update

edu-user/edu-user-server/pom.xml

@@ -27,6 +27,10 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-openfeign-core</artifactId>
 			<version>2.1.2.RELEASE</version>
@@ -40,6 +44,10 @@
             <groupId>com.keao.edu</groupId>
             <artifactId>edu-common</artifactId>
         </dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+		</dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -1,42 +0,0 @@
-package com.keao.edu.user.controller.queryinfo;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import com.keao.edu.common.page.QueryInfo;
-
-public class HelpCenterContentQueryInfo extends QueryInfo {
-
-	@ApiModelProperty(value = "父分类ID，多个用逗号分隔", required = false)
-	private String catalogIds;
-
-	@ApiModelProperty(value = "标题", required = false)
-	private String title;
-
-	@ApiModelProperty(value = "状态（1-显示 0-隐藏）", required = false)
-	private Integer status;
-
-	public String getCatalogIds() {
-		return catalogIds;
-	}
-
-	public void setCatalogIds(String catalogIds) {
-		this.catalogIds = catalogIds;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-}

edu-user/edu-user-server/src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
     
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/edu_saas_test?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.99.212.176:3306/edu_saas?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: edu_saas
     password: edu_saas
     # 使用druid数据源
@@ -45,6 +45,24 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
+
+  redis:
+    host: 47.99.212.176
+    port: 6379
+    password:
+    database: 0
+    #连接超时时间（毫秒）
+    timeout: 10000
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 10
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+        #连接池中的最大空闲连接
+        max-idle: 10
+        #连接池中的最小空闲连接
+        min-idle: 1
     
 
 mybatis:
@@ -73,7 +91,9 @@ management:
     health:
       show-details: ALWAYS
       
-
-ribbon:  
+ribbon:
     ReadTimeout: 60000  
-    ConnectTimeout: 60000
+    ConnectTimeout: 60000
+
+message:
+  debugMode: true