同步若依2.3版本

疯狂的狮子li

2020-06-01 8a62368141a93ee7d8fd53e3d88414904ab5eb3d

 ruoyi/pom.xml

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

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

   <name>ruoyi</name>
@@ -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.70</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>
@@ -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,14 +45,12 @@
      <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 测试 -->
@@ -70,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>
@@ -103,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>

      <!--阿里数据库连接池 -->
@@ -232,12 +236,44 @@
         <artifactId>poi-ooxml</artifactId>
         <version>${poi.version}</version>
      </dependency>

      <!--velocity代码生成使用模板 -->
      <dependency>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
         <version>${velocity.version}</version>
      </dependency>
      <dependency>
         <groupId>com.baomidou</groupId>
         <artifactId>mybatis-plus-boot-starter</artifactId>
         <version>${mybatis-plus.version}</version>
      </dependency>
      <dependency>
         <groupId>com.baomidou</groupId>
         <artifactId>mybatis-plus-extension</artifactId>
         <version>${mybatis-plus.version}</version>
      </dependency>
      <dependency>
         <groupId>cn.hutool</groupId>
         <artifactId>hutool-all</artifactId>
         <version>${hutool.version}</version>
      </dependency>
      <dependency>
         <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>