From 79766fa8c2571affbd86bd4f8871d0db6bd52e08 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:18:05 +0800
Subject: [PATCH] update springboot 2.4.9 => 2.5.3 update hutool 5.7.5 => 5.7.6 update redisson 3.16.0 => 3.16.1 update datasource 3.4.0 => 3.4.1
---
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..bc7e7f3 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
@@ -3,6 +3,7 @@
import cn.hutool.core.lang.Assert;
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;
@@ -26,11 +27,15 @@
public static ICloudStorageService instance() {
String type = sysConfigService.selectConfigByKey(CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
- return SERVICES.get(type);
+ 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