diff --git a/src/main/java/com/youlai/system/controller/FileController.java b/src/main/java/com/youlai/system/controller/FileController.java index b805a1ed..ea602b19 100644 --- a/src/main/java/com/youlai/system/controller/FileController.java +++ b/src/main/java/com/youlai/system/controller/FileController.java @@ -32,9 +32,9 @@ public class FileController { @ApiOperation(value = "文件删除") @SneakyThrows public Result deleteFile( - @ApiParam("文件路径") @RequestParam String fileName + @ApiParam("文件路径") @RequestParam String filePath ) { - boolean result = fileService.deleteFile(fileName); + boolean result = fileService.deleteFile(filePath); return Result.judge(result); } } diff --git a/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java b/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java index aaaba9d9..176b7957 100644 --- a/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java @@ -72,7 +72,12 @@ public class MinioServiceImpl implements FileService, InitializingBean { .build(); } - + /** + * 上传文件 + * + * @param file 表单文件对象 + * @return + */ @Override @SneakyThrows public FileInfo uploadFile(MultipartFile file) { @@ -116,10 +121,20 @@ public class MinioServiceImpl implements FileService, InitializingBean { } - + /** + * 删除文件 + * + * @param filePath 文件路径 + * https://oss.youlai.tech/default/2022/11/20/test.jpg + * @return + */ @Override @SneakyThrows - public boolean deleteFile(String fileName) { + public boolean deleteFile(String filePath) { + Assert.notBlank(filePath, "删除文件路径不能为空"); + String tempStr = "/" + bucketName + "/"; + String fileName = filePath.substring(filePath.indexOf(tempStr) + tempStr.length()); // 2022/11/20/test.jpg + RemoveObjectArgs removeObjectArgs = RemoveObjectArgs.builder() .bucket(bucketName) .object(fileName)