From 7f305962f26ec44ba6e958f81a20c55c3738233b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 18 二月 2022 10:31:13 +0800
Subject: [PATCH] 发布 4.0.0
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
index 60ac032..eb2e770 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java
@@ -1,6 +1,7 @@
package com.ruoyi.oss.service.impl;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.oss.constant.OssConstant;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.OssEnumd;
import com.ruoyi.oss.enumd.PolicyType;
@@ -9,6 +10,7 @@
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import io.minio.*;
import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -18,22 +20,24 @@
*
* @author Lion Li
*/
+@Component
public class MinioOssStrategy extends AbstractOssStrategy {
private MinioClient minioClient;
@Override
- public void init(OssProperties cloudStorageProperties) {
- properties = cloudStorageProperties;
+ public void init(OssProperties ossProperties) {
+ super.init(ossProperties);
try {
minioClient = MinioClient.builder()
- .endpoint(properties.getEndpoint())
+ .endpoint(properties.getEndpoint(), 443, OssConstant.IS_HTTPS.equals(ossProperties.getIsHttps()))
.credentials(properties.getAccessKey(), properties.getSecretKey())
.build();
createBucket();
} catch (Exception e) {
throw new OssException("Minio瀛樺偍閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�:[" + e.getMessage() + "]");
}
+ isInit = true;
}
@Override
@@ -56,8 +60,8 @@
}
@Override
- public String getServiceType() {
- return OssEnumd.MINIO.getValue();
+ public OssEnumd getServiceType() {
+ return OssEnumd.MINIO;
}
@Override
@@ -77,7 +81,7 @@
} catch (Exception e) {
throw new OssException("涓婁紶鏂囦欢澶辫触锛岃鏍稿Minio閰嶇疆淇℃伅:[" + e.getMessage() + "]");
}
- return new UploadResult().setUrl(getEndpointLink() + "/" + path).setFilename(path);
+ return UploadResult.builder().url(getEndpointLink() + "/" + path).filename(path).build();
}
@Override
--
Gitblit v1.9.3