From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
index 7eea775..f4ef56c 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttToolService.java
@@ -14,7 +14,6 @@
private MqttConfig config;
@Autowired
private MqttPushCallback callBack ;
-
/**
* 璁㈤槄娑堟伅锛屽惎鍔ㄥ姞杞戒竴娆�
* @param topics
@@ -25,8 +24,13 @@
int[] Qos = new int[topics.length];//0锛氭渶澶氫竴娆� 銆�1锛氭渶灏戜竴娆� 銆�2锛氬彧鏈変竴娆�
for (int i = 0; i < Qos.length; i++) {
Qos[i] = 1;
+ /*if(i ==2){
+ Qos[i] = 2;
+ }else{
+ Qos[i] = 1;
+ }*/
}
- MqttClientInit.getInstance(config,callBack).subscribe(topics, Qos);
+ MqttClientInit.getSubInstance(config,callBack).subscribe(topics, Qos);
} catch (Exception e) {
e.printStackTrace();
}
@@ -39,10 +43,10 @@
public int pubMessage(String message,String topic){
MqttMessage mess = new MqttMessage();
mess.setQos(1);
- mess.setRetained(true);
+ mess.setRetained(false);
mess.setPayload(message.getBytes());
try {
- MqttClientInit.getInstance(config,callBack).publish(topic, mess);
+ MqttClientInit.getInstance(config).publish(topic, mess);
return 0;
} catch (Exception e) {
//LOGGER.error(e.getLocalizedMessage());
--
Gitblit v1.9.3