diff --git a/shoulder-platform-common/shoulder-platform-parent/pom.xml b/shoulder-platform-common/shoulder-platform-parent/pom.xml index 1052b6e..be90043 100644 --- a/shoulder-platform-common/shoulder-platform-parent/pom.xml +++ b/shoulder-platform-common/shoulder-platform-parent/pom.xml @@ -12,6 +12,8 @@ shoulder-platform-parent pom + ${project.artifactId} + shoulder platform 的通用父类,管理了平台的技术选型和通用配置 https://github.com/ChinaLym/shoulder-platform @@ -55,28 +57,27 @@ 1.4.13 shoulder 3.11.0 - 3.3.0 - 3.6.0 - 3.3.0 - 3.1.0 + 3.3.1 + 3.6.3 + 3.4.1 + 3.2.4 - 3.1.2 + 3.2.5 3.0.5 + 2.7 - 2.7 - 2.2.0 + 2.16.2 + 4.5.0 6.0.0 3.10.0.2594 - 1.1 + 1.2.1 0x0000 - 0.3 + - ${project.artifactId} - shoulder platform 的通用父类,管理了平台的技术选型和通用配置 lym diff --git a/shoulder-storage-center/storage-modules/storage-modules-minio/pom.xml b/shoulder-storage-center/storage-modules/storage-modules-minio/pom.xml index fab56e2..0867ef0 100644 --- a/shoulder-storage-center/storage-modules/storage-modules-minio/pom.xml +++ b/shoulder-storage-center/storage-modules/storage-modules-minio/pom.xml @@ -17,6 +17,7 @@ minio + org.springframework.boot spring-boot-starter @@ -32,6 +33,11 @@ spring-boot-configuration-processor true + + io.minio + minio + 7.1.0 + diff --git a/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioAutoConfiguration.java b/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioAutoConfiguration.java index 62ed4d8..25c691c 100644 --- a/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioAutoConfiguration.java +++ b/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioAutoConfiguration.java @@ -32,10 +32,11 @@ public class MinioAutoConfiguration { * @throws InvalidPortException port 错误 */ @Bean - public MinioClient minioClient() throws InvalidPortException, InvalidEndpointException { - return new MinioClient(minioProperties.getEndpoint(), minioProperties.getPort(), - minioProperties.getAccessKey(), minioProperties.getSecretKey(), - minioProperties.getRegion(), minioProperties.isSecure() - ); + public MinioClient minioClient() { + return MinioClient.builder() + .region(minioProperties.getRegion()) + .endpoint(minioProperties.getEndpoint()) + .credentials(minioProperties.getAccessKey(), minioProperties.getSecretKey()) + .build(); } } diff --git a/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioProperties.java b/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioProperties.java index 2f96251..0fdaf9a 100644 --- a/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioProperties.java +++ b/shoulder-storage-center/storage-modules/storage-modules-minio/src/main/java/org/shoulder/minio/config/MinioProperties.java @@ -15,13 +15,9 @@ public class MinioProperties { */ private Boolean enable = Boolean.TRUE; /** - * minio Server 主机名或IP地址 + * minio Server http 地址,注意 minio8 后 endpoint 是 url 而非 host */ - private String endpoint = "127.0.0.1"; - /** - * 端口号 - */ - private int port = 9000; + private String endpoint = "http://127.0.0.1:9000"; /** * ak 类似于用户ID,用于唯一标识你的账户 */ @@ -34,10 +30,6 @@ public class MinioProperties { * 设置该值将覆盖自动发现存储桶region。(可选) */ private String region; - /** - * 使用 ssl - */ - private boolean secure = false; public Boolean getEnable() { return enable; @@ -55,14 +47,6 @@ public class MinioProperties { this.endpoint = endpoint; } - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - public String getAccessKey() { return accessKey; } @@ -86,12 +70,4 @@ public class MinioProperties { public void setRegion(String region) { this.region = region; } - - public boolean isSecure() { - return secure; - } - - public void setSecure(boolean secure) { - this.secure = secure; - } }