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-dev.yml | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/ard-admin/src/main/resources/application-dev.yml b/ard-admin/src/main/resources/application-dev.yml
index a70eda9..3548002 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: true
+
# 日志配置
logging:
level:
@@ -23,14 +25,6 @@
enable: false
username: admin
password: ardkj12345
-# MyBatis Plus配置
-mybatis-plus:
- # 搜索指定包别名
- typeAliasesPackage: com.ard.**.domain
- # 配置mapper的扫描，找到所有的mapper.xml映射文件
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 加载全局的配置文件
- configLocation: classpath:mybatis/mybatis-config.xml
# 六合服务器配置
tianyu:
@@ -60,13 +54,6 @@
#航线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:
@@ -75,11 +62,16 @@
license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
host: 192.168.1.15
port: 123
+
#流媒体
mediamtx:
apiHost: 192.168.1.15
playHost: 192.168.1.15
- https: false
+ https: true
+ pushHost: 127.0.0.1
+ rtmpPort: 1935
+ rtspPort: 8554
+ webrtcPort: 8889
# mqtt配置
mqtt:
@@ -89,4 +81,32 @@
username: admin
password: public
client-id: liusuyi
- inbound-topic: sys/product/+/status,thing/product/+/requests
\ No newline at end of file
+ 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
+
+dock:
+ enable: true
+ provider: minio
+ endpoint: http://127.0.0.1:9011
+ access-key: admin
+ secret-key: ard12345
+ bucket: dockfile
+ expire: 3600
+ region: us-east-1
+ object-dir-prefix: wayline
+
+pointCloud:
+ url : https://127.0.10.1:3001/tileset/
+ type : /tileset.json
+ folder : /home/inspection/uploadPath/zip/
\ No newline at end of file
--
Gitblit v1.9.3