From 23cc4c4cbef0e2f0dd190043d36abb992882c8be Mon Sep 17 00:00:00 2001
From: gxl <8121275+gyz818@user.noreply.gitee.com>
Date: Sat, 22 May 2021 21:59:02 +0800
Subject: [PATCH 1/3] first-commit

---
 ruoyi-admin/src/main/resources/application-druid.yml | 4 ++--
 1 file 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 3c46fd50b..6f9cc1310 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/companydemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

From 11ed8683a53612c2b7556381f1bac4e466dfffdd Mon Sep 17 00:00:00 2001
From: gxl <8121275+gyz818@user.noreply.gitee.com>
Date: Sat, 22 May 2021 22:09:35 +0800
Subject: [PATCH 2/3] second-commit

---
 .../java/com/ruoyi/common/config/thread/ThreadPoolConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java
index 1ff207552..0f22a48d3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java
@@ -26,7 +26,7 @@ public class ThreadPoolConfig
     // 队列最大长度
     private int queueCapacity = 1000;
 
-    // 线程池维护线程所允许的空闲时间
+    // 线程池维护线程所允许的空闲时间-1
     private int keepAliveSeconds = 300;
 
     @Bean(name = "threadPoolTaskExecutor")

From ecebd5c1ae8aa50cdc6578225455a50afc4c14ef Mon Sep 17 00:00:00 2001
From: gxl <8121275+gyz818@user.noreply.gitee.com>
Date: Sat, 22 May 2021 22:12:12 +0800
Subject: [PATCH 3/3] third-commit

---
 .../java/com/ruoyi/common/config/thread/ThreadPoolConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java
index 0f22a48d3..fb37683e7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/thread/ThreadPoolConfig.java
@@ -26,7 +26,7 @@ public class ThreadPoolConfig
     // 队列最大长度
     private int queueCapacity = 1000;
 
-    // 线程池维护线程所允许的空闲时间-1
+    // 线程池维护线程所允许的空闲时间-2
     private int keepAliveSeconds = 300;
 
     @Bean(name = "threadPoolTaskExecutor")