diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 44db6b3ec..c5a53ad10 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2203,7 +2203,7 @@ public class MapLogic { String value = item.getValue(); int score = item.getScore().intValue(); int uidTmp = Integer.parseInt(value); - User userTmp = UserManager.getUser(uidTmp); + User userTmp = UserManager.getUser(uidTmp, true); if (null == userTmp) { continue; } @@ -2992,7 +2992,7 @@ public class MapLogic { int data = next.getScore().intValue(); int tower = TowerRankUtil.getTowerAndTime(data)[0]; int time = TowerRankUtil.getTowerAndTime(data)[1]; - User everyUser = UserManager.getUser(Integer.parseInt(next.getValue())); + User everyUser = UserManager.getUser(Integer.parseInt(next.getValue()), true); if (null == everyUser) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java index ace78ff9b..5ff36c72d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/GetMonsterAttackRankHandler.java @@ -38,7 +38,7 @@ public class GetMonsterAttackRankHandler extends BaseHandler>40); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid,true); if (null == user) { continue; } @@ -50,6 +50,7 @@ public class GetMonsterAttackRankHandler extends BaseHandler item : rankInfo) { String value = item.getValue(); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid, true); if (null == user) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java index 87e79052e..d76a37a92 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ForceRankActivity.java @@ -75,7 +75,7 @@ class ForceRankActivity extends AbstractActivity { for (ZSetOperations.TypedTuple item : rankInfo) { String value = item.getValue(); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid, true); if (null == user) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 8443b6eda..a8193c097 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -446,7 +446,7 @@ public class ArenaLogic { String value = item.getValue(); int score = item.getScore().intValue(); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid,true); if (null == user) { continue; } @@ -619,7 +619,7 @@ public class ArenaLogic { for(ZSetOperations.TypedTuple item : arenaRankInfo){ String value = item.getValue(); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid, true); if (null == user) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 15fd0ad51..1206a4aea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -99,12 +99,19 @@ public class UserManager { public static User getUser(int uid) throws Exception { + return getUser(uid,false); + } + + public static User getUser(int uid,boolean canNull) throws Exception { User user = userMap.get(uid); if (user != null) { return user; } user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), uid, User.class); - if (user == null) { + if (null == user) { + if(canNull){ + return null; + } throw new Exception("UserManager::getUser null exception"); } UserManager.addUser(user); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index adc00c69a..8e04fedc9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -705,7 +705,7 @@ public class CombatLogic { String value = item.getValue(); int score =item.getScore().intValue(); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid,true); if (null == user) { continue; } @@ -740,7 +740,7 @@ public class CombatLogic { for(ZSetOperations.TypedTuple item : adventureBossRankInfo){ String value = item.getValue(); int uid = Integer.parseInt(value); - User user = UserManager.getUser(uid); + User user = UserManager.getUser(uid, true); if (null == user) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index b9e2cd0fe..08d47f557 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -260,6 +260,7 @@ public class CBean2Proto { .setHead(playerInfoManager.getHead()) .setHeadFrame(playerInfoManager.getHeadFrame()) .setRank(rank) + .setUid(uid) .build(); }