From 0b29af287c3a352cda210cedbf241fad8afdda07 Mon Sep 17 00:00:00 2001 From: kingston-csj Date: Sun, 15 Oct 2017 18:21:20 +0800 Subject: [PATCH] net package rename --- src/main/java/com/kingston/GameServer.java | 4 +- src/main/java/com/kingston/db/BaseEntity.java | 3 +- src/main/java/com/kingston/db/DbService.java | 3 +- .../activity/AbstractActivityHandler.java | 2 +- .../game/activity/IActivityHandler.java | 2 +- .../message/ReqOpenActivityPanelMessage.java | 2 +- .../kingston/game/cronjob/DailyResetJob.java | 2 +- .../game/database/user/player/Player.java | 6 +- .../java/com/kingston/game/gm/GmManager.java | 2 +- .../game/gm/message/ReqGmExecMessage.java | 2 +- .../game/gm/message/ResGmResultMessage.java | 2 +- .../com/kingston/game/http/HttpServer.java | 88 +++++++++---------- .../com/kingston/game/login/LoginManager.java | 9 +- .../game/login/message/ReqLoginMessage.java | 2 +- .../login/message/ReqSelectPlayerMessage.java | 2 +- .../game/login/message/ResLoginMessage.java | 2 +- .../kingston/game/player/DailyResetTask.java | 2 +- .../kingston/game/player/PlayerManager.java | 4 +- .../player/message/ResKickPlayerMessage.java | 2 +- .../message/ResPlayerEnterSceneMessage.java | 2 +- .../kingston/net/ServerSocketIoHandler.java | 5 +- .../kingston/net/codec/MessageDecoder.java | 15 ++-- .../kingston/net/codec/MessageEncoder.java | 6 +- .../kingston/net/combine/CombineMessage.java | 2 +- .../java/com/kingston/net/combine/Packet.java | 4 +- .../{dispatch => message}/CmdExecutor.java | 2 +- .../kingston/net/{ => message}/Message.java | 2 +- .../MessageDispatcher.java | 11 ++- .../net/{ => message}/MessageFactory.java | 2 +- .../net/{ => message}/MessagePusher.java | 5 +- .../net/{ => session}/SessionManager.java | 2 +- .../net/{ => session}/SessionProperties.java | 2 +- .../AbstractDistributeTask.java | 2 +- .../net/{context => task}/IDistributable.java | 2 +- .../{context => task}/IDistributeTask.java | 2 +- .../net/{context => task}/MessageTask.java | 4 +- .../{context => task}/TaskHandlerContext.java | 2 +- .../net/{context => task}/TimerTask.java | 2 +- .../kingston/tools/ProtoFileGenerator.java | 2 +- .../com/kingston/client/ClientStartup.java | 2 +- .../java/com/kingston/robot/SocketRobot.java | 2 +- 41 files changed, 110 insertions(+), 111 deletions(-) rename src/main/java/com/kingston/net/{dispatch => message}/CmdExecutor.java (95%) rename src/main/java/com/kingston/net/{ => message}/Message.java (95%) rename src/main/java/com/kingston/net/{dispatch => message}/MessageDispatcher.java (95%) rename src/main/java/com/kingston/net/{ => message}/MessageFactory.java (97%) rename src/main/java/com/kingston/net/{ => message}/MessagePusher.java (83%) rename src/main/java/com/kingston/net/{ => session}/SessionManager.java (97%) rename src/main/java/com/kingston/net/{ => session}/SessionProperties.java (93%) rename src/main/java/com/kingston/net/{context => task}/AbstractDistributeTask.java (96%) rename src/main/java/com/kingston/net/{context => task}/IDistributable.java (80%) rename src/main/java/com/kingston/net/{context => task}/IDistributeTask.java (84%) rename src/main/java/com/kingston/net/{context => task}/MessageTask.java (95%) rename src/main/java/com/kingston/net/{context => task}/TaskHandlerContext.java (98%) rename src/main/java/com/kingston/net/{context => task}/TimerTask.java (94%) diff --git a/src/main/java/com/kingston/GameServer.java b/src/main/java/com/kingston/GameServer.java index d7670b75..3b66fb3b 100644 --- a/src/main/java/com/kingston/GameServer.java +++ b/src/main/java/com/kingston/GameServer.java @@ -16,9 +16,9 @@ import com.kingston.game.database.config.ConfigDatasPool; import com.kingston.game.http.HttpServer; import com.kingston.monitor.jmx.GameMonitor; import com.kingston.monitor.jmx.GameMonitorMXBean; -import com.kingston.net.MessageFactory; import com.kingston.net.SocketServer; -import com.kingston.net.context.TaskHandlerContext; +import com.kingston.net.message.MessageFactory; +import com.kingston.net.task.TaskHandlerContext; import com.kingston.orm.OrmProcessor; import com.kingston.orm.utils.DbUtils; import com.kingston.redis.RedisCluster; diff --git a/src/main/java/com/kingston/db/BaseEntity.java b/src/main/java/com/kingston/db/BaseEntity.java index f425fc26..99aa52fe 100644 --- a/src/main/java/com/kingston/db/BaseEntity.java +++ b/src/main/java/com/kingston/db/BaseEntity.java @@ -14,7 +14,7 @@ public abstract class BaseEntity extends AbstractCacheable private static final long serialVersionUID = 5416347850924361417L; /** - * 每个db实体必须有个long型id + * entity id * @return */ public abstract long getId() ; @@ -27,7 +27,6 @@ public abstract class BaseEntity extends AbstractCacheable return result; } - @SuppressWarnings("rawtypes") @Override public boolean equals(Object obj) { if (this == obj) diff --git a/src/main/java/com/kingston/db/DbService.java b/src/main/java/com/kingston/db/DbService.java index 21345459..a7f418f5 100644 --- a/src/main/java/com/kingston/db/DbService.java +++ b/src/main/java/com/kingston/db/DbService.java @@ -28,13 +28,12 @@ public class DbService { } /** - * 启动消费者线程 + * start consumer thread */ public void init() { new NameableThreadFactory("db-save-service").newThread(new Worker()).start(); } - @SuppressWarnings("rawtypes") private BlockingQueue queue = new BlockingUniqueQueue<>(); private final AtomicBoolean run = new AtomicBoolean(true); diff --git a/src/main/java/com/kingston/game/activity/AbstractActivityHandler.java b/src/main/java/com/kingston/game/activity/AbstractActivityHandler.java index e588922c..0d76e5c7 100644 --- a/src/main/java/com/kingston/game/activity/AbstractActivityHandler.java +++ b/src/main/java/com/kingston/game/activity/AbstractActivityHandler.java @@ -3,7 +3,7 @@ package com.kingston.game.activity; import org.apache.commons.lang3.StringUtils; import com.kingston.game.database.user.player.Player; -import com.kingston.net.Message; +import com.kingston.net.message.Message; public abstract class AbstractActivityHandler implements IActivityHandler { diff --git a/src/main/java/com/kingston/game/activity/IActivityHandler.java b/src/main/java/com/kingston/game/activity/IActivityHandler.java index 07c86448..76ad15a1 100644 --- a/src/main/java/com/kingston/game/activity/IActivityHandler.java +++ b/src/main/java/com/kingston/game/activity/IActivityHandler.java @@ -1,7 +1,7 @@ package com.kingston.game.activity; import com.kingston.game.database.user.player.Player; -import com.kingston.net.Message; +import com.kingston.net.message.Message; public interface IActivityHandler { diff --git a/src/main/java/com/kingston/game/activity/message/ReqOpenActivityPanelMessage.java b/src/main/java/com/kingston/game/activity/message/ReqOpenActivityPanelMessage.java index ff984ab9..4f4d0f2f 100644 --- a/src/main/java/com/kingston/game/activity/message/ReqOpenActivityPanelMessage.java +++ b/src/main/java/com/kingston/game/activity/message/ReqOpenActivityPanelMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.activity.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.activity.ActivityDataPool; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; @MessageMeta(module=Modules.ACTIVITY, cmd=ActivityDataPool.REQ_OPEN_PANEL) public class ReqOpenActivityPanelMessage extends Message { diff --git a/src/main/java/com/kingston/game/cronjob/DailyResetJob.java b/src/main/java/com/kingston/game/cronjob/DailyResetJob.java index ccc28aac..9ebb439e 100644 --- a/src/main/java/com/kingston/game/cronjob/DailyResetJob.java +++ b/src/main/java/com/kingston/game/cronjob/DailyResetJob.java @@ -13,7 +13,7 @@ import com.kingston.game.database.user.player.Player; import com.kingston.game.player.DailyResetTask; import com.kingston.game.player.PlayerManager; import com.kingston.logs.LoggerSystem; -import com.kingston.net.context.TaskHandlerContext; +import com.kingston.net.task.TaskHandlerContext; /** * 每日５点定时job diff --git a/src/main/java/com/kingston/game/database/user/player/Player.java b/src/main/java/com/kingston/game/database/user/player/Player.java index 3e7b130c..c4477749 100644 --- a/src/main/java/com/kingston/game/database/user/player/Player.java +++ b/src/main/java/com/kingston/game/database/user/player/Player.java @@ -3,9 +3,9 @@ package com.kingston.game.database.user.player; import org.apache.mina.core.session.IoSession; import com.kingston.db.BaseEntity; -import com.kingston.net.SessionManager; -import com.kingston.net.SessionProperties; -import com.kingston.net.context.IDistributable; +import com.kingston.net.session.SessionManager; +import com.kingston.net.session.SessionProperties; +import com.kingston.net.task.IDistributable; import com.kingston.orm.annotation.Column; import com.kingston.orm.annotation.Entity; import com.kingston.orm.annotation.Id; diff --git a/src/main/java/com/kingston/game/gm/GmManager.java b/src/main/java/com/kingston/game/gm/GmManager.java index 3be6c2ef..9dec7ceb 100644 --- a/src/main/java/com/kingston/game/gm/GmManager.java +++ b/src/main/java/com/kingston/game/gm/GmManager.java @@ -13,7 +13,7 @@ import com.kingston.game.database.user.player.Player; import com.kingston.game.gm.command.AbstractGmCommand; import com.kingston.game.gm.message.ResGmResultMessage; import com.kingston.game.player.PlayerManager; -import com.kingston.net.MessagePusher; +import com.kingston.net.message.MessagePusher; import com.kingston.utils.ClassFilter; import com.kingston.utils.ClassScanner; diff --git a/src/main/java/com/kingston/game/gm/message/ReqGmExecMessage.java b/src/main/java/com/kingston/game/gm/message/ReqGmExecMessage.java index 0c6c84b6..4826be6e 100644 --- a/src/main/java/com/kingston/game/gm/message/ReqGmExecMessage.java +++ b/src/main/java/com/kingston/game/gm/message/ReqGmExecMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.gm.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.gm.GmConstant; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; @MessageMeta(module=Modules.GM, cmd=GmConstant.REQ_GM_EXEC) public class ReqGmExecMessage extends Message { diff --git a/src/main/java/com/kingston/game/gm/message/ResGmResultMessage.java b/src/main/java/com/kingston/game/gm/message/ResGmResultMessage.java index f6cd40db..023d09eb 100644 --- a/src/main/java/com/kingston/game/gm/message/ResGmResultMessage.java +++ b/src/main/java/com/kingston/game/gm/message/ResGmResultMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.gm.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.gm.GmConstant; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; /** * gm执行结果 diff --git a/src/main/java/com/kingston/game/http/HttpServer.java b/src/main/java/com/kingston/game/http/HttpServer.java index 017f609a..d736ad8e 100644 --- a/src/main/java/com/kingston/game/http/HttpServer.java +++ b/src/main/java/com/kingston/game/http/HttpServer.java @@ -21,9 +21,9 @@ import org.slf4j.LoggerFactory; import com.google.gson.Gson; import com.kingston.ServerConfig; -import com.kingston.net.SessionManager; +import com.kingston.net.session.SessionManager; -public class HttpServer { +public class HttpServer { private Logger logger = LoggerFactory.getLogger(HttpServer.class); @@ -32,13 +32,13 @@ public class HttpServer { //http端口 int port = ServerConfig.getInstance().getHttpPort(); - public void start() throws Exception { - acceptor = new NioSocketAcceptor(); - acceptor.getFilterChain().addLast("codec", new HttpServerCodec()); - acceptor.setHandler(new HttpServerHandle()); + public void start() throws Exception { + acceptor = new NioSocketAcceptor(); + acceptor.getFilterChain().addLast("codec", new HttpServerCodec()); + acceptor.setHandler(new HttpServerHandle()); - acceptor.bind(new InetSocketAddress(port)); - } + acceptor.bind(new InetSocketAddress(port)); + } public void shutdown() { if (acceptor != null) { @@ -47,20 +47,20 @@ public class HttpServer { } logger.error("---------> http server stop at port:{}", port); } -} +} -class HttpServerHandle extends IoHandlerAdapter { +class HttpServerHandle extends IoHandlerAdapter { private static Logger logger = LoggerFactory.getLogger(HttpServer.class); - @Override - public void exceptionCaught(IoSession session, Throwable cause) - throws Exception { - cause.printStackTrace(); - } + @Override + public void exceptionCaught(IoSession session, Throwable cause) + throws Exception { + cause.printStackTrace(); + } - @Override - public void sessionOpened(IoSession session) throws Exception { + @Override + public void sessionOpened(IoSession session) throws Exception { String ipAddr = SessionManager.INSTANCE.getRemoteIp(session); if (!ServerConfig.getInstance().isInWhiteIps(ipAddr)) { logger.error("非法后台登录,remoteIp=[{}]", ipAddr); @@ -71,35 +71,35 @@ class HttpServerHandle extends IoHandlerAdapter { session.write(out); session.close(false); } - } + } - @Override - public void messageReceived(IoSession session, Object message) - throws Exception { - if (message instanceof HttpRequest) { - // 请求，解码器将请求转换成HttpRequest对象 - HttpRequest request = (HttpRequest) message; + @Override + public void messageReceived(IoSession session, Object message) + throws Exception { + if (message instanceof HttpRequest) { + // 请求，解码器将请求转换成HttpRequest对象 + HttpRequest request = (HttpRequest) message; HttpCommandResponse commandResponse = handleCommand(request); - // 响应HTML - String responseHtml = new Gson().toJson(commandResponse); - byte[] responseBytes = responseHtml.getBytes("UTF-8"); - int contentLength = responseBytes.length; + // 响应HTML + String responseHtml = new Gson().toJson(commandResponse); + byte[] responseBytes = responseHtml.getBytes("UTF-8"); + int contentLength = responseBytes.length; - // 构造HttpResponse对象，HttpResponse只包含响应的status line和header部分 - Map headers = new HashMap(); - headers.put("Content-Type", "text/html; charset=utf-8"); - headers.put("Content-Length", Integer.toString(contentLength)); - HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SUCCESS_OK, headers); + // 构造HttpResponse对象，HttpResponse只包含响应的status line和header部分 + Map headers = new HashMap(); + headers.put("Content-Type", "text/html; charset=utf-8"); + headers.put("Content-Length", Integer.toString(contentLength)); + HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SUCCESS_OK, headers); - // 响应BODY - IoBuffer responseIoBuffer = IoBuffer.allocate(contentLength); - responseIoBuffer.put(responseBytes); - responseIoBuffer.flip(); + // 响应BODY + IoBuffer responseIoBuffer = IoBuffer.allocate(contentLength); + responseIoBuffer.put(responseBytes); + responseIoBuffer.flip(); - session.write(response); // 响应的status line和header部分 - session.write(responseIoBuffer); // 响应body部分 - } - } + session.write(response); // 响应的status line和header部分 + session.write(responseIoBuffer); // 响应body部分 + } + } private HttpCommandResponse handleCommand(HttpRequest request) { HttpCommandParams httpParams = toHttpParams(request); @@ -119,11 +119,11 @@ class HttpServerHandle extends IoHandlerAdapter { } private HttpCommandParams toHttpParams(HttpRequest httpReq) { - String cmd = httpReq.getParameter("cmd"); + String cmd = httpReq.getParameter("cmd"); if (StringUtils.isEmpty(cmd)) { return null; } - String paramJson = httpReq.getParameter("params"); + String paramJson = httpReq.getParameter("params"); if (StringUtils.isNotEmpty(paramJson)) { try{ @SuppressWarnings("unchecked") @@ -135,4 +135,4 @@ class HttpServerHandle extends IoHandlerAdapter { return null; } -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/com/kingston/game/login/LoginManager.java b/src/main/java/com/kingston/game/login/LoginManager.java index 34470bec..0b9125c4 100644 --- a/src/main/java/com/kingston/game/login/LoginManager.java +++ b/src/main/java/com/kingston/game/login/LoginManager.java @@ -2,17 +2,16 @@ package com.kingston.game.login; import org.apache.mina.core.session.IoSession; -import com.kingston.game.core.SystemParameters; import com.kingston.game.database.user.player.Player; import com.kingston.game.gm.message.ResGmResultMessage; import com.kingston.game.login.message.ResLoginMessage; import com.kingston.game.player.PlayerManager; import com.kingston.game.scene.message.ResPlayerEnterSceneMessage; -import com.kingston.net.Message; -import com.kingston.net.MessagePusher; -import com.kingston.net.SessionManager; -import com.kingston.net.SessionProperties; import com.kingston.net.combine.CombineMessage; +import com.kingston.net.message.Message; +import com.kingston.net.message.MessagePusher; +import com.kingston.net.session.SessionManager; +import com.kingston.net.session.SessionProperties; public class LoginManager { diff --git a/src/main/java/com/kingston/game/login/message/ReqLoginMessage.java b/src/main/java/com/kingston/game/login/message/ReqLoginMessage.java index 2e8669d0..f2203c7c 100644 --- a/src/main/java/com/kingston/game/login/message/ReqLoginMessage.java +++ b/src/main/java/com/kingston/game/login/message/ReqLoginMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.login.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.login.LoginDataPool; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; /** * 请求－账号登录 diff --git a/src/main/java/com/kingston/game/login/message/ReqSelectPlayerMessage.java b/src/main/java/com/kingston/game/login/message/ReqSelectPlayerMessage.java index aa9bd41f..fee9f8e2 100644 --- a/src/main/java/com/kingston/game/login/message/ReqSelectPlayerMessage.java +++ b/src/main/java/com/kingston/game/login/message/ReqSelectPlayerMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.login.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.login.LoginDataPool; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; @MessageMeta(module=Modules.LOGIN, cmd=LoginDataPool.REQ_SELECT_PLAYER) public class ReqSelectPlayerMessage extends Message { diff --git a/src/main/java/com/kingston/game/login/message/ResLoginMessage.java b/src/main/java/com/kingston/game/login/message/ResLoginMessage.java index 6d759fcb..f3bd557a 100644 --- a/src/main/java/com/kingston/game/login/message/ResLoginMessage.java +++ b/src/main/java/com/kingston/game/login/message/ResLoginMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.login.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.login.LoginDataPool; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; @MessageMeta(module=Modules.LOGIN, cmd=LoginDataPool.RES_LOGIN) public class ResLoginMessage extends Message { diff --git a/src/main/java/com/kingston/game/player/DailyResetTask.java b/src/main/java/com/kingston/game/player/DailyResetTask.java index a9402cad..452f95ad 100644 --- a/src/main/java/com/kingston/game/player/DailyResetTask.java +++ b/src/main/java/com/kingston/game/player/DailyResetTask.java @@ -1,7 +1,7 @@ package com.kingston.game.player; import com.kingston.game.database.user.player.Player; -import com.kingston.net.context.TimerTask; +import com.kingston.net.task.TimerTask; public class DailyResetTask extends TimerTask { diff --git a/src/main/java/com/kingston/game/player/PlayerManager.java b/src/main/java/com/kingston/game/player/PlayerManager.java index b9a9a1f2..b267730c 100644 --- a/src/main/java/com/kingston/game/player/PlayerManager.java +++ b/src/main/java/com/kingston/game/player/PlayerManager.java @@ -10,8 +10,8 @@ import com.kingston.cache.CacheService; import com.kingston.game.core.SystemParameters; import com.kingston.game.database.user.player.Player; import com.kingston.game.player.message.ResKickPlayerMessage; -import com.kingston.net.MessagePusher; -import com.kingston.net.SessionManager; +import com.kingston.net.message.MessagePusher; +import com.kingston.net.session.SessionManager; import com.kingston.orm.utils.DbUtils; /** diff --git a/src/main/java/com/kingston/game/player/message/ResKickPlayerMessage.java b/src/main/java/com/kingston/game/player/message/ResKickPlayerMessage.java index cbdb3f9f..df4f9f88 100644 --- a/src/main/java/com/kingston/game/player/message/ResKickPlayerMessage.java +++ b/src/main/java/com/kingston/game/player/message/ResKickPlayerMessage.java @@ -2,8 +2,8 @@ package com.kingston.game.player.message; import com.kingston.game.Modules; import com.kingston.game.player.PlayerDataPool; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; @MessageMeta(module=Modules.PLAYER, cmd= PlayerDataPool.RES_KICK_PLAYER) public class ResKickPlayerMessage extends Message { diff --git a/src/main/java/com/kingston/game/scene/message/ResPlayerEnterSceneMessage.java b/src/main/java/com/kingston/game/scene/message/ResPlayerEnterSceneMessage.java index b53c49f7..72a49565 100644 --- a/src/main/java/com/kingston/game/scene/message/ResPlayerEnterSceneMessage.java +++ b/src/main/java/com/kingston/game/scene/message/ResPlayerEnterSceneMessage.java @@ -3,8 +3,8 @@ package com.kingston.game.scene.message; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.game.Modules; import com.kingston.game.scene.SceneDataPool; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; @MessageMeta(module=Modules.SCENE, cmd=SceneDataPool.RES_ENTER_SCENE) public class ResPlayerEnterSceneMessage extends Message { diff --git a/src/main/java/com/kingston/net/ServerSocketIoHandler.java b/src/main/java/com/kingston/net/ServerSocketIoHandler.java index 93b182ef..57a31948 100644 --- a/src/main/java/com/kingston/net/ServerSocketIoHandler.java +++ b/src/main/java/com/kingston/net/ServerSocketIoHandler.java @@ -4,7 +4,10 @@ import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; import com.kingston.logs.LoggerUtils; -import com.kingston.net.dispatch.MessageDispatcher; +import com.kingston.net.message.Message; +import com.kingston.net.message.MessageDispatcher; +import com.kingston.net.session.SessionManager; +import com.kingston.net.session.SessionProperties; public class ServerSocketIoHandler extends IoHandlerAdapter { diff --git a/src/main/java/com/kingston/net/codec/MessageDecoder.java b/src/main/java/com/kingston/net/codec/MessageDecoder.java index 860e737f..fec63190 100644 --- a/src/main/java/com/kingston/net/codec/MessageDecoder.java +++ b/src/main/java/com/kingston/net/codec/MessageDecoder.java @@ -12,20 +12,19 @@ import org.slf4j.Logger; import com.baidu.bjf.remoting.protobuf.Codec; import com.baidu.bjf.remoting.protobuf.ProtobufProxy; import com.kingston.logs.LoggerSystem; -import com.kingston.net.Message; -import com.kingston.net.MessageFactory; -import com.kingston.net.SessionManager; -import com.kingston.net.SessionProperties; import com.kingston.net.combine.CombineMessage; import com.kingston.net.combine.Packet; +import com.kingston.net.message.Message; +import com.kingston.net.message.MessageFactory; +import com.kingston.net.session.SessionManager; +import com.kingston.net.session.SessionProperties; public class MessageDecoder implements ProtocolDecoder{ - + private static final Logger logger = LoggerSystem.EXCEPTION.getLogger(); public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws Exception { _decode(session, in, out); - } private void _decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) { @@ -59,7 +58,7 @@ public class MessageDecoder implements ProtocolDecoder{ byte[] body = new byte[length-4]; ioBuffer.get(body); Message msg = readMessage(moduleId, cmd, body); - + if (moduleId > 0) { out.write(msg); } else { //属于组合包 @@ -97,12 +96,10 @@ public class MessageDecoder implements ProtocolDecoder{ } public void dispose(IoSession arg0) throws Exception { - // TODO Auto-generated method stub } public void finishDecode(IoSession arg0, ProtocolDecoderOutput arg1) throws Exception { - // TODO Auto-generated method stub } diff --git a/src/main/java/com/kingston/net/codec/MessageEncoder.java b/src/main/java/com/kingston/net/codec/MessageEncoder.java index 74083be9..6dd4e401 100644 --- a/src/main/java/com/kingston/net/codec/MessageEncoder.java +++ b/src/main/java/com/kingston/net/codec/MessageEncoder.java @@ -10,9 +10,9 @@ import org.apache.mina.filter.codec.ProtocolEncoderOutput; import com.baidu.bjf.remoting.protobuf.Codec; import com.baidu.bjf.remoting.protobuf.ProtobufProxy; import com.kingston.logs.LoggerUtils; -import com.kingston.net.Message; -import com.kingston.net.MessageFactory; -import com.kingston.net.SessionProperties; +import com.kingston.net.message.Message; +import com.kingston.net.message.MessageFactory; +import com.kingston.net.session.SessionProperties; public class MessageEncoder implements ProtocolEncoder{ diff --git a/src/main/java/com/kingston/net/combine/CombineMessage.java b/src/main/java/com/kingston/net/combine/CombineMessage.java index d47cc3b8..16ba05d3 100644 --- a/src/main/java/com/kingston/net/combine/CombineMessage.java +++ b/src/main/java/com/kingston/net/combine/CombineMessage.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; -import com.kingston.net.Message; import com.kingston.net.annotation.MessageMeta; +import com.kingston.net.message.Message; /** * special message used to combine lots of messages together diff --git a/src/main/java/com/kingston/net/combine/Packet.java b/src/main/java/com/kingston/net/combine/Packet.java index 41731191..ae7bc555 100644 --- a/src/main/java/com/kingston/net/combine/Packet.java +++ b/src/main/java/com/kingston/net/combine/Packet.java @@ -7,8 +7,8 @@ import com.baidu.bjf.remoting.protobuf.FieldType; import com.baidu.bjf.remoting.protobuf.ProtobufProxy; import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; import com.kingston.logs.LoggerUtils; -import com.kingston.net.Message; -import com.kingston.net.MessageFactory; +import com.kingston.net.message.Message; +import com.kingston.net.message.MessageFactory; /** * message min unit diff --git a/src/main/java/com/kingston/net/dispatch/CmdExecutor.java b/src/main/java/com/kingston/net/message/CmdExecutor.java similarity index 95% rename from src/main/java/com/kingston/net/dispatch/CmdExecutor.java rename to src/main/java/com/kingston/net/message/CmdExecutor.java index 5ebd76fd..a29c9db2 100644 --- a/src/main/java/com/kingston/net/dispatch/CmdExecutor.java +++ b/src/main/java/com/kingston/net/message/CmdExecutor.java @@ -1,4 +1,4 @@ -package com.kingston.net.dispatch; +package com.kingston.net.message; import java.lang.reflect.Method; diff --git a/src/main/java/com/kingston/net/Message.java b/src/main/java/com/kingston/net/message/Message.java similarity index 95% rename from src/main/java/com/kingston/net/Message.java rename to src/main/java/com/kingston/net/message/Message.java index e3692f2f..3d8bbe12 100644 --- a/src/main/java/com/kingston/net/Message.java +++ b/src/main/java/com/kingston/net/message/Message.java @@ -1,4 +1,4 @@ -package com.kingston.net; +package com.kingston.net.message; import com.kingston.net.annotation.MessageMeta; diff --git a/src/main/java/com/kingston/net/dispatch/MessageDispatcher.java b/src/main/java/com/kingston/net/message/MessageDispatcher.java similarity index 95% rename from src/main/java/com/kingston/net/dispatch/MessageDispatcher.java rename to src/main/java/com/kingston/net/message/MessageDispatcher.java index d32cf8ef..3b47c224 100644 --- a/src/main/java/com/kingston/net/dispatch/MessageDispatcher.java +++ b/src/main/java/com/kingston/net/message/MessageDispatcher.java @@ -1,4 +1,4 @@ -package com.kingston.net.dispatch; +package com.kingston.net.message; import java.lang.reflect.Method; import java.util.HashMap; @@ -8,14 +8,13 @@ import java.util.Set; import org.apache.mina.core.session.IoSession; import com.kingston.logs.LoggerUtils; -import com.kingston.net.Message; -import com.kingston.net.SessionManager; -import com.kingston.net.SessionProperties; import com.kingston.net.annotation.Controller; import com.kingston.net.annotation.MessageMeta; import com.kingston.net.annotation.RequestMapping; -import com.kingston.net.context.MessageTask; -import com.kingston.net.context.TaskHandlerContext; +import com.kingston.net.session.SessionManager; +import com.kingston.net.session.SessionProperties; +import com.kingston.net.task.MessageTask; +import com.kingston.net.task.TaskHandlerContext; import com.kingston.utils.ClassScanner; public class MessageDispatcher { diff --git a/src/main/java/com/kingston/net/MessageFactory.java b/src/main/java/com/kingston/net/message/MessageFactory.java similarity index 97% rename from src/main/java/com/kingston/net/MessageFactory.java rename to src/main/java/com/kingston/net/message/MessageFactory.java index 2ce5a5cb..1f7c7854 100644 --- a/src/main/java/com/kingston/net/MessageFactory.java +++ b/src/main/java/com/kingston/net/message/MessageFactory.java @@ -1,4 +1,4 @@ -package com.kingston.net; +package com.kingston.net.message; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/kingston/net/MessagePusher.java b/src/main/java/com/kingston/net/message/MessagePusher.java similarity index 83% rename from src/main/java/com/kingston/net/MessagePusher.java rename to src/main/java/com/kingston/net/message/MessagePusher.java index 3ee48a32..044b0ed6 100644 --- a/src/main/java/com/kingston/net/MessagePusher.java +++ b/src/main/java/com/kingston/net/message/MessagePusher.java @@ -1,7 +1,10 @@ -package com.kingston.net; +package com.kingston.net.message; import org.apache.mina.core.session.IoSession; +import com.kingston.net.session.SessionManager; + + /** * util used to push message to client * @author kingston diff --git a/src/main/java/com/kingston/net/SessionManager.java b/src/main/java/com/kingston/net/session/SessionManager.java similarity index 97% rename from src/main/java/com/kingston/net/SessionManager.java rename to src/main/java/com/kingston/net/session/SessionManager.java index d048108e..74a03561 100644 --- a/src/main/java/com/kingston/net/SessionManager.java +++ b/src/main/java/com/kingston/net/session/SessionManager.java @@ -1,4 +1,4 @@ -package com.kingston.net; +package com.kingston.net.session; import java.net.InetSocketAddress; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/kingston/net/SessionProperties.java b/src/main/java/com/kingston/net/session/SessionProperties.java similarity index 93% rename from src/main/java/com/kingston/net/SessionProperties.java rename to src/main/java/com/kingston/net/session/SessionProperties.java index 750044d7..49a2ebef 100644 --- a/src/main/java/com/kingston/net/SessionProperties.java +++ b/src/main/java/com/kingston/net/session/SessionProperties.java @@ -1,4 +1,4 @@ -package com.kingston.net; +package com.kingston.net.session; import org.apache.mina.core.session.AttributeKey; diff --git a/src/main/java/com/kingston/net/context/AbstractDistributeTask.java b/src/main/java/com/kingston/net/task/AbstractDistributeTask.java similarity index 96% rename from src/main/java/com/kingston/net/context/AbstractDistributeTask.java rename to src/main/java/com/kingston/net/task/AbstractDistributeTask.java index 1a411cbf..d1c2ab4b 100644 --- a/src/main/java/com/kingston/net/context/AbstractDistributeTask.java +++ b/src/main/java/com/kingston/net/task/AbstractDistributeTask.java @@ -1,4 +1,4 @@ -package com.kingston.net.context; +package com.kingston.net.task; /** * provides a skeletal implementation of the IDistributeTask diff --git a/src/main/java/com/kingston/net/context/IDistributable.java b/src/main/java/com/kingston/net/task/IDistributable.java similarity index 80% rename from src/main/java/com/kingston/net/context/IDistributable.java rename to src/main/java/com/kingston/net/task/IDistributable.java index b4d072da..c2e4bfe6 100644 --- a/src/main/java/com/kingston/net/context/IDistributable.java +++ b/src/main/java/com/kingston/net/task/IDistributable.java @@ -1,4 +1,4 @@ -package com.kingston.net.context; +package com.kingston.net.task; /** * @author kingston diff --git a/src/main/java/com/kingston/net/context/IDistributeTask.java b/src/main/java/com/kingston/net/task/IDistributeTask.java similarity index 84% rename from src/main/java/com/kingston/net/context/IDistributeTask.java rename to src/main/java/com/kingston/net/task/IDistributeTask.java index 740095ef..2ac90461 100644 --- a/src/main/java/com/kingston/net/context/IDistributeTask.java +++ b/src/main/java/com/kingston/net/task/IDistributeTask.java @@ -1,4 +1,4 @@ -package com.kingston.net.context; +package com.kingston.net.task; /** * @author kingston diff --git a/src/main/java/com/kingston/net/context/MessageTask.java b/src/main/java/com/kingston/net/task/MessageTask.java similarity index 95% rename from src/main/java/com/kingston/net/context/MessageTask.java rename to src/main/java/com/kingston/net/task/MessageTask.java index 526c6f4a..1407dc1c 100644 --- a/src/main/java/com/kingston/net/context/MessageTask.java +++ b/src/main/java/com/kingston/net/task/MessageTask.java @@ -1,9 +1,9 @@ -package com.kingston.net.context; +package com.kingston.net.task; import java.lang.reflect.Method; import com.kingston.logs.LoggerUtils; -import com.kingston.net.Message; +import com.kingston.net.message.Message; /** * when server receives a message, wrapped it into a MessageTask, diff --git a/src/main/java/com/kingston/net/context/TaskHandlerContext.java b/src/main/java/com/kingston/net/task/TaskHandlerContext.java similarity index 98% rename from src/main/java/com/kingston/net/context/TaskHandlerContext.java rename to src/main/java/com/kingston/net/task/TaskHandlerContext.java index e1207cf2..82ec21f6 100644 --- a/src/main/java/com/kingston/net/context/TaskHandlerContext.java +++ b/src/main/java/com/kingston/net/task/TaskHandlerContext.java @@ -1,4 +1,4 @@ -package com.kingston.net.context; +package com.kingston.net.task; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/kingston/net/context/TimerTask.java b/src/main/java/com/kingston/net/task/TimerTask.java similarity index 94% rename from src/main/java/com/kingston/net/context/TimerTask.java rename to src/main/java/com/kingston/net/task/TimerTask.java index 7c6b374b..618456d1 100644 --- a/src/main/java/com/kingston/net/context/TimerTask.java +++ b/src/main/java/com/kingston/net/task/TimerTask.java @@ -1,4 +1,4 @@ -package com.kingston.net.context; +package com.kingston.net.task; /** * timer task, for thread safe diff --git a/src/main/java/com/kingston/tools/ProtoFileGenerator.java b/src/main/java/com/kingston/tools/ProtoFileGenerator.java index 09f7fa08..fd0f4268 100644 --- a/src/main/java/com/kingston/tools/ProtoFileGenerator.java +++ b/src/main/java/com/kingston/tools/ProtoFileGenerator.java @@ -7,7 +7,7 @@ import java.text.MessageFormat; import java.util.Set; import com.baidu.bjf.remoting.protobuf.ProtobufIDLGenerator; -import com.kingston.net.Message; +import com.kingston.net.message.Message; import com.kingston.utils.ClassScanner; /** diff --git a/src/test/java/com/kingston/client/ClientStartup.java b/src/test/java/com/kingston/client/ClientStartup.java index e23d4fca..f32164e2 100644 --- a/src/test/java/com/kingston/client/ClientStartup.java +++ b/src/test/java/com/kingston/client/ClientStartup.java @@ -1,7 +1,7 @@ package com.kingston.client; import com.kingston.ServerConfig; -import com.kingston.net.MessageFactory; +import com.kingston.net.message.MessageFactory; import com.kingston.robot.SocketRobot; /** diff --git a/src/test/java/com/kingston/robot/SocketRobot.java b/src/test/java/com/kingston/robot/SocketRobot.java index 1e772899..e5d0d07c 100644 --- a/src/test/java/com/kingston/robot/SocketRobot.java +++ b/src/test/java/com/kingston/robot/SocketRobot.java @@ -12,8 +12,8 @@ import com.kingston.ServerConfig; import com.kingston.game.login.message.ReqLoginMessage; import com.kingston.game.login.message.ReqSelectPlayerMessage; import com.kingston.logs.LoggerUtils; -import com.kingston.net.Message; import com.kingston.net.codec.MessageCodecFactory; +import com.kingston.net.message.Message; public class SocketRobot {