diff --git a/VERSIONS.md b/VERSIONS.md index 30fb0494..c8e3ed48 100644 --- a/VERSIONS.md +++ b/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 diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/core/C2SSessionPoolFactory.java b/jforgame-demo/src/main/java/jforgame/demo/cross/core/C2SSessionPoolFactory.java index dbba0fa2..465ce19e 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/core/C2SSessionPoolFactory.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackController.java b/jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackController.java index d238e565..15be8537 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackController.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackHandler.java b/jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackHandler.java index 879e5f8e..5a44e345 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/core/CallbackHandler.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/core/F2GCallBack.java b/jforgame-demo/src/main/java/jforgame/demo/cross/core/F2GCallBack.java index 51f6f8d9..8a07874c 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/core/F2GCallBack.java +++ b/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; /** * 跨服回调响应方 diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/core/G2FCallBack.java b/jforgame-demo/src/main/java/jforgame/demo/cross/core/G2FCallBack.java index d6ffefa2..f2de1452 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/core/G2FCallBack.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/demo/F2GHeartBeat.java b/jforgame-demo/src/main/java/jforgame/demo/cross/demo/F2GHeartBeat.java index 8c419cca..382abb1d 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/demo/F2GHeartBeat.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/demo/G2FHeartBeat.java b/jforgame-demo/src/main/java/jforgame/demo/cross/demo/G2FHeartBeat.java index 4b381cb8..cd303dda 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/demo/G2FHeartBeat.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/cross/demo/HelloCallbackHandler.java b/jforgame-demo/src/main/java/jforgame/demo/cross/demo/HelloCallbackHandler.java index 0c667869..15d0f4d7 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/cross/demo/HelloCallbackHandler.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/core/MessagePusher.java b/jforgame-demo/src/main/java/jforgame/demo/game/core/MessagePusher.java index 6948c522..3e3b8bc4 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/core/MessagePusher.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/gm/controller/GmController.java b/jforgame-demo/src/main/java/jforgame/demo/game/gm/controller/GmController.java index b22317d8..11a34ee2 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/gm/controller/GmController.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ReqGmExec.java b/jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ReqGmExec.java index 01f6b227..46c5f4a8 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ReqGmExec.java +++ b/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 执行命令 diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ResGmResult.java b/jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ResGmResult.java index 025db3c8..84897329 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/gm/message/ResGmResult.java +++ b/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执行结果 diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/hello/HelloMsgRoute.java b/jforgame-demo/src/main/java/jforgame/demo/game/hello/HelloMsgRoute.java index e32cc0fe..c1f6efbd 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/hello/HelloMsgRoute.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/hello/ReqHello.java b/jforgame-demo/src/main/java/jforgame/demo/game/hello/ReqHello.java index ae54b01e..635c4f95 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/hello/ReqHello.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/hello/ResHello.java b/jforgame-demo/src/main/java/jforgame/demo/game/hello/ResHello.java index b2c50416..cc0d934b 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/hello/ResHello.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/login/LoginManager.java b/jforgame-demo/src/main/java/jforgame/demo/game/login/LoginManager.java index 54edac44..f7e9a931 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/login/LoginManager.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/login/controller/LoginController.java b/jforgame-demo/src/main/java/jforgame/demo/game/login/controller/LoginController.java index 8e0e9120..30ce51c5 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/login/controller/LoginController.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqAccountLogin.java b/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqAccountLogin.java index e982c996..3e70e47f 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqAccountLogin.java +++ b/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; /** * 请求－账号登录 diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqSelectPlayer.java b/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqSelectPlayer.java index defe0e3d..0005c816 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ReqSelectPlayer.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ResAccountLogin.java b/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ResAccountLogin.java index 95e4aab3..5be174a7 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/login/message/ResAccountLogin.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/player/PlayerManager.java b/jforgame-demo/src/main/java/jforgame/demo/game/player/PlayerManager.java index 1a21f71d..53df4ac3 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/player/PlayerManager.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/player/controller/PlayerController.java b/jforgame-demo/src/main/java/jforgame/demo/game/player/controller/PlayerController.java index 59dd35ff..ce66cbf8 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/player/controller/PlayerController.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ReqCreateNewPlayer.java b/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ReqCreateNewPlayer.java index 1551ad34..037ba962 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ReqCreateNewPlayer.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResCreateNewPlayer.java b/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResCreateNewPlayer.java index 14100def..3a95db25 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResCreateNewPlayer.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResKickPlayer.java b/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResKickPlayer.java index 1f62f00f..b04b3edc 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/player/message/ResKickPlayer.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/scene/message/ResPlayerEnterScene.java b/jforgame-demo/src/main/java/jforgame/demo/game/scene/message/ResPlayerEnterScene.java index 9e98e957..6e27e8ef 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/scene/message/ResPlayerEnterScene.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/skill/facade/SkillController.java b/jforgame-demo/src/main/java/jforgame/demo/game/skill/facade/SkillController.java index c0642b69..a8310509 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/skill/facade/SkillController.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/game/skill/message/ReqUseSkill.java b/jforgame-demo/src/main/java/jforgame/demo/game/skill/message/ReqUseSkill.java index cfbf2a1b..e30105ba 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/game/skill/message/ReqUseSkill.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/GameMessageFactory.java b/jforgame-demo/src/main/java/jforgame/demo/socket/GameMessageFactory.java index 5a820842..ab113095 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/GameMessageFactory.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/GameSocketFactory.java b/jforgame-demo/src/main/java/jforgame/demo/socket/GameSocketFactory.java index b84fecde..2065d971 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/GameSocketFactory.java +++ b/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 组装逻辑。 diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/MessageIoDispatcher.java b/jforgame-demo/src/main/java/jforgame/demo/socket/MessageIoDispatcher.java index 59cd4d6f..65df639e 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/MessageIoDispatcher.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/SessionManager.java b/jforgame-demo/src/main/java/jforgame/demo/socket/SessionManager.java index 814b585f..af6d9fc3 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/SessionManager.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/client/RpcClientHelper.java b/jforgame-demo/src/main/java/jforgame/demo/socket/client/RpcClientHelper.java index 28e82b56..4ebb13a1 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/client/RpcClientHelper.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/filter/FloodFilter.java b/jforgame-demo/src/main/java/jforgame/demo/socket/filter/FloodFilter.java index 256c95da..26908cf6 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/filter/FloodFilter.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/filter/MessageTraceFilter.java b/jforgame-demo/src/main/java/jforgame/demo/socket/filter/MessageTraceFilter.java index a2423652..370d8fe6 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/filter/MessageTraceFilter.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/socket/filter/ModuleEntranceFilter.java b/jforgame-demo/src/main/java/jforgame/demo/socket/filter/ModuleEntranceFilter.java index 73a95c1f..38b3d673 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/socket/filter/ModuleEntranceFilter.java +++ b/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; /** * 功能模块请求过滤器 diff --git a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/CSharpProtocolGenerator.java b/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/CSharpProtocolGenerator.java index 27fe96cd..6ce0b4f4 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/CSharpProtocolGenerator.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/ProtocolDocGenerator.java b/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/ProtocolDocGenerator.java index c9568622..49ec3812 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/ProtocolDocGenerator.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/TypeScriptProtocolGenerator.java b/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/TypeScriptProtocolGenerator.java index 7a257cb4..5ece18ba 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/diy/TypeScriptProtocolGenerator.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageExport.java b/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageExport.java index c1e42cd4..4688cd09 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageExport.java +++ b/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; diff --git a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageMetadata.java b/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageMetadata.java index 95c5a093..ab573969 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/message/MessageMetadata.java +++ b/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 { diff --git a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/protobuf/ProtoFileGenerator.java b/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/protobuf/ProtoFileGenerator.java index ea774ccf..7d802cd6 100644 --- a/jforgame-demo/src/main/java/jforgame/demo/tools/protocol/protobuf/ProtoFileGenerator.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/client/ClientPlayer.java b/jforgame-demo/src/test/java/jforgame/demo/client/ClientPlayer.java index 54b9ed78..15808b35 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/client/ClientPlayer.java +++ b/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构建的机器人 diff --git a/jforgame-demo/src/test/java/jforgame/demo/client/ClientStartup.java b/jforgame-demo/src/test/java/jforgame/demo/client/ClientStartup.java index 86c50f16..fd4d1044 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/client/ClientStartup.java +++ b/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; /** * 客户端模拟器启动程序 diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/LoginRouter.java b/jforgame-demo/src/test/java/jforgame/demo/udp/LoginRouter.java index 13a41419..9bfe4c87 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/LoginRouter.java +++ b/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 { diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/MessageIoDispatcher.java b/jforgame-demo/src/test/java/jforgame/demo/udp/MessageIoDispatcher.java index c6a8352d..01f58df8 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/MessageIoDispatcher.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/Player.java b/jforgame-demo/src/test/java/jforgame/demo/udp/Player.java index 02fe35c3..020fb0b8 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/Player.java +++ b/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 { diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/ReqLogin.java b/jforgame-demo/src/test/java/jforgame/demo/udp/ReqLogin.java index 77dc27ea..3c4b34bc 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/ReqLogin.java +++ b/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 { diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/ResPlayerLogin.java b/jforgame-demo/src/test/java/jforgame/demo/udp/ResPlayerLogin.java index 8deedb33..fba57f05 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/ResPlayerLogin.java +++ b/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 { diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/ResWelcome.java b/jforgame-demo/src/test/java/jforgame/demo/udp/ResWelcome.java index 29739080..dc110e9a 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/ResWelcome.java +++ b/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 { diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/SessionManager.java b/jforgame-demo/src/test/java/jforgame/demo/udp/SessionManager.java index 36936ffc..f5e2a8f5 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/SessionManager.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpChannelIoHandler.java b/jforgame-demo/src/test/java/jforgame/demo/udp/UdpChannelIoHandler.java index 51b415d5..8ba0d115 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpChannelIoHandler.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpMessage.java b/jforgame-demo/src/test/java/jforgame/demo/udp/UdpMessage.java index 1bcf68b0..572b8ce2 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpMessage.java +++ b/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 { diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolDecoder.java b/jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolDecoder.java index 95d85673..f0a372d5 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolDecoder.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolEncoder.java b/jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolEncoder.java index 7e8ef710..e7c65a0a 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpProtocolEncoder.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketClient.java b/jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketClient.java index 40539262..381fb296 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketClient.java +++ b/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; diff --git a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketServer.java b/jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketServer.java index 7e52644b..88bed171 100644 --- a/jforgame-demo/src/test/java/jforgame/demo/udp/UdpSocketServer.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/AbstractSocketClient.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/AbstractSocketClient.java index 1136c560..3a515cb6 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/AbstractSocketClient.java +++ b/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客户端 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RequestResponseFuture.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RequestResponseFuture.java index 717fdcc2..949cb3d6 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RequestResponseFuture.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RpcMessageClient.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RpcMessageClient.java index 2cabf621..a250e21d 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/RpcMessageClient.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/SocketClient.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/SocketClient.java index 216505b1..25347c21 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/client/SocketClient.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/ChainedMessageDispatcher.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/ChainedMessageDispatcher.java similarity index 95% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/ChainedMessageDispatcher.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/ChainedMessageDispatcher.java index b8e0036b..cf5f2190 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/ChainedMessageDispatcher.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageHandler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/MessageHandler.java similarity index 85% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageHandler.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/MessageHandler.java index b6ed5b95..3ba4a2eb 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageHandler.java +++ b/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; /** * 消息处理接口，用于处理具体的消息 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageParameterConverter.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/MessageParameterConverter.java similarity index 61% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageParameterConverter.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/MessageParameterConverter.java index fac3198d..95a3b349 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageParameterConverter.java +++ b/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 方法参数 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/PreprocessingMessageHandler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/PreprocessingMessageHandler.java similarity index 89% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/PreprocessingMessageHandler.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/PreprocessingMessageHandler.java index 691e01ed..9083233b 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/PreprocessingMessageHandler.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestActorSelector.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestActorSelector.java similarity index 85% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestActorSelector.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestActorSelector.java index 446a327d..aaf96827 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestActorSelector.java +++ b/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; /** diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestContext.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestContext.java similarity index 91% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestContext.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestContext.java index fc3242dc..7a632db7 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestContext.java +++ b/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; /** * 对于客户端的每一个请求，在生命周期内，都有一个供框架执行的上下文 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestDispatchKeyResolver.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestDispatchKeyResolver.java similarity index 83% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestDispatchKeyResolver.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestDispatchKeyResolver.java index d44048d6..8fcf6a6d 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestDispatchKeyResolver.java +++ b/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; /** * 请求分发键解析器。 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestScheduler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestScheduler.java similarity index 81% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestScheduler.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/RequestScheduler.java index 9cf8065f..4bf751a2 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/RequestScheduler.java +++ b/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; /** * 请求调度器，用于将客户端请求消息投递到具体线程模型。 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/SocketIoDispatcher.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/SocketIoDispatcher.java similarity index 90% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/SocketIoDispatcher.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/SocketIoDispatcher.java index 2a3e7f64..16eab4bd 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/SocketIoDispatcher.java +++ b/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; /** * 消息分发器，服务器，客户端均适用 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/SocketIoDispatcherAdapter.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/SocketIoDispatcherAdapter.java similarity index 85% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/SocketIoDispatcherAdapter.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/dispatch/SocketIoDispatcherAdapter.java index 3d09618f..53e4aa03 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/SocketIoDispatcherAdapter.java +++ b/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接口的默认实现 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/TrafficStatistic.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/monitoring/TrafficStatistic.java similarity index 99% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/TrafficStatistic.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/monitoring/TrafficStatistic.java index bb229115..c4cd16f3 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/TrafficStatistic.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/HostAndPort.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/net/HostAndPort.java similarity index 96% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/HostAndPort.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/net/HostAndPort.java index 687ed7a9..f649f6d2 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/HostAndPort.java +++ b/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连接的主机与端口 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/WebSocketJsonFrame.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/net/WebSocketJsonFrame.java similarity index 93% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/WebSocketJsonFrame.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/net/WebSocketJsonFrame.java index bad06bef..9e527d28 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/WebSocketJsonFrame.java +++ b/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传输文本格式的消息时，定义一个消息帧类 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/MessageMeta.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/MessageMeta.java similarity index 94% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/MessageMeta.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/MessageMeta.java index a701a0ee..3be419af 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/MessageMeta.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/MessageRoute.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/MessageRoute.java similarity index 93% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/MessageRoute.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/MessageRoute.java index ec2b483a..0f417c72 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/MessageRoute.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/RequestHandler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/RequestHandler.java similarity index 90% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/RequestHandler.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/annotation/RequestHandler.java index 71fa7724..1d8ce4ae 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/annotation/RequestHandler.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/Message.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/Message.java similarity index 92% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/Message.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/Message.java index f4c83cd7..fa9f9af4 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/Message.java +++ b/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; /** * 通信消息基础接口 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageExecutor.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageExecutor.java similarity index 92% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageExecutor.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageExecutor.java index 839cedff..b2e4f676 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageExecutor.java +++ b/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; /** diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageFactory.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageFactory.java similarity index 95% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageFactory.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageFactory.java index 385fa63f..46cbe469 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageFactory.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageHeader.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageHeader.java similarity index 95% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageHeader.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/MessageHeader.java index b2303e7b..3924f175 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/MessageHeader.java +++ b/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; /** * 私有协议栈——消息包头定义 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/RequestDataFrame.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/RequestDataFrame.java similarity index 94% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/RequestDataFrame.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/RequestDataFrame.java index 9d077d83..af0d4596 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/RequestDataFrame.java +++ b/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; /** * 解析过的私有协议栈包结构 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/Response.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/Response.java similarity index 94% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/Response.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/Response.java index 1b30f982..b03fff52 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/Response.java +++ b/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; /** * 通用响应类 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/SocketDataFrame.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/SocketDataFrame.java similarity index 96% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/SocketDataFrame.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/protocol/message/SocketDataFrame.java index 203d487d..223c6a58 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/message/SocketDataFrame.java +++ b/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; /** * 套接字数据帧，用于标识客户端一个完整的消息包 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageHandlerRegister.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/registry/MessageHandlerRegister.java similarity index 83% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageHandlerRegister.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/registry/MessageHandlerRegister.java index 4140372d..b57413ef 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/MessageHandlerRegister.java +++ b/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; /** * 消息处理注册器，用于注册消息处理方法 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/IdSession.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/session/IdSession.java similarity index 96% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/IdSession.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/session/IdSession.java index eac526cc..6ef62f75 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/IdSession.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ActorRequestScheduler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ActorRequestScheduler.java index 554222d7..f9dfbdf4 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ActorRequestScheduler.java +++ b/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; /** diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestExecutor.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestExecutor.java index d5daa49a..4d9a5c08 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestExecutor.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestMail.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestMail.java index fc1bb58b..ad7a2af0 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestMail.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestTask.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestTask.java index b3387f49..ea2fdbda 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/ClientRequestTask.java +++ b/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); diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/CommonMessageHandlerRegister.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/CommonMessageHandlerRegister.java similarity index 83% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/CommonMessageHandlerRegister.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/CommonMessageHandlerRegister.java index 36da5e28..fa5aea6b 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/share/CommonMessageHandlerRegister.java +++ b/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); }); } diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageFactory.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageFactory.java index 3fea3362..59908d0c 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageFactory.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHandlerRegister.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHandlerRegister.java index e47de059..8c8f242a 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHandlerRegister.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHeader.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHeader.java index bb056aef..bbdef955 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageHeader.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageParameterConverter.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageParameterConverter.java index 09d313ad..bf181d42 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DefaultMessageParameterConverter.java +++ b/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; /** * 默认的消息参数转换器 diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DispatchThreadRequestScheduler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DispatchThreadRequestScheduler.java index 44b141f9..f8bce647 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/DispatchThreadRequestScheduler.java +++ b/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; /** diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/MessageExecuteUnit.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/MessageHandlerMethod.java similarity index 55% rename from jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/MessageExecuteUnit.java rename to jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/MessageHandlerMethod.java index abcd40a7..5a5c142a 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/MessageExecuteUnit.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/RequestSchedulers.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/RequestSchedulers.java index 77d772cb..4558b5ca 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/RequestSchedulers.java +++ b/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; diff --git a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/SharedActorRequestScheduler.java b/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/SharedActorRequestScheduler.java index 7acee149..24c9af13 100644 --- a/jforgame-socket-parent/jforgame-socket-core/src/main/java/jforgame/socket/support/SharedActorRequestScheduler.java +++ b/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; /** diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolCodecFactory.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolCodecFactory.java index 04008b39..f18aba38 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolCodecFactory.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolCodecFactory.java @@ -1,7 +1,7 @@ package jforgame.socket.mina; import jforgame.codec.MessageCodec; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.protocol.message.MessageFactory; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolDecoder.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolDecoder.java index 6639e77e..4e090308 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolDecoder.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolDecoder.java @@ -1,9 +1,9 @@ package jforgame.socket.mina; import jforgame.codec.MessageCodec; -import jforgame.socket.share.TrafficStatistic; -import jforgame.socket.share.message.MessageFactory; -import jforgame.socket.share.message.RequestDataFrame; +import jforgame.socket.monitoring.TrafficStatistic; +import jforgame.socket.protocol.message.MessageFactory; +import jforgame.socket.protocol.message.RequestDataFrame; import jforgame.socket.support.DefaultMessageHeader; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolEncoder.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolEncoder.java index aea00d66..3555c3e3 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolEncoder.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultProtocolEncoder.java @@ -1,9 +1,9 @@ package jforgame.socket.mina; import jforgame.codec.MessageCodec; -import jforgame.socket.share.TrafficStatistic; -import jforgame.socket.share.message.MessageFactory; -import jforgame.socket.share.message.SocketDataFrame; +import jforgame.socket.monitoring.TrafficStatistic; +import jforgame.socket.protocol.message.MessageFactory; +import jforgame.socket.protocol.message.SocketDataFrame; import jforgame.socket.support.DefaultMessageHeader; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultSocketIoHandler.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultSocketIoHandler.java index b3c06c61..bcad11de 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultSocketIoHandler.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/DefaultSocketIoHandler.java @@ -1,9 +1,9 @@ package jforgame.socket.mina; -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.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.AttributeKey; import org.apache.mina.core.session.IoSession; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/MSession.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/MSession.java index 571c2d90..20176ef7 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/MSession.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/MSession.java @@ -1,7 +1,7 @@ package jforgame.socket.mina; -import jforgame.socket.share.IdSession; -import jforgame.socket.share.message.SocketDataFrame; +import jforgame.socket.session.IdSession; +import jforgame.socket.protocol.message.SocketDataFrame; import org.apache.mina.core.future.IoFuture; import org.apache.mina.core.future.IoFutureListener; import org.apache.mina.core.session.IoSession; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/DefaultClientSocketIoHandler.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/DefaultClientSocketIoHandler.java index c7cd4591..f8c0868a 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/DefaultClientSocketIoHandler.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/DefaultClientSocketIoHandler.java @@ -3,8 +3,8 @@ package jforgame.socket.mina.client; import jforgame.socket.client.CallBackService; import jforgame.socket.client.RpcResponseData; import jforgame.socket.mina.DefaultSocketIoHandler; -import jforgame.socket.share.SocketIoDispatcher; -import jforgame.socket.share.message.RequestDataFrame; +import jforgame.socket.dispatch.SocketIoDispatcher; +import jforgame.socket.protocol.message.RequestDataFrame; import org.apache.mina.core.session.IoSession; /** * 默认的客户端SocketIoHandler diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/TcpSocketClient.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/TcpSocketClient.java index 0c76581b..3410b87d 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/TcpSocketClient.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/client/TcpSocketClient.java @@ -5,10 +5,10 @@ import jforgame.socket.client.AbstractSocketClient; import jforgame.socket.mina.MSession; import jforgame.socket.mina.DefaultProtocolCodecFactory; import jforgame.socket.mina.DefaultSocketIoHandler; -import jforgame.socket.share.HostAndPort; -import jforgame.socket.share.IdSession; -import jforgame.socket.share.SocketIoDispatcher; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.net.HostAndPort; +import jforgame.socket.session.IdSession; +import jforgame.socket.dispatch.SocketIoDispatcher; +import jforgame.socket.protocol.message.MessageFactory; import org.apache.mina.core.future.ConnectFuture; import org.apache.mina.core.session.AttributeKey; import org.apache.mina.core.session.IoSession; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServer.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServer.java index 607f276f..6dbf4c9e 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServer.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServer.java @@ -3,10 +3,10 @@ package jforgame.socket.mina.server; import jforgame.codec.MessageCodec; import jforgame.socket.mina.DefaultProtocolCodecFactory; import jforgame.socket.mina.DefaultSocketIoHandler; -import jforgame.socket.share.ChainedMessageDispatcher; -import jforgame.socket.share.HostAndPort; +import jforgame.socket.dispatch.ChainedMessageDispatcher; +import jforgame.socket.net.HostAndPort; import jforgame.socket.server.ServerNode; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.protocol.message.MessageFactory; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.SimpleBufferAllocator; import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder; diff --git a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServerBuilder.java b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServerBuilder.java index 166d8633..44c6d406 100644 --- a/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServerBuilder.java +++ b/jforgame-socket-parent/jforgame-socket-mina/src/main/java/jforgame/socket/mina/server/TcpSocketServerBuilder.java @@ -1,9 +1,9 @@ package jforgame.socket.mina.server; import jforgame.codec.MessageCodec; -import jforgame.socket.share.ChainedMessageDispatcher; -import jforgame.socket.share.HostAndPort; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.dispatch.ChainedMessageDispatcher; +import jforgame.socket.net.HostAndPort; +import jforgame.socket.protocol.message.MessageFactory; import org.apache.mina.filter.codec.ProtocolCodecFactory; import java.util.ArrayList; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelIoHandler.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelIoHandler.java index 64999389..16889aee 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelIoHandler.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelIoHandler.java @@ -5,10 +5,10 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import jforgame.commons.util.JsonUtil; -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; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelUtils.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelUtils.java index 9519ca13..32990246 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelUtils.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/ChannelUtils.java @@ -3,7 +3,7 @@ package jforgame.socket.netty; import io.netty.channel.Channel; import io.netty.util.Attribute; import io.netty.util.AttributeKey; -import jforgame.socket.share.IdSession; +import jforgame.socket.session.IdSession; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolDecoder.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolDecoder.java index 76cc788b..e9e6c790 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolDecoder.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolDecoder.java @@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import jforgame.codec.MessageCodec; -import jforgame.socket.share.TrafficStatistic; -import jforgame.socket.share.message.MessageFactory; -import jforgame.socket.share.message.RequestDataFrame; +import jforgame.socket.monitoring.TrafficStatistic; +import jforgame.socket.protocol.message.MessageFactory; +import jforgame.socket.protocol.message.RequestDataFrame; import jforgame.socket.support.DefaultMessageHeader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolEncoder.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolEncoder.java index 3dd74710..43146d2b 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolEncoder.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/DefaultProtocolEncoder.java @@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import jforgame.codec.MessageCodec; -import jforgame.socket.share.TrafficStatistic; -import jforgame.socket.share.message.MessageFactory; -import jforgame.socket.share.message.SocketDataFrame; +import jforgame.socket.monitoring.TrafficStatistic; +import jforgame.socket.protocol.message.MessageFactory; +import jforgame.socket.protocol.message.SocketDataFrame; import jforgame.socket.support.DefaultMessageHeader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/NSession.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/NSession.java index ff70119a..bbe1d445 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/NSession.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/NSession.java @@ -3,8 +3,8 @@ package jforgame.socket.netty; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; -import jforgame.socket.share.IdSession; -import jforgame.socket.share.message.SocketDataFrame; +import jforgame.socket.session.IdSession; +import jforgame.socket.protocol.message.SocketDataFrame; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/CallbackHandler.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/CallbackHandler.java index 92375f51..46c88ff9 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/CallbackHandler.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/CallbackHandler.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import jforgame.socket.client.CallBackService; import jforgame.socket.client.RpcResponseData; -import jforgame.socket.share.message.RequestDataFrame; +import jforgame.socket.protocol.message.RequestDataFrame; /** * 回调处理器，用于绑定请求与响应的关系 diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/TcpSocketClient.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/TcpSocketClient.java index 065fd13d..59d72ae6 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/TcpSocketClient.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/TcpSocketClient.java @@ -16,11 +16,11 @@ import jforgame.socket.netty.NSession; import jforgame.socket.netty.ChannelIoHandler; import jforgame.socket.netty.DefaultProtocolDecoder; import jforgame.socket.netty.DefaultProtocolEncoder; -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 java.io.IOException; import java.net.InetSocketAddress; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/WebSocketClient.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/WebSocketClient.java index 43fbe9a5..2edaadb4 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/WebSocketClient.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/client/WebSocketClient.java @@ -23,10 +23,10 @@ import jforgame.socket.client.AbstractSocketClient; import jforgame.socket.netty.NSession; import jforgame.socket.netty.ChannelIoHandler; import jforgame.socket.netty.server.WebSocketFrameToSocketDataCodec; -import jforgame.socket.share.HostAndPort; -import jforgame.socket.share.IdSession; -import jforgame.socket.share.SocketIoDispatcher; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.net.HostAndPort; +import jforgame.socket.session.IdSession; +import jforgame.socket.dispatch.SocketIoDispatcher; +import jforgame.socket.protocol.message.MessageFactory; import java.io.IOException; import java.net.URI; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/ServerIdleHandler.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/ServerIdleHandler.java index 272503fd..53cca283 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/ServerIdleHandler.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/ServerIdleHandler.java @@ -6,8 +6,8 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.timeout.IdleStateEvent; import jforgame.socket.netty.ChannelUtils; -import jforgame.socket.share.IdSession; -import jforgame.socket.share.SocketIoDispatcher; +import jforgame.socket.session.IdSession; +import jforgame.socket.dispatch.SocketIoDispatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServer.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServer.java index 91f59102..a6ec05c7 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServer.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServer.java @@ -11,7 +11,7 @@ import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; -import jforgame.socket.share.HostAndPort; +import jforgame.socket.net.HostAndPort; import jforgame.socket.server.ServerNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServerBuilder.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServerBuilder.java index 6043486f..391d30fb 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServerBuilder.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/TcpSocketServerBuilder.java @@ -11,9 +11,9 @@ import jforgame.codec.MessageCodec; import jforgame.socket.netty.ChannelIoHandler; import jforgame.socket.netty.DefaultProtocolDecoder; import jforgame.socket.netty.DefaultProtocolEncoder; -import jforgame.socket.share.ChainedMessageDispatcher; -import jforgame.socket.share.HostAndPort; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.dispatch.ChainedMessageDispatcher; +import jforgame.socket.net.HostAndPort; +import jforgame.socket.protocol.message.MessageFactory; import java.util.ArrayList; import java.util.List; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketFrameToSocketDataCodec.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketFrameToSocketDataCodec.java index 9c61caed..4b5febf9 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketFrameToSocketDataCodec.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketFrameToSocketDataCodec.java @@ -11,11 +11,11 @@ import io.netty.util.ReferenceCounted; import jforgame.codec.MessageCodec; import jforgame.commons.util.JsonUtil; import jforgame.commons.util.NumberUtil; -import jforgame.socket.share.WebSocketJsonFrame; -import jforgame.socket.share.message.MessageFactory; -import jforgame.socket.share.message.MessageHeader; -import jforgame.socket.share.message.RequestDataFrame; -import jforgame.socket.share.message.SocketDataFrame; +import jforgame.socket.net.WebSocketJsonFrame; +import jforgame.socket.protocol.message.MessageFactory; +import jforgame.socket.protocol.message.MessageHeader; +import jforgame.socket.protocol.message.RequestDataFrame; +import jforgame.socket.protocol.message.SocketDataFrame; import jforgame.socket.support.DefaultMessageHeader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServer.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServer.java index 68acd1ed..df6f96f8 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServer.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServer.java @@ -17,9 +17,9 @@ import io.netty.handler.timeout.IdleStateHandler; import jforgame.codec.MessageCodec; import jforgame.socket.netty.ChannelIoHandler; import jforgame.socket.server.ServerNode; -import jforgame.socket.share.HostAndPort; -import jforgame.socket.share.SocketIoDispatcher; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.net.HostAndPort; +import jforgame.socket.dispatch.SocketIoDispatcher; +import jforgame.socket.protocol.message.MessageFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServerBuilder.java b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServerBuilder.java index 7cd9ac7b..bc7cafd4 100644 --- a/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServerBuilder.java +++ b/jforgame-socket-parent/jforgame-socket-netty/src/main/java/jforgame/socket/netty/server/WebSocketServerBuilder.java @@ -2,9 +2,9 @@ package jforgame.socket.netty.server; import jforgame.codec.MessageCodec; import jforgame.socket.netty.ChannelIoHandler; -import jforgame.socket.share.ChainedMessageDispatcher; -import jforgame.socket.share.HostAndPort; -import jforgame.socket.share.message.MessageFactory; +import jforgame.socket.dispatch.ChainedMessageDispatcher; +import jforgame.socket.net.HostAndPort; +import jforgame.socket.protocol.message.MessageFactory; import java.io.File;