From 77ae8c8bf34aaafa58a230d65db5e0f9f2e23c74 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:14:53 +0800
Subject: [PATCH] 2026-04-01 优化机场minio配置信息
---
ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java | 93 +---------------------------------------------
ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java | 6 +-
ard-admin/src/main/resources/application-daqing.yml | 9 ----
ard-admin/src/main/resources/application-prod.yml | 9 ----
4 files changed, 7 insertions(+), 110 deletions(-)
diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index f81317c..1cb0056 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -87,12 +87,5 @@
# 机场单独用的oss配置，要http地址
dock:
- enable: true
- provider: minio
endpoint: http://192.168.10.103:9011
- access-key: admin
- secret-key: ard12345
- bucket: dockfile
- expire: 3600
- region: us-east-1
- object-dir-prefix: wayline
\ No newline at end of file
+ bucket: dockfile
\ No newline at end of file
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index 6ce13b3..6da2f62 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -85,12 +85,5 @@
object-dir-prefix: wayline
dock:
- enable: true
- provider: minio
endpoint: http://111.40.46.199:9011
- access-key: admin
- secret-key: ard12345
- bucket: dockfile
- expire: 3600
- region: us-east-1
- object-dir-prefix: wayline
\ No newline at end of file
+ bucket: dockfile
\ No newline at end of file
diff --git a/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java b/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
index 05d0388..3c82057 100644
--- a/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
+++ b/ard-sample/src/main/java/com/ard/sample/config/DockConfiguration.java
@@ -9,105 +9,16 @@
@Component
@ConfigurationProperties(prefix = "dock")
public class DockConfiguration {
-// public static String endpoint;
-//
-// public static String bucket;
-//
-// public void setEndpoint(String endpoint) {
-// DockConfiguration.endpoint = endpoint;
-// }
-//
-// public void setBucket(String bucket) {
-// DockConfiguration.bucket = bucket;
-// }
- /**
- * @see OssTypeEnum
- */
- public static String provider;
-
- /**
- * Whether to use the object storage service.
- */
- public static boolean enable;
-
- /**
- * The protocol needs to be included at the beginning of the address.
- */
public static String endpoint;
-
- public static String accessKey;
-
- public static String secretKey;
-
- public static String region;
-
- public static Long expire;
-
- public static String roleSessionName;
-
- public static String roleArn;
public static String bucket;
- public static String objectDirPrefix;
-
- public void setProvider(String provider) {
- DockConfiguration.provider = provider;
- }
-
- public void setEnable(boolean enable) {
- DockConfiguration.enable = enable;
- }
-
- public void setEndpoint(String endpoint) { DockConfiguration.endpoint = endpoint; }
-
- public void setAccessKey(String accessKey) {
- DockConfiguration.accessKey = accessKey;
- }
-
- public void setSecretKey(String secretKey) {
- DockConfiguration.secretKey = secretKey;
- }
-
- public void setRegion(String region) {
- DockConfiguration.region = region;
- }
-
- public void setExpire(Long expire) {
- DockConfiguration.expire = expire;
- }
-
- public void setRoleSessionName(String roleSessionName) {
- DockConfiguration.roleSessionName = roleSessionName;
- }
-
- public void setRoleArn(String roleArn) {
- DockConfiguration.roleArn = roleArn;
+ public void setEndpoint(String endpoint) {
+ DockConfiguration.endpoint = endpoint;
}
public void setBucket(String bucket) {
DockConfiguration.bucket = bucket;
}
- public void setObjectDirPrefix(String objectDirPrefix) {
- DockConfiguration.objectDirPrefix = objectDirPrefix;
- }
-
-// /**
-// * 创建MinioClient Bean（核心：适配反向代理的HTTP地址）
-// */
-// @Bean
-// public MinioClient minioClient() {
-// // 方式1：通过endpoint重载方法（推荐，明确指定端口和是否HTTPS）
-// // 解析endpoint的协议、IP、端口
-// String[] endpointParts = endpoint.split("//")[1].split(":");
-// String host = endpointParts[0]; // 192.168.10.103
-// int port = Integer.parseInt(endpointParts[1]); // 9011
-// boolean isHttps = endpoint.startsWith("https"); // 反向代理是HTTP，故为false
-//
-// return MinioClient.builder()
-// .endpoint(host, port, isHttps) // 8.3.7核心：通过重载方法指定secure
-// .credentials(accessKey, secretKey)
-// .build();
-// }
}
diff --git a/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
index 88eaf20..6842b2c 100644
--- a/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
@@ -56,9 +56,9 @@
.endpoint(DockConfiguration.endpoint)
.bucket(DockConfiguration.bucket)
.credentials(credentials)
- .provider(DockConfiguration.provider)
- .objectKeyPrefix(DockConfiguration.objectDirPrefix)
- .region(DockConfiguration.region)
+ .provider(OssConfiguration.provider)
+ .objectKeyPrefix(OssConfiguration.objectDirPrefix)
+ .region(OssConfiguration.region)
.build();
// return StsCredentialsDTO.builder()
--
Gitblit v1.9.3