diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java index b9dbd557..9dca172e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/AliyunOssConfig.java @@ -60,6 +60,12 @@ public class AliyunOssConfig { * 3、公共读写 */ private Long expiryDuration = 32400L; + /** + * 使用内网,还是外网 + * true: 内网,必须是aliyun公网服务器 + * false: 外网 + */ + private Boolean internal = false; public String getAccessKey() { return accessKey; @@ -117,4 +123,12 @@ public class AliyunOssConfig { public void setExpiryDuration(Long expiryDuration) { this.expiryDuration = expiryDuration; } + + public Boolean getInternal() { + return internal; + } + + public void setInternal(Boolean internal) { + this.internal = internal; + } } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java index 132dfaac..d55bcdc5 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssDsfServiceImpl.java @@ -72,6 +72,7 @@ public class AliyunOssDsfServiceImpl implements ISysFileService { String requestKey = "upload/" + StringUtils.defaultString(modules, "default") + "/" + newName; //这里增加一个前缀区分一下是测试环境还是正式环境 boolean isProd = "prod".equalsIgnoreCase(SpringUtil.getActiveProfile()); + boolean isInternalNetwork = aliyunOssConfig.getInternal(); if (!isProd) { requestKey = SpringUtil.getActiveProfile() + "/" + requestKey; } @@ -88,10 +89,10 @@ public class AliyunOssDsfServiceImpl implements ISysFileService { long mb5 = 5 * 1024 * 1024L; if (file.getSize() > mb5) { //大于5mb,我们就分片上传 - this.ossUploadFileBigMultiable(isProd ? endpointInternal : endpoint, requestKey, file); + this.ossUploadFileBigMultiable(isInternalNetwork ? endpointInternal : endpoint, requestKey, file); } else { //否则,我们常规上传 - this.ossUploadFileSmall(isProd ? endpointInternal : endpoint, requestKey, file); + this.ossUploadFileSmall(isInternalNetwork ? endpointInternal : endpoint, requestKey, file); } // 解析结果