From 4c57c2a04408fb8f9c0c08cf8d1919c76a90658c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 四月 2022 11:50:16 +0800
Subject: [PATCH] update springboot-admin 2.6.5 => 2.6.6 update qiniu 7.9.3 => 7.9.5 update qcloud 5.6.68 => 5.6.72 update minio 8.3.7 => 8.3.8 update okhttp 4.9.2 => 4.9.3
---
ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 435606c..f5be957 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;
@@ -8,6 +9,8 @@
import com.ruoyi.oss.properties.OssProperties;
import com.ruoyi.oss.service.abstractd.AbstractOssStrategy;
import io.minio.*;
+import io.minio.http.HttpUtils;
+import okhttp3.HttpUrl;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
@@ -28,10 +31,15 @@
public void init(OssProperties ossProperties) {
super.init(ossProperties);
try {
- minioClient = MinioClient.builder()
- .endpoint(properties.getEndpoint())
- .credentials(properties.getAccessKey(), properties.getSecretKey())
- .build();
+ MinioClient.Builder builder = MinioClient.builder();
+ if (OssConstant.IS_HTTPS.equals(ossProperties.getIsHttps())) {
+ HttpUrl url = HttpUtils.getBaseUrl(properties.getEndpoint())
+ .newBuilder().scheme("https").build();
+ builder.endpoint(url);
+ } else {
+ builder.endpoint(properties.getEndpoint());
+ }
+ minioClient = builder.credentials(properties.getAccessKey(), properties.getSecretKey()).build();
createBucket();
} catch (Exception e) {
throw new OssException("Minio瀛樺偍閰嶇疆閿欒! 璇锋鏌ョ郴缁熼厤缃�:[" + e.getMessage() + "]");
@@ -71,6 +79,8 @@
@Override
public UploadResult upload(InputStream inputStream, String path, String contentType) {
try {
+ // 瑙ｅ喅 inputStream.available() 鍐� socket 涓嬩紶杈撳欢杩熼棶棰� 瀵艰嚧鑾峰彇鏁板�间笉绮剧‘
+ Thread.sleep(1000);
minioClient.putObject(PutObjectArgs.builder()
.bucket(properties.getBucketName())
.object(path)
--
Gitblit v1.9.3