From 7fd4b6614a86c2a0aab3264fbfe5d5f3189bd2d0 Mon Sep 17 00:00:00 2001 From: dftre <3066417822@qq.com> Date: Sun, 29 Sep 2024 21:29:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(file-service):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1=E4=BB=A5=E6=94=B9=E8=BF=9B?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=92=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重构了文件上传和删除的实现,优化了文件服务的效率和可靠性。上传方法现在正确使用filePath参数,删除方法不再依赖于查询字符串参数。另外,纠正了MinioFileService中的文件删除逻辑,使其与更新的FileOperateUtils接口兼容。 - 重构了FileOperateUtils中的上传逻辑,并更新了MinioFileService以使用新的方法。 - 直接传递filePath到FileOperateUtils的deleteFileAndMd5ByFilePath方法,避免了解析查询字符串。 - 调整了MinioFileService中的deleteFile方法,以匹配FileOperateUtils接口的变化。 - 代码清理和优化,提高了可读性和可维护性。 --- .../common/utils/file/FileOperateUtils.java | 19 ++++++++++--------- .../minio/service/MinioFileService.java | 5 ++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java index 50199e2..4d7c8be 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java @@ -1,17 +1,18 @@ package com.ruoyi.common.utils.file; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.springframework.web.multipart.MultipartFile; + import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.utils.CacheUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sign.Md5Utils; import com.ruoyi.common.utils.spring.SpringUtils; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; /** * 文件上传工具类 @@ -69,9 +70,9 @@ public class FileOperateUtils { return pathForMd5; } FileUtils.assertAllowed(file, allowedExtension); - String pathFileName = fileService.upload(filePath, file); - FileOperateUtils.saveFileAndMd5(pathFileName, md5); - return pathFileName; + fileService.upload(filePath, file); + FileOperateUtils.saveFileAndMd5(filePath, md5); + return filePath; } /** diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java index 78e1cca..b661f6e 100644 --- a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java @@ -3,7 +3,6 @@ package com.ruoyi.middleware.minio.service; import java.io.File; import java.io.InputStream; -import com.ruoyi.common.utils.file.FileOperateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; @@ -11,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.file.FileOperateUtils; import com.ruoyi.common.utils.file.FileService; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.middleware.minio.config.MinioConfig; @@ -62,8 +62,7 @@ public class MinioFileService implements FileService { } @Override - public boolean deleteFile(String fileUrl) throws Exception { - String filePath = StringUtils.substringAfter(fileUrl, "?fileName="); + public boolean deleteFile(String filePath) throws Exception { MinioUtil.removeFile(minioConfig.getPrimary(), filePath); FileOperateUtils.deleteFileAndMd5ByFilePath(filePath); return true;