From d2b21bc8fd32da4ac29518a0c07f95c140f287b3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Oct 2020 14:47:07 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/config/WebSocketConfig.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 71ac2eb..dd57a2a 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,18 +1,24 @@
package com.moral.config;
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;
+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 {
- /* @Bean
+ //���������������������������������
+ /*@Bean
public ServerEndpointExporter serverEndpointExporter() {
return new ServerEndpointExporter();
}*/
@@ -25,6 +31,14 @@
@Autowired
public void setMessageService(DeviceService deviceService){
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