From e1e290cbef86b5a5c58b8ef238424373f00ed00b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 四月 2026 18:03:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-druid.yml | 2 +-
ruoyi-admin/src/main/resources/application-ls.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 1c9eda3..3669f6b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -118,7 +118,7 @@
database: 0
password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
+ timeout: 30s
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
diff --git a/ruoyi-admin/src/main/resources/application-ls.yml b/ruoyi-admin/src/main/resources/application-ls.yml
index 5ae1f44..5c3fb84 100644
--- a/ruoyi-admin/src/main/resources/application-ls.yml
+++ b/ruoyi-admin/src/main/resources/application-ls.yml
@@ -92,7 +92,7 @@
# 瀵嗙爜
password: Smartor
# 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
+ timeout: 30s
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
--
Gitblit v1.9.3