abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!207 update 优化 OSS 自定义域名拼接 无需配置HTTP等前缀

Browse Source 
Merge pull request !207 from JaneYork/4.X
This commit is contained in:
疯狂的狮子Li 2022-07-18 03:50:54 +00:00 committed by Gitee
commit 369e4be31c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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