From d2bee612653bc1d8bb726ecc384c57d74456556a Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Wed, 4 Jul 2018 09:12:27 +0800
Subject: [PATCH] seo

---
 tamguo-admin/src/main/resources/application.properties |  4 ++--
 .../src/main/resources/mappers/CourseMapper.xml        |  2 +-
 .../src/main/resources/templates/tiku/course/list.html |  6 ------
 tamguo/src/main/resources/application.properties       | 10 +++++-----
 tamguo/src/main/resources/redis.xml                    |  2 +-
 tamguo/src/main/resources/templates/subject.html       |  2 +-
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/tamguo-admin/src/main/resources/application.properties b/tamguo-admin/src/main/resources/application.properties
index 30260a1..3cf7c64 100644
--- a/tamguo-admin/src/main/resources/application.properties
+++ b/tamguo-admin/src/main/resources/application.properties
@@ -11,14 +11,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://47.100.175.14:3306/tiku?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tamguo?useUnicode=true&characterEncoding=UTF-8&useSSL=false
 spring.datasource.username=root
 spring.datasource.validationQuery=SELECT 1 FROM DUAL
 
diff --git a/tamguo-admin/src/main/resources/mappers/CourseMapper.xml b/tamguo-admin/src/main/resources/mappers/CourseMapper.xml
index 945435b..f721a5d 100644
--- a/tamguo-admin/src/main/resources/mappers/CourseMapper.xml
+++ b/tamguo-admin/src/main/resources/mappers/CourseMapper.xml
@@ -22,7 +22,7 @@
 			c.orders,
 			c.point_num,
 			c.question_num,
-			c.subject_id,
+			c.subject_id
 		FROM
 			tiku_course c
 		WHERE
diff --git a/tamguo-admin/src/main/resources/templates/tiku/course/list.html b/tamguo-admin/src/main/resources/templates/tiku/course/list.html
index 5fc1297..194fc46 100644
--- a/tamguo-admin/src/main/resources/templates/tiku/course/list.html
+++ b/tamguo-admin/src/main/resources/templates/tiku/course/list.html
@@ -86,12 +86,6 @@
 			      <input type="number" class="form-control" v-model="course.pointNum" placeholder="知识点数量"/>
 			    </div>
 			</div>
-			<div class="form-group">
-			   	<div class="col-sm-2 control-label">图标</div>
-			   	<div class="col-sm-10">
-			      <input type="text" class="form-control" v-model="course.icon" placeholder="图标"/>
-			    </div>
-			</div>
 			<div class="form-group">
 			   	<div class="col-sm-2 control-label">排序</div>
 			   	<div class="col-sm-10">
diff --git a/tamguo/src/main/resources/application.properties b/tamguo/src/main/resources/application.properties
index fa403f2..e055b2f 100644
--- a/tamguo/src/main/resources/application.properties
+++ b/tamguo/src/main/resources/application.properties
@@ -1,6 +1,6 @@
-domain.name=http://localhost/
+domain.name=http://www.tamguo.com/
 admin.domain.name=http://admin.tanguoguo.com
-server.port=80
+server.port=8081
 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=Tanguo
+spring.datasource.password=
 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/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=47.100.175.14
+redis.hostname=127.0.0.1
 redis.port=6379
 redis.password=
 
diff --git a/tamguo/src/main/resources/redis.xml b/tamguo/src/main/resources/redis.xml
index 4055e0d..ed04f74 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="47.100.175.14" port="6379"/>
+		<server ip="127.0.0.1" port="6379"/>
 	</servers>
 </redis>
\ No newline at end of file
diff --git a/tamguo/src/main/resources/templates/subject.html b/tamguo/src/main/resources/templates/subject.html
index 6387ad9..91f2d05 100644
--- a/tamguo/src/main/resources/templates/subject.html
+++ b/tamguo/src/main/resources/templates/subject.html
@@ -2,7 +2,7 @@
 <html lang="Zh-hans" xmlns:th="http://www.thymeleaf.org">
 	<head>
 		<meta charset="UTF-8">
-		<title th:text="${subject.name + '|' + course.seoTitle +'-探果网 ' }">试卷_探果题库</title>
+		<title th:text="${subject.name + '|' + course.seoTitle +'-探果题库 ' }">试卷_探果题库</title>
 		<meta name="description" content="探果题库携手高校名师为考生提供高效的智能备考服务，涵括领域有高考、财会类、建筑工程、职业资格、医卫类、计算机类和学历类等热门考试题库。拥有高校名师丰富的经验，优质的学习资料和备考全阶段的高效服务，助您丰富自我，不断前行！"/>
 		<meta name="keyword" content="探果题库,数学试卷,高校试题,名校,名校试题,名校试卷,高校名师,名师专访,名师教案,名师课堂试题库,试卷库,智能题库,历年真题,模拟试题,押题,预测试题,高考,会计证,会计从业,会计师,经济师,施工员,建造师,建筑师,造价师,职业资格,证券资格,考研,计算机考试,建筑考试,财会类,医卫类,护士资格,公务员,知识点,试题,试卷"/>
 		<meta name="author" content="Tamguo Team" />