github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix UpYun oss delete error.

pull/241/head
darkcloth 2019-07-13 19:16:03 +08:00
parent 11d798ffa3
commit 7f699d1a40
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/run/halo/app/handler/file/UpYunFileHandler.java
View File

@ -100,7 +100,7 @@ public class UpYunFileHandler implements FileHandler {
Assert.notNull(key, "File key must not be blank"); Assert.notNull(key, "File key must not be blank");
// Get config // Get config
String ossSource = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_SOURCE).toString(); // String ossSource = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_SOURCE).toString();
String ossPassword = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_PASSWORD).toString(); String ossPassword = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_PASSWORD).toString();
String ossBucket = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_BUCKET).toString(); String ossBucket = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_BUCKET).toString();
String ossOperator = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_OPERATOR).toString(); String ossOperator = optionService.getByPropertyOfNonNull(UpYunProperties.OSS_OPERATOR).toString();
@ -111,11 +111,10 @@ public class UpYunFileHandler implements FileHandler {
upYun.setApiDomain(UpYun.ED_AUTO); upYun.setApiDomain(UpYun.ED_AUTO);
try { try {
String filePath = ossSource + key;
// Delete the file // Delete the file
boolean deleteResult = upYun.deleteFile(filePath); boolean deleteResult = upYun.deleteFile(key);
if (!deleteResult) { if (!deleteResult) {
log.warn("Failed to delete file " + filePath + " from UpYun"); log.warn("Failed to delete file " + key + " from UpYun");
} }
} catch (Exception e) { } catch (Exception e) {
throw new FileOperationException("附件从又拍云删除失败", e); throw new FileOperationException("附件从又拍云删除失败", e);