From 11bb93e34b91a8ba4c5588dbe907988a1f279859 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:06:00 +0800
Subject: [PATCH] 增加新的websocket版本

---
 src/main/java/com/moral/config/WebSocketConfig.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 5f40f0d..a021668 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -2,15 +2,14 @@
 
 import com.moral.service.DeviceService;
 import com.moral.service.SensorService;
-import com.moral.webSocketServer.BSWebsocketServer;
-import com.moral.webSocketServer.WebSocketServer;
+import com.moral.webSocketServer.*;
 
-import com.moral.webSocketServer.WebSocketServerNew;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
@@ -31,10 +30,14 @@
         WebSocketServer.deviceService=deviceService;
         WebSocketServerNew.deviceService=deviceService;
         BSWebsocketServer.deviceService=deviceService;
+        BSAQIWebSocketServer.deviceService=deviceService;
+        BSAQIWebSocketServerTest.deviceService=deviceService;
     }
     @Autowired
     public void setSensorService( SensorService sensorService){
         BSWebsocketServer.sensorService=sensorService;
+        BSAQIWebSocketServer.sensorService=sensorService;
+        BSAQIWebSocketServerTest.sensorService=sensorService;
     }
 
 }

--
Gitblit v1.8.0