From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/config/WebSocketConfig.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index 5ea4e3d..5bb5e61 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -33,6 +33,7 @@
WebSocketServerNew.deviceService=deviceService;
BSWebsocketServer.deviceService=deviceService;
BSAQIWebSocketServer.deviceService=deviceService;
+ BSAQIWebSocketServerTest.deviceService=deviceService;
}
@Autowired
public void setMessageService(AccountService accountService){
@@ -43,6 +44,8 @@
BSWebsocketServer.sensorService=sensorService;
BSAQIWebSocketServer.sensorService=sensorService;
ElectronicSWebSocketServer.sensorService=sensorService;
+ BSAQIWebSocketServerTest.sensorService=sensorService;
+ ElectronicSWebSocketServer.sensorService=sensorService;
}
@Autowired
public void setSensorUnitService( SensorUnitService sensorUnitService){
--
Gitblit v1.8.0