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

reset 回滚错误合并

Browse Source
This commit is contained in:
疯狂的狮子li 2022-07-18 11:55:52 +08:00
parent 369e4be31c
commit 6f83ed3285
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() {
String header = OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? "https://" : "http://";
String domain = properties.getDomain();
if (StringUtils.isNotBlank(domain)) {
return header + domain;
return domain;
}
String endpoint = properties.getEndpoint();
String header = OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? "https://" : "http://";
// 云服务商直接返回
if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)){
return header + properties.getBucketName() + "." + endpoint;