From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
index 92a8106..6ad0cc7 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
@@ -19,7 +19,7 @@
             try {
                 // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
 //                String clientId =config.getClientid()+ Constants.getUUID();
-                String clientId =config.getClientid()+"009";
+                String clientId =config.getClientid()+"001";
                 client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                 // MQTT鐨勮繛鎺ヨ缃�
                 MqttConnectOptions   options = new MqttConnectOptions();
@@ -51,7 +51,7 @@
             try {
                 // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
 //                String clientId =config.getClientid()+ Constants.getUUID();
-                String clientId =config.getSubclientid();
+                String clientId =config.getSubclientid()+"001";
                 subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                 // MQTT鐨勮繛鎺ヨ缃�
                 MqttConnectOptions   options = new MqttConnectOptions();

--
Gitblit v1.9.3