From c0b167404dbc4e98ccb8b84f94f48c96bcb3df02 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 09:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application.yml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index d55c1bd..584dcd1 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: 60
# 是否允许账户多终端同时登录（true允许 false不允许）
soloLogin: true
@@ -148,7 +148,6 @@
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
-
#健康监控
boot:
admin:
@@ -164,5 +163,6 @@
# 激活配置文件
profiles:
- #active: prod-druid,prod
- active: dev-druid,dev
\ No newline at end of file
+ #active: daqing-druid,daqing
+ active: prod-druid,prod
+ #active: dev-druid,dev
\ No newline at end of file
--
Gitblit v1.9.3