From f1dc0fcb4cfdb2277d12f860a54f7b24407ea908 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 26 Nov 2019 16:45:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=A8=A1=E5=9D=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/GameApplication.java | 50 ------------------- .../network/server/SessionManager.java | 20 +++++--- 2 files changed, 12 insertions(+), 58 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index fdf1bc2df..38f55da40 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -67,53 +67,6 @@ public class GameApplication { CoreSettings coreSettings = ConfigurableApplicationContextManager.getBean(CoreSettings.class); GameApplication.areaId = coreSettings.getArea(); LOGGER.info("ServerProperties ->{},coreIp=>{}", serverProperties.toString()); -//<<<<<<< HEAD -//======= -// RedisUtil.getInstence().init(configurableApplicationContext); -// MongoUtil.getInstence().init(configurableApplicationContext); -// //todo 设置开服时间 -// setRegisterTime();// might loop -// //注册消息处理方法 -// register(configurableApplicationContext); -// ProtocolsManager protocolsManager = ProtocolsManager.getInstance(); -// protocolsManager.initCheck(); -// // 追加ProtocolsManager消息处理器 注解和非注解 -// protocolsManager.initHandler("com.ljsd.jieling.handler",configurableApplicationContext); -//// protocolsManager.initContext(); -// -// //http线程池初始化 -// // HttpPool.init(); -// GuilidManager.init(); -// -// STableManager.initialize("config"); -// //mongo异步数据处理线程 -// MongoDataHandlerTask.init(configurableApplicationContext); -// //初始化邮件 -// MailingSystemManager.init(configurableApplicationContext); -// ThreadManager threadManager = ThreadManager.getInstance(); -// threadManager.init(configurableApplicationContext); -// MapLogic.getInstance().init(configurableApplicationContext); -// MongoKeys.initmongoKey(); -// SensitivewordFilter.init(); -// HttpPool.init(); -// -// // 加载lua文件 -// CheckFight.getInstance().init("luafight/BattleMain.lua"); -// -// final NettyServerAutoConfiguration netServerConfig = configurableApplicationContext.getBean(NettyServerAutoConfiguration.class); -// NettyProperties properties = netServerConfig.getNettyProperties(); -// -// KeyGenUtils.setMachineNum(serverConfiguration.getServerProperties().getNum()); -// ActivityLogic.getInstance().checkActiviyStatus(); -// //初始化cdk -// CoreLogic.getInstance().checkCoreCdk(); -// ThriftPoolUtils.getInstance().initContext(configurableApplicationContext); -// GlobalDataManaager.getInstance().whenServerStart(configurableApplicationContext); -// URL resource = HeroLogic.class.getClassLoader().getResource("mingan.txt"); -// if(resource!=null){ -// LOGGER.info(resource.getFile()); -// } -//>>>>>>> 843e4f921d5bc65ced6568bf5fc4b58b2b17cf54 GameLogicService.getInstance().init(); //设置开服时间 @@ -141,7 +94,6 @@ public class GameApplication { } } - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); long serverOenTime = TimeUtils.getAppointTime(0); String format = simpleDateFormat.format(serverOenTime); @@ -160,9 +112,7 @@ public class GameApplication { } - public static void close() throws Exception{ - start = false; NetManager.getInstance().exit(); ConfigurableApplicationContextManager.getInstance().exit(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java index 6696c4f86..553493164 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java @@ -28,6 +28,7 @@ import com.ljsd.jieling.protocol.INetSession; import com.ljsd.jieling.util.MessageUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import util.NetUtils; import util.StringUtil; import util.TimeUtils; @@ -213,7 +214,7 @@ public class SessionManager implements INetSession, INetReceived, INetReceived, INetReceiveduid={},iSessionId={},HeartBreatNums={},remoteAddress={};not receieve heart breat", iSession.getUid(), iSession.getId(), iSession.getHeartBreatNums(), remoteAddress); int heartBreatNums = iSession.getHeartBreatNums(); @@ -321,7 +325,7 @@ public class SessionManager implements INetSession, INetReceived