diff --git a/tamguo/src/main/java/com/tamguo/model/CourseEntity.java b/tamguo/src/main/java/com/tamguo/model/CourseEntity.java
index 2fed75f..d05d095 100644
--- a/tamguo/src/main/java/com/tamguo/model/CourseEntity.java
+++ b/tamguo/src/main/java/com/tamguo/model/CourseEntity.java
@@ -2,8 +2,8 @@ package com.tamguo.model;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.tamguo.config.dao.SuperEntity;
 import java.util.List;
 
 
@@ -12,23 +12,18 @@ import java.util.List;
  * 
  */
 @TableName(value="tiku_course")
-public class CourseEntity extends SuperEntity<CourseEntity> implements Serializable {
+public class CourseEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
-
+	
+	@TableId
+	private String uid;
 	private String name;
-
 	private String subjectId;
-	
 	private String pointNum;
-	
 	private String questionNum;
-
 	private Integer orders;
-	
 	private String seoTitle;
-	
 	private String seoKeywords;
-	
 	private String seoDescription;
 	
 	@TableField(exist=false)
@@ -124,4 +119,12 @@ public class CourseEntity extends SuperEntity<CourseEntity> implements Serializa
 		this.subjectName = subjectName;
 	}
 
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
 }
\ No newline at end of file
diff --git a/tamguo/src/main/java/com/tamguo/model/MenuEntity.java b/tamguo/src/main/java/com/tamguo/model/MenuEntity.java
index 9f41376..7a7cbcd 100644
--- a/tamguo/src/main/java/com/tamguo/model/MenuEntity.java
+++ b/tamguo/src/main/java/com/tamguo/model/MenuEntity.java
@@ -17,17 +17,11 @@ public class MenuEntity extends SuperEntity<MenuEntity> implements Serializable
 	private static final long serialVersionUID = 1L;
 
 	private String name;
-	
 	private String pinyin;
-
 	private String parentId;
-	
 	private String isShow;
-	
 	private Integer orders;
-
 	private String url;
-	
 	private String reserve1;
 	
 	// 子类型
diff --git a/tamguo/src/main/java/com/tamguo/model/SubjectEntity.java b/tamguo/src/main/java/com/tamguo/model/SubjectEntity.java
index 2f83ae0..e03f1ca 100644
--- a/tamguo/src/main/java/com/tamguo/model/SubjectEntity.java
+++ b/tamguo/src/main/java/com/tamguo/model/SubjectEntity.java
@@ -3,15 +3,18 @@ package com.tamguo.model;
 import java.io.Serializable;
 import java.util.List;
 
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.tamguo.config.dao.SuperEntity;
 
 @TableName(value="tiku_subject")
-public class SubjectEntity extends SuperEntity<SubjectEntity> implements Serializable {
+public class SubjectEntity extends Model<SubjectEntity> implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	@TableId
+	private String uid;
 	private String name;
 	
 	@TableField(exist=false)
@@ -32,4 +35,18 @@ public class SubjectEntity extends SuperEntity<SubjectEntity> implements Seriali
 	public void setCourseList(List<CourseEntity> courseList) {
 		this.courseList = courseList;
 	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	@Override
+	protected Serializable pkVal() {
+		return getUid();
+	}
+
 }
diff --git a/tamguo/src/main/java/com/tamguo/web/SubjectController.java b/tamguo/src/main/java/com/tamguo/web/SubjectController.java
index e90dd0a..90e0330 100644
--- a/tamguo/src/main/java/com/tamguo/web/SubjectController.java
+++ b/tamguo/src/main/java/com/tamguo/web/SubjectController.java
@@ -1,6 +1,9 @@
 package com.tamguo.web;
 
 import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -27,6 +30,8 @@ import com.tamguo.util.Result;
 @Controller
 public class SubjectController {
 	
+	private Logger logger = LoggerFactory.getLogger(getClass());
+	
 	@Autowired
 	private IChapterService iChapterService;
 	@Autowired
@@ -49,7 +54,8 @@ public class SubjectController {
 	    	model.addObject("areaList", iAreaService.findRootArea());
 	        return model;
 		} catch (Exception e) {
-			model.setViewName("404");
+			logger.error(e.getMessage() , e);
+			model.setViewName("500");
 			return model;
 		}
 		
diff --git a/tamguo/src/main/resources/application.properties b/tamguo/src/main/resources/application.properties
index 1de9962..9e524d3 100644
--- a/tamguo/src/main/resources/application.properties
+++ b/tamguo/src/main/resources/application.properties
@@ -13,14 +13,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/src/main/resources/templates/include/footer.html b/tamguo/src/main/resources/templates/include/footer.html
index 0c4f80d..d01873e 100644
--- a/tamguo/src/main/resources/templates/include/footer.html
+++ b/tamguo/src/main/resources/templates/include/footer.html
@@ -3,9 +3,9 @@
 <div class="footer" th:fragment="footer">
 	<div class="footer-contain clearfix">
 		<div class="intro">
-			<div class="title">探果网</div>
+			<div class="title">探果题库</div>
 			<p>
-				探果网旨在为老师提供高效的智能备课等服务，让知识能无障碍传播，老师创造价值，助您不断前行！
+				探果题库旨在为用户提供高效的备考服务，让知识能无障碍传播，老用户价值，助您不断前行！
 			</p>
 		</div>
 		<div class="connect">
diff --git a/tamguo/src/main/resources/templates/subject.html b/tamguo/src/main/resources/templates/subject.html
index 6d890c8..37163c6 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>探果题库_聪明的学生都在这里</title>
+		<title th:text="${'探果题库-'+subject.name+'_聪明的学生都在这里'}">探果题库_聪明的学生都在这里</title>
 		<meta name="description" content="探果题库携手高校名师为考生提供高效的智能备考服务，涵括领域有高考、财会类、建筑工程、职业资格、医卫类、计算机类和学历类等热门考试题库。拥有高校名师丰富的经验，优质的学习资料和备考全阶段的高效服务，助您丰富自我，不断前行！"/>
 		<meta name="keyword" content="探果题库,数学试卷,高校试题,名校,名校试题,名校试卷,高校名师,名师专访,名师教案,名师课堂试题库,试卷库,智能题库,历年真题,模拟试题,押题,预测试题,高考,会计证,会计从业,会计师,经济师,施工员,建造师,建筑师,造价师,职业资格,证券资格,考研,计算机考试,建筑考试,财会类,医卫类,护士资格,公务员,知识点,试题,试卷"/>
 		<meta name="author" content="Tamguo Team" />