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-daqing.yml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index 503f160..74ef075 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -55,13 +55,18 @@
 #流媒体
 mediamtx:
   apiHost: 192.168.10.103
-  playHost: 112.98.104.134
+  playHost: 192.168.10.103
   https: true
   pushHost: 192.168.10.103
   rtmpPort: 1935
   rtspPort: 8554
-  webrtcPort: 28889
+  webrtcPort: 8889
 
+#六合流媒体外网映射
+mediamtx-sixhe:
+  enable: false
+  playHost: 112.98.104.134 # 大庆外网地址
+  webrtcPort: 38889
 
 # mqtt配置
 mqtt:
@@ -90,7 +95,6 @@
   endpoint: http://192.168.10.103:9011
   bucket: dockfile
 
+# 点云文件夹路径配置
 pointCloud:
-  url : https://192.168.10.103:3001/tileset/
-  type : /tileset.json
-  folder : /home/inspection/uploadPath/zip/
\ No newline at end of file
+  url : https://192.168.10.103:3001/tileset/
\ No newline at end of file

--
Gitblit v1.9.3