From b94d9f61d29a4c107543de8072809bc1b263efc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com> Date: Thu, 13 Feb 2025 17:35:42 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=20oss=20bean=20?= =?UTF-8?q?=E6=9E=84=E9=80=A0=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=87=8F=E5=B0=91?= =?UTF-8?q?=20bean=20=E5=86=B2=E7=AA=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/oss/config/AliossConfiguration.java | 11 ++++------- .../core/oss/config/MinioConfiguration.java | 12 ++++-------- .../core/oss/config/QiniuConfiguration.java | 16 ++++++++-------- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/blade-starter-oss/src/main/java/org/springblade/core/oss/config/AliossConfiguration.java b/blade-starter-oss/src/main/java/org/springblade/core/oss/config/AliossConfiguration.java index 3bcdd02..9a436bc 100644 --- a/blade-starter-oss/src/main/java/org/springblade/core/oss/config/AliossConfiguration.java +++ b/blade-starter-oss/src/main/java/org/springblade/core/oss/config/AliossConfiguration.java @@ -19,7 +19,6 @@ import com.aliyun.oss.ClientConfiguration; import com.aliyun.oss.OSSClient; import com.aliyun.oss.common.auth.CredentialsProvider; import com.aliyun.oss.common.auth.DefaultCredentialProvider; -import lombok.AllArgsConstructor; import org.springblade.core.oss.AliossTemplate; import org.springblade.core.oss.props.OssProperties; import org.springblade.core.oss.rule.OssRule; @@ -36,19 +35,15 @@ import org.springframework.context.annotation.Bean; * * @author Chill */ -@AllArgsConstructor @AutoConfiguration(after = OssConfiguration.class) @EnableConfigurationProperties(OssProperties.class) @ConditionalOnClass({OSSClient.class}) @ConditionalOnProperty(value = "oss.name", havingValue = "alioss") public class AliossConfiguration { - private final OssProperties ossProperties; - private final OssRule ossRule; - @Bean @ConditionalOnMissingBean(OSSClient.class) - public OSSClient ossClient() { + public OSSClient ossClient(OssProperties ossProperties) { // 创建ClientConfiguration。ClientConfiguration是OSSClient的配置类，可配置代理、连接超时、最大连接数等参数。 ClientConfiguration conf = new ClientConfiguration(); // 设置OSSClient允许打开的最大HTTP连接数，默认为1024个。 @@ -70,7 +65,9 @@ public class AliossConfiguration { @Bean @ConditionalOnBean({OSSClient.class}) @ConditionalOnMissingBean(AliossTemplate.class) - public AliossTemplate aliossTemplate(OSSClient ossClient) { + public AliossTemplate aliossTemplate(OssRule ossRule, + OssProperties ossProperties, + OSSClient ossClient) { return new AliossTemplate(ossClient, ossProperties, ossRule); } diff --git a/blade-starter-oss/src/main/java/org/springblade/core/oss/config/MinioConfiguration.java b/blade-starter-oss/src/main/java/org/springblade/core/oss/config/MinioConfiguration.java index 0423ebc..6dd3a07 100644 --- a/blade-starter-oss/src/main/java/org/springblade/core/oss/config/MinioConfiguration.java +++ b/blade-starter-oss/src/main/java/org/springblade/core/oss/config/MinioConfiguration.java @@ -16,7 +16,6 @@ package org.springblade.core.oss.config; import io.minio.MinioClient; -import lombok.AllArgsConstructor; import lombok.SneakyThrows; import org.springblade.core.oss.MinioTemplate; import org.springblade.core.oss.props.OssProperties; @@ -34,21 +33,16 @@ import org.springframework.context.annotation.Bean; * * @author Chill */ -@AllArgsConstructor @AutoConfiguration(after = OssConfiguration.class) @ConditionalOnClass({MinioClient.class}) @EnableConfigurationProperties(OssProperties.class) @ConditionalOnProperty(value = "oss.name", havingValue = "minio") public class MinioConfiguration { - private final OssProperties ossProperties; - private final OssRule ossRule; - - @Bean @SneakyThrows @ConditionalOnMissingBean(MinioClient.class) - public MinioClient minioClient() { + public MinioClient minioClient(OssProperties ossProperties) { return MinioClient.builder() .endpoint(ossProperties.getEndpoint()) .credentials(ossProperties.getAccessKey(), ossProperties.getSecretKey()) @@ -58,7 +52,9 @@ public class MinioConfiguration { @Bean @ConditionalOnBean({MinioClient.class}) @ConditionalOnMissingBean(MinioTemplate.class) - public MinioTemplate minioTemplate(MinioClient minioClient) { + public MinioTemplate minioTemplate(OssRule ossRule, + OssProperties ossProperties, + MinioClient minioClient) { return new MinioTemplate(minioClient, ossRule, ossProperties); } diff --git a/blade-starter-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java b/blade-starter-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java index 08ea29e..8f80836 100644 --- a/blade-starter-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java +++ b/blade-starter-oss/src/main/java/org/springblade/core/oss/config/QiniuConfiguration.java @@ -19,7 +19,6 @@ import com.qiniu.storage.BucketManager; import com.qiniu.storage.Region; import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; -import lombok.AllArgsConstructor; import org.springblade.core.oss.QiniuTemplate; import org.springblade.core.oss.props.OssProperties; import org.springblade.core.oss.rule.OssRule; @@ -36,16 +35,12 @@ import org.springframework.context.annotation.Bean; * * @author Chill */ -@AllArgsConstructor @AutoConfiguration(after = OssConfiguration.class) @ConditionalOnClass({Auth.class, UploadManager.class, BucketManager.class}) @EnableConfigurationProperties(OssProperties.class) @ConditionalOnProperty(value = "oss.name", havingValue = "qiniu") public class QiniuConfiguration { - private final OssProperties ossProperties; - private final OssRule ossRule; - @Bean @ConditionalOnMissingBean(com.qiniu.storage.Configuration.class) public com.qiniu.storage.Configuration qnConfiguration() { @@ -54,7 +49,7 @@ public class QiniuConfiguration { @Bean @ConditionalOnMissingBean(Auth.class) - public Auth auth() { + public Auth auth(OssProperties ossProperties) { return Auth.create(ossProperties.getAccessKey(), ossProperties.getSecretKey()); } @@ -66,14 +61,19 @@ public class QiniuConfiguration { @Bean @ConditionalOnBean(com.qiniu.storage.Configuration.class) - public BucketManager bucketManager(com.qiniu.storage.Configuration cfg) { + public BucketManager bucketManager(OssProperties ossProperties, + com.qiniu.storage.Configuration cfg) { return new BucketManager(Auth.create(ossProperties.getAccessKey(), ossProperties.getSecretKey()), cfg); } @Bean @ConditionalOnBean({Auth.class, UploadManager.class, BucketManager.class}) @ConditionalOnMissingBean(QiniuTemplate.class) - public QiniuTemplate qiniuTemplate(Auth auth, UploadManager uploadManager, BucketManager bucketManager) { + public QiniuTemplate qiniuTemplate(OssRule ossRule, + OssProperties ossProperties, + Auth auth, + UploadManager uploadManager, + BucketManager bucketManager) { return new QiniuTemplate(auth, uploadManager, bucketManager, ossProperties, ossRule); }