From 7077d3a7819de3229482e5a9edb4bd895ea2a49f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 29 Oct 2025 16:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-admin/src/main/resources/application.yml |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index d55c1bd..7e78448 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: 720
+  expireTime: 10
   # 是否允许账户多终端同时登录（true允许 false不允许）
   soloLogin: true
 
@@ -148,7 +148,6 @@
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-
   #健康监控
   boot:
     admin:

--
Gitblit v1.9.3