Merge branch 'package' of GameCenter/game-center into dev

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交1300･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (发码器代码完成提交2100･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/handler/GlobalExceptionHandler.java

@@ -35,10 +35,19 @@ public class GlobalExceptionHandler {
     }
 
     /**
-     * 断言判断异常
+     * 断言参数判断异常
      */
-    @ExceptionHandler(AssertionError.class)
-    public ResultVO<?> assertionError(AssertionError e) {
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResultVO<?> assertArgumentError(IllegalArgumentException e) {
+        log.error(e.getMessage(), e);
+        return ResultVO.fail(e.getMessage());
+    }
+
+    /**
+     * 断言状态判断异常
+     */
+    @ExceptionHandler(IllegalStateException.class)
+    public ResultVO<?> assertStateError(IllegalStateException e) {
         log.error(e.getMessage(), e);
         return ResultVO.fail(e.getMessage());
     }

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

@@ -20,7 +20,7 @@ public interface IRoleOperateService extends IService<RoleOperate> {
      *
      * @param gameGiftPackLinkLog : 发码器访问记录
      */
-    void roleOperateUpdate(GameGiftPackLinkLog gameGiftPackLinkLog);
+    void roleOperateUpdate(String userPhone, GameGiftPackLinkLog gameGiftPackLinkLog);
 
     /**
      * 玩家是否加企微

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

@@ -21,11 +21,13 @@ import com.zanxiang.module.redis.service.IDistributedLockComponent;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.util.Assert;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -41,6 +43,7 @@ import java.util.stream.Collectors;
  * @time : 2022-06-22
  * @description : 游戏礼包码领取日志
  */
+@Slf4j
 @Service
 public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCodeLogMapper, GameGiftPackCodeLog> implements IGameGiftPackCodeLogService {
 
@@ -56,9 +59,6 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
     @Autowired
     private RedisUtil<String> redisUtil;
 
-    @Autowired
-    private IGameServerService gameServerService;
-
     @Autowired
     private IRoleOperateService roleOperateService;
 
@@ -116,11 +116,11 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
             throw new BaseException("操作频繁, 请稍后重试");
         }
         GameGiftPackLinkLog gameGiftPackLinkLog = gameGiftPackLinkLogService.getById(linkId);
-        assert gameGiftPackLinkLog != null : "参数错误, 链接访问日志信息不存在";
+        Assert.notNull(gameGiftPackLinkLog, "参数错误, 链接访问日志信息不存在");
         //判断验证是通过的
         Long userId = gameGiftPackLinkLog.getUserId();
-        assert StringUtils.isNoneBlank(userId == null ? null : userId.toString(), gameGiftPackLinkLog.getServerId(),
-                gameGiftPackLinkLog.getRoleId(), gameGiftPackLinkLog.getRoleName()) : "参数错误, 链接访问记录信息缺失";
+        Assert.state(StringUtils.isNoneBlank(userId == null ? null : userId.toString(), gameGiftPackLinkLog.getServerId(),
+                gameGiftPackLinkLog.getRoleId(), gameGiftPackLinkLog.getRoleName()), "参数错误, 链接访问记录信息缺失");
         //获取礼包码, 且执行释放锁动作
         try {
             return this.getRandomCode(randomCode, userPhone, gameGiftPackLinkLog);
@@ -138,7 +138,7 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
             return Tuple2.with(Boolean.TRUE, repeatCheck.second);
         }
         //异步更新角色操作表
-        roleOperateService.roleOperateUpdate(linkLog);
+        roleOperateService.roleOperateUpdate(userPhone, linkLog);
         //构造记录
         GameGiftPackCodeLog gameGiftPackCodeLog = this.transform(linkLog, userPhone);
         //从缓存中获取一个礼包码id, 如果缓存中不存在则是领完了
@@ -151,7 +151,7 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
         }
         //查询礼包码具体信息, 礼包码必须存在, 且未被领取, 否则数据错误
         GameGiftPackCode gameGiftPackCode = gameGiftPackCodeService.getById(Long.valueOf(codeId));
-        assert gameGiftPackCode != null && !gameGiftPackCode.getIsSend() : "礼包码数据错误, 请联系客服小姐姐处理";
+        Assert.notNull(gameGiftPackCode, "礼包码数据错误, 请联系客服小姐姐处理");
         //判断是否满足领取条件
         Tuple2<Boolean, String> conditionCheck = this.conditionCheck(linkLog);
         //设置判定消息
@@ -213,7 +213,7 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
 
     private Tuple2<Boolean, String> conditionCheck(GameGiftPackLinkLog gameGiftPackLinkLog) {
         GameGiftPackLink giftPackLink = gameGiftPackLinkService.getById(gameGiftPackLinkLog.getLinkId());
-        assert giftPackLink != null : "参数错误, 礼包链接信息不存在";
+        Assert.notNull(giftPackLink, "参数错误, 礼包链接信息不存在");
         String codeCheck = giftPackLink.getCodeCheck();
         if (Strings.isBlank(codeCheck)) {
             return Tuple2.with(Boolean.TRUE, "领取成功, 礼包码领取条件 - 不存在");

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

@@ -22,16 +22,21 @@ import com.zanxiang.game.module.mybatis.entity.GameGiftPackLink;
 import com.zanxiang.game.module.mybatis.mapper.GameGiftPackCodeMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -40,6 +45,7 @@ import java.util.stream.Stream;
  * @time : 2022-06-22
  * @description : 游戏礼包码
  */
+@Slf4j
 @Service
 public class GameGiftPackCodeServiceImpl extends ServiceImpl<GameGiftPackCodeMapper, GameGiftPackCode> implements IGameGiftPackCodeService {
 
@@ -96,7 +102,7 @@ public class GameGiftPackCodeServiceImpl extends ServiceImpl<GameGiftPackCodeMap
                 .eq(GameGiftPackLink::getGameId, param.getGameId())
         );
         //礼包码链接信息不可为空
-        assert gameGiftPackLink != null : "参数错误, 礼包码链接信息不存在";
+        Assert.notNull(gameGiftPackLink, "参数错误, 礼包码链接信息不存在");
         //判断已存在的礼包码
         List<String> existCodeList = super.list(new LambdaQueryWrapper<GameGiftPackCode>()
                 .select(GameGiftPackCode::getCode)
@@ -110,7 +116,7 @@ public class GameGiftPackCodeServiceImpl extends ServiceImpl<GameGiftPackCodeMap
                 .filter(code -> !existCodeList.contains(code))
                 .map(code -> this.transform(param, code))
                 .collect(Collectors.toList());
-        assert CollectionUtils.isNotEmpty(saveList) : "参数错误, 礼包码已存在, 禁止重复添加";
+        Assert.state(CollectionUtils.isNotEmpty(saveList), "参数错误, 礼包码已存在, 禁止重复添加");
         //保存返回
         super.saveBatch(saveList);
         //将礼包码主键添加到缓存
@@ -137,15 +143,14 @@ public class GameGiftPackCodeServiceImpl extends ServiceImpl<GameGiftPackCodeMap
     @Override
     public boolean updateGiftPackCode(GameGiftPackCodeUpdateParam param) {
         String giftPackCodeKey = RedisKeyConstant.GAME_GIFT_PACK_CODE + param.getLinkId();
-        String[] giftPackCodeIdArray = param.getIds().stream()
+        List<Long> giftPackCodeIdList = param.getIds().stream()
                 .filter(id -> redisUtil.isMemberInSet(giftPackCodeKey, String.valueOf(id)))
-                .map(Object::toString)
-                .toArray(String[]::new);
+                .collect(Collectors.toList());
         //不存在缓存队列中, 不可以删除
-        assert giftPackCodeIdArray.length != 0 : "缓存队列中不存在可删除的礼包码";
+        Assert.notEmpty(giftPackCodeIdList, "缓存队列中不存在可删除的礼包码");
         //先从缓存中移除
-        redisUtil.removeOfSet(giftPackCodeKey, giftPackCodeIdArray);
-        List<Long> giftPackCodeIdList = Arrays.stream(giftPackCodeIdArray).map(Long::parseLong).collect(Collectors.toList());
+        redisUtil.removeOfSet(giftPackCodeKey, giftPackCodeIdList.stream().map(String::valueOf).toArray(String[]::new));
+        //更新数据库
         return super.update(new LambdaUpdateWrapper<GameGiftPackCode>()
                 .set(GameGiftPackCode::getEnabled, Boolean.FALSE)
                 .set(GameGiftPackCode::getUpdateBy, SecurityUtil.getUserId())

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

@@ -19,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import java.net.URLDecoder;
 import java.time.LocalDateTime;
@@ -81,7 +82,7 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
     public Map<String, String> getSourceGameServerByLinkId(Long linkId) {
         //查询访问日志
         GameGiftPackLink giftPackLink = gameGiftPackLinkService.getById(linkId);
-        assert giftPackLink != null : "参数错误, 链接信息不存在";
+        Assert.notNull(giftPackLink, "参数错误, 链接信息不存在");
         return this.getSourceGameServerByGameId(giftPackLink.getGameId());
     }
 
@@ -89,14 +90,14 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
     public Map<String, String> getSourceGameServerByLinkLogId(Long linkLogId) {
         //查询访问日志
         GameGiftPackLinkLog gameGiftPackLinkLog = super.getById(linkLogId);
-        assert gameGiftPackLinkLog != null : "参数错误, 链接访问日志信息不存在";
+        Assert.notNull(gameGiftPackLinkLog, "参数错误, 链接访问日志信息不存在");
         return this.getSourceGameServerByGameId(gameGiftPackLinkLog.getGameId());
     }
 
     private Map<String, String> getSourceGameServerByGameId(Long gameId) {
         //查询游戏信息
         GameDTO gameDTO = gameService.getById(gameId);
-        assert gameDTO != null : "参数错误, 游戏信息不存在";
+        Assert.notNull(gameDTO, "参数错误, 游戏信息不存在");
         //查询区服信息
         return gameServerService.list(new LambdaQueryWrapper<GameServer>()
                 .eq(GameServer::getGameId, gameDTO.getSuperGameId())
@@ -108,7 +109,7 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
     public Map<String, Object> gameUserRoleCheck(Long linkLogId, String serverId, String roleName) {
         //查询访问日志
         GameGiftPackLinkLog gameGiftPackLinkLog = super.getById(linkLogId);
-        assert gameGiftPackLinkLog != null : "参数错误, 链接访问日志信息不存在";
+        Assert.notNull(gameGiftPackLinkLog, "参数错误, 链接访问日志信息不存在");
         //构造返回结果
         Map<String, Object> resultMap = new HashMap<>();
         //查询角色
@@ -157,14 +158,14 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
         String corpUserId = urlParameter.get("corpUserId");
         String externalUserId = urlParameter.get("externalUserId");
         //参数判断
-        if (StringUtils.isAnyEmpty(linkUrl, gameId, codeType, corpId, corpUserId, externalUserId)) {
+        if (StringUtils.isAnyEmpty(linkUrl, gameId, codeType)) {
             throw new BaseException("非法链接请求, 链接参数解析异常");
         }
         //查询链接信息
         GameGiftPackLink gameGiftPackLink = gameGiftPackLinkService.getOne(new LambdaQueryWrapper<GameGiftPackLink>()
                 .eq(GameGiftPackLink::getGameId, Long.valueOf(gameId))
                 .eq(GameGiftPackLink::getCodeType, codeType));
-        assert gameGiftPackLink != null : "非法链接请求, 链接信息不存在";
+        Assert.notNull(gameGiftPackLink, "非法链接请求, 礼包链接信息不存在");
         //构造
         GameGiftPackLinkLog gameGiftPackLinkLog = this.transform(gameGiftPackLink, linkUrl, corpId, corpUserId, externalUserId);
         super.save(gameGiftPackLinkLog);

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

@@ -36,6 +36,7 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -146,11 +147,11 @@ public class GameGiftPackLinkServiceImpl extends ServiceImpl<GameGiftPackLinkMap
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteById(Long id) {
         //链接里存在可用的未被领取的礼包码, 禁止删除
-        assert gameGiftPackCodeService.count(new LambdaUpdateWrapper<GameGiftPackCode>()
+        Assert.state(gameGiftPackCodeService.count(new LambdaUpdateWrapper<GameGiftPackCode>()
                 .eq(GameGiftPackCode::getLinkId, id)
                 .eq(GameGiftPackCode::getEnabled, Boolean.TRUE)
                 .eq(GameGiftPackCode::getIsSend, Boolean.FALSE)
-        ) <= 0 : "礼包码链接中存在未被领取的礼包码, 禁止删除";
+        ) <= 0, "礼包码链接中存在未被领取的礼包码, 禁止删除");
         //删除链接
         super.update(new LambdaUpdateWrapper<GameGiftPackLink>()
                 .set(GameGiftPackLink::getIsDelete, DeleteEnum.YES.getCode())
@@ -166,21 +167,21 @@ public class GameGiftPackLinkServiceImpl extends ServiceImpl<GameGiftPackLinkMap
     @Transactional(rollbackFor = Exception.class)
     public boolean addGiftPackLink(GameGiftPackLinkAddParam param) {
         //判断该游戏该类型是否已经存在礼包链接
-        assert super.count(new LambdaQueryWrapper<GameGiftPackLink>()
+        Assert.state(super.count(new LambdaQueryWrapper<GameGiftPackLink>()
                 .eq(GameGiftPackLink::getGameId, param.getGameId())
                 .eq(GameGiftPackLink::getCodeType, param.getCodeType())
-        ) <= 0 : "该游戏已经存在此类型礼包码链接, 请勿重复添加";
+        ) <= 0, "该游戏已经存在此类型礼包码链接, 请勿重复添加");
         //查询超父游戏id
         GameDTO gameDTO = gameService.getById(param.getGameId());
         //游戏不可以为空
-        assert gameDTO != null : "参数错误, 游戏信息不存在";
+        Assert.notNull(gameDTO, "参数错误, 游戏信息不存在");
         //查询配置
         GameGiftPackConfig giftPackConfig = gameGiftPackConfigService.getOne(new LambdaQueryWrapper<GameGiftPackConfig>()
                 .eq(GameGiftPackConfig::getSuperGameId, gameDTO.getSuperGameId()));
         //礼包码配置不可为空
-        assert giftPackConfig.getGameIdList().contains(param.getGameId()) : "参数错误, 游戏礼包码配置不存在";
+        Assert.state(giftPackConfig.getGameIdList().contains(param.getGameId()), "参数错误, 游戏礼包码配置不存在");
         //链接域名必须存在
-        assert Strings.isNotBlank(giftPackConfig.getCodeLinkHost()) : "数据错误, 配置链接域名不可为空";
+        Assert.state(Strings.isNotBlank(giftPackConfig.getCodeLinkHost()), "数据错误, 配置链接域名不可为空");
         //礼包码链接
         String codeLink = giftPackConfig.getCodeLinkHost() + "?gameId=" + param.getGameId() + "&codeType=" + param.getCodeType();
         //保存且返回结果

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

@@ -8,6 +8,8 @@ import com.zanxiang.game.module.manage.service.IRoleOperateService;
 import com.zanxiang.game.module.mybatis.entity.GameGiftPackLinkLog;
 import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 import com.zanxiang.game.module.mybatis.mapper.RoleOperateMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,27 +31,36 @@ public class RoleOperateServiceImpl extends ServiceImpl<RoleOperateMapper, RoleO
 
     @Async
     @Override
-    public void roleOperateUpdate(GameGiftPackLinkLog gameGiftPackLinkLog) {
+    public void roleOperateUpdate(String userPhone, GameGiftPackLinkLog gameGiftPackLinkLog) {
         RoleOperate roleOperate = super.getOne(new LambdaQueryWrapper<RoleOperate>()
                 .eq(RoleOperate::getGameId, gameGiftPackLinkLog.getGameId())
                 .eq(RoleOperate::getServerId, gameGiftPackLinkLog.getServerId())
                 .eq(RoleOperate::getUserId, gameGiftPackLinkLog.getUserId())
                 .eq(RoleOperate::getRoleId, gameGiftPackLinkLog.getRoleId()));
+        //不存在数据, 直接保存
         if (roleOperate == null) {
-            roleOperate = this.transform(gameGiftPackLinkLog);
-        } else {
+            super.save(this.transform(userPhone, gameGiftPackLinkLog));
+            return;
+        }
+        //更新玩家企微信息
+        if (StringUtils.isNoneBlank(gameGiftPackLinkLog.getCorpId(), gameGiftPackLinkLog.getExternalUserId(), gameGiftPackLinkLog.getCorpUserId())
+                && StringUtils.isAllBlank(roleOperate.getCorpId(), roleOperate.getExternalUserId(), roleOperate.getAddCorpUserId())) {
             roleOperate.setCorpId(gameGiftPackLinkLog.getCorpId());
             roleOperate.setExternalUserId(gameGiftPackLinkLog.getExternalUserId());
             roleOperate.setAddCorpUserId(gameGiftPackLinkLog.getCorpUserId());
             roleOperate.setIsAddCorpWechat(1);
-            roleOperate.setUpdateBy(RoleOperate.SYSTEM_OPERATE);
-            roleOperate.setUpdateTime(LocalDateTime.now());
         }
-        super.saveOrUpdate(roleOperate);
+        //更新玩家手机号
+        if (Strings.isNotBlank(userPhone) && Strings.isBlank(roleOperate.getUserPhone())) {
+            roleOperate.setUserPhone(userPhone);
+        }
+        roleOperate.setUpdateBy(RoleOperate.SYSTEM_OPERATE);
+        roleOperate.setUpdateTime(LocalDateTime.now());
+        super.updateById(roleOperate);
     }
 
-    private RoleOperate transform(GameGiftPackLinkLog gameGiftPackLinkLog) {
-        return RoleOperate.builder()
+    private RoleOperate transform(String userPhone, GameGiftPackLinkLog gameGiftPackLinkLog) {
+        RoleOperate roleOperate = RoleOperate.builder()
                 .gameId(gameGiftPackLinkLog.getGameId())
                 .serverId(gameGiftPackLinkLog.getServerId())
                 .userId(gameGiftPackLinkLog.getUserId())
@@ -57,12 +68,16 @@ public class RoleOperateServiceImpl extends ServiceImpl<RoleOperateMapper, RoleO
                 .corpId(gameGiftPackLinkLog.getCorpId())
                 .externalUserId(gameGiftPackLinkLog.getExternalUserId())
                 .addCorpUserId(gameGiftPackLinkLog.getCorpUserId())
-                .isAddCorpWechat(1)
+                .userPhone(userPhone)
                 .createBy(RoleOperate.SYSTEM_OPERATE)
                 .createTime(LocalDateTime.now())
                 .updateBy(RoleOperate.SYSTEM_OPERATE)
                 .updateTime(LocalDateTime.now())
                 .build();
+        if (StringUtils.isNoneBlank(roleOperate.getCorpId(), roleOperate.getExternalUserId(), roleOperate.getAddCorpUserId())) {
+            roleOperate.setIsAddCorpWechat(1);
+        }
+        return roleOperate;
     }
 
     @Override

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

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -34,7 +35,7 @@ public class SmsServiceImpl implements ISmsService {
     public boolean randomCodeSend(String phoneNumber) {
         //判断是否已经发送
         String smsKey = RedisKeyConstant.SMS_PHONE_KEY + "_" + phoneNumber;
-        assert Strings.isBlank(redisUtil.getCache(smsKey)) : "验证码已发送请稍后再试";
+        Assert.state(Strings.isBlank(redisUtil.getCache(smsKey)), "验证码已发送请稍后再试");
         //发送验证码
         String randomCode = RandomUtil.randomNumbers(4);
         //发送短信验证码
@@ -49,19 +50,19 @@ public class SmsServiceImpl implements ISmsService {
         //获取缓存中的验证码
         String cache = redisUtil.getCache(smsKey);
         //验证码已过期
-        assert Strings.isNotBlank(cache) : "验证码已过期";
+        Assert.state(Strings.isNotBlank(cache), "验证码已过期");
         //验证码错误
-        assert Objects.equals(cache, randomCode) : "验证码错误";
+        Assert.state(Objects.equals(cache, randomCode), "验证码错误");
         //验证成功, 删除缓存
         return redisUtil.deleteCache(smsKey);
     }
 
     private void smsSendApi(String content, String phoneNumber) {
         //验证手机号
-        assert Pattern.matches("^1[3-9]\\d{9}$", phoneNumber) : "手机号格式错误";
+        Assert.state(Pattern.matches("^1[3-9]\\d{9}$", phoneNumber), "手机号格式错误");
         //发送短信
         SendResult sendResult = aliSmsService.sendCode(content, phoneNumber);
         //发送结果判断
-        assert sendResult.isSuccess() : "验证码发送失败";
+        Assert.state(sendResult.isSuccess(), "验证码发送失败");
     }
 }