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 |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index c383b44..ce8aa27 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -64,9 +64,9 @@
 
 #六合流媒体映射
 mediamtx-sixhe:
-    enable: true
-    playHost: 112.98.104.134
-    webrtcPort: 38889
+  enable: true
+  playHost: 112.98.104.134
+  webrtcPort: 38889
 
 # mqtt配置
 mqtt:
@@ -90,6 +90,9 @@
   region: us-east-1
   object-dir-prefix: wayline
 
+dock:
+  endpoint: http://111.40.46.199:9011
+  bucket: dockfile
 
 pointCloud:
   url : https://192.168.1.3:3001/tileset/

--
Gitblit v1.9.3