From 4cfbd8a9d2ca743842f8d47ac18c5c7cea5a04cd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 22 十一月 2021 09:45:46 +0800
Subject: [PATCH] update OSS 模块 整体重命名 消除歧义
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java | 12 +-
ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java | 6
ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java | 63 ++++++++++++
ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java | 30 +++---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java | 12 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java | 12 +-
ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java | 10 +-
/dev/null | 63 ------------
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java | 12 +-
ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java | 6
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java | 12 +-
ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java | 2
13 files changed, 121 insertions(+), 121 deletions(-)
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 7bba1f4..b5236bf 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 @@
*
* @author Lion Li
*/
-public class CloudConstant {
+public class OssConstant {
/**
* OSS妯″潡KEY
@@ -18,12 +18,12 @@
/**
* 瀵硅薄瀛樺偍閰嶇疆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;
/**
* 棰勮鍒楄〃璧勬簮寮�鍏矺ey
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
deleted file mode 100644
index ac8ad81..0000000
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
+++ /dev/null
@@ -1,63 +0,0 @@
-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 lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 瀵硅薄瀛樺偍鏈嶅姟鍟嗘灇涓�
- *
- * @author Lion Li
- */
-@Getter
-@AllArgsConstructor
-public enum CloudServiceEnumd {
-
- /**
- * 涓冪墰浜�
- */
- QINIU("qiniu", QiniuCloudStorageStrategy.class),
-
- /**
- * 闃块噷浜�
- */
- ALIYUN("aliyun", AliyunCloudStorageStrategy.class),
-
- /**
- * 鑵捐浜�
- */
- QCLOUD("qcloud", QcloudCloudStorageStrategy.class),
-
- /**
- * minio
- */
- MINIO("minio", MinioCloudStorageStrategy.class);
-
- private final String value;
-
- private final Class<?> serviceClass;
-
- public static Class<?> getServiceClass(String value) {
- for (CloudServiceEnumd clazz : values()) {
- if (clazz.getValue().equals(value)) {
- return clazz.getServiceClass();
- }
- }
- return null;
- }
-
- public static String getServiceName(String value) {
- for (CloudServiceEnumd clazz : values()) {
- if (clazz.getValue().equals(value)) {
- return StringUtils.uncapitalize(clazz.getServiceClass().getSimpleName());
- }
- }
- return null;
- }
-
-
-}
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java
new file mode 100644
index 0000000..4defca4
--- /dev/null
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java
@@ -0,0 +1,63 @@
+package com.ruoyi.oss.enumd;
+
+import com.ruoyi.common.utils.StringUtils;
+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;
+
+/**
+ * 瀵硅薄瀛樺偍鏈嶅姟鍟嗘灇涓�
+ *
+ * @author Lion Li
+ */
+@Getter
+@AllArgsConstructor
+public enum OssEnumd {
+
+ /**
+ * 涓冪墰浜�
+ */
+ QINIU("qiniu", QiniuOssStrategy.class),
+
+ /**
+ * 闃块噷浜�
+ */
+ ALIYUN("aliyun", AliyunOssStrategy.class),
+
+ /**
+ * 鑵捐浜�
+ */
+ QCLOUD("qcloud", QcloudOssStrategy.class),
+
+ /**
+ * minio
+ */
+ MINIO("minio", MinioOssStrategy.class);
+
+ private final String value;
+
+ private final Class<?> serviceClass;
+
+ public static Class<?> getServiceClass(String value) {
+ for (OssEnumd clazz : values()) {
+ if (clazz.getValue().equals(value)) {
+ return clazz.getServiceClass();
+ }
+ }
+ return null;
+ }
+
+ public static String getServiceName(String value) {
+ for (OssEnumd clazz : values()) {
+ if (clazz.getValue().equals(value)) {
+ return StringUtils.uncapitalize(clazz.getServiceClass().getSimpleName());
+ }
+ }
+ return null;
+ }
+
+
+}
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 b99ae0a..56ea522 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.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 @@
/**
* 鏈嶅姟瀹炰緥缂撳瓨
*/
- private static final Map<String, ICloudStorageStrategy> SERVICES = new ConcurrentHashMap<>();
+ private static final Map<String, IOssStrategy> SERVICES = new ConcurrentHashMap<>();
/**
* 鍒濆鍖栧伐鍘�
*/
public static void init() {
log.info("鍒濆鍖朞SS宸ュ巶");
- 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 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 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 @@
}
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 9d3f15a..22b31c4 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 @@
* @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 3928611..34d25e4 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 @@
*
* @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 8fc55fb..9fa52ac 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 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 @@
*
* @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 04ee675..db9ad91 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.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 @@
*
* @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 @@
@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 3bbf187..0423dcc 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 @@
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 @@
*
* @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 @@
@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 9bd366e..156eb24 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.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 @@
*
* @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 @@
@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 0c23e76..bf90aa8 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.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 @@
*
* @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 @@
@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 ddbf421..697aa41 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.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 @@
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 @@
@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 @@
.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 @@
* @return 缂撳瓨閿甼ey
*/
private String getCacheKey(String configKey) {
- return CloudConstant.SYS_OSS_KEY + configKey;
+ return OssConstant.SYS_OSS_KEY + configKey;
}
/**
@@ -184,7 +184,7 @@
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);
});
}
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 b703ff6..c20cc4b 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.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 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 @@
}
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);
--
Gitblit v1.9.3