From c6730faba09365bc31dba0e97d462ad542c577bf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 24 六月 2025 17:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global(166web文件花生壳).yml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
index bc9864b..808d0b3 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
@@ -146,6 +146,10 @@
         webPort: 8089
         actutorPort: 9089
         idSuffix: 11
+    terminal:
+        webPort: 8090
+        actutorPort: 9090
+        idSuffix: 12
     # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
     temp:
         webPort: 8099
@@ -359,6 +363,8 @@
         comSendUrl: "http://127.0.0.1:8105/rtuMw/com/send"
     #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
     rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+    #MQTT杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
+    mqttCallbackUrl_rm: "http://127.0.0.1:8081/remote/mqttRes/receive"
     #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
     mwMsCenterReceiveUrl_rm: "http://127.0.0.1:8081/remote/msCenter/receive"
     #rtu杩滅▼鍗囩骇鐘舵�佷俊鎭洖璋冨湴鍧�

--
Gitblit v1.8.0