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

疯狂的狮子li

2020-04-03 31a271301275ca59e4821b988f482f753ae0b885

 ruoyi/pom.xml

@@ -5,7 +5,7 @@

   <groupId>com.ruoyi</groupId>
   <artifactId>ruoyi</artifactId>
   <version>2.0.0</version>
   <version>2.2.0</version>
   <packaging>jar</packaging>

   <name>ruoyi</name>
@@ -36,7 +36,7 @@
      <oshi.version>3.9.1</oshi.version>
      <velocity.version>1.7</velocity.version>
      <mybatis-plus.version>3.3.0</mybatis-plus.version>
      <hutool.version>5.0.6</hutool.version>
      <hutool.version>5.1.0</hutool.version>
   </properties>

   <dependencies>
@@ -45,13 +45,18 @@
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
         <!--
          <exclusions>
                <exclusion>
                    <artifactId>spring-boot-starter-tomcat</artifactId>
                    <groupId>org.springframework.boot</groupId>
                </exclusion>
            </exclusions>
         <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>

      <!-- SpringBoot 测试 -->
@@ -104,13 +109,6 @@
         <artifactId>mysql-connector-java</artifactId>
         <scope>runtime</scope>
      </dependency>

<!--      &lt;!&ndash; SpringBoot集成mybatis框架 &ndash;&gt;-->
<!--      <dependency>-->
<!--         <groupId>org.mybatis.spring.boot</groupId>-->
<!--         <artifactId>mybatis-spring-boot-starter</artifactId>-->
<!--         <version>${mybatis.spring.boot.starter.version}</version>-->
<!--      </dependency>-->
      
      <!-- pagehelper 分页插件 -->
      <dependency>
@@ -239,6 +237,7 @@
         <artifactId>poi-ooxml</artifactId>
         <version>${poi.version}</version>
      </dependency>

      <!--velocity代码生成使用模板 -->
      <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -264,6 +263,19 @@
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
      </dependency>

        <!-- 定时任务 -->
      <dependency>
         <groupId>org.quartz-scheduler</groupId>
         <artifactId>quartz</artifactId>
         <exclusions>
            <exclusion>
               <groupId>com.mchange</groupId>
               <artifactId>c3p0</artifactId>
            </exclusion>
         </exclusions>
      </dependency>

   </dependencies>

   <build>