From b1bfa089b5b299c1c3c71094e450748a5e5e8a75 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Aug 2023 15:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' into dev
---
screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 c4f6e0a..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
@@ -1,7 +1,12 @@
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;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
/**
@@ -18,4 +23,11 @@
public ServerEndpointExporter serverEndpointExporter(){
return new ServerEndpointExporter();
}
+
+ @Autowired
+ public void setMessageService(RedisTemplate redisTemplate){
+ SingleDeviceServer.redisTemplate = redisTemplate;
+ CruiserWebSocketServer.redisTemplate = redisTemplate;
+ }
+
}
--
Gitblit v1.8.0