From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 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 7a22c50..1691596 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,17 +1,15 @@
package com.ruoyi.oss.factory;
-import cn.hutool.core.convert.Convert;
-import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.oss.constant.CloudConstant;
-import com.ruoyi.oss.enumd.CloudServiceEnumd;
+import com.ruoyi.oss.constant.OssConstant;
+import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.exception.OssException;
-import com.ruoyi.oss.properties.CloudStorageProperties;
-import com.ruoyi.oss.service.ICloudStorageStrategy;
-import com.ruoyi.oss.service.abstractd.AbstractCloudStorageStrategy;
+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;
@@ -25,27 +23,31 @@
@Slf4j
public class OssFactory {
- private static RedisCache redisCache;
-
- static {
- OssFactory.redisCache = SpringUtils.getBean(RedisCache.class);
- redisCache.subscribe(CloudConstant.CACHE_CONFIG_KEY, String.class, msg -> {
- refreshService(msg);
- log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + msg);
- });
- }
-
/**
* 鏈嶅姟瀹炰緥缂撳瓨
*/
- private static final Map<String, ICloudStorageStrategy> SERVICES = new ConcurrentHashMap<>();
+ private static final Map<String, IOssStrategy> SERVICES = 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);
+ }
+ });
+ }
/**
* 鑾峰彇榛樿瀹炰緥
*/
- public static ICloudStorageStrategy instance() {
+ public static IOssStrategy instance() {
// 鑾峰彇redis 榛樿绫诲瀷
- String type = Convert.toStr(redisCache.getCacheObject(CloudConstant.CACHE_CONFIG_KEY));
+ String type = RedisUtils.getCacheObject(OssConstant.CACHE_CONFIG_KEY);
if (StringUtils.isEmpty(type)) {
throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
}
@@ -55,8 +57,8 @@
/**
* 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
*/
- public static ICloudStorageStrategy instance(String type) {
- ICloudStorageStrategy service = SERVICES.get(type);
+ public static IOssStrategy instance(String type) {
+ IOssStrategy service = SERVICES.get(type);
if (service == null) {
refreshService(type);
service = SERVICES.get(type);
@@ -65,14 +67,14 @@
}
private static void refreshService(String type) {
- Object json = redisCache.getCacheObject(CloudConstant.SYS_OSS_KEY + type);
- CloudStorageProperties properties = JsonUtils.parseObject(json.toString(), CloudStorageProperties.class);
+ 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閰嶇疆淇℃伅 鍒涘缓瀵硅薄 骞剁紦瀛�
- ICloudStorageStrategy service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type));
- ((AbstractCloudStorageStrategy)service).init(properties);
+ IOssStrategy service = (IOssStrategy) ReflectUtils.newInstance(OssEnumd.getServiceClass(type));
+ ((AbstractOssStrategy)service).init(properties);
SERVICES.put(type, service);
}
--
Gitblit v1.9.3