Pre Merge pull request !295 from gxl/dev-2

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:
                 # 从数据源开关/默认关闭

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")