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-prod.yml |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index be98aff..ce8aa27 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -49,7 +49,7 @@
     id: 143640
     key: da5babf38a5d05b0f46a7d82910da1b
     license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
-    host: 192.168.1.15
+    host: 111.40.46.199
     port: 123
 
 #流媒体
@@ -57,9 +57,16 @@
   apiHost: 192.168.1.3
   playHost: 192.168.1.3
   https: true
+  pushHost: 192.168.10.73
   rtmpPort: 1935
   rtspPort: 8554
   webrtcPort: 8889
+
+#六合流媒体映射
+mediamtx-sixhe:
+  enable: true
+  playHost: 112.98.104.134
+  webrtcPort: 38889
 
 # mqtt配置
 mqtt:
@@ -71,7 +78,7 @@
   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
@@ -83,14 +90,11 @@
   region: us-east-1
   object-dir-prefix: wayline
 
-# 机场单独用的oss配置，要http地址
-ossdock:
-  enable: true
-  provider: minio
-  endpoint: http://192.168.1.3: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://111.40.46.199:9011
+  bucket: dockfile
+
+pointCloud:
+  url : https://192.168.1.3:3001/tileset/
+  type : /tileset.json
+  folder : /home/inspection/uploadPath/zip/
\ No newline at end of file

--
Gitblit v1.9.3