diff --git a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java index 59c8e4e93..7301817d2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java @@ -272,8 +272,7 @@ public class ChatLogic { private void checkSaveUser(User user) throws Exception { ArenaOfUser query = CrossServiceLogic.getInstance().query(user.getId()); if (query == null){ - ArenaOfUser arenaOfUser = CrossServiceLogic.getInstance().buildArenaOfUser(user); - CrossServiceLogic.getInstance().insert(arenaOfUser); + CrossServiceLogic.getInstance().dispose(user); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java index 66f9c0794..a66da4b4d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java @@ -254,9 +254,15 @@ public class GlobleSystemLogic implements IEventHandler { redisUtil.putMapEntrys(RedisKey.SERVER_SPLIT_INFO,"",split); //发分组邮件 split.keySet().forEach(server->redisUtil.putMapEntry(RedisKey.SERVER_SPLIT_MAIL_INFO,"",server,0)); + //清除分组聊天记录 + for(int i=1;i<=areaId;i++){ + redisUtil.del(RedisKey.CHAT_CROSS_INFO_CACHE+i); + redisUtil.del(RedisKey.CHAT_CROSS_MSG_ID+i); + } //释放分布式锁 redisUtil.del("SERVER_SPLIT_REDIS_LOCK"); + LOGGER.info("跨服分组结束"); // splitInfo = RedisUtil.getInstence().getMapValues(RedisKey.SERVER_SPLIT_INFO,"",String.class,Integer.class); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index df6bf3679..d86d397ff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2974,7 +2974,11 @@ public class HeroLogic{ public int calTeamTotalForce(User targetUser,int teamId,boolean isMyself){ int totalForce =0; targetUser.getTeamPosManager().setCurTeamPosId(teamId); - List teamPosHeroInfoList = targetUser.getTeamPosManager().getTeamPosForHero().get(teamId); + Map> teamPosForHero = targetUser.getTeamPosManager().getTeamPosForHero(); + if(teamPosForHero==null||teamPosForHero.size()<=0){ + return totalForce; + } + List teamPosHeroInfoList = teamPosForHero.get(teamId); if(teamPosHeroInfoList == null || teamPosHeroInfoList.isEmpty()){ return totalForce; }