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.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 45b845c..e7dcb72 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -6,8 +6,8 @@
version: 3.8.8
# 版权年份
copyrightYear: 2024
- # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
- profile: D:/ruoyi/uploadPath
+ # 文件路径 示例（ Windows配置D:/ard/uploadPath，Linux配置 /home/ard/uploadPath）
+ profile: /home/ard/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
@@ -44,11 +44,12 @@
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
- expireTime: 10
+ expireTime: 60
# 是否允许账户多终端同时登录（true允许 false不允许）
soloLogin: true
-# MyBatis配置
-mybatis:
+
+# MyBatis Plus配置
+mybatis-plus:
# 搜索指定包别名
typeAliasesPackage: com.ard.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
@@ -90,8 +91,25 @@
log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
async-mode: platform # [自v1.5.27版本起可用] 异步模式（默认为 platform）
+# 服务端点检查
+management:
+ endpoints:
+ web:
+ exposure:
+ include: health,info,logfile,loggers
+ endpoint:
+ info:
+ enabled: true
+ health:
+ enabled: true
+ show-details: always
+ logfile:
+ external-file: logs/info.log
+
# Spring配置
spring:
+ application:
+ name: ard-uav
# 资源信息
messages:
# 国际化资源文件路径
@@ -100,9 +118,9 @@
servlet:
multipart:
# 单个文件大小
- max-file-size: 10MB
+ max-file-size: 6144MB
# 设置总上传的文件大小
- max-request-size: 20MB
+ max-request-size: 6144MB
# 服务模块
devtools:
restart:
@@ -111,14 +129,13 @@
# redis 配置
redis:
# 地址
- host: 192.168.1.3
+ host: 127.0.0.1
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
- # password: 123456
- password: Ardkj.2025
+ password:
# 连接超时时间
timeout: 10s
lettuce:
@@ -131,7 +148,24 @@
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
+ #健康监控
+ boot:
+ admin:
+ client:
+ url: http://127.0.0.1:9100
+ username: admin
+ password: admin
+ instance:
+ name: ard-uav
+ management-url: http://127.0.0.1:8080/actuator
+ service-url: http://127.0.0.1:8080/
+
# 激活配置文件
profiles:
- # active: dev-druid,dev
- active: prod-druid,prod
\ No newline at end of file
+ active: @spring.profiles.active@
+
+inspection:
+ profile: /home/inspection/uploadPath # 上传文件存储路径
+ chunk:
+ path: /home/inspection/uploadPath/chunks # 切片临时目录
+ zipPath: /home/inspection/uploadPath/zip # 压缩文件临时目录
--
Gitblit v1.9.3