oss兼容
This commit is contained in:
@@ -154,7 +154,7 @@ public class FileStorageUtil {
|
|||||||
filePath = dir + minIoUtils.minFileName(multipartFile.getOriginalFilename());
|
filePath = dir + minIoUtils.minFileName(multipartFile.getOriginalFilename());
|
||||||
obsUtil.uploadMultipart(multipartFile, filePath);
|
obsUtil.uploadMultipart(multipartFile, filePath);
|
||||||
} else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
|
} else if (generalInfo.getBusinessFileStorage() == GeneralConstant.AliYUN_OSS) {
|
||||||
filePath = dir.endsWith("/")?dir+multipartFile.getOriginalFilename():dir+"/"+multipartFile.getOriginalFilename();
|
filePath = dir.endsWith("/")?dir+getFileNameWithoutPath(multipartFile):dir+"/"+getFileNameWithoutPath(multipartFile);
|
||||||
aliYunOssUtils.uploadFile(dir, multipartFile);
|
aliYunOssUtils.uploadFile(dir, multipartFile);
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
@@ -167,6 +167,15 @@ public class FileStorageUtil {
|
|||||||
}
|
}
|
||||||
return filePath;
|
return filePath;
|
||||||
}
|
}
|
||||||
|
public static String getFileNameWithoutPath(MultipartFile file) {
|
||||||
|
String originalFilename = file.getOriginalFilename();
|
||||||
|
if (originalFilename == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// 统一分隔符为 '/',再取最后一部分
|
||||||
|
String normalized = originalFilename.replace('\\', '/');
|
||||||
|
return normalized.substring(normalized.lastIndexOf('/') + 1);
|
||||||
|
}
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* 上传InputStream流,
|
* 上传InputStream流,
|
||||||
|
|||||||
Reference in New Issue
Block a user