diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java index f64f429..acdd80f 100644 --- a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java +++ b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java @@ -32,14 +32,14 @@ public class PaperCrawler { private final String COURSE_ID = "likeshuxue"; // 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 | 330000 浙江 // 140000 山西 | 350000 福建 | 340000 安徽 | 220000 吉林 | 150000 内蒙古 | 640000 宁夏 | 650000 新疆 | 广西 450000 | 210000 辽宁 - // 230000 黑龙江 | 610000 陕西 | 360000 江西 | 440000 广东 | 430000 湖南 | 460000 海南 - private final String AREA_ID = "460000"; + // 230000 黑龙江 | 610000 陕西 | 360000 江西 | 440000 广东 | 430000 湖南 | 460000 海南 | 530000 云南 + private final String AREA_ID = "530000"; // 年份 private final String YEAR = "2015"; // 真题试卷 类型(1:真题试卷,2:模拟试卷,3:押题预测,4:名校精品) private final String PAPER_TYPE = "3"; // 开始采集的URL - private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-2-2015-1567-1-download"; + private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-2-2015-1597-1-download"; private RunData runData; diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java index f1f319a..5c3a72f 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java @@ -94,6 +94,11 @@ public class QuestionContrller { model.addObject("question", question); model.addObject("course", iCourseService.selectById(question.getCourseId())); model.addObject("answerList", iQuestionAnswerService.selectList(Condition.create().eq("question_id", uid).orderDesc(Arrays.asList("create_date")))); + if(BrowserUtils.isMobile(request.getHeader("user-agent"))) { + model.setViewName("mobile/question"); + }else { + model.setViewName("question"); + } return model; } diff --git a/tamguo-tms/src/main/resources/application.properties b/tamguo-tms/src/main/resources/application.properties index 6e39331..f2af949 100644 --- a/tamguo-tms/src/main/resources/application.properties +++ b/tamguo-tms/src/main/resources/application.properties @@ -1,4 +1,4 @@ -domain.name=https://www.tamguo.com/ +domain.name=http://localhost:8081/ admin.domain.name=https://admin.tamguo.com server.port=8081 jasypt.encryptor.password=tamguo @@ -12,7 +12,7 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 spring.datasource.maxWait=60000 spring.datasource.minEvictableIdleTimeMillis=300000 spring.datasource.minIdle=5 -spring.datasource.password=tanguo520pig +spring.datasource.password=123456 spring.datasource.poolPreparedStatements=true spring.datasource.testOnBorrow=false spring.datasource.testOnReturn=false diff --git a/tamguo-tms/src/main/resources/static/mobile/css/detail.css b/tamguo-tms/src/main/resources/static/mobile/css/detail.css new file mode 100644 index 0000000..5985849 --- /dev/null +++ b/tamguo-tms/src/main/resources/static/mobile/css/detail.css @@ -0,0 +1,31 @@ +section.card { + padding: 1.5625rem 1.25rem; + margin-bottom: .75rem; +} +section { + background: #fff; +} +.card-name-wrapper { + display: -webkit-flex; + display: flex; + -webkit-justify-content: space-between; + justify-content: space-between; + -webkit-align-items: flex-end; + align-items: flex-end; + padding-bottom: 1rem; +} +.card-name-wrapper .name { + font-size: 1.1875rem; + font-weight: 700; + line-height: 1; +} +.card-name-wrapper .more { + position: relative; + padding-right: .75rem; + font-size: .8125rem; + color: #9C9FA1; + line-height: 1; +} +.loupan-status .status-wrapper .status-item:last-child { + padding-bottom: 0; +} \ No newline at end of file diff --git a/tamguo-tms/src/main/resources/templates/include/footer.html b/tamguo-tms/src/main/resources/templates/include/footer.html index 180d557..9847607 100644 --- a/tamguo-tms/src/main/resources/templates/include/footer.html +++ b/tamguo-tms/src/main/resources/templates/include/footer.html @@ -33,7 +33,7 @@