From 845a380a7e384a2c6ffccc914447fd87aee60fef Mon Sep 17 00:00:00 2001
From: zhaojun1998 <root@zhaojun.im>
Date: Thu, 2 Jan 2020 18:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=90=AF=E7=BC=93=E5=AD=98,?=
 =?UTF-8?q?=20=E4=B8=8D=E5=85=81=E8=AE=B8=E6=90=9C=E7=B4=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/AbstractFileService.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/im/zhaojun/common/service/AbstractFileService.java b/src/main/java/im/zhaojun/common/service/AbstractFileService.java
index c186b98..5ff4214 100644
--- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java
+++ b/src/main/java/im/zhaojun/common/service/AbstractFileService.java
@@ -1,10 +1,8 @@
 package im.zhaojun.common.service;
 
-import com.alicp.jetcache.Cache;
 import com.alicp.jetcache.anno.CacheRefresh;
 import com.alicp.jetcache.anno.CacheType;
 import com.alicp.jetcache.anno.Cached;
-import com.alicp.jetcache.anno.CreateCache;
 import im.zhaojun.common.model.dto.FileItemDTO;
 import im.zhaojun.common.model.enums.FileTypeEnum;
 import im.zhaojun.common.model.enums.StorageTypeEnum;
@@ -14,6 +12,7 @@ import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Value;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
@@ -31,8 +30,8 @@ public abstract class AbstractFileService implements FileService {
 
     protected boolean isInitialized;
 
-    @CreateCache(name = "zfile-cache:")
-    private Cache<String, Object> userCache;
+    @Resource
+    private SystemConfigService systemConfigService;
 
     /***
      * 获取指定路径下的文件及文件夹, 默认缓存 60 分钟，每隔 30 分钟刷新一次.
@@ -65,7 +64,7 @@ public abstract class AbstractFileService implements FileService {
         try {
             fileList("/");
         } catch (Exception e) {
-            e.printStackTrace();
+            log.debug(getStorageTypeEnum().getDescription() + "初始化异常", e);
             flag = false;
         }
         return flag;
@@ -112,6 +111,12 @@ public abstract class AbstractFileService implements FileService {
     public List<FileItemDTO> selectAllFileList() throws Exception {
         List<FileItemDTO> result = new ArrayList<>();
 
+        boolean enableCache = systemConfigService.getEnableCache();
+        if (!enableCache) {
+            log.debug("未开启缓存, 不支持查询所有文件.");
+            return null;
+        }
+
         String path = "/";
 
         FileService currentFileService = (FileService) AopContext.currentProxy();