From 935b27a40c549f3ebc15e7e9654cdfd01e8eab13 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 04 Jun 2024 11:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
target/classes/application.yml | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/target/classes/application.yml b/target/classes/application.yml
index 109fcbe..0b78733 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -13,13 +13,11 @@
max: 800
# Tomcat启动初始化的线程数，默认值10
min-spare: 100
-
# 日志配置
logging:
level:
com.ruoyi: debug
org.springframework: warn
-
# token配置
token:
# 令牌自定义标识
@@ -65,6 +63,7 @@
time-zone: Asia/Kolkata
profiles:
active: druid
+
# 文件上传
servlet:
multipart:
@@ -110,18 +109,16 @@
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- rname: root
- password: root
-# url: jdbc:mysql://114.29.252.25:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: Err;2[eoGFUriwdgr
+# url: jdbc:mysql://127.0.0.1:3306/cgstock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
druid:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
- maxActive: 20
+ maxActive: 50
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
--
Gitblit v1.9.3