From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-admin/src/main/resources/application-daqing.yml |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index ce8b82a..503f160 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -55,8 +55,13 @@
 #流媒体
 mediamtx:
   apiHost: 192.168.10.103
-  playHost: 192.168.10.103
+  playHost: 112.98.104.134
   https: true
+  pushHost: 192.168.10.103
+  rtmpPort: 1935
+  rtspPort: 8554
+  webrtcPort: 28889
+
 
 # mqtt配置
 mqtt:
@@ -81,13 +86,11 @@
   object-dir-prefix: wayline
 
 # 机场单独用的oss配置，要http地址
-ossdock:
-  enable: true
-  provider: minio
+dock:
   endpoint: http://192.168.10.103: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
+  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

--
Gitblit v1.9.3