admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复 minio 上传自定义域名回显路径错误问题

Browse Source
This commit is contained in:
疯狂的狮子li 2022-07-05 15:20:32 +08:00
parent 9cd4f0c332
commit 1bb1b3886b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
View File

@ -120,16 +120,19 @@ public class OssClient {
public String getUrl() { public String getUrl() {
String domain = properties.getDomain(); String domain = properties.getDomain();
if (StringUtils.isNotBlank(domain)) {
return domain;
}
String endpoint = properties.getEndpoint(); String endpoint = properties.getEndpoint();
String header = OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? "https://" : "http://"; String header = OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? "https://" : "http://";
// 云服务商直接返回 // 云服务商直接返回
if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)){ if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)){
if (StringUtils.isNotBlank(domain)) {
return domain;
}
return header + properties.getBucketName() + "." + endpoint; return header + properties.getBucketName() + "." + endpoint;
} }
// minio 单独处理 // minio 单独处理
if (StringUtils.isNotBlank(domain)) {
return domain + "/" + properties.getBucketName();
}
return header + endpoint + "/" + properties.getBucketName(); return header + endpoint + "/" + properties.getBucketName();
} }