From 9fbdf0f263acd464a94ae94bb8edc8c2ef608491 Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 12 Dec 2022 18:48:36 +0800 Subject: [PATCH] ref[net]: refactored the session event --- boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java | 2 +- net/src/main/java/com/zfoo/net/NetContext.java | 2 +- .../com/zfoo/net/config/{manager => }/ConfigManager.java | 4 +--- .../com/zfoo/net/config/{manager => }/IConfigManager.java | 6 +----- .../{tcp/model => event}/ClientSessionInactiveEvent.java | 3 +-- .../net/core/{tcp/model => event}/ServerExceptionEvent.java | 3 +-- .../{tcp/model => event}/ServerSessionInactiveEvent.java | 3 +-- .../main/java/com/zfoo/net/handler/ClientRouteHandler.java | 2 +- .../main/java/com/zfoo/net/handler/GatewayRouteHandler.java | 2 +- .../main/java/com/zfoo/net/handler/ServerRouteHandler.java | 2 +- net/src/main/java/com/zfoo/net/router/Router.java | 2 +- .../main/java/com/zfoo/net/schema/NetDefinitionParser.java | 2 +- net/src/main/java/com/zfoo/net/session/Session.java | 6 +++--- net/src/main/java/com/zfoo/net/task/TaskBus.java | 2 +- .../com/zfoo/net/core/tcpAsync/server/TcpServerTest.java | 2 +- 15 files changed, 17 insertions(+), 26 deletions(-) rename net/src/main/java/com/zfoo/net/config/{manager => }/ConfigManager.java (99%) rename net/src/main/java/com/zfoo/net/config/{manager => }/IConfigManager.java (79%) rename net/src/main/java/com/zfoo/net/core/{tcp/model => event}/ClientSessionInactiveEvent.java (96%) rename net/src/main/java/com/zfoo/net/core/{tcp/model => event}/ServerExceptionEvent.java (97%) rename net/src/main/java/com/zfoo/net/core/{tcp/model => event}/ServerSessionInactiveEvent.java (96%) diff --git a/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java b/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java index 6666f50e..b1111ddd 100644 --- a/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java +++ b/boot/src/main/java/com/zfoo/boot/NetAutoConfiguration.java @@ -13,7 +13,7 @@ package com.zfoo.boot; import com.zfoo.net.NetContext; -import com.zfoo.net.config.manager.ConfigManager; +import com.zfoo.net.config.ConfigManager; import com.zfoo.net.config.model.NetConfig; import com.zfoo.net.consumer.Consumer; import com.zfoo.net.packet.service.PacketService; diff --git a/net/src/main/java/com/zfoo/net/NetContext.java b/net/src/main/java/com/zfoo/net/NetContext.java index a560a6fd..a554a9da 100644 --- a/net/src/main/java/com/zfoo/net/NetContext.java +++ b/net/src/main/java/com/zfoo/net/NetContext.java @@ -13,7 +13,7 @@ package com.zfoo.net; -import com.zfoo.net.config.manager.IConfigManager; +import com.zfoo.net.config.IConfigManager; import com.zfoo.net.consumer.IConsumer; import com.zfoo.net.core.AbstractClient; import com.zfoo.net.core.AbstractServer; diff --git a/net/src/main/java/com/zfoo/net/config/manager/ConfigManager.java b/net/src/main/java/com/zfoo/net/config/ConfigManager.java similarity index 99% rename from net/src/main/java/com/zfoo/net/config/manager/ConfigManager.java rename to net/src/main/java/com/zfoo/net/config/ConfigManager.java index 3384d2c4..417ff830 100644 --- a/net/src/main/java/com/zfoo/net/config/manager/ConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/ConfigManager.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.config.manager; +package com.zfoo.net.config; import com.zfoo.net.config.model.NetConfig; import com.zfoo.net.consumer.registry.IRegistry; @@ -20,7 +19,6 @@ import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/net/src/main/java/com/zfoo/net/config/manager/IConfigManager.java b/net/src/main/java/com/zfoo/net/config/IConfigManager.java similarity index 79% rename from net/src/main/java/com/zfoo/net/config/manager/IConfigManager.java rename to net/src/main/java/com/zfoo/net/config/IConfigManager.java index 4008df00..087930b4 100644 --- a/net/src/main/java/com/zfoo/net/config/manager/IConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/IConfigManager.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,13 +10,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.config.manager; +package com.zfoo.net.config; import com.zfoo.net.config.model.NetConfig; -import com.zfoo.net.consumer.balancer.AbstractConsumerLoadBalancer; -import com.zfoo.net.consumer.balancer.IConsumerLoadBalancer; import com.zfoo.net.consumer.registry.IRegistry; -import com.zfoo.protocol.registration.ProtocolModule; /** * @author jaysunxiao diff --git a/net/src/main/java/com/zfoo/net/core/tcp/model/ClientSessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java similarity index 96% rename from net/src/main/java/com/zfoo/net/core/tcp/model/ClientSessionInactiveEvent.java rename to net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java index 30008e0a..e60f78aa 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/model/ClientSessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ClientSessionInactiveEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.core.tcp.model; +package com.zfoo.net.core.event; import com.zfoo.event.model.event.IEvent; import com.zfoo.net.session.Session; diff --git a/net/src/main/java/com/zfoo/net/core/tcp/model/ServerExceptionEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java similarity index 97% rename from net/src/main/java/com/zfoo/net/core/tcp/model/ServerExceptionEvent.java rename to net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java index 85e54366..e77ac97a 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/model/ServerExceptionEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.core.tcp.model; +package com.zfoo.net.core.event; import com.zfoo.event.model.event.IEvent; import com.zfoo.net.router.attachment.IAttachment; diff --git a/net/src/main/java/com/zfoo/net/core/tcp/model/ServerSessionInactiveEvent.java b/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java similarity index 96% rename from net/src/main/java/com/zfoo/net/core/tcp/model/ServerSessionInactiveEvent.java rename to net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java index a68fcd1d..b42d79d8 100644 --- a/net/src/main/java/com/zfoo/net/core/tcp/model/ServerSessionInactiveEvent.java +++ b/net/src/main/java/com/zfoo/net/core/event/ServerSessionInactiveEvent.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2020 The zfoo Authors - * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * @@ -11,7 +10,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.net.core.tcp.model; +package com.zfoo.net.core.event; import com.zfoo.event.model.event.IEvent; import com.zfoo.net.session.Session; diff --git a/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java index 536a60a9..ac5ae001 100644 --- a/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ClientRouteHandler.java @@ -15,7 +15,7 @@ package com.zfoo.net.handler; import com.zfoo.event.manager.EventBus; import com.zfoo.net.NetContext; -import com.zfoo.net.core.tcp.model.ClientSessionInactiveEvent; +import com.zfoo.net.core.event.ClientSessionInactiveEvent; import com.zfoo.net.util.SessionUtils; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java index 5026627d..a7e18d2c 100644 --- a/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java @@ -92,7 +92,7 @@ public class GatewayRouteHandler extends ServerRouteHandler { } else { // 使用用户的uid做一致性hash var uid = session.getUid(); - if (uid < 0) { + if (uid <= 0) { forwardingPacket(packet, gatewayAttachment, uid); return; } diff --git a/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java index 00697b1c..dc206f4a 100644 --- a/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/ServerRouteHandler.java @@ -15,7 +15,7 @@ package com.zfoo.net.handler; import com.zfoo.event.manager.EventBus; import com.zfoo.net.NetContext; -import com.zfoo.net.core.tcp.model.ServerSessionInactiveEvent; +import com.zfoo.net.core.event.ServerSessionInactiveEvent; import com.zfoo.net.util.SessionUtils; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/net/src/main/java/com/zfoo/net/router/Router.java b/net/src/main/java/com/zfoo/net/router/Router.java index 6366d870..212fcf56 100644 --- a/net/src/main/java/com/zfoo/net/router/Router.java +++ b/net/src/main/java/com/zfoo/net/router/Router.java @@ -15,10 +15,10 @@ package com.zfoo.net.router; import com.zfoo.event.manager.EventBus; import com.zfoo.net.NetContext; +import com.zfoo.net.core.event.ServerExceptionEvent; import com.zfoo.net.core.gateway.model.AuthUidToGatewayCheck; import com.zfoo.net.core.gateway.model.AuthUidToGatewayConfirm; import com.zfoo.net.core.gateway.model.AuthUidToGatewayEvent; -import com.zfoo.net.core.tcp.model.ServerExceptionEvent; import com.zfoo.net.packet.common.Error; import com.zfoo.net.packet.common.Heartbeat; import com.zfoo.net.packet.model.EncodedPacketInfo; diff --git a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java index c951b144..3d3ee73f 100644 --- a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java +++ b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java @@ -14,7 +14,7 @@ package com.zfoo.net.schema; import com.zfoo.net.NetContext; -import com.zfoo.net.config.manager.ConfigManager; +import com.zfoo.net.config.ConfigManager; import com.zfoo.net.config.model.*; import com.zfoo.net.consumer.Consumer; import com.zfoo.net.packet.service.PacketService; diff --git a/net/src/main/java/com/zfoo/net/session/Session.java b/net/src/main/java/com/zfoo/net/session/Session.java index 35da475e..7a613262 100644 --- a/net/src/main/java/com/zfoo/net/session/Session.java +++ b/net/src/main/java/com/zfoo/net/session/Session.java @@ -33,10 +33,10 @@ public class Session implements Closeable { private long sid; /** - * EN:The default user ID is an ID greater than 0, or less than 0 if there is no login - * CN:默认用户的id都是大于0的id，如果没有登录则小于0 + * EN:The default user ID is an ID greater than 0, or equal 0 if there is no login + * CN:默认用户的id都是大于0的id，如果没有登录则等于0 */ - private long uid = -1; + private long uid = 0; private Channel channel; diff --git a/net/src/main/java/com/zfoo/net/task/TaskBus.java b/net/src/main/java/com/zfoo/net/task/TaskBus.java index 147aa038..d671b474 100644 --- a/net/src/main/java/com/zfoo/net/task/TaskBus.java +++ b/net/src/main/java/com/zfoo/net/task/TaskBus.java @@ -114,7 +114,7 @@ public final class TaskBus { if (attachment == null) { var session = task.getSession(); var uid = session.getUid(); - if (uid < 0) { + if (uid <= 0) { execute((int) session.getSid(), task); } else { execute(uid, task); diff --git a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java index a7cf6296..49a61111 100644 --- a/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java +++ b/net/src/test/java/com/zfoo/net/core/tcpAsync/server/TcpServerTest.java @@ -73,7 +73,7 @@ org.springframework.context.event.internalEventListenerProcessor org.springframework.context.event.internalEventListenerFactory com.zfoo.net.config.model.NetConfig com.zfoo.net.NetContext -com.zfoo.net.config.manager.ConfigManager +com.zfoo.net.config.ConfigManager com.zfoo.net.packet.service.PacketService com.zfoo.net.router.Router com.zfoo.net.consumer.Consumer