From 989d0a2d85a4758e34118fd8dc9b04d2bd451cdb Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 21 Aug 2019 20:59:50 +0800 Subject: [PATCH] fix activity --- .../com/ljsd/jieling/handler/LoginRequestHandler.java | 11 ++++++++--- .../ljsd/jieling/logic/activity/ActivityLogic.java | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) 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 04c46548a..6948506f1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java @@ -75,10 +75,15 @@ public class LoginRequestHandler extends BaseHandler { //登陆注册入内存 String openIdFront = loginRequest.getOpenId(); String[] split = openIdFront.split("\\."); - String openId = split[0]; - String chanel = split[1]; + User user = null; + if(split.length>=2){ + String openId = split[0]; + String chanel = split[1]; + user = UserManager.userLogin(userId,openId,chanel); + }else{ + user = UserManager.userLogin(userId,openIdFront,""); + } - User user = UserManager.userLogin(userId,openId,chanel); String newToken = UserManager.getNewToken(userId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 26c2ba2fc..1cbf3e28e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -106,6 +106,9 @@ public class ActivityLogic { for (Map.Entry entry : OnlineUserManager.sessionMap.entrySet()) { User user = UserManager.getUserInMem(entry.getKey()); + if(user==null){ + continue; + } PlayerInfoProto.ActivityUpateIndication.Builder builder = PlayerInfoProto.ActivityUpateIndication.newBuilder(); MissionEventDistributor.requestStart(); Set openNews = checkActivityOfUser(user, builder);