From 7114fc27207ea8f8aca86dd91ff2acfe470c9349 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 23 七月 2021 18:37:39 +0800
Subject: [PATCH] update OSS模块 更新 阿里云 腾讯云 相关代码 重构部分代码结构
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java
index 944dd23..f7b4d4e 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java
@@ -49,14 +49,28 @@
Auth auth = Auth.create(
this.properties.getAccessKey(),
this.properties.getSecretKey());
- token = auth.uploadToken(this.properties.getBucketName());
+ String bucketName = this.properties.getBucketName();
+ token = auth.uploadToken(bucketName);
bucketManager = new BucketManager(auth, config);
- if (!ArrayUtil.contains(bucketManager.buckets(), this.properties.getBucketName())) {
- bucketManager.createBucket(this.properties.getBucketName(), this.properties.getRegion());
+ if (!ArrayUtil.contains(bucketManager.buckets(), bucketName)) {
+ bucketManager.createBucket(bucketName, this.properties.getRegion());
}
} catch (Exception e) {
throw new IllegalArgumentException("涓冪墰浜戝瓨鍌ㄩ厤缃敊璇�! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
+ }
+
+ @Override
+ public void createBucket() {
+ try {
+ String bucketName = properties.getBucketName();
+ if (ArrayUtil.contains(bucketManager.buckets(), bucketName)) {
+ return;
+ }
+ bucketManager.createBucket(bucketName, properties.getRegion());
+ } catch (Exception e) {
+ throw new OssException("鍒涘缓Bucket澶辫触, 璇锋牳瀵逛竷鐗涗簯閰嶇疆淇℃伅");
}
}
@@ -68,21 +82,21 @@
@Override
public UploadResult upload(byte[] data, String path, String contentType) {
try {
- Response res = uploadManager.put(data, path, token);
+ Response res = uploadManager.put(data, path, token, null, contentType, false);
if (!res.isOK()) {
throw new RuntimeException("涓婁紶涓冪墰鍑洪敊锛�" + res.toString());
}
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿涓冪墰閰嶇疆淇℃伅");
}
- return new UploadResult().setUrl(properties.getDomain() + "/" + path).setFilename(path);
+ return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
}
@Override
public void delete(String path) {
try {
- path = path.replace(this.properties.getDomain() + "/", "");
- Response res = bucketManager.delete(this.properties.getBucketName(), path);
+ path = path.replace(getEndpointLink() + "/", "");
+ Response res = bucketManager.delete(properties.getBucketName(), path);
if (!res.isOK()) {
throw new RuntimeException("鍒犻櫎涓冪墰鏂囦欢鍑洪敊锛�" + res.toString());
}
@@ -93,12 +107,12 @@
@Override
public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
- return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
+ return upload(data, getPath(properties.getPrefix(), suffix), contentType);
}
@Override
public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
- return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
+ return upload(inputStream, getPath(properties.getPrefix(), suffix), contentType);
}
@Override
@@ -106,6 +120,11 @@
OssFactory.register(getServiceType(),this);
}
+ @Override
+ public String getEndpointLink() {
+ return properties.getDomain();
+ }
+
private Region getRegion(String region) {
switch (region) {
case "z0":
--
Gitblit v1.9.3