aliyun oss 增加:使用内网接口还是外网接口配置

pull/84/head
duandazhi 3 years ago
parent 12c6751404
commit 21e13c3779

@ -60,6 +60,12 @@ public class AliyunOssConfig {
* 3 * 3
*/ */
private Long expiryDuration = 32400L; private Long expiryDuration = 32400L;
/**
* 使
* true: aliyun
* false:
*/
private Boolean internal = false;
public String getAccessKey() { public String getAccessKey() {
return accessKey; return accessKey;
@ -117,4 +123,12 @@ public class AliyunOssConfig {
public void setExpiryDuration(Long expiryDuration) { public void setExpiryDuration(Long expiryDuration) {
this.expiryDuration = expiryDuration; this.expiryDuration = expiryDuration;
} }
public Boolean getInternal() {
return internal;
}
public void setInternal(Boolean internal) {
this.internal = internal;
}
} }

@ -72,6 +72,7 @@ public class AliyunOssDsfServiceImpl implements ISysFileService {
String requestKey = "upload/" + StringUtils.defaultString(modules, "default") + "/" + newName; String requestKey = "upload/" + StringUtils.defaultString(modules, "default") + "/" + newName;
//这里增加一个前缀区分一下是测试环境还是正式环境 //这里增加一个前缀区分一下是测试环境还是正式环境
boolean isProd = "prod".equalsIgnoreCase(SpringUtil.getActiveProfile()); boolean isProd = "prod".equalsIgnoreCase(SpringUtil.getActiveProfile());
boolean isInternalNetwork = aliyunOssConfig.getInternal();
if (!isProd) { if (!isProd) {
requestKey = SpringUtil.getActiveProfile() + "/" + requestKey; requestKey = SpringUtil.getActiveProfile() + "/" + requestKey;
} }
@ -88,10 +89,10 @@ public class AliyunOssDsfServiceImpl implements ISysFileService {
long mb5 = 5 * 1024 * 1024L; long mb5 = 5 * 1024 * 1024L;
if (file.getSize() > mb5) { if (file.getSize() > mb5) {
//大于5mb,我们就分片上传 //大于5mb,我们就分片上传
this.ossUploadFileBigMultiable(isProd ? endpointInternal : endpoint, requestKey, file); this.ossUploadFileBigMultiable(isInternalNetwork ? endpointInternal : endpoint, requestKey, file);
} else { } else {
//否则,我们常规上传 //否则,我们常规上传
this.ossUploadFileSmall(isProd ? endpointInternal : endpoint, requestKey, file); this.ossUploadFileSmall(isInternalNetwork ? endpointInternal : endpoint, requestKey, file);
} }
// 解析结果 // 解析结果

Loading…
Cancel
Save