From b1384c4959a4486d391369c4e7a58c4b4b0e9b9c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 13 十一月 2024 17:41:23 +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 | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 46e2aab..5e8b483 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -1,3 +1,9 @@
+spring:
+ servlet:
+ multipart:
+ # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
+ max-file-size: 500MB
+ max-request-size: 5000MB
logging:
charset:
console: UTF-8
@@ -76,8 +82,8 @@
nginx:
webPort: 54321
mw:
- webPort: 8070
- actutorPort: 9070
+ webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+ actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
idSuffix: 0
sso:
cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
@@ -289,7 +295,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -307,18 +313,23 @@
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
ym:
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+ ugTaskSendUrl: "http://127.0.0.1:8070/rtuMw/com/upgradeRtu"
rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- pj:
- comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
- rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
+ sp:
+ comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
+ ugTaskSendUrl: "http://127.0.0.1:8073/rtuMw/com/upgradeRtu"
+ rtuLogFileUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogFile"
+ rtuLogTextUrl: "http://127.0.0.1:8073/rtuMw/com/rtuLogText"
test:
comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
+ ugTaskSendUrl: "http://127.0.0.1:8072/rtuMw/com/upgradeRtu"
rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+ #rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
+ ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
#寰俊灏忕▼搴忓洖璋冨湴鍧�
rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
@@ -327,9 +338,11 @@
urls:
- /sso/sso
- /remote/comRes/receive
+ - /remote/rtuUpgradeStateReceiver/receive
- /wx/comRes/receive
- /app/captcha/get
- /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+ - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
@@ -346,7 +359,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
--
Gitblit v1.8.0