From fee6cbe63d4dc2df256e2a6977331e26d84588de Mon Sep 17 00:00:00 2001 From: zhaowenyu <35589726@qq.com> Date: Wed, 17 Dec 2025 15:37:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-admin/src/main/resources/application-daqing.yml | 17 +++++++---------- 1 files changed, 7 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..679d97f 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: @@ -81,13 +86,5 @@ object-dir-prefix: wayline # 机场单独用的oss配置，要http地址 -ossdock: - enable: true - provider: minio - 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 +dock: + endpoint: http://192.168.10.103:9011 \ No newline at end of file -- Gitblit v1.9.3