同步若依2.3版本

疯狂的狮子li

2020-06-01 8a62368141a93ee7d8fd53e3d88414904ab5eb3d

 ruoyi/pom.xml

@@ -1,287 +1,318 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

   <modelVersion>4.0.0</modelVersion>



   <groupId>com.ruoyi</groupId>

   <artifactId>ruoyi</artifactId>

   <version>2.2.0</version>

   <packaging>jar</packaging>



   <name>ruoyi</name>

   <url>http://www.ruoyi.vip</url>

   <description>若依管理系统</description>



   <parent>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-parent</artifactId>

      <version>2.1.1.RELEASE</version>

      <relativePath />

   </parent>



   <properties>

      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

      <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>

      <druid.version>1.1.14</druid.version>

      <commons.io.version>2.5</commons.io.version>

      <commons.fileupload.version>1.3.3</commons.fileupload.version>

      <bitwalker.version>1.19</bitwalker.version>

      <jwt.version>0.9.0</jwt.version>

      <swagger.version>2.9.2</swagger.version>

      <poi.version>3.17</poi.version>

      <oshi.version>3.9.1</oshi.version>

      <velocity.version>1.7</velocity.version>

   </properties>



   <dependencies>



      <!-- SpringBoot 核心包 -->

      <dependency>

         <groupId>org.springframework.boot</groupId>

         <artifactId>spring-boot-starter</artifactId>

      </dependency>



      <!-- SpringBoot 测试 -->

      <dependency>

         <groupId>org.springframework.boot</groupId>

         <artifactId>spring-boot-starter-test</artifactId>

         <scope>test</scope>

      </dependency>



      <!-- SpringBoot 拦截器 -->

      <dependency>

         <groupId>org.springframework.boot</groupId>

         <artifactId>spring-boot-starter-aop</artifactId>

      </dependency>



      <!-- SpringBoot Web容器 -->

      <dependency>

         <groupId>org.springframework.boot</groupId>

         <artifactId>spring-boot-starter-web</artifactId>

      </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>

         <artifactId>commons-pool2</artifactId>

      </dependency>



      <!-- Mysql驱动包 -->

      <dependency>

         <groupId>mysql</groupId>

         <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>

      </dependency>



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

      <dependency>

            <groupId>com.alibaba</groupId>

            <artifactId>druid-spring-boot-starter</artifactId>

            <version>${druid.version}</version>

        </dependency>



      <!--常用工具类 -->

      <dependency>

         <groupId>org.apache.commons</groupId>

         <artifactId>commons-lang3</artifactId>

      </dependency>



      <!--io常用工具类 -->

      <dependency>

         <groupId>commons-io</groupId>

         <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>

         <artifactId>UserAgentUtils</artifactId>

         <version>${bitwalker.version}</version>

      </dependency>



      <!-- 阿里JSON解析器 -->

      <dependency>

         <groupId>com.alibaba</groupId>

         <artifactId>fastjson</artifactId>

         <version>${fastjson.version}</version>

      </dependency>



      <!--Spring框架基本的核心工具-->

      <dependency>

         <groupId>org.springframework</groupId>

         <artifactId>spring-context-support</artifactId>

      </dependency>

		
        <!--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>

         </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>

        
      <!-- 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>

         <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>org.quartz-scheduler</groupId>

         <artifactId>quartz</artifactId>

         <exclusions>

            <exclusion>

               <groupId>com.mchange</groupId>

               <artifactId>c3p0</artifactId>

            </exclusion>

         </exclusions>

      </dependency>



   </dependencies>



   <build>

      <finalName>${project.artifactId}</finalName>

      <plugins>

         <plugin>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-maven-plugin</artifactId>

            <configuration>

               <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->

            </configuration>

         </plugin>

      </plugins>

   </build>



   <repositories>

      <repository>

         <id>public</id>

         <name>aliyun nexus</name>

         <url>http://maven.aliyun.com/nexus/content/groups/public/</url>

         <releases>

            <enabled>true</enabled>

         </releases>

      </repository>

   </repositories>



   <pluginRepositories>

      <pluginRepository>

         <id>public</id>

         <name>aliyun nexus</name>

         <url>http://maven.aliyun.com/nexus/content/groups/public/</url>

         <releases>

            <enabled>true</enabled>

         </releases>

         <snapshots>

            <enabled>false</enabled>

         </snapshots>

      </pluginRepository>

   </pluginRepositories>



<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>

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

   <name>ruoyi</name>
   <url>http://www.ruoyi.vip</url>
   <description>若依管理系统</description>

   <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>2.1.1.RELEASE</version>
      <relativePath />
   </parent>

   <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
      <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.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>
      <bitwalker.version>1.19</bitwalker.version>
      <jwt.version>0.9.0</jwt.version>
      <swagger.version>2.9.2</swagger.version>
      <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>

      <!-- SpringBoot 核心包 -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
      </dependency>

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

      <!-- SpringBoot 测试 -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-test</artifactId>
         <scope>test</scope>
      </dependency>

      <!-- SpringBoot 拦截器 -->
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-aop</artifactId>
      </dependency>

      <!-- SpringBoot Web容器 -->
      <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>
         <artifactId>commons-pool2</artifactId>
      </dependency>

      <!-- Mysql驱动包 -->
      <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
         <scope>runtime</scope>
      </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>

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

      <!--常用工具类 -->
      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
      </dependency>

      <!--io常用工具类 -->
      <dependency>
         <groupId>commons-io</groupId>
         <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>
         <artifactId>UserAgentUtils</artifactId>
         <version>${bitwalker.version}</version>
      </dependency>

      <!-- 阿里JSON解析器 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>${fastjson.version}</version>
      </dependency>

      <!--Spring框架基本的核心工具-->
      <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context-support</artifactId>
      </dependency>
		
        <!--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>
         </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>
        
      <!-- 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>
         <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>

   <build>
      <finalName>${project.artifactId}</finalName>
      <plugins>
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <configuration>
               <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
            </configuration>
         </plugin>
      </plugins>
   </build>

   <repositories>
      <repository>
         <id>public</id>
         <name>aliyun nexus</name>
         <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
         <releases>
            <enabled>true</enabled>
         </releases>
      </repository>
   </repositories>

   <pluginRepositories>
      <pluginRepository>
         <id>public</id>
         <name>aliyun nexus</name>
         <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
         <releases>
            <enabled>true</enabled>
         </releases>
         <snapshots>
            <enabled>false</enabled>
         </snapshots>
      </pluginRepository>
   </pluginRepositories>

</project>