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

疯狂的狮子li

2020-05-23 4460fae46fedb491ccb2782e6984fc8145d809d4

 ruoyi/pom.xml

@@ -25,7 +25,7 @@
      <java.version>1.8</java.version>
      <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
      <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
      <fastjson.version>1.2.47</fastjson.version>
      <fastjson.version>1.2.68</fastjson.version>
      <druid.version>1.1.14</druid.version>
      <commons.io.version>2.5</commons.io.version>
      <commons.fileupload.version>1.3.3</commons.fileupload.version>
@@ -45,12 +45,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 性能更强 -->
@@ -76,21 +70,27 @@
      <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>
		

      <!-- spring-boot-devtools -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-devtools</artifactId>
         <optional>true</optional> <!-- 表示依赖不会传递 -->
      </dependency>
		

      <!-- spring security 安全认证 -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-security</artifactId>
      </dependency>
		

      <!-- redis 缓存操作 -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
@@ -109,19 +109,17 @@
         <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>

      <!--阿里数据库连接池 -->
@@ -265,7 +263,7 @@
         <artifactId>lombok</artifactId>
      </dependency>

        <!-- 定时任务 -->
      <!-- 定时任务 -->
      <dependency>
         <groupId>org.quartz-scheduler</groupId>
         <artifactId>quartz</artifactId>