From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
ruoyi-admin/src/main/resources/application.yml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0ab2d16..40e0272 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,6 +53,10 @@
basename: i18n/messages
profiles:
active: druid
+ # 鍏ㄥ眬鏃堕棿澶勭悊 LocalDateTime鏃堕棿搴忓垪鍙�
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -61,10 +65,10 @@
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
max-request-size: 20MB
# 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: true
+# devtools:
+# restart:
+# # 鐑儴缃插紑鍏�
+# enabled: false
# redis 閰嶇疆
redis:
# 鍦板潃
@@ -74,7 +78,7 @@
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- password:
+# password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -95,7 +99,7 @@
# 浠ょ墝瀵嗛挜
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+ expireTime: 450
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
--
Gitblit v1.9.3