|
@@ -17,8 +17,6 @@ import org.springframework.beans.factory.InitializingBean;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
import java.nio.charset.StandardCharsets;
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
-import java.util.LinkedHashMap;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -37,11 +35,11 @@ public class OssTemplate implements InitializingBean {
|
|
|
|
|
|
|
|
private OSS ossClient;
|
|
private OSS ossClient;
|
|
|
|
|
|
|
|
- public R<PolicyVO> getPolicy() {
|
|
|
|
|
|
|
+ public R<PolicyVO> getPolicy(String dirStr) {
|
|
|
|
|
|
|
|
String format = LocalDate.now().format(DatePattern.NORM_DATE_FORMATTER);
|
|
String format = LocalDate.now().format(DatePattern.NORM_DATE_FORMATTER);
|
|
|
// 用户上传文件时指定的前缀。
|
|
// 用户上传文件时指定的前缀。
|
|
|
- String dir = properties.getFilePrefix() + StrUtil.SLASH + format + StrUtil.SLASH + UUID.randomUUID();
|
|
|
|
|
|
|
+ String dir = properties.getFilePrefix() + StrUtil.SLASH + dirStr + StrUtil.SLASH + format + StrUtil.SLASH + UUID.randomUUID();
|
|
|
//上传过期时间
|
|
//上传过期时间
|
|
|
long expireEndTime = System.currentTimeMillis() + 30 * 1000;
|
|
long expireEndTime = System.currentTimeMillis() + 30 * 1000;
|
|
|
Date expiration = new Date(expireEndTime);
|
|
Date expiration = new Date(expireEndTime);
|