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 17f42baf7..cb0792623 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 @@ -16,7 +16,7 @@ public class RedisKey { - private String getKey(String type, K key, boolean withServerId) { + public static String getKey(String type, String key, boolean withServerId) { if (withServerId) { return areaId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key); } else { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index 6a0eb787f..085015045 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -198,12 +198,12 @@ public class RedisUtil { * * @param key * 键 不能为null - * @param item + * @param mapKey * 项 不能为null * @return 值 */ - public Object hget(String key, String item) { - return redisTemplate.opsForHash().get(key, item); + public Object hget(String key, String mapKey) { + return redisTemplate.opsForHash().get(key, mapKey); } /** @@ -265,18 +265,18 @@ public class RedisUtil { * * @param key * 键 - * @param item + * @param mapKey * 项 * @param value * 值 * @return true 成功 false失败 */ - public boolean hset(String key, String item, Object value) { + public boolean hset(String key, String mapKey, Object value) { try { if (!(value instanceof String)){ value = gson.toJson(value); } - redisTemplate.opsForHash().put(key, item, value); + redisTemplate.opsForHash().put(key, mapKey, value); return true; } catch (Exception e) { e.printStackTrace(); @@ -289,7 +289,7 @@ public class RedisUtil { * * @param key * 键 - * @param item + * @param mapKey * 项 * @param value * 值 @@ -297,9 +297,12 @@ public class RedisUtil { * 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 * @return true 成功 false失败 */ - public boolean hset(String key, String item, Object value, long time) { + public boolean hset(String key, String mapKey, Object value, long time) { try { - redisTemplate.opsForHash().put(key, item, value); + if (!(value instanceof String)){ + value = gson.toJson(value); + } + redisTemplate.opsForHash().put(key, mapKey, value); if (time > 0) { expire(key, time); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java index b87ed6d2e..31ddd17a3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java @@ -24,8 +24,8 @@ public class GetAllItemHandler extends BaseHandler { int token = netData.getToken(); int msgId = netData.getMsgId(); int msgIndex = netData.getIndex(); - PlayerInfoProto.PlayerInfo.GetItemInfoRequest getItemInfoRequest - = PlayerInfoProto.PlayerInfo.GetItemInfoRequest.parseFrom(netData.parseClientProtoNetData()); + PlayerInfoProto.GetItemInfoRequest getItemInfoRequest + = PlayerInfoProto.GetItemInfoRequest.parseFrom(netData.parseClientProtoNetData()); 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 d2ceafcac..fa2eef86b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -31,18 +31,18 @@ public class GetPlayerInfoHandler extends BaseHandler{ int token = netData.getToken(); int msgId = netData.getMsgId(); int msgIndex = netData.getIndex(); - PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest getPlayerInfoRequest - = PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest.parseFrom(netData.parseClientProtoNetData()); + PlayerInfoProto.GetPlayerInfoRequest getPlayerInfoRequest + = PlayerInfoProto.GetPlayerInfoRequest.parseFrom(netData.parseClientProtoNetData()); LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},messageNum={},messageStr={}", userId, token,msgId,msgIndex,getPlayerInfoRequest.getNum(),getPlayerInfoRequest.getStr()); User user = UserManager.getUserForLogin(userId); - CommonProto.Common.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager()); + CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager()); - PlayerInfoProto.PlayerInfo.GetPlayerInfoResponse getPlayerInfoResponse - = PlayerInfoProto.PlayerInfo.GetPlayerInfoResponse.newBuilder() + PlayerInfoProto.GetPlayerInfoResponse getPlayerInfoResponse + = PlayerInfoProto.GetPlayerInfoResponse.newBuilder() .setPlayer(player) .build(); try { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java index e431d113a..2787394cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java @@ -1,10 +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.logic.dao.User; import com.ljsd.jieling.logic.dao.UserManager; -import com.ljsd.jieling.logic.dao.UserServerInfo; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.MessageTypeProto; @@ -32,24 +29,35 @@ public class LoginRequestHandler extends BaseHandler { int msgId = netData.getMsgId(); int msgIndex = netData.getIndex(); byte[] message = netData.parseClientProtoNetData(); - PlayerInfoProto.PlayerInfo.LoginRequest loginRequest - = PlayerInfoProto.PlayerInfo.LoginRequest.parseFrom(message); + PlayerInfoProto.LoginRequest loginRequest + = PlayerInfoProto.LoginRequest.parseFrom(message); LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={},messageNum={},messageStr={}", userId, token,msgId,msgIndex,loginRequest.getNum(),loginRequest.getStr()); //登陆注册入内存 User user = UserManager.userLogin(userId); user.getPlayerInfoManager().setOpenId(loginRequest.getOpenId()); - UserServerInfo userServerInfo = new UserServerInfo(user.getPlayerInfoManager()); - RedisUtil.getInstence().hset(RedisKey.USER_SERVER_INFO,loginRequest.getOpenId(), userServerInfo); + +// UserServerInfo userServerInfo = new UserServerInfo(user.getPlayerInfoManager()); +// String key = RedisKey.getKey(RedisKey.USER_SERVER_INFO,loginRequest.getOpenId(),false); +// RedisUtil.getInstence().hset(key,10086+"", userServerInfo); +// +// UserServerInfo userServerInfo1 = new UserServerInfo(user.getPlayerInfoManager()); +// RedisUtil.getInstence().hset(key,10087+"", userServerInfo1); +// +// UserServerInfo userServerInfo2 = new UserServerInfo(user.getPlayerInfoManager()); +// RedisUtil.getInstence().hset(key,10088+"", userServerInfo2); + +// Map userServerInfoMap = RedisUtil.getInstence().hget(RedisKey.USER_SERVER_INFO, loginRequest.getOpenId(), UserServerInfo.class, -1, false); String newToken = UserManager.getNewToken(userId); - PlayerInfoProto.PlayerInfo.LoginResponse loginResponse - = PlayerInfoProto.PlayerInfo.LoginResponse.newBuilder() + PlayerInfoProto.LoginResponse loginResponse + = PlayerInfoProto.LoginResponse.newBuilder() .setResultCode(0) .setNewToken(newToken) .build(); + try { MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.LOGIN_RESPONSE_VALUE, loginResponse, true); LOGGER.info("back to client!"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java index 65df67fce..d896cb0c6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapEnterRequestHandler.java @@ -17,7 +17,7 @@ public class MapEnterRequestHandler extends BaseHandler{ @Override public void process(ISession iSession, PacketNetData netData) throws Exception { byte[] message = netData.parseClientProtoNetData(); - MapInfoProto.MapInfo.MapEnterRequest mapEnterRequest = MapInfoProto.MapInfo.MapEnterRequest.parseFrom(message); + MapInfoProto.MapEnterRequest mapEnterRequest = MapInfoProto.MapEnterRequest.parseFrom(message); MapLogic.getInstance().enterMap(iSession, mapEnterRequest.getMapId(), MessageTypeProto.MessageType.MAP_ENTER_RESPONSE); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapGetInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapGetInfoRequestHandler.java index 909237246..fe975d1e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapGetInfoRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapGetInfoRequestHandler.java @@ -21,7 +21,7 @@ public class MapGetInfoRequestHandler extends BaseHandler { public void process(ISession iSession, PacketNetData netData) throws Exception { int uid = iSession.getUid(); User user = UserManager.getUser(uid); - MapInfoProto.MapInfo.MapGetInfoResponse mapGetInfoResponse = MapInfoProto.MapInfo.MapGetInfoResponse + MapInfoProto.MapGetInfoResponse mapGetInfoResponse = MapInfoProto.MapGetInfoResponse .newBuilder() .setMapId(user.getMapManager().getCurMapId()) .build(); 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 41938cf73..08daca5c3 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 @@ -48,7 +48,7 @@ public class MapLogic { mapManager = initMap( 1); user.setMapManager(mapManager); } - MapInfoProto.MapInfo.MapEnterResponse mapEnterResponse = MapInfoProto.MapInfo.MapEnterResponse + MapInfoProto.MapEnterResponse mapEnterResponse = MapInfoProto.MapEnterResponse .newBuilder() .build(); MessageUtil.sendMessage(iSession, 1, messageType.getNumber(), mapEnterResponse, true); 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 0bd8d8c6a..721585147 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -9,8 +9,8 @@ import java.util.List; public class CBean2Proto { - public static CommonProto.Common.Player getPlayer(int uid, PlayerManager playerManager) { - CommonProto.Common.Player player = CommonProto.Common.Player + public static CommonProto.Player getPlayer(int uid, PlayerManager playerManager) { + CommonProto.Player player = CommonProto.Player .newBuilder() .setUid(uid) .setNickName(playerManager.getNickName()) @@ -25,8 +25,8 @@ public class CBean2Proto { return player; } - public static CommonProto.Common.Item getItem(Item item){ - CommonProto.Common.Item itemProto = CommonProto.Common.Item + public static CommonProto.Item getItem(Item item){ + CommonProto.Item itemProto = CommonProto.Item .newBuilder() .setItemId(item.getItemId()) .setItemNum(item.getItemNum()) @@ -35,8 +35,8 @@ public class CBean2Proto { return itemProto; } - public static CommonProto.Common.Hero getHero(Hero hero){ - CommonProto.Common.Hero heroProto = CommonProto.Common.Hero + public static CommonProto.Hero getHero(Hero hero){ + CommonProto.Hero heroProto = CommonProto.Hero .newBuilder() .setId(hero.getId()) .setHeroId(hero.getTemplateId()) @@ -55,11 +55,11 @@ public class CBean2Proto { return heroProto; } - private static List getHeroSkill(List skillList) { + private static List getHeroSkill(List skillList) { - List skills = new ArrayList<>(); + List skills = new ArrayList<>(); for(Skill skill : skillList){ - CommonProto.Common.Skill skill1 = CommonProto.Common.Skill + CommonProto.Skill skill1 = CommonProto.Skill .newBuilder() .setSkillId(skill.getSkillId()) .setSkillType(skill.getSkillType()) @@ -72,8 +72,8 @@ public class CBean2Proto { return skills; } - private static List getHeroEquip(List equipList) { - List equips = new ArrayList<>(); + private static List getHeroEquip(List equipList) { + List equips = new ArrayList<>(); return equips; } diff --git a/test/src/main/java/network/client/NettyClient.java b/test/src/main/java/network/client/NettyClient.java index decf673f2..a03a2af23 100644 --- a/test/src/main/java/network/client/NettyClient.java +++ b/test/src/main/java/network/client/NettyClient.java @@ -36,7 +36,7 @@ public class NettyClient { NettyTCPClientHandler handler = ch.pipeline().get(NettyTCPClientHandler.class); //------------------------------------------测试类型------------------------------------------------------- // GameProto.GameMessage gameMessage = new NettyClient().sendLoginMessageTest();//登陆请求 - PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest gameMessage = new NettyClient().sendRegisterMessageTest();//注册请求 + PlayerInfoProto.GetPlayerInfoRequest gameMessage = new NettyClient().sendRegisterMessageTest();//注册请求 LOGGER.info(gameMessage.toString()); //--------------------------------------------------------------------------------------------------------- @@ -64,9 +64,9 @@ public class NettyClient { } - private PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest sendRegisterMessageTest(){ + private PlayerInfoProto.GetPlayerInfoRequest sendRegisterMessageTest(){ LOGGER.info("register"); - PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest registerRequest = PlayerInfoProto.PlayerInfo.GetPlayerInfoRequest + PlayerInfoProto.GetPlayerInfoRequest registerRequest = PlayerInfoProto.GetPlayerInfoRequest .newBuilder() // .setNum(888) // .setStr("666")