by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zcxlsm
2025-09-15 15:59:30 +08:00
parent 3f52dd9091 d25c87da64
commit 0fb33c0de9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
View File

@@ -452,8 +452,9 @@ public class OssClient {
// MinIO 单独处理 // MinIO 单独处理
if (StringUtils.isNotEmpty(domain)) { if (StringUtils.isNotEmpty(domain)) {
// 如果 domain 以 "https://" 或 "http://" 开头 // 如果 domain 以 "https://" 或 "http://" 开头
return (domain.startsWith(Constants.HTTPS) || domain.startsWith(Constants.HTTP)) ? // return (domain.startsWith(Constants.HTTPS) || domain.startsWith(Constants.HTTP)) ?
domain + StringUtils.SLASH + properties.getBucketName() : header + domain + StringUtils.SLASH + properties.getBucketName(); // domain + StringUtils.SLASH + properties.getBucketName() : header + domain + StringUtils.SLASH + properties.getBucketName();
return StringUtils.SLASH + properties.getBucketName();
} }
return header + endpoint + StringUtils.SLASH + properties.getBucketName(); return header + endpoint + StringUtils.SLASH + properties.getBucketName();
} }