From 7374d150b7f08d4b126d3d0fde57ab55febb53dd Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 05 三月 2025 09:48:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
ruoyi-admin/src/main/resources/application.yml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 11725f1..8a825d3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ profile: /javaWork/lims-ruoyi/file/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -33,8 +33,9 @@
# 鏃ュ織閰嶇疆
logging:
+ file-location: /javaWork/lims-ruoyi
level:
- com.ruoyi: debug
+ com.ruoyi: info
org.springframework: warn
# 鐢ㄦ埛閰嶇疆
@@ -77,8 +78,8 @@
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜
- password:
+# # 瀵嗙爜
+# password: root2022!
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -99,7 +100,7 @@
# 浠ょ墝瀵嗛挜
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+ expireTime: 450
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
--
Gitblit v1.9.3