From 70bf1a48d037f993021ddf4ee2ee6da3bbce351e Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:51:52 +0800
Subject: [PATCH] !481 单元格合并可以基于注解选择哪些其他字段需要同时相等方可进行该单元格合并 * excel插件 原有的合并策略写死了根据前一字段是否一致来判断后一字段的合并 感觉这样不灵活 如有特殊需求 字段排序不规整 于是扩充了注解的…
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java | 15 +++++++++------
1 files changed, 9 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 cbda62a..d70270a 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
@@ -24,6 +24,7 @@
public class OssFactory {
private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();
+ private static final ReentrantLock LOCK = new ReentrantLock();
/**
* 鑾峰彇榛樿瀹炰緥
@@ -51,14 +52,16 @@
OssClient client = CLIENT_CACHE.get(key);
// 瀹㈡埛绔笉瀛樺湪鎴栭厤缃笉鐩稿悓鍒欓噸鏂版瀯寤�
if (client == null || !client.checkPropertiesSame(properties)) {
- ReentrantLock lock = new ReentrantLock();
- lock.lock();
+ 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();
+ LOCK.unlock();
}
}
return client;
--
Gitblit v1.9.3