From f4d1e8f5e01e12a90050d94e50571b9cb1ebe109 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 09:01:14 +0800
Subject: [PATCH] 灌溉模块4个接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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 a2e6483..7767226 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -4,6 +4,11 @@
             # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
             max-file-size: 500MB
             max-request-size: 5000MB
+    http:
+        client:
+            # spring restTemplate 瀵瑰http璁块棶鏃�
+            connect-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿
+            read-timeout: 3000 # 璇诲彇瓒呮椂鏃堕棿
 logging:
     charset:
         console: UTF-8
@@ -78,7 +83,7 @@
 
 pipIrr:
     global:
-        dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: true  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     nginx:
         root: E:/apps/pipIrr/nginx-1.27.0
@@ -335,11 +340,13 @@
     test:
         url: "http://127.0.0.1:8072"
         comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
-    #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
+    #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
     rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
-    #rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
+    #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
+    mwMsCenterReceiveUrl_rm: "http://127.0.0.1:8081/remote/msCenter/receive"
+    #rtu杩滅▼鍗囩骇鐘舵�佷俊鎭洖璋冨湴鍧�
     ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
-    #寰俊灏忕▼搴忓洖璋冨湴鍧�
+    #寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
     rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
 
 #涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
@@ -347,7 +354,9 @@
     urls:
         - /sso/sso
         - /remote/comRes/receive
+        - /remote/msCenter/receive
         - /remote/rtuUpgradeStateReceiver/receive
+        - /remote/websocket
         - /wx/comRes/receive
         - /app/captcha/get
         - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
@@ -403,7 +412,6 @@
 
 #闃�鎺у櫒鍙傛暟
 rtu:
-    batteryVolt: 17
     signalIntensity:
         weak: 10
         ordinary: 20

--
Gitblit v1.8.0