From 8a6f6a055b75a11b03b2f931cd1872a00b8c9e3d Mon Sep 17 00:00:00 2001 From: XSWL1018 <824576966@qq.com> Date: Wed, 19 Jun 2024 09:36:23 +0800 Subject: [PATCH] init --- .../{DiskFileUtil.java => DiskFileService.java} | 4 ++-- .../common/utils/file/FileOperateUtils.java | 10 +++++----- .../file/{FileUtil.java => FileService.java} | 16 ++++++++-------- ...{MinioFileUtil.java => MinioFileService.java} | 5 ++--- 4 files changed, 17 insertions(+), 18 deletions(-) rename ruoyi-common/src/main/java/com/ruoyi/common/utils/file/{DiskFileUtil.java => DiskFileService.java} (96%) rename ruoyi-common/src/main/java/com/ruoyi/common/utils/file/{FileUtil.java => FileService.java} (95%) rename ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/{MinioFileUtil.java => MinioFileService.java} (94%) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileUtil.java rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java index 43df3b7..51c47b5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java @@ -20,12 +20,12 @@ import static com.ruoyi.common.utils.file.FileUtils.getPathFileName; * 磁盘文件操作实现类 */ @Component("file:strategy:disk") -public class DiskFileUtil implements FileUtil { +public class DiskFileService implements FileService { private static String defaultBaseDir = RuoYiConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { - DiskFileUtil.defaultBaseDir = defaultBaseDir; + DiskFileService.defaultBaseDir = defaultBaseDir; } public static String getDefaultBaseDir() { 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 0d1b410..ffa06a1 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 @@ -16,7 +16,7 @@ import java.io.OutputStream; */ public class FileOperateUtils { - private static FileUtil fileUtil = SpringUtils.getBean("file:strategy:" + RuoYiConfig.getFileServer()); + private static FileService fileService = SpringUtils.getBean("file:strategy:" + RuoYiConfig.getFileServer()); /** * 默认大小 50M */ @@ -36,7 +36,7 @@ public class FileOperateUtils { public static final String upload(MultipartFile file) throws IOException { try { FileUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - return fileUtil.upload(file); + return fileService.upload(file); } catch (Exception e) { throw new IOException(e.getMessage(), e); } @@ -53,7 +53,7 @@ public class FileOperateUtils { */ public static final String upload(String filePath, MultipartFile file, String[] allowedExtension) throws Exception { FileUtils.assertAllowed(file, allowedExtension); - return fileUtil.upload(filePath, file); + return fileService.upload(filePath, file); } /** @@ -86,7 +86,7 @@ public class FileOperateUtils { * @throws IOException */ public static final void downLoad(String fileUrl, OutputStream outputStream) throws Exception { - InputStream inputStream = fileUtil.downLoad(fileUrl); + InputStream inputStream = fileService.downLoad(fileUrl); FileUtils.writeBytes(inputStream, outputStream); } @@ -98,6 +98,6 @@ public class FileOperateUtils { * @throws IOException */ public static final boolean deleteFile(String fileUrl) throws Exception { - return fileUtil.deleteFile(fileUrl); + return fileService.deleteFile(fileUrl); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtil.java rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java index 51b8d16..e452b1d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java @@ -9,7 +9,7 @@ import java.io.InputStream; /** * 文件操作接口 */ -public interface FileUtil { +public interface FileService { /** * 文件上传 @@ -18,7 +18,7 @@ public interface FileUtil { * @param file 文件对象 * @return 返回上传成功的文路径 * @throws IOException 比如读写文件出错时 - * + * */ public String upload(String filePath, MultipartFile file) throws Exception; @@ -29,17 +29,17 @@ public interface FileUtil { * @param file 文件对象 * @return 返回上传成功的文路径 * @throws IOException 比如读写文件出错时 - * + * */ public String upload(MultipartFile file, String name) throws Exception; /** * 文件上传 - * + * * @param file 文件对象 * @return 返回上传成功的文路径 * @throws IOException 比如读写文件出错时 - * + * */ public String upload(MultipartFile file) throws Exception; @@ -51,7 +51,7 @@ public interface FileUtil { * @param file 文件对象 * @return 返回上传成功的文路径 * @throws IOException 比如读写文件出错时 - * + * */ public String upload(String baseDir, String fileName, MultipartFile file) throws Exception; @@ -61,7 +61,7 @@ public interface FileUtil { * @param filePath 下载的文件路径 * @return 返回上传成功的文路径 * @throws IOException 比如读写文件出错时 - * + * */ public InputStream downLoad(String filePath) throws Exception; @@ -71,7 +71,7 @@ public interface FileUtil { * @param filePath 删除的文件路径 * @return 返回上传成功的文路径 * @throws IOException 比如读写文件出错时 - * + * */ public boolean deleteFile(String filePath) throws Exception; } diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileService.java similarity index 94% rename from ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java rename to ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileService.java index 7be7e4f..8555fc4 100644 --- a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileUtil.java +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/MinioFileService.java @@ -1,9 +1,8 @@ package com.ruoyi.middleware.minio.utils; import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtil; +import com.ruoyi.common.utils.file.FileService; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.middleware.minio.config.MinioConfig; @@ -18,7 +17,7 @@ import java.io.InputStream; * Minio文件操作实现类 */ @Component("file:strategy:minio") -public class MinioFileUtil implements FileUtil { +public class MinioFileService implements FileService { private static MinioConfig minioConfig = SpringUtils.getBean(MinioConfig.class); @Override