🔖 升级版本为 0.3.1

README.md

@@ -34,19 +34,19 @@ yum instal -y java # 适用于 Centos 7.x
 下载项目:
 
 ```bash
-wget https://github.com/zhaojun1998/zfile/releases/download/0.3/zfile-0.3.jar
+wget https://github.com/zhaojun1998/zfile/releases/download/0.3.1/zfile-0.3.1.jar
 ```
 
 启动项目:
 
 ```bash
-java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar
+java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.1.jar
 
 ## 高级启动
-java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar --server.port=18777
+java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.1.jar --server.port=18777
 
 ## 后台运行
-nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.jar &
+nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.3.1.jar &
 ```
 
 > 系统使用的是内置配置文件, 默认配置请参考: [application.yml](https://github.com/zhaojun1998/zfile/blob/master/src/main/resources/application.yml)

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>im.zhaojun</groupId>
     <artifactId>zfile</artifactId>
-    <version>0.3</version>
+    <version>0.3.1</version>
     <name>zfile</name>
     <description>一个在线的文件浏览系统</description>
 

src/main/java/im/zhaojun/aliyun/service/AliyunServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -35,12 +36,18 @@ public class AliyunServiceImpl extends AbstractS3FileService implements FileServ
             super.domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             super.basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            super.s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "oss")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+
+                super.s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "oss")).build();
+                isInitialized = testConnection();
+            }
+
 
-            isInitialized = testConnection();
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/common/aspect/StorageStrategyInitCheckAspect.java

@@ -19,9 +19,13 @@ public class StorageStrategyInitCheckAspect {
     public void logStart() {
         SystemConfigService systemConfigService = SpringContextHolder.getBean(SystemConfigService.class);
         AbstractFileService currentFileService = systemConfigService.getCurrentFileService();
-        if (currentFileService == null || !currentFileService.getIsInitialized()) {
+        if (currentFileService == null) {
+            throw new StorageStrategyUninitializedException("存储策略尚未初始化, 请联系管理员!");
+        }
+        if (!currentFileService.getIsInitialized()) {
             throw new StorageStrategyUninitializedException("存储策略异常, 请联系管理员!");
         }
+
     }
 
 }

src/main/java/im/zhaojun/common/controller/AdminController.java

@@ -59,7 +59,7 @@ public class AdminController {
      * 更新系统配置
      */
     @PostMapping("/config")
-    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) {
+    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) throws Exception {
         StorageTypeEnum currentStorageStrategy = systemConfigService.getCurrentStorageStrategy();
 
         systemConfigDTO.setId(1);
@@ -82,7 +82,7 @@ public class AdminController {
     /**
      * 清理当前启用的存储引擎的缓存
      */
-    @GetMapping("/clear-cache")
+    @PostMapping("/clear-cache")
     public ResultBean clearCache() {
         AbstractFileService fileService = systemConfigService.getCurrentFileService();
         fileService.clearCache();

src/main/java/im/zhaojun/common/controller/FileController.java

@@ -11,6 +11,7 @@ import im.zhaojun.common.model.dto.SiteConfigDTO;
 import im.zhaojun.common.model.dto.SystemConfigDTO;
 import im.zhaojun.common.model.enums.StorageTypeEnum;
 import im.zhaojun.common.service.AbstractFileService;
+import im.zhaojun.common.service.FileAsyncCacheService;
 import im.zhaojun.common.service.StorageConfigService;
 import im.zhaojun.common.service.SystemConfigService;
 import im.zhaojun.common.service.SystemService;
@@ -44,6 +45,9 @@ public class FileController {
     @Resource
     private StorageConfigService storageConfigService;
 
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
     /**
      * 滚动加载每页条数.
      */
@@ -133,6 +137,9 @@ public class FileController {
         if (!systemConfigDTO.getSearchEnable()) {
             throw new SearchDisableException("搜索功能未开启");
         }
+        if (!fileAsyncCacheService.isCacheFinish()) {
+            throw new SearchDisableException("搜索功能缓存预热中, 请稍后再试");
+        }
         return ResultBean.success(fileService.search(URLUtil.decode(name)));
     }
 

src/main/java/im/zhaojun/common/controller/InstallController.java

@@ -48,7 +48,7 @@ public class InstallController {
 
     @PostMapping("/install")
     @ResponseBody
-    public ResultBean install(InstallModelDTO installModelDTO) {
+    public ResultBean install(InstallModelDTO installModelDTO) throws Exception {
         SystemConfigDTO systemConfigDTO = systemConfigService.getSystemConfig();
 
         if (systemConfigDTO.getStorageStrategy() != null) {

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();

src/main/java/im/zhaojun/common/service/FileAsyncCacheService.java

@@ -2,8 +2,7 @@ package im.zhaojun.common.service;
 
 import im.zhaojun.common.config.StorageTypeFactory;
 import im.zhaojun.common.model.enums.StorageTypeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -12,10 +11,11 @@ import javax.annotation.Resource;
 /**
  * @author zhaojun
  */
+@Slf4j
 @Service
 public class FileAsyncCacheService {
 
-    private static final Logger log = LoggerFactory.getLogger(FileAsyncCacheService.class);
+    private boolean cacheFinish;
 
     @Resource
     private SystemConfigService systemConfigService;
@@ -42,5 +42,14 @@ public class FileAsyncCacheService {
         }
         long endTime = System.currentTimeMillis();
         log.info("缓存 {} 所有文件结束, 用时: {} 秒", storageStrategy.getDescription(), ( (endTime - startTime) / 1000 ));
+        cacheFinish = true;
+    }
+
+    public boolean isCacheFinish() {
+        return cacheFinish;
+    }
+
+    public void setCacheFinish(boolean cacheFinish) {
+        this.cacheFinish = cacheFinish;
     }
 }

src/main/java/im/zhaojun/common/service/SystemConfigService.java

@@ -1,6 +1,8 @@
 package im.zhaojun.common.service;
 
 import cn.hutool.crypto.SecureUtil;
+import com.alicp.jetcache.Cache;
+import com.alicp.jetcache.anno.CreateCache;
 import im.zhaojun.common.config.StorageTypeFactory;
 import im.zhaojun.common.model.SystemConfig;
 import im.zhaojun.common.model.constant.SystemConfigConstant;
@@ -8,6 +10,7 @@ import im.zhaojun.common.model.dto.SystemConfigDTO;
 import im.zhaojun.common.model.enums.StorageTypeEnum;
 import im.zhaojun.common.repository.SystemConfigRepository;
 import im.zhaojun.common.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -17,13 +20,29 @@ import java.util.List;
 /**
  * @author zhaojun
  */
+@Slf4j
 @Service
 public class SystemConfigService {
 
+    public static final String SYSTEM_CONFIG_CACHE_PREFIX = "zfile-config-cache:";
+
+    public static final String SYSTEM_CONFIG_CACHE_KEY = "1";
+
+    @CreateCache(name = SYSTEM_CONFIG_CACHE_PREFIX)
+    private Cache<String, Object> configCache;
+
     @Resource
     private SystemConfigRepository systemConfigRepository;
 
+    @Resource
+    private FileAsyncCacheService fileAsyncCacheService;
+
     public SystemConfigDTO getSystemConfig() {
+        Object cache = configCache.get(SYSTEM_CONFIG_CACHE_KEY);
+        if (configCache.get(SYSTEM_CONFIG_CACHE_KEY) != null) {
+            return (SystemConfigDTO) cache;
+        }
+
         SystemConfigDTO systemConfigDTO = new SystemConfigDTO();
         List<SystemConfig> systemConfigList = systemConfigRepository.findAll();
 
@@ -61,10 +80,12 @@ public class SystemConfigService {
             }
         }
 
+        configCache.put(SYSTEM_CONFIG_CACHE_KEY, systemConfigDTO);
         return systemConfigDTO;
     }
 
-    public void updateSystemConfig(SystemConfigDTO systemConfigDTO) {
+    public void updateSystemConfig(SystemConfigDTO systemConfigDTO) throws Exception {
+
         List<SystemConfig> systemConfigList = new ArrayList<>();
 
         SystemConfig systemConfig = systemConfigRepository.findByKey(SystemConfigConstant.SITE_NAME);
@@ -87,6 +108,9 @@ public class SystemConfigService {
         searchIgnoreCaseSystemConfig.setValue(systemConfigDTO.getSearchIgnoreCase() ? "true" : "false");
         systemConfigList.add(searchIgnoreCaseSystemConfig);
 
+        boolean oldEnableCache = getEnableCache();
+        Boolean curEnableCache = systemConfigDTO.getEnableCache();
+
         SystemConfig enableCacheSystemConfig = systemConfigRepository.findByKey(SystemConfigConstant.ENABLE_CACHE);
         enableCacheSystemConfig.setValue(systemConfigDTO.getEnableCache() ? "true" : "false");
         systemConfigList.add(enableCacheSystemConfig);
@@ -107,7 +131,14 @@ public class SystemConfigService {
             systemConfigList.add(passwordSystemConfig);
         }
 
+        configCache.remove(SYSTEM_CONFIG_CACHE_KEY);
+
         systemConfigRepository.saveAll(systemConfigList);
+
+        if (!oldEnableCache && curEnableCache) {
+            log.debug("检测到开启了缓存, 开启预热缓存");
+            fileAsyncCacheService.cacheGlobalFile();
+        }
     }
 
     public void updateUsernameAndPwd(String username, String password) {
@@ -119,6 +150,8 @@ public class SystemConfigService {
         SystemConfig systemConfig = systemConfigRepository.findByKey(SystemConfigConstant.PASSWORD);
         systemConfig.setValue(encryptionPassword);
 
+        configCache.remove(SYSTEM_CONFIG_CACHE_KEY);
+
         systemConfigRepository.save(systemConfig);
     }
 

src/main/java/im/zhaojun/ftp/service/FtpServiceImpl.java

@@ -14,13 +14,13 @@ import im.zhaojun.common.util.StringUtils;
 import org.apache.commons.net.ftp.FTPFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -39,24 +39,28 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
 
     @Override
     public void init() {
-       try {
-           Map<String, StorageConfig> stringStorageConfigMap =
-                   storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.FTP);
-           String host = stringStorageConfigMap.get(StorageConfigConstant.HOST_KEY).getValue();
-           String port = stringStorageConfigMap.get(StorageConfigConstant.PORT_KEY).getValue();
-           String username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue();
-           String password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
-           domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
+        try {
+            Map<String, StorageConfig> stringStorageConfigMap =
+                    storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.FTP);
+            String host = stringStorageConfigMap.get(StorageConfigConstant.HOST_KEY).getValue();
+            String port = stringStorageConfigMap.get(StorageConfigConstant.PORT_KEY).getValue();
+            String username = stringStorageConfigMap.get(StorageConfigConstant.USERNAME_KEY).getValue();
+            String password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
+            domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
 
-           ftp = new Ftp(host, Integer.parseInt(port), username, password);
-           isInitialized = testConnection();
-       } catch (Exception e) {
-           log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
-       }
+            if (Objects.isNull(host) || Objects.isNull(port) || Objects.isNull(username) || Objects.isNull(password)) {
+                isInitialized = true;
+            } else {
+                ftp = new Ftp(host, Integer.parseInt(port), username, password);
+                isInitialized = testConnection();
+            }
+
+        } catch (Exception e) {
+            log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
+        }
     }
 
     @Override
-    @Cacheable
     public List<FileItemDTO> fileList(String path) {
         FTPFile[] ftpFiles = ftp.lsFiles(path);
 
@@ -78,7 +82,6 @@ public class FtpServiceImpl extends AbstractFileService implements FileService {
     }
 
     @Override
-    @Cacheable
     public String getDownloadUrl(String path) {
         return URLUtil.complateUrl(domain, path);
     }

src/main/java/im/zhaojun/huawei/service/HuaweiServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -35,12 +36,16 @@ public class HuaweiServiceImpl extends AbstractS3FileService implements FileServ
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "obs")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "obs")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/local/service/LocalServiceImpl.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -45,7 +46,11 @@ public class LocalServiceImpl extends AbstractFileService implements FileService
             Map<String, StorageConfig> stringStorageConfigMap =
                     storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.LOCAL);
             filePath = stringStorageConfigMap.get(StorageConfigConstant.FILE_PATH_KEY).getValue();
-            isInitialized = testConnection();
+            if (Objects.isNull(filePath)) {
+                isInitialized = false;
+            } else {
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/minio/MinIOServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -33,12 +34,16 @@ public class MinIOServiceImpl extends AbstractS3FileService implements FileServi
             bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "minio")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "minio")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/qiniu/service/QiniuServiceImpl.java

@@ -11,10 +11,10 @@ import im.zhaojun.common.service.AbstractS3FileService;
 import im.zhaojun.common.service.FileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -36,12 +36,16 @@ public class QiniuServiceImpl extends AbstractS3FileService implements FileServi
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "kodo")).build();
+            if (Objects.isNull(accessKey) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "kodo")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/tencent/TencentServiceImpl.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -29,17 +30,21 @@ public class TencentServiceImpl extends AbstractS3FileService implements FileSer
             Map<String, StorageConfig> stringStorageConfigMap = storageConfigService.selectStorageConfigMapByKey(StorageTypeEnum.TENCENT);
             String secretId = stringStorageConfigMap.get(StorageConfigConstant.SECRET_ID_KEY).getValue();
             String secretKey = stringStorageConfigMap.get(StorageConfigConstant.SECRET_KEY).getValue();
-            String regionName = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
+            String endPoint = stringStorageConfigMap.get(StorageConfigConstant.ENDPOINT_KEY).getValue();
             bucketName = stringStorageConfigMap.get(StorageConfigConstant.BUCKET_NAME_KEY).getValue();
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
 
-            BasicAWSCredentials credentials = new BasicAWSCredentials(secretId, secretKey);
-            s3Client = AmazonS3ClientBuilder.standard()
-                    .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(regionName, "cos")).build();
+            if (Objects.isNull(secretId) || Objects.isNull(secretKey) || Objects.isNull(endPoint) || Objects.isNull(bucketName)) {
+                isInitialized = false;
+            } else {
+                BasicAWSCredentials credentials = new BasicAWSCredentials(secretId, secretKey);
+                s3Client = AmazonS3ClientBuilder.standard()
+                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
+                        .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, "cos")).build();
 
-            isInitialized = testConnection();
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }

src/main/java/im/zhaojun/upyun/service/UpYunServiceImpl.java

@@ -1,5 +1,6 @@
 package im.zhaojun.upyun.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.URLUtil;
 import com.UpYun;
 import im.zhaojun.common.model.StorageConfig;
@@ -13,7 +14,6 @@ import im.zhaojun.common.service.StorageConfigService;
 import im.zhaojun.common.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhaojun
@@ -51,15 +52,20 @@ public class UpYunServiceImpl extends AbstractFileService implements FileService
             String password = stringStorageConfigMap.get(StorageConfigConstant.PASSWORD_KEY).getValue();
             domain = stringStorageConfigMap.get(StorageConfigConstant.DOMAIN_KEY).getValue();
             basePath = stringStorageConfigMap.get(StorageConfigConstant.BASE_PATH).getValue();
-            upYun = new UpYun(bucketName, username, password);
-            isInitialized = testConnection();
+            basePath = ObjectUtil.defaultIfNull(basePath, "");
+
+            if (Objects.isNull(bucketName) || Objects.isNull(username) || Objects.isNull(password)) {
+                isInitialized = false;
+            } else {
+                upYun = new UpYun(bucketName, username, password);
+                isInitialized = testConnection();
+            }
         } catch (Exception e) {
             log.debug(getStorageTypeEnum().getDescription() + "初始化异常, 已跳过");
         }
     }
 
     @Override
-    @Cacheable
     public List<FileItemDTO> fileList(String path) throws Exception {
         ArrayList<FileItemDTO> fileItemList = new ArrayList<>();
         String nextMark = null;
@@ -94,7 +100,6 @@ public class UpYunServiceImpl extends AbstractFileService implements FileService
     }
 
     @Override
-    @Cacheable
     public String getDownloadUrl(String path) {
         return URLUtil.complateUrl(domain, path);
     }

src/main/resources/application.yml

@@ -1,8 +1,7 @@
 logging:
   level:
     im:
-      zhaojun:
-        common: debug
+      zhaojun: info
   path: ${user.home}/.zfile/logs
 
 server: