From 4d02466fed4f3ea012a80c3359cde9af0737141f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十一月 2022 20:01:12 +0800
Subject: [PATCH] add 增加 skywalking 集成 默认注释不开启
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 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 b549d21..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,10 +1,15 @@
package com.ruoyi.oss.factory;
-import cn.hutool.core.lang.Assert;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.oss.constant.CloudConstant;
-import com.ruoyi.oss.service.ICloudStorageService;
-import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.common.constant.CacheNames;
+import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.oss.constant.OssConstant;
+import com.ruoyi.oss.core.OssClient;
+import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.oss.properties.OssProperties;
+import lombok.extern.slf4j.Slf4j;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -14,27 +19,61 @@
*
* @author Lion Li
*/
+@Slf4j
public class OssFactory {
- private static ISysConfigService sysConfigService;
+ private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();
- static {
- OssFactory.sysConfigService = SpringUtils.getBean(ISysConfigService.class);
- }
+ /**
+ * 鍒濆鍖栧伐鍘�
+ */
+ public static void init() {
+ log.info("鍒濆鍖朞SS宸ュ巶");
+ RedisUtils.subscribe(OssConstant.DEFAULT_CONFIG_KEY, String.class, configKey -> {
+ OssClient client = getClient(configKey);
+ // 鏈垵濮嬪寲涓嶅鐞�
+ if (client != null) {
+ refresh(configKey);
+ log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + configKey);
+ }
+ });
+ }
- private static final Map<String, ICloudStorageService> SERVICES = new ConcurrentHashMap<>();
+ /**
+ * 鑾峰彇榛樿瀹炰緥
+ */
+ 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 ICloudStorageService instance() {
- String type = sysConfigService.selectConfigByKey(CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
- return SERVICES.get(type);
- }
+ /**
+ * 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
+ */
+ public static OssClient instance(String configKey) {
+ OssClient client = getClient(configKey);
+ if (client == null) {
+ refresh(configKey);
+ return getClient(configKey);
+ }
+ return client;
+ }
- public static ICloudStorageService instance(String type) {
- return SERVICES.get(type);
- }
+ 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));
+ }
- public static void register(String type, ICloudStorageService iCloudStorageService) {
- Assert.notNull(type, "type can't be null");
- SERVICES.put(type, iCloudStorageService);
- }
+ private static OssClient getClient(String configKey) {
+ return CLIENT_CACHE.get(configKey);
+ }
+
}
--
Gitblit v1.9.3