From 2faf9698db07c58907150e3b53aae6dd7bcf38aa Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Sun, 4 Jun 2023 14:22:20 +0800
Subject: [PATCH 1/3] fix: log panic

---
 pkg/common/log/zap.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go
index a90cf3592..1d1d5fbc8 100644
--- a/pkg/common/log/zap.go
+++ b/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)

From 557980c63f32283444afa8c22610119d58e054dd Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Sun, 4 Jun 2023 14:27:00 +0800
Subject: [PATCH 2/3] DismissGroup

---
 internal/rpc/group/group.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 382dc3244..f84acd929 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -1109,19 +1109,19 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
 			return nil, err
 		}
 	} else {
-		if !req.DeleteMember {
-			//s.Notification.GroupDismissedNotification(ctx, req)
-			tips := &sdkws.GroupDismissedTips{
-				Group:  s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))),
-				OpUser: &sdkws.GroupMemberFullInfo{},
-			}
-			if mcontext.GetOpUserID(ctx) == owner.UserID {
-				tips.OpUser = s.groupMemberDB2PB(owner, 0)
-			} else {
-				tips.OpUser = &sdkws.GroupMemberFullInfo{UserID: mcontext.GetOpUserID(ctx)}
-			}
-			s.Notification.GroupDismissedNotification(ctx, tips)
+		//if !req.DeleteMember {
+		//s.Notification.GroupDismissedNotification(ctx, req)
+		tips := &sdkws.GroupDismissedTips{
+			Group:  s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))),
+			OpUser: &sdkws.GroupMemberFullInfo{},
 		}
+		if mcontext.GetOpUserID(ctx) == owner.UserID {
+			tips.OpUser = s.groupMemberDB2PB(owner, 0)
+		} else {
+			tips.OpUser = &sdkws.GroupMemberFullInfo{UserID: mcontext.GetOpUserID(ctx)}
+		}
+		s.Notification.GroupDismissedNotification(ctx, tips)
+		//}
 	}
 	return resp, nil
 }

From 5ca104c6fe6f6b4cb2f6735238e6c1293c8ef108 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Sun, 4 Jun 2023 14:37:45 +0800
Subject: [PATCH 3/3] DismissGroup

---
 internal/rpc/msg/verify.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go
index b50c4c18b..5a190bbe3 100644
--- a/internal/rpc/msg/verify.go
+++ b/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 {