打包文件

lift-batch-service/src/main/java/cn/com/ty/lift/batch/config/CustomCORSConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2019-12-10
  * @description
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -23,7 +23,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

lift-push-pc/src/main/java/cn/com/ty/lift/push/websocket/handler/TimeyMessageHandler.java

@@ -41,7 +41,7 @@ public class TimeyMessageHandler implements WebSocketHandler {
     public void afterConnectionEstablished(WebSocketSession session) {
         //用户登录连接后，将用户id放入到在线用户列表中
         Long userId = getCurrentUser(session);
-        if (userId == null) {
+        if (userId != null) {
             users.put(userId, session);
             //获取用户实时消息
             List<TimeMessage> TimeMessageList = timeMessageService.list(new QueryWrapper<TimeMessage>()

lift-push-pc/src/main/resources/application-prod.yml

@@ -5,6 +5,20 @@ spring:
     password: Tdkg-13250409
     driver-class-name: com.mysql.cj.jdbc.Driver
 
+  #redis缓存配置
+  redis:
+    database: 0 #数据库索引，默认为0
+    host: r-bp1j7odydtfqtprdvm.redis.rds.aliyuncs.com #(内网地址，上线改为内网地址)服务器地址
+    port: 6379 #端口
+    password: Gdkc-290431 #验证密码
+    jedis:
+      pool:
+        max-active: 8 #最大连接数
+        max-idle: 8 #最大空闲链接
+        max-wait: 20000ms
+        min-idle: 0
+    timeout: 600000s
+
   # activemq配置
   activemq:
     #ActiveMQ通讯地址