From a5f04d4925f77fd741abecdc37cfc6674894cefe Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 13 Dec 2025 10:54:04 +0800
Subject: [PATCH] 2025-12-13 zwy 修改机场航线文件取path，转换http地址，配置文件oss去掉endpoint-spare字段，增加dock:endpoint,增加DockConfiguration.java配置文件，删除ossdock模块

---
 ard-admin/src/main/resources/application-prod.yml |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index 991128e..89786b7 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -77,7 +77,6 @@
   enable: true
   provider: minio
   endpoint: https://192.168.1.3:9001
-  endpoint-spare: http://111.40.46.199:9011
   access-key: admin
   secret-key: ard12345
   bucket: cloud-bucket
@@ -85,14 +84,17 @@
   region: us-east-1
   object-dir-prefix: wayline
 
-# 机场单独用的oss配置，要http地址 http://192.168.1.3:9011
-ossdock:
-  enable: true
-  provider: minio
+dock:
   endpoint: http://111.40.46.199:9011
-  access-key: admin2
-  secret-key: ard123456
-  bucket: cloud-bucket
-  expire: 3600
-  region: us-east-1
-  object-dir-prefix: wayline
\ No newline at end of file
+
+# 机场单独用的oss配置，要http地址 http://192.168.1.3:9011
+#ossdock:
+#  enable: true
+#  provider: minio
+#  endpoint: http://111.40.46.199:9011
+#  access-key: admin2
+#  secret-key: ard123456
+#  bucket: cloud-bucket
+#  expire: 3600
+#  region: us-east-1
+#  object-dir-prefix: wayline
\ No newline at end of file

--
Gitblit v1.9.3