From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 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..ecb269d 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,17 @@
package com.ruoyi.oss.factory;
-import cn.hutool.core.lang.Assert;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import cn.hutool.core.convert.Convert;
+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.oss.constant.CloudConstant;
-import com.ruoyi.oss.service.ICloudStorageService;
-import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.oss.enumd.CloudServiceEnumd;
+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 lombok.extern.slf4j.Slf4j;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -14,27 +21,55 @@
*
* @author Lion Li
*/
+@Slf4j
public class OssFactory {
- private static ISysConfigService sysConfigService;
-
static {
- OssFactory.sysConfigService = SpringUtils.getBean(ISysConfigService.class);
+ RedisUtils.subscribe(CloudConstant.CACHE_CONFIG_KEY, String.class, msg -> {
+ refreshService(msg);
+ log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + msg);
+ });
}
- private static final Map<String, ICloudStorageService> SERVICES = new ConcurrentHashMap<>();
+ /**
+ * 鏈嶅姟瀹炰緥缂撳瓨
+ */
+ private static final Map<String, ICloudStorageStrategy> SERVICES = new ConcurrentHashMap<>();
- public static ICloudStorageService instance() {
- String type = sysConfigService.selectConfigByKey(CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
- return SERVICES.get(type);
+ /**
+ * 鑾峰彇榛樿瀹炰緥
+ */
+ public static ICloudStorageStrategy instance() {
+ // 鑾峰彇redis 榛樿绫诲瀷
+ String type = Convert.toStr(RedisUtils.getCacheObject(CloudConstant.CACHE_CONFIG_KEY));
+ if (StringUtils.isEmpty(type)) {
+ throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
+ }
+ return instance(type);
}
- public static ICloudStorageService instance(String type) {
- return SERVICES.get(type);
+ /**
+ * 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
+ */
+ public static ICloudStorageStrategy instance(String type) {
+ ICloudStorageStrategy service = SERVICES.get(type);
+ if (service == null) {
+ refreshService(type);
+ service = SERVICES.get(type);
+ }
+ return service;
}
- public static void register(String type, ICloudStorageService iCloudStorageService) {
- Assert.notNull(type, "type can't be null");
- SERVICES.put(type, iCloudStorageService);
+ private static void refreshService(String type) {
+ Object json = RedisUtils.getCacheObject(CloudConstant.SYS_OSS_KEY + type);
+ CloudStorageProperties properties = JsonUtils.parseObject(json.toString(), CloudStorageProperties.class);
+ if (properties == null) {
+ throw new OssException("绯荤粺寮傚父, '" + type + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
+ }
+ // 鑾峰彇redis閰嶇疆淇℃伅 鍒涘缓瀵硅薄 骞剁紦瀛�
+ ICloudStorageStrategy service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type));
+ ((AbstractCloudStorageStrategy)service).init(properties);
+ SERVICES.put(type, service);
}
+
}
--
Gitblit v1.9.3