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

pkg/common/config/config.go

@@ -251,6 +251,13 @@ type config struct {
 			OfflinePush  POfflinePush  `yaml:"offlinePush"`
 			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
 		} `yaml:"memberEnter"`
+
+		GroupDismissed struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		} `yaml:"groupDismissed"`
+
 		////////////////////////user///////////////////////
 		UserInfoUpdated struct {
 			Conversation PConversation `yaml:"conversation"`

pkg/common/constant/constant.go

@@ -77,6 +77,7 @@ const (
 	MemberKickedNotification             = 1508
 	MemberInvitedNotification            = 1509
 	MemberEnterNotification              = 1510
+	GroupDismissedNotification           = 1511
 
 	SignalingNotificationBegin = 1600
 	SignalingNotification      = 1601
@@ -129,9 +130,10 @@ const (
 	IsSenderSync         = "senderSync"
 
 	//GroupStatus
-	GroupOk             = 0
-	GroupBanChat        = 1
-	GroupDisband        = 2
+	GroupOk              = 0
+	GroupBanChat         = 1
+	GroupStatusDismissed = 2
+
 	GroupBaned          = 3
 	GroupBanPrivateChat = 4
 

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -103,6 +103,18 @@ func DeleteGroupMemberByGroupIDAndUserID(groupID, userID string) error {
 	return nil
 }
 
+func DeleteGroupMemberByGroupID(groupID string) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	err = dbConn.Table("group_members").Where("group_id=?  ", groupID).Delete(db.GroupMember{}).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func UpdateGroupMemberInfo(groupMemberInfo db.GroupMember) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {