From 1b4c6718db46841cbfff33b26336f3d1e5cb19d4 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:31:50 +0800
Subject: [PATCH] update
---
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..dd57a2a 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.BSTestWebsocketServer;
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,9 +33,11 @@
WebSocketServer.deviceService=deviceService;
WebSocketServerNew.deviceService=deviceService;
BSWebsocketServer.deviceService=deviceService;
+ BSTestWebsocketServer.deviceService=deviceService;
}
@Autowired
public void setSensorService( SensorService sensorService){
+ BSTestWebsocketServer.sensorService=sensorService;
BSWebsocketServer.sensorService=sensorService;
}
--
Gitblit v1.8.0