From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/config/WebSocketConfig.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index dd57a2a..5f40f0d 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -2,7 +2,6 @@
 
 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;
 
@@ -12,7 +11,6 @@
 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 {
@@ -33,11 +31,9 @@
         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