From a2843b599dca4edc4bb72a34ff268c2e1df6c62d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 16 七月 2022 15:44:26 +0800
Subject: [PATCH] !205 StreamUtils优化分组方法返回由HashMap无序转为LinkedHashMap有序 Merge pull request !205 from 抓蛙师/auto-7465549-dev-1657957318499
---
ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
index 6f6be8f..f255f15 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
@@ -120,16 +120,19 @@
public String getUrl() {
String domain = properties.getDomain();
- if (StringUtils.isNotBlank(domain)) {
- return domain;
- }
String endpoint = properties.getEndpoint();
String header = OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? "https://" : "http://";
// 浜戞湇鍔″晢鐩存帴杩斿洖
if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)){
+ if (StringUtils.isNotBlank(domain)) {
+ return header + domain;
+ }
return header + properties.getBucketName() + "." + endpoint;
}
// minio 鍗曠嫭澶勭悊
+ if (StringUtils.isNotBlank(domain)) {
+ return header + domain + "/" + properties.getBucketName();
+ }
return header + endpoint + "/" + properties.getBucketName();
}
--
Gitblit v1.9.3