Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
2025-11-24 16:52:55 +08:00

View File

@@ -229,11 +229,11 @@ public class MqttServerHandler extends ChannelInboundHandlerAdapter {
if ("con".equals(topic)) { if ("con".equals(topic)) {
// 延迟 2 秒执行 // 延迟 2 秒执行
SCHEDULER.schedule(() -> sendResponseToClient(ctx, "处理成功"), 2, TimeUnit.SECONDS); SCHEDULER.schedule(() -> sendResponseToClient(ctx, "处理成功"), 2, TimeUnit.SECONDS);
try { // try {
deviceStatusManager.sendMqMsg(content); // deviceStatusManager.sendMqMsg(content);
} catch (Exception e) { // } catch (Exception e) {
log.error("发送消息异常:{}", e.getMessage()); // log.error("发送消息异常:{}", e.getMessage());
} // }
} }
// 按QoS等级回复确认重点实现QoS2 // 按QoS等级回复确认重点实现QoS2