diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 18b58f5a8..b90601eec 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -12,15 +12,18 @@ import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.GlobleSystemLogic; -import com.ljsd.jieling.logic.activity.*; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.logic.activity.ActivityTypeEnum; +import com.ljsd.jieling.logic.activity.ChoiceDrawCardActivity; +import com.ljsd.jieling.logic.activity.LimitRandomSpecialMonsterActivityNew; import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.explorerMap.ExplorerMapLogic; -import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.home.event.HomeEvent; +import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.question.QuestionLogic; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 9c5c0cbf7..ddf744a21 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.player; +import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.ljsd.CoreService; import com.ljsd.GameApplication; @@ -1752,6 +1753,7 @@ public class PlayerLogic { * @throws Exception */ public User getUserByRpc(int uid) { + LOGGER.info("fanhuijieguo1 open the door"); int serverId = AreaManager.getInstance().getServerIdByUid(uid, GameApplication.serverId); if (serverId == 0) { return null; @@ -1776,6 +1778,7 @@ public class PlayerLogic { String ip = rpcString.split(":")[0]; String port = rpcString.split(":")[3]; StringBuilder sb = new StringBuilder(); + Gson gson = RedisUtil.getInstence().getGson(); sb.append("RPCCORE").append("|").append(ip).append("|").append(port); ClientAdapterPo rPCClient = null; String userStr = null ; @@ -1791,12 +1794,15 @@ public class PlayerLogic { LOGGER.info("callback=> rPCClient is null "); } } + if (userStr == null || userStr.isEmpty()) { LOGGER.error("getUserByRpc ,userStr == null uid={}", uid); return null; } - Gson gson = RedisUtil.getInstence().getGson(); - return gson.fromJson(userStr, User.class); + JSONObject jsonObject = JSONObject.parseObject(userStr); + jsonObject.remove("activityManager"); + + return gson.fromJson(jsonObject.toJSONString(), User.class); } //森罗幻境自动挂机奖励展示