From 2e25dbb794bde83ebca485178b3447e8be0271e4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 21 十一月 2022 16:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
sandu-common/src/main/java/com/sandu/common/file/impl/AliOssFileServiceImpl.java | 188 ++++++++++++++++++++++------------------------
1 files changed, 89 insertions(+), 99 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/file/impl/AliOssFileServiceImpl.java b/sandu-common/src/main/java/com/sandu/common/file/impl/AliOssFileServiceImpl.java
index 97df32c..41e8eea 100644
--- a/sandu-common/src/main/java/com/sandu/common/file/impl/AliOssFileServiceImpl.java
+++ b/sandu-common/src/main/java/com/sandu/common/file/impl/AliOssFileServiceImpl.java
@@ -2,31 +2,28 @@
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.StrUtil;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.model.CannedAccessControlList;
-import com.aliyun.oss.model.CreateBucketRequest;
-import com.aliyun.oss.model.PutObjectRequest;
-import com.aliyun.oss.model.PutObjectResult;
import com.sandu.common.enums.FileStorageEnums;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.IFileUpload;
+import com.sandu.common.file.config.minioConfig.MinIoPolicy;
+import io.minio.*;
+import io.minio.messages.Bucket;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.List;
/**
* @author chenjiantian
@@ -36,16 +33,12 @@
@Component
public class AliOssFileServiceImpl implements IFileUpload {
- @Value("${oss-conf.end-point}")
- private String endPoint;
- @Value("${oss-conf.key-id}")
- private String keyId;
- @Value("${oss-conf.key-secret}")
- private String keySecret;
- @Value("${oss-conf.bucket-name}")
- private String bucketName;
+ @Autowired
+ private MinioClient minioClient;
- private String host;
+ private String bucketName = "remote-update";
+ public String MINIO_PREFIX = "vnnox.";
+
@Override
public FileUploadDto uploadFile(MultipartFile multipartFile) {
@@ -57,41 +50,29 @@
String md5 = getMD5(multipartFile);
FileUploadDto uploadDto = new FileUploadDto();
- OSS ossClient = new OSSClientBuilder().build(endPoint, keyId, keySecret);
+
+
try {
- //瀹瑰櫒涓嶅瓨鍦紝灏卞垱寤�
- if (!ossClient.doesBucketExist(bucketName)) {
- ossClient.createBucket(bucketName);
- CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
- createBucketRequest.setCannedACL(CannedAccessControlList.PublicRead);
- ossClient.createBucket(createBucketRequest);
- }
- //涓婁紶鏂囦欢
- PutObjectResult result = ossClient.putObject(new PutObjectRequest(bucketName, fileName, new ByteArrayInputStream(multipartFile.getBytes())));
- //璁剧疆鏉冮檺 杩欓噷鏄叕寮�璇�
-// ossClient.setBucketAcl(ossProperties.getBucketName(), CannedAccessControlList.PublicRead);
-
- if (result != null) {
- String url = "";
- // https://BucketName.Endpoint/ObjectName
- if (StrUtil.isBlank(host)) {
- url = "https://" + bucketName + "." + endPoint + "/" + fileName;
- } else {
- if (!host.endsWith("/")) {
- url = host + "/" + fileName;
- } else {
- url = host + fileName;
- }
+ if (!bucketExists(bucketName)) {
+ createBucket(bucketName);
+ if (bucketName.contains(MINIO_PREFIX)) {
+ setBucketPolicy(bucketName);
}
-
- uploadDto.setFileUrl(url);
}
+
+ final InputStream is = multipartFile.getInputStream();
+ Long start = System.currentTimeMillis();
+ minioClient.putObject(bucketName, fileName, is, new PutObjectOptions(is.available(), -1));
+ is.close();
+ System.out.println(("涓婁紶鎬绘椂闂达細" + (System.currentTimeMillis() - start) + "ms"));
+
+// 浠巑inio鑾峰彇 url
+ String url = minioClient.presignedGetObject(bucketName, fileName);
+ System.out.println("鑾峰彇鍒扮殑璺緞锛�"+url);
+ uploadDto.setFileUrl(url);
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new BusinessException(e.getMessage());
- } finally {
- //鍏抽棴
- ossClient.shutdown();
}
uploadDto.setOriginName(originalFilename);
@@ -117,57 +98,6 @@
return uploadDto;
}
- public FileUploadDto uploadFile(File multipartFile) {
- String originalFilename = multipartFile.getName();
-// long size = multipartFile.get();
- String suffix = FileUtil.getSuffix(originalFilename);
- String dayStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm"));
- String fileName = dayStr + UUID.fastUUID() + "." + suffix;
-
- FileUploadDto uploadDto = new FileUploadDto();
- OSS ossClient = new OSSClientBuilder().build(endPoint, keyId, keySecret);
- try {
- //瀹瑰櫒涓嶅瓨鍦紝灏卞垱寤�
- if (!ossClient.doesBucketExist(bucketName)) {
- ossClient.createBucket(bucketName);
- CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
- createBucketRequest.setCannedACL(CannedAccessControlList.PublicRead);
- ossClient.createBucket(createBucketRequest);
- }
- //涓婁紶鏂囦欢
- PutObjectResult result = ossClient.putObject(new PutObjectRequest(bucketName, fileName, multipartFile));
- //璁剧疆鏉冮檺 杩欓噷鏄叕寮�璇�
-// ossClient.setBucketAcl(ossProperties.getBucketName(), CannedAccessControlList.PublicRead);
-
- if (result != null) {
- String url = "";
- // https://BucketName.Endpoint/ObjectName
- if (StrUtil.isBlank(host)) {
- url = "https://" + bucketName + "." + endPoint + "/" + fileName;
- } else {
- if (!host.endsWith("/")) {
- url = host + "/" + fileName;
- } else {
- url = host + fileName;
- }
- }
- uploadDto.setFileUrl(url);
- }
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- throw new BusinessException(e.getMessage());
- } finally {
- //鍏抽棴
- ossClient.shutdown();
- }
-
- uploadDto.setOriginName(originalFilename);
- uploadDto.setFileName(fileName);
- uploadDto.setFileType(FileUtil.extName(originalFilename));
- uploadDto.setStorageType(FileStorageEnums.ALIBABA.getCode());
-
- return uploadDto;
- }
/**
* 鑾峰彇涓婁紶鏂囦欢鐨凪D5鍊�
@@ -191,4 +121,64 @@
return null;
}
+
+ /**
+ * 璁剧疆寮�鏀�*鐨勬《绛栫暐
+ *
+ * @param bucketName
+ * @return
+ */
+ public void setBucketPolicy(String bucketName) throws Exception {
+ minioClient.setBucketPolicy(
+ SetBucketPolicyArgs.builder().bucket(bucketName).config(MinIoPolicy.generateMinioPolicy(bucketName)).build()
+ );
+ }
+
+
+ /**
+ * 鍒ゆ柇 bucket鏄惁瀛樺湪
+ *
+ * @param bucketName: 妗跺悕
+ * @return: boolean
+ */
+ @SneakyThrows(Exception.class)
+ public boolean bucketExists(String bucketName) {
+ return minioClient.bucketExists(bucketName);
+ }
+
+ public boolean objectExists(String bucketName, String objectName) {
+ try {
+ getObjectInfo(bucketName, objectName);
+ } catch (Exception e) {
+ return false;
+ }
+ return true;
+ }
+
+ private void getObjectInfo(String bucketName, String objectName) {
+
+ }
+
+ /**
+ * 鍒涘缓 bucket
+ *
+ * @param bucketName: 妗跺悕
+ * @return: void
+ */
+ @SneakyThrows(Exception.class)
+ public void createBucket(String bucketName) {
+ boolean isExist = minioClient.bucketExists((BucketExistsArgs) ((io.minio.BucketExistsArgs.Builder) BucketExistsArgs.builder().bucket(bucketName)).build());
+ if (!isExist) {
+ minioClient.makeBucket((MakeBucketArgs) ((io.minio.MakeBucketArgs.Builder) MakeBucketArgs.builder().bucket(bucketName)).build());
+ }
+ }
+
+ /**
+ * 鑾峰彇鍏ㄩ儴bucket
+ */
+ @SneakyThrows(Exception.class)
+ public List<Bucket> getAllBuckets() {
+ return minioClient.listBuckets();
+ }
+
}
--
Gitblit v1.9.3