diff --git a/tamguo-crawler/pom.xml b/tamguo-crawler/pom.xml
index a52c6f1..6395bb5 100644
--- a/tamguo-crawler/pom.xml
+++ b/tamguo-crawler/pom.xml
@@ -17,6 +17,7 @@
UTF-8
1.8
2.1.9
+ 5.1.44
diff --git a/tamguo-crawler/src/main/java/com/tamguo/model/vo/QuestionVo.java b/tamguo-crawler/src/main/java/com/tamguo/model/vo/QuestionVo.java
index ae10c6f..a1f8360 100644
--- a/tamguo-crawler/src/main/java/com/tamguo/model/vo/QuestionVo.java
+++ b/tamguo-crawler/src/main/java/com/tamguo/model/vo/QuestionVo.java
@@ -41,7 +41,6 @@ public class QuestionVo {
@PageFieldSelect(cssQuery=".kpoint-contain .point .point-item",selectType = XxlCrawlerConf.SelectType.TEXT)
private List reviewPoint;
-
public String getQuestionType() {
return questionType;
}
diff --git a/tamguo-crawler/src/main/resources/application.properties b/tamguo-crawler/src/main/resources/application.properties
index e9b8cc9..26dd5ef 100644
--- a/tamguo-crawler/src/main/resources/application.properties
+++ b/tamguo-crawler/src/main/resources/application.properties
@@ -8,14 +8,14 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
spring.datasource.maxWait=60000
spring.datasource.minEvictableIdleTimeMillis=300000
spring.datasource.minIdle=5
-spring.datasource.password=Tanguo
+spring.datasource.password=123456
spring.datasource.poolPreparedStatements=true
spring.datasource.testOnBorrow=false
spring.datasource.testOnReturn=false
spring.datasource.testWhileIdle=true
spring.datasource.timeBetweenEvictionRunsMillis=60000
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
spring.datasource.username=root
spring.datasource.validationQuery=SELECT 1 FROM DUAL
diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
index 2a080b1..06361f0 100644
--- a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
+++ b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
@@ -30,14 +30,15 @@ public class PaperCrawler {
private final String SUBJECT_ID = "gaokao";
// 科目
private final String COURSE_ID = "likeshuxue";
- // 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏
- private final String AREA_ID = "320000";
+ // 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 | 330000 浙江
+ // 140000 山西 | 350000 福建 | 340000 安徽
+ private final String AREA_ID = "340000";
// 年份
- private final String YEAR = "2016";
+ private final String YEAR = "2015";
// 真题试卷 类型(1:真题试卷,2:模拟试卷,3:押题预测,4:名校精品)
- private final String PAPER_TYPE = "4";
+ private final String PAPER_TYPE = "3";
// 开始采集的URL
- private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-7-2016-552-1-download";
+ private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-2-2015-852-1-download";
private RunData runData;
diff --git a/tamguo-tms/src/main/resources/application.properties b/tamguo-tms/src/main/resources/application.properties
index 70c37fc..f2af949 100644
--- a/tamguo-tms/src/main/resources/application.properties
+++ b/tamguo-tms/src/main/resources/application.properties
@@ -1,5 +1,5 @@
domain.name=http://localhost:8081/
-admin.domain.name=http://admin.tanguoguo.com
+admin.domain.name=https://admin.tamguo.com
server.port=8081
jasypt.encryptor.password=tamguo
@@ -12,14 +12,14 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
spring.datasource.maxWait=60000
spring.datasource.minEvictableIdleTimeMillis=300000
spring.datasource.minIdle=5
-spring.datasource.password=Tanguo
+spring.datasource.password=123456
spring.datasource.poolPreparedStatements=true
spring.datasource.testOnBorrow=false
spring.datasource.testOnReturn=false
spring.datasource.testWhileIdle=true
spring.datasource.timeBetweenEvictionRunsMillis=60000
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
spring.datasource.username=root
spring.datasource.validationQuery=SELECT 1 FROM DUAL
diff --git a/tamguo-tms/src/main/resources/templates/mobile/subject.html b/tamguo-tms/src/main/resources/templates/mobile/subject.html
index 4fbf729..1b60129 100644
--- a/tamguo-tms/src/main/resources/templates/mobile/subject.html
+++ b/tamguo-tms/src/main/resources/templates/mobile/subject.html
@@ -1,11 +1,10 @@
-
-
-
-
+
+
+