From c0af5152f10a44a678e138b87492216659d076d3 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 29 Jun 2023 21:32:02 +0800 Subject: [PATCH] fix bug --- pkg/common/mw/gin.go | 1 + pkg/rpcclient/conversation.go | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/mw/gin.go b/pkg/common/mw/gin.go index 430edbbd9..fcdbe334e 100644 --- a/pkg/common/mw/gin.go +++ b/pkg/common/mw/gin.go @@ -157,6 +157,7 @@ func GinParseToken(rdb redis.UniversalClient) gin.HandlerFunc { } } else { apiresp.GinError(c, errs.ErrTokenNotExist.Wrap()) + c.Abort() return } c.Set(constant.OpUserPlatform, constant.PlatformIDToName(claims.PlatformID)) diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index 55ea5f829..400a7b651 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -7,13 +7,12 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation" pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation" "google.golang.org/grpc" ) type Conversation struct { - Client conversation.ConversationClient + Client pbConversation.ConversationClient conn grpc.ClientConnInterface discov discoveryregistry.SvcDiscoveryRegistry } @@ -23,7 +22,7 @@ func NewConversation(discov discoveryregistry.SvcDiscoveryRegistry) *Conversatio if err != nil { panic(err) } - client := conversation.NewConversationClient(conn) + client := pbConversation.NewConversationClient(conn) return &Conversation{discov: discov, conn: conn, Client: client} }