From d76f8e3b59969d4bf0f1bf4c92730719bd5389d3 Mon Sep 17 00:00:00 2001 From: zhaowenyu <35589726@qq.com> Date: Fri, 28 Nov 2025 16:54:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-admin/src/main/resources/application-prod.yml | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml index ef2d25d..8c2d762 100644 --- a/ard-admin/src/main/resources/application-prod.yml +++ b/ard-admin/src/main/resources/application-prod.yml @@ -57,6 +57,10 @@ apiHost: 192.168.1.3 playHost: 192.168.1.3 https: true + pushHost: 192.168.10.73 + rtmpPort: 1935 + rtspPort: 8554 + webrtcPort: 8889 # mqtt配置 mqtt: @@ -68,14 +72,26 @@ client-id: ard-uav inbound-topic: sys/product/+/status,thing/product/+/requests -# oss配置 +# oss配置 https://192.168.1.3:9001 oss: enable: true provider: minio - endpoint: https://192.168.1.3:9001 + endpoint: https://111.40.46.199:9001 access-key: admin secret-key: ard12345 bucket: cloud-bucket expire: 3600 region: us-east-1 object-dir-prefix: wayline + +# 机场单独用的oss配置，要http地址 http://192.168.1.3:9011 +ossdock: + enable: true + provider: minio + endpoint: http://111.40.46.199: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 -- Gitblit v1.9.3