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(mj梅江系统).yml |   98 +++++++++++++++++++++++++------------------------
 1 files changed, 50 insertions(+), 48 deletions(-)

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 #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
         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
 
 #閽夐拤娑堟伅鎺ㄩ��

--
Gitblit v1.8.0