From 6e23c61910b5930195671bb226a2b64db433a9d2 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Wed, 4 Jul 2018 10:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tamguo/service/impl/SubjectService.java   |  8 ++++++-
 .../src/main/resources/application.properties | 10 ++++----
 tamguo/src/main/resources/redis.xml           |  2 +-
 .../src/main/resources/templates/chapter.html | 24 +++++++++----------
 4 files changed, 24 insertions(+), 20 deletions(-)

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 63fb6c2..06d7c24 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
@@ -81,9 +81,15 @@ public class SubjectService implements ISubjectService{
                     	for(int i=0 ; i<subjectVo.getCourseName().size() ; i++) {
                         	logger.info("科目名称:{}" , subjectVo.getCourseName().get(i));
                         	SubjectEntity subject = subjectMapper.findByName(subjectVo.getSubjectName());
-                        	
+                        	if(subject == null) {
+                        		continue;
+                        	}
                         	CourseEntity course = new CourseEntity();
                         	course.setName(subjectVo.getCourseName().get(i));
+                        	CourseEntity courseEntity = courseMapper.selectOne(course);
+                        	if(courseEntity != null) {
+                        		continue;
+                        	}
                         	course.setOrders(i+1);
                         	course.setPointNum(BigInteger.ZERO);
                         	course.setQuestionNum(BigInteger.ZERO);
diff --git a/tamguo/src/main/resources/application.properties b/tamguo/src/main/resources/application.properties
index e055b2f..2f0ad7d 100644
--- a/tamguo/src/main/resources/application.properties
+++ b/tamguo/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-domain.name=http://www.tamguo.com/
+domain.name=http://localhost/
 admin.domain.name=http://admin.tanguoguo.com
-server.port=8081
+server.port=80
 jasypt.encryptor.password=tamguo
 
 spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
@@ -12,14 +12,14 @@ spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 spring.datasource.maxWait=60000
 spring.datasource.minEvictableIdleTimeMillis=300000
 spring.datasource.minIdle=5
-spring.datasource.password=
+spring.datasource.password=Tanguo
 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://127.0.0.1:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false
 spring.datasource.username=root
 spring.datasource.validationQuery=SELECT 1 FROM DUAL
 
@@ -46,7 +46,7 @@ spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.content-type=text/html
 spring.thymeleaf.cache=false
 
-redis.hostname=127.0.0.1
+redis.hostname=47.100.175.14
 redis.port=6379
 redis.password=
 
diff --git a/tamguo/src/main/resources/redis.xml b/tamguo/src/main/resources/redis.xml
index ed04f74..4055e0d 100644
--- a/tamguo/src/main/resources/redis.xml
+++ b/tamguo/src/main/resources/redis.xml
@@ -4,6 +4,6 @@
 	<pool maxActive="50" maxIdle="20" maxWait="1000" />
 	<servers>
 		<!-- test -->
-		<server ip="127.0.0.1" port="6379"/>
+		<server ip="47.100.175.14" port="6379"/>
 	</servers>
 </redis>
\ No newline at end of file
diff --git a/tamguo/src/main/resources/templates/chapter.html b/tamguo/src/main/resources/templates/chapter.html
index 7dfb194..1a4aa3e 100644
--- a/tamguo/src/main/resources/templates/chapter.html
+++ b/tamguo/src/main/resources/templates/chapter.html
@@ -78,18 +78,16 @@
 
         <div class="list-left">
             <div id="outline" tabindex="0" style="overflow: hidden; position: static; outline: none; height: 697px; top: 0px;">
-    <div class="outline-content" style="transform: translate3d(0px, 0px, 0px);">
-        
-            <div th:class="${cStat.index==0} ? 'out-chapter show' : 'out-chapter'" th:attr="data-chapterId=${c.uid}" th:each="c,cStat:${chapterList}">
-                <h3 class="k1" data-class="dct-0" title="第一章 集合与常用逻辑用语">
-                    <i class="iconfont icon-unie047 icon-zhankai"></i> <span th:text="${c.name}">第一章 集合与常用逻辑用语</span>
-                </h3>
-            </div>
-        	<div class="blank" style="height: 70px;"></div>
-    </div>
-<div id="ascrail2000" class="nicescroll-rails nicescroll-rails-vr" style="width: 15px; z-index: auto; cursor: default; position: absolute; top: 0px; right: 0px; touch-action: none; height: 697px; opacity: 0; display: block;"><div class="nicescroll-cursors" style="position: relative; top: 0px; float: right; width: 5px; height: 403px; background-color: rgb(219, 219, 219); border: 5px; background-clip: padding-box; border-radius: 5px; touch-action: none;"></div></div><div id="ascrail2000-hr" class="nicescroll-rails nicescroll-rails-hr" style="height: 15px; z-index: auto; position: absolute; left: 0px; bottom: 0px; cursor: default; display: none; width: 329px; opacity: 0;"><div class="nicescroll-cursors" style="position: absolute; top: 0px; height: 5px; width: 329px; background-color: rgb(219, 219, 219); border: 5px; background-clip: padding-box; border-radius: 5px;"></div></div></div>
-
-
+			    <div class="outline-content" style="transform: translate3d(0px, 0px, 0px);">
+			        
+			            <div th:class="${cStat.index==0} ? 'out-chapter show' : 'out-chapter'" th:attr="data-chapterId=${c.uid}" th:each="c,cStat:${chapterList}">
+			                <h3 class="k1" data-class="dct-0" title="第一章 集合与常用逻辑用语">
+			                    <i class="iconfont icon-unie047 icon-zhankai"></i> <span th:text="${c.name}">第一章 集合与常用逻辑用语</span>
+			                </h3>
+			            </div>
+			        	<div class="blank" style="height: 70px;"></div>
+			    </div>
+				<div id="ascrail2000" class="nicescroll-rails nicescroll-rails-vr" style="width: 15px; z-index: auto; cursor: default; position: absolute; top: 0px; right: 0px; touch-action: none; height: 697px; opacity: 0; display: block;"><div class="nicescroll-cursors" style="position: relative; top: 0px; float: right; width: 5px; height: 403px; background-color: rgb(219, 219, 219); border: 5px; background-clip: padding-box; border-radius: 5px; touch-action: none;"></div></div><div id="ascrail2000-hr" class="nicescroll-rails nicescroll-rails-hr" style="height: 15px; z-index: auto; position: absolute; left: 0px; bottom: 0px; cursor: default; display: none; width: 329px; opacity: 0;"><div class="nicescroll-cursors" style="position: absolute; top: 0px; height: 5px; width: 329px; background-color: rgb(219, 219, 219); border: 5px; background-clip: padding-box; border-radius: 5px;"></div></div></div>
         </div>
         <div class="list-right">
             <div class="detail">
@@ -112,7 +110,7 @@
         
             <div class="detail-kpoint-1" th:each="cc,ccStat:${c.childChapterList}">
             <div class="kpoint-1-title k1t-0-0" id="k1t-0-0">
-                <h4 text="$">1 集合的概念及运算</h4>
+                <h4 th:text="${cc.name}">1 集合的概念及运算</h4>
                 <span>1181 试题</span>
                 
                     <a target="_blank" class="ten" th:href="${setting.domain + 'question/' + subjectId +'/'+ course.uid + '/' +c.uid +'/'+cc.uid+'-1-15.html'}">随机来