From 1c1c52dd0ce7cbad68c66f198813651e150891c1 Mon Sep 17 00:00:00 2001 From: BanTanger <88583317+BanTanger@users.noreply.github.com> Date: Thu, 13 Jul 2023 16:11:30 +0800 Subject: [PATCH] fix: changing naming irregularities under pkg and internal packages, #520 --- internal/msgtransfer/init.go | 6 +++--- internal/rpc/msg/server.go | 16 ++++++++++++++++ pkg/rpcclient/msg.go | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 8b812bac9..c7ffbcb1f 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -71,8 +71,8 @@ func StartTransfer(prometheusPort int) error { msgMysModel := relation.NewChatLogGorm(db) chatLogDatabase := controller.NewChatLogDatabase(msgMysModel) msgDatabase := controller.NewCommonMsgDatabase(msgDocModel, msgModel, msgMysModel) - conversationRpcClient := rpcclient.NewConversationRpcClient(client) - groupRpcClient := rpcclient.NewGroupRpcClient(client) + conversationRpcClient := rpcclient.NewConversationRPCClient(client) + groupRpcClient := rpcclient.NewGroupRPCClient(client) msgTransfer := NewMsgTransfer(chatLogDatabase, msgDatabase, &conversationRpcClient, &groupRpcClient) msgTransfer.initPrometheus() return msgTransfer.Start(prometheusPort) @@ -80,7 +80,7 @@ func StartTransfer(prometheusPort int) error { func NewMsgTransfer(chatLogDatabase controller.ChatLogDatabase, msgDatabase controller.CommonMsgDatabase, - conversationRpcClient *rpcclient.ConversationRpcClient, groupRpcClient *rpcclient.GroupRpcClient) *MsgTransfer { + conversationRpcClient *rpcclient.ConversationRPCClient, groupRpcClient *rpcclient.GroupRPCClient) *MsgTransfer { return &MsgTransfer{ persistentCH: NewPersistentConsumerHandler(chatLogDatabase), historyCH: NewOnlineHistoryRedisConsumerHandler(msgDatabase, conversationRpcClient, groupRpcClient), diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index d3ac1af62..3bb9fbf90 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -3,6 +3,7 @@ package msg import ( "context" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation" + "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" "google.golang.org/grpc" @@ -33,6 +34,21 @@ type msgServer struct { notificationSender *rpcclient.NotificationSender } +func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sdkws.GetMaxSeqResp, error) { + // TODO implement me + panic("implement me") +} + +func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) { + // TODO implement me + panic("implement me") +} + +func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) (*msg.SearchMessageResp, error) { + // TODO implement me + panic("implement me") +} + func (m *msgServer) addInterceptorHandler(interceptorFunc ...MessageInterceptorFunc) { m.Handlers = append(m.Handlers, interceptorFunc...) } diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index 2724be058..b86aa01a7 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -3,6 +3,7 @@ package rpcclient import ( "context" "encoding/json" + "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/user" "google.golang.org/grpc" "google.golang.org/protobuf/proto"