From 11999481fbcdacd6425217cd89c21ac17579ea7a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 17 Dec 2020 15:57:31 +0800
Subject: [PATCH] 删除打印
---
src/main/java/com/moral/config/WebSocketConfig.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 6426c78..824d0d3 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,9 +1,10 @@
package com.moral.config;
+import com.moral.service.AccountService;
import com.moral.service.DeviceService;
-import com.moral.webSocketServer.WebSocketServer;
+import com.moral.service.SensorService;
+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;
@@ -14,10 +15,11 @@
@Configuration
public class WebSocketConfig {
- @Bean
+ //���������������������������������
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
- }
+ }*/
@Bean
public MessageConverter jsonMessageConverter() {
@@ -28,6 +30,20 @@
public void setMessageService(DeviceService deviceService){
WebSocketServer.deviceService=deviceService;
WebSocketServerNew.deviceService=deviceService;
+ BSWebsocketServer.deviceService=deviceService;
+ BSAQIWebSocketServer.deviceService=deviceService;
+ BSAQIWebSocketServerTest.deviceService=deviceService;
+ }
+ @Autowired
+ public void setMessageService(AccountService accountService){
+ ElectronicSWebSocketServer.accountService=accountService;
+ }
+ @Autowired
+ public void setSensorService( SensorService sensorService){
+ BSWebsocketServer.sensorService=sensorService;
+ BSAQIWebSocketServer.sensorService=sensorService;
+ ElectronicSWebSocketServer.sensorService=sensorService;
+ BSAQIWebSocketServerTest.sensorService=sensorService;
}
}
--
Gitblit v1.8.0