diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MinioUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MinioUtil.java index 45720d93..175ebf15 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MinioUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MinioUtil.java @@ -7,6 +7,7 @@ import io.minio.errors.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URLDecoder; @@ -58,7 +59,7 @@ public class MinioUtil { * @return */ public static String upload(MultipartFile file, String bizPath, String customBucket) { - String file_url = ""; + String fileUrl = ""; //update-begin-author:wangshuai date:20201012 for: 过滤上传文件夹名特殊字符,防止攻击 bizPath=StrAttackFilter.filter(bizPath); //update-end-author:wangshuai date:20201012 for: 过滤上传文件夹名特殊字符,防止攻击 @@ -86,8 +87,8 @@ public class MinioUtil { orgName=file.getName(); } orgName = CommonUtils.getFileName(orgName); - String objectName = bizPath+"/" - +( orgName.indexOf(".")==-1 + String objectName = bizPath+File.separator + +(!orgName.contains(".") ?orgName + "_" + System.currentTimeMillis() :orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf(".")) ); @@ -101,11 +102,11 @@ public class MinioUtil { .stream(stream,stream.available(),-1).build(); minioClient.putObject(objectArgs); stream.close(); - file_url = minioUrl+newBucket+"/"+objectName; + fileUrl = minioUrl+newBucket+ File.separator +objectName; }catch (Exception e){ log.error(e.getMessage(), e); } - return file_url; + return fileUrl; } /**