Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw

back_recharge
zhangshanxue 2020-11-04 17:54:04 +08:00
commit 711fa42582
1 changed files with 77 additions and 71 deletions

View File

@ -57,9 +57,11 @@ public class StoreLogic implements IEventHandler {
StoreLogic.getInstance();
}
public static void checkGlobalStore(boolean isStartServer) throws Exception {
public static void checkGlobalStore(boolean isStartServer) {
Calendar calendar = Calendar.getInstance();
long now = calendar.getTimeInMillis();
try {
for (SStoreTypeConfig sStoreTypeConfig : SStoreTypeConfig.getsStoreTypeConfigMap().values()) {
if (sStoreTypeConfig.getStoreOpenRule() == 3) {
long startTime = ToolsUtil.getTimeLong(sStoreTypeConfig.getStartTimeLong(), sStoreTypeConfig.getEndTimeLong(), ActivityType.OPEN_TYPE_TIME, 0, 1);
@ -85,7 +87,7 @@ public class StoreLogic implements IEventHandler {
} else if (sStoreTypeConfig.getStoreOpenRule() == 6) {
for (ISession session : OnlineUserManager.sessionMap.values()) {
if (session.getFiveReady() == 1) {
User user = UserManager.getUser(session.getUid());
User user = UserManager.getUser(session.getUid(), true);
if (user == null) {
LOGGER.info("user null removeid=>{}", session.getUid());
OnlineUserManager.userOffline(session.getUid());
@ -113,7 +115,7 @@ public class StoreLogic implements IEventHandler {
}
for (ISession session : OnlineUserManager.sessionMap.values()) {
if (session.getFiveReady() == 1) {
User user = UserManager.getUser(session.getUid());
User user = UserManager.getUser(session.getUid(), true);
if (user == null) {
LOGGER.info("user null removeid=>{}", session.getUid());
OnlineUserManager.userOffline(session.getUid());
@ -141,6 +143,10 @@ public class StoreLogic implements IEventHandler {
}
}
}
}catch (Exception e){
LOGGER.error(e.getMessage());
e.printStackTrace();
}
}
private static void sendRefreshIndication(SStoreTypeConfig sStoreTypeConfig,long lastRefreshTime) throws Exception {