From bb7ba94195bb3a28d77085e3958a97d3d69ad79f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 16:30:35 +0800
Subject: [PATCH] 1、web分布式文件系统文件下载路径生成逻辑不正确，进行修改
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/FileRestVo.java | 4 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/dyFile/FileRestVo.java | 4 +-
pms-parent/pms-global/src/main/resources/application-global.yml | 25 ++++++------
pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml | 17 +-------
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoOth/OthFile.java | 5 --
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFileSvConf.java | 12 +++---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFmListener.java | 4 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java | 44 ++++++++++++++++------
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/RestHashDeal.java | 4 +-
9 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/dyFile/FileRestVo.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/dyFile/FileRestVo.java
index 88f3ba9..90f25e2 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/dyFile/FileRestVo.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/dyFile/FileRestVo.java
@@ -14,7 +14,7 @@
public String fileSysRestUrl; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨剅estful URL锛屽湪閰嶇疆鏂囦欢涓厤缃�
public String fileWebPath; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨勬樉绀哄強涓嬭浇鏂囦欢鐨剋eb path锛屽姩鎬佺敓鎴�
public String fileWebUrl; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨勬樉绀烘枃浠剁殑web URL锛屽湪閰嶇疆鏂囦欢涓厤缃�
- public String fileWebDownloadUrl; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨凙ction涓嬭浇鏂囦欢鐨剋eb URL锛屽湪閰嶇疆鏂囦欢涓厤缃�
+ public String fileWebDownloadPath; //涓嬭浇鏂囨。鐨凜ontroller鐨勭浉瀵硅矾寰�
public String toString(){
return "fileName=" + fileName + "\n"
@@ -25,7 +25,7 @@
+ "fileSysRestUrl=" + fileSysRestUrl + "\n"
+ "fileWebPath=" + fileWebPath + "\n"
+ "fileWebUrl=" + fileWebUrl + "\n"
- + "fileWebDownloadUrl=" + fileWebDownloadUrl;
+ + "fileWebDownloadPath=" + fileWebDownloadPath;
}
/**
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 97470ab..a3d3641 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
@@ -17,6 +17,8 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
+import java.util.Date;
+
/**
* web鏂囦欢涓婁紶绀轰緥
*/
@@ -35,6 +37,11 @@
@Value("${dy.webFile.fmUrl}")
private String fmUrl ;
+ /**
+ * 涓婁紶鐓х墖鍥剧墖鏂囦欢 锛堝綋鍓嶅彧瀵筽ng jpg鏍煎紡鍥剧墖鏀寔缂╃暐鍥撅級
+ * @param file
+ * @return
+ */
@PostMapping("/upPhoto")
@SsoPowerAop(power = "-1") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
//https://blog.zhengru.top/posts/33486.html#%E5%8D%95%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
@@ -52,8 +59,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1], (frVo.getFileWebUrl() + frVo.getFileWebPath()), fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()), frVo.fileWebDownloadUrl) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1], (frVo.getFileWebUrl() + frVo.getFileWebPath()), fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()), frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -70,6 +77,11 @@
}
}
+ /**
+ * 涓婁紶褰曢煶闊抽鏂囦欢
+ * @param file
+ * @return
+ */
@PostMapping("/upPhone")
@SsoPowerAop(power = "-1")
public BaseResponse<?> upPhone(MultipartFile file) {
@@ -86,8 +98,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileWebDownloadUrl) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -105,7 +117,11 @@
}
-
+ /**
+ * 涓婁紶褰曞儚瑙嗛鏂囦欢
+ * @param file
+ * @return
+ */
@PostMapping("/upVideo")
@SsoPowerAop(power = "-1")
public BaseResponse<?> upVideo(MultipartFile file) {
@@ -122,8 +138,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileWebDownloadUrl) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -141,7 +157,11 @@
}
-
+ /**
+ * 涓婁紶鏂囨。鏂囦欢
+ * @param file
+ * @return
+ */
@PostMapping("/upDocument")
@SsoPowerAop(power = "-1")
public BaseResponse<?> upDocument(MultipartFile file) {
@@ -158,8 +178,8 @@
fileNameGrp[1],
null);
String fileMainName = fileOp.getFileMainName(frVo.fileName) ;
- Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath, frVo.fileWebDownloadUrl);
- FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileWebDownloadUrl) ;
+ Long id = this.saveFileInfo(fileNameGrp[0], fileNameGrp[1], fileMainName, frVo.fileNameHash, frVo.fileWebPath);
+ FileVo fvo = new FileVo(id, frVo.fileNameHash, fileNameGrp[0], fileNameGrp[1],frVo.getFileWebUrl() + frVo.getFileWebPath(), null, frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -186,14 +206,14 @@
* @param filePath 鏂囦欢鏈嶅姟绔瓨鍌ㄧ浉瀵硅矾寰�
* @return
*/
- private Long saveFileInfo(String orgName, String extName, String newName, Integer hash, String filePath, String downloadPath){
+ private Long saveFileInfo(String orgName, String extName, String newName, Integer hash, String filePath){
OthFile po = new OthFile() ;
po.orgName = orgName ;
po.extName = extName ;
po.newName = newName ;
po.hash = hash ;
po.filePath = filePath ;
- po.downloadPath = downloadPath ;
+ po.dt = new Date() ;
return this.sv.save(po) ;
}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoOth/OthFile.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoOth/OthFile.java
index 3abb84f..d51a84e 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoOth/OthFile.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoOth/OthFile.java
@@ -63,11 +63,6 @@
public String filePath;
/**
- * 鏂囦欢涓嬭浇璺緞
- */
- public String downloadPath;
-
- /**
* 鏂囦欢涓婅浇鏃ユ湡
*/
@TableField(value = "dt", fill = FieldFill.INSERT)
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 1a79b0a..168697e 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -68,7 +68,6 @@
other:
webPort: 12348
idSuffix: 5
-
file:
idSuffix: 99
file1:
@@ -109,7 +108,7 @@
hashEnd: 5461
restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file鏄笂涓嬫枃
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞
- webDownloadUrl: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id= #瀹為檯涓嬭浇webUrl= restUrl + webDownloadPath
sv2:
id: dyFile2
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -118,7 +117,7 @@
hashEnd: 10923
restUrl: http://127.0.0.1:${pms.file2.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv3:
id: dyFile3
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -127,7 +126,7 @@
hashEnd: 16385
restUrl: http://127.0.0.1:${pms.file3.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv4:
id: dyFile4
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -136,7 +135,7 @@
hashEnd: 21847
restUrl: http://127.0.0.1:${pms.file4.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv5:
id: dyFile5
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -145,7 +144,7 @@
hashEnd: 27309
restUrl: http://127.0.0.1:${pms.file5.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv6:
id: dyFile6
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -154,7 +153,7 @@
hashEnd: 32767
restUrl: http://127.0.0.1:${pms.file6.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv7:
id: dyFile7
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -163,7 +162,7 @@
hashEnd: 38229
restUrl: http://127.0.0.1:${pms.file7.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv8:
id: dyFile8
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -172,7 +171,7 @@
hashEnd: 43691
restUrl: http://127.0.0.1:${pms.file8.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv9:
id: dyFile9
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -181,7 +180,7 @@
hashEnd: 49153
restUrl: http://127.0.0.1:${pms.file9.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv10:
id: dyFile10
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -190,7 +189,7 @@
hashEnd: 54615
restUrl: http://127.0.0.1:${pms.file10.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv11:
id: dyFile11
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -199,7 +198,7 @@
hashEnd: 60077
restUrl: http://127.0.0.1:${pms.file11.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
sv12:
id: dyFile12
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -208,4 +207,4 @@
hashEnd: 65535
restUrl: http://127.0.0.1:${pms.file12.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadUrl: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=
+ webDownloadPath: /download/down?id=
diff --git a/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
index 79591c6..1763752 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
@@ -10,12 +10,11 @@
<result column="new_name" property="newName" />
<result column="hash" property="hash" />
<result column="file_path" property="filePath" />
- <result column="download_path" property="downloadPath" />
<result column="dt" property="dt" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, org_name, ext_name, new_name, hash, file_path, download_path, dt
+ id, org_name, ext_name, new_name, hash, file_path, dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -31,9 +30,9 @@
</delete>
<insert id="insert" parameterType="com.dy.pmsGlobal.pojoOth.OthFile">
<!--@mbg.generated-->
- insert into oth_file (id, org_name, ext_name, new_name, hash, file_path, download_path,
+ insert into oth_file (id, org_name, ext_name, new_name, hash, file_path,
dt)
- values (#{id}, #{orgName}, #{extName}, #{newName}, #{hash}, #{filePath}, #{downloadPath},
+ values (#{id}, #{orgName}, #{extName}, #{newName}, #{hash}, #{filePath},
#{dt})
</insert>
<insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoOth.OthFile">
@@ -58,9 +57,6 @@
<if test="filePath != null">
file_path,
</if>
- <if test="downloadPath != null">
- download_path,
- </if>
<if test="dt != null">
dt,
</if>
@@ -83,9 +79,6 @@
</if>
<if test="filePath != null">
#{filePath},
- </if>
- <if test="downloadPath != null">
- #{downloadPath},
</if>
<if test="dt != null">
#{dt},
@@ -111,9 +104,6 @@
<if test="filePath != null">
file_path = #{filePath},
</if>
- <if test="downloadPath != null">
- download_path = #{downloadPath},
- </if>
<if test="dt != null">
dt = #{dt},
</if>
@@ -128,7 +118,6 @@
new_name = #{newName},
hash = #{hash},
file_path = #{filePath},
- download_path = #{downloadPath},
dt = #{dt}
where id = #{id}
</update>
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFileSvConf.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFileSvConf.java
index 7b55078..d2d0314 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFileSvConf.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFileSvConf.java
@@ -51,7 +51,7 @@
public String fileSysRelativePath; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢鏈�缁堝瓨鍌ㄧ浉瀵硅矾寰勭殑鐩綍锛屽湪閰嶇疆鏂囦欢涓厤缃�
public String restUrl;//鏂囦欢绯荤粺璺緞
public String webUrl ;//涓嬭浇鏂囨。鐨剋eb璺緞
- public String webDownloadUrl ;//Action涓嬭浇鏂囨。鐨剋eb璺緞
+ public String webDownloadPath ;//涓嬭浇鏂囨。鐨凜ontroller鐨勭浉瀵硅矾寰�
public Integer hashStart ;//鍝堝笇鍊煎惎濮嬪�硷紙鍖呭惈锛�
public Integer hashEnd ;//鍝堝笇鍊兼埅姝㈠�硷紙鍖呭惈锛�
@@ -61,7 +61,7 @@
String fileSysBasePath,
String restUrl,
String webUrl,
- String webDownloadUrl,
+ String webDownloadPath,
Integer hashStart,
Integer hashEnd)throws Exception{
this.id = id ;
@@ -69,7 +69,7 @@
this.fileSysRelativePath = fileSysBasePath ;
this.restUrl = restUrl ;
this.webUrl = webUrl ;
- this.webDownloadUrl = webDownloadUrl ;
+ this.webDownloadPath = webDownloadPath ;
this.hashStart = hashStart ;
this.hashEnd = hashEnd ;
if(this.id == null || this.id.trim().equals("")){
@@ -99,8 +99,8 @@
this.webUrl += "/" ;
}
}
- if(this.webDownloadUrl == null || this.webDownloadUrl.trim().equals("")){
- throw new Exception("鍑洪敊锛寃ebDownloadUrl涓虹┖浜嗭紒") ;
+ if(this.webDownloadPath == null || this.webDownloadPath.trim().equals("")){
+ throw new Exception("鍑洪敊锛寃ebDownloadPath锛�") ;
}
if(this.hashStart == null){
@@ -127,7 +127,7 @@
+ "fileSysBasePath=" + fileSysRelativePath + "\n"
+ "restUrl=" + restUrl + "\n"
+ "webUrl=" + webUrl + "\n"
- + "webDownloadUrl=" + webDownloadUrl + "\n"
+ + "webDownloadPath=" + webDownloadPath + "\n"
+ "hashStart=" + hashStart + "\n"
+ "hashEnd=" + hashEnd ;
}
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFmListener.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFmListener.java
index 1595b63..4e9845c 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFmListener.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFmListener.java
@@ -46,7 +46,7 @@
String hashEnd = env.getProperty("dy.webFile.sv" + i + ".hashEnd");
String restUrl = env.getProperty("dy.webFile.sv" + i + ".restUrl");
String webUrl = env.getProperty("dy.webFile.sv" + i + ".webUrl");
- String webDownloadUrl = env.getProperty("dy.webFile.sv" + i + ".webDownloadUrl");
+ String webDownloadPath = env.getProperty("dy.webFile.sv" + i + ".webDownloadPath");
if(!NumUtil.isPlusIntNumber(hashStart)){
throw new Exception("閰嶇疆dy.webFile.sv" + i + ".hashStart 涓嶆槸鏁存暟") ;
}
@@ -58,7 +58,7 @@
relativePath,
restUrl,
webUrl,
- webDownloadUrl,
+ webDownloadPath,
Integer.parseInt(hashStart),
Integer.parseInt(hashEnd))) ;
}
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/FileRestVo.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/FileRestVo.java
index b176b10..1833d76 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/FileRestVo.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/FileRestVo.java
@@ -12,7 +12,7 @@
public String fileSysRelativePath; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢鏈�缁堝瓨鍌ㄧ浉瀵硅矾寰勭殑鐩綍锛屽湪閰嶇疆鏂囦欢涓厤缃�
public String fileSysRestUrl; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨剅estful URL锛屽湪閰嶇疆鏂囦欢涓厤缃�
public String fileWebUrl; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨勪笅杞芥枃浠剁殑web URL锛屽湪閰嶇疆鏂囦欢涓厤缃�
- public String fileWebDownloadUrl; //鏂囦欢鍚嶇О鐨勫搱甯屽�煎搴旂殑鏂囦欢绯荤粺鐨凙ction涓嬭浇鏂囦欢鐨剋eb URL锛屽湪閰嶇疆鏂囦欢涓厤缃�
+ public String fileWebDownloadPath; //涓嬭浇鏂囨。鐨凜ontroller鐨勭浉瀵硅矾寰�
public String toString(){
return "fileName=" + fileName + "\n"
@@ -22,7 +22,7 @@
+ "fileSysRelativePath=" + fileSysRelativePath + "\n"
+ "restUrl=" + fileSysRestUrl + "\n"
+ "fileWebUrl=" + fileWebUrl + "\n"
- + "fileWebDownloadUrl=" + fileWebDownloadUrl ;
+ + "fileWebDownloadPath=" + fileWebDownloadPath ;
}
}
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/RestHashDeal.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/RestHashDeal.java
index 2eba6d0..3d86f13 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/RestHashDeal.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/RestHashDeal.java
@@ -42,7 +42,7 @@
rvo.fileSysRelativePath = confVo.fileSysRelativePath;
rvo.fileSysRestUrl = confVo.restUrl;
rvo.fileWebUrl = confVo.webUrl ;
- rvo.fileWebDownloadUrl = confVo.webDownloadUrl ;
+ rvo.fileWebDownloadPath = confVo.webDownloadPath ;
}
}
}
@@ -85,7 +85,7 @@
rvo.fileSysRelativePath = confVo.fileSysRelativePath;
rvo.fileSysRestUrl = confVo.restUrl;
rvo.fileWebUrl = confVo.webUrl ;
- rvo.fileWebDownloadUrl = confVo.webDownloadUrl ;
+ rvo.fileWebDownloadPath = confVo.webDownloadPath ;
}
}
}
--
Gitblit v1.8.0