From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 十二月 2024 16:59:34 +0800 Subject: [PATCH] (1)升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败; (2)升级状态向Remote模块通知时,当升级任务结束后,仍要向remote模块通知可配置的次数; --- pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 17 +++++------------ 1 files changed, 5 insertions(+), 12 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 060f8de..e4f3b7d 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml @@ -77,7 +77,7 @@ pipIrr: global: - dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse + dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О nginx: webPort: 54321 @@ -310,22 +310,16 @@ #閫氳涓棿浠剁浉鍏抽厤缃� #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://192.168.40.132: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杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃 @@ -375,7 +369,6 @@ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7 at-all: true mobile: 18602657034 - #闃�鎺у櫒鍙傛暟 rtu: batteryVolt: 17 -- Gitblit v1.8.0