From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java | 4 ++--
1 files changed, 2 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 9189321..fc13249 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,7 +1,7 @@
package com.moral.api.config.websocket;
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 +25,7 @@
@Autowired
public void setMessageService(RedisTemplate redisTemplate){
- SingleDeviceServer.redisTemplate = redisTemplate;
+ // SingleDeviceServer.redisTemplate = redisTemplate;
CruiserWebSocketServer.redisTemplate = redisTemplate;
}
--
Gitblit v1.8.0