From ba5616e5c89b6a697d713f136db208ead05cc7ae Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Wed, 25 Sep 2024 09:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=AD=98=E5=82=A8=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/RemoteFileService.java | 11 +++++++++++
 .../api/factory/RemoteFileFallbackFactory.java       |  5 +++++
 .../bonus/common/core/utils/file/MimeTypeUtils.java  |  2 +-
 .../file/service/impl/FastDfsSysFileServiceImpl.java |  4 ++++
 .../file/service/impl/MinioSysFileServiceImpl.java   |  4 ++++
 .../bonus/file/service/impl/MongodbServiceImpl.java  |  6 ++++++
 .../com/bonus/file/service/impl/ObsServiceImpl.java  | 12 ++++++++----
 .../com/bonus/file/service/impl/OssServiceImpl.java  |  5 +++++
 .../java/com/bonus/file/utils/FileUploadUtils.java   | 11 ++++++-----
 9 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java
index c9574d7..c5a907c 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java
@@ -3,7 +3,9 @@ package com.bonus.system.api;
 import com.bonus.common.core.web.domain.AjaxResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 import com.bonus.common.core.constant.ServiceNameConstants;
@@ -34,4 +36,13 @@ public interface RemoteFileService
      */
     @PostMapping(value = "/uploadFiles", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public AjaxResult uploadFile(@RequestPart(value = "files") MultipartFile[] files);
+
+    /**
+     * 文件删除
+     * 从各个存储平台删除文件
+     * @param objectKey * @param objectKey，除mongodb 存fileid之外，其他均存上传文件的网络路径
+     * @return 成功或失败信息
+     */
+    @DeleteMapping("/deleteFile")
+    public AjaxResult deleteFile(@RequestParam("objectKey") String objectKey);
 }
diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java
index 8dc63fd..9057fc6 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java
@@ -36,6 +36,11 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
             public AjaxResult uploadFile(MultipartFile[] files) {
                 return AjaxResult.error("多上传文件失败:" + throwable.getMessage());
             }
+
+            @Override
+            public AjaxResult deleteFile(String objectKey) {
+                return AjaxResult.error("删除文件失败:" + throwable.getMessage());
+            }
         };
     }
 }
diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/MimeTypeUtils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/MimeTypeUtils.java
index 8a5849d..43c3820 100644
--- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/MimeTypeUtils.java
+++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/MimeTypeUtils.java
@@ -30,7 +30,7 @@ public class MimeTypeUtils
             // 图片
             "bmp", "gif", "jpg", "jpeg", "png",
             // word excel powerpoint
-            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+            "doc", "docx", "xls", "xlsx","csv", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
             "rar", "zip", "gz", "bz2",
             // 视频格式
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FastDfsSysFileServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FastDfsSysFileServiceImpl.java
index f9064f5..8a20cd0 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FastDfsSysFileServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FastDfsSysFileServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.nacos.common.utils.IoUtils;
+import com.bonus.common.core.utils.file.MimeTypeUtils;
 import com.bonus.file.service.ISysFileService;
 import com.bonus.file.utils.FileUploadUtils;
 import com.bonus.system.api.domain.SysFile;
@@ -49,6 +50,9 @@ public class FastDfsSysFileServiceImpl implements ISysFileService
     @Override
     public SysFile uploadFile(MultipartFile file) throws Exception
     {
+        //验证文件扩展名是否合法
+        FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+
         String fileName = FileUploadUtils.extractFilename(file);
         InputStream inputStream = file.getInputStream();
         StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(),
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MinioSysFileServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MinioSysFileServiceImpl.java
index 3c5f8f2..5a74ebf 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MinioSysFileServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MinioSysFileServiceImpl.java
@@ -4,6 +4,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.bonus.common.core.utils.file.MimeTypeUtils;
 import com.bonus.file.service.ISysFileService;
 import io.minio.RemoveObjectArgs;
 import org.apache.commons.io.IOUtils;
@@ -48,6 +49,9 @@ public class MinioSysFileServiceImpl implements ISysFileService
     @Override
     public SysFile uploadFile(MultipartFile file) throws Exception
     {
+        //验证文件扩展名和大小
+        FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+
         String fileName = FileUploadUtils.extractFilename(file);
         InputStream inputStream = file.getInputStream();
         PutObjectArgs args = PutObjectArgs.builder()
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MongodbServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MongodbServiceImpl.java
index ac5d9fa..0fb2299 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MongodbServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/MongodbServiceImpl.java
@@ -1,6 +1,8 @@
 package com.bonus.file.service.impl;
 
+import com.bonus.common.core.utils.file.MimeTypeUtils;
 import com.bonus.file.service.ISysFileService;
+import com.bonus.file.utils.FileUploadUtils;
 import com.bonus.system.api.domain.SysFile;
 
 import com.mongodb.client.gridfs.model.GridFSFile;
@@ -52,6 +54,10 @@ public class MongodbServiceImpl implements ISysFileService {
 
     @Override
     public SysFile uploadFile(MultipartFile file) throws Exception {
+
+        //验证文件扩展名和大小
+        FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+
         String fileName = file.getOriginalFilename();
         long fileSize = file.getSize();
 
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/ObsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/ObsServiceImpl.java
index b03ac21..223c2b9 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/ObsServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/ObsServiceImpl.java
@@ -1,7 +1,9 @@
 package com.bonus.file.service.impl;
 
 import com.bonus.common.core.domain.R;
+import com.bonus.common.core.utils.file.MimeTypeUtils;
 import com.bonus.file.service.ISysFileService;
+import com.bonus.file.utils.FileUploadUtils;
 import com.bonus.file.utils.ObsUtils;
 import com.alibaba.nacos.common.utils.UuidUtils;
 import com.bonus.common.core.utils.file.FileUtils;
@@ -46,18 +48,20 @@ public class ObsServiceImpl implements ISysFileService {
      * @return 文件信息
      */
     @Override
-    public SysFile uploadFile(MultipartFile file) {
+    public SysFile uploadFile(MultipartFile file) throws Exception {
         try {
+            //验证文件扩展名和大小
+            FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+
             String originalFilename = Objects.requireNonNull(file.getOriginalFilename(), "文件名不能为空");
             String extension = originalFilename.substring(originalFilename.lastIndexOf('.'));
             String objectKey = UuidUtils.generateUuid() + extension;
             objectKey = FileUtils.generateObjectName(objectKey);
-
-            SysFile sysFile = obsUtils.uploadFile(objectKey, FileUtils.multipartFileToFile(file));
+            SysFile sysFile = obsUtils.uploadFile(objectKey, Objects.requireNonNull(FileUtils.multipartFileToFile(file)));
             sysFile.setName(originalFilename);
             return sysFile;
         } catch (Exception e) {
-            return null;
+           throw new Exception(e);
         }
     }
 
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java
index db1168e..7bdaab0 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java
@@ -5,8 +5,10 @@ import com.aliyun.oss.model.OSSObject;
 import com.bonus.common.core.domain.R;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.utils.file.FileUtils;
+import com.bonus.common.core.utils.file.MimeTypeUtils;
 import com.bonus.file.controller.SysFileController;
 import com.bonus.file.service.ISysFileService;
+import com.bonus.file.utils.FileUploadUtils;
 import com.bonus.file.utils.OssUtils;
 import com.bonus.system.api.domain.SysFile;
 import org.apache.commons.lang3.ObjectUtils;
@@ -54,6 +56,9 @@ public class OssServiceImpl implements ISysFileService {
            throw new Exception("文件名为空");
         }
         try {
+            //验证文件扩展名和大小
+            FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+
             String originalFilename = Objects.requireNonNull(file.getOriginalFilename(), "文件名不能为空");
             String extension = originalFilename.substring(originalFilename.lastIndexOf('.'));
             String objectKey = UuidUtils.generateUuid() + extension;
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUploadUtils.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUploadUtils.java
index 107b760..935d5f6 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUploadUtils.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUploadUtils.java
@@ -127,11 +127,12 @@ public class FileUploadUtils
     public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
             throws FileSizeLimitExceededException, InvalidExtensionException
     {
-        long size = file.getSize();
-        if (size > DEFAULT_MAX_SIZE)
-        {
-            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
-        }
+//   这里不验证文件大小，使用Spring MVC中上传文件的最大大小 spring.servlet.multipart.max-file-size
+//        long size = file.getSize();
+//        if (size > DEFAULT_MAX_SIZE)
+//        {
+//            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+//        }
 
         String fileName = file.getOriginalFilename();
         String extension = FileTypeUtils.getExtension(file);