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 | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index ef2d25d..89786b7 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -49,7 +49,7 @@
id: 143640
key: da5babf38a5d05b0f46a7d82910da1b
license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
- host: 192.168.1.15
+ host: 111.40.46.199
port: 123
#流媒体
@@ -57,6 +57,10 @@
apiHost: 192.168.1.3
playHost: 192.168.1.3
https: true
+ pushHost: 192.168.10.73
+ rtmpPort: 1935
+ rtspPort: 8554
+ webrtcPort: 8889
# mqtt配置
mqtt:
@@ -68,7 +72,7 @@
client-id: ard-uav
inbound-topic: sys/product/+/status,thing/product/+/requests
-# oss配置
+# oss配置 https://192.168.1.3:9001
oss:
enable: true
provider: minio
@@ -79,3 +83,18 @@
expire: 3600
region: us-east-1
object-dir-prefix: wayline
+
+dock:
+ endpoint: http://111.40.46.199:9011
+
+# 机场单独用的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