From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 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 bc7e7f3..1290685 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,12 +1,18 @@
package com.ruoyi.oss.factory;
-import cn.hutool.core.lang.Assert;
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.JsonUtils;
+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.service.ICloudStorageService;
-import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.oss.properties.CloudStorageProperties;
+import com.ruoyi.oss.service.ICloudStorageStrategy;
+import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -17,29 +23,55 @@
*/
public class OssFactory {
- private static ISysConfigService sysConfigService;
+ private static RedisCache redisCache;
static {
- OssFactory.sysConfigService = SpringUtils.getBean(ISysConfigService.class);
+ OssFactory.redisCache = SpringUtils.getBean(RedisCache.class);
}
- 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);
+ /**
+ * 鏈嶅姟閰嶇疆鏇存柊鏃堕棿缂撳瓨
+ */
+ private static final Map<String, Date> SERVICES_UPDATE_TIME = new ConcurrentHashMap<>();
+
+ /**
+ * 鑾峰彇榛樿瀹炰緥
+ */
+ public static ICloudStorageStrategy instance() {
+ // 鑾峰彇redis 榛樿绫诲瀷
+ String type = Convert.toStr(redisCache.getCacheObject(CloudConstant.CACHE_CONFIG_KEY));
+ if (StringUtils.isEmpty(type)) {
+ throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
+ }
return instance(type);
}
- public static ICloudStorageService instance(String type) {
- ICloudStorageService service = SERVICES.get(type);
- if (service == null) {
- service = (ICloudStorageService) SpringUtils.getBean(CloudServiceEnumd.getServiceClass(type));
+ /**
+ * 鏍规嵁绫诲瀷鑾峰彇瀹炰緥
+ */
+ public static ICloudStorageStrategy instance(String type) {
+ ICloudStorageStrategy service = SERVICES.get(type);
+ Date oldDate = SERVICES_UPDATE_TIME.get(type);
+ Object json = redisCache.getCacheObject(CloudConstant.SYS_OSS_KEY + type);
+ CloudStorageProperties properties = JsonUtils.parseObject(json.toString(), CloudStorageProperties.class);
+ if (properties == null) {
+ throw new OssException("绯荤粺寮傚父, '" + type + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
}
+ Date nowDate = properties.getUpdateTime();
+ // 鏈嶅姟瀛樺湪骞舵洿鏂版椂闂寸浉鍚屽垯杩斿洖(浣跨敤鏇存柊鏃堕棿纭繚閰嶇疆鏈�缁堜竴鑷存��)
+ if (service != null && oldDate.equals(nowDate)) {
+ return service;
+ }
+ // 鑾峰彇redis閰嶇疆淇℃伅 鍒涘缓瀵硅薄 骞剁紦瀛�
+ service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type), properties);
+ SERVICES.put(type, service);
+ SERVICES_UPDATE_TIME.put(type, nowDate);
return service;
}
- public static void register(String type, ICloudStorageService iCloudStorageService) {
- Assert.notNull(type, "type can't be null");
- SERVICES.put(type, iCloudStorageService);
- }
}
--
Gitblit v1.9.3