Merge branch 'ver3' of github.com:OpenIMSDK/Open-IM-Server into ver3

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:

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)