From 41a98879a4a0ffe9cc28b2d668ea518006ec9e04 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 4 Jan 2021 17:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/cloud/AliyunCloudStorageService.java | 4 ++-- .../main/java/com/epmet/cloud/LocalCloudStorageService.java | 4 ++-- .../main/java/com/epmet/cloud/QcloudCloudStorageService.java | 4 ++-- .../main/java/com/epmet/cloud/QiniuCloudStorageService.java | 4 ++-- .../src/main/java/com/epmet/utils/ModuleConstant.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AliyunCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AliyunCloudStorageService.java index 3b599a4abd..472609fbcd 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AliyunCloudStorageService.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AliyunCloudStorageService.java @@ -67,13 +67,13 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService { @Override public String uploadSuffix(byte[] data, String suffix, String privacyType) { CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType); - return upload(data, getPath(props.getAliyunPrefix(), suffix), privacyType); + return upload(data, getPath(props.getAliyunPrefix(), suffix, privacyType), privacyType); } @Override public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) { CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType); - return upload(inputStream, getPath(props.getAliyunPrefix(), suffix), privacyType); + return upload(inputStream, getPath(props.getAliyunPrefix(), suffix, privacyType), privacyType); } @Override diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/LocalCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/LocalCloudStorageService.java index b523283101..8143edaa0b 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/LocalCloudStorageService.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/LocalCloudStorageService.java @@ -46,12 +46,12 @@ public class LocalCloudStorageService extends AbstractCloudStorageService { @Override public String uploadSuffix(byte[] data, String suffix, String privacyType) { - return upload(data, getPath(config.getLocalPrefix(), suffix), privacyType); + return upload(data, getPath(config.getLocalPrefix(), suffix, privacyType), privacyType); } @Override public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) { - return upload(inputStream, getPath(config.getLocalPrefix(), suffix), privacyType); + return upload(inputStream, getPath(config.getLocalPrefix(), suffix, privacyType), privacyType); } @Override diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java index ef7d6fcc07..80c5e494f4 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java @@ -76,12 +76,12 @@ public class QcloudCloudStorageService extends AbstractCloudStorageService { @Override public String uploadSuffix(byte[] data, String suffix, String privacyType) { - return upload(data, getPath(config.getQcloudPrefix(), suffix), privacyType); + return upload(data, getPath(config.getQcloudPrefix(), suffix, privacyType), privacyType); } @Override public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) { - return upload(inputStream, getPath(config.getQcloudPrefix(), suffix), privacyType); + return upload(inputStream, getPath(config.getQcloudPrefix(), suffix, privacyType), privacyType); } @Override diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java index 1145234e22..16515203dd 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java @@ -70,12 +70,12 @@ public class QiniuCloudStorageService extends AbstractCloudStorageService { @Override public String uploadSuffix(byte[] data, String suffix, String privacyType) { - return upload(data, getPath(config.getQiniuPrefix(), suffix), privacyType); + return upload(data, getPath(config.getQiniuPrefix(), suffix, privacyType), privacyType); } @Override public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) { - return upload(inputStream, getPath(config.getQiniuPrefix(), suffix), privacyType); + return upload(inputStream, getPath(config.getQiniuPrefix(), suffix, privacyType), privacyType); } @Override diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java index efa289bd61..951c225561 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/utils/ModuleConstant.java @@ -20,7 +20,7 @@ public interface ModuleConstant extends Constant { /** * 云存储配置KEY */ - String CLOUD_STORAGE_CONFIG_KEY = "CLOUD_STORAGE_CONFIG_KEY"; + String CLOUD_STORAGE_CONFIG_KEY = "CLOUD_STORAGE_CONFIG_KEY_TEMP"; /** * jpg文件类型