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

疯狂的狮子li

2020-12-21 78ef398257008415f0b2ef275c1885c4fc38908a

 ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.2.0</version>

        <version>3.3.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



@@ -17,11 +17,31 @@


    <dependencies>



        <!-- BEGIN 如果想使用 Tomcat 注释掉以下代码 -->

        <!-- SpringBoot Web容器 -->

         <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-web</artifactId>

             <exclusions>

                 <exclusion>

                     <artifactId>spring-boot-starter-tomcat</artifactId>

                     <groupId>org.springframework.boot</groupId>

                 </exclusion>

             </exclusions>

        </dependency>

        <!-- web 容器使用 undertow 性能更强 -->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-undertow</artifactId>

        </dependency>

        <!-- END -->



        <!-- BEGIN 如果想使用 Tomcat 解除以下代码注释 -->

<!--        <dependency>-->

<!--            <groupId>org.springframework.boot</groupId>-->

<!--            <artifactId>spring-boot-starter-web</artifactId>-->

<!--        </dependency>-->

        <!-- END -->



        <!-- SpringBoot 拦截器 -->

        <dependency>