From b65856227f9b0862bbf65c1890b11fdf343d15dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 4 Aug 2021 17:40:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E4=BD=BF=E7=94=A8redis=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/oss/factory/OssFactory.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 bc7e7f31..90e21ab2 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,11 +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; @@ -17,16 +21,19 @@ import java.util.concurrent.ConcurrentHashMap; */ 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 SERVICES = new ConcurrentHashMap<>(); public static ICloudStorageService instance() { - String type = sysConfigService.selectConfigByKey(CloudConstant.CLOUD_STORAGE_CONFIG_KEY); + 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); }