🧨🧨🧨发布 5.3.0 新春版 祝大家新年快乐

疯狂的狮子Li

2025-01-24 b528f0bd146769407de4b7da223e75d46b51d345

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

@@ -24,8 +24,7 @@
public class OssFactory {

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

    private static final ReentrantLock lock = new ReentrantLock();
    private static final ReentrantLock LOCK = new ReentrantLock();

    /**
     * 获取默认实例
@@ -49,11 +48,14 @@
        }
        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)) {
            lock.lock();
            LOCK.lock();
            try {
                client = CLIENT_CACHE.get(key);
                if (client == null || !client.checkPropertiesSame(properties)) {
@@ -62,7 +64,7 @@
                    return CLIENT_CACHE.get(key);
                }
            } finally {
                lock.unlock();
                LOCK.unlock();
            }
        }
        return client;