From abcfdda034cd3312e72a5f02001e13226e1821c3 Mon Sep 17 00:00:00 2001 From: tamguo Date: Fri, 13 Jul 2018 16:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5360?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tamguo/admin/model/CourseEntity.java | 18 +++--- .../tamguo/admin/model/QuestionEntity.java | 6 +- .../java/com/tamguo/model/CourseEntity.java | 15 ++--- .../tamguo/service/impl/SubjectService.java | 4 +- .../java/com/tamguo/model/CourseEntity.java | 12 ++-- .../java/com/tamguo/model/QuestionEntity.java | 9 +-- .../main/java/com/tamguo/util/Setting.java | 14 ++--- .../java/com/tamguo/web/IndexController.java | 6 ++ .../src/main/resources/application.properties | 2 +- .../resources/templates/include/footer.html | 56 +++++++++++-------- .../src/main/resources/templates/index.html | 1 - .../thirdparty/sogousiteverification.html | 1 + 12 files changed, 78 insertions(+), 66 deletions(-) create mode 100644 tamguo/src/main/resources/templates/thirdparty/sogousiteverification.html diff --git a/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java b/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java index 0403b1f..5f67a22 100644 --- a/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java +++ b/tamguo-admin/src/main/java/com/tamguo/admin/model/CourseEntity.java @@ -19,11 +19,11 @@ public class CourseEntity extends SuperEntity implements Serializa private String name; - private BigInteger subjectId; + private String subjectId; - private BigInteger pointNum; + private Integer pointNum; - private BigInteger questionNum; + private Integer questionNum; private Integer orders; @@ -50,27 +50,27 @@ public class CourseEntity extends SuperEntity implements Serializa this.name = name; } - public BigInteger getSubjectId() { + public String getSubjectId() { return this.subjectId; } - public void setSubjectId(BigInteger subjectId) { + public void setSubjectId(String subjectId) { this.subjectId = subjectId; } - public BigInteger getQuestionNum() { + public Integer getQuestionNum() { return questionNum; } - public void setQuestionNum(BigInteger questionNum) { + public void setQuestionNum(Integer questionNum) { this.questionNum = questionNum; } - public BigInteger getPointNum() { + public Integer getPointNum() { return pointNum; } - public void setPointNum(BigInteger pointNum) { + public void setPointNum(Integer pointNum) { this.pointNum = pointNum; } diff --git a/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java b/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java index 164c3f4..4efbd47 100644 --- a/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java +++ b/tamguo-admin/src/main/java/com/tamguo/admin/model/QuestionEntity.java @@ -18,7 +18,7 @@ public class QuestionEntity extends SuperEntity implements Seria private String analysis; - private BigInteger paperId; + private String paperId; private String answer; @@ -116,11 +116,11 @@ public class QuestionEntity extends SuperEntity implements Seria this.score = score; } - public BigInteger getPaperId() { + public String getPaperId() { return paperId; } - public void setPaperId(BigInteger paperId) { + public void setPaperId(String paperId) { this.paperId = paperId; } diff --git a/tamguo-crawler/src/main/java/com/tamguo/model/CourseEntity.java b/tamguo-crawler/src/main/java/com/tamguo/model/CourseEntity.java index fd4ff6a..aa70084 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/model/CourseEntity.java +++ b/tamguo-crawler/src/main/java/com/tamguo/model/CourseEntity.java @@ -4,9 +4,6 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; -import java.math.BigInteger; - - /** * The persistent class for the tiku_course database table. * @@ -19,9 +16,9 @@ public class CourseEntity extends SuperEntity implements Serializa private String subjectId; - private BigInteger pointNum; + private Integer pointNum; - private BigInteger questionNum; + private Integer questionNum; private Integer orders; @@ -50,19 +47,19 @@ public class CourseEntity extends SuperEntity implements Serializa this.subjectId = subjectId; } - public BigInteger getQuestionNum() { + public Integer getQuestionNum() { return questionNum; } - public void setQuestionNum(BigInteger questionNum) { + public void setQuestionNum(Integer questionNum) { this.questionNum = questionNum; } - public BigInteger getPointNum() { + public Integer getPointNum() { return pointNum; } - public void setPointNum(BigInteger pointNum) { + public void setPointNum(Integer pointNum) { this.pointNum = pointNum; } diff --git a/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java b/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java index b72a7b0..9eb5006 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java +++ b/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java @@ -101,8 +101,8 @@ public class SubjectService implements ISubjectService{ continue; } course.setOrders(i+1); - course.setPointNum(BigInteger.ZERO); - course.setQuestionNum(BigInteger.ZERO); + course.setPointNum(0); + course.setQuestionNum(0); course.setSeoDescription(subjectVo.getCourseName().get(i)); course.setSeoKeywords(subjectVo.getCourseName().get(i)); course.setSeoTitle(subjectVo.getCourseName().get(i)); diff --git a/tamguo-mobile/src/main/java/com/tamguo/model/CourseEntity.java b/tamguo-mobile/src/main/java/com/tamguo/model/CourseEntity.java index a892206..b623e9d 100644 --- a/tamguo-mobile/src/main/java/com/tamguo/model/CourseEntity.java +++ b/tamguo-mobile/src/main/java/com/tamguo/model/CourseEntity.java @@ -21,9 +21,9 @@ public class CourseEntity extends SuperEntity implements Serializa private String subjectId; - private BigInteger pointNum; + private Integer pointNum; - private BigInteger questionNum; + private Integer questionNum; private Integer orders; @@ -58,19 +58,19 @@ public class CourseEntity extends SuperEntity implements Serializa this.subjectId = subjectId; } - public BigInteger getQuestionNum() { + public Integer getQuestionNum() { return questionNum; } - public void setQuestionNum(BigInteger questionNum) { + public void setQuestionNum(Integer questionNum) { this.questionNum = questionNum; } - public BigInteger getPointNum() { + public Integer getPointNum() { return pointNum; } - public void setPointNum(BigInteger pointNum) { + public void setPointNum(Integer pointNum) { this.pointNum = pointNum; } diff --git a/tamguo/src/main/java/com/tamguo/model/QuestionEntity.java b/tamguo/src/main/java/com/tamguo/model/QuestionEntity.java index a9c111e..4fe7584 100644 --- a/tamguo/src/main/java/com/tamguo/model/QuestionEntity.java +++ b/tamguo/src/main/java/com/tamguo/model/QuestionEntity.java @@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.tamguo.config.dao.SuperEntity; -import java.math.BigInteger; - - /** * The persistent class for the tiku_question database table. * @@ -22,7 +19,7 @@ public class QuestionEntity extends SuperEntity implements Seria private String answer; - private BigInteger chapterId; + private String chapterId; private String questionType; @@ -68,11 +65,11 @@ public class QuestionEntity extends SuperEntity implements Seria this.answer = answer; } - public BigInteger getChapterId() { + public String getChapterId() { return this.chapterId; } - public void setChapterId(BigInteger chapterId) { + public void setChapterId(String chapterId) { this.chapterId = chapterId; } diff --git a/tamguo/src/main/java/com/tamguo/util/Setting.java b/tamguo/src/main/java/com/tamguo/util/Setting.java index 4240daf..b3ac4a5 100644 --- a/tamguo/src/main/java/com/tamguo/util/Setting.java +++ b/tamguo/src/main/java/com/tamguo/util/Setting.java @@ -17,8 +17,8 @@ public final class Setting { public String domain; /**站点编号 **/ - @Value(value="${sitenum}") - private String sitenum; + @Value(value="${sitename}") + private String sitename; /** 后端管理*/ @Value(value="${admin.domain.name}") @@ -32,11 +32,11 @@ public final class Setting { public final String PAPER_TYPE_YATI = "3"; /** 名校 */ public final String PAPER_TYPE_MINGXIAO = "4"; - public String getSitenum() { - return sitenum; + public String getSitename() { + return sitename; } - public void setSitenum(String sitenum) { - this.sitenum = sitenum; + public void setSitename(String sitename) { + this.sitename = sitename; } - + } diff --git a/tamguo/src/main/java/com/tamguo/web/IndexController.java b/tamguo/src/main/java/com/tamguo/web/IndexController.java index 498b256..d3dda61 100644 --- a/tamguo/src/main/java/com/tamguo/web/IndexController.java +++ b/tamguo/src/main/java/com/tamguo/web/IndexController.java @@ -31,4 +31,10 @@ public class IndexController { model.setViewName("thirdparty/baidu_verify_iAm7387J0l"); return model; } + + @RequestMapping(value = "/sogousiteverification", method = RequestMethod.GET) + public ModelAndView sogousiteverification(ModelAndView model) { + model.setViewName("thirdparty/sogousiteverification"); + return model; + } } diff --git a/tamguo/src/main/resources/application.properties b/tamguo/src/main/resources/application.properties index aef7af7..a24a782 100644 --- a/tamguo/src/main/resources/application.properties +++ b/tamguo/src/main/resources/application.properties @@ -1,4 +1,4 @@ -sitenum=2 +sitename=tamguo domain.name=http://www.tamguo.com/ admin.domain.name=http://admin.tanguoguo.com server.port=8081 diff --git a/tamguo/src/main/resources/templates/include/footer.html b/tamguo/src/main/resources/templates/include/footer.html index 052ab94..bc829d7 100644 --- a/tamguo/src/main/resources/templates/include/footer.html +++ b/tamguo/src/main/resources/templates/include/footer.html @@ -47,37 +47,49 @@ target="_blank">沪ICP备14022608号-1 Copyright © 2018 Tamguo

- -