From 040d2e6579bceff1b7cb54b2d06a9e9c958618d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 十二月 2024 15:46:45 +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(test测试系统).yml | 106 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 39 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index 4fac75c..966c67a 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -1,3 +1,9 @@
+spring:
+ servlet:
+ multipart:
+ # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
+ max-file-size: 500MB
+ max-request-size: 5000MB
logging:
charset:
console: UTF-8
@@ -59,7 +65,8 @@
#type-aliases-package: com.dy.pipIrrGlobal.daoBa
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
- log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl
+ #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
+ print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
@@ -73,9 +80,11 @@
global:
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ nginx:
+ webPort: 54321
mw:
- webPort: 8072
- actutorPort: 9072
+ webPort: 8072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+ actutorPort: 9072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
idSuffix: 0
sso:
cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
@@ -128,46 +137,51 @@
webPort: 8089
actutorPort: 9089
idSuffix: 11
+ # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
+ temp:
+ webPort: 8099
+ actutorPort: 9099
+ idSuffix: 98
-
+ # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
file:
idSuffix: 99
file1:
webPort: 8180
actutorPort: 9180
file2:
- webPort: 8181
- actutorPort: 9181
+ webPort: 8180
+ actutorPort: 9180
file3:
- webPort: 8182
- actutorPort: 9182
+ webPort: 8180
+ actutorPort: 9180
file4:
- webPort: 8183
- actutorPort: 9183
+ webPort: 8180
+ actutorPort: 9180
file5:
- webPort: 8184
- actutorPort: 9184
+ webPort: 8180
+ actutorPort: 9180
file6:
- webPort: 8185
- actutorPort: 9185
+ webPort: 8180
+ actutorPort: 9180
file7:
- webPort: 8186
- actutorPort: 9186
+ webPort: 8180
+ actutorPort: 9180
file8:
- webPort: 8187
- actutorPort: 9187
+ webPort: 8180
+ actutorPort: 9180
file9:
- webPort: 8188
- actutorPort: 9188
+ webPort: 8180
+ actutorPort: 9180
file10:
- webPort: 8189
- actutorPort: 9189
+ webPort: 8180
+ actutorPort: 9180
file11:
- webPort: 8190
- actutorPort: 9190
+ webPort: 8180
+ actutorPort: 9180
file12:
- webPort: 8191
- actutorPort: 9191
+ webPort: 8180
+ actutorPort: 9180
#web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +189,7 @@
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
- supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -285,11 +299,10 @@
webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
-
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -301,24 +314,26 @@
divisionCode: 120114403100
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
- #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
ym:
+ url: "http://127.0.0.1:8070"
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
- rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- pj:
+ mj:
+ url: "http://127.0.0.1:8071"
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:
+ 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"
- 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,8 +342,12 @@
urls:
- /sso/sso
- /remote/comRes/receive
+ - /remote/rtuUpgradeStateReceiver/receive
- /wx/comRes/receive
- /app/captcha/get
+ - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+ - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
+
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
startHour: 0 #寮�濮嬪皬鏃� 0
@@ -344,7 +363,15 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ mj:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
@@ -360,6 +387,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+
#闃�鎺у櫒鍙傛暟
rtu:
batteryVolt: 17
--
Gitblit v1.8.0