From 6dc7dc3670300ec7949f8134ab80166107b2f705 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 30 Aug 2023 09:30:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java b/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java
index 8e6393b..020d13b 100644
--- a/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java
+++ b/screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java
@@ -1,20 +1,24 @@
+/*
package com.moral.api.config.websocket;
+
+
import com.moral.api.websocket.SingleDeviceServer;
-import com.moral.constant.RedisConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+*/
/**
* @ClassName WebSocketConfig
* @Description TODO
* @Author ���������
* @Date 2021/6/15 13:53
* @Version TODO
- **/
+ **//*
+
@Configuration
public class WebSocketConfig {
@@ -26,5 +30,8 @@
@Autowired
public void setMessageService(RedisTemplate redisTemplate){
SingleDeviceServer.redisTemplate = redisTemplate;
+ CruiserWebSocketServer.redisTemplate = redisTemplate;
}
+
}
+*/
--
Gitblit v1.8.0