diff --git a/pom.xml b/pom.xml index ecc6df1..732ab7c 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 cdfb339..423e75f 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 ab78abd..c7912d7 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 795d650..144fb5b 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