From ecff6c40a1728c61c6a9a713df721b0eb31a616c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 13:12:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 fc13249..9b8f942 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
@@ -2,6 +2,7 @@
import com.moral.api.websocket.CruiserWebSocketServer;
+import com.moral.api.websocket.SingleDeviceServer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -25,7 +26,7 @@
@Autowired
public void setMessageService(RedisTemplate redisTemplate){
- // SingleDeviceServer.redisTemplate = redisTemplate;
+ SingleDeviceServer.redisTemplate = redisTemplate;
CruiserWebSocketServer.redisTemplate = redisTemplate;
}
--
Gitblit v1.8.0