mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-24 07:19:46 +08:00
update 优化 oss配置 使用发布订阅工具 刷新配置
This commit is contained in:
@ -12,8 +12,8 @@ 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 +22,17 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
@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);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@ -35,11 +40,6 @@ public class OssFactory {
|
||||
*/
|
||||
private static final Map<String, ICloudStorageStrategy> SERVICES = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* 服务配置更新时间缓存
|
||||
*/
|
||||
private static final Map<String, Date> SERVICES_UPDATE_TIME = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* 获取默认实例
|
||||
*/
|
||||
@ -57,23 +57,23 @@ public class OssFactory {
|
||||
*/
|
||||
public static ICloudStorageStrategy instance(String type) {
|
||||
ICloudStorageStrategy service = SERVICES.get(type);
|
||||
Date oldDate = SERVICES_UPDATE_TIME.get(type);
|
||||
if (service == null) {
|
||||
refreshService(type);
|
||||
service = SERVICES.get(type);
|
||||
}
|
||||
return service;
|
||||
}
|
||||
|
||||
private static void refreshService(String 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));
|
||||
ICloudStorageStrategy service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type));
|
||||
((AbstractCloudStorageStrategy)service).init(properties);
|
||||
SERVICES.put(type, service);
|
||||
SERVICES_UPDATE_TIME.put(type, nowDate);
|
||||
return service;
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user