From 171439bcb3b5e4a636bbb81a93d61396f6e2940e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 17 二月 2025 17:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 07abef9..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,12 +83,12 @@
pipIrr:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
root: E:/apps/pipIrr/nginx-1.27.0
webPort: 54321
- webFilePort: 64321
+ webFilePort: 19913
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -337,6 +342,8 @@
comSendUrl: "http://127.0.0.1:8072/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 +354,7 @@
urls:
- /sso/sso
- /remote/comRes/receive
+ - /remote/msCenter/receive
- /remote/rtuUpgradeStateReceiver/receive
- /remote/websocket
- /wx/comRes/receive
--
Gitblit v1.8.0