diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java index 5d5c17065..9382bb2a8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java @@ -5,7 +5,6 @@ import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.dao.GuilidManager; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; @@ -117,6 +116,5 @@ public class CarDelayFunction implements FunctionManager { } MongoUtil.getLjsdMongoTemplate().lastUpdate(); - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_kick.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_kick.java index e67d96467..44463ccff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_kick.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_kick.java @@ -2,22 +2,32 @@ package com.ljsd.jieling.kefu; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.logic.OnlineUserManager; -import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.server.SessionManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.MessageUtil; -public class Cmd_kick extends GmGlobleAbstract { +import java.util.Map; + +public class Cmd_kick extends GmAbstract { @Override public boolean exec(String[] args) throws Exception { - SessionManager instance = SessionManager.getInstance(); - ISession session= OnlineUserManager.getSessionByUid(getUser().getId()); - if (session != null) { - MessageUtil.sendErrorCode(session, ErrorCode.kickUserCode, "您已被踢下线!"); - Thread.sleep(100); - instance.kickOldUser(getUser().getId(), "", ErrorCode.kickUserCode, "LOSE HEART PACKET!!!!", 0); + int uid = Integer.parseInt(args[0]); + if (uid == 0){ + Map sessionMap = OnlineUserManager.sessionMap; + for (ISession session : sessionMap.values()) { + MessageUtil.sendErrorCode(session, ErrorCode.kickUserCode, "您已被踢下线!"); + Thread.sleep(100); + SessionManager.getInstance().kickOldUser(uid, "", ErrorCode.kickUserCode, "LOSE HEART PACKET!!!!", 0); + } + }else { + ISession session= OnlineUserManager.getSessionByUid(uid); + if (session != null) { + MessageUtil.sendErrorCode(session, ErrorCode.kickUserCode, "您已被踢下线!"); + Thread.sleep(100); + SessionManager.getInstance().kickOldUser(uid, "", ErrorCode.kickUserCode, "LOSE HEART PACKET!!!!", 0); + } } return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index 52841af69..0a0afe46f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -88,7 +88,7 @@ public class MinuteTask extends Thread { LOGGER.error("Exception::=>{}",e.toString()); } try { - if (TimeUtils.getHourOfDay() == 20 && TimeUtils.getMiunte() == 59){ + if (TimeUtils.getHourOfDay() == 21 && TimeUtils.getMiunte() == 0){ // 竞技场,每日晚九点刷新 ArenaLogic.getInstance().sendReward(GlobalsDef.ARENA_DAILY_REWARD); }