From 4c0bacba31b6555ecb4f00d32a6e40e7d8c9ba34 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Sat, 4 Apr 2020 19:57:09 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?,=20=E5=B0=86=E6=AF=8F=E4=B8=AA=E5=AD=98=E5=82=A8=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E7=9A=84=E8=A1=A8=E5=8D=95=E8=AE=BE=E7=BD=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20Java=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...S3ServiceImpl.java => AbstractS3Service.java} | 6 +++--- .../zfile/service/impl/AliyunServiceImpl.java | 16 +++++++++++++++- .../zfile/service/impl/FtpServiceImpl.java | 12 ++++++++++++ .../zfile/service/impl/HuaweiServiceImpl.java | 16 ++++++++++++++++ .../zfile/service/impl/LocalServiceImpl.java | 7 +++++++ .../zfile/service/impl/MinIOServiceImpl.java | 16 +++++++++++++++- .../service/impl/OneDriveChinaServiceImpl.java | 3 ++- .../zfile/service/impl/QiniuServiceImpl.java | 15 +++++++++++++++ .../zfile/service/impl/TencentServiceImpl.java | 15 ++++++++++++++- .../zfile/service/impl/UpYunServiceImpl.java | 12 ++++++++++++ 10 files changed, 111 insertions(+), 7 deletions(-) rename src/main/java/im/zhaojun/zfile/service/impl/{S3ServiceImpl.java => AbstractS3Service.java} (93%) diff --git a/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/AbstractS3Service.java similarity index 93% rename from src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java rename to src/main/java/im/zhaojun/zfile/service/impl/AbstractS3Service.java index 90c5da0..e5b44b0 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/S3ServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/AbstractS3Service.java @@ -21,9 +21,9 @@ import java.util.Objects; * @author zhaojun */ @Service -public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFileService { +public abstract class AbstractS3Service extends AbstractS3BaseFileService implements BaseFileService { - private static final Logger log = LoggerFactory.getLogger(S3ServiceImpl.class); + private static final Logger log = LoggerFactory.getLogger(AbstractS3Service.class); @Override public void init() { @@ -65,4 +65,4 @@ public class S3ServiceImpl extends AbstractS3BaseFileService implements BaseFile return StorageTypeEnum.S3; } -} +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java index 0426d1a..069e301 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/AliyunServiceImpl.java @@ -5,6 +5,7 @@ import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import im.zhaojun.zfile.model.dto.StorageStrategyDTO; import im.zhaojun.zfile.model.entity.StorageConfig; import im.zhaojun.zfile.model.constant.StorageConfigConstant; import im.zhaojun.zfile.model.enums.StorageTypeEnum; @@ -14,6 +15,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -60,4 +63,15 @@ public class AliyunServiceImpl extends AbstractS3BaseFileService implements Base return StorageTypeEnum.ALIYUN; } -} + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("accessKey", "AccessKey")); + add(new StorageConfig("secretKey", "SecretKey")); + add(new StorageConfig("bucket-name", "Bucket 名称")); + add(new StorageConfig("domain", "Bucket 域名 / CDN 加速域名")); + add(new StorageConfig("endPoint", "区域")); + add(new StorageConfig("base-path", "基路径")); + }}; + } +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java index 4d3954c..d1266c3 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/FtpServiceImpl.java @@ -129,4 +129,16 @@ public class FtpServiceImpl extends AbstractBaseFileService implements BaseFileS fileItemDTO.setUrl(getDownloadUrl(path)); return fileItemDTO; } + + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("host", "域名或IP")); + add(new StorageConfig("port", "端口")); + add(new StorageConfig("username", "用户名")); + add(new StorageConfig("password", "密码")); + add(new StorageConfig("domain", "加速域名")); + add(new StorageConfig("base-path", "基路径")); + }}; + } } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java index 017ada0..a09f22e 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/HuaweiServiceImpl.java @@ -14,6 +14,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -60,4 +62,18 @@ public class HuaweiServiceImpl extends AbstractS3BaseFileService implements Base return StorageTypeEnum.HUAWEI; } + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("accessKey", "AccessKey")); + add(new StorageConfig("secretKey", "SecretKey")); + add(new StorageConfig("bucket-name", "云存储服务名称")); + add(new StorageConfig("domain", "加速域名")); + add(new StorageConfig("endPoint", "区域")); + add(new StorageConfig("base-path", "基路径")); + add(new StorageConfig("isPrivate", "是否是私有空间")); + }}; + } + + } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java index 5047bed..88f6a41 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/LocalServiceImpl.java @@ -127,4 +127,11 @@ public class LocalServiceImpl extends AbstractBaseFileService implements BaseFil return fileItemDTO; } + + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("filePath", "文件路径")); + }}; + } } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java index 73b2fef..84ff176 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/MinIOServiceImpl.java @@ -14,6 +14,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -61,4 +63,16 @@ public class MinIOServiceImpl extends AbstractS3BaseFileService implements BaseF return StorageTypeEnum.MINIO; } -} + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("accessKey", "AccessKey")); + add(new StorageConfig("secretKey", "SecretKey")); + add(new StorageConfig("endPoint", "服务地址")); + add(new StorageConfig("bucket-name", "存储空间名称")); + add(new StorageConfig("base-path", "基路径")); + add(new StorageConfig("isPrivate", "是否是私有空间")); + }}; + } + +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java index 57961d9..b3ea8e2 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/OneDriveChinaServiceImpl.java @@ -96,4 +96,5 @@ public class OneDriveChinaServiceImpl extends AbstractOneDriveServiceBase implem public String getScope() { return scope; } -} + +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java index 2283b3a..a442530 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/QiniuServiceImpl.java @@ -14,6 +14,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -60,4 +62,17 @@ public class QiniuServiceImpl extends AbstractS3BaseFileService implements BaseF return StorageTypeEnum.QINIU; } + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("accessKey", "AccessKey")); + add(new StorageConfig("secretKey", "SecretKey")); + add(new StorageConfig("bucket-name", "存储空间名称")); + add(new StorageConfig("domain", "加速域名")); + add(new StorageConfig("endPoint", "区域")); + add(new StorageConfig("base-path", "基路径")); + add(new StorageConfig("isPrivate", "是否是私有空间")); + }}; + } + } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java index 6c9a4bd..e0e7ea9 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/TencentServiceImpl.java @@ -14,6 +14,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -55,10 +57,21 @@ public class TencentServiceImpl extends AbstractS3BaseFileService implements Bas } - @Override public StorageTypeEnum getStorageTypeEnum() { return StorageTypeEnum.TENCENT; } + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("secretId", "SecretId")); + add(new StorageConfig("secretKey", "SecretKey")); + add(new StorageConfig("bucket-name", "云存储服务名称")); + add(new StorageConfig("domain", "加速域名")); + add(new StorageConfig("endPoint", "区域")); + add(new StorageConfig("base-path", "基路径")); + add(new StorageConfig("isPrivate", "是否是私有空间")); + }}; + } } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java b/src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java index 426d9f6..4ee76bc 100644 --- a/src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java +++ b/src/main/java/im/zhaojun/zfile/service/impl/UpYunServiceImpl.java @@ -128,4 +128,16 @@ public class UpYunServiceImpl extends AbstractBaseFileService implements BaseFil throw new NotExistFileException(); } + + @Override + public List storageStrategyList() { + return new ArrayList() {{ + add(new StorageConfig("bucket-name", "云存储服务名称")); + add(new StorageConfig("username", "操作员名称")); + add(new StorageConfig("password", "操作员密码")); + add(new StorageConfig("domain", "加速域名")); + add(new StorageConfig("base-path", "基路径")); + }}; + } + } \ No newline at end of file