fix 修复 minio 适配 https 导致的问题

疯狂的狮子li

2022-02-18 bb793d71e7bb47e8a036dba4d07b132cecc24c81

 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() + "]");
@@ -80,7 +88,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