From 25789b4bade943762ca5afaca628dfd392a1c0f3 Mon Sep 17 00:00:00 2001 From: tangmingyou <234767776@qq.com> Date: Sat, 14 May 2022 19:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-client/pom.xml | 2 +- .../soim/client/session/SoImSession.java | 2 +- im-core/pom.xml | 41 --------- im-data/pom.xml | 38 -------- im-entry/pom.xml | 2 +- .../entry/config/MessageHandlerContext.java | 3 +- .../SpringApplicationContextInitialed.java | 2 +- .../entry/delay/NetUserDelayTaskManager.java | 7 +- .../auth/ReqTokenAuthHandler.java | 8 +- .../chat/ReqTextChatHandler.java | 6 +- .../task/NetUserDelayCloseHandler.java | 6 +- .../user/HelloHandler.java | 6 +- .../user/ReqOnlineUserListHandler.java | 6 +- .../registry/ProtoMessageHandlerRegistry.java | 4 +- .../soim/entry/server/AccountRegistry.java | 2 +- .../soim/entry/server}/AttributeKeys.java | 2 +- .../soim/entry/server/ImEntryInitializer.java | 2 +- .../entry/server/InboundImMessageHandler.java | 7 +- .../entry/server/ProtoMessageDispatcher.java | 8 +- .../handler/AccountMessageHandler.java | 8 +- .../entry/server}/handler/MessageHandler.java | 4 +- .../handler/NetUserMessageHandler.java | 5 +- .../soim/entry/server}/session/Account.java | 2 +- .../soim/entry/server}/session/NetUser.java | 2 +- .../entry/service/TextChatServiceImpl.java | 2 +- .../sopod/soim/entry/worker/WorkerGroup.java | 3 - im-service-api/im-entry-protocol/pom.xml | 90 +++++++++++++++++++ .../net/sopod/soim/data/Gen1Protobuf.java | 0 .../sopod/soim/data/Gen2ProtoSerialNo.java | 0 .../soim/data/constant/PlatformType.java | 0 .../soim/data/constant/SerializeType.java | 0 .../net/sopod/soim/data/msg/auth/Auth.java | 0 .../net/sopod/soim/data/msg/chat/Chat.java | 0 .../sopod/soim/data/msg/hello/HelloPB.java | 0 .../sopod/soim/data/msg/net/HeartBeat.java | 0 .../net/sopod/soim/data/msg/task/Tasks.java | 0 .../sopod/soim/data/msg/user/UserGroup.java | 0 .../soim/data/proto/ProtoMessageManager.java | 0 .../soim/data/serialize/ByteSerializer.java | 0 .../sopod/soim/data/serialize/ImMessage.java | 0 .../soim/data/serialize}/ImMessageCodec.java | 4 +- .../data/serialize/JacksonByteSerializer.java | 0 .../net/sopod/soim/data/transer/LoginReq.java | 0 .../src/main/resources/proto}/Hello.proto | 0 .../src/main/resources/proto}/auth/Auth.proto | 0 .../src/main/resources/proto}/chat/Chat.proto | 0 .../main/resources/proto}/net/HeartBeat.proto | 0 .../main/resources/proto}/task/Tasks.proto | 0 .../resources/proto}/user/UserGroup.proto | 0 .../src/main/resources/protoSerialNoTable.txt | 0 im-service-api/pom.xml | 44 +-------- pom.xml | 10 +-- 52 files changed, 141 insertions(+), 187 deletions(-) delete mode 100644 im-core/pom.xml delete mode 100644 im-data/pom.xml rename im-entry/src/main/java/net/sopod/soim/entry/{handler => handlers}/auth/ReqTokenAuthHandler.java (92%) rename im-entry/src/main/java/net/sopod/soim/entry/{handler => handlers}/chat/ReqTextChatHandler.java (87%) rename im-entry/src/main/java/net/sopod/soim/entry/{handler => handlers}/task/NetUserDelayCloseHandler.java (78%) rename im-entry/src/main/java/net/sopod/soim/entry/{handler => handlers}/user/HelloHandler.java (91%) rename im-entry/src/main/java/net/sopod/soim/entry/{handler => handlers}/user/ReqOnlineUserListHandler.java (89%) rename {im-core/src/main/java/net/sopod/soim/core => im-entry/src/main/java/net/sopod/soim/entry}/registry/ProtoMessageHandlerRegistry.java (96%) rename {im-core/src/main/java/net/sopod/soim/core/net => im-entry/src/main/java/net/sopod/soim/entry/server}/AttributeKeys.java (92%) rename im-entry/src/main/java/net/sopod/soim/entry/{ => server}/handler/AccountMessageHandler.java (74%) rename {im-core/src/main/java/net/sopod/soim/core => im-entry/src/main/java/net/sopod/soim/entry/server}/handler/MessageHandler.java (61%) rename im-entry/src/main/java/net/sopod/soim/entry/{ => server}/handler/NetUserMessageHandler.java (77%) rename {im-core/src/main/java/net/sopod/soim/core => im-entry/src/main/java/net/sopod/soim/entry/server}/session/Account.java (98%) rename {im-core/src/main/java/net/sopod/soim/core => im-entry/src/main/java/net/sopod/soim/entry/server}/session/NetUser.java (97%) create mode 100644 im-service-api/im-entry-protocol/pom.xml rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/Gen1Protobuf.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/Gen2ProtoSerialNo.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/constant/PlatformType.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/constant/SerializeType.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/msg/auth/Auth.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/msg/chat/Chat.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/msg/hello/HelloPB.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/msg/net/HeartBeat.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/msg/task/Tasks.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/proto/ProtoMessageManager.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/serialize/ByteSerializer.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/serialize/ImMessage.java (100%) rename {im-core/src/main/java/net/sopod/soim/core/net => im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize}/ImMessageCodec.java (96%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/serialize/JacksonByteSerializer.java (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/java/net/sopod/soim/data/transer/LoginReq.java (100%) rename {im-data/src/main/resources/protobuf => im-service-api/im-entry-protocol/src/main/resources/proto}/Hello.proto (100%) rename {im-data/src/main/resources/protobuf => im-service-api/im-entry-protocol/src/main/resources/proto}/auth/Auth.proto (100%) rename {im-data/src/main/resources/protobuf => im-service-api/im-entry-protocol/src/main/resources/proto}/chat/Chat.proto (100%) rename {im-data/src/main/resources/protobuf => im-service-api/im-entry-protocol/src/main/resources/proto}/net/HeartBeat.proto (100%) rename {im-data/src/main/resources/protobuf => im-service-api/im-entry-protocol/src/main/resources/proto}/task/Tasks.proto (100%) rename {im-data/src/main/resources/protobuf => im-service-api/im-entry-protocol/src/main/resources/proto}/user/UserGroup.proto (100%) rename {im-data => im-service-api/im-entry-protocol}/src/main/resources/protoSerialNoTable.txt (100%) diff --git a/im-client/pom.xml b/im-client/pom.xml index a33fac9..960d8ae 100644 --- a/im-client/pom.xml +++ b/im-client/pom.xml @@ -14,7 +14,7 @@ net.sopod - im-core + im-entry-protocol ${soim.version} diff --git a/im-client/src/main/java/net/sopod/soim/client/session/SoImSession.java b/im-client/src/main/java/net/sopod/soim/client/session/SoImSession.java index af66dac..a44383c 100644 --- a/im-client/src/main/java/net/sopod/soim/client/session/SoImSession.java +++ b/im-client/src/main/java/net/sopod/soim/client/session/SoImSession.java @@ -11,7 +11,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import net.sopod.soim.client.logger.Logger; import net.sopod.soim.common.util.netty.Varint32FrameCodec; -import net.sopod.soim.core.net.ImMessageCodec; +import net.sopod.soim.data.serialize.ImMessageCodec; import net.sopod.soim.data.msg.auth.Auth; import net.sopod.soim.data.msg.chat.Chat; import org.slf4j.LoggerFactory; diff --git a/im-core/pom.xml b/im-core/pom.xml deleted file mode 100644 index 5529817..0000000 --- a/im-core/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - so-im - net.sopod - 1.0.0 - - 4.0.0 - - im-core - - - - net.sopod - im-common - ${soim.version} - - - net.sopod - im-data - ${soim.version} - - - io.netty - netty-all - - - org.springframework - spring-context - provided - - - org.apache.dubbo - dubbo - provided - - - - \ No newline at end of file diff --git a/im-data/pom.xml b/im-data/pom.xml deleted file mode 100644 index 152efae..0000000 --- a/im-data/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - so-im - net.sopod - 1.0.0 - - 4.0.0 - - im-data - - - - net.sopod - im-common - ${soim.version} - - - io.netty - netty-buffer - - - com.google.protobuf - protobuf-java - - - org.projectlombok - lombok - - - org.reflections - reflections - - - - \ No newline at end of file diff --git a/im-entry/pom.xml b/im-entry/pom.xml index 685563f..5353112 100644 --- a/im-entry/pom.xml +++ b/im-entry/pom.xml @@ -23,7 +23,7 @@ net.sopod - im-core + im-entry-protocol ${soim.version} diff --git a/im-entry/src/main/java/net/sopod/soim/entry/config/MessageHandlerContext.java b/im-entry/src/main/java/net/sopod/soim/entry/config/MessageHandlerContext.java index d8335b5..5535bb6 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/config/MessageHandlerContext.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/config/MessageHandlerContext.java @@ -1,6 +1,7 @@ package net.sopod.soim.entry.config; import io.netty.util.concurrent.FastThreadLocal; +import net.sopod.soim.entry.server.handler.MessageHandler; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -9,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap; * MsgHandlerContext * * 线程上下文属性设置工具 - * 这里主要用于 {@link net.sopod.soim.core.handler.MessageHandler} 与 dubbo RpcContext 上下文参数传递 + * 这里主要用于 {@link MessageHandler} 与 dubbo RpcContext 上下文参数传递 * * @author tmy * @date 2022-05-01 22:42 diff --git a/im-entry/src/main/java/net/sopod/soim/entry/config/SpringApplicationContextInitialed.java b/im-entry/src/main/java/net/sopod/soim/entry/config/SpringApplicationContextInitialed.java index 1fa5ef2..c225747 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/config/SpringApplicationContextInitialed.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/config/SpringApplicationContextInitialed.java @@ -1,6 +1,6 @@ package net.sopod.soim.entry.config; -import net.sopod.soim.core.registry.ProtoMessageHandlerRegistry; +import net.sopod.soim.entry.registry.ProtoMessageHandlerRegistry; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/delay/NetUserDelayTaskManager.java b/im-entry/src/main/java/net/sopod/soim/entry/delay/NetUserDelayTaskManager.java index 2723610..d51607e 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/delay/NetUserDelayTaskManager.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/delay/NetUserDelayTaskManager.java @@ -3,14 +3,13 @@ package net.sopod.soim.entry.delay; import com.google.common.base.Preconditions; import com.google.protobuf.MessageLite; import net.sopod.soim.common.util.ImClock; -import net.sopod.soim.core.handler.MessageHandler; -import net.sopod.soim.core.registry.ProtoMessageHandlerRegistry; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.handler.MessageHandler; +import net.sopod.soim.entry.registry.ProtoMessageHandlerRegistry; +import net.sopod.soim.entry.server.session.NetUser; import net.sopod.soim.entry.server.ProtoMessageDispatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.ref.WeakReference; import java.util.concurrent.*; /** diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/auth/ReqTokenAuthHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/handlers/auth/ReqTokenAuthHandler.java similarity index 92% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/auth/ReqTokenAuthHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/handlers/auth/ReqTokenAuthHandler.java index 8f1d1eb..a9242ed 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/auth/ReqTokenAuthHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/handlers/auth/ReqTokenAuthHandler.java @@ -1,10 +1,10 @@ -package net.sopod.soim.entry.handler.auth; +package net.sopod.soim.entry.handlers.auth; import com.google.protobuf.MessageLite; import net.sopod.soim.entry.config.ImEntryAppContextHolder; -import net.sopod.soim.entry.handler.NetUserMessageHandler; -import net.sopod.soim.core.session.Account; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.handler.NetUserMessageHandler; +import net.sopod.soim.entry.server.session.Account; +import net.sopod.soim.entry.server.session.NetUser; import net.sopod.soim.data.msg.auth.Auth; import net.sopod.soim.entry.config.EntryServerConfig; import net.sopod.soim.entry.server.AccountRegistry; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/chat/ReqTextChatHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/handlers/chat/ReqTextChatHandler.java similarity index 87% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/chat/ReqTextChatHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/handlers/chat/ReqTextChatHandler.java index 4be932e..45a1e16 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/chat/ReqTextChatHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/handlers/chat/ReqTextChatHandler.java @@ -1,8 +1,8 @@ -package net.sopod.soim.entry.handler.chat; +package net.sopod.soim.entry.handlers.chat; import com.google.protobuf.MessageLite; -import net.sopod.soim.entry.handler.AccountMessageHandler; -import net.sopod.soim.core.session.Account; +import net.sopod.soim.entry.server.handler.AccountMessageHandler; +import net.sopod.soim.entry.server.session.Account; import net.sopod.soim.data.msg.chat.Chat; import net.sopod.soim.logic.common.model.TextChat; import net.sopod.soim.logic.user.service.ChatService; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/task/NetUserDelayCloseHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/handlers/task/NetUserDelayCloseHandler.java similarity index 78% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/task/NetUserDelayCloseHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/handlers/task/NetUserDelayCloseHandler.java index 3935e8c..f64d7f9 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/task/NetUserDelayCloseHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/handlers/task/NetUserDelayCloseHandler.java @@ -1,8 +1,8 @@ -package net.sopod.soim.entry.handler.task; +package net.sopod.soim.entry.handlers.task; import com.google.protobuf.MessageLite; -import net.sopod.soim.entry.handler.NetUserMessageHandler; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.handler.NetUserMessageHandler; +import net.sopod.soim.entry.server.session.NetUser; import net.sopod.soim.data.msg.task.Tasks; import org.springframework.stereotype.Service; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/user/HelloHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/handlers/user/HelloHandler.java similarity index 91% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/user/HelloHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/handlers/user/HelloHandler.java index 822db7f..6b83ab1 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/user/HelloHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/handlers/user/HelloHandler.java @@ -1,10 +1,10 @@ -package net.sopod.soim.entry.handler.user; +package net.sopod.soim.entry.handlers.user; import com.google.protobuf.MessageLite; -import net.sopod.soim.core.session.Account; +import net.sopod.soim.entry.server.session.Account; import net.sopod.soim.data.msg.hello.HelloPB; import net.sopod.soim.entry.delay.NetUserDelayTaskManager; -import net.sopod.soim.entry.handler.AccountMessageHandler; +import net.sopod.soim.entry.server.handler.AccountMessageHandler; import net.sopod.soim.logic.api.segmentid.core.SegmentIdGenerator; import net.sopod.soim.logic.user.service.UserBizService; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/user/ReqOnlineUserListHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/handlers/user/ReqOnlineUserListHandler.java similarity index 89% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/user/ReqOnlineUserListHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/handlers/user/ReqOnlineUserListHandler.java index e91aab9..4e753ce 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/user/ReqOnlineUserListHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/handlers/user/ReqOnlineUserListHandler.java @@ -1,9 +1,9 @@ -package net.sopod.soim.entry.handler.user; +package net.sopod.soim.entry.handlers.user; import com.google.protobuf.MessageLite; -import net.sopod.soim.core.session.Account; +import net.sopod.soim.entry.server.session.Account; import net.sopod.soim.data.msg.user.UserGroup; -import net.sopod.soim.entry.handler.AccountMessageHandler; +import net.sopod.soim.entry.server.handler.AccountMessageHandler; import net.sopod.soim.logic.common.model.UserInfo; import net.sopod.soim.logic.user.service.UserBizService; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/im-core/src/main/java/net/sopod/soim/core/registry/ProtoMessageHandlerRegistry.java b/im-entry/src/main/java/net/sopod/soim/entry/registry/ProtoMessageHandlerRegistry.java similarity index 96% rename from im-core/src/main/java/net/sopod/soim/core/registry/ProtoMessageHandlerRegistry.java rename to im-entry/src/main/java/net/sopod/soim/entry/registry/ProtoMessageHandlerRegistry.java index 4a68907..d5cc6d3 100644 --- a/im-core/src/main/java/net/sopod/soim/core/registry/ProtoMessageHandlerRegistry.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/registry/ProtoMessageHandlerRegistry.java @@ -1,9 +1,9 @@ -package net.sopod.soim.core.registry; +package net.sopod.soim.entry.registry; import com.google.protobuf.MessageLite; import net.sopod.soim.common.util.ImClock; import net.sopod.soim.common.util.Reflects; -import net.sopod.soim.core.handler.MessageHandler; +import net.sopod.soim.entry.server.handler.MessageHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/server/AccountRegistry.java b/im-entry/src/main/java/net/sopod/soim/entry/server/AccountRegistry.java index dfd3717..2ce8173 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/server/AccountRegistry.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/AccountRegistry.java @@ -1,6 +1,6 @@ package net.sopod.soim.entry.server; -import net.sopod.soim.core.session.Account; +import net.sopod.soim.entry.server.session.Account; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/im-core/src/main/java/net/sopod/soim/core/net/AttributeKeys.java b/im-entry/src/main/java/net/sopod/soim/entry/server/AttributeKeys.java similarity index 92% rename from im-core/src/main/java/net/sopod/soim/core/net/AttributeKeys.java rename to im-entry/src/main/java/net/sopod/soim/entry/server/AttributeKeys.java index 70e2eba..d4f3b90 100644 --- a/im-core/src/main/java/net/sopod/soim/core/net/AttributeKeys.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/AttributeKeys.java @@ -1,4 +1,4 @@ -package net.sopod.soim.core.net; +package net.sopod.soim.entry.server; import io.netty.util.AttributeKey; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/server/ImEntryInitializer.java b/im-entry/src/main/java/net/sopod/soim/entry/server/ImEntryInitializer.java index d8df009..14eb834 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/server/ImEntryInitializer.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/ImEntryInitializer.java @@ -6,7 +6,7 @@ import io.netty.channel.socket.SocketChannel; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import net.sopod.soim.common.util.netty.Varint32FrameCodec; -import net.sopod.soim.core.net.ImMessageCodec; +import net.sopod.soim.data.serialize.ImMessageCodec; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/server/InboundImMessageHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/server/InboundImMessageHandler.java index 0829d33..25e1389 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/server/InboundImMessageHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/InboundImMessageHandler.java @@ -6,14 +6,9 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.util.Attribute; import net.sopod.soim.common.util.ImClock; -import net.sopod.soim.core.handler.MessageHandler; -import net.sopod.soim.core.net.AttributeKeys; -import net.sopod.soim.core.registry.ProtoMessageHandlerRegistry; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.session.NetUser; import net.sopod.soim.data.msg.task.Tasks; import net.sopod.soim.entry.delay.NetUserDelayTaskManager; -import net.sopod.soim.entry.worker.Worker; -import net.sopod.soim.entry.worker.WorkerGroup; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/server/ProtoMessageDispatcher.java b/im-entry/src/main/java/net/sopod/soim/entry/server/ProtoMessageDispatcher.java index c37db98..fbf54a1 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/server/ProtoMessageDispatcher.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/ProtoMessageDispatcher.java @@ -2,10 +2,10 @@ package net.sopod.soim.entry.server; import com.google.protobuf.MessageLite; import net.sopod.soim.common.constant.DubboConstant; -import net.sopod.soim.core.handler.MessageHandler; -import net.sopod.soim.core.registry.ProtoMessageHandlerRegistry; -import net.sopod.soim.core.session.Account; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.handler.MessageHandler; +import net.sopod.soim.entry.registry.ProtoMessageHandlerRegistry; +import net.sopod.soim.entry.server.session.Account; +import net.sopod.soim.entry.server.session.NetUser; import net.sopod.soim.entry.config.MessageHandlerContext; import net.sopod.soim.entry.worker.Worker; import net.sopod.soim.entry.worker.WorkerGroup; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/AccountMessageHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/server/handler/AccountMessageHandler.java similarity index 74% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/AccountMessageHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/server/handler/AccountMessageHandler.java index 8288855..a47483a 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/AccountMessageHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/handler/AccountMessageHandler.java @@ -1,10 +1,8 @@ -package net.sopod.soim.entry.handler; +package net.sopod.soim.entry.server.handler; import com.google.protobuf.MessageLite; -import net.sopod.soim.core.handler.MessageHandler; -import net.sopod.soim.core.session.Account; -import net.sopod.soim.core.session.NetUser; -import org.apache.dubbo.rpc.RpcContext; +import net.sopod.soim.entry.server.session.Account; +import net.sopod.soim.entry.server.session.NetUser; /** * AccountMessageHandler diff --git a/im-core/src/main/java/net/sopod/soim/core/handler/MessageHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/server/handler/MessageHandler.java similarity index 61% rename from im-core/src/main/java/net/sopod/soim/core/handler/MessageHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/server/handler/MessageHandler.java index 14166af..d2242e5 100644 --- a/im-core/src/main/java/net/sopod/soim/core/handler/MessageHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/handler/MessageHandler.java @@ -1,6 +1,6 @@ -package net.sopod.soim.core.handler; +package net.sopod.soim.entry.server.handler; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.session.NetUser; /** * MessageHandler diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handler/NetUserMessageHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/server/handler/NetUserMessageHandler.java similarity index 77% rename from im-entry/src/main/java/net/sopod/soim/entry/handler/NetUserMessageHandler.java rename to im-entry/src/main/java/net/sopod/soim/entry/server/handler/NetUserMessageHandler.java index 5915efe..cbef33a 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/handler/NetUserMessageHandler.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/handler/NetUserMessageHandler.java @@ -1,8 +1,7 @@ -package net.sopod.soim.entry.handler; +package net.sopod.soim.entry.server.handler; import com.google.protobuf.MessageLite; -import net.sopod.soim.core.handler.MessageHandler; -import net.sopod.soim.core.session.NetUser; +import net.sopod.soim.entry.server.session.NetUser; /** * NetUserMessageHandler diff --git a/im-core/src/main/java/net/sopod/soim/core/session/Account.java b/im-entry/src/main/java/net/sopod/soim/entry/server/session/Account.java similarity index 98% rename from im-core/src/main/java/net/sopod/soim/core/session/Account.java rename to im-entry/src/main/java/net/sopod/soim/entry/server/session/Account.java index 9890339..412e421 100644 --- a/im-core/src/main/java/net/sopod/soim/core/session/Account.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/session/Account.java @@ -1,4 +1,4 @@ -package net.sopod.soim.core.session; +package net.sopod.soim.entry.server.session; import com.google.common.base.Preconditions; import org.slf4j.Logger; diff --git a/im-core/src/main/java/net/sopod/soim/core/session/NetUser.java b/im-entry/src/main/java/net/sopod/soim/entry/server/session/NetUser.java similarity index 97% rename from im-core/src/main/java/net/sopod/soim/core/session/NetUser.java rename to im-entry/src/main/java/net/sopod/soim/entry/server/session/NetUser.java index e7812dc..acb66ad 100644 --- a/im-core/src/main/java/net/sopod/soim/core/session/NetUser.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/server/session/NetUser.java @@ -1,4 +1,4 @@ -package net.sopod.soim.core.session; +package net.sopod.soim.entry.server.session; import io.netty.channel.Channel; import io.netty.util.AttributeKey; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/service/TextChatServiceImpl.java b/im-entry/src/main/java/net/sopod/soim/entry/service/TextChatServiceImpl.java index 37437d8..969b6cc 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/service/TextChatServiceImpl.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/service/TextChatServiceImpl.java @@ -1,6 +1,6 @@ package net.sopod.soim.entry.service; -import net.sopod.soim.core.session.Account; +import net.sopod.soim.entry.server.session.Account; import net.sopod.soim.data.msg.chat.Chat; import net.sopod.soim.entry.api.service.TextChatService; import net.sopod.soim.entry.config.ImEntryAppContextHolder; diff --git a/im-entry/src/main/java/net/sopod/soim/entry/worker/WorkerGroup.java b/im-entry/src/main/java/net/sopod/soim/entry/worker/WorkerGroup.java index 66c857f..d399937 100644 --- a/im-entry/src/main/java/net/sopod/soim/entry/worker/WorkerGroup.java +++ b/im-entry/src/main/java/net/sopod/soim/entry/worker/WorkerGroup.java @@ -1,8 +1,5 @@ package net.sopod.soim.entry.worker; -import com.google.protobuf.GeneratedMessageV3; -import net.sopod.soim.core.session.Account; -import net.sopod.soim.core.session.NetUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/im-service-api/im-entry-protocol/pom.xml b/im-service-api/im-entry-protocol/pom.xml new file mode 100644 index 0000000..4644c07 --- /dev/null +++ b/im-service-api/im-entry-protocol/pom.xml @@ -0,0 +1,90 @@ + + + + so-im + net.sopod + 1.0.0 + + 4.0.0 + + im-entry-protocol + + + + net.sopod + im-common + ${soim.version} + + + io.netty + netty-buffer + ${netty.version} + + + io.netty + netty-codec + ${netty.version} + + + io.netty + netty-transport + ${netty.version} + + + com.google.protobuf + protobuf-java + + + org.projectlombok + lombok + + + org.reflections + reflections + + + + + + + kr.motd.maven + os-maven-plugin + 1.6.1 + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} + src/main/resources + src/main/java + false + + + + + + + + + + + + + + compile + test-compile + + + + + + + + \ No newline at end of file diff --git a/im-data/src/main/java/net/sopod/soim/data/Gen1Protobuf.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/Gen1Protobuf.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/Gen1Protobuf.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/Gen1Protobuf.java diff --git a/im-data/src/main/java/net/sopod/soim/data/Gen2ProtoSerialNo.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/Gen2ProtoSerialNo.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/Gen2ProtoSerialNo.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/Gen2ProtoSerialNo.java diff --git a/im-data/src/main/java/net/sopod/soim/data/constant/PlatformType.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/constant/PlatformType.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/constant/PlatformType.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/constant/PlatformType.java diff --git a/im-data/src/main/java/net/sopod/soim/data/constant/SerializeType.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/constant/SerializeType.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/constant/SerializeType.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/constant/SerializeType.java diff --git a/im-data/src/main/java/net/sopod/soim/data/msg/auth/Auth.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/auth/Auth.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/msg/auth/Auth.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/auth/Auth.java diff --git a/im-data/src/main/java/net/sopod/soim/data/msg/chat/Chat.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/chat/Chat.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/msg/chat/Chat.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/chat/Chat.java diff --git a/im-data/src/main/java/net/sopod/soim/data/msg/hello/HelloPB.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/hello/HelloPB.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/msg/hello/HelloPB.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/hello/HelloPB.java diff --git a/im-data/src/main/java/net/sopod/soim/data/msg/net/HeartBeat.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/net/HeartBeat.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/msg/net/HeartBeat.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/net/HeartBeat.java diff --git a/im-data/src/main/java/net/sopod/soim/data/msg/task/Tasks.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/task/Tasks.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/msg/task/Tasks.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/task/Tasks.java diff --git a/im-data/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java diff --git a/im-data/src/main/java/net/sopod/soim/data/proto/ProtoMessageManager.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/proto/ProtoMessageManager.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/proto/ProtoMessageManager.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/proto/ProtoMessageManager.java diff --git a/im-data/src/main/java/net/sopod/soim/data/serialize/ByteSerializer.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ByteSerializer.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/serialize/ByteSerializer.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ByteSerializer.java diff --git a/im-data/src/main/java/net/sopod/soim/data/serialize/ImMessage.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ImMessage.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/serialize/ImMessage.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ImMessage.java diff --git a/im-core/src/main/java/net/sopod/soim/core/net/ImMessageCodec.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ImMessageCodec.java similarity index 96% rename from im-core/src/main/java/net/sopod/soim/core/net/ImMessageCodec.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ImMessageCodec.java index a166701..4ec580a 100644 --- a/im-core/src/main/java/net/sopod/soim/core/net/ImMessageCodec.java +++ b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/ImMessageCodec.java @@ -1,14 +1,12 @@ -package net.sopod.soim.core.net; +package net.sopod.soim.data.serialize; import com.google.protobuf.MessageLite; import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.CombinedChannelDuplexHandler; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; import net.sopod.soim.data.proto.ProtoMessageManager; -import net.sopod.soim.data.serialize.ImMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/im-data/src/main/java/net/sopod/soim/data/serialize/JacksonByteSerializer.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/JacksonByteSerializer.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/serialize/JacksonByteSerializer.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/serialize/JacksonByteSerializer.java diff --git a/im-data/src/main/java/net/sopod/soim/data/transer/LoginReq.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/transer/LoginReq.java similarity index 100% rename from im-data/src/main/java/net/sopod/soim/data/transer/LoginReq.java rename to im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/transer/LoginReq.java diff --git a/im-data/src/main/resources/protobuf/Hello.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/Hello.proto similarity index 100% rename from im-data/src/main/resources/protobuf/Hello.proto rename to im-service-api/im-entry-protocol/src/main/resources/proto/Hello.proto diff --git a/im-data/src/main/resources/protobuf/auth/Auth.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/auth/Auth.proto similarity index 100% rename from im-data/src/main/resources/protobuf/auth/Auth.proto rename to im-service-api/im-entry-protocol/src/main/resources/proto/auth/Auth.proto diff --git a/im-data/src/main/resources/protobuf/chat/Chat.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/chat/Chat.proto similarity index 100% rename from im-data/src/main/resources/protobuf/chat/Chat.proto rename to im-service-api/im-entry-protocol/src/main/resources/proto/chat/Chat.proto diff --git a/im-data/src/main/resources/protobuf/net/HeartBeat.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/net/HeartBeat.proto similarity index 100% rename from im-data/src/main/resources/protobuf/net/HeartBeat.proto rename to im-service-api/im-entry-protocol/src/main/resources/proto/net/HeartBeat.proto diff --git a/im-data/src/main/resources/protobuf/task/Tasks.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/task/Tasks.proto similarity index 100% rename from im-data/src/main/resources/protobuf/task/Tasks.proto rename to im-service-api/im-entry-protocol/src/main/resources/proto/task/Tasks.proto diff --git a/im-data/src/main/resources/protobuf/user/UserGroup.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/user/UserGroup.proto similarity index 100% rename from im-data/src/main/resources/protobuf/user/UserGroup.proto rename to im-service-api/im-entry-protocol/src/main/resources/proto/user/UserGroup.proto diff --git a/im-data/src/main/resources/protoSerialNoTable.txt b/im-service-api/im-entry-protocol/src/main/resources/protoSerialNoTable.txt similarity index 100% rename from im-data/src/main/resources/protoSerialNoTable.txt rename to im-service-api/im-entry-protocol/src/main/resources/protoSerialNoTable.txt diff --git a/im-service-api/pom.xml b/im-service-api/pom.xml index cd41810..0f784d1 100644 --- a/im-service-api/pom.xml +++ b/im-service-api/pom.xml @@ -13,50 +13,12 @@ pom + im-entry-api + im-entry-protocol + im-logic-common im-segment-id-api im-router-api im-logic-user-api - - - - kr.motd.maven - os-maven-plugin - 1.6.1 - - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.1 - - com.google.protobuf:protoc:3.19.4:exe:${os.detected.classifier} - src/main/java - false - - - - - dubbo - org.apache.dubbo - dubbo-compiler - ${dubbo.compiler.version} - org.apache.dubbo.gen.dubbo.Dubbo3Generator - - - - - - - compile - test-compile - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index e3038e5..12088ff 100644 --- a/pom.xml +++ b/pom.xml @@ -10,10 +10,8 @@ 1.0.0 im-common - im-data im-entry im-client - im-core im-das im-das-api im-service @@ -44,6 +42,7 @@ 2.0.3 0.9.1 0.0.3 + 3.19.4 @@ -53,15 +52,10 @@ netty-all ${netty.version} - - io.netty - netty-buffer - ${netty.version} - com.google.protobuf protobuf-java - 3.19.4 + ${protoc.version} com.lmax