From 77ac99a1d0cad1f8d48f45a6f8e2d93d29c8f105 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 12 七月 2022 22:52:06 +0800
Subject: [PATCH] !198 Merge remote-tracking branch 'origin/dev' into dev Merge pull request !198 from 孤舟烟雨/auto-494979-dev-1657633741164
---
ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 03c8396..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
@@ -125,13 +125,13 @@
// 浜戞湇鍔″晢鐩存帴杩斿洖
if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)){
if (StringUtils.isNotBlank(domain)) {
- return domain;
+ return header + domain;
}
return header + properties.getBucketName() + "." + endpoint;
}
// minio 鍗曠嫭澶勭悊
if (StringUtils.isNotBlank(domain)) {
- return domain + "/" + properties.getBucketName();
+ return header + domain + "/" + properties.getBucketName();
}
return header + endpoint + "/" + properties.getBucketName();
}
--
Gitblit v1.9.3