|
|
@@ -86,8 +86,11 @@ public class OssServiceImpl implements OssService {
|
|
|
String policy = BinaryUtil.toBase64String(binaryData);
|
|
|
String signature = ossClient.calculatePostSignature(postPolicy);
|
|
|
String callbackData = BinaryUtil.toBase64String(JSONUtil.parse(callback).toString().getBytes("utf-8"));
|
|
|
+ String now = String.valueOf(System.currentTimeMillis()) + "_";
|
|
|
+ Random rand = new Random();
|
|
|
+ int random = rand.nextInt();
|
|
|
resultBean.set("accessid",ossClient.getCredentialsProvider().getCredentials().getAccessKeyId()).set("policy",policy).set("signature",signature)
|
|
|
- .set("dir",dir).set("expire",String.valueOf(expireEndTime / 1000)).set("callback",callbackData).set("host",action);
|
|
|
+ .set("dir",dir+"/"+now + String.valueOf(random > 0 ? random : (-1) * random)).set("expire",String.valueOf(expireEndTime / 1000)).set("callback",callbackData).set("host",action);
|
|
|
// 返回结果
|
|
|
} catch (Exception e) {
|
|
|
LOGGER.error("签名生成失败", e);
|
|
|
@@ -113,25 +116,25 @@ public class OssServiceImpl implements OssService {
|
|
|
RandomFilename = now + String.valueOf(random > 0 ? random : (-1) * random);
|
|
|
switch(ossRequest.getImageStatus()){
|
|
|
case 0 :
|
|
|
- RandomFilename = "avatar"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "avatar"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
case 1 :
|
|
|
- RandomFilename = "IDNumber"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "IDNumber"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
case 2 :
|
|
|
- RandomFilename = "QuestionBank"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "QuestionBank"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
case 3 :
|
|
|
- RandomFilename = "guide"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "guide"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
case 4 :
|
|
|
- RandomFilename = "advertising"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "advertising"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
case 5 :
|
|
|
- RandomFilename = "IDCard"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "IDCard"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
case 6 :
|
|
|
- RandomFilename = "file"+"/"+sdf.format(new Date())+"/"+RandomFilename;
|
|
|
+ RandomFilename = "file"+"/"+sdf.format(new Date());
|
|
|
break;
|
|
|
}
|
|
|
|