From 28e43e968faad49dcd83bd2076ecd44158468f09 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Fri, 24 Jan 2020 17:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5,=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E9=94=99=E8=AF=AF?= 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 | 9 +++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java index 63ab98b..5f1d744 100644 --- a/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java +++ b/src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java @@ -47,8 +47,6 @@ public class AliyunServiceImpl extends AbstractS3FileService implements FileServ .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "oss")).build(); isInitialized = testConnection(); } - - } catch (Exception e) { 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 60b33cb..e453483 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java +++ b/src/main/java/im/zhaojun/common/service/AbstractFileService.java @@ -31,12 +31,12 @@ import java.util.stream.Collectors; @Slf4j public abstract class AbstractFileService extends FileCacheService implements FileService { - public static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:"; + private static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-cache:"; @Value("${zfile.cache.timeout}") protected Long timeout; - protected boolean isInitialized; + protected boolean isInitialized = false; @Resource private SystemConfigService systemConfigService; @@ -62,11 +62,16 @@ public abstract class AbstractFileService extends FileCacheService implements Fi /** * 清理当前存储策略的缓存 + * 1. 删除全部缓存 + * 2. 关闭自动刷新 + * 3. 重置缓存个数 + * 4. 标记为当前处于未完成缓存状态 */ public void clearFileCache() throws Exception { Set cacheKeys = getCacheKeys(); cache.removeAll(cacheKeys); closeCacheAutoRefresh(); + fileAsyncCacheService.resetCacheCount(); fileAsyncCacheService.setCacheFinish(false); }