fix : 升级jdk17兼容性修改

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyDTO.java

@@ -10,7 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/OrderReportDTO.java

@@ -2,7 +2,7 @@ package com.zanxiang.game.back.serve.pojo.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/RoleManageController.java

@@ -19,7 +19,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Map;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/intercept/WebVisitLogIntercept.java

@@ -7,8 +7,8 @@ import com.zanxiang.game.data.serve.pojo.dto.WebLogDTO;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameCountryParamDTO.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.data.serve.pojo.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameUserConfigCreateOrUpdateDTO.java

@@ -1,10 +1,9 @@
 package com.zanxiang.game.data.serve.pojo.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * packageName com.zanxiang.game.data.serve.pojo.dto
  *

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/MsgTaskResultDTO.java

@@ -4,7 +4,7 @@ import com.zanxiang.game.data.serve.pojo.base.BasePage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleGameCountryParamDTO.java

@@ -2,38 +2,30 @@ package com.zanxiang.game.data.serve.pojo.dto;
 
 import com.zanxiang.game.data.serve.pojo.base.BasePage;
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.List;
-
 /**
-  * @author ZhangXianyu
-  * @date 2025/2/20
-  * @description 游戏帮派查询参数
+ * @author ZhangXianyu
+ * @date 2025/2/20
+ * @description 游戏帮派查询参数
  */
 @Data
 public class RoleGameCountryParamDTO extends BasePage {
 
-   @ApiModelProperty(value = "帮派")
-   @NotEmpty(message = "帮派不能为空")
-   private String country;
-
-   @ApiModelProperty(value = "区服id")
-   @NotEmpty(message = "区服不能为空")
-   private String serverId;
-
-   @ApiModelProperty(value = "等级类型 0小于13，1大于13")
-   private Long countryLevel;
-
-   private String sortFiled;
-
-   private String sortType;
+    @ApiModelProperty(value = "帮派")
+    @NotEmpty(message = "帮派不能为空")
+    private String country;
 
+    @ApiModelProperty(value = "区服id")
+    @NotEmpty(message = "区服不能为空")
+    private String serverId;
 
+    @ApiModelProperty(value = "等级类型 0小于13，1大于13")
+    private Long countryLevel;
 
+    private String sortFiled;
 
+    private String sortType;
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/SendMsgTaskDTO.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.data.serve.pojo.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/MediaActiveDataDayVO.java

@@ -6,8 +6,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/service/impl/AdsGsServerDayParentServiceImpl.java

@@ -15,7 +15,7 @@ import com.zanxiang.game.gs.data.serve.service.IGameServerSonMergeService;
 import com.zanxiang.game.gs.data.serve.service.ISysUserService;
 import com.zanxiang.module.util.DateUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.zanxiang.game.gs.data.serve.service.IAdsGsServerDayParentService;
 import com.zanxiang.game.gs.data.serve.pojo.entity.game.parent.AdsGsServerDayParent;

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/service/impl/AdsRoleAmountDataParentServiceImpl.java

@@ -20,7 +20,7 @@ import com.zanxiang.game.gs.data.serve.pojo.vo.RoleRemoveGameMonitorVO;
 import com.zanxiang.game.gs.data.serve.service.*;
 import com.zanxiang.module.util.DateUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/service/impl/AdsServerRankingParentServiceImpl.java

@@ -16,7 +16,7 @@ import com.zanxiang.game.gs.data.serve.service.IGameServerSonMergeService;
 import com.zanxiang.game.gs.data.serve.service.ISysUserService;
 import com.zanxiang.module.util.DateUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameServerController.java

@@ -23,7 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/OrderController.java

@@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * @author : lingfeng

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/UserController.java

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/KfWebSocketMsgDTO.java

@@ -332,7 +332,7 @@ public class KfWebSocketMsgDTO {
         /**
          * 未读消息总数
          */
-        private Integer unReadMsgCount;
+        private Long unReadMsgCount;
     }
 
     @Data
@@ -469,7 +469,7 @@ public class KfWebSocketMsgDTO {
         /**
          * 未读消息总数
          */
-        private Integer unReadMsgCount;
+        private Long unReadMsgCount;
 
         /**
          * 是否添加企微

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameServerService.java

@@ -10,9 +10,9 @@ import com.zanxiang.game.module.manage.pojo.params.GameServerListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameServerListVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameServerVO;
 import com.zanxiang.game.module.mybatis.entity.GameServer;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameUserRoleService.java

@@ -8,7 +8,7 @@ import com.zanxiang.game.module.manage.pojo.vo.GameUserRoleListVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameUserRoleVO;
 import com.zanxiang.game.module.mybatis.entity.GameUserRole;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IOrderService.java

@@ -8,7 +8,7 @@ import com.zanxiang.game.module.manage.pojo.vo.OrderListVO;
 import com.zanxiang.game.module.manage.pojo.vo.UserOrderListVO;
 import com.zanxiang.game.module.mybatis.entity.Order;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * @author : lingfeng

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/CpServiceImpl.java

@@ -50,7 +50,7 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements ICpServi
             //更新CP名字, 不可重复
             if (!Objects.equals(cp.getCpName(), param.getCpName())) {
                 //判断cp名称是否已经存在
-                int count = super.count(new LambdaQueryWrapper<Cp>()
+                long count = super.count(new LambdaQueryWrapper<Cp>()
                         .eq(Cp::getCpName, param.getCpName()));
                 if (count > 0) {
                     throw new BaseException("cp名称已经存在");
@@ -66,7 +66,7 @@ public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements ICpServi
             return super.updateById(cp);
         }
         //判断cp名称是否已经存在
-        int count = super.count(new LambdaQueryWrapper<Cp>()
+        long count = super.count(new LambdaQueryWrapper<Cp>()
                 .eq(Cp::getCpName, param.getCpName()));
         if (count > 0) {
             throw new BaseException("cp名称已经存在");

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAdMonitorServiceImpl.java

@@ -59,7 +59,7 @@ public class GameAdMonitorServiceImpl extends ServiceImpl<GameAdMonitorMapper, G
         LocalDateTime now = LocalDateTime.now();
 
         //数据库找出是否含有相同的规则策略
-        int count = this.count(new LambdaQueryWrapper<GameAdMonitor>()
+        long count = this.count(new LambdaQueryWrapper<GameAdMonitor>()
                 .ne(param.getId() != null, GameAdMonitor::getId, param.getId())
                 .eq(GameAdMonitor::getRuleType, param.getRuleType())
                 .eq(GameAdMonitor::getDepartment, param.getDepartment())

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameGiftServiceImpl.java

@@ -51,7 +51,7 @@ public class GameGiftServiceImpl extends ServiceImpl<GameGiftMapper, GameGift> i
         Long sysUserId = SecurityUtil.getUserId();
         LocalDateTime now = LocalDateTime.now();
         if (null == param.getId()) {
-            int count = count(new LambdaQueryWrapper<GameGift>()
+            long count = count(new LambdaQueryWrapper<GameGift>()
                     .eq(GameGift::getParentGameId, param.getParentGameId())
                     .eq(GameGift::getSuperGameId, param.getSuperGameId())
                     .eq(GameGift::getGiftName, param.getGiftName()));
@@ -69,7 +69,7 @@ public class GameGiftServiceImpl extends ServiceImpl<GameGiftMapper, GameGift> i
                     .build();
             return save(gameGift);
         } else {
-            int count = count(new LambdaQueryWrapper<GameGift>()
+            long count = count(new LambdaQueryWrapper<GameGift>()
                     .ne(GameGift::getId, param.getId())
                     .eq(GameGift::getParentGameId, param.getParentGameId())
                     .eq(GameGift::getSuperGameId, param.getSuperGameId())

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GamePayStrategyServiceImpl.java

@@ -89,7 +89,7 @@ public class GamePayStrategyServiceImpl extends ServiceImpl<GameStrategyMapper,
     }
 
     private void gamePayStrategyNameCheck(String name) {
-        int count = super.count(new LambdaQueryWrapper<GamePayStrategy>()
+        long count = super.count(new LambdaQueryWrapper<GamePayStrategy>()
                 .eq(GamePayStrategy::getName, name));
         if (count > 0) {
             throw new BaseException("策略名称重复");

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GamePolicyConfigServiceImpl.java

@@ -72,7 +72,7 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
                 .timeCondition(param.getTimeCondition())
                 .build());
 
-        int count = this.count(new LambdaQueryWrapper<GamePolicyConfig>()
+        long count = this.count(new LambdaQueryWrapper<GamePolicyConfig>()
                 .ne(param.getId() != null, GamePolicyConfig::getId, param.getId())
                 .eq(GamePolicyConfig::getSuperGameId, param.getSuperGameId())
                 .eq(GamePolicyConfig::getType, param.getType())

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServerServiceImpl.java

@@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import reactor.util.function.Tuple2;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.LocalTime;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameTagServiceImpl.java

@@ -110,7 +110,7 @@ public class GameTagServiceImpl extends ServiceImpl<GameTagMapper, GameTag> impl
             //更新标签名字, 不可重复
             if (!Objects.equals(gameTag.getName(), param.getName())) {
                 //判断cp名称是否已经存在
-                int count = super.count(new LambdaQueryWrapper<GameTag>()
+                long count = super.count(new LambdaQueryWrapper<GameTag>()
                         .eq(GameTag::getName, param.getName()));
                 if (count > 0) {
                     throw new BaseException("游戏分类标签名称已经存在");
@@ -124,7 +124,7 @@ public class GameTagServiceImpl extends ServiceImpl<GameTagMapper, GameTag> impl
             return super.updateById(gameTag);
         }
         //判断cp名称是否已经存在
-        int count = super.count(new LambdaQueryWrapper<GameTag>()
+        long count = super.count(new LambdaQueryWrapper<GameTag>()
                 .eq(GameTag::getName, param.getName()));
         if (count > 0) {
             throw new BaseException("游戏分类标签名称已经存在");

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameUserRoleServiceImpl.java

@@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import reactor.util.function.Tuple2;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameVipServiceImpl.java

@@ -60,7 +60,7 @@ public class GameVipServiceImpl extends ServiceImpl<GameVipMapper, GameVip> impl
         LocalDateTime now = LocalDateTime.now();
 
         //不传入id，说明是新增档位；传入id说明是修改档位
-        int count = count(new LambdaQueryWrapper<GameVip>()
+        long count = count(new LambdaQueryWrapper<GameVip>()
                 .ne(param.getId() != null, GameVip::getId, param.getId())
                 .eq(GameVip::getSuperGameId, param.getSuperGameId())
                 .eq(GameVip::getParentGameId, param.getParentGameId())
@@ -100,17 +100,17 @@ public class GameVipServiceImpl extends ServiceImpl<GameVipMapper, GameVip> impl
     public boolean deleteById(List<Long> ids) {
         Long sysUserId = SecurityUtil.getUserId();
         return update(new LambdaUpdateWrapper<GameVip>()
-                        .set(GameVip::getIsDelete, 1)
-                        .set(GameVip::getUpdateBy, sysUserId)
-                        .set(GameVip::getUpdateTime, LocalDateTime.now())
-                        .in(GameVip::getId, ids)
+                .set(GameVip::getIsDelete, 1)
+                .set(GameVip::getUpdateBy, sysUserId)
+                .set(GameVip::getUpdateTime, LocalDateTime.now())
+                .in(GameVip::getId, ids)
         );
     }
 
     @Override
     public IPage<GameVipListVO> gameVipList(GameVipListParam param) {
         return page(param.toPage(), new LambdaQueryWrapper<GameVip>()
-                .eq(null != param.getSuperGameId() , GameVip::getSuperGameId, param.getSuperGameId())
+                .eq(null != param.getSuperGameId(), GameVip::getSuperGameId, param.getSuperGameId())
                 .eq(null != param.getParentGameId(), GameVip::getParentGameId, param.getParentGameId())
                 .eq(null != param.getVipLevel(), GameVip::getVipLevel, param.getVipLevel())
                 .eq(GameVip::getIsDelete, 0))
@@ -127,7 +127,7 @@ public class GameVipServiceImpl extends ServiceImpl<GameVipMapper, GameVip> impl
         List<Integer> vipList = param.getList().stream()
                 .map(GameVipAddBatchParam.GameVipParam::getVipLevel).collect(Collectors.toList());
 
-        int count = count(new LambdaQueryWrapper<GameVip>()
+        long count = count(new LambdaQueryWrapper<GameVip>()
                 .eq(GameVip::getSuperGameId, param.getSuperGameId())
                 .in(GameVip::getParentGameId, param.getParentGameId())
                 .in(GameVip::getVipLevel, vipList)
@@ -143,16 +143,16 @@ public class GameVipServiceImpl extends ServiceImpl<GameVipMapper, GameVip> impl
             Long parentGameId = param.getParentGameId().get(i);
             for (GameVipAddBatchParam.GameVipParam gameVipParam : param.getList()) {
                 list.add(GameVip.builder()
-                                .parentGameId(parentGameId)
-                                .superGameId(param.getSuperGameId())
-                                .rechargeMoneyMin(gameVipParam.getRechargeMoneyMin())
-                                .rechargeMoneyMax(gameVipParam.getRechargeMoneyMax())
-                                .vipLevel(gameVipParam.getVipLevel())
-                                .createBy(sysUserId)
-                                .createTime(now)
-                                .updateTime(now)
-                                .updateBy(sysUserId)
-                                .build());
+                        .parentGameId(parentGameId)
+                        .superGameId(param.getSuperGameId())
+                        .rechargeMoneyMin(gameVipParam.getRechargeMoneyMin())
+                        .rechargeMoneyMax(gameVipParam.getRechargeMoneyMax())
+                        .vipLevel(gameVipParam.getVipLevel())
+                        .createBy(sysUserId)
+                        .createTime(now)
+                        .updateTime(now)
+                        .updateBy(sysUserId)
+                        .build());
             }
         }
         return saveBatch(list);

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/KfRoomServiceImpl.java

@@ -135,7 +135,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         if (gameApplet == null) {
             return null;
         }
-        int unReadMsgCount = kfRoomMsgService.count(new LambdaQueryWrapper<KfRoomMsg>()
+        long unReadMsgCount = kfRoomMsgService.count(new LambdaQueryWrapper<KfRoomMsg>()
                 .eq(KfRoomMsg::getGameId, gameApplet.getGameId())
                 .eq(KfRoomMsg::getReadStatus, Boolean.FALSE)
                 .and(qw -> qw.eq(KfRoomMsg::getKfUserId, kfUserId)
@@ -178,7 +178,7 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
             roomBean.setLastRoleName(kfSessionUser.getLastRoleName());
         }
         //未读消息数量
-        int unReadMsgCount = kfRoomMsgService.count(new LambdaQueryWrapper<KfRoomMsg>()
+        long unReadMsgCount = kfRoomMsgService.count(new LambdaQueryWrapper<KfRoomMsg>()
                 .eq(KfRoomMsg::getRoomId, kfRoom.getId())
                 .eq(KfRoomMsg::getReadStatus, Boolean.FALSE)
                 .eq(KfRoomMsg::getMsgOwner, KfRoomMsgOwnerEnum.KF_MSG_OWNER_USER.getValue()));

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/MiPaySumServiceImpl.java

@@ -37,7 +37,7 @@ public class MiPaySumServiceImpl extends ServiceImpl<MiPaySumMapper, MiPaySum> i
 
     @Override
     public void add(Long gameId, String appId, String miPayAppId) {
-        int count = super.count(new LambdaQueryWrapper<MiPaySum>()
+        long count = super.count(new LambdaQueryWrapper<MiPaySum>()
                 .eq(MiPaySum::getGameId, gameId)
                 .eq(MiPaySum::getAppId, appId)
                 .eq(MiPaySum::getMiPayAppId, miPayAppId));

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/OrderServiceImpl.java

@@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import reactor.util.function.Tuple2;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.time.Duration;
 import java.time.LocalDateTime;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/PayApplicationServiceImpl.java

@@ -91,7 +91,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
             //更新时, 应用id不可重复
             if (!Objects.equals(payApplication.getAppId(), param.getAppId())) {
                 //判断应用是否已经存在
-                int count = super.count(new LambdaQueryWrapper<PayApplication>()
+                long count = super.count(new LambdaQueryWrapper<PayApplication>()
                         .eq(PayApplication::getAppId, param.getAppId()));
                 if (count > 0) {
                     throw new BaseException("应用id已经存在");
@@ -115,7 +115,7 @@ public class PayApplicationServiceImpl extends ServiceImpl<PayApplicationMapper,
             return super.updateById(payApplication);
         }
         //判断应用是否已经存在
-        int count = super.count(new LambdaQueryWrapper<PayApplication>()
+        long count = super.count(new LambdaQueryWrapper<PayApplication>()
                 .eq(PayApplication::getAppId, param.getAppId()));
         if (count > 0) {
             throw new BaseException("应用id已经存在");

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/PayBoxServiceImpl.java

@@ -24,7 +24,7 @@ import com.zanxiang.game.module.mybatis.mapper.PayBoxMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -55,7 +55,7 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
     @Override
     public List<PayBoxChoiceVO> payBoxChoiceList() {
         return super.list(new LambdaQueryWrapper<PayBox>()
-                .select(PayBox::getId, PayBox::getType, PayBox::getName))
+                        .select(PayBox::getId, PayBox::getType, PayBox::getName))
                 .stream()
                 .map(payBox -> BeanUtil.copy(payBox, PayBoxChoiceVO.class))
                 .collect(Collectors.toList());
@@ -174,7 +174,7 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
         if (payBox != null && Objects.equals(payBox.getName(), payBoxName)) {
             return;
         }
-        int count = super.count(new LambdaQueryWrapper<PayBox>().eq(PayBox::getName, payBoxName));
+        long count = super.count(new LambdaQueryWrapper<PayBox>().eq(PayBox::getName, payBoxName));
         if (count > 0) {
             throw new BaseException("支付盒子名称已经存在");
         }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleMailRecordServiceImpl.java

@@ -131,7 +131,7 @@ public class RoleMailRecordServiceImpl extends ServiceImpl<RoleMailRecordMapper,
     }
 
     private boolean hasMai(Long gameId, String serverId, Long userId, String roleId) {
-        int count = count(new LambdaQueryWrapper<RoleMailRecord>()
+        long count = count(new LambdaQueryWrapper<RoleMailRecord>()
                 .eq(RoleMailRecord::getGameId, gameId)
                 .eq(RoleMailRecord::getServerId, serverId)
                 .eq(RoleMailRecord::getUserId, userId)

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/utils/FileUtil.java

@@ -1,17 +1,13 @@
 package com.zanxiang.game.module.manage.utils;
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.springframework.lang.NonNull;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.file.Files;
 
 /**
  * @author : lingfeng
@@ -20,18 +16,6 @@ import java.net.URL;
  */
 public class FileUtil {
 
-    /**
-     * 网络url转MultipartFile
-     *
-     * @param url : 网络资源url
-     * @return {@link MultipartFile}
-     */
-    public static MultipartFile urlToMultipartFile(String url) {
-        byte[] bytes = downloadResources(url);
-        String name = "mediaFile" + url.substring(url.lastIndexOf("."));
-        return getMultipartFile(name, bytes);
-    }
-
     /**
      * 下载资源
      *
@@ -64,27 +48,90 @@ public class FileUtil {
         return null;
     }
 
+
     /**
-     * 得到多部分文件
-     *
-     * @param name  名字
-     * @param bytes 字节
-     * @return {@link MultipartFile}
+     * 网络url转MultipartFile
      */
-    private static MultipartFile getMultipartFile(String name, byte[] bytes) {
-        MultipartFile multipartFile = null;
-        ByteArrayInputStream in;
-        try {
-            in = new ByteArrayInputStream(bytes);
-            FileItemFactory factory = new DiskFileItemFactory(16, null);
-            FileItem fileItem = factory.createItem("mainFile", "text/plain", false, name);
-            IOUtils.copy(new ByteArrayInputStream(bytes), fileItem.getOutputStream());
-            multipartFile = new CommonsMultipartFile(fileItem);
-            in.close();
-        } catch (Exception e) {
-            e.printStackTrace();
+    public static MultipartFile urlToMultipartFile(String url) {
+        byte[] bytes = downloadResources(url); // 假设这是你现有的下载方法
+
+        // 简单的文件名截取，建议加个校验防止url不带后缀报错
+        String extension = url.contains(".") ? url.substring(url.lastIndexOf(".")) : ".tmp";
+        String name = "mediaFile" + extension;
+
+        // 自动探测类型，如果不需要太精确，用 "application/octet-stream" 代替 "text/plain" 更通用
+        String contentType = "application/octet-stream";
+
+        return getMultipartFile(name, bytes, contentType);
+    }
+
+    /**
+     * 得到多部分文件 (重构版)
+     */
+    private static MultipartFile getMultipartFile(String name, byte[] bytes, String contentType) {
+        // 直接返回自定义实现，无需 try-catch，无需 Commons IO
+        return new ByteArrayMultipartFile("mainFile", name, contentType, bytes);
+    }
+
+
+    private static class ByteArrayMultipartFile implements MultipartFile {
+        private final String name;
+        private final String originalFilename;
+        private final String contentType;
+        private final byte[] content;
+
+        public ByteArrayMultipartFile(String name, String originalFilename, String contentType, byte[] content) {
+            this.name = name;
+            this.originalFilename = originalFilename;
+            this.contentType = contentType;
+            this.content = (content != null) ? content : new byte[0];
+        }
+
+        @Override
+        @NonNull
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        @NonNull
+        public String getOriginalFilename() {
+            return originalFilename;
+        }
+
+        @Override
+        public String getContentType() {
+            return contentType;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return content.length == 0;
+        }
+
+        @Override
+        public long getSize() {
+            return content.length;
+        }
+
+        @Override
+        @NonNull
+        public byte[] getBytes() {
+            return content;
+        }
+
+        @Override
+        @NonNull
+        public InputStream getInputStream() {
+            return new ByteArrayInputStream(content);
+        }
+
+        @Override
+        public void transferTo(@NonNull File dest) throws IOException, IllegalStateException {
+            try (OutputStream out = Files.newOutputStream(dest.toPath())) {
+                out.write(content);
+            }
         }
-        return multipartFile;
     }
 
 

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/adapter/ArgumentAdapter.java

@@ -21,7 +21,7 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/adapter/WebHandlerAdapter.java

@@ -17,8 +17,8 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Objects;
 
 /**

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/AppletController.java

@@ -19,8 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/LoginController.java

@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/PayController.java

@@ -17,8 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/PushController.java

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/UserController.java

@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IGameAppletShellService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.mybatis.entity.GameAppletShell;
 import com.zanxiang.game.module.mybatis.entity.User;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IGameShellLogService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.mybatis.entity.GameShellLog;
 import com.zanxiang.game.module.sdk.pojo.param.GameShellLogParam;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IOrderPayService.java

@@ -5,8 +5,8 @@ import com.zanxiang.game.module.sdk.pojo.param.UserData;
 import com.zanxiang.game.module.sdk.pojo.vo.PayParamVO;
 import com.zanxiang.game.module.sdk.pojo.vo.SessionCheckVO;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IPayApplicationService.java

@@ -6,8 +6,8 @@ import com.zanxiang.game.module.sdk.pojo.dto.PayApplicationDTO;
 import com.zanxiang.game.module.sdk.pojo.param.MiniAppPayParam;
 import com.zanxiang.module.util.pojo.ResultVO;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IRegisterLoginService.java

@@ -8,7 +8,7 @@ import com.zanxiang.game.module.sdk.pojo.param.UserData;
 import com.zanxiang.game.module.sdk.pojo.vo.UserLoginVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/IUserVisitLogService.java

@@ -3,7 +3,7 @@ package com.zanxiang.game.module.sdk.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.mybatis.entity.UserVisitLog;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * @author : lingfeng

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameAppletShellServiceImpl.java

@@ -23,7 +23,7 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameShellLogServiceImpl.java

@@ -9,7 +9,7 @@ import com.zanxiang.module.web.util.IpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -35,7 +35,7 @@ import reactor.util.function.Tuple2;
 import reactor.util.function.Tuple3;
 import reactor.util.function.Tuples;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.Objects;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/OrderPayServiceImpl.java

@@ -34,8 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PayApplicationServiceImpl.java

@@ -38,8 +38,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserServiceImpl.java

@@ -146,7 +146,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return ResultVO.fail(HttpStatusEnum.PHONE_IS_BIND.getMsg());
         }
         //校验手机号是否已经绑定了其他账号
-        int count = super.count(new LambdaQueryWrapper<User>()
+        long count = super.count(new LambdaQueryWrapper<User>()
                 .eq(User::getGameId, userData.getGameId())
                 .eq(User::getMobile, mobile));
         if (count > 0) {

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserVisitLogServiceImpl.java

@@ -14,7 +14,7 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.util.Collections;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/AliPayService.java

@@ -31,8 +31,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.URL;
 import java.time.LocalDateTime;
 import java.util.*;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/MiPayService.java

@@ -27,8 +27,8 @@ import reactor.util.function.Tuples;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/PayBaseService.java

@@ -21,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Lazy;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/WxPayService.java

@@ -24,8 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/pojo/dto/PlatformDeYangOrderDTO.java

@@ -1,9 +1,8 @@
 package com.zanxiang.game.platform.serve.pojo.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author : lingfeng
  * @time : 2023-05-22

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/pojo/req/PlatformSyncRequest.java

@@ -1,11 +1,10 @@
 package com.zanxiang.game.platform.serve.pojo.req;
 
 import com.zanxiang.game.platform.serve.enums.GamePlatformEnum;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;