From 86d8700e7776bf44b8fb90df1823daf147a13b27 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 04 九月 2024 10:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/dyFm/DyFileSvConf.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
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 6e314ec..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,14 +99,10 @@
this.webUrl += "/" ;
}
}
- if(this.webDownloadUrl == null || this.webDownloadUrl.trim().equals("")){
- throw new Exception("鍑洪敊锛寃ebDownloadUrl涓虹┖浜嗭紒") ;
- }else{
- this.webDownloadUrl = this.webDownloadUrl.trim() ;
- if(!this.webDownloadUrl.endsWith("/") && !this.webDownloadUrl.endsWith("\\")){
- this.webDownloadUrl += "/" ;
- }
+ if(this.webDownloadPath == null || this.webDownloadPath.trim().equals("")){
+ throw new Exception("鍑洪敊锛寃ebDownloadPath锛�") ;
}
+
if(this.hashStart == null){
throw new Exception("鍑洪敊锛宧ashStart涓虹┖浜嗭紒") ;
}else if(this.hashStart.intValue() < 0){
@@ -131,7 +127,7 @@
+ "fileSysBasePath=" + fileSysRelativePath + "\n"
+ "restUrl=" + restUrl + "\n"
+ "webUrl=" + webUrl + "\n"
- + "webDownloadUrl=" + webDownloadUrl + "\n"
+ + "webDownloadPath=" + webDownloadPath + "\n"
+ "hashStart=" + hashStart + "\n"
+ "hashEnd=" + hashEnd ;
}
--
Gitblit v1.8.0