From 77547e85cac1f2e9a02e770fb8dfb603d236c67a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 11:50:36 +0800
Subject: [PATCH] 1、取水口年月水量统计、农户年月用水量统计、取水口漏损年月统计存在bug,进行了修改; 2、生成新的pipIrr-web-temp临时任务模块,执行一些临时任务,例如删除数据库中一些出错的数据。

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 b4cbcac..8cd0186 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: true  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     nginx:
         webPort: 54321
@@ -136,7 +136,13 @@
         webPort: 8089
         actutorPort: 9089
         idSuffix: 11
+    # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
+    temp:
+        webPort: 8099
+        actutorPort: 9099
+        idSuffix: 98
 
+    # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
     file:
         idSuffix: 99
     file1:
@@ -310,21 +316,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 +338,7 @@
     urls:
         - /sso/sso
         - /remote/comRes/receive
+        - /remote/rtuUpgradeStateReceiver/receive
         - /wx/comRes/receive
         - /app/captcha/get
         - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�

--
Gitblit v1.8.0