🎨 优化代码结构, 拆分代码

src/main/java/im/zhaojun/zfile/controller/admin/AdminController.java

@@ -1,30 +1,15 @@
 package im.zhaojun.zfile.controller.admin;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ZipUtil;
-import im.zhaojun.zfile.context.StorageTypeContext;
-import im.zhaojun.zfile.model.dto.ResultBean;
-import im.zhaojun.zfile.model.dto.StorageStrategyDTO;
 import im.zhaojun.zfile.model.dto.SystemConfigDTO;
-import im.zhaojun.zfile.model.entity.StorageConfig;
-import im.zhaojun.zfile.model.enums.StorageTypeEnum;
-import im.zhaojun.zfile.model.support.SystemMonitorInfo;
+import im.zhaojun.zfile.model.support.ResultBean;
 import im.zhaojun.zfile.service.SystemConfigService;
-import im.zhaojun.zfile.service.base.AbstractBaseFileService;
-import im.zhaojun.zfile.util.FileUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 管理后台接口
@@ -52,7 +37,7 @@ public class AdminController {
      * 更新系统配置
      */
     @PostMapping("/config")
-    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) throws Exception {
+    public ResultBean updateConfig(SystemConfigDTO systemConfigDTO) {
         systemConfigDTO.setId(1);
         systemConfigService.updateSystemConfig(systemConfigDTO);
         return ResultBean.success();
@@ -68,52 +53,4 @@ public class AdminController {
         return ResultBean.success();
     }
 
-
-    /**
-     * 获取指定存储策略的表单域
-     *
-     * @param   storageType
-     *          存储策略
-     *
-     * @return  所有表单域
-     */
-    @GetMapping("/strategy-form")
-    public ResultBean getFormByStorageType(StorageTypeEnum storageType) {
-        AbstractBaseFileService storageTypeService = StorageTypeContext.getStorageTypeService(storageType);
-        List<StorageConfig> storageConfigList = storageTypeService.storageStrategyConfigList();
-        return ResultBean.success(storageConfigList);
-    }
-
-
-    /**
-     * 返回支持的存储引擎.
-     */
-    @GetMapping("/support-strategy")
-    public ResultBean supportStrategy() {
-        List<StorageStrategyDTO> result = new ArrayList<>();
-        StorageTypeEnum[] values = StorageTypeEnum.values();
-        return ResultBean.successData(values);
-    }
-
-
-    /**
-     * 系统日志下载
-     */
-    @GetMapping("/log")
-    public ResponseEntity<Object> downloadLog(HttpServletResponse response) {
-        String userHome = System.getProperty("user.home");
-        File fileZip = ZipUtil.zip(userHome + "/.zfile/logs");
-        String currentDate = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
-        return FileUtil.export(fileZip, "ZFile 诊断日志 - " + currentDate + ".zip");
-    }
-
-
-    /**
-     * 获取系统监控信息
-     */
-    @GetMapping("monitor")
-    public ResultBean monitor() {
-        return ResultBean.success(new SystemMonitorInfo());
-    }
-
 }

src/main/java/im/zhaojun/zfile/controller/admin/CacheController.java

@@ -1,7 +1,7 @@
 package im.zhaojun.zfile.controller.admin;
 
 import im.zhaojun.zfile.model.dto.CacheInfoDTO;
-import im.zhaojun.zfile.model.dto.ResultBean;
+import im.zhaojun.zfile.model.support.ResultBean;
 import im.zhaojun.zfile.service.DriveConfigService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/im/zhaojun/zfile/controller/admin/DriveController.java

@@ -1,8 +1,8 @@
 package im.zhaojun.zfile.controller.admin;
 
 import im.zhaojun.zfile.model.dto.DriveConfigDTO;
-import im.zhaojun.zfile.model.dto.ResultBean;
 import im.zhaojun.zfile.model.entity.DriveConfig;
+import im.zhaojun.zfile.model.support.ResultBean;
 import im.zhaojun.zfile.service.DriveConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * 驱动器 Controller
+ * 驱动器相关操作 Controller
  * @author zhaojun
  */
 @RestController
@@ -34,7 +34,7 @@ public class DriveController {
      *
      * @return  驱动器列表
      */
-    @GetMapping("drives")
+    @GetMapping("/drives")
     public ResultBean driveList() {
         List<DriveConfig> list = driveConfigService.list();
         return ResultBean.success(list);
@@ -47,9 +47,9 @@ public class DriveController {
      * @param   id
      *          驱动器 ID
      *
-     * @return  驱动器基本信息信息
+     * @return  驱动器基本信息
      */
-    @GetMapping("drive/{id}")
+    @GetMapping("/drive/{id}")
     public ResultBean driveItem(@PathVariable Integer id) {
         DriveConfigDTO driveConfig = driveConfigService.findDriveConfigDTOById(id);
         return ResultBean.success(driveConfig);
@@ -59,7 +59,7 @@ public class DriveController {
     /**
      * 保存驱动器设置
      */
-    @PostMapping("drive")
+    @PostMapping("/drive")
     public ResultBean saveDriveItem(@RequestBody DriveConfigDTO driveConfigDTO) {
         driveConfigService.save(driveConfigDTO);
         return ResultBean.success();
@@ -72,7 +72,7 @@ public class DriveController {
      * @param   id
      *          驱动器 ID
      */
-    @DeleteMapping("drive/{id}")
+    @DeleteMapping("/drive/{id}")
     public ResultBean deleteDriveItem(@PathVariable Integer id) {
         driveConfigService.deleteById(id);
         return ResultBean.success();

src/main/java/im/zhaojun/zfile/controller/admin/LogController.java

@@ -0,0 +1,36 @@
+package im.zhaojun.zfile.controller.admin;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ZipUtil;
+import im.zhaojun.zfile.util.FileUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.Date;
+
+/**
+ * 日志相关 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+@Slf4j
+public class LogController {
+
+    /**
+     * 系统日志下载
+     */
+    @GetMapping("/log")
+    public ResponseEntity<Object> downloadLog(HttpServletResponse response) {
+        String userHome = System.getProperty("user.home");
+        File fileZip = ZipUtil.zip(userHome + "/.zfile/logs");
+        String currentDate = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        return FileUtil.export(fileZip, "ZFile 诊断日志 - " + currentDate + ".zip");
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/admin/MateDataController.java

@@ -0,0 +1,49 @@
+package im.zhaojun.zfile.controller.admin;
+
+import im.zhaojun.zfile.context.StorageTypeContext;
+import im.zhaojun.zfile.model.entity.StorageConfig;
+import im.zhaojun.zfile.model.enums.StorageTypeEnum;
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.service.base.AbstractBaseFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 系统元数据 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+@Slf4j
+public class MateDataController {
+
+    /**
+     * 返回支持的存储引擎.
+     */
+    @GetMapping("/support-strategy")
+    public ResultBean supportStrategy() {
+        StorageTypeEnum[] values = StorageTypeEnum.values();
+        return ResultBean.successData(values);
+    }
+
+
+    /**
+     * 获取指定存储策略的表单域
+     *
+     * @param   storageType
+     *          存储策略
+     *
+     * @return  所有表单域
+     */
+    @GetMapping("/strategy-form")
+    public ResultBean getFormByStorageType(StorageTypeEnum storageType) {
+        AbstractBaseFileService storageTypeService = StorageTypeContext.getStorageTypeService(storageType);
+        List<StorageConfig> storageConfigList = storageTypeService.storageStrategyConfigList();
+        return ResultBean.success(storageConfigList);
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/admin/MonitorController.java

@@ -0,0 +1,28 @@
+package im.zhaojun.zfile.controller.admin;
+
+import im.zhaojun.zfile.model.support.ResultBean;
+import im.zhaojun.zfile.model.support.SystemMonitorInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统监控 Controller
+ * @author zhaojun
+ */
+@RestController
+@RequestMapping("/admin")
+@Slf4j
+public class MonitorController {
+
+
+    /**
+     * 获取系统监控信息
+     */
+    @GetMapping("monitor")
+    public ResultBean monitor() {
+        return ResultBean.success(new SystemMonitorInfo());
+    }
+
+}

src/main/java/im/zhaojun/zfile/controller/home/LocalController.java

@@ -1,7 +1,8 @@
-package im.zhaojun.zfile.controller;
+package im.zhaojun.zfile.controller.home;
 
-import im.zhaojun.zfile.service.impl.LocalServiceImpl;
 import im.zhaojun.zfile.context.DriveContext;
+import im.zhaojun.zfile.model.constant.ZFileConstant;
+import im.zhaojun.zfile.service.impl.LocalServiceImpl;
 import im.zhaojun.zfile.util.FileUtil;
 import im.zhaojun.zfile.util.StringUtils;
 import org.springframework.http.ResponseEntity;