From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 92 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java
index 9a421c1..c3312d7 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java
@@ -1,15 +1,14 @@
package com.ruoyi.oss.factory;
+import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.oss.constant.OssConstant;
-import com.ruoyi.oss.enumd.OssEnumd;
+import com.ruoyi.oss.core.OssClient;
import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.properties.OssProperties;
-import com.ruoyi.oss.service.IOssStrategy;
-import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
@@ -23,59 +22,58 @@
@Slf4j
public class OssFactory {
- /**
- * 鏈嶅姟瀹炰緥缂撳瓨
- */
- private static final Map<String, IOssStrategy> SERVICES = new ConcurrentHashMap<>();
+ private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();
/**
* 鍒濆鍖栧伐鍘�
*/
public static void init() {
log.info("鍒濆鍖朞SS宸ュ巶");
- RedisUtils.subscribe(OssConstant.CACHE_CONFIG_KEY, String.class, type -> {
- // 娌℃湁鐨勫疄渚嬩笉澶勭悊
- if (SERVICES.containsKey(type)) {
- refreshService(type);
- log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + type);
+ RedisUtils.subscribe(OssConstant.DEFAULT_CONFIG_KEY, String.class, configKey -> {
+ OssClient client = getClient(configKey);
+ // 鏈垵濮嬪寲涓嶅鐞�
+ if (client != null) {
+ refresh(configKey);
+ log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + configKey);
}
});
}
- /**
- * 鑾峰彇榛樿瀹炰緥
- */
- public static IOssStrategy instance() {
- // 鑾峰彇redis 榛樿绫诲瀷
- String type = RedisUtils.getCacheObject(OssConstant.CACHE_CONFIG_KEY);
- if (StringUtils.isEmpty(type)) {
- throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
- }
- return instance(type);
- }
+ /**
+ * 鑾峰彇榛樿瀹炰緥
+ */
+ public static OssClient instance() {
+ // 鑾峰彇redis 榛樿绫诲瀷
+ String configKey = RedisUtils.getCacheObject(OssConstant.DEFAULT_CONFIG_KEY);
+ if (StringUtils.isEmpty(configKey)) {
+ throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
+ }
+ return instance(configKey);
+ }
- /**
- * 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
- */
- public static IOssStrategy instance(String type) {
- IOssStrategy service = SERVICES.get(type);
- if (service == null) {
- refreshService(type);
- service = SERVICES.get(type);
- }
- return service;
- }
+ /**
+ * 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
+ */
+ public static OssClient instance(String configKey) {
+ OssClient client = getClient(configKey);
+ if (client == null) {
+ refresh(configKey);
+ return getClient(configKey);
+ }
+ return client;
+ }
- private static void refreshService(String type) {
- Object json = RedisUtils.getCacheObject(OssConstant.SYS_OSS_KEY + type);
- OssProperties properties = JsonUtils.parseObject(json.toString(), OssProperties.class);
- if (properties == null) {
- throw new OssException("绯荤粺寮傚父, '" + type + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
- }
- // 鑾峰彇redis閰嶇疆淇℃伅 鍒涘缓瀵硅薄 骞剁紦瀛�
- IOssStrategy service = (IOssStrategy) ReflectUtils.newInstance(OssEnumd.getServiceClass(type));
- ((AbstractOssStrategy)service).init(properties);
- SERVICES.put(type, service);
- }
+ private static void refresh(String configKey) {
+ String json = CacheUtils.get(CacheNames.SYS_OSS_CONFIG, configKey);
+ if (json == null) {
+ throw new OssException("绯荤粺寮傚父, '" + configKey + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
+ }
+ OssProperties properties = JsonUtils.parseObject(json, OssProperties.class);
+ CLIENT_CACHE.put(configKey, new OssClient(configKey, properties));
+ }
+
+ private static OssClient getClient(String configKey) {
+ return CLIENT_CACHE.get(configKey);
+ }
}
--
Gitblit v1.9.3