From c0f1569ad98aa44bd4ee2712ff1f3de974a28091 Mon Sep 17 00:00:00 2001
From: hh44h1144 <huyongquan@ecloude.com>
Date: Fri, 12 Mar 2021 16:59:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcommons-collections?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96?=
 =?UTF-8?q?=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                 | 12 +++++++++++-
 ruoyi-generator/pom.xml |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c9377ce4..ecc6df16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,8 +136,18 @@
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.2</version>
             </dependency>
-	        
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 594d0b30..795d6506 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -22,7 +22,11 @@
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>
-
+        <!--commons-collections-->
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
         <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>

From c2e92006260a190e8a3ffd050418ed3dcd1394c3 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 14 Mar 2021 16:37:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B4=A6=E6=88=B7=E5=AF=86=E7=A0=81=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E8=B6=8A=E6=9D=83=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 6 +++++-
 ruoyi-admin/src/main/resources/application-druid.yml        | 4 ++--
 .../com/ruoyi/common/core/controller/BaseController.java    | 2 +-
 ruoyi-generator/pom.xml                                     | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ecc6df16..732ab7c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
         <jna.version>5.7.0</jna.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
+        <commons.collections.version>3.2.2</commons.collections.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
@@ -143,11 +144,14 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+			
+            <!-- collections工具类 -->
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
+                <version>${commons.collections.version}</version>
             </dependency>
+			
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index cdfb3390..423e75f9 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -43,8 +43,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username: admin
+                login-password: 123456
             filter:
                 stat:
                     enabled: true
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index ab78abda..c7912d71 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.utils.sql.SqlUtil;
  */
 public class BaseController
 {
-    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 795d6506..144fb5bc 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -22,11 +22,13 @@
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>
-        <!--commons-collections-->
+
+        <!-- collections工具类 -->
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
+
         <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>