From 3f43e40ed1a1e9f66b3ad2862da9dbc4b710c712 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 23 Oct 2026 14:09:47 +0800
Subject: [PATCH] 智云3.0机场1适配内容提交
---
ard-admin/src/main/resources/application-dev.yml | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/ard-admin/src/main/resources/application-dev.yml b/ard-admin/src/main/resources/application-dev.yml
index d9225f2..5754283 100644
--- a/ard-admin/src/main/resources/application-dev.yml
+++ b/ard-admin/src/main/resources/application-dev.yml
@@ -2,10 +2,12 @@
server:
# 服务器的HTTP端口，默认为8080
port: 8080
+
# token配置
token:
# 是否允许账户多终端同时登录（true允许 false不允许）
- soloLogin: false
+ soloLogin: true
+
# 日志配置
logging:
level:
@@ -24,24 +26,14 @@
username: admin
password: ardkj12345
-# 天宇服务器配置
-#tianyu:
-# # 天宇http服务器地址
-# endpoint: 112.98.106.22:12000
-# accesskeyid: qmfmd3Ws7M4dMcylnrTU
-# accesskeysecret: 5WBU2uEhHZaVefpZdaxpFh4LJW9fZZaa
-# # 天宇tcp服务器地址
-# tcpserver: 123.56.170.94
-# tcpport: 12345
-
-# 天宇服务器配置
+# 六合服务器配置
tianyu:
- # 天宇http服务器地址
+ # 六合http服务器地址
# endpoint: 192.168.1.97:8060 # 哈尔滨环境
endpoint: 112.98.104.134:8060 # 哈尔滨环境
accesskeyid: wuwuwu
accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
- # 天宇tcp服务器地址
+ # 六合tcp服务器地址
tcpserver: 192.168.1.97
tcpport: 8126
@@ -49,6 +41,7 @@
geoserver:
deviceCoordinateType: WGS84
tifPath: H:\map\hlj.tif
+
wayline:
#可理解为100米大小占图像的比例
targetRatio: 0.5
@@ -61,13 +54,58 @@
#航线KMZ临时存放路径
waylineSavePath: /home/ard/myworkspace/uav_server/mainserver/waylines
-# MinIO
-minio:
- url: http://192.168.1.15:9001
- accessKey: admin
- secretKey: xzx12345
- bucketName: kmz
-#流媒体配置
+#上云API
+cloud-api:
+ app:
+ id: 143640
+ key: da5babf38a5d05b0f46a7d82910da1b
+ license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
+ host: 192.168.1.15
+ port: 123
+
+#流媒体
mediamtx:
- # 流媒体服务器地址
- host: 192.168.1.15
\ No newline at end of file
+ apiHost: 192.168.1.15
+ playHost: 192.168.1.15
+ https: true
+ pushHost: 127.0.0.1
+ rtmpPort: 1935
+ rtspPort: 8554
+ webrtcPort: 8889
+
+#六合流媒体外网映射
+mediamtx-sixhe:
+ enable: false
+ playHost: 112.98.104.134 # 大庆外网地址
+ webrtcPort: 38889
+
+# mqtt配置
+mqtt:
+ protocol: tcp
+ host: 192.168.1.15
+ port: 1883
+ username: admin
+ password: public
+ client-id: liusuyi
+ inbound-topic: sys/product/+/status,thing/product/+/requests
+
+# oss配置 https://192.168.1.3:9001
+oss:
+ enable: true
+ provider: minio
+ endpoint: https://127.0.0.1:9001
+ access-key: admin
+ secret-key: ard12345
+ bucket: cloud-bucket
+ expire: 3600
+ region: us-east-1
+ object-dir-prefix: wayline
+
+# 机场单独用的oss配置，要http地址
+dock:
+ endpoint: http://192.168.10.103:9011
+ bucket: dockfile
+
+# 点云文件夹路径配置
+pointCloud:
+ url : https://127.0.10.1:3001/tileset/
\ No newline at end of file
--
Gitblit v1.9.3