From 94797a2d2b815fe7a4e8d884059a34e1d9bc74f3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 五月 2024 15:14:16 +0800
Subject: [PATCH] fix 修复 oss未使用租户 拼接租户id null问题
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
index d70270a..3da1ba5 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
@@ -48,7 +48,10 @@
}
OssProperties properties = JsonUtils.parseObject(json, OssProperties.class);
// 浣跨敤绉熸埛鏍囪瘑閬垮厤澶氫釜绉熸埛鐩稿悓key瀹炰緥瑕嗙洊
- String key = properties.getTenantId() + ":" + configKey;
+ String key = configKey;
+ if (StringUtils.isNotBlank(properties.getTenantId())) {
+ key = properties.getTenantId() + ":" + configKey;
+ }
OssClient client = CLIENT_CACHE.get(key);
// 瀹㈡埛绔笉瀛樺湪鎴栭厤缃笉鐩稿悓鍒欓噸鏂版瀯寤�
if (client == null || !client.checkPropertiesSame(properties)) {
--
Gitblit v1.9.3