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

疯狂的狮子li

2020-04-03 31a271301275ca59e4821b988f482f753ae0b885

 ruoyi/pom.xml

@@ -35,6 +35,8 @@
      <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.1.0</hutool.version>
   </properties>

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

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

      <!-- SpringBoot 测试 -->
@@ -95,19 +109,18 @@
         <artifactId>mysql-connector-java</artifactId>
         <scope>runtime</scope>
      </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>

      <!--阿里数据库连接池 -->