From 4ceb79afa35b2be369b8c84219524d687451974b Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期五, 29 十二月 2023 11:39:15 +0800
Subject: [PATCH] !467 新增 ThreadLocalHolder 整合 SaHolder，ThreadLocal * fix 修复 issue#I8RWB5 字段缺少问题 ; * add 新增 ThreadLocalHolder 替换 SaHolder ;
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..763b090 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
@@ -39,23 +39,25 @@
/**
* 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
*/
- public static OssClient instance(String configKey) {
+ public static synchronized OssClient instance(String configKey) {
String json = CacheUtils.get(CacheNames.SYS_OSS_CONFIG, configKey);
if (json == null) {
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);
+ return CLIENT_CACHE.get(key);
}
// 閰嶇疆涓嶇浉鍚屽垯閲嶆柊鏋勫缓
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);
+ return CLIENT_CACHE.get(key);
}
return client;
}
--
Gitblit v1.9.3