fix activity
parent
7b988d70c2
commit
989d0a2d85
|
@ -75,10 +75,15 @@ public class LoginRequestHandler extends BaseHandler {
|
||||||
//登陆注册入内存
|
//登陆注册入内存
|
||||||
String openIdFront = loginRequest.getOpenId();
|
String openIdFront = loginRequest.getOpenId();
|
||||||
String[] split = openIdFront.split("\\.");
|
String[] split = openIdFront.split("\\.");
|
||||||
|
User user = null;
|
||||||
|
if(split.length>=2){
|
||||||
String openId = split[0];
|
String openId = split[0];
|
||||||
String chanel = split[1];
|
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);
|
String newToken = UserManager.getNewToken(userId);
|
||||||
|
|
||||||
|
|
|
@ -106,6 +106,9 @@ public class ActivityLogic {
|
||||||
|
|
||||||
for (Map.Entry<Integer, ISession> entry : OnlineUserManager.sessionMap.entrySet()) {
|
for (Map.Entry<Integer, ISession> entry : OnlineUserManager.sessionMap.entrySet()) {
|
||||||
User user = UserManager.getUserInMem(entry.getKey());
|
User user = UserManager.getUserInMem(entry.getKey());
|
||||||
|
if(user==null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
PlayerInfoProto.ActivityUpateIndication.Builder builder = PlayerInfoProto.ActivityUpateIndication.newBuilder();
|
PlayerInfoProto.ActivityUpateIndication.Builder builder = PlayerInfoProto.ActivityUpateIndication.newBuilder();
|
||||||
MissionEventDistributor.requestStart();
|
MissionEventDistributor.requestStart();
|
||||||
Set<Integer> openNews = checkActivityOfUser(user, builder);
|
Set<Integer> openNews = checkActivityOfUser(user, builder);
|
||||||
|
|
Loading…
Reference in New Issue