From a4c019ace2841faa6af14b5373a041464c3dbbde Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 20 七月 2021 11:12:22 +0800
Subject: [PATCH] update OSS接口增加通用contentType
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioCloudStorageServiceImpl.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 145 insertions(+), 27 deletions(-)
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 bf02831..f6d4cd4 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
@@ -1,66 +1,184 @@
package com.ruoyi.oss.service.impl;
-import cn.hutool.core.io.IoUtil;
-import com.ruoyi.oss.config.CloudStorageConfig;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.oss.constant.CloudConstant;
+import com.ruoyi.oss.entity.UploadResult;
+import com.ruoyi.oss.enumd.CloudServiceEnumd;
+import com.ruoyi.oss.enumd.PolicyType;
import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.oss.factory.OssFactory;
+import com.ruoyi.oss.properties.CloudStorageProperties;
+import com.ruoyi.oss.properties.CloudStorageProperties.MinioProperties;
import com.ruoyi.oss.service.abstractd.AbstractCloudStorageService;
-import io.minio.MinioClient;
+import io.minio.*;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
/**
* minio瀛樺偍
+ *
+ * @author Lion Li
*/
-public class MinioCloudStorageServiceImpl extends AbstractCloudStorageService {
+@Lazy
+@Service
+public class MinioCloudStorageServiceImpl extends AbstractCloudStorageService implements InitializingBean {
- private MinioClient minioClient;
+ private final MinioClient minioClient;
+ private final MinioProperties properties;
- public MinioCloudStorageServiceImpl(CloudStorageConfig config) {
- this.config = config;
- // 鍒濆鍖�
- init();
- }
-
- private void init() {
- minioClient = MinioClient.builder()
- .endpoint(config.getDomain())
- .credentials(config.getAccessKey(), config.getSecretKey())
- .build();
+ @Autowired
+ public MinioCloudStorageServiceImpl(CloudStorageProperties properties) {
+ this.properties = properties.getMinio();
+ try {
+ minioClient = MinioClient.builder()
+ .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());
+ }
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Minio瀛樺偍閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�!");
+ }
}
@Override
- public String upload(byte[] data, String path) {
- try {
+ public String getServiceType() {
+ return CloudServiceEnumd.MINIO.getValue();
+ }
+ @Override
+ public UploadResult upload(byte[] data, String path, String contentType) {
+ return upload(new ByteArrayInputStream(data), path, contentType);
+ }
+
+ @Override
+ public UploadResult upload(InputStream inputStream, String path, String contentType) {
+ try {
+ minioClient.putObject(PutObjectArgs.builder()
+ .bucket(properties.getBucketName())
+ .object(path)
+ .contentType(StrUtil.blankToDefault(contentType, CloudConstant.DEFAULT_CONTENT_TYPE))
+ .stream(inputStream, inputStream.available(), -1)
+ .build());
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅");
}
- return config.getDomain() + "/" + path;
+ return new UploadResult().setUrl(getBaseUrl() + path).setFilename(path);
}
@Override
public void delete(String path) {
+ path = path.replace(getBaseUrl(), "");
try {
-
+ minioClient.removeObject(RemoveObjectArgs.builder()
+ .bucket(properties.getBucketName())
+ .object(path)
+ .build());
} catch (Exception e) {
throw new OssException(e.getMessage());
}
}
@Override
- public String upload(InputStream inputStream, String path) {
- byte[] data = IoUtil.readBytes(inputStream);
- return this.upload(data, path);
+ public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+ return upload(data, getPath("", suffix), contentType);
}
@Override
- public String uploadSuffix(byte[] data, String suffix) {
- return upload(data, getPath(config.getPrefix(), suffix));
+ public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
+ return upload(inputStream, getPath("", suffix), contentType);
}
@Override
- public String uploadSuffix(InputStream inputStream, String suffix) {
- return upload(inputStream, getPath(config.getPrefix(), suffix));
+ public void afterPropertiesSet() throws Exception {
+ OssFactory.register(getServiceType(), this);
}
+ private String getBaseUrl() {
+ return properties.getEndpoint() + "/" + properties.getBucketName() + "/";
+ }
+
+ private String getPolicy(String bucketName, PolicyType policyType) {
+ StringBuilder builder = new StringBuilder();
+ builder.append("{\n");
+ builder.append(" \"Statement\": [\n");
+ builder.append(" {\n");
+ builder.append(" \"Action\": [\n");
+ if (policyType == PolicyType.WRITE) {
+ builder.append(" \"s3:GetBucketLocation\",\n");
+ builder.append(" \"s3:ListBucketMultipartUploads\"\n");
+ } else if (policyType == PolicyType.READ_WRITE) {
+ builder.append(" \"s3:GetBucketLocation\",\n");
+ builder.append(" \"s3:ListBucket\",\n");
+ builder.append(" \"s3:ListBucketMultipartUploads\"\n");
+ } else {
+ builder.append(" \"s3:GetBucketLocation\"\n");
+ }
+ builder.append(" ],\n");
+ builder.append(" \"Effect\": \"Allow\",\n");
+ builder.append(" \"Principal\": \"*\",\n");
+ builder.append(" \"Resource\": \"arn:aws:s3:::");
+ builder.append(bucketName);
+ builder.append("\"\n");
+ builder.append(" },\n");
+ if (PolicyType.READ.equals(policyType)) {
+ builder.append(" {\n");
+ builder.append(" \"Action\": [\n");
+ builder.append(" \"s3:ListBucket\"\n");
+ builder.append(" ],\n");
+ builder.append(" \"Effect\": \"Deny\",\n");
+ builder.append(" \"Principal\": \"*\",\n");
+ builder.append(" \"Resource\": \"arn:aws:s3:::");
+ builder.append(bucketName);
+ builder.append("\"\n");
+ builder.append(" },\n");
+ }
+ builder.append(" {\n");
+ builder.append(" \"Action\": ");
+ switch (policyType) {
+ case WRITE:
+ builder.append("[\n");
+ builder.append(" \"s3:AbortMultipartUpload\",\n");
+ builder.append(" \"s3:DeleteObject\",\n");
+ builder.append(" \"s3:ListMultipartUploadParts\",\n");
+ builder.append(" \"s3:PutObject\"\n");
+ builder.append(" ],\n");
+ break;
+ case READ_WRITE:
+ builder.append("[\n");
+ builder.append(" \"s3:AbortMultipartUpload\",\n");
+ builder.append(" \"s3:DeleteObject\",\n");
+ builder.append(" \"s3:GetObject\",\n");
+ builder.append(" \"s3:ListMultipartUploadParts\",\n");
+ builder.append(" \"s3:PutObject\"\n");
+ builder.append(" ],\n");
+ break;
+ default:
+ builder.append("\"s3:GetObject\",\n");
+ break;
+ }
+ builder.append(" \"Effect\": \"Allow\",\n");
+ builder.append(" \"Principal\": \"*\",\n");
+ builder.append(" \"Resource\": \"arn:aws:s3:::");
+ builder.append(bucketName);
+ builder.append("/*\"\n");
+ builder.append(" }\n");
+ builder.append(" ],\n");
+ builder.append(" \"Version\": \"2012-10-17\"\n");
+ builder.append("}\n");
+ return builder.toString();
+ }
}
--
Gitblit v1.9.3