From eb99a3e3405fced141c1adc266b3e3f0085e90f5 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Mon, 9 Dec 2019 22:47:43 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20UpYun=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9F=BA=E8=B7=AF=E5=BE=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/zhaojun/upyun/service/UpYunServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java b/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java index 5b14de7..ac58a02 100644 --- a/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java +++ b/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java @@ -35,12 +35,16 @@ public class UpYunServiceImpl implements FileService { private static final String DOMAIN_KEY = "domain"; + private static final String BASE_PATH = "base-path"; + private String domain; private UpYun upYun; private boolean isInitialized; + private String basePath; + @Override public void init() { try { @@ -50,6 +54,7 @@ public class UpYunServiceImpl implements FileService { String username = stringStorageConfigMap.get(USERNAME_KEY).getValue(); String password = stringStorageConfigMap.get(PASSWORD_KEY).getValue(); domain = stringStorageConfigMap.get(DOMAIN_KEY).getValue(); + basePath = stringStorageConfigMap.get(BASE_PATH).getValue(); upYun = new UpYun(bucketName, username, password); isInitialized = true; } catch (Exception e) { @@ -66,7 +71,7 @@ public class UpYunServiceImpl implements FileService { HashMap hashMap = new HashMap<>(24); hashMap.put("x-list-iter", nextMark); hashMap.put("x-list-limit", "100"); - UpYun.FolderItemIter folderItemIter = upYun.readDirIter(URLUtil.encode(path), hashMap); + UpYun.FolderItemIter folderItemIter = upYun.readDirIter(URLUtil.encode(basePath + path), hashMap); nextMark = folderItemIter.iter; ArrayList folderItems = folderItemIter.files; if (folderItems != null) { @@ -81,7 +86,7 @@ public class UpYunServiceImpl implements FileService { fileItemDTO.setType(FileTypeEnum.FOLDER); } else { fileItemDTO.setType(FileTypeEnum.FILE); - fileItemDTO.setUrl(getDownloadUrl(StringUtils.concatUrl(path, fileItemDTO.getName()))); + fileItemDTO.setUrl(getDownloadUrl(StringUtils.concatUrl(basePath + path, fileItemDTO.getName()))); } fileItemList.add(fileItemDTO); } @@ -107,5 +112,4 @@ public class UpYunServiceImpl implements FileService { return isInitialized; } - } \ No newline at end of file