From 1bec7081450b35f79cd022a502d1b3022657df49 Mon Sep 17 00:00:00 2001 From: jianan <1072772483@qq.com> Date: Thu, 28 Jul 2022 10:36:30 +0800 Subject: [PATCH] =?UTF-8?q?fix[module]=20=E4=BF=AE=E5=A4=8D=EF=BC=9A?= =?UTF-8?q?=E5=86=8D=E6=9C=89=E8=BF=9E=E6=8E=A5=E6=97=B6=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=85=88=E4=BB=A5uid=E4=BD=9C=E4=B8=BAhashId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zfoo/net/session/model/Session.java | 4 ++-- .../task/dispatcher/ConsistentHashTaskDispatch.java | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net/src/main/java/com/zfoo/net/session/model/Session.java b/net/src/main/java/com/zfoo/net/session/model/Session.java index 54994588..9d0f268c 100644 --- a/net/src/main/java/com/zfoo/net/session/model/Session.java +++ b/net/src/main/java/com/zfoo/net/session/model/Session.java @@ -96,8 +96,8 @@ public class Session implements Closeable { } - public Object getAttribute(AttributeType key) { - return attributes.get(key); + public T getAttribute(AttributeType key) { + return (T) attributes.get(key); } public Channel getChannel() { diff --git a/net/src/main/java/com/zfoo/net/task/dispatcher/ConsistentHashTaskDispatch.java b/net/src/main/java/com/zfoo/net/task/dispatcher/ConsistentHashTaskDispatch.java index 17d0cd8b..e26a2994 100644 --- a/net/src/main/java/com/zfoo/net/task/dispatcher/ConsistentHashTaskDispatch.java +++ b/net/src/main/java/com/zfoo/net/task/dispatcher/ConsistentHashTaskDispatch.java @@ -13,6 +13,7 @@ package com.zfoo.net.task.dispatcher; +import com.zfoo.net.session.model.AttributeType; import com.zfoo.net.task.TaskBus; import com.zfoo.net.task.model.PacketReceiverTask; @@ -35,7 +36,14 @@ public class ConsistentHashTaskDispatch extends AbstractTaskDispatch { var attachment = packetReceiverTask.getAttachment(); if (attachment == null) { - return SessionIdTaskDispatch.getInstance().getExecutor(packetReceiverTask); + var session = packetReceiverTask.getSession(); + Long uid = session.getAttribute(AttributeType.UID); + + if (uid == null) { + return SessionIdTaskDispatch.getInstance().getExecutor(packetReceiverTask); + } else { + return TaskBus.executor(Math.toIntExact(uid)); + } } // 可见最终是根据附加包的信息选择服务端由哪个线程执行这个业务