From 058da57d0644597a034135e86fca37b9b071ade3 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 3 Sep 2023 18:19:28 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20minio=E5=A2=9E=E5=8A=A0URL=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=86=85=E7=BD=91=E5=9C=B0=E5=9D=80=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=B9=B6=E8=BF=94=E5=9B=9E=E5=A4=96=E7=BD=91=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/builder/oss/MinioOssBuilder.java | 3 ++- .../resource/builder/oss/OssBuilder.java | 2 +- .../src/main/resources/application.yml | 20 ++++++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java index 8ec624a3..84c62e78 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java @@ -32,12 +32,13 @@ import org.springblade.resource.entity.Oss; public class MinioOssBuilder { @SneakyThrows - public static OssTemplate template(Oss oss, OssRule ossRule) { + public static OssTemplate template(Oss oss, OssRule ossRule, OssProperties properties) { MinioClient minioClient = MinioClient.builder() .endpoint(oss.getEndpoint()) .credentials(oss.getAccessKey(), oss.getSecretKey()) .build(); OssProperties ossProperties = new OssProperties(); + ossProperties.setTransformEndpoint(properties.getTransformEndpoint()); ossProperties.setEndpoint(oss.getEndpoint()); ossProperties.setAccessKey(oss.getAccessKey()); ossProperties.setSecretKey(oss.getSecretKey()); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java index 058c2bb5..614d49fa 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java @@ -100,7 +100,7 @@ public class OssBuilder { ossRule = new BladeOssRule(Boolean.FALSE); } if (oss.getCategory() == OssEnum.MINIO.getCategory()) { - template = MinioOssBuilder.template(oss, ossRule); + template = MinioOssBuilder.template(oss, ossRule, ossProperties); } else if (oss.getCategory() == OssEnum.QINIU.getCategory()) { template = QiniuOssBuilder.template(oss, ossRule); } else if (oss.getCategory() == OssEnum.ALI.getCategory()) { diff --git a/blade-ops/blade-resource/src/main/resources/application.yml b/blade-ops/blade-resource/src/main/resources/application.yml index f5e2576f..0eb39769 100644 --- a/blade-ops/blade-resource/src/main/resources/application.yml +++ b/blade-ops/blade-resource/src/main/resources/application.yml @@ -2,12 +2,22 @@ server: port: 8010 -#默认对象存储配置 +#oss默认配置 oss: + #开启oss配置 enabled: true - name: minio + #开启oss类型 + #minio、s3、qiniu、alioss、huaweiobs、tencentcos + name: qiniu + #租户模式 tenant-mode: true - endpoint: http://127.0.0.1:9000 - access-key: D99KGE6ZTQXSATTJWU24 - secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ + #oss服务地址 + endpoint: http://prt1thnw3.bkt.clouddn.com + #minio转换服务地址，用于内网上传后将返回地址改为转换的外网地址 + transform-endpoint: http://localhost:9000 + #访问key + access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h + #密钥key + secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS + #存储桶 bucket-name: bladex