From c53e77b9d88d69eafcb40f64351bcad8c766eda7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 八月 2025 09:37:17 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns

---
 ruoyi-admin-ztns/src/main/resources/application-ztns.yml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
index 7c90b2b..a266525 100644
--- a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
+++ b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
@@ -170,7 +170,7 @@
     keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
     qos: 1 # 蹇冭烦鍖呯骇鍒�
     completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
-    clientId: ztns # clientId
+    clientId: ztns01 # clientId
     subscribe: /ztt/v3/2455220/publish # 璁㈤槄涓婚
     client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
   - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
@@ -180,6 +180,6 @@
     keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
     qos: 1 # 蹇冭烦鍖呯骇鍒�
     completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
-    clientId: ztns # clientId
+    clientId: ztns02 # clientId
     subscribe: /ztt/v3/2455221/publish # 璁㈤槄涓婚
     client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�

--
Gitblit v1.9.3