fix 提升锁的作用域 并采用双重校验锁

fanc

2024-01-25 cb913a9adcbe83b5688478cf538f11631b1270da

fix 提升锁的作用域 并采用双重校验锁

Signed-off-by: fanc <1571025887@qq.com>

 ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java

@@ -25,6 +25,8 @@

    private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();

    private static final ReentrantLock lock = new ReentrantLock();

    /**
     * 获取默认实例
     */
@@ -51,12 +53,14 @@
        OssClient client = CLIENT_CACHE.get(key);
        // 客户端不存在或配置不相同则重新构建
        if (client == null || !client.checkPropertiesSame(properties)) {
            ReentrantLock lock = new ReentrantLock();
            lock.lock();
            try {
                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();
            }