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

internal/rpc/group/group.go

@@ -1109,7 +1109,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 			return nil, err
 		}
 	} else {
-		if !req.DeleteMember {
+		//if !req.DeleteMember {
 		//s.Notification.GroupDismissedNotification(ctx, req)
 		tips := &sdkws.GroupDismissedTips{
 			Group:  s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))),
@@ -1121,7 +1121,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 			tips.OpUser = &sdkws.GroupMemberFullInfo{UserID: mcontext.GetOpUserID(ctx)}
 		}
 		s.Notification.GroupDismissedNotification(ctx, tips)
-		}
+		//}
 	}
 	return resp, nil
 }

internal/rpc/msg/verify.go

@@ -99,7 +99,7 @@ func (m *msgServer) messageVerification(ctx context.Context, data *msg.SendMsgRe
 		if err != nil {
 			return nil, err
 		}
-		if groupInfo.Status == constant.GroupStatusDismissed {
+		if groupInfo.Status == constant.GroupStatusDismissed && data.MsgData.ContentType != constant.GroupDismissedNotification {
 			return nil, errs.ErrArgs.Wrap("group is dismissed")
 		}
 		if groupInfo.GroupType == constant.SuperGroup {

pkg/common/log/zap.go

@@ -213,6 +213,9 @@ func (l *ZapLogger) Error(ctx context.Context, msg string, err error, keysAndVal
 }
 
 func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) []interface{} {
+	if ctx == nil {
+		return keysAndValues
+	}
 	operationID := mcontext.GetOperationID(ctx)
 	opUserID := mcontext.GetOpUserID(ctx)
 	connID := mcontext.GetConnID(ctx)