From 9380998c311ee98dcd12dd5420c3e14058949340 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 26 Jun 2023 16:17:33 +0800 Subject: [PATCH 1/2] test: log add --- pkg/common/kafka/consumer_group.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/common/kafka/consumer_group.go b/pkg/common/kafka/consumer_group.go index bbb5b2ec4..318583852 100644 --- a/pkg/common/kafka/consumer_group.go +++ b/pkg/common/kafka/consumer_group.go @@ -8,6 +8,7 @@ package kafka import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/Shopify/sarama" ) @@ -46,6 +47,7 @@ func (mc *MConsumerGroup) GetContextFromMsg(cMsg *sarama.ConsumerMessage) contex } func (mc *MConsumerGroup) RegisterHandleAndConsumer(handler sarama.ConsumerGroupHandler) { + log.ZDebug(context.Background(), "register consumer group", "groupID", mc.groupID) ctx := context.Background() for { err := mc.ConsumerGroup.Consume(ctx, mc.topics, handler) From dd6ff0a7dba3f13b270e2e952d8ff0b7cbf845a8 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Mon, 26 Jun 2023 17:42:07 +0800 Subject: [PATCH 2/2] RevokeMsg --- internal/rpc/msg/revoke.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index bc6a7a551..05c38accb 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -55,11 +55,10 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg. return nil, err } if req.UserID != msgs[0].SendID { - roleLevel := members[req.UserID].RoleLevel switch members[req.UserID].RoleLevel { case constant.GroupOwner: case constant.GroupAdmin: - if roleLevel != constant.GroupOrdinaryUsers { + if members[msgs[0].SendID].RoleLevel != constant.GroupOrdinaryUsers { return nil, errs.ErrNoPermission.Wrap("no permission") } default: