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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 7e78448..584dcd1 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -44,7 +44,7 @@
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 10
+  expireTime: 60
   # 是否允许账户多终端同时登录（true允许 false不允许）
   soloLogin: true
 
@@ -163,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