From 659f0f6945ce344f638554212cf8eb65a6ba5379 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 2 Jul 2019 16:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=B7=E9=9B=BE=E6=A3=AE?= =?UTF-8?q?=E6=9E=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/db/redis/RedisKey.java | 2 ++ .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 4 ++++ .../main/java/com/ljsd/jieling/logic/mission/MissionType.java | 2 +- .../main/java/com/ljsd/jieling/thread/task/RPCServerTask.java | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java index b17c5cc19..433a3b8ef 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java @@ -102,6 +102,8 @@ public class RedisKey { public static final String CUser_Chat = ":CUser_Chat:"; + public static final String USER_LOGIN_URL = "USER_LOGIN_URL:"; + public static String getKey(String type, String key, boolean withoutServerId) { if (withoutServerId) { return GameApplication.areaId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key); 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 bfb784fc9..223a18ff2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.handler; +import com.ljsd.jieling.db.redis.RedisKey; +import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.handler.map.MapLogic; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.GlobalDataManaager; @@ -20,6 +22,7 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; +import com.ljsd.jieling.thread.task.RPCServerTask; import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.TimeUtils; @@ -97,6 +100,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ try { MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true); ActivityLogic.getInstance().flushForLogin(user); + RedisUtil.getInstence().set(RedisKey.USER_LOGIN_URL + userId, RPCServerTask.userCallBackUrl); LOGGER.info("back to client!"); } catch (Exception e) { e.printStackTrace(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java index 964fda8a2..8fdf7257c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java @@ -87,7 +87,7 @@ public enum MissionType { case 14: return LEVEL_STORY_PASS; case 15: - return HERO_STORY_PASS; + return GENERAL_STORY_PASS; case 16: return HERO_STORY_PASS; case 17: diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java index 5356db81e..c269415f3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java @@ -18,10 +18,13 @@ import java.net.InetSocketAddress; public class RPCServerTask extends Thread{ private static final Logger LOGGER = LoggerFactory.getLogger(RPCServerTask.class); + public static String userCallBackUrl; + private CoreSettings coreSettings; public RPCServerTask(ConfigurableApplicationContext configurableApplicationContext){ this.coreSettings = configurableApplicationContext.getBean(CoreSettings.class); + userCallBackUrl = this.coreSettings.getIp() + ":" + this.coreSettings.getPort(); setName("rpc"); }