From 4cfbd8a9d2ca743842f8d47ac18c5c7cea5a04cd 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: Mon, 22 Nov 2021 09:45:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20OSS=20=E6=A8=A1=E5=9D=97=20=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E9=87=8D=E5=91=BD=E5=90=8D=20=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E6=AD=A7=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{CloudConstant.java => OssConstant.java} | 6 ++-- .../{CloudServiceEnumd.java => OssEnumd.java} | 22 +++++++------- .../com/ruoyi/oss/factory/OssFactory.java | 30 +++++++++---------- ...rageProperties.java => OssProperties.java} | 2 +- ...StorageStrategy.java => IOssStrategy.java} | 2 +- ...Strategy.java => AbstractOssStrategy.java} | 10 +++---- ...geStrategy.java => AliyunOssStrategy.java} | 12 ++++---- ...ageStrategy.java => MinioOssStrategy.java} | 12 ++++---- ...geStrategy.java => QcloudOssStrategy.java} | 12 ++++---- ...ageStrategy.java => QiniuOssStrategy.java} | 12 ++++---- .../service/impl/SysOssConfigServiceImpl.java | 12 ++++---- .../service/impl/SysOssServiceImpl.java | 6 ++-- 12 files changed, 69 insertions(+), 69 deletions(-) rename ruoyi-oss/src/main/java/com/ruoyi/oss/constant/{CloudConstant.java => OssConstant.java} (73%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/{CloudServiceEnumd.java => OssEnumd.java} (56%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/properties/{CloudStorageProperties.java => OssProperties.java} (93%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/service/{ICloudStorageStrategy.java => IOssStrategy.java} (96%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/{AbstractCloudStorageStrategy.java => AbstractOssStrategy.java} (81%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/{AliyunCloudStorageStrategy.java => AliyunOssStrategy.java} (90%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/{MinioCloudStorageStrategy.java => MinioOssStrategy.java} (94%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/{QcloudCloudStorageStrategy.java => QcloudOssStrategy.java} (91%) rename ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/{QiniuCloudStorageStrategy.java => QiniuOssStrategy.java} (90%) diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java similarity index 73% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java index 7bba1f4db..b5236bfe7 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java @@ -8,7 +8,7 @@ import java.util.List; * * @author Lion Li */ -public class CloudConstant { +public class OssConstant { /** * OSS模块KEY @@ -18,12 +18,12 @@ public class CloudConstant { /** * 对象存储配置KEY */ - public static final String CLOUD_STORAGE_CONFIG_KEY = "CloudStorageConfig"; + public static final String OSS_CONFIG_KEY = "OssConfig"; /** * 缓存配置KEY */ - public static final String CACHE_CONFIG_KEY = SYS_OSS_KEY + CLOUD_STORAGE_CONFIG_KEY; + public static final String CACHE_CONFIG_KEY = SYS_OSS_KEY + OSS_CONFIG_KEY; /** * 预览列表资源开关Key diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java similarity index 56% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java index ac8ad8184..4defca40e 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java @@ -1,10 +1,10 @@ package com.ruoyi.oss.enumd; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.service.impl.AliyunCloudStorageStrategy; -import com.ruoyi.oss.service.impl.MinioCloudStorageStrategy; -import com.ruoyi.oss.service.impl.QcloudCloudStorageStrategy; -import com.ruoyi.oss.service.impl.QiniuCloudStorageStrategy; +import com.ruoyi.oss.service.impl.AliyunOssStrategy; +import com.ruoyi.oss.service.impl.MinioOssStrategy; +import com.ruoyi.oss.service.impl.QcloudOssStrategy; +import com.ruoyi.oss.service.impl.QiniuOssStrategy; import lombok.AllArgsConstructor; import lombok.Getter; @@ -15,34 +15,34 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum CloudServiceEnumd { +public enum OssEnumd { /** * 七牛云 */ - QINIU("qiniu", QiniuCloudStorageStrategy.class), + QINIU("qiniu", QiniuOssStrategy.class), /** * 阿里云 */ - ALIYUN("aliyun", AliyunCloudStorageStrategy.class), + ALIYUN("aliyun", AliyunOssStrategy.class), /** * 腾讯云 */ - QCLOUD("qcloud", QcloudCloudStorageStrategy.class), + QCLOUD("qcloud", QcloudOssStrategy.class), /** * minio */ - MINIO("minio", MinioCloudStorageStrategy.class); + MINIO("minio", MinioOssStrategy.class); private final String value; private final Class serviceClass; public static Class getServiceClass(String value) { - for (CloudServiceEnumd clazz : values()) { + for (OssEnumd clazz : values()) { if (clazz.getValue().equals(value)) { return clazz.getServiceClass(); } @@ -51,7 +51,7 @@ public enum CloudServiceEnumd { } public static String getServiceName(String value) { - for (CloudServiceEnumd clazz : values()) { + for (OssEnumd clazz : values()) { if (clazz.getValue().equals(value)) { return StringUtils.uncapitalize(clazz.getServiceClass().getSimpleName()); } 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 b99ae0a63..56ea52225 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 @@ -4,12 +4,12 @@ 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.oss.constant.CloudConstant; -import com.ruoyi.oss.enumd.CloudServiceEnumd; +import com.ruoyi.oss.constant.OssConstant; +import com.ruoyi.oss.enumd.OssEnumd; 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 com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.oss.service.IOssStrategy; +import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; import lombok.extern.slf4j.Slf4j; import java.util.Map; @@ -26,14 +26,14 @@ public class OssFactory { /** * 服务实例缓存 */ - private static final Map SERVICES = new ConcurrentHashMap<>(); + private static final Map SERVICES = new ConcurrentHashMap<>(); /** * 初始化工厂 */ public static void init() { log.info("初始化OSS工厂"); - RedisUtils.subscribe(CloudConstant.CACHE_CONFIG_KEY, String.class, msg -> { + RedisUtils.subscribe(OssConstant.CACHE_CONFIG_KEY, String.class, msg -> { refreshService(msg); log.info("订阅刷新OSS配置 => " + msg); }); @@ -42,9 +42,9 @@ public class OssFactory { /** * 获取默认实例 */ - public static ICloudStorageStrategy instance() { + public static IOssStrategy instance() { // 获取redis 默认类型 - String type = RedisUtils.getCacheObject(CloudConstant.CACHE_CONFIG_KEY); + String type = RedisUtils.getCacheObject(OssConstant.CACHE_CONFIG_KEY); if (StringUtils.isEmpty(type)) { throw new OssException("文件存储服务类型无法找到!"); } @@ -54,8 +54,8 @@ public class OssFactory { /** * 根据类型获取实例 */ - public static ICloudStorageStrategy instance(String type) { - ICloudStorageStrategy service = SERVICES.get(type); + public static IOssStrategy instance(String type) { + IOssStrategy service = SERVICES.get(type); if (service == null) { refreshService(type); service = SERVICES.get(type); @@ -64,14 +64,14 @@ public class OssFactory { } private static void refreshService(String type) { - Object json = RedisUtils.getCacheObject(CloudConstant.SYS_OSS_KEY + type); - CloudStorageProperties properties = JsonUtils.parseObject(json.toString(), CloudStorageProperties.class); + Object json = RedisUtils.getCacheObject(OssConstant.SYS_OSS_KEY + type); + OssProperties properties = JsonUtils.parseObject(json.toString(), OssProperties.class); if (properties == null) { throw new OssException("系统异常, '" + type + "'配置信息不存在!"); } // 获取redis配置信息 创建对象 并缓存 - ICloudStorageStrategy service = (ICloudStorageStrategy) ReflectUtils.newInstance(CloudServiceEnumd.getServiceClass(type)); - ((AbstractCloudStorageStrategy)service).init(properties); + IOssStrategy service = (IOssStrategy) ReflectUtils.newInstance(OssEnumd.getServiceClass(type)); + ((AbstractOssStrategy)service).init(properties); SERVICES.put(type, service); } diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java similarity index 93% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java index 9d3f15afb..22b31c45d 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java @@ -10,7 +10,7 @@ import java.util.Date; * @author Lion Li */ @Data -public class CloudStorageProperties { +public class OssProperties { /** * 域名 diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java similarity index 96% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java index 39286110d..34d25e477 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java @@ -9,7 +9,7 @@ import java.io.InputStream; * * @author Lion Li */ -public interface ICloudStorageStrategy { +public interface IOssStrategy { void createBucket(); diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java similarity index 81% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java index 8fc55fbf0..9fa52acb4 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java @@ -5,8 +5,8 @@ import cn.hutool.core.util.IdUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.service.ICloudStorageStrategy; +import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.oss.service.IOssStrategy; import java.io.InputStream; @@ -15,11 +15,11 @@ import java.io.InputStream; * * @author Lion Li */ -public abstract class AbstractCloudStorageStrategy implements ICloudStorageStrategy { +public abstract class AbstractOssStrategy implements IOssStrategy { - protected CloudStorageProperties properties; + protected OssProperties properties; - public abstract void init(CloudStorageProperties properties); + public abstract void init(OssProperties properties); @Override public abstract void createBucket(); diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java similarity index 90% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageStrategy.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java index 04ee67500..db9ad910e 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java @@ -9,10 +9,10 @@ import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.CloudServiceEnumd; +import com.ruoyi.oss.enumd.OssEnumd; import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.service.abstractd.AbstractCloudStorageStrategy; +import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -22,12 +22,12 @@ import java.io.InputStream; * * @author Lion Li */ -public class AliyunCloudStorageStrategy extends AbstractCloudStorageStrategy { +public class AliyunOssStrategy extends AbstractOssStrategy { private OSSClient client; @Override - public void init(CloudStorageProperties cloudStorageProperties) { + public void init(OssProperties cloudStorageProperties) { properties = cloudStorageProperties; try { ClientConfiguration configuration = new ClientConfiguration(); @@ -57,7 +57,7 @@ public class AliyunCloudStorageStrategy extends AbstractCloudStorageStrategy { @Override public String getServiceType() { - return CloudServiceEnumd.ALIYUN.getValue(); + return OssEnumd.ALIYUN.getValue(); } @Override diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java similarity index 94% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java index 3bbf187c9..0423dcc8a 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java @@ -2,11 +2,11 @@ package com.ruoyi.oss.service.impl; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.CloudServiceEnumd; +import com.ruoyi.oss.enumd.OssEnumd; import com.ruoyi.oss.enumd.PolicyType; import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.service.abstractd.AbstractCloudStorageStrategy; +import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; import io.minio.*; import org.springframework.http.MediaType; @@ -18,12 +18,12 @@ import java.io.InputStream; * * @author Lion Li */ -public class MinioCloudStorageStrategy extends AbstractCloudStorageStrategy { +public class MinioOssStrategy extends AbstractOssStrategy { private MinioClient minioClient; @Override - public void init(CloudStorageProperties cloudStorageProperties) { + public void init(OssProperties cloudStorageProperties) { properties = cloudStorageProperties; try { minioClient = MinioClient.builder() @@ -57,7 +57,7 @@ public class MinioCloudStorageStrategy extends AbstractCloudStorageStrategy { @Override public String getServiceType() { - return CloudServiceEnumd.MINIO.getValue(); + return OssEnumd.MINIO.getValue(); } @Override diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java similarity index 91% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageStrategy.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java index 9bd366e0d..156eb24c5 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java @@ -9,10 +9,10 @@ import com.qcloud.cos.model.*; import com.qcloud.cos.region.Region; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.CloudServiceEnumd; +import com.ruoyi.oss.enumd.OssEnumd; import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.service.abstractd.AbstractCloudStorageStrategy; +import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -22,12 +22,12 @@ import java.io.InputStream; * * @author Lion Li */ -public class QcloudCloudStorageStrategy extends AbstractCloudStorageStrategy { +public class QcloudOssStrategy extends AbstractOssStrategy { private COSClient client; @Override - public void init(CloudStorageProperties cloudStorageProperties) { + public void init(OssProperties cloudStorageProperties) { properties = cloudStorageProperties; try { COSCredentials credentials = new BasicCOSCredentials( @@ -65,7 +65,7 @@ public class QcloudCloudStorageStrategy extends AbstractCloudStorageStrategy { @Override public String getServiceType() { - return CloudServiceEnumd.QCLOUD.getValue(); + return OssEnumd.QCLOUD.getValue(); } @Override diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java similarity index 90% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageStrategy.java rename to ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java index 0c23e7612..bf90aa824 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageStrategy.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java @@ -8,10 +8,10 @@ import com.qiniu.storage.Region; import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.CloudServiceEnumd; +import com.ruoyi.oss.enumd.OssEnumd; import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.CloudStorageProperties; -import com.ruoyi.oss.service.abstractd.AbstractCloudStorageStrategy; +import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; import java.io.InputStream; @@ -20,14 +20,14 @@ import java.io.InputStream; * * @author Lion Li */ -public class QiniuCloudStorageStrategy extends AbstractCloudStorageStrategy { +public class QiniuOssStrategy extends AbstractOssStrategy { private UploadManager uploadManager; private BucketManager bucketManager; private Auth auth; @Override - public void init(CloudStorageProperties cloudStorageProperties) { + public void init(OssProperties cloudStorageProperties) { properties = cloudStorageProperties; try { Configuration config = new Configuration(getRegion(properties.getRegion())); @@ -62,7 +62,7 @@ public class QiniuCloudStorageStrategy extends AbstractCloudStorageStrategy { @Override public String getServiceType() { - return CloudServiceEnumd.QINIU.getValue(); + return OssEnumd.QINIU.getValue(); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java index ddbf421ee..697aa414c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java @@ -15,7 +15,7 @@ import com.ruoyi.common.utils.JsonUtils; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.RedisUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.constant.CloudConstant; +import com.ruoyi.oss.constant.OssConstant; import com.ruoyi.oss.factory.OssFactory; import com.ruoyi.system.domain.SysOssConfig; import com.ruoyi.system.domain.bo.SysOssConfigBo; @@ -54,7 +54,7 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl ids, Boolean isValid) { if (isValid) { - if (CollUtil.containsAny(ids, CloudConstant.SYSTEM_DATA_IDS)) { + if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) { throw new ServiceException("系统内置, 不可删除!"); } } @@ -157,7 +157,7 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl 0) { - RedisUtils.setCacheObject(CloudConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey()); + RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey()); } return row; } @@ -169,7 +169,7 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl { + RedisUtils.publish(OssConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> { log.info("发布刷新OSS配置 => " + msg); }); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index b703ff690..c20cc4b76 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -10,7 +10,7 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.oss.entity.UploadResult; import com.ruoyi.oss.factory.OssFactory; -import com.ruoyi.oss.service.ICloudStorageStrategy; +import com.ruoyi.oss.service.IOssStrategy; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; @@ -56,7 +56,7 @@ public class SysOssServiceImpl extends ServicePlusImpl list = listByIds(ids); for (SysOss sysOss : list) { - ICloudStorageStrategy storage = OssFactory.instance(sysOss.getService()); + IOssStrategy storage = OssFactory.instance(sysOss.getService()); storage.delete(sysOss.getUrl()); } return removeByIds(ids);