From 44e2cc3deb22aa0b832a2bf4f738cd98d4e9255a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 13 Oct 2025 15:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application-prod.yml | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index 24a7827..5fc752a 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.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
# 地图资源配置
geoserver:
@@ -49,13 +43,6 @@
#航线KMZ临时存放路径
waylineSavePath: /home/ard/myworkspace/uav_server/mainserver/waylines
-# MinIO
-minio:
- url: https://192.168.1.3:9001
- accessKey: admin
- secretKey: ard12345
- bucketName: kmz
-
#上云API
cloud-api:
app:
@@ -64,6 +51,7 @@
license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
host: 192.168.1.15
port: 123
+
#流媒体
mediamtx:
apiHost: 192.168.1.3
--
Gitblit v1.9.3