升级pagehelper到最新版1.3.1

RuoYi

2021-06-25 11d327572b3fc007ef68c46b9c66a451a76e6430

 pom.xml

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


   <groupId>com.ruoyi</groupId>

   <artifactId>ruoyi</artifactId>

   <version>3.1.0</version>

   <version>3.5.0</version>

   <packaging>jar</packaging>



   <name>ruoyi</name>

@@ -15,7 +15,7 @@
   <parent>

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

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

      <version>2.1.17.RELEASE</version>

      <version>2.2.13.RELEASE</version>

      <relativePath />

   </parent>



@@ -24,19 +24,20 @@
      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

      <java.version>1.8</java.version>

      <maven-jar-plugin.version>3.1.1</maven-jar-plugin.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.73</fastjson.version>

      <druid.version>1.1.22</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>

      <mybatis.spring.boot.starter.version>2.1.4</mybatis.spring.boot.starter.version>

      <pagehelper.spring.boot.starter.version>1.3.1</pagehelper.spring.boot.starter.version>

      <fastjson.version>1.2.76</fastjson.version>

      <druid.version>1.2.6</druid.version>

      <commons.io.version>2.10.0</commons.io.version>

      <commons.fileupload.version>1.4</commons.fileupload.version>

      <commons.collections.version>3.2.2</commons.collections.version>

      <bitwalker.version>1.21</bitwalker.version>

      <jwt.version>0.9.1</jwt.version>

      <kaptcha.version>2.3.2</kaptcha.version>

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

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

      <oshi.version>5.2.5</oshi.version>

        <jna.version>5.5.0</jna.version>

      <swagger.version>3.0.0</swagger.version>

      <poi.version>4.1.2</poi.version>

      <oshi.version>5.7.4</oshi.version>

        <jna.version>5.8.0</jna.version>

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

   </properties>



@@ -113,27 +114,27 @@
         <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常用工具类 -->

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

@@ -154,55 +155,38 @@
         <version>${fastjson.version}</version>

      </dependency>



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

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

      <dependency>

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

         </exclusions>

      </dependency>

		
      <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->

      <!-- Swagger3依赖 -->

        <dependency>

            <groupId>io.swagger</groupId>

            <artifactId>swagger-annotations</artifactId>

            <version>1.5.21</version>

            <groupId>io.springfox</groupId>

            <artifactId>springfox-boot-starter</artifactId>

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

            <exclusions>

                <exclusion>

                    <groupId>io.swagger</groupId>

                    <artifactId>swagger-models</artifactId>

                </exclusion>

            </exclusions>

        </dependency>

        

        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->

        <dependency>

            <groupId>io.swagger</groupId>

            <artifactId>swagger-models</artifactId>

            <version>1.5.21</version>

            <version>1.6.2</version>

        </dependency>

        
      <!-- swagger2-UI-->

      <dependency>

         <groupId>io.springfox</groupId>

         <artifactId>springfox-swagger-ui</artifactId>

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

      </dependency>

      

        <!-- 获取系统信息 -->

      <dependency>

@@ -218,11 +202,24 @@
         <version>${poi.version}</version>

      </dependency>



      <!--velocity代码生成使用模板 -->

      <!-- velocity代码生成使用模板 -->

      <dependency>

         <groupId>org.apache.velocity</groupId>

         <artifactId>velocity</artifactId>

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

            <exclusions>

                <exclusion>

                    <groupId>commons-collections</groupId>

                    <artifactId>commons-collections</artifactId>

                </exclusion>

            </exclusions>

      </dependency>

		
      <!-- collections工具类 -->

      <dependency>

         <groupId>commons-collections</groupId>

         <artifactId>commons-collections</artifactId>

         <version>${commons.collections.version}</version>

      </dependency>

      

        <!-- 定时任务 -->

@@ -237,7 +234,7 @@
         </exclusions>

      </dependency>

      

      <!--验证码 -->

      <!-- 验证码 -->

        <dependency>

            <groupId>com.github.penggle</groupId>

            <artifactId>kaptcha</artifactId>