From 2c2dad24d59b37df254d1c003d6c3e1119b51d6c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 11 八月 2021 14:28:05 +0800
Subject: [PATCH] update 更新 阿里云 maven源 新地址
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..90e21ab 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,15 @@
package com.ruoyi.oss.factory;
+import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.StringUtils;
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.service.ICloudStorageService;
-import com.ruoyi.system.service.ISysConfigService;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -16,21 +21,28 @@
*/
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<>();
public static ICloudStorageService instance() {
- String type = sysConfigService.selectConfigByKey(CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
- return SERVICES.get(type);
+ String type = Convert.toStr(redisCache.getCacheObject(Constants.SYS_CONFIG_KEY + CloudConstant.CLOUD_STORAGE_CONFIG_KEY));
+ if (StringUtils.isEmpty(type)) {
+ throw new OssException("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!");
+ }
+ return instance(type);
}
public static ICloudStorageService instance(String type) {
- return SERVICES.get(type);
+ ICloudStorageService service = SERVICES.get(type);
+ if (service == null) {
+ service = (ICloudStorageService) SpringUtils.getBean(CloudServiceEnumd.getServiceClass(type));
+ }
+ return service;
}
public static void register(String type, ICloudStorageService iCloudStorageService) {
--
Gitblit v1.9.3