Merge pull request #35 from besscroft/dev

🎉v0.7.0
besscroft · Aug 5, 2023 · 6ae54e1 · 6ae54e1
2 parents 528e22c + d30b927
commit 6ae54e1
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 203 deletions.
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -1,5 +1,5 @@
 # 该镜像需要依赖的基础镜像
-FROM eclipse-temurin:17.0.7_7-jre-jammy
+FROM eclipse-temurin:17.0.8_7-jre-jammy
 # 设置环境变量
 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m -Dfile.encoding=utf-8" SPRING_CONFIG="--spring.application.name=diyfile" SPRING_PROFILE="sqlite"
 # 设置时区

diff --git a/diyfile-common/src/main/java/com/besscroft/diyfile/common/result/AjaxResult.java b/diyfile-common/src/main/java/com/besscroft/diyfile/common/result/AjaxResult.java
diff --git a/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java b/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java
@@ -20,7 +20,7 @@ public OpenAPI springShopOpenAPI() {
         return new OpenAPI()
                 .info(new Info().title("DiyFile")
                         .description("一款好看的在线文件列表程序")
-                        .version("v0.6.1")
+                        .version("v0.7.0")
                         .license(new License().name("MIT license").url("https://github.com/besscroft/diyfile/blob/main/LICENSE")))
                 .externalDocs(new ExternalDocumentation()
                         .description("DiyFile 文档")

diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/FileController.java b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/FileController.java
@@ -6,7 +6,6 @@
 import com.besscroft.diyfile.common.constant.MessageConstants;
 import com.besscroft.diyfile.common.constant.RoleConstants;
 import com.besscroft.diyfile.common.param.file.*;
-import com.besscroft.diyfile.common.result.AjaxResult;
 import com.besscroft.diyfile.common.result.CommonResult;
 import com.besscroft.diyfile.common.util.PathUtils;
 import com.besscroft.diyfile.common.vo.FileInfoVo;
@@ -87,8 +86,8 @@ public CommonResult<FileInfoVo> getFileInfo(@RequestBody GetFileInfoParam param)
     )
     @Operation(summary = "获取文件上传地址")
     @PostMapping("/getUploadUrl")
-    public AjaxResult getUploadUrl(@RequestBody @Valid GetUploadUrlParam param) {
-        return AjaxResult.success("获取成功！", fileService.getUploadUrl(param.getStorageKey(), param.getPath()));
+    public CommonResult<String> getUploadUrl(@RequestBody @Valid GetUploadUrlParam param) {
+        return CommonResult.success("获取成功！", fileService.getUploadUrl(param.getStorageKey(), param.getPath()));
     }
 
     @SaCheckRole(
@@ -101,20 +100,20 @@ public AjaxResult getUploadUrl(@RequestBody @Valid GetUploadUrlParam param) {
     )
     @Operation(summary = "删除文件接口")
     @PostMapping("/deleteFile")
-    public AjaxResult deleteFile(@RequestBody @Valid DeleteFileParam param) {
+    public CommonResult<Void> deleteFile(@RequestBody @Valid DeleteFileParam param) {
         // 校验路径
         PathUtils.checkPath(param.getPath());
         fileService.deleteFile(param.getStorageKey(), param.getPath());
-        return AjaxResult.success(MessageConstants.DELETE_SUCCESS);
+        return CommonResult.success(MessageConstants.DELETE_SUCCESS);
     }
 
     @SaIgnore
     @Operation(summary = "获取文件下载地址")
     @PostMapping("/getDownloadUrl")
-    public AjaxResult getDownloadUrl(@RequestBody @Valid GetDownloadUrlParam param) {
+    public CommonResult<String> getDownloadUrl(@RequestBody @Valid GetDownloadUrlParam param) {
         // 校验路径
         PathUtils.checkPath(param.getPath());
-        return AjaxResult.success("获取成功！", fileService.getDownloadUrl(param.getStorageKey(), param.getPath(), param.getFullPath()));
+        return CommonResult.success("获取成功！", fileService.getDownloadUrl(param.getStorageKey(), param.getPath(), param.getFullPath()));
     }
 
     @SaIgnore

diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/MonitorController.java b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/MonitorController.java
@@ -5,7 +5,6 @@
 import com.besscroft.diyfile.common.constant.RoleConstants;
 import com.besscroft.diyfile.common.dto.ServerInfo;
 import com.besscroft.diyfile.common.exception.DiyFileException;
-import com.besscroft.diyfile.common.result.AjaxResult;
 import com.besscroft.diyfile.common.result.CommonResult;
 import com.besscroft.diyfile.service.SystemConfigService;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -15,6 +14,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * @Description 系统监控
  * @Author Bess Croft
@@ -36,8 +37,8 @@ public CommonResult<ServerInfo> serverInfo() {
 
     @Operation(summary = "统计信息接口")
     @GetMapping("/getTotalInfo")
-    public AjaxResult getTotalInfo() {
-        return AjaxResult.success(systemConfigService.getTotalInfo());
+    public CommonResult<Map<String, Object>> getTotalInfo() {
+        return CommonResult.success(systemConfigService.getTotalInfo());
     }
 
     @SaCheckRole(
@@ -48,9 +49,9 @@ public AjaxResult getTotalInfo() {
     )
     @Operation(summary = "获取备份数据")
     @GetMapping("/getBackupFile")
-    public AjaxResult getBackupFile() {
+    public CommonResult<String> getBackupFile() {
         try {
-            return AjaxResult.success("success", systemConfigService.getBackupJsonString());
+            return CommonResult.success("success", systemConfigService.getBackupJsonString());
         } catch (JsonProcessingException e) {
             throw new DiyFileException("获取备份数据失败！");
         }
@@ -64,9 +65,9 @@ public AjaxResult getBackupFile() {
     )
     @Operation(summary = "恢复数据")
     @PostMapping("/restoreData")
-    public AjaxResult restoreData(@ModelAttribute MultipartFile file) {
+    public CommonResult<Void> restoreData(@ModelAttribute MultipartFile file) {
         systemConfigService.restoreData(file);
-        return AjaxResult.success("恢复数据成功！");
+        return CommonResult.success("恢复数据成功！");
     }
 
 }
diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/StorageController.java b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/StorageController.java
@@ -11,7 +11,6 @@
 import com.besscroft.diyfile.common.param.storage.StorageAddParam;
 import com.besscroft.diyfile.common.param.storage.StorageUpdateParam;
 import com.besscroft.diyfile.common.param.storage.StorageUpdateStatusParam;
-import com.besscroft.diyfile.common.result.AjaxResult;
 import com.besscroft.diyfile.common.result.CommonResult;
 import com.besscroft.diyfile.common.util.CommonPage;
 import com.besscroft.diyfile.common.vo.StorageInfoVo;
@@ -66,9 +65,9 @@ public CommonResult<CommonPage<Storage>> storagePage(@RequestParam("pageNum") In
             mode = SaMode.OR
     )
     @DeleteMapping("/delete/{storageId:[\\d]+}")
-    public AjaxResult delete(@PathVariable(name = "storageId") Long storageId) {
+    public CommonResult<Void> delete(@PathVariable(name = "storageId") Long storageId) {
         storageService.deleteStorage(storageId);
-        return AjaxResult.success(MessageConstants.DELETE_SUCCESS);
+        return CommonResult.success(MessageConstants.DELETE_SUCCESS);
     }
 
     @Operation(summary = "存储新增接口")
@@ -81,15 +80,15 @@ public AjaxResult delete(@PathVariable(name = "storageId") Long storageId) {
             mode = SaMode.OR
     )
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody @Valid StorageAddParam param) {
+    public CommonResult<Void> add(@RequestBody @Valid StorageAddParam param) {
         if (Objects.equals("proxy", param.getStorageKey())) {
             throw new DiyFileException("存储 key 不能为 proxy");
         }
         if (StrUtil.contains(param.getStorageKey(), "/")) {
             throw new DiyFileException("存储 key 不能包含 /");
         }
         storageService.addStorage(param);
-        return AjaxResult.success(MessageConstants.ADD_SUCCESS);
+        return CommonResult.success(MessageConstants.ADD_SUCCESS);
     }
 
     @Operation(summary = "存储更新接口")
@@ -102,9 +101,9 @@ public AjaxResult add(@RequestBody @Valid StorageAddParam param) {
             mode = SaMode.OR
     )
     @PutMapping("/update")
-    public AjaxResult update(@RequestBody @Valid StorageUpdateParam param) {
+    public CommonResult<Void> update(@RequestBody @Valid StorageUpdateParam param) {
         storageService.updateStorage(param);
-        return AjaxResult.success(MessageConstants.UPDATE_SUCCESS);
+        return CommonResult.success(MessageConstants.UPDATE_SUCCESS);
     }
 
     @Operation(summary = "存储详情接口")
@@ -138,9 +137,9 @@ public CommonResult<StorageInfoVo> info(@PathVariable(name = "storageKey") Strin
             mode = SaMode.OR
     )
     @PutMapping("/updateStatus")
-    public AjaxResult updateStatus(@RequestBody @Valid StorageUpdateStatusParam param) {
+    public CommonResult<Void> updateStatus(@RequestBody @Valid StorageUpdateStatusParam param) {
         storageService.updateStatus(param.getStorageId(), param.getStatus());
-        return AjaxResult.success(MessageConstants.UPDATE_SUCCESS);
+        return CommonResult.success(MessageConstants.UPDATE_SUCCESS);
     }
 
     @Operation(summary = "默认存储设置")
@@ -153,9 +152,9 @@ public AjaxResult updateStatus(@RequestBody @Valid StorageUpdateStatusParam para
             mode = SaMode.OR
     )
     @PutMapping("/setDefault/{storageId:[\\d]+}")
-    public AjaxResult setDefault(@PathVariable(name = "storageId") Long storageId) {
+    public CommonResult<Void> setDefault(@PathVariable(name = "storageId") Long storageId) {
         storageService.setDefault(storageId);
-        return AjaxResult.success(MessageConstants.UPDATE_SUCCESS);
+        return CommonResult.success(MessageConstants.UPDATE_SUCCESS);
     }
 
     @SaIgnore

diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/SyncController.java b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/SyncController.java
@@ -1,7 +1,7 @@
 package com.besscroft.diyfile.controller;
 
 import com.besscroft.diyfile.common.param.sync.SyncTaskParam;
-import com.besscroft.diyfile.common.result.AjaxResult;
+import com.besscroft.diyfile.common.result.CommonResult;
 import com.besscroft.diyfile.common.util.PathUtils;
 import com.besscroft.diyfile.service.SyncService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,14 +27,14 @@ public class SyncController {
 
     @PostMapping("/taskAdd")
     @Operation(summary = "添加同步任务")
-    public AjaxResult taskAdd(@RequestBody SyncTaskParam param) {
+    public CommonResult<Void> taskAdd(@RequestBody SyncTaskParam param) {
         PathUtils.checkPath(param.getBeforePath());
         PathUtils.checkPath(param.getAfterPath());
         syncService.taskAdd(param.getBeforeStorageKey(),
                 PathUtils.decode(param.getBeforePath()),
                 param.getAfterStorageKey(),
                 PathUtils.decode(param.getAfterPath()));
-        return AjaxResult.success();
+        return CommonResult.success();
     }
 
 }