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(166web文件花生壳).yml |   88 ++++++++++++++++++++++++--------------------
 1 files changed, 48 insertions(+), 40 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
index 52b898c..7e9473f 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050166web\346\226\207\344\273\266\350\212\261\347\224\237\345\243\263\051.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
@@ -190,107 +195,107 @@
 dy:
     photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
     webFile:
-        fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+        fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
         supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
         sv1:
             id: dyFile1
-            absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
+            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile1
             hashStart: 0
             hashEnd: 5461
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+            restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
             webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
             webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv2:
             id: dyFile2
-            absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
+            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile2
             hashStart: 5462
             hashEnd: 10923
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv3:
             id: dyFile3
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile3
             hashStart: 10924
             hashEnd: 16385
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv4:
             id: dyFile4
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile4
             hashStart: 16386
             hashEnd: 21847
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv5:
             id: dyFile5
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile5
             hashStart: 21848
             hashEnd: 27309
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv6:
             id: dyFile6
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile6
             hashStart: 27310
             hashEnd: 32767
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv7:
             id: dyFile7
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile7
             hashStart: 32768
             hashEnd: 38229
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv8:
             id: dyFile8
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile8
             hashStart: 38230
             hashEnd: 43691
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv9:
             id: dyFile9
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile9
             hashStart: 43692
             hashEnd: 49153
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv10:
             id: dyFile10
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile10
             hashStart: 49154
             hashEnd: 54615
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv11:
             id: dyFile11
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
             relativePath: webFile11
             hashStart: 54616
             hashEnd: 60077
-            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
+            restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv12:
             id: dyFile12
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -298,8 +303,8 @@
             hashStart: 60078
             hashEnd: 65535
             restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
-            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
-            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file12.webPort}/file/download/down?id=
+            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
 
 #椤圭洰缂栧彿
 #projectCode:
@@ -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