diff --git a/README.md b/README.md index f277d39e..05b58fb5 100644 --- a/README.md +++ b/README.md @@ -218,7 +218,7 @@ ioGame 是轻量级的网络编程框架,**不依赖任何第三方**中间件 com.iohao.game run-one-netty - 21.14 + 21.15 ``` diff --git a/common/common-core/pom.xml b/common/common-core/pom.xml index ee70d6d1..8a333add 100644 --- a/common/common-core/pom.xml +++ b/common/common-core/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java b/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java index cbb37a18..45d3919d 100644 --- a/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java +++ b/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java @@ -26,7 +26,7 @@ public final class IoGameVersion { public static final String VERSION; static { - String internalVersion = "21.14"; + String internalVersion = "21.15"; VERSION = internalVersion .replace("", "") diff --git a/common/common-kit/pom.xml b/common/common-kit/pom.xml index 89c86258..e83af7dc 100644 --- a/common/common-kit/pom.xml +++ b/common/common-kit/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/common/common-micro-kit/pom.xml b/common/common-micro-kit/pom.xml index 0ae5885b..a6890b5e 100644 --- a/common/common-micro-kit/pom.xml +++ b/common/common-micro-kit/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ../../pom.xml diff --git a/common/common-validation/pom.xml b/common/common-validation/pom.xml index 2bd0f760..59b4e9e8 100644 --- a/common/common-validation/pom.xml +++ b/common/common-validation/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/external/external-core/pom.xml b/external/external-core/pom.xml index f2d8003e..c68a095e 100644 --- a/external/external-core/pom.xml +++ b/external/external-core/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ../../pom.xml diff --git a/external/external-core/src/main/java/com/iohao/game/external/core/session/UserSession.java b/external/external-core/src/main/java/com/iohao/game/external/core/session/UserSession.java index 3ca4d563..a0bd96fb 100644 --- a/external/external-core/src/main/java/com/iohao/game/external/core/session/UserSession.java +++ b/external/external-core/src/main/java/com/iohao/game/external/core/session/UserSession.java @@ -19,6 +19,7 @@ package com.iohao.game.external.core.session; +import com.iohao.game.action.skeleton.core.CmdInfo; import com.iohao.game.action.skeleton.protocol.BarMessage; import com.iohao.game.action.skeleton.protocol.HeadMetadata; import com.iohao.game.action.skeleton.protocol.RequestMessage; @@ -116,16 +117,14 @@ public interface UserSession extends AttrOptionDynamic { /** * 创建 RequestMessage,内部会将 User 自身的相关信息设置到 RequestMessage 中。 * - * @param cmdMerge 路由 + * @param cmdInfo 路由 * @return RequestMessage * @since 21.15 */ - default RequestMessage ofRequestMessage(int cmdMerge) { + default RequestMessage ofRequestMessage(CmdInfo cmdInfo) { RequestMessage request = ExternalCodecKit.createRequest(); - HeadMetadata headMetadata = request.getHeadMetadata(); - headMetadata.setCmdMerge(cmdMerge); - + headMetadata.setCmdInfo(cmdInfo); // 给请求消息加上一些 user 自身的数据 this.employ(headMetadata); diff --git a/external/external-netty/pom.xml b/external/external-netty/pom.xml index 0960f6b7..2547fdc8 100644 --- a/external/external-netty/pom.xml +++ b/external/external-netty/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ../../pom.xml diff --git a/net-bolt/bolt-broker-server/pom.xml b/net-bolt/bolt-broker-server/pom.xml index d6551e9c..64d4201f 100644 --- a/net-bolt/bolt-broker-server/pom.xml +++ b/net-bolt/bolt-broker-server/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/net-bolt/bolt-client/pom.xml b/net-bolt/bolt-client/pom.xml index 85e1f92a..9c55b945 100644 --- a/net-bolt/bolt-client/pom.xml +++ b/net-bolt/bolt-client/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/net-bolt/bolt-core/pom.xml b/net-bolt/bolt-core/pom.xml index 5a2cdfb4..f5076be9 100644 --- a/net-bolt/bolt-core/pom.xml +++ b/net-bolt/bolt-core/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 97632972..9f924068 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ioGame 生产资料公有制。 diff --git a/run-one/run-one-netty/pom.xml b/run-one/run-one-netty/pom.xml index 7e51236b..a7436c26 100644 --- a/run-one/run-one-netty/pom.xml +++ b/run-one/run-one-netty/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ../../pom.xml diff --git a/widget/light-client/pom.xml b/widget/light-client/pom.xml index f8c1808f..6f96dc7d 100644 --- a/widget/light-client/pom.xml +++ b/widget/light-client/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ../../pom.xml diff --git a/widget/light-domain-event/pom.xml b/widget/light-domain-event/pom.xml index ef13fd3f..b8d0319c 100644 --- a/widget/light-domain-event/pom.xml +++ b/widget/light-domain-event/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/widget/light-game-room/pom.xml b/widget/light-game-room/pom.xml index ee1f93a5..8dae3416 100644 --- a/widget/light-game-room/pom.xml +++ b/widget/light-game-room/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/widget/light-jprotobuf/pom.xml b/widget/light-jprotobuf/pom.xml index f69e9214..019e7ce2 100644 --- a/widget/light-jprotobuf/pom.xml +++ b/widget/light-jprotobuf/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/widget/light-profile/pom.xml b/widget/light-profile/pom.xml index 3aa4abc4..ce97be7d 100644 --- a/widget/light-profile/pom.xml +++ b/widget/light-profile/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/widget/light-redis-lock-spring-boot-starter/pom.xml b/widget/light-redis-lock-spring-boot-starter/pom.xml index ef2a9932..6621593c 100644 --- a/widget/light-redis-lock-spring-boot-starter/pom.xml +++ b/widget/light-redis-lock-spring-boot-starter/pom.xml @@ -8,7 +8,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml diff --git a/widget/light-redis-lock/pom.xml b/widget/light-redis-lock/pom.xml index 7387c78b..1c606e3c 100644 --- a/widget/light-redis-lock/pom.xml +++ b/widget/light-redis-lock/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/widget/light-timer-task/pom.xml b/widget/light-timer-task/pom.xml index fe39760b..2a88cf5c 100644 --- a/widget/light-timer-task/pom.xml +++ b/widget/light-timer-task/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.14 + 21.15 ../../pom.xml 4.0.0 diff --git a/widget/other-tool/pom.xml b/widget/other-tool/pom.xml index ecbe8e7a..a2a6fb4a 100644 --- a/widget/other-tool/pom.xml +++ b/widget/other-tool/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.14 + 21.15 ../../pom.xml