From de2fafa2e1fc28b7f1780b5ebb27feaeed0ef0c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 06 一月 2025 15:36:45 +0800
Subject: [PATCH] 1、王江海协议上线解析中未把版本号放入IoSession中的问题解决； 2、配置文件调整与统一
---
pipIrr-platform/pipIrr-global/src/main/resources/application-global(166web文件花生壳).yml | 98 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml | 98 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 98 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global(mq民勤系统).yml | 96 ++++---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/OnLineV202404.java | 1
pipIrr-platform/pipIrr-global/src/main/resources/application-global(mj梅江系统).yml | 98 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 98 ++++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global(sp沙盘系统).yml | 98 ++++----
8 files changed, 350 insertions(+), 335 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/OnLineV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/OnLineV202404.java
index 70571ed..27612b2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/OnLineV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/OnLineV202404.java
@@ -34,6 +34,7 @@
olr.result = OnLine.OnLineAction_success ;
olr.rtuAddr = cp.parseRtuAddr(upBuf) ;
olr.protocolName = ProtocolConstantV206V202404.protocolName ;
+ olr.protocolVersion = ProtocolConstantV206V202404.protocolVer ;
}
return olr;
}
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 b0e9a6f..52b898c 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"
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
- webPort: 19913
+ root: E:/apps/pipIrr/nginx-1.27.0
+ webPort: 54321
+ webFilePort: 19913
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
relativePath: webFile1
hashStart: 0
hashEnd: 5461
- restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
relativePath: webFile2
hashStart: 5462
hashEnd: 10923
- restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file2.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile3
hashStart: 10924
hashEnd: 16385
- restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file3.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile4
hashStart: 16386
hashEnd: 21847
- restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file4.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile5
hashStart: 21848
hashEnd: 27309
- restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file5.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile6
hashStart: 27310
hashEnd: 32767
- restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file6.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile7
hashStart: 32768
hashEnd: 38229
- restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file7.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile8
hashStart: 38230
hashEnd: 43691
- restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
- webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file8.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile9
hashStart: 43692
hashEnd: 49153
- restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file9.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile10
hashStart: 49154
hashEnd: 54615
- restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file10.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile11
hashStart: 54616
hashEnd: 60077
- restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file11.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile12
hashStart: 60078
hashEnd: 65535
restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
index 767216c..39a0c28 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
+ root: D:/apps/pipIrr/nginx-1.27.0
webPort: 54321
+ webFilePort: 64321
mw:
webPort: 8071 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9071 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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/
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
@@ -353,7 +355,7 @@
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃� 0
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
index d37f961..2cd9e15 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
+ root: D:/apps/pipIrr/nginx-1.27.0
webPort: 54321
+ webFilePort: 64321
mw:
webPort: 8100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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/
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
index 389c68f..cfae501 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
+ root: D:/apps/pipIrr/nginx-1.27.0
webPort: 54321
+ webFilePort: 64321
mw:
webPort: 8073 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9073 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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/
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
@@ -353,7 +355,7 @@
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃� 0
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
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 831cb7f..a2765e7 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"
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
+ root: D:/apps/pipIrr/nginx-1.27.0
webPort: 54321
+ webFilePort: 64321
mw:
webPort: 8072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9072 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
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鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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/
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
@@ -353,7 +355,7 @@
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃� 0
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index 9d6d2be..c642e7a 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
+ root: D:/apps/pipIrr/nginx-1.27.0
webPort: 54321
+ webFilePort: 64321
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
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鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/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/
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
@@ -353,7 +355,7 @@
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
- startHour: 0 #寮�濮嬪皬鏃� 0
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
startMinute: 5 #寮�濮嬪垎閽� 5
#閽夐拤娑堟伅鎺ㄩ��
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 b0e9a6f..52b898c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -81,7 +81,9 @@
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
- webPort: 19913
+ root: E:/apps/pipIrr/nginx-1.27.0
+ webPort: 54321
+ webFilePort: 19913
mw:
webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -188,115 +190,115 @@
dy:
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
- fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
relativePath: webFile1
hashStart: 0
hashEnd: 5461
- restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #鎵�鏈塻v*鐨勫畨瑁呰矾寰勬渶濂戒竴鏍凤紝杩欐牱灏卞彲浠ョ粺涓�閰嶇疆浜�
relativePath: webFile2
hashStart: 5462
hashEnd: 10923
- restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file2.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv3:
id: dyFile3
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile3
hashStart: 10924
hashEnd: 16385
- restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file3.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv4:
id: dyFile4
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile4
hashStart: 16386
hashEnd: 21847
- restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file4.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv5:
id: dyFile5
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile5
hashStart: 21848
hashEnd: 27309
- restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file5.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv6:
id: dyFile6
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile6
hashStart: 27310
hashEnd: 32767
- restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file6.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv7:
id: dyFile7
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile7
hashStart: 32768
hashEnd: 38229
- restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file7.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv8:
id: dyFile8
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile8
hashStart: 38230
hashEnd: 43691
- restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
- webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file8.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv9:
id: dyFile9
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile9
hashStart: 43692
hashEnd: 49153
- restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file9.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv10:
id: dyFile10
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile10
hashStart: 49154
hashEnd: 54615
- restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file10.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv11:
id: dyFile11
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile11
hashStart: 54616
hashEnd: 60077
- restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
- webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file11.webPort}/file/download/down?id=
+ restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
+ webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
sv12:
id: dyFile12
- absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
+ absolutePath: ${pipIrr.nginx.root}/html/webfiles/
relativePath: webFile12
hashStart: 60078
hashEnd: 65535
restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
- webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
+ webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file12.webPort}/file/download/down?id=
#椤圭洰缂栧彿
--
Gitblit v1.8.0