From e129e1b5d9be70e516d0f1ca6b7c5d5eca864a1b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 一月 2024 15:16:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/resources/application-druid.yml | 31 ++++++++++++++++---------------
ruoyi-admin/src/main/resources/application.yml | 20 ++++++++++----------
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c25e58b..d222f80 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,23 +6,23 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# # 鍖婚櫌鐜
-# url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: JQ
-# password: Jqserver88
+ # 鍖婚櫌鐜
+ url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: JQ
+ password: Jqserver88
- # 寮�鍙戠幆澧�
- url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
- username: opo
- password: opo@2022
+# # 寮�鍙戠幆澧�
+# url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+# username: opo
+# password: opo@2022
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
enabled: false
- url:
- username:
- password:
+ url:
+ username:
+ password:
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -42,16 +42,17 @@
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- webStatFilter:
+ webStatFilter:
enabled: true
statViewServlet:
- enabled: true
+ # 寮�鍏�
+ enabled: false
# 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
allow:
url-pattern: /druid/*
# 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: ruoyi
- login-password: 123456
+ login-username: lihu
+ login-password: Lihu.7647Sa89.94
filter:
stat:
enabled: true
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 326dc40..9fab6f1 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -56,9 +56,9 @@
servlet:
multipart:
# 鍗曚釜鏂囦欢澶у皬
- max-file-size: 20MB
+ max-file-size: 500MB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 40MB
+ max-request-size: 600MB
# 鏈嶅姟妯″潡
devtools:
restart:
@@ -70,15 +70,15 @@
enabled: ALWAYS
# redis 閰嶇疆
redis:
- # # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
- # host: 129.88.242.37
- # password: jqserver
- # port: 6379
+ # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
+ host: 129.88.242.37
+ password: jqserver
+ port: 6379
- # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
- host: 116.62.18.175
- password: Smartor
- port: 6020
+# # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
+# host: 116.62.18.175
+# password: Smartor
+# port: 6020
# 鏁版嵁搴撶储寮�
database: 0
--
Gitblit v1.9.3