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

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

@@ -107,7 +107,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         //渠道id
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
-        if (SecurityUtil.isManager() && param.getChannelId() != null) {
+        if (SecurityUtil.isManager() && param.getChannelId() == null) {
             agentIdList.add(Agent.DEFAULT_AGENT);
         }
         //玩家条件处理

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

@@ -72,7 +72,7 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
         if (SecurityUtil.isManager() && Strings.isBlank(param.getAccountId())
-                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() != null) {
+                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() == null) {
             agentIdList.add(Agent.DEFAULT_AGENT);
         }
         //玩家条件处理

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

@@ -104,7 +104,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         List<Long> agentIds = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
         if (SecurityUtil.isManager() && Strings.isBlank(param.getAccountId())
-                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() != null) {
+                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() == null) {
             agentIds.add(Agent.DEFAULT_AGENT);
         }
         //查询用户id和名字条件

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

@@ -79,7 +79,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
         if (SecurityUtil.isManager() && Strings.isBlank(param.getAccountId())
-                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() != null) {
+                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() == null) {
             agentIdList.add(Agent.DEFAULT_AGENT);
         }
         Map<Long, CpDTO> cpMap = cpService.cpMap();

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

@@ -98,10 +98,19 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
 
     @Override
     public Boolean userTokenExpireTimeCheck(UserData userData) {
+        log.error("缓存token验证请求 userData : {}", JsonUtil.toString(userData));
         //判断是否存在用户id或者token是否存在
         if (userData.getUserId() == null || Strings.isBlank(userData.getToken())) {
             return Boolean.FALSE;
         }
+        //判断token在数据库是否存在
+        UserToken userToken = super.getOne(new LambdaQueryWrapper<UserToken>()
+                .eq(UserToken::getToken, userData.getToken())
+                .eq(UserToken::getDeviceType, userData.getDeviceType()));
+        //token已经更新, 返回失效
+        if (userToken == null) {
+            return Boolean.FALSE;
+        }
         //判断是否ip封禁
         if (ipBanService.checkIpBan(userData.getIp())) {
             return Boolean.FALSE;