✨ 缓存功能优化, 更高效的管理缓存.

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

@@ -1,6 +1,7 @@
 package im.zhaojun.common.controller;
 
 import im.zhaojun.common.model.StorageConfig;
+import im.zhaojun.common.model.dto.CacheConfigDTO;
 import im.zhaojun.common.model.dto.ResultBean;
 import im.zhaojun.common.model.dto.SystemConfigDTO;
 import im.zhaojun.common.model.enums.StorageTypeEnum;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 后台管理
@@ -46,15 +48,6 @@ public class AdminController {
         return ResultBean.success(systemConfigDTO);
     }
 
-    /**
-     * 更新系统配置
-     */
-    @PostMapping("/update-pwd")
-    public ResultBean updatePwd(String username, String password) {
-        systemConfigService.updateUsernameAndPwd(username, password);
-        return ResultBean.success();
-    }
-
     /**
      * 更新系统配置
      */
@@ -72,23 +65,61 @@ public class AdminController {
         return ResultBean.success();
     }
 
+    /**
+     * 修改管理员登陆密码
+     */
+    @PostMapping("/update-pwd")
+    public ResultBean updatePwd(String username, String password) {
+        systemConfigService.updateUsernameAndPwd(username, password);
+        return ResultBean.success();
+    }
 
+    /**
+     * 获取指定存储引擎的设置
+     * @param storageType   存储引擎
+     * @return              所有设置
+     */
     @GetMapping("/strategy-form")
     public ResultBean getFormByStorageType(StorageTypeEnum storageType) {
         List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageType);
         return ResultBean.success(storageConfigList);
     }
 
-    /**
-     * 清理当前启用的存储引擎的缓存
-     */
-    @PostMapping("/clear-cache")
-    public ResultBean clearCache() {
+    @GetMapping("/cache/config")
+    public ResultBean cacheConfig() throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        Set<String> cacheKeys = fileService.getCacheKeys();
+
+        CacheConfigDTO cacheConfigDTO = new CacheConfigDTO();
+        cacheConfigDTO.setEnableCache(systemConfigService.getEnableCache());
+        cacheConfigDTO.setCacheFinish(fileAsyncCacheService.isCacheFinish());
+        cacheConfigDTO.setCacheKeys(cacheKeys);
+
+        return ResultBean.success(cacheConfigDTO);
+    }
+
+    @PostMapping("/cache/refresh")
+    public ResultBean refreshCache(String key) throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        fileService.refreshCache(key);
+        return ResultBean.success();
+    }
+
+    @PostMapping("/cache/clear")
+    public ResultBean clearCache(String key) throws Exception {
         AbstractFileService fileService = systemConfigService.getCurrentFileService();
         fileService.clearCache();
         return ResultBean.success();
     }
 
+    @PostMapping("/cache/all")
+    public ResultBean cacheAll() throws Exception {
+        AbstractFileService fileService = systemConfigService.getCurrentFileService();
+        fileService.clearCache();
+        fileAsyncCacheService.cacheGlobalFile();
+        return ResultBean.success();
+    }
+
     /**
      * 更新存储策略
      */
@@ -112,4 +143,5 @@ public class AdminController {
             fileAsyncCacheService.cacheGlobalFile();
         }
     }
+
 }

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

@@ -86,7 +86,7 @@ public class FileController {
         int start = (page - 1) * PAGE_SIZE;
         int end = page * PAGE_SIZE;
         end = Math.min(end, total);
-        List<FileItemDTO> fileSubItem = fileItemList.subList(start, end);
+        List<FileItemDTO> fileSubItem = new ArrayList<>(fileItemList.subList(start, end));
         return ResultBean.successData(fileSubItem);
     }
 
@@ -115,7 +115,7 @@ public class FileController {
 
     @CheckStorageStrategyInit
     @GetMapping("/clearCache")
-    public ResultBean clearCache() {
+    public ResultBean clearCache() throws Exception {
         AbstractFileService fileService = systemConfigService.getCurrentFileService();
         if (fileService != null) {
             fileService.clearCache();

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

@@ -79,7 +79,7 @@ public class InstallController {
 
     @PostMapping("/storage-strategy")
     @ResponseBody
-    public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) {
+    public ResultBean save(@RequestParam Map<String, String> storageStrategyConfig, StorageTypeEnum storageStrategy) throws Exception {
         List<StorageConfig> storageConfigList = storageConfigService.selectStorageConfigByType(storageStrategy);
         for (StorageConfig storageConfig : storageConfigList) {
             String key = storageConfig.getKey();