From e4d9487314cb32ed27bdcb027bbf43b4e1e3160f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 06 十二月 2024 13:40:18 +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.yml |   38 ++++++++------------------------------
 1 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 891eeb3..e7a60d0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -310,21 +310,20 @@
 #閫氳涓棿浠剁浉鍏抽厤缃�
 #protocol: DYJS_2023,DYJS_2024
 mw:
-    #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+    #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
     ym:
+        url: "http://127.0.0.1:8070"
         comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
-        rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
-        rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
     sp:
+        url: "http://127.0.0.1:8073"
         comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
-        rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
-        rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
     test:
+        url: "http://127.0.0.1:8072"
         comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
-        rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
-        rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
     #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
     rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+    #rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
+    ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
     #寰俊灏忕▼搴忓洖璋冨湴鍧�
     rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
 
@@ -333,6 +332,7 @@
     urls:
         - /sso/sso
         - /remote/comRes/receive
+        - /remote/rtuUpgradeStateReceiver/receive
         - /wx/comRes/receive
         - /app/captcha/get
         - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
@@ -381,26 +381,4 @@
 #铏氭嫙鍗¢厤缃弬鏁�
 vc:
     #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
-    alarmValue: 10
-
-rocketmq:
-    consumer:
-        group: consumer_group
-        # 涓�娆℃媺鍙栨秷鎭渶澶у�硷紝娉ㄦ剰鏄媺鍙栨秷鎭殑鏈�澶у�艰�岄潪娑堣垂鏈�澶у��
-        pull-batch-size: 10
-    name-server: 127.0.0.1:9876
-    producer:
-        # 鍙戦�佸悓涓�绫绘秷鎭殑璁剧疆涓哄悓涓�涓猤roup锛屼繚璇佸敮涓�
-        group: producer_group
-        # 鍙戦�佹秷鎭秴鏃舵椂闂达紝榛樿3000
-        sendMessageTimeout: 10000
-        # 鍙戦�佹秷鎭け璐ラ噸璇曟鏁帮紝榛樿2
-        retryTimesWhenSendFailed: 2
-        # 寮傛娑堟伅閲嶈瘯娆℃暟锛岄粯璁�2
-        retryTimesWhenSendAsyncFailed: 2
-        # 娑堟伅鏈�澶ч暱搴︼紝榛樿1024 * 1024 * 4(榛樿4M)
-        maxMessageSize: 4096
-        # 鍘嬬缉娑堟伅闃堝�硷紝榛樿4k(1024 * 4)
-        compressMessageBodyThreshold: 4096
-        # 鏄惁鍦ㄥ唴閮ㄥ彂閫佸け璐ユ椂閲嶈瘯鍙︿竴涓猙roker锛岄粯璁alse
-        retryNextServer: false
+    alarmValue: 10
\ No newline at end of file

--
Gitblit v1.8.0