From 8d69be093e8ba490994b11bb51c6b23ca5ff1c84 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 26 五月 2023 16:29:45 +0800
Subject: [PATCH] fix 修复 OssClient 实例多租户相同key缓存覆盖问题
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java | 5 +++++
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java | 8 +++++---
2 files changed, 10 insertions(+), 3 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 084d89a..911d9a8 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
@@ -45,15 +45,17 @@
throw new OssException("绯荤粺寮傚父, '" + configKey + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
}
OssProperties properties = JsonUtils.parseObject(json, OssProperties.class);
- OssClient client = CLIENT_CACHE.get(configKey);
+ // 浣跨敤绉熸埛鏍囪瘑閬垮厤澶氫釜绉熸埛鐩稿悓key瀹炰緥瑕嗙洊
+ String key = properties.getTenantId() + ":" + configKey;
+ OssClient client = CLIENT_CACHE.get(key);
if (client == null) {
- CLIENT_CACHE.put(configKey, new OssClient(configKey, properties));
+ CLIENT_CACHE.put(key, new OssClient(configKey, properties));
log.info("鍒涘缓OSS瀹炰緥 key => {}", configKey);
return CLIENT_CACHE.get(configKey);
}
// 閰嶇疆涓嶇浉鍚屽垯閲嶆柊鏋勫缓
if (!client.checkPropertiesSame(properties)) {
- CLIENT_CACHE.put(configKey, new OssClient(configKey, properties));
+ CLIENT_CACHE.put(key, new OssClient(configKey, properties));
log.info("閲嶈浇OSS瀹炰緥 key => {}", configKey);
return CLIENT_CACHE.get(configKey);
}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java
index 697530b..cb37206 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java
@@ -11,6 +11,11 @@
public class OssProperties {
/**
+ * 绉熸埛id
+ */
+ private String tenantId;
+
+ /**
* 璁块棶绔欑偣
*/
private String endpoint;
--
Gitblit v1.9.3