From c2e92006260a190e8a3ffd050418ed3dcd1394c3 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 14 Mar 2021 16:37:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=91=E6=8E=A7=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B4=A6=E6=88=B7=E5=AF=86=E7=A0=81=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=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 @@ 5.7.0 2.5 1.3.3 + 3.2.2 4.1.2 1.7 0.9.1 @@ -143,11 +144,14 @@ + + commons-collections commons-collections - 3.2.2 + ${commons.collections.version} + com.alibaba 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 @@ org.apache.velocity velocity - + + commons-collections commons-collections + com.ruoyi