|
@@ -20,12 +20,15 @@ import com.amazonaws.services.s3.AmazonS3;
|
|
|
import com.amazonaws.services.s3.model.*;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.SneakyThrows;
|
|
|
+import org.springblade.common.utils.SnowFlakeUtil;
|
|
|
import org.springblade.core.oss.OssTemplate;
|
|
|
import org.springblade.core.oss.enums.PolicyType;
|
|
|
import org.springblade.core.oss.model.BladeFile;
|
|
|
import org.springblade.core.oss.model.OssFile;
|
|
|
import org.springblade.core.oss.props.OssProperties;
|
|
|
import org.springblade.core.oss.rule.OssRule;
|
|
|
+import org.springblade.core.tool.utils.DateUtil;
|
|
|
+import org.springblade.core.tool.utils.FileUtil;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.core.tool.utils.StringPool;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
@@ -417,6 +420,15 @@ public class S3Template2 implements OssTemplate {
|
|
|
* @return string
|
|
|
*/
|
|
|
private String getFileName(String originalFilename) {
|
|
|
+ return fileName(originalFilename);
|
|
|
+ }
|
|
|
+
|
|
|
+ public String fileName(String originalFilename) {
|
|
|
+ //试验-规范管理
|
|
|
+ if(originalFilename.contains("|")){
|
|
|
+ String[] split = originalFilename.split("\\|");
|
|
|
+ return "upload/" + split[0] + "/" + DateUtil.today() + "/" + SnowFlakeUtil.getId() + "." + FileUtil.getFileExtension(split[1]);
|
|
|
+ }
|
|
|
return ossRule.fileName(originalFilename);
|
|
|
}
|
|
|
|