From e6a8f8388901749b66a36c0b5e5f2984efcea7e6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:03:46 +0800
Subject: [PATCH] 增加新的websocket，取消中文转化参数功能。
---
src/main/java/com/moral/config/WebSocketConfig.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 0f071cb..a021668 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -2,10 +2,8 @@
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;
@@ -17,7 +15,7 @@
public class WebSocketConfig {
//���������������������������������
- /* @Bean
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
}*/
@@ -32,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