Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-04-01 b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89

 ard-admin/src/main/resources/application-prod.yml

@@ -64,9 +64,9 @@

#六合流媒体映射
mediamtx-sixhe:
    enable: true
    playHost: 112.98.104.134
    webrtcPort: 38889
  enable: true
  playHost: 112.98.104.134
  webrtcPort: 38889

# mqtt配置
mqtt:
@@ -90,6 +90,9 @@
  region: us-east-1
  object-dir-prefix: wayline

dock:
  endpoint: http://111.40.46.199:9011
  bucket: dockfile

pointCloud:
  url : https://192.168.1.3:3001/tileset/