From 39be193dece5ad6314aa22a41a2c8675e8057be3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 15:19:36 +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(test测试系统).yml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index d0bc938..ee69901 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -313,18 +313,23 @@
     #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
     ym:
         comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+        ugTaskSendUrl: "http://127.0.0.1:8070/rtuMw/com/upgradeRtu"
         rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
         rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
     sp:
         comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
+        ugTaskSendUrl: "http://127.0.0.1:8073/rtuMw/com/upgradeRtu"
         rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
         rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
     test:
         comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
+        ugTaskSendUrl: "http://127.0.0.1:8072/rtuMw/com/upgradeRtu"
         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 +338,7 @@
     urls:
         - /sso/sso
         - /remote/comRes/receive
+        - /remote/rtuUpgradeStateReceiver/receive
         - /wx/comRes/receive
         - /app/captcha/get
         - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�

--
Gitblit v1.8.0