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-daqing.yml | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml index 679d97f..503f160 100644 --- a/ard-admin/src/main/resources/application-daqing.yml +++ b/ard-admin/src/main/resources/application-daqing.yml @@ -55,12 +55,12 @@ #流媒体 mediamtx: apiHost: 192.168.10.103 - playHost: 192.168.10.103 - pushHost: 192.168.10.103 + playHost: 112.98.104.134 https: true + pushHost: 192.168.10.103 rtmpPort: 1935 rtspPort: 8554 - webrtcPort: 8889 + webrtcPort: 28889 # mqtt配置 @@ -87,4 +87,10 @@ # 机场单独用的oss配置，要http地址 dock: - endpoint: http://192.168.10.103:9011 \ No newline at end of file + endpoint: http://192.168.10.103:9011 + bucket: dockfile + +pointCloud: + url : https://192.168.10.103:3001/tileset/ + type : /tileset.json + folder : /home/inspection/uploadPath/zip/ \ No newline at end of file -- Gitblit v1.9.3