From e33b92fe82818792d1891f842ccde97fef51c731 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 16 Oct 2026 12:57:57 +0800
Subject: [PATCH] 还原git提交测试
---
ard-admin/src/main/resources/application-daqing.yml | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index 503f160..40791c4 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -49,24 +49,29 @@
id: 143640
key: da5babf38a5d05b0f46a7d82910da1b
license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
- host: 192.168.10.103
+ host: 192.168.10.139
port: 123
#流媒体
mediamtx:
- apiHost: 192.168.10.103
- playHost: 112.98.104.134
+ apiHost: 192.168.10.139
+ playHost: 192.168.10.139
https: true
- pushHost: 192.168.10.103
+ pushHost: 192.168.10.139
rtmpPort: 1935
rtspPort: 8554
- webrtcPort: 28889
+ webrtcPort: 8889
+#六合流媒体外网映射
+mediamtx-sixhe:
+ enable: false
+ playHost: 112.98.104.134 # 大庆外网地址
+ webrtcPort: 38889
# mqtt配置
mqtt:
protocol: tcp
- host: 192.168.10.103
+ host: 192.168.10.139
port: 1883
username: admin
password: public
@@ -77,7 +82,7 @@
oss:
enable: true
provider: minio
- endpoint: https://192.168.10.103:9001
+ endpoint: https://192.168.10.139:9001
access-key: admin
secret-key: ard12345
bucket: cloud-bucket
@@ -87,10 +92,9 @@
# 机场单独用的oss配置，要http地址
dock:
- endpoint: http://192.168.10.103:9011
+ endpoint: http://192.168.10.139: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
+ url : https://192.168.10.139:3001/tileset/
\ No newline at end of file
--
Gitblit v1.9.3