diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java index 84bdc69..2a080b1 100644 --- a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java +++ b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java @@ -30,14 +30,14 @@ public class PaperCrawler { private final String SUBJECT_ID = "gaokao"; // 科目 private final String COURSE_ID = "likeshuxue"; - // 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 - private final String AREA_ID = "420000"; + // 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 + private final String AREA_ID = "320000"; // 年份 private final String YEAR = "2016"; // 真题试卷 类型(1:真题试卷,2:模拟试卷,3:押题预测,4:名校精品) private final String PAPER_TYPE = "4"; // 开始采集的URL - private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-7-2016-463-1-download"; + private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-7-2016-552-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 edea471..a0dcbd5 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 @@ -93,6 +93,7 @@ public class QuestionContrller { QuestionEntity question = iQuestionService.selectById(uid); question.setQuestionType(question.getQuestionType()); 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")))); return model; } catch (Exception e) { diff --git a/tamguo-tms/src/main/resources/templates/404.html b/tamguo-tms/src/main/resources/templates/404.html index e9cc6f2..0c05406 100644 --- a/tamguo-tms/src/main/resources/templates/404.html +++ b/tamguo-tms/src/main/resources/templates/404.html @@ -4,7 +4,7 @@ 探果网_聪明的学生都在这里 - + diff --git a/tamguo-tms/src/main/resources/templates/500.html b/tamguo-tms/src/main/resources/templates/500.html index f1f8538..a189b81 100644 --- a/tamguo-tms/src/main/resources/templates/500.html +++ b/tamguo-tms/src/main/resources/templates/500.html @@ -4,7 +4,7 @@ 探果网_聪明的学生都在这里 - + diff --git a/tamguo-tms/src/main/resources/templates/book.html b/tamguo-tms/src/main/resources/templates/book.html index d2f80bd..1ccabc6 100644 --- a/tamguo-tms/src/main/resources/templates/book.html +++ b/tamguo-tms/src/main/resources/templates/book.html @@ -2,9 +2,9 @@ - - - + + + diff --git a/tamguo-tms/src/main/resources/templates/chapter.html b/tamguo-tms/src/main/resources/templates/chapter.html index 637d1b4..39156c5 100644 --- a/tamguo-tms/src/main/resources/templates/chapter.html +++ b/tamguo-tms/src/main/resources/templates/chapter.html @@ -2,9 +2,9 @@ - - - + + + diff --git a/tamguo-tms/src/main/resources/templates/include/footer.html b/tamguo-tms/src/main/resources/templates/include/footer.html index 3c229fb..d1ea63d 100644 --- a/tamguo-tms/src/main/resources/templates/include/footer.html +++ b/tamguo-tms/src/main/resources/templates/include/footer.html @@ -33,9 +33,9 @@
diff --git a/tamguo-tms/src/main/resources/templates/index.html b/tamguo-tms/src/main/resources/templates/index.html index 040b90f..040640f 100644 --- a/tamguo-tms/src/main/resources/templates/index.html +++ b/tamguo-tms/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ 探果网_聪明的学生都在这里 - + diff --git a/tamguo-tms/src/main/resources/templates/login.html b/tamguo-tms/src/main/resources/templates/login.html index 1a9897b..5d387bf 100644 --- a/tamguo-tms/src/main/resources/templates/login.html +++ b/tamguo-tms/src/main/resources/templates/login.html @@ -3,7 +3,7 @@ 登录_探果网 - + diff --git a/tamguo-tms/src/main/resources/templates/paper.html b/tamguo-tms/src/main/resources/templates/paper.html index de320b5..f15a4e8 100644 --- a/tamguo-tms/src/main/resources/templates/paper.html +++ b/tamguo-tms/src/main/resources/templates/paper.html @@ -3,8 +3,8 @@ 探果网_聪明的学生都在这里 - - + + diff --git a/tamguo-tms/src/main/resources/templates/paperlist.html b/tamguo-tms/src/main/resources/templates/paperlist.html index aa41ad6..4a8e902 100644 --- a/tamguo-tms/src/main/resources/templates/paperlist.html +++ b/tamguo-tms/src/main/resources/templates/paperlist.html @@ -2,9 +2,9 @@ - - - + + + diff --git a/tamguo-tms/src/main/resources/templates/question.html b/tamguo-tms/src/main/resources/templates/question.html index 806a0b7..b5d5dec 100644 --- a/tamguo-tms/src/main/resources/templates/question.html +++ b/tamguo-tms/src/main/resources/templates/question.html @@ -2,9 +2,9 @@ - - - + + + diff --git a/tamguo-tms/src/main/resources/templates/register.html b/tamguo-tms/src/main/resources/templates/register.html index a98b81d..572af98 100644 --- a/tamguo-tms/src/main/resources/templates/register.html +++ b/tamguo-tms/src/main/resources/templates/register.html @@ -3,7 +3,7 @@ 注册_探果网 - + diff --git a/tamguo-tms/src/main/resources/templates/subject.html b/tamguo-tms/src/main/resources/templates/subject.html index 572141c..e854b88 100644 --- a/tamguo-tms/src/main/resources/templates/subject.html +++ b/tamguo-tms/src/main/resources/templates/subject.html @@ -2,9 +2,9 @@ - - - + + +