Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2021-03-15 71325b540a2063a32b902e5d3aa0a3df2260f715

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-admin/src/main/resources/application-prod.yml

	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

 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>


 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

 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类型

 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>