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

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <解决线上BUg> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <解决线上BUg01> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -68,8 +68,10 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
             log.error("token验证失败 , 游戏拓展信息不存在, appId : {}, userId : {}", appId, userId);
             return ResultVO.fail(TokenCheckEnum.PARAM_LACK.getMsg());
         }
+        //用户信息
+        User user = userService.getById(userId);
         //获取检测token
-        UserToken userToken = this.getCheckUserToken(userId, token);
+        UserToken userToken = this.getCheckUserToken(userId, token, user.getRelationUserId());
         //判断token是否存在, 并且没有过期
         if (userToken == null || userToken.getExpireTime() < DateUtils.localDateTimeToSecond(LocalDateTime.now())) {
             log.error("token验证失败 , token不存在或者已经失效, appId : {}, userId : {}, token : {}", appId, userId, token);
@@ -85,7 +87,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         //构造返回
         return ResultVO.ok(CpTokenCheckVO.builder()
                 .userId(userId)
-                .appId(gameExt.getAppId())
+                .appId(gameExtService.getByGameId(user.getGameId()).getAppId())
                 .build());
     }
 
@@ -97,8 +99,10 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
             log.error("token验证失败 , 游戏拓展信息不存在, appId : {}, userId : {}", appId, userId);
             return ResultVO.fail(TokenCheckEnum.PARAM_LACK.getMsg());
         }
+        //用户信息
+        User user = userService.getById(userId);
         //获取检测token
-        UserToken userToken = this.getCheckUserToken(userId, token);
+        UserToken userToken = this.getCheckUserToken(userId, token, user.getRelationUserId());
         //判断token是否存在, 并且没有过期
         if (userToken == null || userToken.getExpireTime() < DateUtils.localDateTimeToSecond(LocalDateTime.now())) {
             log.error("token验证失败 , token不存在或者已经失效, appId : {}, userId : {}, token : {}", appId, userId, token);
@@ -131,13 +135,11 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         return Tuples.of(sb.toString(), mySign);
     }
 
-    private UserToken getCheckUserToken(Long userId, String token) {
-        //用户信息
-        User user = userService.getById(userId);
+    private UserToken getCheckUserToken(Long userId, String token, Long relationUserId) {
         //查询token是否存在
         UserToken userToken = super.getOne(new LambdaQueryWrapper<UserToken>()
                 .eq(UserToken::getToken, token)
-                .eq(user.getRelationUserId() == null, UserToken::getUserId, userId));
+                .eq(relationUserId == null, UserToken::getUserId, userId));
         //非导量玩家
         if (Objects.equals(userToken.getUserId(), userId)) {
             return userToken;