From 4fafee90e483bb10e092186a9b07b8cc356dbdb2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 11 Jun 2026 14:49:37 +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 |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index feeff77..0e7741d 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -62,6 +62,12 @@
   rtspPort: 8554
   webrtcPort: 8889
 
+#六合流媒体外网映射
+mediamtx-sixhe:
+  enable: false
+  playHost: 112.98.104.134 # 大庆外网地址
+  webrtcPort: 38889
+
 # mqtt配置
 mqtt:
   protocol: tcp
@@ -72,7 +78,7 @@
   client-id: ard-uav
   inbound-topic: sys/product/+/status,thing/product/+/requests
 
-# oss配置 https://192.168.1.3:9001
+# oss配置
 oss:
   enable: true
   provider: minio
@@ -84,13 +90,11 @@
   region: us-east-1
   object-dir-prefix: wayline
 
+# 机场单独用的oss配置，要http地址
 dock:
-  enable: true
-  provider: minio
   endpoint: http://111.40.46.199:9011
-  access-key: admin
-  secret-key: ard12345
-  bucket: dock
-  expire: 3600
-  region: us-east-1
-  object-dir-prefix: wayline
\ No newline at end of file
+  bucket: dockfile
+
+# 点云文件夹路径配置
+pointCloud:
+  url : https://192.168.1.3:3001/tileset/
\ No newline at end of file

--
Gitblit v1.9.3