From 9715cf922ae2bd0363906aefbd3cdc5c827ffdeb Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Mon, 20 Jan 2020 21:35:41 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../im/zhaojun/aliyun/service/AliyunServiceImpl.java | 2 +- .../im/zhaojun/common/service/AbstractFileService.java | 10 +++++++++- .../java/im/zhaojun/ftp/service/FtpServiceImpl.java | 2 +- .../im/zhaojun/huawei/service/HuaweiServiceImpl.java | 2 +- .../im/zhaojun/local/service/LocalServiceImpl.java | 2 +- src/main/java/im/zhaojun/minio/MinIOServiceImpl.java | 2 +- .../im/zhaojun/qiniu/service/QiniuServiceImpl.java | 2 +- .../java/im/zhaojun/tencent/TencentServiceImpl.java | 2 +- .../im/zhaojun/upyun/service/UpYunServiceImpl.java | 8 +++----- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java index d84a1a8..63ab98b 100644 --- a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java @@ -50,7 +50,7 @@ public class AliyunServiceImpl extends AbstractS3FileService implements FileServ } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/common/service/AbstractFileService.java b/src/main/java/im/zhaojun/common/service/AbstractFileService.java index ba3d9f6..60b33cb 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java +++ b/src/main/java/im/zhaojun/common/service/AbstractFileService.java @@ -81,7 +81,7 @@ public abstract class AbstractFileService extends FileCacheService implements Fi try { fileList("/"); } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常", e); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常", e); flag = false; } return flag; @@ -95,6 +95,14 @@ public abstract class AbstractFileService extends FileCacheService implements Fi return !isInitialized; } + /** + * 获取是否初始化成功 + * @return 初始化成功与否 + */ + public boolean getIsInitialized() { + return isInitialized; + } + /** * 获取存储策略类型 * @return 存储策略类型枚举 diff --git a/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java b/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java index afd1001..3e6cb5c 100644 --- a/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java +++ b/src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java @@ -56,7 +56,7 @@ public class FtpServiceImpl extends AbstractFileService implements FileService { } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java b/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java index 123e3f9..56dabba 100644 --- a/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java +++ b/src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java @@ -48,7 +48,7 @@ public class HuaweiServiceImpl extends AbstractS3FileService implements FileServ isInitialized = testConnection(); } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/local/service/LocalServiceImpl.java b/src/main/java/im/zhaojun/local/service/LocalServiceImpl.java index f16122c..6f2ebde 100644 --- a/src/main/java/im/zhaojun/local/service/LocalServiceImpl.java +++ b/src/main/java/im/zhaojun/local/service/LocalServiceImpl.java @@ -54,7 +54,7 @@ public class LocalServiceImpl extends AbstractFileService implements FileService isInitialized = testConnection(); } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/minio/MinIOServiceImpl.java b/src/main/java/im/zhaojun/minio/MinIOServiceImpl.java index ace1db9..e14301b 100644 --- a/src/main/java/im/zhaojun/minio/MinIOServiceImpl.java +++ b/src/main/java/im/zhaojun/minio/MinIOServiceImpl.java @@ -46,7 +46,7 @@ public class MinIOServiceImpl extends AbstractS3FileService implements FileServi isInitialized = testConnection(); } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java b/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java index a40b1db..67eee27 100644 --- a/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java +++ b/src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java @@ -48,7 +48,7 @@ public class QiniuServiceImpl extends AbstractS3FileService implements FileServi isInitialized = testConnection(); } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java b/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java index 2f049eb..66a08c3 100644 --- a/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java +++ b/src/main/java/im/zhaojun/tencent/TencentServiceImpl.java @@ -47,7 +47,7 @@ public class TencentServiceImpl extends AbstractS3FileService implements FileSer isInitialized = testConnection(); } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } } diff --git a/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java b/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java index 83e0cd5..7c5922d 100644 --- a/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java +++ b/src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java @@ -12,8 +12,7 @@ import im.zhaojun.common.service.AbstractFileService; import im.zhaojun.common.service.FileService; import im.zhaojun.common.service.StorageConfigService; import im.zhaojun.common.util.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,10 +26,9 @@ import java.util.Objects; * @author zhaojun */ @Service +@Slf4j public class UpYunServiceImpl extends AbstractFileService implements FileService { - private static final Logger log = LoggerFactory.getLogger(UpYunServiceImpl.class); - private static final String END_MARK = "g2gCZAAEbmV4dGQAA2VvZg"; @Resource @@ -62,7 +60,7 @@ public class UpYunServiceImpl extends AbstractFileService implements FileService isInitialized = testConnection(); } } catch (Exception e) { - log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过"); + log.debug(getStorageTypeEnum().getDescription() + " 初始化异常, 已跳过"); } }