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/config/MqttClientInit.java | 6 ++---- 1 files changed, 2 insertions(+), 4 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 d71719c..7028dc9 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 @@ -18,8 +18,7 @@ } try { // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨 -// String clientId =config.getClientid()+ Constants.getUUID(); - String clientId =config.getClientid(); + String clientId =config.getClientid() +config.getVersion(); client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence()); // MQTT鐨勮繛鎺ヨ缃� MqttConnectOptions options = new MqttConnectOptions(); @@ -50,8 +49,7 @@ } try { // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨 -// String clientId =config.getClientid()+ Constants.getUUID(); - String clientId =config.getSubclientid(); + String clientId =config.getSubclientid() +config.getVersion(); subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence()); // MQTT鐨勮繛鎺ヨ缃� MqttConnectOptions options = new MqttConnectOptions(); -- Gitblit v1.9.3