From 3f957d3cf5d05109867800a2d78ee0bb9ecb4561 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 17 Jan 2026 16:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index c630210..33ab44a 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -56,7 +56,12 @@
 mediamtx:
   apiHost: 192.168.10.103
   playHost: 192.168.10.103
+  pushHost: 192.168.10.103
   https: true
+  rtmpPort: 1935
+  rtspPort: 8554
+  webrtcPort: 8889
+
 
 # mqtt配置
 mqtt:
@@ -79,3 +84,8 @@
   expire: 3600
   region: us-east-1
   object-dir-prefix: wayline
+
+# 机场单独用的oss配置，要http地址
+dock:
+  endpoint: http://192.168.10.103:9011
+  bucket: dock
\ No newline at end of file

--
Gitblit v1.9.3