From bb793d71e7bb47e8a036dba4d07b132cecc24c81 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 18 二月 2022 14:05:32 +0800
Subject: [PATCH] fix 修复 minio 适配 https 导致的问题
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 90 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 28 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 bc7e7f3..9ac887e 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,45 +1,79 @@
package com.ruoyi.oss.factory;
-import cn.hutool.core.lang.Assert;
+import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.oss.constant.CloudConstant;
-import com.ruoyi.oss.enumd.CloudServiceEnumd;
-import com.ruoyi.oss.service.ICloudStorageService;
-import com.ruoyi.system.service.ISysConfigService;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import com.ruoyi.oss.constant.OssConstant;
+import com.ruoyi.oss.enumd.OssEnumd;
+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;
/**
* 鏂囦欢涓婁紶Factory
*
* @author Lion Li
*/
+@Slf4j
public class OssFactory {
- private static ISysConfigService sysConfigService;
+ /**
+ * 鍒濆鍖栧伐鍘�
+ */
+ public static void init() {
+ log.info("鍒濆鍖朞SS宸ュ巶");
+ RedisUtils.subscribe(OssConstant.CACHE_CONFIG_KEY, String.class, type -> {
+ AbstractOssStrategy strategy = getStrategy(type);
+ // 鏈垵濮嬪寲涓嶅鐞�
+ if (strategy.isInit) {
+ refresh(type);
+ log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + type);
+ }
+ });
+ }
- static {
- OssFactory.sysConfigService = SpringUtils.getBean(ISysConfigService.class);
- }
+ /**
+ * 鑾峰彇榛樿瀹炰緥
+ */
+ public static IOssStrategy instance() {
+ // 鑾峰彇redis 榛樿绫诲瀷
+ String type = RedisUtils.getCacheObject(OssConstant.CACHE_CONFIG_KEY);
+ if (StringUtils.isEmpty(type)) {
+ throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
+ }
+ return instance(type);
+ }
- private static final Map<String, ICloudStorageService> SERVICES = new ConcurrentHashMap<>();
+ /**
+ * 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
+ */
+ public static IOssStrategy instance(String type) {
+ OssEnumd enumd = OssEnumd.find(type);
+ if (enumd == null) {
+ throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
+ }
+ AbstractOssStrategy strategy = getStrategy(type);
+ if (!strategy.isInit) {
+ refresh(type);
+ }
+ return strategy;
+ }
- public static ICloudStorageService instance() {
- String type = sysConfigService.selectConfigByKey(CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
- return instance(type);
- }
+ private static void refresh(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 + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
+ }
+ getStrategy(type).init(properties);
+ }
- public static ICloudStorageService instance(String type) {
- ICloudStorageService service = SERVICES.get(type);
- if (service == null) {
- service = (ICloudStorageService) SpringUtils.getBean(CloudServiceEnumd.getServiceClass(type));
- }
- return service;
- }
+ private static AbstractOssStrategy getStrategy(String type) {
+ OssEnumd enumd = OssEnumd.find(type);
+ return (AbstractOssStrategy) SpringUtils.getBean(enumd.getBeanClass());
+ }
- public static void register(String type, ICloudStorageService iCloudStorageService) {
- Assert.notNull(type, "type can't be null");
- SERVICES.put(type, iCloudStorageService);
- }
}
--
Gitblit v1.9.3