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

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

@@ -139,14 +139,17 @@ public class LoginServiceImpl implements IRegisterLoginService {
         String password = param.getPassword();
         //用户信息
         User user;
+        log.error("登录参数 param : {}, userData : {}", JsonUtil.toString(param), JsonUtil.toString(userData));
         //登录, 进行登录检测
         if (Objects.equals(param.getType(), LoginPasswordParam.LOGIN)) {
             //判断是否手机号
             if (RegexUtil.checkPhone(username)) {
+                log.error("手机登录, username : {}", username);
                 user = userService.getOne(new LambdaQueryWrapper<User>()
                         .eq(User::getGameId, userData.getGameId()).eq(User::getMobile, username));
             } else {
                 //根据用户名查询
+                log.error("账号登录, username : {}", username);
                 user = userService.getOne(new LambdaQueryWrapper<User>()
                         .eq(User::getGameId, userData.getGameId()).eq(User::getUsername, username));
             }
@@ -173,7 +176,8 @@ public class LoginServiceImpl implements IRegisterLoginService {
             return ResultVO.fail(checkRegisterEnum.getMsg());
         }
         //用户注册
-        user = userCreateSave(userData, username, password, null, null, null, null);
+        user = userCreateSave(userData, username, RegisterUtil.cmfPassword(password), null, null,
+                null, null);
         //返回登录信息
         return ResultVO.ok(this.createUserLoginVO(user, userData));
     }

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

@@ -78,6 +78,10 @@ public class PerformOrderServiceImpl implements IPerformOrderService {
         }
         GameExt gameExt = gameExtService.getByGameId(orderInfo.getGameId());
         String cpPaybackUrl = gameExt.getPayCallBackUrl();
+        if (Strings.isBlank(cpPaybackUrl)) {
+            log.error("充值回调CP失败, 游戏拓展信息中的回调地址为空!");
+            return false;
+        }
         //回调CP
         Map<String, String> map = new HashMap<>(9);
         map.put("userId", String.valueOf(orderInfo.getUserId()));

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

@@ -59,6 +59,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         //查询登录签名
         GameExt gameExt = gameExtService.getByGameAppId(appId);
         if (gameExt == null || Strings.isBlank(gameExt.getLoginKey())) {
+            log.error("token验证失败 , 游戏拓展信息不存在!");
             return ResultVO.fail(TokenCheckEnum.PARAM_LACK.getMsg());
         }
         //查询token是否存在
@@ -67,6 +68,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
                 .eq(UserToken::getUserId, userId));
         //判断token是否存在, 并且没有过期
         if (userToken == null || userToken.getExpireTime() < DateUtils.localDateTimeToSecond(LocalDateTime.now())) {
+            log.error("token验证失败 , token不存在或者已经失效!");
             return ResultVO.fail(TokenCheckEnum.SIGN_ERROR.getMsg());
         }
         //登录密钥
@@ -86,14 +88,11 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         }
         //签名错误
         if (!Objects.equals(mySign, sign)) {
-            log.error("token验证失败 , sb : {}, mySign : {}, sign : {}", sb.toString(), mySign, sign);
+            log.error("token验证失败 , str : {}, mySign : {}, sign : {}", sb.toString(), mySign, sign);
             return ResultVO.fail(TokenCheckEnum.CHECK_FAIL.getMsg());
         }
-        log.error("token验证成功, sb : {}, mySign : {}, sign : {}", sb.toString(), mySign, sign);
-
         ResultVO<Long> re = ResultVO.ok(userId);
-
-        log.error("token验证返回接过 re : {}", JsonUtil.toString(re));
+        log.error("token验证成功, str : {}, mySign : {}, sign : {}, re : {}", sb.toString(), mySign, sign, JsonUtil.toString(re));
         return re;
     }