Skip to content

Commit 96dc351

Browse files
herodotus-ecosystemgitee-org
authored andcommitted
!128 feat: v4.0.6.5
Merge pull request !128 from 码匠君/develop
2 parents e4b1b96 + 6d74f1e commit 96dc351

92 files changed

Lines changed: 266 additions & 128 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-4.0.6-blue.svg?logo=springboot" alt="Spring Boot 4.0.6"></a>
99
<a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2025.1.1-blue.svg?logo=springboot" alt="Spring Cloud 2025.1.0"></a>
1010
<a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2025.1.0.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2025.1.0.0"></a>
11-
<a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-2.1.1.0--2024.0.3-blue.svg?logo=qq" alt="Spring Cloud Tencent 2.1.1.0-2024.0.3"></a>
11+
<a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-2.1.2.0--2025.0.2-blue.svg?logo=qq" alt="Spring Cloud Tencent 2.1.2.0-2025.0.2"></a>
1212
<a href="https://nacos.io/docs/latest/overview/" target="_blank"><img src="https://shields.io/badge/Nacos-3.2.1-brightgreen.svg?logo=alibabadotcom" alt="Nacos 3.2.1"></a>
1313
</p>
1414
<p align="center">
1515
<a href="https://deepwiki.com/dante-compass/dante-engine" target="_blank"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
16-
<a href="https://github.com/dante-compass/dante-engine" target="_blank"><img src="https://shields.io/badge/Version-4.0.6.4-red.svg?logo=spring" alt="Version 4.0.6.4"></a>
16+
<a href="https://github.com/dante-compass/dante-engine" target="_blank"><img src="https://shields.io/badge/Version-4.0.6.5-red.svg?logo=spring" alt="Version 4.0.6.5"></a>
1717
<a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-25%2B-green.svg?logo=openjdk" alt="Java 25"></a>
1818
<a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
1919
<a href="https://blog.csdn.net/Pointer_v" target="_blank"><img src="https://shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>

dante-assistant/dante-assistant-access/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.dromara.dante</groupId>
3333
<artifactId>dante-assistant</artifactId>
34-
<version>4.0.6.4</version>
34+
<version>4.0.6.5</version>
3535
</parent>
3636

3737
<artifactId>dante-assistant-access</artifactId>

dante-assistant/dante-assistant-captcha/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.dromara.dante</groupId>
3333
<artifactId>dante-assistant</artifactId>
34-
<version>4.0.6.4</version>
34+
<version>4.0.6.5</version>
3535
</parent>
3636

3737
<artifactId>dante-assistant-captcha</artifactId>

dante-assistant/dante-assistant-oss/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.dromara.dante</groupId>
3333
<artifactId>dante-assistant</artifactId>
34-
<version>4.0.6.4</version>
34+
<version>4.0.6.5</version>
3535
</parent>
3636

3737
<artifactId>dante-assistant-oss</artifactId>

dante-assistant/dante-assistant-oss/src/main/java/org/dromara/dante/assistant/oss/pool/AwsConfigurer.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.dromara.dante.assistant.oss.properties.OssProperties;
3131
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
3232
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
33+
import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
34+
import software.amazon.awssdk.core.checksums.ResponseChecksumValidation;
3335
import software.amazon.awssdk.regions.Region;
3436
import software.amazon.awssdk.services.s3.S3AsyncClient;
3537
import software.amazon.awssdk.services.s3.S3Configuration;
@@ -74,9 +76,11 @@ public S3AsyncClient createS3AsyncClient() {
7476
.credentialsProvider(createCredentialsProvider())
7577
.endpointOverride(URI.create(ossProperties.getEndpoint()))
7678
.region(of())
79+
.forcePathStyle(ossProperties.getUsePathStyleAccess())
80+
.requestChecksumCalculation(RequestChecksumCalculation.WHEN_REQUIRED)
81+
.responseChecksumValidation(ResponseChecksumValidation.WHEN_REQUIRED)
7782
.targetThroughputInGbps(20.0)
7883
.minimumPartSizeInBytes(OssConstants.MIN_PART_SIZE)
79-
.checksumValidationEnabled(false)
8084
.build();
8185
}
8286

@@ -88,17 +92,13 @@ public S3AsyncClient createS3AsyncClient() {
8892
* @return {@link S3Presigner}
8993
*/
9094
public S3Presigner createPresigner() {
91-
// 创建 S3 配置对象
92-
S3Configuration config = S3Configuration.builder()
93-
.chunkedEncodingEnabled(false)
94-
.pathStyleAccessEnabled(false)
95-
.build();
96-
9795
return S3Presigner.builder()
9896
.region(of())
9997
.endpointOverride(URI.create(ossProperties.getEndpoint()))
10098
.credentialsProvider(createCredentialsProvider())
101-
.serviceConfiguration(config)
99+
.serviceConfiguration(S3Configuration.builder()
100+
.pathStyleAccessEnabled(ossProperties.getUsePathStyleAccess())
101+
.build())
102102
.build();
103103
}
104104

dante-assistant/dante-assistant-oss/src/main/java/org/dromara/dante/assistant/oss/properties/OssProperties.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ public class OssProperties {
6666
*/
6767
private Duration preSignedExpires = Duration.ofMinutes(5);
6868

69+
/**
70+
* MinIO 使用 HTTPS 限制使用域名访问,站点填域名。需要启用路径样式访问
71+
*/
72+
private Boolean usePathStyleAccess = Boolean.FALSE;
73+
6974
/**
7075
* 自定义 OSS 对象池参数配置
7176
*/
@@ -116,6 +121,14 @@ public void setPreSignedExpires(Duration preSignedExpires) {
116121
this.preSignedExpires = preSignedExpires;
117122
}
118123

124+
public Boolean getUsePathStyleAccess() {
125+
return usePathStyleAccess;
126+
}
127+
128+
public void setUsePathStyleAccess(Boolean usePathStyleAccess) {
129+
this.usePathStyleAccess = usePathStyleAccess;
130+
}
131+
119132
public Pool getPool() {
120133
return pool;
121134
}
@@ -190,6 +203,7 @@ public String toString() {
190203
.add("secretKey", secretKey)
191204
.add("region", region)
192205
.add("preSignedExpires", preSignedExpires)
206+
.add("usePathStyleAccess", usePathStyleAccess)
193207
.add("pool", pool)
194208
.add("proxy", proxy)
195209
.toString();

dante-assistant/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>org.dromara.dante</groupId>
3333
<artifactId>dante-engine</artifactId>
34-
<version>4.0.6.4</version>
34+
<version>4.0.6.5</version>
3535
</parent>
3636

3737
<artifactId>dante-assistant</artifactId>

dante-cache/dante-cache-caffeine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cache</artifactId>
3434
<groupId>org.dromara.dante</groupId>
35-
<version>4.0.6.4</version>
35+
<version>4.0.6.5</version>
3636
</parent>
3737

3838
<artifactId>dante-cache-caffeine</artifactId>

dante-cache/dante-cache-commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cache</artifactId>
3434
<groupId>org.dromara.dante</groupId>
35-
<version>4.0.6.4</version>
35+
<version>4.0.6.5</version>
3636
</parent>
3737

3838
<artifactId>dante-cache-commons</artifactId>

dante-cache/dante-cache-jetcache/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<artifactId>dante-cache</artifactId>
3434
<groupId>org.dromara.dante</groupId>
35-
<version>4.0.6.4</version>
35+
<version>4.0.6.5</version>
3636
</parent>
3737

3838
<artifactId>dante-cache-jetcache</artifactId>

0 commit comments

Comments
 (0)