From 8739a65826f197156624880172983ca8faee4dfc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 17:15:20 +0800
Subject: [PATCH] 修改web文件功能中下载文件URL配置与生成方式
---
pms-parent/pms-global/src/main/resources/application-global.yml | 26 +++++++++++++-------------
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java | 8 ++++----
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
index 6392086..3228be2 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
@@ -68,7 +68,7 @@
fileNameGrp[1],
(frVo.getFileWebUrl() + frVo.getFileWebPath()),
fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()),
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -113,7 +113,7 @@
fileNameGrp[1],
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -159,7 +159,7 @@
fileNameGrp[1],
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -208,7 +208,7 @@
fileNameGrp[0], fileNameGrp[1],
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml
index f9f3ba4..82b38df 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -119,8 +119,8 @@
hashStart: 0
hashEnd: 5461
restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file鏄笂涓嬫枃
- webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞
- webDownloadPath: /download/down?id= #瀹為檯涓嬭浇webUrl= restUrl + webDownloadPath
+ webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞锛屽畨瑁呴儴缃叉椂IP鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -129,7 +129,7 @@
hashEnd: 10923
restUrl: http://127.0.0.1:${pms.file2.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
sv3:
id: dyFile3
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -138,7 +138,7 @@
hashEnd: 16385
restUrl: http://127.0.0.1:${pms.file3.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
sv4:
id: dyFile4
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -147,7 +147,7 @@
hashEnd: 21847
restUrl: http://127.0.0.1:${pms.file4.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
sv5:
id: dyFile5
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -156,7 +156,7 @@
hashEnd: 27309
restUrl: http://127.0.0.1:${pms.file5.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
sv6:
id: dyFile6
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -165,7 +165,7 @@
hashEnd: 32767
restUrl: http://127.0.0.1:${pms.file6.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
sv7:
id: dyFile7
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -174,7 +174,7 @@
hashEnd: 38229
restUrl: http://127.0.0.1:${pms.file7.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
sv8:
id: dyFile8
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -183,7 +183,7 @@
hashEnd: 43691
restUrl: http://127.0.0.1:${pms.file8.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
sv9:
id: dyFile9
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -192,7 +192,7 @@
hashEnd: 49153
restUrl: http://127.0.0.1:${pms.file9.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
sv10:
id: dyFile10
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -201,7 +201,7 @@
hashEnd: 54615
restUrl: http://127.0.0.1:${pms.file10.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
sv11:
id: dyFile11
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -210,7 +210,7 @@
hashEnd: 60077
restUrl: http://127.0.0.1:${pms.file11.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
sv12:
id: dyFile12
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -219,4 +219,4 @@
hashEnd: 65535
restUrl: http://127.0.0.1:${pms.file12.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=
--
Gitblit v1.8.0