From 97777b835192d6f0fedc8fec397fa52a382328cc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 25 三月 2025 10:18:17 +0800
Subject: [PATCH] 调整application.yml配置文件的结构,以支持多服务器多子系统的方便配置切换

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global(166web文件花生壳).yml |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 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 59cb80b..bc9864b 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"
@@ -1,9 +1,16 @@
 spring:
+    main:
+        allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
     servlet:
         multipart:
             # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
             max-file-size: 500MB
             max-request-size: 5000MB
+    http:
+        client:
+            # spring restTemplate 瀵瑰http璁块棶鏃�
+            connect-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿
+            read-timeout: 3000 # 璇诲彇瓒呮椂鏃堕棿
 logging:
     charset:
         console: UTF-8
@@ -326,17 +333,34 @@
     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"
+    #鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
+    mwMsCenterReceiveUrl_rm: "http://127.0.0.1:8081/remote/msCenter/receive"
     #rtu杩滅▼鍗囩骇鐘舵�佷俊鎭洖璋冨湴鍧�
     ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
     #寰俊灏忕▼搴忓簲鐢ㄤ腑Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
@@ -347,6 +371,7 @@
     urls:
         - /sso/sso
         - /remote/comRes/receive
+        - /remote/msCenter/receive
         - /remote/rtuUpgradeStateReceiver/receive
         - /remote/websocket
         - /wx/comRes/receive

--
Gitblit v1.8.0