From 182edef28a7b1d1d980687b17a7fe3a127a2a0ca Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 07 九月 2021 13:20:24 +0800 Subject: [PATCH] update 所有业务适配 RedisUtils 新工具 --- ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 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 7a22c50..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,11 +1,10 @@ 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; @@ -25,11 +24,8 @@ @Slf4j public class OssFactory { - private static RedisCache redisCache; - static { - OssFactory.redisCache = SpringUtils.getBean(RedisCache.class); - redisCache.subscribe(CloudConstant.CACHE_CONFIG_KEY, String.class, msg -> { + RedisUtils.subscribe(CloudConstant.CACHE_CONFIG_KEY, String.class, msg -> { refreshService(msg); log.info("璁㈤槄鍒锋柊OSS閰嶇疆 => " + msg); }); @@ -45,7 +41,7 @@ */ 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("鏂囦欢瀛樺偍鏈嶅姟绫诲瀷鏃犳硶鎵惧埌!"); } @@ -65,7 +61,7 @@ } private static void refreshService(String type) { - Object json = redisCache.getCacheObject(CloudConstant.SYS_OSS_KEY + 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 + "'閰嶇疆淇℃伅涓嶅瓨鍦�!"); -- Gitblit v1.9.3