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

疯狂的狮子li

2020-03-19 b1afb78ca252faa5b05a293f1b7467b1315c980f

 ruoyi/pom.xml

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

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

   <name>ruoyi</name>
@@ -35,8 +35,6 @@
      <poi.version>3.17</poi.version>
      <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>
   </properties>

   <dependencies>
@@ -45,18 +43,6 @@
      <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>
      </dependency>

      <!-- web 容器使用 undertow 性能更强 -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-undertow</artifactId>
      </dependency>

      <!-- SpringBoot 测试 -->
@@ -110,24 +96,18 @@
         <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>-->
      <!-- SpringBoot集成mybatis框架 -->
      <dependency>
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>${mybatis.spring.boot.starter.version}</version>
      </dependency>
      
      <!-- pagehelper 分页插件 -->
      <dependency>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-starter</artifactId>
         <version>${pagehelper.spring.boot.starter.version}</version>
         <exclusions>
            <exclusion>
               <groupId>org.mybatis</groupId>
               <artifactId>mybatis</artifactId>
            </exclusion>
         </exclusions>
      </dependency>

      <!--阿里数据库连接池 -->
@@ -244,6 +224,7 @@
         <artifactId>poi-ooxml</artifactId>
         <version>${poi.version}</version>
      </dependency>

      <!--velocity代码生成使用模板 -->
      <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -269,6 +250,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>