From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/config/WebSocketConfig.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 565181b..df8b756 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -2,6 +2,7 @@
import com.moral.service.DeviceService;
import com.moral.service.SensorService;
+import com.moral.webSocketServer.BSAQIWebSocketServer;
import com.moral.webSocketServer.BSWebsocketServer;
import com.moral.webSocketServer.WebSocketServer;
@@ -17,10 +18,10 @@
public class WebSocketConfig {
//���������������������������������
- @Bean
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
- }
+ }*/
@Bean
public MessageConverter jsonMessageConverter() {
@@ -32,10 +33,12 @@
WebSocketServer.deviceService=deviceService;
WebSocketServerNew.deviceService=deviceService;
BSWebsocketServer.deviceService=deviceService;
+ BSAQIWebSocketServer.deviceService=deviceService;
}
@Autowired
public void setSensorService( SensorService sensorService){
BSWebsocketServer.sensorService=sensorService;
+ BSAQIWebSocketServer.sensorService=sensorService;
}
}
--
Gitblit v1.8.0