feat(pom): org.apache.commons.lang 工具包冲突

pom.xml

@@ -343,11 +343,11 @@
             <version>3.4.0</version>
         </dependency>
         <!--分页插架-->
-        <dependency>
+        <!-- <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.13</version>
-        </dependency>
+        </dependency> -->
         <!-- spring-cloud-alibaba-dependencies 依赖同注册中心 -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

src/main/java/com/dlbridge/jadp/common/persistence/PageInfo.java

@@ -140,7 +140,7 @@ public class PageInfo<T> implements Serializable {
                 this.startRow = 0;
                 this.endRow = 0;
             } else {
-                this.startRow = page.getStartRow() + 1;
+                this.startRow = (int) (page.getStartRow() + 1);
                 //计算实际的endRow（最后一页的时候特殊）
                 this.endRow = this.startRow - 1 + this.size;
             }
@@ -479,7 +479,6 @@ public class PageInfo<T> implements Serializable {
      *
      * @param pageNo   当前页码
      * @param pageSize 分页大小
-     * @param count    数据条数
      * @param list     本页数据对象列表
      */
     public PageInfo(int pageNo, int pageSize, long total, List<T> list) {

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/BusService.java

@@ -18,7 +18,7 @@ import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import  com.dlbridge.jadp.plugins.cmpt.utils.PageConvertUtil;

src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/ValidateUtils.java

 package com.dlbridge.jadp.plugins.cmpt.utils;
 
-import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import java.math.BigDecimal;
 import java.util.Calendar;

src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/date/DateUtil.java

 package com.dlbridge.jadp.plugins.cmpt.utils.date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.lang3.time.DateUtils;
 

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -139,7 +139,7 @@ public class MicroApiController {
     @ApiResponses({@ApiResponse(code = 200, message = "成功"), @ApiResponse(code = -1, message = "失败"), @ApiResponse(code = 200, message = "成功", response = Result.class)})
     @ApiOperation(value = "绑定赛事", notes = "用户与赛事绑定功能", tags = "赛事页面")
     public Result<EnrollInfo> bind(@RequestParam("phone") String phone, @RequestParam("cmptId") Integer cmptId, @RequestParam(name = "userMapId", defaultValue = "-1", required = false) Integer userMapId, HttpServletRequest request) {
-        int userId = org.apache.commons.lang.math.NumberUtils.toInt(request.getParameter("userId"), -1);
+        int userId = org.apache.commons.lang3.math.NumberUtils.toInt(request.getParameter("userId"), -1);
         if (userId == -1) {
             return Result.fail()
                     .setMsg("入参错误");

src/main/java/com/dlbridge/jadp/plugins/partner/service/BagDeliveryService.java

@@ -15,7 +15,7 @@ import com.dlbridge.jadp.plugins.partner.bean.vo.BagDropPointsVO;
 import com.dlbridge.jadp.plugins.partner.mapper.BagDeliveryMapper;
 import com.neusoft.www.utils.web.Result;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 

src/main/java/com/dlbridge/jadp/plugins/partner/service/InvoiceService.java

@@ -6,7 +6,7 @@ import com.dlbridge.jadp.plugins.partner.bean.Invoice;
 import com.dlbridge.jadp.plugins.partner.bean.InvoiceParam;
 import com.dlbridge.jadp.plugins.partner.mapper.InvoiceMapper;
 import com.neusoft.www.utils.web.Result;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;