admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: fanc <1571025887@qq.com>
This commit is contained in:
fanc 2024-01-25 06:48:29 +00:00 committed by Gitee
parent 7c5898ddf6
commit cb913a9adc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,8 @@ public class OssFactory {
private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>(); private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();
private static final ReentrantLock lock = new ReentrantLock();
/** /**
* 获取默认实例 * 获取默认实例
*/ */
@ -51,12 +53,14 @@ public class OssFactory {
OssClient client = CLIENT_CACHE.get(key); OssClient client = CLIENT_CACHE.get(key);
// 客户端不存在或配置不相同则重新构建 // 客户端不存在或配置不相同则重新构建
if (client == null || !client.checkPropertiesSame(properties)) { if (client == null || !client.checkPropertiesSame(properties)) {
ReentrantLock lock = new ReentrantLock();
lock.lock(); lock.lock();
try { try {
client = CLIENT_CACHE.get(key);
if (client == null || !client.checkPropertiesSame(properties)) {
CLIENT_CACHE.put(key, new OssClient(configKey, properties)); CLIENT_CACHE.put(key, new OssClient(configKey, properties));
log.info("创建OSS实例 key => {}", configKey); log.info("创建OSS实例 key => {}", configKey);
return CLIENT_CACHE.get(key); return CLIENT_CACHE.get(key);
}
} finally { } finally {
lock.unlock(); lock.unlock();
} }