From 71325b540a2063a32b902e5d3aa0a3df2260f715 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 10:00:14 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-admin/src/main/resources/application-prod.yml | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 2 +-
ruoyi-generator/pom.xml | 6 ++++++
pom.xml | 16 +++++++++++++++-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f0e37d7..58f0280 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,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>
@@ -145,8 +146,21 @@
<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>
-
+
+ <!-- collections宸ュ叿绫� -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+
<!-- 闃块噷JSON瑙ｆ瀽鍣� -->
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index e9cf4a7..ed1a529 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -43,8 +43,8 @@
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 2a31e70..9eb24e0 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 @@
*/
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 594d0b3..144fb5b 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -23,6 +23,12 @@
<artifactId>velocity</artifactId>
</dependency>
+ <!-- collections宸ュ叿绫� -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
--
Gitblit v1.9.3