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/abstractd/AbstractCloudStorageService.java | 6 +
ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java | 14 +-
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java | 39 ++++--
ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java | 3
ruoyi-admin/src/main/resources/application-prod.yml | 39 ++++++
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuCloudStorageServiceImpl.java | 37 ++++-
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java | 55 +++++++-
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java | 80 ++++++++++---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageService.java | 4
ruoyi-admin/src/main/resources/application-dev.yml | 39 ++++++
10 files changed, 256 insertions(+), 60 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 62312f6..1c16128 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -137,3 +137,42 @@
endpoint:
logfile:
external-file: ./logs/sys-console.log
+
+--- # OSS 浜戝瓨鍌�(鐣岄潰 <鍙傛暟璁剧疆> 鍙垏鎹�)
+cloud-storage:
+ # minio閰嶇疆
+ minio:
+ endpoint: http://localhost:9000
+ accessKey: ruoyi
+ secretKey: ruoyi123
+ bucketName: ruoyi
+ # 涓冪墰浜戦厤缃�
+ qiniu:
+ domain: http://XXX.XXXX.com
+ prefix:
+ accessKey: XXXXXXXXXXXXXXX
+ secretKey: XXXXXXXXXXXXXXX
+ bucketName: ruoyi
+ isHttps: false
+ # z0 鍗庝笢 z1 鍗庡寳 z2 鍗庡崡 na0 鍖楃編 as0 涓滃崡浜�
+ # 涓嶅～涓鸿嚜鍔ㄨ幏鍙�(鎬ц兘浣� 鏄撳嚭闂)
+ region: z0
+ # 闃块噷浜戦厤缃�
+ aliyun:
+ endpoint: http://oss-cn-beijing.aliyuncs.com
+ prefix:
+ accessKeyId: XXXXXXXXXXXXXXX
+ accessKeySecret: XXXXXXXXXXXXXXX
+ bucketName: ruoyi
+ # 鑵捐浜戦厤缃�
+ qcloud:
+ endpoint: http://cos.ap-beijing.myqcloud.com
+ prefix:
+ secretId: XXXXXXXXXXXXXXX
+ secretKey: XXXXXXXXXXXXXXX
+ # 鑵捐浜慴ucket鍚嶈鍒� 鏍煎紡涓� BucketName-APPID 姝ゅ濉啓鐨勫瓨鍌ㄦ《鍚嶇О蹇呴』涓烘鏍煎紡
+ bucketName: ruoyi-1250000000
+ isHttps: false
+ # 鍦板煙鍚嶅弬鑰冨畼鏂规枃妗�
+ # https://cloud.tencent.com/document/product/436/6224
+ region: ap-beijing
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 2c9d4e5..998237c 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -137,3 +137,42 @@
endpoint:
logfile:
external-file: ./logs/sys-console.log
+
+--- # OSS 浜戝瓨鍌�(鐣岄潰 <鍙傛暟璁剧疆> 鍙垏鎹�)
+cloud-storage:
+ # minio閰嶇疆
+ minio:
+ endpoint: http://172.30.0.54:9000
+ accessKey: ruoyi
+ secretKey: ruoyi123
+ bucketName: ruoyi
+ # 涓冪墰浜戦厤缃�
+ qiniu:
+ domain: http://XXX.XXXX.com
+ prefix:
+ accessKey: XXXXXXXXXXXXXXX
+ secretKey: XXXXXXXXXXXXXXX
+ bucketName: ruoyi
+ isHttps: false
+ # z0 鍗庝笢 z1 鍗庡寳 z2 鍗庡崡 na0 鍖楃編 as0 涓滃崡浜�
+ # 涓嶅～涓鸿嚜鍔ㄨ幏鍙�(鎬ц兘浣� 鏄撳嚭闂)
+ region: z0
+ # 闃块噷浜戦厤缃�
+ aliyun:
+ endpoint: http://oss-cn-beijing.aliyuncs.com
+ prefix:
+ accessKeyId: XXXXXXXXXXXXXXX
+ accessKeySecret: XXXXXXXXXXXXXXX
+ bucketName: ruoyi
+ # 鑵捐浜戦厤缃�
+ qcloud:
+ endpoint: http://cos.ap-beijing.myqcloud.com
+ prefix:
+ secretId: XXXXXXXXXXXXXXX
+ secretKey: XXXXXXXXXXXXXXX
+ # 鑵捐浜慴ucket鍚嶈鍒� 鏍煎紡涓� BucketName-APPID 姝ゅ濉啓鐨勫瓨鍌ㄦ《鍚嶇О蹇呴』涓烘鏍煎紡
+ bucketName: ruoyi-1250000000
+ isHttps: false
+ # 鍦板煙鍚嶅弬鑰冨畼鏂规枃妗�
+ # https://cloud.tencent.com/document/product/436/6224
+ region: ap-beijing
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
index a668bf2..3191dc4 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/CloudServiceEnumd.java
@@ -2,6 +2,7 @@
import com.ruoyi.oss.service.impl.AliyunCloudStorageServiceImpl;
import com.ruoyi.oss.service.impl.MinioCloudStorageServiceImpl;
+import com.ruoyi.oss.service.impl.QcloudCloudStorageServiceImpl;
import com.ruoyi.oss.service.impl.QiniuCloudStorageServiceImpl;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -28,7 +29,7 @@
/**
* 鑵捐浜�
*/
- QCLOUD("qcloud", QiniuCloudStorageServiceImpl.class),
+ QCLOUD("qcloud", QcloudCloudStorageServiceImpl.class),
/**
* minio
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java
index 4a86331..236757e 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java
@@ -102,17 +102,12 @@
/**
* 鑵捐浜戠粦瀹氱殑鍩熷悕
*/
- private String domain;
+ private String endpoint;
/**
* 鑵捐浜戣矾寰勫墠缂�
*/
private String prefix;
-
- /**
- * 鑵捐浜慳ppId
- */
- private String appId;
/**
* 鑵捐浜慡ecretId
@@ -128,6 +123,11 @@
* 鑵捐浜態ucketName
*/
private String bucketName;
+
+ /**
+ * 涓冪墰鏄惁浣跨敤https
+ */
+ private Boolean isHttps;
/**
* 鑵捐浜慍OS鎵�灞炲湴鍖�
@@ -176,7 +176,7 @@
private String region;
/**
- * 涓冪墰瀛樺偍鍖哄煙
+ * 涓冪墰鏄惁浣跨敤https
*/
private Boolean isHttps;
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageService.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageService.java
index a3d73d7..a23c1f5 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageService.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/ICloudStorageService.java
@@ -11,6 +11,8 @@
*/
public interface ICloudStorageService {
+ void createBucket();
+
/**
* 鑾峰彇鏈嶅姟鍟嗙被鍨�
*/
@@ -67,4 +69,6 @@
* @return 杩斿洖http鍦板潃
*/
UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType);
+
+ String getEndpointLink();
}
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 2e6404c..c757ab4 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
@@ -19,6 +19,9 @@
public abstract class AbstractCloudStorageService implements ICloudStorageService, InitializingBean {
@Override
+ public abstract void createBucket();
+
+ @Override
public abstract String getServiceType();
@Override
@@ -53,4 +56,7 @@
@Override
public abstract void afterPropertiesSet() throws Exception;
+
+ @Override
+ public abstract String getEndpointLink();
}
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java
index b483eba..a4b43ec 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java
@@ -1,8 +1,13 @@
package com.ruoyi.oss.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.aliyun.oss.ClientConfiguration;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.common.auth.DefaultCredentialProvider;
+import com.aliyun.oss.model.CannedAccessControlList;
+import com.aliyun.oss.model.CreateBucketRequest;
+import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PutObjectRequest;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.CloudServiceEnumd;
import com.ruoyi.oss.exception.OssException;
@@ -39,8 +44,24 @@
this.properties.getAccessKeyId(),
this.properties.getAccessKeySecret());
client = new OSSClient(this.properties.getEndpoint(), credentialProvider, configuration);
+ createBucket();
} catch (Exception e) {
throw new IllegalArgumentException("闃块噷浜戝瓨鍌ㄩ厤缃敊璇�! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
+ }
+
+ @Override
+ public void createBucket() {
+ try {
+ String bucketName = properties.getBucketName();
+ if (client.doesBucketExist(bucketName)) {
+ return;
+ }
+ CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
+ createBucketRequest.setCannedACL(CannedAccessControlList.PublicRead);
+ client.createBucket(createBucketRequest);
+ } catch (Exception e) {
+ throw new OssException("鍒涘缓Bucket澶辫触, 璇锋牳瀵归樋閲屼簯閰嶇疆淇℃伅");
}
}
@@ -57,35 +78,51 @@
@Override
public UploadResult upload(InputStream inputStream, String path, String contentType) {
try {
- client.putObject(this.properties.getBucketName(), path, inputStream);
+ ObjectMetadata metadata = new ObjectMetadata();
+ metadata.setContentType(contentType);
+ client.putObject(new PutObjectRequest(properties.getBucketName(), path, inputStream, metadata));
} catch (Exception e) {
- throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ厤缃俊鎭�");
+ throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ樋閲屼簯閰嶇疆淇℃伅");
}
- return new UploadResult().setUrl(properties.getEndpoint() + "/" + path).setFilename(path);
+ return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
}
@Override
public void delete(String path) {
- path = path.replace(this.properties.getEndpoint() + "/", "");
+ path = path.replace(getEndpointLink() + "/", "");
try {
- client.deleteObject(this.properties.getBucketName(), path);
+ client.deleteObject(properties.getBucketName(), path);
} catch (Exception e) {
- throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ厤缃俊鎭�");
+ throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ラ樋閲屼簯閰嶇疆淇℃伅");
}
}
@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
public void afterPropertiesSet() throws Exception {
- OssFactory.register(getServiceType(),this);
+ OssFactory.register(getServiceType(), this);
+ }
+
+ @Override
+ public String getEndpointLink() {
+ String endpoint = properties.getEndpoint();
+ StringBuilder sb = new StringBuilder(endpoint);
+ if (StrUtil.containsAnyIgnoreCase(endpoint, "http://")) {
+ sb.insert(7, properties.getBucketName() + ".");
+ } else if (StrUtil.containsAnyIgnoreCase(endpoint, "https://")) {
+ sb.insert(8, properties.getBucketName() + ".");
+ } else {
+ throw new OssException("Endpoint閰嶇疆閿欒");
+ }
+ return sb.toString();
}
}
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java
index d499eb5..70ed684 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java
@@ -39,18 +39,28 @@
.endpoint(this.properties.getEndpoint())
.credentials(this.properties.getAccessKey(), this.properties.getSecretKey())
.build();
- String bucketName = this.properties.getBucketName();
- boolean exists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
- // 涓嶅瓨鍦ㄥ氨鍒涘缓妗�
- if (!exists) {
- minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
- minioClient.setBucketPolicy(SetBucketPolicyArgs.builder()
- .bucket(bucketName)
- .config(getPolicy(bucketName, PolicyType.READ))
- .build());
- }
+ createBucket();
} catch (Exception e) {
throw new IllegalArgumentException("Minio瀛樺偍閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
+ }
+
+ @Override
+ public void createBucket() {
+ try {
+ String bucketName = properties.getBucketName();
+ boolean exists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
+ if (exists) {
+ return;
+ }
+ // 涓嶅瓨鍦ㄥ氨鍒涘缓妗�
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
+ minioClient.setBucketPolicy(SetBucketPolicyArgs.builder()
+ .bucket(bucketName)
+ .config(getPolicy(bucketName, PolicyType.READ))
+ .build());
+ } catch (Exception e) {
+ throw new OssException("鍒涘缓Bucket澶辫触, 璇锋牳瀵筂inio閰嶇疆淇℃伅");
}
}
@@ -76,12 +86,12 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅");
}
- return new UploadResult().setUrl(getBaseUrl() + path).setFilename(path);
+ return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
}
@Override
public void delete(String path) {
- path = path.replace(getBaseUrl(), "");
+ path = path.replace(getEndpointLink() + "/", "");
try {
minioClient.removeObject(RemoveObjectArgs.builder()
.bucket(properties.getBucketName())
@@ -107,8 +117,9 @@
OssFactory.register(getServiceType(), this);
}
- private String getBaseUrl() {
- return properties.getEndpoint() + "/" + properties.getBucketName() + "/";
+ @Override
+ public String getEndpointLink() {
+ return properties.getEndpoint() + "/" + properties.getBucketName();
}
private String getPolicy(String bucketName, PolicyType policyType) {
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java
index 3376b8d..35f008a 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudCloudStorageServiceImpl.java
@@ -1,12 +1,16 @@
package com.ruoyi.oss.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.qcloud.cos.COSClient;
import com.qcloud.cos.ClientConfig;
import com.qcloud.cos.auth.BasicCOSCredentials;
import com.qcloud.cos.auth.COSCredentials;
+import com.qcloud.cos.http.HttpProtocol;
+import com.qcloud.cos.model.*;
import com.qcloud.cos.region.Region;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.CloudServiceEnumd;
+import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.factory.OssFactory;
import com.ruoyi.oss.properties.CloudStorageProperties;
import com.ruoyi.oss.properties.CloudStorageProperties.QcloudProperties;
@@ -16,6 +20,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
/**
@@ -41,9 +46,30 @@
ClientConfig clientConfig = new ClientConfig();
// 璁剧疆bucket鎵�鍦ㄧ殑鍖哄煙锛屽崕鍗楋細gz 鍗庡寳锛歵j 鍗庝笢锛歴h
clientConfig.setRegion(new Region(this.properties.getRegion()));
+ if (this.properties.getIsHttps()) {
+ clientConfig.setHttpProtocol(HttpProtocol.https);
+ } else {
+ clientConfig.setHttpProtocol(HttpProtocol.http);
+ }
client = new COSClient(credentials, clientConfig);
+ createBucket();
} catch (Exception e) {
throw new IllegalArgumentException("鑵捐浜戝瓨鍌ㄩ厤缃敊璇�! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
+ }
+
+ @Override
+ public void createBucket() {
+ try {
+ String bucketName = properties.getBucketName();
+ if (client.doesBucketExist(bucketName)) {
+ return;
+ }
+ CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
+ createBucketRequest.setCannedAcl(CannedAccessControlList.PublicRead);
+ client.createBucket(createBucketRequest);
+ } catch (Exception e) {
+ throw new OssException("鍒涘缓Bucket澶辫触, 璇锋牳瀵硅吘璁簯閰嶇疆淇℃伅");
}
}
@@ -54,43 +80,57 @@
@Override
public UploadResult upload(byte[] data, String path, String contentType) {
- // 鑵捐浜戝繀闇�瑕佷互"/"寮�澶�
- if (!path.startsWith("/")) {
- path = "/" + path;
+ return upload(new ByteArrayInputStream(data), path, contentType);
+ }
+
+ @Override
+ public UploadResult upload(InputStream inputStream, String path, String contentType) {
+ try {
+ ObjectMetadata metadata = new ObjectMetadata();
+ metadata.setContentType(contentType);
+ client.putObject(new PutObjectRequest(properties.getBucketName(), path, inputStream, metadata));
+ } catch (Exception e) {
+ throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鏌ヨ吘璁簯閰嶇疆淇℃伅");
}
- // 涓婁紶鍒拌吘璁簯
-// UploadFileRequest request = new UploadFileRequest(config.getQcloudBucketName(), path, data);
-// String response = client.uploadFile(request);
-// Map<String, Object> jsonObject = JsonUtils.parseMap(response);
-// if (Convert.toInt(jsonObject.get("code")) != 0) {
-// throw new OssException("鏂囦欢涓婁紶澶辫触锛�" + Convert.toStr(jsonObject.get("message")));
-// }
- return new UploadResult().setUrl(properties.getDomain() + "/" + path).setFilename(path);
+ return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
}
@Override
public void delete(String path) {
-// path = path.replace(config.getDomain(),"");
-// DelFileRequest request = new DelFileRequest(config.getBucketName(), path);
-// String response = client.delFile(request);
-// Map<String, Object> jsonObject = JsonUtils.parseMap(response);
-// if (Convert.toInt(jsonObject.get("code")) != 0) {
-// throw new OssException("鏂囦欢鍒犻櫎澶辫触锛�" + Convert.toStr(jsonObject.get("message")));
-// }
+ path = path.replace(getEndpointLink() + "/", "");
+ try {
+ client.deleteObject(new DeleteObjectRequest(properties.getBucketName(), path));
+ } catch (Exception e) {
+ throw new OssException("涓婁紶鏂囦欢澶辫触锛岃妫�鑵捐浜戞煡閰嶇疆淇℃伅");
+ }
}
@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
public void afterPropertiesSet() throws Exception {
OssFactory.register(getServiceType(),this);
}
+
+ @Override
+ public String getEndpointLink() {
+ String endpoint = properties.getEndpoint();
+ StringBuilder sb = new StringBuilder(endpoint);
+ if (StrUtil.containsAnyIgnoreCase(endpoint, "http://")) {
+ sb.insert(7, properties.getBucketName() + ".");
+ } else if (StrUtil.containsAnyIgnoreCase(endpoint, "https://")) {
+ sb.insert(8, properties.getBucketName() + ".");
+ } else {
+ throw new OssException("Endpoint閰嶇疆閿欒");
+ }
+ return sb.toString();
+ }
}
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