From 0b91951c20f0022e131cd095293fee7534bce36a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 03 十二月 2024 11:30:41 +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(sp沙盘系统).yml | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
index d814934..0ca5332 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
@@ -310,26 +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"
- 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:
+ url: "http://127.0.0.1:8073"
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:
+ url: "http://127.0.0.1:8072"
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
+ ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
#寰俊灏忕▼搴忓洖璋冨湴鍧�
rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
--
Gitblit v1.8.0