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-prod.yml |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index feeff77..ce8aa27 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: true
+  playHost: 112.98.104.134
+  webrtcPort: 38889
+
 # mqtt配置
 mqtt:
   protocol: tcp
@@ -85,12 +91,10 @@
   object-dir-prefix: wayline
 
 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/
+  type : /tileset.json
+  folder : /home/inspection/uploadPath/zip/
\ No newline at end of file

--
Gitblit v1.9.3