From d7fef91a4cbb702988dc820bcde82c166253ceec Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 07 Mar 2026 10:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application.yml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 7434cfe..3f98273 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,7 +44,7 @@
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
- expireTime: 10
+ expireTime: 60
# 是否允许账户多终端同时登录（true允许 false不允许）
soloLogin: true
@@ -118,9 +118,9 @@
servlet:
multipart:
# 单个文件大小
- max-file-size: 10MB
+ max-file-size: 3GB
# 设置总上传的文件大小
- max-request-size: 20MB
+ max-request-size: 3GB
# 服务模块
devtools:
restart:
@@ -129,7 +129,7 @@
# redis 配置
redis:
# 地址
- host: 192.168.1.15
+ host: 127.0.0.1
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -148,7 +148,6 @@
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
-
#健康监控
boot:
admin:
@@ -161,8 +160,12 @@
management-url: http://127.0.0.1:8080/actuator
service-url: http://127.0.0.1:8080/
-
# 激活配置文件
profiles:
- #active: prod-druid,prod
- active: dev-druid,dev
\ 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