From 5d6b6da80413b1be06b62f232e366c07d171b4fc Mon Sep 17 00:00:00 2001 From: Wen JY Date: Fri, 15 Sep 2023 13:23:35 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20broker=E7=9B=91=E5=90=AC=E5=99=A8?= =?UTF-8?q?=E6=B3=A8=E5=85=A5=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?websocket=E6=97=A5=E5=BF=97=E7=B1=BB=E4=BF=AE=E6=94=B9final?= =?UTF-8?q?=E4=BF=AE=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hw/mqtt/listener/MqttServerMessageListener.java | 7 +++++-- .../java/com/hw/mqtt/listener/RedisMessageListener.java | 7 +++++-- .../java/com/hw/websocket/controller/WebSocketApi.java | 2 +- .../src/main/java/com/hw/websocket/operate/WebSocket.java | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/MqttServerMessageListener.java b/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/MqttServerMessageListener.java index f194479..157899c 100644 --- a/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/MqttServerMessageListener.java +++ b/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/MqttServerMessageListener.java @@ -23,10 +23,13 @@ import org.tio.core.ChannelContext; @Service public class MqttServerMessageListener implements IMqttMessageListener, SmartInitializingSingleton { private static final Logger logger = LoggerFactory.getLogger(MqttServerMessageListener.class); - @Autowired - private ApplicationContext applicationContext; + private final ApplicationContext applicationContext; private MqttServerTemplate mqttServerTemplate; + public MqttServerMessageListener(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + @Override public void onMessage(ChannelContext context, String clientId, String topic, MqttQoS qos, MqttPublishMessage message) { logger.info("context:{} clientId:{} message:{} payload:{}", context, clientId, message, ByteBufferUtil.toString(message.getPayload())); diff --git a/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/RedisMessageListener.java b/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/RedisMessageListener.java index 45a12f7..5d4b970 100644 --- a/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/RedisMessageListener.java +++ b/ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/listener/RedisMessageListener.java @@ -25,8 +25,11 @@ public class RedisMessageListener { private static final Logger logger = LoggerFactory.getLogger(RedisMessageListener.class); - @Autowired - private MqttServerTemplate mqttServerTemplate; + private final MqttServerTemplate mqttServerTemplate; + + public RedisMessageListener(MqttServerTemplate mqttServerTemplate) { + this.mqttServerTemplate = mqttServerTemplate; + } /** * 订阅设备控制信息、发布设备指令 diff --git a/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java b/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java index 780a025..6799a6b 100644 --- a/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java +++ b/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/controller/WebSocketApi.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; @RequestMapping("/webSocketApi") public class WebSocketApi { - private Logger logger = LoggerFactory.getLogger(WebSocketApi.class); + private final Logger logger = LoggerFactory.getLogger(WebSocketApi.class); @Resource private WebSocket webSocket; diff --git a/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/operate/WebSocket.java b/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/operate/WebSocket.java index eb8e8ac..6ce6b83 100644 --- a/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/operate/WebSocket.java +++ b/ruoyi-modules/hw-websocket-server/src/main/java/com/hw/websocket/operate/WebSocket.java @@ -20,7 +20,7 @@ import java.util.concurrent.CopyOnWriteArraySet; @ServerEndpoint("/websocket/{userId}") // 接口路径 ws://localhost:8087/webSocket/userId; public class WebSocket { - private Logger logger = LoggerFactory.getLogger(WebSocket.class); + private final Logger logger = LoggerFactory.getLogger(WebSocket.class); //与某个客户端的连接会话，需要通过它来给客户端发送数据 private Session session;