Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

pkg/common/constant/constant.go

@@ -287,6 +287,11 @@ const (
 	Directly                            = 2 //直接进群
 )
 
+const (
+	GroupRPCRecvSize = 30
+	GroupRPCSendSize = 30
+)
+
 const FriendAcceptTip = "You have successfully become friends, so start chatting"
 
 func GroupIsBanChat(status int32) bool {

pkg/common/db/mongoModel.go

@@ -1074,7 +1074,8 @@ func (d *DataBases) GetSuperGroupByUserID(userID string) (UserToSuperGroup, erro
 	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
 	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cUserToSuperGroup)
 	var user UserToSuperGroup
-	return user, c.FindOne(ctx, bson.M{"user_id": userID}).Decode(&user)
+	_ = c.FindOne(ctx, bson.M{"user_id": userID}).Decode(&user)
+	return user, nil
 }
 
 func (d *DataBases) DeleteSuperGroup(groupID string) error {

pkg/proto/sdk_ws/ws.proto

@@ -262,6 +262,8 @@ message MsgData {
   OfflinePushInfo offlinePushInfo = 19;
   repeated string atUserIDList = 20;
   bytes msgDataList = 21;
+  string attachedInfo = 22;
+  string  ex = 23;
 
 }
 message OfflinePushInfo{