jforgame-socket-core内部代码结构调整

VERSIONS.md

@@ -361,12 +361,11 @@ BeanProcessor#toBean和toBeanList方法内部自动执行BaseEntity#afterLoad()
 ### jforgame-spring-boot-starter-data
     Container去掉#validate()无参方法
     Container#validate(DataRepository dataRepository)签名增加DataValidator异常
-### jforgame-socket-api
+### jforgame-socket-core
     jforgame-socket-api更名为jforgame-socket-core
     增加RequestScheduler抽象层
-    CommonMessageHandlerRegister移动到support包下
+    代码目录结构调整
     MessageExecuteUnit更名为MessageHandlerMethod
-    去掉share目录
     CallBackService#closeTimer()更名为shutdown()
     TrafficStatistic流量统计移到MessageHandler
 

jforgame-demo/src/main/java/jforgame/demo/cross/core/C2SSessionPoolFactory.java

@@ -8,7 +8,7 @@ import jforgame.demo.game.database.config.ConfigDataPool;
 import jforgame.demo.game.database.config.bean.ConfigCross;
 import jforgame.demo.game.database.config.storage.ConfigCrossStorage;
 import jforgame.demo.socket.GameSocketFactory;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 import org.apache.commons.pool2.BasePooledObjectFactory;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.impl.DefaultPooledObject;

jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackController.java

@@ -1,9 +1,9 @@
 package jforgame.demo.cross.core;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
+import jforgame.socket.protocol.message.Message;
 
 @MessageRoute
 public class CallbackController {

jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackHandler.java

@@ -1,8 +1,8 @@
 package jforgame.demo.cross.core;
 
 import jforgame.demo.cross.demo.HelloCallbackHandler;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.message.Message;
 
 import java.util.HashMap;
 import java.util.Map;

jforgame-demo/src/main/java/jforgame/demo/cross/core/F2GCallBack.java

@@ -2,8 +2,8 @@ package jforgame.demo.cross.core;
 
 import jforgame.commons.util.JsonUtil;
 import jforgame.demo.game.Modules;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 /**
  * 跨服回调响应方

jforgame-demo/src/main/java/jforgame/demo/cross/core/G2FCallBack.java

@@ -3,8 +3,8 @@ package jforgame.demo.cross.core;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jforgame.commons.util.JsonUtil;
 import jforgame.demo.game.Modules;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 import java.util.Base64;
 import java.util.HashMap;

jforgame-demo/src/main/java/jforgame/demo/cross/demo/F2GHeartBeat.java

@@ -2,8 +2,8 @@ package jforgame.demo.cross.demo;
 
 import jforgame.demo.cross.core.CrossCommands;
 import jforgame.demo.game.Modules;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module = Modules.CROSS, cmd  = CrossCommands.F2G_HEART_BEAT)
 public class F2GHeartBeat implements Message {

jforgame-demo/src/main/java/jforgame/demo/cross/demo/G2FHeartBeat.java

@@ -2,8 +2,8 @@ package jforgame.demo.cross.demo;
 
 import jforgame.demo.cross.core.CrossCommands;
 import jforgame.demo.game.Modules;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module = Modules.CROSS, cmd  = CrossCommands.G2F_HEART_BEAT)
 public class G2FHeartBeat implements Message {

jforgame-demo/src/main/java/jforgame/demo/cross/demo/HelloCallbackHandler.java

@@ -3,7 +3,7 @@ package jforgame.demo.cross.demo;
 import jforgame.demo.cross.core.G2FCallBack;
 import jforgame.demo.cross.core.CallBackCommands;
 import jforgame.demo.cross.core.CallbackHandler;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 
 public class HelloCallbackHandler extends CallbackHandler {
 

jforgame-demo/src/main/java/jforgame/demo/game/core/MessagePusher.java

@@ -4,8 +4,8 @@ import jforgame.demo.game.database.config.ConfigDataPool;
 import jforgame.demo.game.database.config.bean.ConfigNotice;
 import jforgame.demo.game.database.config.storage.ConfigNoticeStorage;
 import jforgame.demo.socket.SessionManager;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.message.Message;
 import org.apache.mina.core.session.IoSession;
 
 import java.util.Collection;

jforgame-demo/src/main/java/jforgame/demo/game/gm/controller/GmController.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.gm.controller;
 
 import jforgame.demo.game.GameContext;
 import jforgame.demo.game.gm.message.ReqGmExec;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
 
 @MessageRoute
 public class GmController {

jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ReqGmExec.java

@@ -3,8 +3,8 @@ package jforgame.demo.game.gm.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.gm.GmConstant;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 /**
  * gm 执行命令

jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ResGmResult.java

@@ -3,8 +3,8 @@ package jforgame.demo.game.gm.message;
 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.gm.GmConstant;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 /**
  * gm执行结果

jforgame-demo/src/main/java/jforgame/demo/game/hello/HelloMsgRoute.java

@@ -1,8 +1,8 @@
 package jforgame.demo.game.hello;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
 
 @MessageRoute
 public class HelloMsgRoute {

jforgame-demo/src/main/java/jforgame/demo/game/hello/ReqHello.java

@@ -1,7 +1,7 @@
 package jforgame.demo.game.hello;
 
 
-import jforgame.socket.share.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageMeta;
 
 @MessageMeta(cmd = 888)
 public class ReqHello {

jforgame-demo/src/main/java/jforgame/demo/game/hello/ResHello.java

@@ -1,6 +1,6 @@
 package jforgame.demo.game.hello;
 
-import jforgame.socket.share.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageMeta;
 
 @MessageMeta(cmd = 999)
 public class ResHello {

jforgame-demo/src/main/java/jforgame/demo/game/login/LoginManager.java

@@ -11,7 +11,7 @@ import jforgame.demo.game.player.model.AccountProfile;
 import jforgame.demo.game.player.model.PlayerProfile;
 import jforgame.demo.game.scene.message.ResPlayerEnterScene;
 import jforgame.demo.socket.SessionManager;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;

jforgame-demo/src/main/java/jforgame/demo/game/login/controller/LoginController.java

@@ -3,9 +3,9 @@ package jforgame.demo.game.login.controller;
 import jforgame.demo.game.GameContext;
 import jforgame.demo.game.login.message.ReqAccountLogin;
 import jforgame.demo.game.login.message.ReqSelectPlayer;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
 
 @MessageRoute
 public class LoginController {

jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqAccountLogin.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.login.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.login.LoginDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 /**
  * 请求－账号登录

jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqSelectPlayer.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.login.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.login.LoginDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module=Modules.LOGIN, cmd=LoginDataPool.REQ_SELECT_PLAYER)
 public class ReqSelectPlayer implements Message {

jforgame-demo/src/main/java/jforgame/demo/game/login/message/ResAccountLogin.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.login.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.login.LoginDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 import java.util.ArrayList;
 import java.util.List;

jforgame-demo/src/main/java/jforgame/demo/game/player/PlayerManager.java

@@ -18,7 +18,7 @@ import jforgame.demo.game.player.model.PlayerProfile;
 import jforgame.demo.listener.EventDispatcher;
 import jforgame.demo.listener.EventType;
 import jforgame.demo.utils.IdGenerator;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-demo/src/main/java/jforgame/demo/game/player/controller/PlayerController.java

@@ -2,9 +2,9 @@ package jforgame.demo.game.player.controller;
 
 import jforgame.demo.game.GameContext;
 import jforgame.demo.game.player.message.ReqCreateNewPlayer;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
 
 @MessageRoute
 public class PlayerController {

jforgame-demo/src/main/java/jforgame/demo/game/player/message/ReqCreateNewPlayer.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.player.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.player.PlayerDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module=Modules.PLAYER, cmd= PlayerDataPool.REQ_CREATE_PLAYER)
 public class ReqCreateNewPlayer implements Message {

jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResCreateNewPlayer.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.player.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.player.PlayerDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module=Modules.PLAYER, cmd= PlayerDataPool.RES_CREATE_PLAYER)
 public class ResCreateNewPlayer implements Message {

jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResKickPlayer.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.player.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.player.PlayerDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module=Modules.PLAYER, cmd= PlayerDataPool.RES_KICK_PLAYER)
 public class ResKickPlayer implements Message {

jforgame-demo/src/main/java/jforgame/demo/game/scene/message/ResPlayerEnterScene.java

@@ -1,8 +1,8 @@
 package jforgame.demo.game.scene.message;
 
 import jforgame.demo.game.Modules;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module=Modules.SCENE, cmd=1)
 public class ResPlayerEnterScene implements Message {

jforgame-demo/src/main/java/jforgame/demo/game/skill/facade/SkillController.java

@@ -1,8 +1,8 @@
 package jforgame.demo.game.skill.facade;
 
 import jforgame.demo.game.skill.message.ReqUseSkill;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
 
 @MessageRoute
 public class SkillController {

jforgame-demo/src/main/java/jforgame/demo/game/skill/message/ReqUseSkill.java

@@ -2,8 +2,8 @@ package jforgame.demo.game.skill.message;
 
 import jforgame.demo.game.Modules;
 import jforgame.demo.game.skill.SkillDataPool;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 @MessageMeta(module=Modules.SKILL, cmd=SkillDataPool.REQ_USE_SKILL)
 public class ReqUseSkill implements Message {

jforgame-demo/src/main/java/jforgame/demo/socket/GameMessageFactory.java

@@ -2,8 +2,8 @@ package jforgame.demo.socket;
 
 import jforgame.commons.util.ClassScanner;
 import jforgame.demo.ServerScanPaths;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.MessageFactory;
 import jforgame.socket.support.DefaultMessageFactory;
 
 import java.util.Collection;

jforgame-demo/src/main/java/jforgame/demo/socket/GameSocketFactory.java

@@ -5,7 +5,7 @@ import jforgame.socket.client.SocketClient;
 import jforgame.socket.mina.server.TcpSocketServerBuilder;
 import jforgame.socket.netty.client.TcpSocketClient;
 import jforgame.socket.server.ServerNode;
-import jforgame.socket.share.HostAndPort;
+import jforgame.socket.net.HostAndPort;
 
 /**
  * 游戏服 socket 默认装配，屏蔽重复的 messageFactory / codec / dispatcher 组装逻辑。

jforgame-demo/src/main/java/jforgame/demo/socket/MessageIoDispatcher.java

@@ -2,14 +2,14 @@ package jforgame.demo.socket;
 
 import jforgame.demo.game.GameContext;
 import jforgame.demo.game.database.user.PlayerEnt;
-import jforgame.socket.share.ChainedMessageDispatcher;
-import jforgame.socket.share.CommonMessageHandlerRegister;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.MessageHandler;
-import jforgame.socket.share.MessageHandlerRegister;
-import jforgame.socket.share.PreprocessingMessageHandler;
-import jforgame.socket.share.message.MessageFactory;
-import jforgame.socket.share.RequestScheduler;
+import jforgame.socket.dispatch.ChainedMessageDispatcher;
+import jforgame.socket.support.CommonMessageHandlerRegister;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.MessageHandler;
+import jforgame.socket.registry.MessageHandlerRegister;
+import jforgame.socket.dispatch.PreprocessingMessageHandler;
+import jforgame.socket.protocol.message.MessageFactory;
+import jforgame.socket.dispatch.RequestScheduler;
 import jforgame.socket.support.RequestSchedulers;
 import jforgame.threadmodel.dispatch.BaseDispatchTask;
 

jforgame-demo/src/main/java/jforgame/demo/socket/SessionManager.java

@@ -1,7 +1,7 @@
 package jforgame.demo.socket;
 
 import jforgame.commons.util.NumberUtil;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

jforgame-demo/src/main/java/jforgame/demo/socket/client/RpcClientHelper.java

@@ -7,11 +7,11 @@ import jforgame.socket.client.CallbackTimeoutException;
 import jforgame.socket.client.RpcMessageClient;
 import jforgame.socket.client.SocketClient;
 import jforgame.socket.mina.client.TcpSocketClient;
-import jforgame.socket.share.HostAndPort;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.SocketIoDispatcher;
-import jforgame.socket.share.SocketIoDispatcherAdapter;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.net.HostAndPort;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.SocketIoDispatcher;
+import jforgame.socket.dispatch.SocketIoDispatcherAdapter;
+import jforgame.socket.protocol.message.MessageFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-demo/src/main/java/jforgame/demo/socket/filter/FloodFilter.java

@@ -4,10 +4,10 @@ import jforgame.commons.util.NumberUtil;
 import jforgame.commons.util.TimeUtil;
 import jforgame.demo.FireWall;
 import jforgame.demo.ServerConfig;
-import jforgame.socket.share.MessageHandler;
+import jforgame.socket.dispatch.MessageHandler;
 import jforgame.demo.socket.model.FloodRecord;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-demo/src/main/java/jforgame/demo/socket/filter/MessageTraceFilter.java

@@ -1,9 +1,9 @@
 package jforgame.demo.socket.filter;
 
 import jforgame.commons.util.JsonUtil;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.MessageHandler;
-import jforgame.socket.share.RequestContext;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.MessageHandler;
+import jforgame.socket.dispatch.RequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-demo/src/main/java/jforgame/demo/socket/filter/ModuleEntranceFilter.java

@@ -2,9 +2,9 @@ package jforgame.demo.socket.filter;
 
 import jforgame.demo.socket.GameMessageFactory;
 import jforgame.demo.socket.NetGateKeeper;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.MessageHandler;
-import jforgame.socket.share.RequestContext;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.MessageHandler;
+import jforgame.socket.dispatch.RequestContext;
 
 /**
  * 功能模块请求过滤器

jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/CSharpProtocolGenerator.java

@@ -4,8 +4,8 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
 import jforgame.commons.util.FileUtil;
-import jforgame.socket.share.message.Message;
-import jforgame.socket.share.message.Response;
+import jforgame.socket.protocol.message.Message;
+import jforgame.socket.protocol.message.Response;
 
 import java.io.File;
 import java.io.FileWriter;

jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/ProtocolDocGenerator.java

@@ -7,8 +7,8 @@ import com.github.javaparser.ast.body.FieldDeclaration;
 import jforgame.commons.util.ClassScanner;
 import jforgame.commons.util.FileUtil;
 import jforgame.demo.socket.GameMessageFactory;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.message.Message;
 
 import java.io.File;
 import java.io.IOException;

jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/TypeScriptProtocolGenerator.java

@@ -4,8 +4,8 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
 import jforgame.commons.util.FileUtil;
-import jforgame.socket.share.message.Message;
-import jforgame.socket.share.message.Response;
+import jforgame.socket.protocol.message.Message;
+import jforgame.socket.protocol.message.Response;
 
 import java.io.File;
 import java.io.FileWriter;

jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageExport.java

@@ -2,7 +2,7 @@ package jforgame.demo.tools.protocol.message;
 
 import jforgame.commons.util.ClassScanner;
 import jforgame.demo.ServerScanPaths;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.message.Message;
 
 import java.util.stream.Collectors;
 

jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageMetadata.java

@@ -1,6 +1,6 @@
 package jforgame.demo.tools.protocol.message;
 
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.message.Message;
 
 public class MessageMetadata implements Comparable<MessageMetadata> {
 

jforgame-demo/src/main/java/jforgame/demo/tools/protocol/protobuf/ProtoFileGenerator.java

@@ -2,7 +2,7 @@ package jforgame.demo.tools.protocol.protobuf;
 
 import com.baidu.bjf.remoting.protobuf.ProtobufIDLGenerator;
 import jforgame.commons.util.ClassScanner;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.message.Message;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;

jforgame-demo/src/test/java/jforgame/demo/client/ClientPlayer.java

@@ -4,8 +4,8 @@ import jforgame.commons.util.JsonUtil;
 import jforgame.demo.game.login.message.ReqAccountLogin;
 import jforgame.demo.game.login.message.ReqSelectPlayer;
 import jforgame.demo.game.player.message.ReqCreateNewPlayer;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.message.Message;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.message.Message;
 
 /**
  * 使用socket构建的机器人

jforgame-demo/src/test/java/jforgame/demo/client/ClientStartup.java

@@ -11,11 +11,11 @@ import jforgame.socket.client.RequestCallback;
 import jforgame.socket.client.RpcMessageClient;
 import jforgame.socket.client.SocketClient;
 import jforgame.socket.mina.client.TcpSocketClient;
-import jforgame.socket.share.HostAndPort;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
-import jforgame.socket.share.SocketIoDispatcher;
-import jforgame.socket.share.SocketIoDispatcherAdapter;
+import jforgame.socket.net.HostAndPort;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.dispatch.SocketIoDispatcher;
+import jforgame.socket.dispatch.SocketIoDispatcherAdapter;
 
 /**
  * 客户端模拟器启动程序

jforgame-demo/src/test/java/jforgame/demo/udp/LoginRouter.java

@@ -1,9 +1,9 @@
 package jforgame.demo.udp;
 
-import jforgame.socket.share.HostAndPort;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
+import jforgame.socket.net.HostAndPort;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
 
 @MessageRoute
 public class LoginRouter {

jforgame-demo/src/test/java/jforgame/demo/udp/MessageIoDispatcher.java

@@ -2,13 +2,13 @@ package jforgame.demo.udp;
 
 import jforgame.demo.socket.GameMessageFactory;
 import jforgame.demo.socket.GameServer;
-import jforgame.socket.share.ChainedMessageDispatcher;
-import jforgame.socket.share.CommonMessageHandlerRegister;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.MessageHandler;
-import jforgame.socket.share.MessageHandlerRegister;
-import jforgame.socket.share.message.MessageExecutor;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.dispatch.ChainedMessageDispatcher;
+import jforgame.socket.support.CommonMessageHandlerRegister;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.MessageHandler;
+import jforgame.socket.registry.MessageHandlerRegister;
+import jforgame.socket.protocol.message.MessageExecutor;
+import jforgame.socket.protocol.message.MessageFactory;
 import jforgame.socket.support.ClientRequestTask;
 
 import java.util.Collections;

jforgame-demo/src/test/java/jforgame/demo/udp/Player.java

@@ -1,7 +1,7 @@
 package jforgame.demo.udp;
 
-import jforgame.socket.share.HostAndPort;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.net.HostAndPort;
+import jforgame.socket.session.IdSession;
 
 public class Player {
 

jforgame-demo/src/test/java/jforgame/demo/udp/ReqLogin.java

@@ -1,6 +1,6 @@
 package jforgame.demo.udp;
 
-import jforgame.socket.share.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageMeta;
 
 @MessageMeta(cmd = 55555)
 public class ReqLogin extends UdpMessage {

jforgame-demo/src/test/java/jforgame/demo/udp/ResPlayerLogin.java

@@ -1,6 +1,6 @@
 package jforgame.demo.udp;
 
-import jforgame.socket.share.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageMeta;
 
 @MessageMeta(cmd = 55556)
 public class ResPlayerLogin extends UdpMessage {

jforgame-demo/src/test/java/jforgame/demo/udp/ResWelcome.java

@@ -1,6 +1,6 @@
 package jforgame.demo.udp;
 
-import jforgame.socket.share.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageMeta;
 
 @MessageMeta(cmd = 55557)
 public class ResWelcome extends UdpMessage {

jforgame-demo/src/test/java/jforgame/demo/udp/SessionManager.java

@@ -2,7 +2,7 @@ package jforgame.demo.udp;
 
 import jforgame.commons.util.TimeUtil;
 import jforgame.demo.game.core.SchedulerManager;
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

jforgame-demo/src/test/java/jforgame/demo/udp/UdpChannelIoHandler.java

@@ -6,10 +6,10 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import jforgame.socket.netty.ChannelUtils;
 import jforgame.socket.netty.NSession;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
-import jforgame.socket.share.SocketIoDispatcher;
-import jforgame.socket.share.message.RequestDataFrame;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.dispatch.SocketIoDispatcher;
+import jforgame.socket.protocol.message.RequestDataFrame;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-demo/src/test/java/jforgame/demo/udp/UdpMessage.java

@@ -1,6 +1,6 @@
 package jforgame.demo.udp;
 
-import jforgame.socket.share.message.Message;
+import jforgame.socket.protocol.message.Message;
 
 public class UdpMessage implements Message {
 

jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolDecoder.java

@@ -5,9 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import jforgame.codec.MessageCodec;
-import jforgame.socket.share.message.MessageFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import jforgame.socket.protocol.message.MessageFactory;
 
 import java.util.List;
 

jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolEncoder.java

@@ -6,7 +6,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import jforgame.codec.MessageCodec;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.protocol.message.MessageFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketClient.java

@@ -16,12 +16,12 @@ import jforgame.commons.util.JsonUtil;
 import jforgame.demo.socket.GameMessageFactory;
 import jforgame.socket.client.AbstractSocketClient;
 import jforgame.socket.netty.NSession;
-import jforgame.socket.share.HostAndPort;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
-import jforgame.socket.share.SocketIoDispatcher;
-import jforgame.socket.share.SocketIoDispatcherAdapter;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.net.HostAndPort;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.dispatch.SocketIoDispatcher;
+import jforgame.socket.dispatch.SocketIoDispatcherAdapter;
+import jforgame.socket.protocol.message.MessageFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketServer.java

@@ -12,10 +12,10 @@ import io.netty.handler.logging.LoggingHandler;
 import jforgame.codec.MessageCodec;
 import jforgame.codec.struct.StructMessageCodec;
 import jforgame.demo.socket.GameMessageFactory;
-import jforgame.socket.share.HostAndPort;
+import jforgame.socket.net.HostAndPort;
 import jforgame.socket.server.ServerNode;
-import jforgame.socket.share.SocketIoDispatcher;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.dispatch.SocketIoDispatcher;
+import jforgame.socket.protocol.message.MessageFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/AbstractSocketClient.java

@@ -1,11 +1,11 @@
 package jforgame.socket.client;
 
 import jforgame.codec.MessageCodec;
-import jforgame.socket.share.HostAndPort;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.SocketIoDispatcher;
-import jforgame.socket.share.SocketIoDispatcherAdapter;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.net.HostAndPort;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.SocketIoDispatcher;
+import jforgame.socket.dispatch.SocketIoDispatcherAdapter;
+import jforgame.socket.protocol.message.MessageFactory;
 
 /**
  * 抽象的socket客户端

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RequestResponseFuture.java

@@ -1,6 +1,6 @@
 package jforgame.socket.client;
 
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RpcMessageClient.java

@@ -1,6 +1,6 @@
 package jforgame.socket.client;
 
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/SocketClient.java

@@ -1,6 +1,6 @@
 package jforgame.socket.client;
 
-import jforgame.socket.share.IdSession;
+import jforgame.socket.session.IdSession;
 
 import java.io.IOException;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/ChainedMessageDispatcher.java

@@ -1,5 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
 
+import jforgame.socket.session.IdSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/MessageHandler.java

@@ -1,4 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
+
+import jforgame.socket.session.IdSession;
 
 /**
  * 消息处理接口，用于处理具体的消息

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/MessageParameterConverter.java

@@ -1,12 +1,15 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
+
+import jforgame.socket.protocol.annotation.RequestHandler;
+import jforgame.socket.session.IdSession;
 
 /**
- * 消息参数转换器，用于将消息参数转换为被{@link jforgame.socket.share.annotation.RequestHandler}注解的方法的实参
+ * 消息参数转换器，用于将消息参数转换为被{@link RequestHandler}注解的方法的实参
  */
 public interface MessageParameterConverter {
 
      /**
-      * 将各种参数转为被{@link jforgame.socket.share.annotation.RequestHandler}注解的方法的实参
+      * 将各种参数转为被{@link RequestHandler}注解的方法的实参
       *
       * @param session      会话
       * @param methodParams 方法参数

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/PreprocessingMessageHandler.java

@@ -1,7 +1,9 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
 
-import jforgame.socket.share.message.MessageExecutor;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.registry.MessageHandlerRegister;
+import jforgame.socket.protocol.message.MessageExecutor;
+import jforgame.socket.protocol.message.MessageFactory;
 import jforgame.socket.support.DefaultMessageParameterConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestActorSelector.java

@@ -1,5 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
 
+import jforgame.socket.session.IdSession;
 import jforgame.threadmodel.actor.Actor;
 
 /**

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestContext.java

@@ -1,7 +1,7 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
 
-import jforgame.socket.share.message.MessageExecutor;
-import jforgame.socket.share.message.MessageHeader;
+import jforgame.socket.protocol.message.MessageExecutor;
+import jforgame.socket.protocol.message.MessageHeader;
 
 /**
  * 对于客户端的每一个请求，在生命周期内，都有一个供框架执行的上下文

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestDispatchKeyResolver.java

@@ -1,4 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
+
+import jforgame.socket.session.IdSession;
 
 /**
  * 请求分发键解析器。

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestScheduler.java

@@ -1,4 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
+
+import jforgame.socket.session.IdSession;
 
 /**
  * 请求调度器，用于将客户端请求消息投递到具体线程模型。

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/SocketIoDispatcher.java

@@ -1,4 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
+
+import jforgame.socket.session.IdSession;
 
 /**
  * 消息分发器，服务器，客户端均适用

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/SocketIoDispatcherAdapter.java

@@ -1,4 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.dispatch;
+
+import jforgame.socket.session.IdSession;
 
 /**
  * 用于适配SocketIoDispatcher接口的默认实现

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/monitoring/TrafficStatistic.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share;
+package jforgame.socket.monitoring;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/net/HostAndPort.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share;
+package jforgame.socket.net;
 
 /**
  * socket连接的主机与端口

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/net/WebSocketJsonFrame.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share;
+package jforgame.socket.net;
 
 /**
  * 当使用WebSocket传输文本格式的消息时，定义一个消息帧类

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/MessageMeta.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.annotation;
+package jforgame.socket.protocol.annotation;
 
 
 import java.lang.annotation.Documented;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/MessageRoute.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.annotation;
+package jforgame.socket.protocol.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/RequestHandler.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.annotation;
+package jforgame.socket.protocol.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/Message.java

@@ -1,6 +1,6 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
-import jforgame.socket.share.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageMeta;
 
 /**
  * 通信消息基础接口

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageExecutor.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
 import java.lang.reflect.Method;
 /**

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageFactory.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
 import java.util.Collection;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageHeader.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
 /**
  * 私有协议栈——消息包头定义

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/RequestDataFrame.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
 /**
  * 解析过的私有协议栈包结构

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/Response.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
 /**
  * 通用响应类

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/SocketDataFrame.java

@@ -1,4 +1,4 @@
-package jforgame.socket.share.message;
+package jforgame.socket.protocol.message;
 
 /**
  * 套接字数据帧，用于标识客户端一个完整的消息包

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/registry/MessageHandlerRegister.java

@@ -1,6 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.registry;
 
-import jforgame.socket.share.message.MessageExecutor;
+import jforgame.socket.protocol.message.MessageExecutor;
 
 /**
  * 消息处理注册器，用于注册消息处理方法

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/session/IdSession.java

@@ -1,6 +1,6 @@
-package jforgame.socket.share;
+package jforgame.socket.session;
 
-import jforgame.socket.share.message.SocketDataFrame;
+import jforgame.socket.protocol.message.SocketDataFrame;
 
 import java.io.Closeable;
 import java.io.IOException;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ActorRequestScheduler.java

@@ -1,9 +1,9 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestActorSelector;
-import jforgame.socket.share.RequestContext;
-import jforgame.socket.share.RequestScheduler;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestActorSelector;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.dispatch.RequestScheduler;
 import jforgame.threadmodel.actor.Actor;
 
 /**

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestExecutor.java

@@ -2,8 +2,8 @@ package jforgame.socket.support;
 
 import jforgame.commons.reflection.MethodCaller;
 import jforgame.commons.reflection.MethodHandleUtils;
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestMail.java

@@ -1,10 +1,8 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.session.IdSession;
 import jforgame.threadmodel.actor.mail.Mail;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 若线程模型采用{@link jforgame.threadmodel.actor.ActorSystem}
@@ -12,9 +10,6 @@ import org.slf4j.LoggerFactory;
  */
 public class ClientRequestMail extends Mail {
 
-
-    private static final Logger logger = LoggerFactory.getLogger(ClientRequestMail.class);
-
     private IdSession session;
 
     private RequestContext requestContext;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestTask.java

@@ -1,7 +1,7 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
 import jforgame.threadmodel.dispatch.BaseDispatchTask;
 
 /**
@@ -22,7 +22,6 @@ public class ClientRequestTask extends BaseDispatchTask {
         return task;
     }
 
-
     @Override
     public void action() {
         ClientRequestExecutor.execute(session, requestContext);

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/CommonMessageHandlerRegister.java

@@ -1,13 +1,11 @@
-package jforgame.socket.share;
+package jforgame.socket.support;
 
 import jforgame.commons.util.ClassScanner;
-import jforgame.socket.share.annotation.MessageMeta;
-import jforgame.socket.share.annotation.MessageRoute;
-import jforgame.socket.share.annotation.RequestHandler;
-import jforgame.socket.share.message.MessageExecutor;
-import jforgame.socket.share.message.MessageFactory;
-import jforgame.socket.support.DefaultMessageHandlerRegister;
-import jforgame.socket.support.MessageExecuteUnit;
+import jforgame.socket.protocol.annotation.MessageMeta;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
+import jforgame.socket.protocol.message.MessageExecutor;
+import jforgame.socket.protocol.message.MessageFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +55,7 @@ public class CommonMessageHandlerRegister extends DefaultMessageHandlerRegister
                     if (cmdExecutor != null) {
                         throw new RuntimeException(String.format("cmd[%d] duplicated", cmd));
                     }
-                    cmdExecutor = MessageExecuteUnit.valueOf(method, method.getParameterTypes(), route);
+                    cmdExecutor = MessageHandlerMethod.valueOf(method, method.getParameterTypes(), route);
                     register(cmd, cmdExecutor);
                 });
             }

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageFactory.java

@@ -1,6 +1,6 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.protocol.message.MessageFactory;
 
 import java.util.Collection;
 import java.util.HashSet;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHandlerRegister.java

@@ -1,7 +1,7 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.MessageHandlerRegister;
-import jforgame.socket.share.message.MessageExecutor;
+import jforgame.socket.registry.MessageHandlerRegister;
+import jforgame.socket.protocol.message.MessageExecutor;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHeader.java

@@ -1,6 +1,6 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.message.MessageHeader;
+import jforgame.socket.protocol.message.MessageHeader;
 
 import java.nio.ByteBuffer;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageParameterConverter.java

@@ -1,9 +1,9 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.MessageParameterConverter;
-import jforgame.socket.share.RequestContext;
-import jforgame.socket.share.message.MessageFactory;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.MessageParameterConverter;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.protocol.message.MessageFactory;
 
 /**
  * 默认的消息参数转换器

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DispatchThreadRequestScheduler.java

@@ -1,9 +1,9 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.IdSession;
-import jforgame.socket.share.RequestContext;
-import jforgame.socket.share.RequestDispatchKeyResolver;
-import jforgame.socket.share.RequestScheduler;
+import jforgame.socket.session.IdSession;
+import jforgame.socket.dispatch.RequestContext;
+import jforgame.socket.dispatch.RequestDispatchKeyResolver;
+import jforgame.socket.dispatch.RequestScheduler;
 import jforgame.threadmodel.dispatch.DispatchThreadModel;
 
 /**

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/MessageHandlerMethod.java

@@ -1,17 +1,19 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.message.MessageExecutor;
+import jforgame.socket.protocol.annotation.MessageRoute;
+import jforgame.socket.protocol.annotation.RequestHandler;
+import jforgame.socket.protocol.message.MessageExecutor;
 
 import java.lang.reflect.Method;
 
 /**
- * 默认的消息执行单元
+ * 默认的消息执行器
  */
-public class MessageExecuteUnit implements MessageExecutor {
+public class MessageHandlerMethod implements MessageExecutor {
 
     /**
-     * 对应消息路由的指定方法 {@link jforgame.socket.share.annotation.RequestHandler}
-     * @see jforgame.socket.share.annotation.MessageRoute
+     * 对应消息路由的指定方法 {@link RequestHandler}
+     * @see MessageRoute
      */
     private Method method;
     /**
@@ -20,12 +22,12 @@ public class MessageExecuteUnit implements MessageExecutor {
     private Class<?>[] params;
     /**
      * 对应消息路由对象
-     * @see jforgame.socket.share.annotation.MessageRoute
+     * @see MessageRoute
      */
     private Object handler;
 
-    public static MessageExecuteUnit valueOf(Method method, Class<?>[] params, Object handler) {
-        MessageExecuteUnit executor = new MessageExecuteUnit();
+    public static MessageHandlerMethod valueOf(Method method, Class<?>[] params, Object handler) {
+        MessageHandlerMethod executor = new MessageHandlerMethod();
         executor.method = method;
         executor.params = params;
         executor.handler = handler;

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/RequestSchedulers.java

@@ -1,8 +1,8 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.RequestActorSelector;
-import jforgame.socket.share.RequestDispatchKeyResolver;
-import jforgame.socket.share.RequestScheduler;
+import jforgame.socket.dispatch.RequestActorSelector;
+import jforgame.socket.dispatch.RequestDispatchKeyResolver;
+import jforgame.socket.dispatch.RequestScheduler;
 import jforgame.threadmodel.actor.ActorSystem;
 import jforgame.threadmodel.dispatch.DispatchThreadModel;
 

jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/SharedActorRequestScheduler.java

@@ -1,6 +1,6 @@
 package jforgame.socket.support;
 
-import jforgame.socket.share.RequestDispatchKeyResolver;
+import jforgame.socket.dispatch.RequestDispatchKeyResolver;
 import jforgame.threadmodel.actor.ActorSystem;
 
 /**