refactor(minio): 使用 Hutool 的 FileUtil 替代自定义文件扩展名方法
- 引入 cn.hutool.core.io.FileUtil 工具类 - 将获取文件扩展名的方法替换为 FileUtil.getSuffix() - 移除原有的 getFileExtension() 自定义实现 - 统一文件名生成逻辑中的扩展名处理方式
This commit is contained in:
+3
-13
@@ -18,6 +18,7 @@ package cn.odboy.system.framework.storage.minio;
|
|||||||
|
|
||||||
import cn.hutool.core.io.FastByteArrayOutputStream;
|
import cn.hutool.core.io.FastByteArrayOutputStream;
|
||||||
import cn.hutool.core.io.FileTypeUtil;
|
import cn.hutool.core.io.FileTypeUtil;
|
||||||
|
import cn.hutool.core.io.FileUtil;
|
||||||
import cn.hutool.core.io.IORuntimeException;
|
import cn.hutool.core.io.IORuntimeException;
|
||||||
import cn.hutool.core.lang.UUID;
|
import cn.hutool.core.lang.UUID;
|
||||||
import cn.hutool.core.util.IdUtil;
|
import cn.hutool.core.util.IdUtil;
|
||||||
@@ -143,7 +144,7 @@ public class MinioRepository {
|
|||||||
String suffix = CsFileUtil.getSuffix(tempFile);
|
String suffix = CsFileUtil.getSuffix(tempFile);
|
||||||
|
|
||||||
String fileCode = IdUtil.fastSimpleUUID();
|
String fileCode = IdUtil.fastSimpleUUID();
|
||||||
String fileName = fileCode + getFileExtension(originalFilename);
|
String fileName = fileCode + FileUtil.getSuffix(originalFilename);
|
||||||
String objectName = CsDateUtil.getNowDateStr() + "/" + fileName;
|
String objectName = CsDateUtil.getNowDateStr() + "/" + fileName;
|
||||||
log.info("上传文件,原文件名:{},上传后文件名:{}", originalFilename, fileName);
|
log.info("上传文件,原文件名:{},上传后文件名:{}", originalFilename, fileName);
|
||||||
String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
String fileUrl = ossMinioConfig.getEndpoint() + "/" + ossMinioConfig.getBucketName() + "/" + objectName;
|
||||||
@@ -194,7 +195,7 @@ public class MinioRepository {
|
|||||||
long size = file.getSize();
|
long size = file.getSize();
|
||||||
CsFileUtil.checkSize(properties.getOss().getMaxSize(), size);
|
CsFileUtil.checkSize(properties.getOss().getMaxSize(), size);
|
||||||
|
|
||||||
String fileName = UUID.randomUUID() + getFileExtension(originalFilename);
|
String fileName = UUID.randomUUID() + FileUtil.getSuffix(originalFilename);
|
||||||
// yyyy/MM/dd/fileName.xxx
|
// yyyy/MM/dd/fileName.xxx
|
||||||
String objectName = CsDateUtil.getNowDateTimeStr() + "/" + fileName;
|
String objectName = CsDateUtil.getNowDateTimeStr() + "/" + fileName;
|
||||||
|
|
||||||
@@ -236,17 +237,6 @@ public class MinioRepository {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取文件扩展名
|
|
||||||
*
|
|
||||||
* @param fileName 文件名
|
|
||||||
* @return String 文件扩展名
|
|
||||||
*/
|
|
||||||
private String getFileExtension(String fileName) {
|
|
||||||
int lastIndex = fileName.lastIndexOf(".");
|
|
||||||
return lastIndex == -1 ? "" : fileName.substring(lastIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成文件的预签名 URL,用于文件预览
|
* 生成文件的预签名 URL,用于文件预览
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user