From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:18:51 +0800
Subject: [PATCH] 整理版本

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |  143 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 100 insertions(+), 43 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 7e9473f..2fffebe 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -1,4 +1,6 @@
 spring:
+    main:
+        allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
     servlet:
         multipart:
             # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
@@ -86,12 +88,12 @@
         dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     nginx:
-        root: E:/apps/pipIrr/nginx-1.27.0
+        root: D:/apps/pipIrr/nginx-1.27.0
         webPort: 54321
-        webFilePort: 19913
+        webFilePort: 64321
     mw:
-        webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
-        actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+        webPort: ${common.pipIrr_mw_webPort} #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+        actutorPort: ${common.pipIrr_mw_actutorPort} #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
         idSuffix: 0
     sso:
         cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
@@ -204,8 +206,8 @@
             hashStart: 0
             hashEnd: 5461
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv2:
             id: dyFile2
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -213,8 +215,8 @@
             hashStart: 5462
             hashEnd: 10923
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv3:
             id: dyFile3
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -222,8 +224,8 @@
             hashStart: 10924
             hashEnd: 16385
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv4:
             id: dyFile4
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -231,8 +233,8 @@
             hashStart: 16386
             hashEnd: 21847
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv5:
             id: dyFile5
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -240,8 +242,8 @@
             hashStart: 21848
             hashEnd: 27309
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv6:
             id: dyFile6
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -249,8 +251,8 @@
             hashStart: 27310
             hashEnd: 32767
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv7:
             id: dyFile7
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -258,8 +260,8 @@
             hashStart: 32768
             hashEnd: 38229
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv8:
             id: dyFile8
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -267,8 +269,8 @@
             hashStart: 38230
             hashEnd: 43691
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv9:
             id: dyFile9
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -276,8 +278,8 @@
             hashStart: 43692
             hashEnd: 49153
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv10:
             id: dyFile10
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -285,8 +287,8 @@
             hashStart: 49154
             hashEnd: 54615
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv11:
             id: dyFile11
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -294,8 +296,8 @@
             hashStart: 54616
             hashEnd: 60077
             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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
         sv12:
             id: dyFile12
             absolutePath: ${pipIrr.nginx.root}/html/webfiles/
@@ -303,8 +305,8 @@
             hashStart: 60078
             hashEnd: 65535
             restUrl: http://127.0.0.1:${pipIrr.file12.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鎴栧煙鍚�
+            webUrl: http://8.130.130.233:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+            webDownloadPath: http://8.130.130.233:${pipIrr.nginx.webPort}/file/download/down?id=  #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
 
 #椤圭洰缂栧彿
 #projectCode:
@@ -331,15 +333,30 @@
     mj:
         url: "http://127.0.0.1:8071"
         comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
-    mq:
-        url: "http://127.0.0.1:8100"
-        comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
     sp:
         url: "http://127.0.0.1:8073"
         comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
     test:
         url: "http://127.0.0.1:8072"
         comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
+    mq:
+        url: "http://127.0.0.1:8100"
+        comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
+    yq:
+        url: "http://127.0.0.1:8101"
+        comSendUrl: "http://127.0.0.1:8101/rtuMw/com/send"
+    hlj:
+        url: "http://127.0.0.1:8102"
+        comSendUrl: "http://127.0.0.1:8102/rtuMw/com/send"
+    gz:
+        url: "http://127.0.0.1:8103"
+        comSendUrl: "http://127.0.0.1:8103/rtuMw/com/send"
+    lz:
+        url: "http://127.0.0.1:8104"
+        comSendUrl: "http://127.0.0.1:8104/rtuMw/com/send"
+    jc:
+        url: "http://127.0.0.1:8105"
+        comSendUrl: "http://127.0.0.1:8105/rtuMw/com/send"
     #Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
     rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
     #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
@@ -370,7 +387,7 @@
 #閽夐拤娑堟伅鎺ㄩ��
 dingtalk:
     ym:
-        enable: true #鏄惁鍚敤
+        enable: false #鏄惁鍚敤
         robot:
             url: https://oapi.dingtalk.com/robot/send
             access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
@@ -378,15 +395,7 @@
         at-all: true
         mobile: 18602657034
     mj:
-        enable: true #鏄惁鍚敤
-        robot:
-            url: https://oapi.dingtalk.com/robot/send
-            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
-            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
-        at-all: true
-        mobile: 18602657034
-    mq:
-        enable: true #鏄惁鍚敤
+        enable: false #鏄惁鍚敤
         robot:
             url: https://oapi.dingtalk.com/robot/send
             access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
@@ -394,7 +403,7 @@
         at-all: true
         mobile: 18602657034
     sp:
-        enable: true #鏄惁鍚敤
+        enable: false #鏄惁鍚敤
         robot:
             url: https://oapi.dingtalk.com/robot/send
             access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
@@ -402,7 +411,55 @@
         at-all: true
         mobile: 18602657034
     test:
-        enable: true #鏄惁鍚敤
+        enable: false #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    mq:
+        enable: false #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    yq:
+        enable: false #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    hlj:
+        enable: false #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    gz:
+        enable: false #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    lz:
+        enable: false #鏄惁鍚敤
+        robot:
+            url: https://oapi.dingtalk.com/robot/send
+            access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+            secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+        at-all: true
+        mobile: 18602657034
+    jc:
+        enable: false #鏄惁鍚敤
         robot:
             url: https://oapi.dingtalk.com/robot/send
             access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f

--
Gitblit v1.8.0