|
@@ -526,17 +526,26 @@ public class AliyunFileStorageImpl implements FileStorage {
|
|
|
// 阿里云文件路径
|
|
|
String path = FreeMarkerUtil.process(as.getPath(), env);
|
|
|
path = disposePath(path);
|
|
|
- if (StringUtils.isNotBlank(md5)) {
|
|
|
- md5 = Base64.getEncoder().encodeToString(Hex.decodeHex(md5));
|
|
|
- ObjectMetadata meta = new ObjectMetadata();
|
|
|
- meta.setContentMD5(md5);
|
|
|
- if(cacheAge!=null) {
|
|
|
- meta.setCacheControl("max-age="+cacheAge);
|
|
|
- }
|
|
|
- oss.putObject(bucket, path, in, meta);
|
|
|
- } else {
|
|
|
- oss.putObject(bucket, path, in);
|
|
|
+// if (StringUtils.isNotBlank(md5)) {
|
|
|
+// md5 = Base64.getEncoder().encodeToString(Hex.decodeHex(md5));
|
|
|
+// ObjectMetadata meta = new ObjectMetadata();
|
|
|
+// meta.setContentMD5(md5);
|
|
|
+// if(cacheAge!=null) {
|
|
|
+// meta.setCacheControl("max-age="+cacheAge);
|
|
|
+// }
|
|
|
+// oss.putObject(bucket, path, in, meta);
|
|
|
+// } else {
|
|
|
+// oss.putObject(bucket, path, in);
|
|
|
+// }
|
|
|
+ ObjectMetadata meta = new ObjectMetadata();
|
|
|
+ if (StringUtils.isNotBlank(md5) ) {
|
|
|
+ md5 = Base64.getEncoder().encodeToString(Hex.decodeHex(md5) );
|
|
|
+ meta.setContentMD5(md5 );
|
|
|
+ }
|
|
|
+ if(cacheAge!=null ) {
|
|
|
+ meta.setCacheControl("max-age="+cacheAge );
|
|
|
}
|
|
|
+ oss.putObject(bucket, path, in, meta );
|
|
|
|
|
|
return path;
|
|
|
}
|