From f8ab5663ef7220f8adc0fd8fcbd7d0cf84c6d77d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 12:15:14 +0800
Subject: [PATCH] update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageService.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageService.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageService.java
index a154670..9bd0013 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageService.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractCloudStorageService.java
@@ -3,7 +3,8 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.service.ICloudStorageService;
import org.springframework.beans.factory.InitializingBean;
@@ -18,6 +19,9 @@
public abstract class AbstractCloudStorageService implements ICloudStorageService, InitializingBean {
@Override
+ public abstract void createBucket();
+
+ @Override
public abstract String getServiceType();
@Override
@@ -26,30 +30,33 @@
String uuid = IdUtil.fastSimpleUUID();
// 鏂囦欢璺緞
String path = DateUtil.format(new Date(), "yyyyMMdd") + "/" + uuid;
- if (StrUtil.isNotBlank(prefix)) {
+ if (StringUtils.isNotBlank(prefix)) {
path = prefix + "/" + path;
}
return path + suffix;
}
@Override
- public abstract String upload(byte[] data, String path);
+ public abstract UploadResult upload(byte[] data, String path, String contentType);
@Override
public abstract void delete(String path);
@Override
- public String upload(InputStream inputStream, String path) {
+ public UploadResult upload(InputStream inputStream, String path, String contentType) {
byte[] data = IoUtil.readBytes(inputStream);
- return this.upload(data, path);
+ return this.upload(data, path, contentType);
}
@Override
- public abstract String uploadSuffix(byte[] data, String suffix);
+ public abstract UploadResult uploadSuffix(byte[] data, String suffix, String contentType);
@Override
- public abstract String uploadSuffix(InputStream inputStream, String suffix);
+ public abstract UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType);
@Override
public abstract void afterPropertiesSet() throws Exception;
+
+ @Override
+ public abstract String getEndpointLink();
}
--
Gitblit v1.9.3