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;