From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/config/WebSocketConfig.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/config/WebSocketConfig.java b/src/main/java/com/moral/config/WebSocketConfig.java
index a021668..824d0d3 100644
--- a/src/main/java/com/moral/config/WebSocketConfig.java
+++ b/src/main/java/com/moral/config/WebSocketConfig.java
@@ -1,5 +1,6 @@
package com.moral.config;
+import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import com.moral.service.SensorService;
import com.moral.webSocketServer.*;
@@ -34,9 +35,14 @@
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