diff --git a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java index 5f1d744..0b6fd5e 100644 --- a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java @@ -27,14 +27,15 @@ public class AliyunServiceImpl extends AbstractS3FileService implements FileServ @Override public void init() { try { - Map stringStorageConfigMap = storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.ALIYUN); + Map stringStorageConfigMap = + storageConfigService.selectStorageConfigMapByKey(getStorageTypeEnum()); String accessKey = stringStorageConfigMap.get(StorageConfigConstant.ACCESS_KEY).getValue(); String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue(); String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue(); - super.bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue(); super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue(); super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue(); + super.bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue(); if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) { log.debug("初始化存储策略 [{}] 失败: 参数不完整", getStorageTypeEnum().getDescription()); diff --git a/src/main/java/im/zhaojun/common/controller/CacheController.java b/src/main/java/im/zhaojun/common/controller/CacheController.java index 132e986..f0c1300 100644 --- a/src/main/java/im/zhaojun/common/controller/CacheController.java +++ b/src/main/java/im/zhaojun/common/controller/CacheController.java @@ -16,7 +16,6 @@ import java.util.Set; /** * @author zhaojun - * @date 2020/1/11 14:03 */ @RestController @RequestMapping("/admin/cache") diff --git a/src/main/java/im/zhaojun/common/controller/CommonController.java b/src/main/java/im/zhaojun/common/controller/CommonController.java index 8c19ca6..76cbee1 100644 --- a/src/main/java/im/zhaojun/common/controller/CommonController.java +++ b/src/main/java/im/zhaojun/common/controller/CommonController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController; /** * @author zhaojun - * @date 2020/1/13 21:40 */ @RestController @RequestMapping("/common") diff --git a/src/main/java/im/zhaojun/common/exception/NotExistFileException.java b/src/main/java/im/zhaojun/common/exception/NotExistFileException.java index 411de10..3dbd1cd 100644 --- a/src/main/java/im/zhaojun/common/exception/NotExistFileException.java +++ b/src/main/java/im/zhaojun/common/exception/NotExistFileException.java @@ -2,7 +2,6 @@ package im.zhaojun.common.exception; /** * @author zhaojun - * @date 2020/1/20 22:15 */ public class NotExistFileException extends RuntimeException { diff --git a/src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java b/src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java index 73c8adc..6d8cca0 100644 --- a/src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java +++ b/src/main/java/im/zhaojun/common/model/constant/StorageConfigConstant.java @@ -2,7 +2,6 @@ package im.zhaojun.common.model.constant; /** * @author zhaojun - * @date 2019/12/28 18:47 */ public class StorageConfigConstant { diff --git a/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java b/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java index a4025ff..7cd7014 100644 --- a/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java +++ b/src/main/java/im/zhaojun/common/model/dto/CacheConfigDTO.java @@ -6,7 +6,6 @@ import java.util.Set; /** * @author zhaojun - * @date 2020/1/3 12:39 */ @Data public class CacheConfigDTO { diff --git a/src/main/java/im/zhaojun/common/service/AbstractFileService.java b/src/main/java/im/zhaojun/common/service/AbstractFileService.java index 4b009ad..6be9e59 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java +++ b/src/main/java/im/zhaojun/common/service/AbstractFileService.java @@ -31,7 +31,6 @@ import java.util.stream.Collectors; /** * @author zhaojun - * @date 2019/12/28 19:27 */ @Slf4j public abstract class AbstractFileService extends FileCacheService implements FileService { diff --git a/src/main/java/im/zhaojun/common/service/FileCacheService.java b/src/main/java/im/zhaojun/common/service/FileCacheService.java index b36438f..64e3226 100644 --- a/src/main/java/im/zhaojun/common/service/FileCacheService.java +++ b/src/main/java/im/zhaojun/common/service/FileCacheService.java @@ -7,7 +7,6 @@ import javax.annotation.Resource; /** * @author zhaojun - * @date 2020/1/11 14:08 */ @Service public class FileCacheService { diff --git a/src/main/java/im/zhaojun/onedrive/china/service/OneDriveServiceChinaImpl.java b/src/main/java/im/zhaojun/onedrive/china/service/OneDriveServiceChinaImpl.java index ce8f3cf..a0112f1 100644 --- a/src/main/java/im/zhaojun/onedrive/china/service/OneDriveServiceChinaImpl.java +++ b/src/main/java/im/zhaojun/onedrive/china/service/OneDriveServiceChinaImpl.java @@ -19,7 +19,6 @@ import java.util.Map; /** * @author zhaojun - * @date 2020/1/12 13:53 */ @Service @Slf4j diff --git a/src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java b/src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java index 7da6e2d..6015cf9 100644 --- a/src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java +++ b/src/main/java/im/zhaojun/onedrive/common/config/OneDriveConfig.java @@ -17,7 +17,6 @@ import java.util.Collections; /** * @author zhaojun - * @date 2020/1/18 17:13 */ @Configuration public class OneDriveConfig { diff --git a/src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java b/src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java index bfa34d9..3699900 100644 --- a/src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java +++ b/src/main/java/im/zhaojun/onedrive/common/model/OneDriveToken.java @@ -5,7 +5,6 @@ import lombok.Data; /** * @author zhaojun - * @date 2020/1/18 17:28 */ @Data public class OneDriveToken { diff --git a/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java b/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java index 22afa90..179a652 100644 --- a/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java +++ b/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java @@ -19,7 +19,6 @@ import java.util.Map; /** * @author zhaojun - * @date 2020/1/12 13:53 */ @Service @Slf4j