From cb913a9adcbe83b5688478cf538f11631b1270da Mon Sep 17 00:00:00 2001 From: fanc <1571025887@qq.com> Date: Thu, 25 Jan 2024 06:48:29 +0000 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8F=90=E5=8D=87=E9=94=81=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=20=E5=B9=B6=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=8F=8C=E9=87=8D=E6=A0=A1=E9=AA=8C=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanc <1571025887@qq.com> --- .../org/dromara/common/oss/factory/OssFactory.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 cbda62ada..f0760f771 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 @@ -25,6 +25,8 @@ public class OssFactory { private static final Map CLIENT_CACHE = new ConcurrentHashMap<>(); + private static final ReentrantLock lock = new ReentrantLock(); + /** * 获取默认实例 */ @@ -51,12 +53,14 @@ public class OssFactory { OssClient client = CLIENT_CACHE.get(key); // 客户端不存在或配置不相同则重新构建 if (client == null || !client.checkPropertiesSame(properties)) { - ReentrantLock lock = new ReentrantLock(); lock.lock(); try { - CLIENT_CACHE.put(key, new OssClient(configKey, properties)); - log.info("创建OSS实例 key => {}", configKey); - return CLIENT_CACHE.get(key); + client = CLIENT_CACHE.get(key); + if (client == null || !client.checkPropertiesSame(properties)) { + CLIENT_CACHE.put(key, new OssClient(configKey, properties)); + log.info("创建OSS实例 key => {}", configKey); + return CLIENT_CACHE.get(key); + } } finally { lock.unlock(); }