From 99830cb70701a0f778bf1842b371b8c7897eb530 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Wed, 20 Sep 2023 17:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/backend/UploadController.java    | 13 ++++++++++---
 .../common/constant/BPermissionConstant.java        |  2 ++
 .../playedu/system/checks/AdminPermissionCheck.java | 12 ++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java
index ab6d6ca..baf997a 100644
--- a/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java
+++ b/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java
@@ -24,7 +24,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import xyz.playedu.api.request.backend.UploadFileMergeRequest;
+import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
+import xyz.playedu.common.constant.BPermissionConstant;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.context.BCtx;
@@ -48,6 +50,7 @@ public class UploadController {
 
     @Autowired private ResourceService resourceService;
 
+    @BackendPermission(slug = BPermissionConstant.UPLOAD)
     @PostMapping("/minio")
     @Log(title = "上传-MinIO", businessType = BusinessTypeConstant.UPLOAD)
     public JsonResponse uploadMinio(
@@ -58,11 +61,12 @@ public class UploadController {
         return JsonResponse.data(res);
     }
 
+    @BackendPermission(slug = BPermissionConstant.UPLOAD)
     @GetMapping("/minio/upload-id")
     @Log(title = "上传-MinIO-uploadId", businessType = BusinessTypeConstant.UPLOAD)
     public JsonResponse minioUploadId(@RequestParam HashMap<String, Object> params) {
         String extension = MapUtils.getString(params, "extension");
-        if (extension == null || extension.trim().length() == 0) {
+        if (extension == null || extension.trim().isEmpty()) {
             return JsonResponse.error("extension参数为空");
         }
         String type = BackendConstant.RESOURCE_EXT_2_TYPE.get(extension.toLowerCase());
@@ -82,6 +86,7 @@ public class UploadController {
         return JsonResponse.data(data);
     }
 
+    @BackendPermission(slug = BPermissionConstant.UPLOAD)
     @GetMapping("/minio/pre-sign-url")
     @Log(title = "上传-MinIO-签名URL", businessType = BusinessTypeConstant.UPLOAD)
     public JsonResponse minioPreSignUrl(@RequestParam HashMap<String, Object> params) {
@@ -97,6 +102,7 @@ public class UploadController {
         return JsonResponse.data(data);
     }
 
+    @BackendPermission(slug = BPermissionConstant.UPLOAD)
     @PostMapping("/minio/merge-file")
     @Log(title = "上传-MinIO-文件合并", businessType = BusinessTypeConstant.UPLOAD)
     public JsonResponse minioMergeFile(@RequestBody @Validated UploadFileMergeRequest req)
@@ -143,15 +149,16 @@ public class UploadController {
         return JsonResponse.data(data);
     }
 
+    @BackendPermission(slug = BPermissionConstant.UPLOAD)
     @GetMapping("/minio/merge")
     @Log(title = "上传-MinIO-文件合并", businessType = BusinessTypeConstant.UPLOAD)
     public JsonResponse minioMerge(@RequestParam HashMap<String, Object> params) {
         String filename = MapUtils.getString(params, "filename");
         String uploadId = MapUtils.getString(params, "upload_id");
-        if (filename == null || filename.trim().length() == 0) {
+        if (filename == null || filename.trim().isEmpty()) {
             return JsonResponse.error("filename必填");
         }
-        if (uploadId == null || uploadId.trim().length() == 0) {
+        if (uploadId == null || uploadId.trim().isEmpty()) {
             return JsonResponse.error("uploadId必填");
         }
 
diff --git a/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java b/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java
index 31f8d74..64a37f8 100644
--- a/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java
+++ b/playedu-common/src/main/java/xyz/playedu/common/constant/BPermissionConstant.java
@@ -47,6 +47,8 @@ public class BPermissionConstant {
 
     public static final String SYSTEM_CONFIG = "system-config";
 
+    public static final String UPLOAD = "upload";
+
     // ##### 友情分割线 ##################################################
 
     public static final String DATA_USER_NAME = "data-user-name";
diff --git a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java
index 4e9e8bd..83085d7 100644
--- a/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java
+++ b/playedu-system/src/main/java/xyz/playedu/system/checks/AdminPermissionCheck.java
@@ -220,6 +220,18 @@ public class AdminPermissionCheck implements CommandLineRunner {
                                                     }
                                                 },
                                             });
+                                    // 其它
+                                    put(
+                                            "其它权限",
+                                            new AdminPermission[] {
+                                                new AdminPermission() {
+                                                    {
+                                                        setSort(0);
+                                                        setName("文件上传");
+                                                        setSlug(BPermissionConstant.UPLOAD);
+                                                    }
+                                                },
+                                            });
                                 }
                             });
                     put(