同步若依2.3版本

疯狂的狮子li

2020-06-01 8a62368141a93ee7d8fd53e3d88414904ab5eb3d

 ruoyi/pom.xml

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

   <groupId>com.ruoyi</groupId>
   <artifactId>ruoyi</artifactId>
   <version>2.2.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.68</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>
@@ -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,23 +70,33 @@
      <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>
         <artifactId>spring-boot-starter-data-redis</artifactId>
      </dependency>
		
      <!-- pool 对象池 -->
      <dependency>
         <groupId>org.apache.commons</groupId>
@@ -120,10 +124,10 @@

      <!--阿里数据库连接池 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>druid-spring-boot-starter</artifactId>
         <version>${druid.version}</version>
      </dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
            <version>${druid.version}</version>
        </dependency>

      <!--常用工具类 -->
      <dependency>
@@ -137,12 +141,14 @@
         <artifactId>commons-io</artifactId>
         <version>${commons.io.version}</version>
      </dependency>
		
      <!--文件上传工具类 -->
      <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
         <version>${commons.fileupload.version}</version>
      </dependency>
		
      <!-- 解析客户端操作系统、浏览器等 -->
      <dependency>
         <groupId>eu.bitwalker</groupId>
@@ -162,59 +168,68 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
      </dependency>
      <!--Token生成与解析-->
		
        <!--Token生成与解析-->
      <dependency>
         <groupId>io.jsonwebtoken</groupId>
         <artifactId>jjwt</artifactId>
         <version>${jwt.version}</version>
      </dependency>
		
      <!-- swagger2-->
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger2</artifactId>
         <version>${swagger.version}</version>
         <exclusions>
            <exclusion>
               <groupId>io.swagger</groupId>
               <artifactId>swagger-annotations</artifactId>
            </exclusion>
            <exclusion>
               <groupId>io.swagger</groupId>
               <artifactId>swagger-models</artifactId>
            </exclusion>
             <exclusion>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-annotations</artifactId>
             </exclusion>
             <exclusion>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-models</artifactId>
             </exclusion>
         </exclusions>
      </dependency>
		
      <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
      <dependency>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-annotations</artifactId>
         <version>1.5.21</version>
      </dependency>
      <dependency>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-models</artifactId>
         <version>1.5.21</version>
      </dependency>
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-annotations</artifactId>
            <version>1.5.21</version>
        </dependency>
        
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-models</artifactId>
            <version>1.5.21</version>
        </dependency>
        
      <!-- swagger2-UI-->
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger-ui</artifactId>
         <version>${swagger.version}</version>
      </dependency>
      <!-- 获取系统信息 -->
		
        <!-- 获取系统信息 -->
      <dependency>
         <groupId>com.github.oshi</groupId>
         <artifactId>oshi-core</artifactId>
         <version>${oshi.version}</version>
      </dependency>
		
      <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
      </dependency>
		
      <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna-platform</artifactId>
      </dependency>
		
      <!-- excel工具 -->
      <dependency>
         <groupId>org.apache.poi</groupId>