update OSS 模块 整体重命名 消除歧义

ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java → 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

ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java → 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());
 			}

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<String, ICloudStorageStrategy> SERVICES = new ConcurrentHashMap<>();
+	private static final Map<String, IOssStrategy> 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);
 	}
 

ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java → 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 {
 
 	/**
 	 * 域名

ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageStrategy.java → 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();
 

ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageStrategy.java → 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();

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageStrategy.java → 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

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageStrategy.java → 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

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageStrategy.java → 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

ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageStrategy.java → 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

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<SysOssConfigMapper,
         for (SysOssConfig config : list) {
             String configKey = config.getConfigKey();
             if ("0".equals(config.getStatus())) {
-                RedisUtils.setCacheObject(CloudConstant.CACHE_CONFIG_KEY, configKey);
+                RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, configKey);
             }
             setConfigCache(true, config);
         }
@@ -114,7 +114,7 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper,
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> 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<SysOssConfigMapper,
                 .set(SysOssConfig::getStatus, "1"));
         row += baseMapper.updateById(sysOssConfig);
         if (row > 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<SysOssConfigMapper,
      * @return 缓存键key
      */
     private String getCacheKey(String configKey) {
-        return CloudConstant.SYS_OSS_KEY + configKey;
+        return OssConstant.SYS_OSS_KEY + configKey;
     }
 
     /**
@@ -184,7 +184,7 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper,
             RedisUtils.setCacheObject(
                     getCacheKey(config.getConfigKey()),
                     JsonUtils.toJsonString(config));
-            RedisUtils.publish(CloudConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
+            RedisUtils.publish(OssConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
                 log.info("发布刷新OSS配置 => " + msg);
             });
         }

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<SysOssMapper, SysOss, Sys
     public SysOss upload(MultipartFile file) {
         String originalfileName = file.getOriginalFilename();
         String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
-        ICloudStorageStrategy storage = OssFactory.instance();
+        IOssStrategy storage = OssFactory.instance();
         UploadResult uploadResult;
         try {
             uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
@@ -81,7 +81,7 @@ public class SysOssServiceImpl extends ServicePlusImpl<SysOssMapper, SysOss, Sys
         }
         List<SysOss> 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);