规范修正,不涉及代码

(cherry picked from commit ae42277f88)
master_haizei01
grimm 2024-04-25 18:56:03 +08:00
parent 5b31f6fe15
commit f5eb45b65e
3 changed files with 28 additions and 31 deletions

View File

@ -167,10 +167,7 @@ public class SessionManager implements INetSession<ISession>, INetReceived<ISess
return false; return false;
} }
//处理多设备重登 //处理多设备重登
if (onRepeatLogin(session) == 1) { return onRepeatLogin(session) != 1;
return false;
}
return true;
} }

View File

@ -161,32 +161,32 @@ public class SessionManager implements INetSession<ISession>, INetReceived<ISess
// iSession.setHeartBreatNums(heartBreatNums); // iSession.setHeartBreatNums(heartBreatNums);
} }
public boolean kickOldUser(int uid, String uToken, int errorCode, String errorMsg, long requestTime) { // public boolean kickOldUser(int uid, String uToken, int errorCode, String errorMsg, long requestTime) {
if (OnlineServerManager.sessionMap.size() != 0 && OnlineServerManager.sessionMap.keySet().contains(uid)) { // if (!OnlineServerManager.sessionMap.isEmpty() && OnlineServerManager.sessionMap.containsKey(uid)) {
if (requestTime != 0 && requestTime < OnlineServerManager.sessionMap.get(uid).getUserLoginTime()) { // if (requestTime != 0 && requestTime < OnlineServerManager.sessionMap.get(uid).getUserLoginTime()) {
LOGGER.info("kickOldUser->uid={},requestTime={},userLoginTime={}", // LOGGER.info("kickOldUser->uid={},requestTime={},userLoginTime={}",
uid, requestTime, OnlineServerManager.sessionMap.get(uid).getUserLoginTime()); // uid, requestTime, OnlineServerManager.sessionMap.get(uid).getUserLoginTime());
return false; // return false;
} // }
} // }
//
if (!OnlineServerManager.checkUidOnline(uid)) { // if (!OnlineServerManager.checkUidOnline(uid)) {
LOGGER.info("kickOldUser->uid={};isNotOnline", uid); // LOGGER.info("kickOldUser->uid={};isNotOnline", uid);
return false; // return false;
} // }
ISession oldSession = OnlineServerManager.getSessionByUid(uid); // ISession oldSession = OnlineServerManager.getSessionByUid(uid);
if (oldSession == null) { // if (oldSession == null) {
LOGGER.info("kickOldUser->uid={};oldSessionisNull", uid); // LOGGER.info("kickOldUser->uid={};oldSessionisNull", uid);
OnlineServerManager.userOffline(uid); // OnlineServerManager.userOffline(uid);
return false; // return false;
} // }
oldSession.setOfflineType(errorCode); // oldSession.setOfflineType(errorCode);
//
//
offLine(oldSession); // offLine(oldSession);
oldSession.close(); // oldSession.close();
return true; // return true;
} // }
@Override @Override
public ISession createGameSession(IChannel channel, INetWorkHandler handler) { public ISession createGameSession(IChannel channel, INetWorkHandler handler) {