Merge branch 'wei_master' into '105'

Wei master

See merge request !20

src/main/java/com/server/Application.java

@@ -3,7 +3,10 @@ package com.server;
 import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 
 @SpringBootApplication
 @SpringBootApplication
@@ -16,4 +19,13 @@ public class Application {
 		SpringApplication application = new SpringApplication(Application.class);
 		SpringApplication application = new SpringApplication(Application.class);
 		application.run(args);
 		application.run(args);
 	}
 	}
+	@Bean
+	public EmbeddedServletContainerCustomizer containerCustomizer(){
+		return new EmbeddedServletContainerCustomizer() {
+			@Override
+			public void customize(ConfigurableEmbeddedServletContainer container) {
+				container.setSessionTimeout(1800);//单位为S
+			}
+		};
+	}
 }
 }

src/main/java/com/server/common/configure/ConfigRedisSession.java

@@ -10,6 +10,6 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 
 
 
 
 @Configuration
 @Configuration
-@EnableRedisHttpSession(maxInactiveIntervalInSeconds=1800,redisNamespace = "kzy_wx")
+@EnableRedisHttpSession(maxInactiveIntervalInSeconds=86400,redisNamespace = "kzy_wx")
 public class ConfigRedisSession {
 public class ConfigRedisSession {
 }
 }
\ No newline at end of file

src/main/resources/mybatis/mapping/CommentMapper.xml

@@ -40,7 +40,7 @@
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         WHERE
         WHERE
             t.is_delete = 0 AND t.auth_status=2
             t.is_delete = 0 AND t.auth_status=2
-        AND t.relation_id = #{courseId,jdbcType=BIGINT}
+        AND t.relation_id = #{informationId,jdbcType=BIGINT}
         ORDER BY
         ORDER BY
             t.id DESC
             t.id DESC
         LIMIT #{start,jdbcType=INTEGER},#{pageSize,jdbcType=INTEGER}
         LIMIT #{start,jdbcType=INTEGER},#{pageSize,jdbcType=INTEGER}
@@ -53,7 +53,7 @@
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         LEFT JOIN t_kzy_user u ON t.user_id = u.id AND t.type = 1
         WHERE
         WHERE
             t.is_delete = 0 AND t.auth_status=2
             t.is_delete = 0 AND t.auth_status=2
-        AND t.relation_id = #{courseId,jdbcType=BIGINT}
+        AND t.relation_id = #{informationId,jdbcType=BIGINT}
     </select>
     </select>
 
 
 </mapper>
 </mapper>
\ No newline at end of file