From 04779efe2410fb0df1ff983b26384d56471b85cf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 08 十一月 2024 08:50:52 +0800
Subject: [PATCH] RTU远程升级管理及相关代码适应性调整与修改
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 221 insertions(+), 15 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 fc10859..7564bf5 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
@@ -68,15 +74,16 @@
lazy-load-trigger-methods: "" # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
- type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler
pipIrr:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ nginx:
+ webPort: 54321
mw:
- webPort: 8070
- actutorPort: 9070
+ webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+ actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
idSuffix: 0
sso:
cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
@@ -129,10 +136,166 @@
webPort: 8089
actutorPort: 9089
idSuffix: 11
+
+ file:
+ idSuffix: 99
+ file1:
+ webPort: 8180
+ actutorPort: 9180
+ file2:
+ webPort: 8180
+ actutorPort: 9180
+ file3:
+ webPort: 8180
+ actutorPort: 9180
+ file4:
+ webPort: 8180
+ actutorPort: 9180
+ file5:
+ webPort: 8180
+ actutorPort: 9180
+ file6:
+ webPort: 8180
+ actutorPort: 9180
+ file7:
+ webPort: 8180
+ actutorPort: 9180
+ file8:
+ webPort: 8180
+ actutorPort: 9180
+ file9:
+ webPort: 8180
+ actutorPort: 9180
+ file10:
+ webPort: 8180
+ actutorPort: 9180
+ file11:
+ webPort: 8180
+ actutorPort: 9180
+ file12:
+ webPort: 8180
+ actutorPort: 9180
+
+
+#web鍒嗗竷寮忔枃浠剁郴缁�
+dy:
+ photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
+ webFile:
+ fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+ sv1:
+ id: dyFile1
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile1
+ hashStart: 0
+ hashEnd: 5461
+ restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ sv2:
+ id: dyFile2
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile2
+ hashStart: 5462
+ hashEnd: 10923
+ restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file2.webPort}/file/download/down?id=
+ sv3:
+ id: dyFile3
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile3
+ hashStart: 10924
+ hashEnd: 16385
+ restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file3.webPort}/file/download/down?id=
+ sv4:
+ id: dyFile4
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile4
+ hashStart: 16386
+ hashEnd: 21847
+ restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file4.webPort}/file/download/down?id=
+ sv5:
+ id: dyFile5
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile5
+ hashStart: 21848
+ hashEnd: 27309
+ restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file5.webPort}/file/download/down?id=
+ sv6:
+ id: dyFile6
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile6
+ hashStart: 27310
+ hashEnd: 32767
+ restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file6.webPort}/file/download/down?id=
+ sv7:
+ id: dyFile7
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile7
+ hashStart: 32768
+ hashEnd: 38229
+ restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file7.webPort}/file/download/down?id=
+ sv8:
+ id: dyFile8
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile8
+ hashStart: 38230
+ hashEnd: 43691
+ restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file8.webPort}/file/download/down?id=
+ sv9:
+ id: dyFile9
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile9
+ hashStart: 43692
+ hashEnd: 49153
+ restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file9.webPort}/file/download/down?id=
+ sv10:
+ id: dyFile10
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile10
+ hashStart: 49154
+ hashEnd: 54615
+ restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file10.webPort}/file/download/down?id=
+ sv11:
+ id: dyFile11
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile11
+ hashStart: 54616
+ hashEnd: 60077
+ restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file11.webPort}/file/download/down?id=
+ sv12:
+ id: dyFile12
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile12
+ hashStart: 60078
+ hashEnd: 65535
+ restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
+ 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:
@@ -144,14 +307,22 @@
divisionCode: 120114403100
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
ym:
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"
sp:
- comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
+ 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"
+ 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"
#寰俊灏忕▼搴忓洖璋冨湴鍧�
@@ -163,16 +334,51 @@
- /sso/sso
- /remote/comRes/receive
- /wx/comRes/receive
+ - /app/captcha/get
+ - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+ - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
+
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 17 #寮�濮嬪皬鏃� 0
- startMinute: 19 #寮�濮嬪垎閽� 5
+ startHour: 0 #寮�濮嬪皬鏃� 0
+ startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
dingtalk:
- robot:
- url: https://oapi.dingtalk.com/robot/send
- access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
- secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
- at-all: true
- mobile: 18602657034
\ No newline at end of file
+ ym:
+ 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
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ test:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+
+#闃�鎺у櫒鍙傛暟
+rtu:
+ batteryVolt: 17
+ signalIntensity:
+ weak: 10
+ ordinary: 20
+# strong: 20
+
+#铏氭嫙鍗￠厤缃弬鏁�
+vc:
+ #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
+ alarmValue: 10
\ No newline at end of file
--
Gitblit v1.8.0