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 | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 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 accbbcd..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,19 +1,18 @@
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.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.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -22,12 +21,14 @@
*
* @author Lion Li
*/
+@Slf4j
public class OssFactory {
- private static RedisCache redisCache;
-
static {
- OssFactory.redisCache = SpringUtils.getBean(RedisCache.class);
+ RedisUtils.subscribe(CloudConstant.CACHE_CONFIG_KEY, String.class, msg -> {
+ refreshService(msg);
+ log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + msg);
+ });
}
/**
@@ -36,16 +37,11 @@
private static final Map<String, ICloudStorageStrategy> SERVICES = new ConcurrentHashMap<>();
/**
- * 鏈嶅姟閰嶇疆鏇存柊鏃堕棿缂撳瓨
- */
- 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));
+ String type = Convert.toStr(RedisUtils.getCacheObject(CloudConstant.CACHE_CONFIG_KEY));
if (StringUtils.isEmpty(type)) {
throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
}
@@ -57,23 +53,23 @@
*/
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);
+ if (service == null) {
+ refreshService(type);
+ service = SERVICES.get(type);
+ }
+ return service;
+ }
+
+ 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 + "'閰嶇疆淇℃伅涓嶅瓨鍦�!");
}
- Date nowDate = properties.getUpdateTime();
- // 鏈嶅姟瀛樺湪骞舵洿鏂版椂闂寸浉鍚屽垯杩斿洖(浣跨敤鏇存柊鏃堕棿纭繚閰嶇疆鏈�缁堜竴鑷存��)
- if (service != null && oldDate.equals(nowDate)) {
- return service;
- }
// 鑾峰彇redis閰嶇疆淇℃伅 鍒涘缓瀵硅薄 骞剁紦瀛�
- service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type));
+ ICloudStorageStrategy service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type));
((AbstractCloudStorageStrategy)service).init(properties);
SERVICES.put(type, service);
- SERVICES_UPDATE_TIME.put(type, nowDate);
- return service;
}
}
--
Gitblit v1.9.3