From f28472ed7c143b6b0ae1eb7f6dc2e1ac73616d53 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 27 Nov 2025 14:21:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

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

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index e726c5a..fb474ac 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -57,6 +57,10 @@
   apiHost: 192.168.1.3
   playHost: 192.168.1.3
   https: true
+  pushHost: 111.40.46.199
+  rtmpPort: 1935
+  rtspPort: 8554
+  webrtcPort: 8889
 
 # mqtt配置
 mqtt:
@@ -80,12 +84,14 @@
   region: us-east-1
   object-dir-prefix: wayline
 
-# 是否是本地测试环境 true / false
-isLocal: false
-
-# 本地KMZ上传的路径
-kmz:
-  path: KmzFile/kmz/
-
-MinioKmz:
-  path: kmz
\ No newline at end of file
+# 机场单独用的oss配置，要http地址
+ossdock:
+  enable: true
+  provider: minio
+  endpoint: http://192.168.1.3: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