From b3b96cfd900c3dee5dc84e53d5677fc6642f85e6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 18 Dec 2025 09:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application-daqing.yml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index 62774ef..679d97f 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -49,14 +49,19 @@
id: 143640
key: da5babf38a5d05b0f46a7d82910da1b
license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
- host: 192.168.1.15
+ host: 192.168.10.103
port: 123
#流媒体
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,7 @@
expire: 3600
region: us-east-1
object-dir-prefix: wayline
+
+# 机场单独用的oss配置，要http地址
+dock:
+ endpoint: http://192.168.10.103:9011
\ No newline at end of file
--
Gitblit v1.9.3