fix: golint and format

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

cmd/openim-api/main.go

@@ -18,12 +18,12 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"net/http"
 	"os"
 	"runtime"
 	"strconv"
 	"time"
 
-	"net/http"
 	_ "net/http/pprof"
 
 	"github.com/OpenIMSDK/Open-IM-Server/internal/api"

internal/msggateway/constant.go

@@ -33,7 +33,7 @@ const (
 )
 
 const (
-	//Websocket Protocol.
+	// Websocket Protocol.
 	WSGetNewestSeq        = 1001
 	WSPullMsgBySeqList    = 1002
 	WSSendMsg             = 1003

internal/msgtransfer/init.go

@@ -19,6 +19,9 @@ import (
 	"sync"
 	"time"
 
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -30,8 +33,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 )
 
 type MsgTransfer struct {

internal/rpc/conversation/conversaion.go

@@ -17,6 +17,8 @@ package conversation
 import (
 	"context"
 
+	"google.golang.org/grpc"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -31,7 +33,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"google.golang.org/grpc"
 )
 
 type conversationServer struct {
@@ -247,7 +248,10 @@ func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req
 	return &pbConversation.GetUserConversationIDsHashResp{Hash: hash}, nil
 }
 
-func (c *conversationServer) GetConversationsByConversationID(ctx context.Context, req *pbConversation.GetConversationsByConversationIDReq) (*pbConversation.GetConversationsByConversationIDResp, error) {
+func (c *conversationServer) GetConversationsByConversationID(
+	ctx context.Context,
+	req *pbConversation.GetConversationsByConversationIDReq,
+) (*pbConversation.GetConversationsByConversationIDResp, error) {
 	conversations, err := c.conversationDatabase.GetConversationsByConversationID(ctx, req.ConversationIDs)
 	if err != nil {
 		return nil, err

internal/rpc/group/group.go

@@ -32,6 +32,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw/specialerror"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 
+	"google.golang.org/grpc"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -46,7 +48,6 @@ import (
 	pbGroup "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"google.golang.org/grpc"
 )
 
 func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {

internal/rpc/msg/lock.go

@@ -49,6 +49,7 @@ func (l *LockerMessage) LockMessageTypeKey(ctx context.Context, clientMsgID, typ
 	}
 	return err
 }
+
 func (l *LockerMessage) LockGlobalMessage(ctx context.Context, clientMsgID string) (err error) {
 	for i := 0; i < 3; i++ {
 		err = l.cache.LockMessageTypeKey(ctx, clientMsgID, GlOBALLOCK)
@@ -61,6 +62,7 @@ func (l *LockerMessage) LockGlobalMessage(ctx context.Context, clientMsgID strin
 	}
 	return err
 }
+
 func (l *LockerMessage) UnLockMessageTypeKey(ctx context.Context, clientMsgID string, typeKey string) error {
 	return l.cache.UnLockMessageTypeKey(ctx, clientMsgID, typeKey)
 }

internal/rpc/msg/statistics.go

@@ -25,7 +25,15 @@ import (
 )
 
 func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq) (*msg.GetActiveUserResp, error) {
-	msgCount, userCount, users, dateCount, err := m.MsgDatabase.RangeUserSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Group, req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+	msgCount, userCount, users, dateCount, err := m.MsgDatabase.RangeUserSendCount(
+		ctx,
+		time.UnixMilli(req.Start),
+		time.UnixMilli(req.End),
+		req.Group,
+		req.Ase,
+		req.Pagination.PageNumber,
+		req.Pagination.ShowNumber,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -60,7 +68,14 @@ func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq
 }
 
 func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupReq) (*msg.GetActiveGroupResp, error) {
-	msgCount, groupCount, groups, dateCount, err := m.MsgDatabase.RangeGroupSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+	msgCount, groupCount, groups, dateCount, err := m.MsgDatabase.RangeGroupSendCount(
+		ctx,
+		time.UnixMilli(req.Start),
+		time.UnixMilli(req.End),
+		req.Ase,
+		req.Pagination.PageNumber,
+		req.Pagination.ShowNumber,
+	)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/third/third.go

@@ -25,6 +25,8 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/minio"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3/oss"
 
+	"google.golang.org/grpc"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -33,7 +35,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/third"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
-	"google.golang.org/grpc"
 )
 
 func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error {

internal/rpc/user/user.go

@@ -38,8 +38,9 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 	"google.golang.org/grpc"
+
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
 type userServer struct {

internal/tools/conversation.go

@@ -33,7 +33,18 @@ func (c *MsgTool) ConversationsDestructMsgs() {
 	}
 	log.ZDebug(context.Background(), "nums conversations need destruct", "nums", len(conversations))
 	for _, conversation := range conversations {
-		log.ZDebug(ctx, "UserMsgsDestruct", "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID, "msgDestructTime", conversation.MsgDestructTime, "lastMsgDestructTime", conversation.LatestMsgDestructTime)
+		log.ZDebug(
+			ctx,
+			"UserMsgsDestruct",
+			"conversationID",
+			conversation.ConversationID,
+			"ownerUserID",
+			conversation.OwnerUserID,
+			"msgDestructTime",
+			conversation.MsgDestructTime,
+			"lastMsgDestructTime",
+			conversation.LatestMsgDestructTime,
+		)
 		seqs, err := c.msgDatabase.UserMsgsDestruct(ctx, conversation.OwnerUserID, conversation.ConversationID, conversation.MsgDestructTime, conversation.LatestMsgDestructTime)
 		if err != nil {
 			log.ZError(ctx, "user msg destruct failed", err, "conversationID", conversation.ConversationID, "ownerUserID", conversation.OwnerUserID)

internal/tools/msg.go

@@ -20,6 +20,10 @@ import (
 	"math"
 	"time"
 
+	"github.com/redis/go-redis/v9"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/controller"
@@ -34,9 +38,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"github.com/redis/go-redis/v9"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 )
 
 type MsgTool struct {
@@ -87,7 +88,11 @@ func InitMsgTool() (*MsgTool, error) {
 		tx.NewGorm(db),
 	)
 	groupDatabase := controller.InitGroupDatabase(db, rdb, mongo.GetDatabase())
-	conversationDatabase := controller.NewConversationDatabase(relation.NewConversationGorm(db), cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), relation.NewConversationGorm(db)), tx.NewGorm(db))
+	conversationDatabase := controller.NewConversationDatabase(
+		relation.NewConversationGorm(db),
+		cache.NewConversationRedis(rdb, cache.GetDefaultOpt(), relation.NewConversationGorm(db)),
+		tx.NewGorm(db),
+	)
 	msgRpcClient := rpcclient.NewMessageRpcClient(discov)
 	msgNotificationSender := notification.NewMsgNotificationSender(rpcclient.WithRpcClient(&msgRpcClient))
 	msgTool := NewMsgTool(msgDatabase, userDatabase, groupDatabase, conversationDatabase, msgNotificationSender)

pkg/common/cmd/msg_gateway.go

@@ -16,7 +16,7 @@ package cmd
 
 import (
 	"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway"
-	//"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway"
+	//"github.com/OpenIMSDK/Open-IM-Server/internal/msggateway".
 	"github.com/spf13/cobra"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"

pkg/common/db/cache/init_redis_test.go

@@ -16,11 +16,12 @@ package cache
 
 import (
 	"fmt"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"testing"
+
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
-//TestNewRedis Test redis connection
+// TestNewRedis Test redis connection
 func TestNewRedis(t *testing.T) {
 	err := config.InitConfig("config_folder_path")
 	if err != nil {

pkg/common/db/controller/msg.go

@@ -19,9 +19,10 @@ import (
 	"errors"
 	"time"
 
+	"gorm.io/gorm"
+
 	relation2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/relation"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
-	"gorm.io/gorm"
 
 	"github.com/redis/go-redis/v9"
 
@@ -35,10 +36,11 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 
+	"go.mongodb.org/mongo-driver/mongo"
+
 	pbMsg "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"go.mongodb.org/mongo-driver/mongo"
 )
 
 const (
@@ -103,8 +105,23 @@ type CommonMsgDatabase interface {
 	MsgToPushMQ(ctx context.Context, key, conversarionID string, msg2mq *sdkws.MsgData) (int32, int64, error)
 	MsgToMongoMQ(ctx context.Context, key, conversarionID string, msgs []*sdkws.MsgData, lastSeq int64) error
 
-	RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error)
+	RangeUserSendCount(
-	RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error)
+		ctx context.Context,
+		start time.Time,
+		end time.Time,
+		group bool,
+		ase bool,
+		pageNumber int32,
+		showNumber int32,
+	) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error)
+	RangeGroupSendCount(
+		ctx context.Context,
+		start time.Time,
+		end time.Time,
+		ase bool,
+		pageNumber int32,
+		showNumber int32,
+	) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error)
 }
 
 func NewCommonMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheModel cache.MsgModel, msgMyqModel relation.ChatLogModelInterface) CommonMsgDatabase {
@@ -575,7 +592,22 @@ func (db *commonMsgDatabase) GetMsgBySeqs(ctx context.Context, userID string, co
 			log.ZError(ctx, "get message from redis exception", err, "failedSeqs", failedSeqs, "conversationID", conversationID)
 		}
 	}
-	log.ZInfo(ctx, "db.cache.GetMessagesBySeq", "userID", userID, "conversationID", conversationID, "seqs", seqs, "successMsgs", len(successMsgs), "failedSeqs", failedSeqs, "conversationID", conversationID)
+	log.ZInfo(
+		ctx,
+		"db.cache.GetMessagesBySeq",
+		"userID",
+		userID,
+		"conversationID",
+		conversationID,
+		"seqs",
+		seqs,
+		"successMsgs",
+		len(successMsgs),
+		"failedSeqs",
+		failedSeqs,
+		"conversationID",
+		conversationID,
+	)
 	prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs))
 	if len(failedSeqs) > 0 {
 		mongoMsgs, err := db.getMsgBySeqs(ctx, userID, conversationID, failedSeqs)
@@ -893,11 +925,26 @@ func (db *commonMsgDatabase) GetMinMaxSeqMongo(ctx context.Context, conversation
 	return
 }
 
-func (db *commonMsgDatabase) RangeUserSendCount(ctx context.Context, start time.Time, end time.Time, group bool, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error) {
+func (db *commonMsgDatabase) RangeUserSendCount(
+	ctx context.Context,
+	start time.Time,
+	end time.Time,
+	group bool,
+	ase bool,
+	pageNumber int32,
+	showNumber int32,
+) (msgCount int64, userCount int64, users []*unRelationTb.UserCount, dateCount map[string]int64, err error) {
 	return db.msgDocDatabase.RangeUserSendCount(ctx, start, end, group, ase, pageNumber, showNumber)
 }
 
-func (db *commonMsgDatabase) RangeGroupSendCount(ctx context.Context, start time.Time, end time.Time, ase bool, pageNumber int32, showNumber int32) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error) {
+func (db *commonMsgDatabase) RangeGroupSendCount(
+	ctx context.Context,
+	start time.Time,
+	end time.Time,
+	ase bool,
+	pageNumber int32,
+	showNumber int32,
+) (msgCount int64, userCount int64, groups []*unRelationTb.GroupCount, dateCount map[string]int64, err error) {
 	return db.msgDocDatabase.RangeGroupSendCount(ctx, start, end, ase, pageNumber, showNumber)
 }
 

pkg/common/db/relation/group_model.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"time"
 
-
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 
 	"gorm.io/gorm"

pkg/common/db/s3/cont/controller.go

@@ -24,10 +24,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
-	"github.com/google/uuid"
 )
 
 func New(impl s3.Interface) *Controller {

pkg/common/db/s3/cos/cos.go

@@ -24,9 +24,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/tencentyun/cos-go-sdk-v5"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
-	"github.com/tencentyun/cos-go-sdk-v5"
 )
 
 const (

pkg/common/db/s3/minio/minio.go

@@ -24,11 +24,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/minio/minio-go/v7/pkg/signer"
+
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
 )
 
 const (

pkg/common/db/s3/oss/oss.go

@@ -24,9 +24,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
-	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 )
 
 const (
@@ -147,7 +148,11 @@ func (o *OSS) AuthSign(ctx context.Context, uploadID string, name string, expire
 		}
 		request.Header.Set(oss.HTTPHeaderHost, request.Host)
 		request.Header.Set(oss.HTTPHeaderDate, time.Now().UTC().Format(http.TimeFormat))
-		authorization := fmt.Sprintf(`OSS %s:%s`, o.credentials.GetAccessKeyID(), o.getSignedStr(request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID), o.credentials.GetAccessKeySecret()))
+		authorization := fmt.Sprintf(
+			`OSS %s:%s`,
+			o.credentials.GetAccessKeyID(),
+			o.getSignedStr(request, fmt.Sprintf(`/%s/%s?partNumber=%d&uploadId=%s`, o.bucket.BucketName, name, partNumber, uploadID), o.credentials.GetAccessKeySecret()),
+		)
 		request.Header.Set(oss.HTTPHeaderAuthorization, authorization)
 		result.Parts[i] = s3.SignPart{
 			PartNumber: partNumber,

pkg/common/db/table/relation/conversation.go

@@ -24,20 +24,20 @@ const (
 )
 
 type ConversationModel struct {
-	OwnerUserID           string    `gorm:"column:owner_user_id;primary_key;type:char(128)" json:"OwnerUserID"`
+	OwnerUserID           string    `gorm:"column:owner_user_id;primary_key;type:char(128)"     json:"OwnerUserID"`
-	ConversationID        string    `gorm:"column:conversation_id;primary_key;type:char(128)" json:"conversationID"`
+	ConversationID        string    `gorm:"column:conversation_id;primary_key;type:char(128)"   json:"conversationID"`
-	ConversationType      int32     `gorm:"column:conversation_type" json:"conversationType"`
+	ConversationType      int32     `gorm:"column:conversation_type"                            json:"conversationType"`
-	UserID                string    `gorm:"column:user_id;type:char(64)" json:"userID"`
+	UserID                string    `gorm:"column:user_id;type:char(64)"                        json:"userID"`
-	GroupID               string    `gorm:"column:group_id;type:char(128)" json:"groupID"`
+	GroupID               string    `gorm:"column:group_id;type:char(128)"                      json:"groupID"`
-	RecvMsgOpt            int32     `gorm:"column:recv_msg_opt" json:"recvMsgOpt"`
+	RecvMsgOpt            int32     `gorm:"column:recv_msg_opt"                                 json:"recvMsgOpt"`
-	IsPinned              bool      `gorm:"column:is_pinned" json:"isPinned"`
+	IsPinned              bool      `gorm:"column:is_pinned"                                    json:"isPinned"`
-	IsPrivateChat         bool      `gorm:"column:is_private_chat" json:"isPrivateChat"`
+	IsPrivateChat         bool      `gorm:"column:is_private_chat"                              json:"isPrivateChat"`
-	BurnDuration          int32     `gorm:"column:burn_duration;default:30" json:"burnDuration"`
+	BurnDuration          int32     `gorm:"column:burn_duration;default:30"                     json:"burnDuration"`
-	GroupAtType           int32     `gorm:"column:group_at_type" json:"groupAtType"`
+	GroupAtType           int32     `gorm:"column:group_at_type"                                json:"groupAtType"`
-	AttachedInfo          string    `gorm:"column:attached_info;type:varchar(1024)" json:"attachedInfo"`
+	AttachedInfo          string    `gorm:"column:attached_info;type:varchar(1024)"             json:"attachedInfo"`
-	Ex                    string    `gorm:"column:ex;type:varchar(1024)" json:"ex"`
+	Ex                    string    `gorm:"column:ex;type:varchar(1024)"                        json:"ex"`
-	MaxSeq                int64     `gorm:"column:max_seq" json:"maxSeq"`
+	MaxSeq                int64     `gorm:"column:max_seq"                                      json:"maxSeq"`
-	MinSeq                int64     `gorm:"column:min_seq" json:"minSeq"`
+	MinSeq                int64     `gorm:"column:min_seq"                                      json:"minSeq"`
 	CreateTime            time.Time `gorm:"column:create_time;index:create_time;autoCreateTime"`
 	IsMsgDestruct         bool      `gorm:"column:is_msg_destruct;default:false"`
 	MsgDestructTime       int64     `gorm:"column:msg_destruct_time;default:604800"`

pkg/common/prome/gather.go

@@ -20,17 +20,17 @@ import (
 )
 
 var (
-	//auth rpc.
+	// auth rpc.
 	UserLoginCounter    prometheus.Counter
 	UserRegisterCounter prometheus.Counter
 
-	//seg.
+	// seg.
 	SeqGetSuccessCounter prometheus.Counter
 	SeqGetFailedCounter  prometheus.Counter
 	SeqSetSuccessCounter prometheus.Counter
 	SeqSetFailedCounter  prometheus.Counter
 
-	//msg-db.
+	// msg-db.
 	MsgInsertRedisSuccessCounter   prometheus.Counter
 	MsgInsertRedisFailedCounter    prometheus.Counter
 	MsgInsertMongoSuccessCounter   prometheus.Counter
@@ -40,7 +40,7 @@ var (
 	MsgPullFromMongoSuccessCounter prometheus.Counter
 	MsgPullFromMongoFailedCounter  prometheus.Counter
 
-	//msg-ws.
+	// msg-ws.
 	MsgRecvTotalCounter          prometheus.Counter
 	GetNewestSeqTotalCounter     prometheus.Counter
 	PullMsgBySeqListTotalCounter prometheus.Counter
@@ -50,7 +50,7 @@ var (
 	WorkSuperGroupChatMsgRecvSuccessCounter prometheus.Counter
 	OnlineUserGauge                         prometheus.Gauge
 
-	//msg-msg.
+	// msg-msg.
 	SingleChatMsgProcessSuccessCounter         prometheus.Counter
 	SingleChatMsgProcessFailedCounter          prometheus.Counter
 	GroupChatMsgProcessSuccessCounter          prometheus.Counter
@@ -58,7 +58,7 @@ var (
 	WorkSuperGroupChatMsgProcessSuccessCounter prometheus.Counter
 	WorkSuperGroupChatMsgProcessFailedCounter  prometheus.Counter
 
-	//msg-push.
+	// msg-push.
 	MsgOnlinePushSuccessCounter  prometheus.Counter
 	MsgOfflinePushSuccessCounter prometheus.Counter
 	MsgOfflinePushFailedCounter  prometheus.Counter

pkg/discoveryregistry/zookeeper/discover.go

@@ -20,9 +20,10 @@ import (
 	"io"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
-	"github.com/pkg/errors"
 
 	"github.com/go-zookeeper/zk"
 	"google.golang.org/grpc"

pkg/proto/auth/auth.pb.go

@@ -22,13 +22,14 @@ package auth
 
 import (
 	context "context"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -43,9 +44,9 @@ type UserTokenReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Secret     string `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret"`
+	Secret     string `protobuf:"bytes,1,opt,name=secret,proto3"      json:"secret"`
 	PlatformID int32  `protobuf:"varint,2,opt,name=platformID,proto3" json:"platformID"`
-	UserID     string `protobuf:"bytes,3,opt,name=userID,proto3" json:"userID"`
+	UserID     string `protobuf:"bytes,3,opt,name=userID,proto3"      json:"userID"`
 }
 
 func (x *UserTokenReq) Reset() {
@@ -106,7 +107,7 @@ type UserTokenResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Token             string `protobuf:"bytes,2,opt,name=token,proto3" json:"token"`
+	Token             string `protobuf:"bytes,2,opt,name=token,proto3"              json:"token"`
 	ExpireTimeSeconds int64  `protobuf:"varint,3,opt,name=expireTimeSeconds,proto3" json:"expireTimeSeconds"`
 }
 
@@ -162,7 +163,7 @@ type ForceLogoutReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	PlatformID int32  `protobuf:"varint,1,opt,name=platformID,proto3" json:"platformID"`
-	UserID     string `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID     string `protobuf:"bytes,2,opt,name=userID,proto3"      json:"userID"`
 }
 
 func (x *ForceLogoutReq) Reset() {
@@ -301,8 +302,8 @@ type ParseTokenResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID            string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID            string `protobuf:"bytes,1,opt,name=userID,proto3"             json:"userID"`
-	Platform          string `protobuf:"bytes,2,opt,name=platform,proto3" json:"platform"`
+	Platform          string `protobuf:"bytes,2,opt,name=platform,proto3"           json:"platform"`
 	ExpireTimeSeconds int64  `protobuf:"varint,4,opt,name=expireTimeSeconds,proto3" json:"expireTimeSeconds"`
 }
 

pkg/proto/conversation/conversation.pb.go

@@ -22,14 +22,16 @@ package conversation
 
 import (
 	context "context"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (
@@ -44,23 +46,23 @@ type Conversation struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID           string `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID           string `protobuf:"bytes,1,opt,name=ownerUserID,proto3"             json:"ownerUserID"`
-	ConversationID        string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
+	ConversationID        string `protobuf:"bytes,2,opt,name=conversationID,proto3"          json:"conversationID"`
-	RecvMsgOpt            int32  `protobuf:"varint,3,opt,name=recvMsgOpt,proto3" json:"recvMsgOpt"`
+	RecvMsgOpt            int32  `protobuf:"varint,3,opt,name=recvMsgOpt,proto3"             json:"recvMsgOpt"`
-	ConversationType      int32  `protobuf:"varint,4,opt,name=conversationType,proto3" json:"conversationType"`
+	ConversationType      int32  `protobuf:"varint,4,opt,name=conversationType,proto3"       json:"conversationType"`
-	UserID                string `protobuf:"bytes,5,opt,name=userID,proto3" json:"userID"`
+	UserID                string `protobuf:"bytes,5,opt,name=userID,proto3"                  json:"userID"`
-	GroupID               string `protobuf:"bytes,6,opt,name=groupID,proto3" json:"groupID"`
+	GroupID               string `protobuf:"bytes,6,opt,name=groupID,proto3"                 json:"groupID"`
-	IsPinned              bool   `protobuf:"varint,7,opt,name=isPinned,proto3" json:"isPinned"`
+	IsPinned              bool   `protobuf:"varint,7,opt,name=isPinned,proto3"               json:"isPinned"`
-	AttachedInfo          string `protobuf:"bytes,8,opt,name=attachedInfo,proto3" json:"attachedInfo"`
+	AttachedInfo          string `protobuf:"bytes,8,opt,name=attachedInfo,proto3"            json:"attachedInfo"`
-	IsPrivateChat         bool   `protobuf:"varint,9,opt,name=isPrivateChat,proto3" json:"isPrivateChat"`
+	IsPrivateChat         bool   `protobuf:"varint,9,opt,name=isPrivateChat,proto3"          json:"isPrivateChat"`
-	GroupAtType           int32  `protobuf:"varint,10,opt,name=groupAtType,proto3" json:"groupAtType"`
+	GroupAtType           int32  `protobuf:"varint,10,opt,name=groupAtType,proto3"           json:"groupAtType"`
-	Ex                    string `protobuf:"bytes,11,opt,name=ex,proto3" json:"ex"`
+	Ex                    string `protobuf:"bytes,11,opt,name=ex,proto3"                     json:"ex"`
-	BurnDuration          int32  `protobuf:"varint,12,opt,name=burnDuration,proto3" json:"burnDuration"`
+	BurnDuration          int32  `protobuf:"varint,12,opt,name=burnDuration,proto3"          json:"burnDuration"`
-	MinSeq                int64  `protobuf:"varint,13,opt,name=minSeq,proto3" json:"minSeq"`
+	MinSeq                int64  `protobuf:"varint,13,opt,name=minSeq,proto3"                json:"minSeq"`
-	MaxSeq                int64  `protobuf:"varint,14,opt,name=maxSeq,proto3" json:"maxSeq"`
+	MaxSeq                int64  `protobuf:"varint,14,opt,name=maxSeq,proto3"                json:"maxSeq"`
-	MsgDestructTime       int64  `protobuf:"varint,15,opt,name=msgDestructTime,proto3" json:"msgDestructTime"`
+	MsgDestructTime       int64  `protobuf:"varint,15,opt,name=msgDestructTime,proto3"       json:"msgDestructTime"`
 	LatestMsgDestructTime int64  `protobuf:"varint,16,opt,name=latestMsgDestructTime,proto3" json:"latestMsgDestructTime"`
-	IsMsgDestruct         bool   `protobuf:"varint,17,opt,name=isMsgDestruct,proto3" json:"isMsgDestruct"`
+	IsMsgDestruct         bool   `protobuf:"varint,17,opt,name=isMsgDestruct,proto3"         json:"isMsgDestruct"`
 }
 
 func (x *Conversation) Reset() {
@@ -219,21 +221,21 @@ type ConversationReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ConversationID   string                  `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
+	ConversationID   string                  `protobuf:"bytes,1,opt,name=conversationID,proto3"    json:"conversationID"`
 	ConversationType int32                   `protobuf:"varint,2,opt,name=conversationType,proto3" json:"conversationType"`
-	UserID           string                  `protobuf:"bytes,3,opt,name=userID,proto3" json:"userID"`
+	UserID           string                  `protobuf:"bytes,3,opt,name=userID,proto3"            json:"userID"`
-	GroupID          string                  `protobuf:"bytes,4,opt,name=groupID,proto3" json:"groupID"`
+	GroupID          string                  `protobuf:"bytes,4,opt,name=groupID,proto3"           json:"groupID"`
-	RecvMsgOpt       *wrapperspb.Int32Value  `protobuf:"bytes,5,opt,name=recvMsgOpt,proto3" json:"recvMsgOpt"`
+	RecvMsgOpt       *wrapperspb.Int32Value  `protobuf:"bytes,5,opt,name=recvMsgOpt,proto3"        json:"recvMsgOpt"`
-	IsPinned         *wrapperspb.BoolValue   `protobuf:"bytes,6,opt,name=isPinned,proto3" json:"isPinned"`
+	IsPinned         *wrapperspb.BoolValue   `protobuf:"bytes,6,opt,name=isPinned,proto3"          json:"isPinned"`
-	AttachedInfo     *wrapperspb.StringValue `protobuf:"bytes,7,opt,name=attachedInfo,proto3" json:"attachedInfo"`
+	AttachedInfo     *wrapperspb.StringValue `protobuf:"bytes,7,opt,name=attachedInfo,proto3"      json:"attachedInfo"`
-	IsPrivateChat    *wrapperspb.BoolValue   `protobuf:"bytes,8,opt,name=isPrivateChat,proto3" json:"isPrivateChat"`
+	IsPrivateChat    *wrapperspb.BoolValue   `protobuf:"bytes,8,opt,name=isPrivateChat,proto3"     json:"isPrivateChat"`
-	Ex               *wrapperspb.StringValue `protobuf:"bytes,9,opt,name=ex,proto3" json:"ex"`
+	Ex               *wrapperspb.StringValue `protobuf:"bytes,9,opt,name=ex,proto3"                json:"ex"`
-	BurnDuration     *wrapperspb.Int32Value  `protobuf:"bytes,10,opt,name=burnDuration,proto3" json:"burnDuration"`
+	BurnDuration     *wrapperspb.Int32Value  `protobuf:"bytes,10,opt,name=burnDuration,proto3"     json:"burnDuration"`
-	MinSeq           *wrapperspb.Int64Value  `protobuf:"bytes,11,opt,name=minSeq,proto3" json:"minSeq"`
+	MinSeq           *wrapperspb.Int64Value  `protobuf:"bytes,11,opt,name=minSeq,proto3"           json:"minSeq"`
-	MaxSeq           *wrapperspb.Int64Value  `protobuf:"bytes,12,opt,name=maxSeq,proto3" json:"maxSeq"`
+	MaxSeq           *wrapperspb.Int64Value  `protobuf:"bytes,12,opt,name=maxSeq,proto3"           json:"maxSeq"`
-	GroupAtType      *wrapperspb.Int32Value  `protobuf:"bytes,13,opt,name=groupAtType,proto3" json:"groupAtType"`
+	GroupAtType      *wrapperspb.Int32Value  `protobuf:"bytes,13,opt,name=groupAtType,proto3"      json:"groupAtType"`
-	MsgDestructTime  *wrapperspb.Int64Value  `protobuf:"bytes,14,opt,name=msgDestructTime,proto3" json:"msgDestructTime"`
+	MsgDestructTime  *wrapperspb.Int64Value  `protobuf:"bytes,14,opt,name=msgDestructTime,proto3"  json:"msgDestructTime"`
-	IsMsgDestruct    *wrapperspb.BoolValue   `protobuf:"bytes,15,opt,name=isMsgDestruct,proto3" json:"isMsgDestruct"`
+	IsMsgDestruct    *wrapperspb.BoolValue   `protobuf:"bytes,15,opt,name=isMsgDestruct,proto3"    json:"isMsgDestruct"`
 }
 
 func (x *ConversationReq) Reset() {
@@ -464,7 +466,7 @@ type GetConversationReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	OwnerUserID    string `protobuf:"bytes,2,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID    string `protobuf:"bytes,2,opt,name=ownerUserID,proto3"    json:"ownerUserID"`
 }
 
 func (x *GetConversationReq) Reset() {
@@ -565,7 +567,7 @@ type GetConversationsReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID     string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID     string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3"     json:"ownerUserID"`
 	ConversationIDs []string `protobuf:"bytes,2,rep,name=conversationIDs,proto3" json:"conversationIDs"`
 }
 
@@ -1042,8 +1044,8 @@ type SetConversationMaxSeqReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string   `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	OwnerUserID    []string `protobuf:"bytes,2,rep,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID    []string `protobuf:"bytes,2,rep,name=ownerUserID,proto3"    json:"ownerUserID"`
-	MaxSeq         int64    `protobuf:"varint,3,opt,name=maxSeq,proto3" json:"maxSeq"`
+	MaxSeq         int64    `protobuf:"varint,3,opt,name=maxSeq,proto3"        json:"maxSeq"`
 }
 
 func (x *SetConversationMaxSeqReq) Reset() {
@@ -1236,7 +1238,7 @@ type SetConversationsReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserIDs      []string         `protobuf:"bytes,1,rep,name=userIDs,proto3" json:"userIDs"`
+	UserIDs      []string         `protobuf:"bytes,1,rep,name=userIDs,proto3"      json:"userIDs"`
 	Conversation *ConversationReq `protobuf:"bytes,2,opt,name=conversation,proto3" json:"conversation"`
 }
 

pkg/proto/errinfo/errinfo.pb.go

@@ -21,10 +21,11 @@
 package errinfo
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (
@@ -39,11 +40,11 @@ type ErrorInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Path  string   `protobuf:"bytes,1,opt,name=path,proto3" json:"path"`
+	Path  string   `protobuf:"bytes,1,opt,name=path,proto3"  json:"path"`
 	Line  uint32   `protobuf:"varint,2,opt,name=line,proto3" json:"line"`
-	Name  string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`
+	Name  string   `protobuf:"bytes,3,opt,name=name,proto3"  json:"name"`
 	Cause string   `protobuf:"bytes,4,opt,name=cause,proto3" json:"cause"`
-	Warp  []string `protobuf:"bytes,5,rep,name=warp,proto3" json:"warp"`
+	Warp  []string `protobuf:"bytes,5,rep,name=warp,proto3"  json:"warp"`
 }
 
 func (x *ErrorInfo) Reset() {

pkg/proto/friend/friend.pb.go

@@ -22,14 +22,16 @@ package friend
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (
@@ -45,7 +47,7 @@ type GetPaginationFriendsReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination"`
-	UserID     string                   `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID     string                   `protobuf:"bytes,2,opt,name=userID,proto3"     json:"userID"`
 }
 
 func (x *GetPaginationFriendsReq) Reset() {
@@ -100,7 +102,7 @@ type GetPaginationFriendsResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	FriendsInfo []*sdkws.FriendInfo `protobuf:"bytes,1,rep,name=friendsInfo,proto3" json:"friendsInfo"`
-	Total       int32               `protobuf:"varint,2,opt,name=total,proto3" json:"total"`
+	Total       int32               `protobuf:"varint,2,opt,name=total,proto3"      json:"total"`
 }
 
 func (x *GetPaginationFriendsResp) Reset() {
@@ -155,9 +157,9 @@ type ApplyToAddFriendReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	FromUserID string `protobuf:"bytes,1,opt,name=fromUserID,proto3" json:"fromUserID"`
-	ToUserID   string `protobuf:"bytes,2,opt,name=toUserID,proto3" json:"toUserID"`
+	ToUserID   string `protobuf:"bytes,2,opt,name=toUserID,proto3"   json:"toUserID"`
-	ReqMsg     string `protobuf:"bytes,3,opt,name=reqMsg,proto3" json:"reqMsg"`
+	ReqMsg     string `protobuf:"bytes,3,opt,name=reqMsg,proto3"     json:"reqMsg"`
-	Ex         string `protobuf:"bytes,4,opt,name=ex,proto3" json:"ex"`
+	Ex         string `protobuf:"bytes,4,opt,name=ex,proto3"         json:"ex"`
 }
 
 func (x *ApplyToAddFriendReq) Reset() {
@@ -263,7 +265,7 @@ type ImportFriendReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID   string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID   string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3"   json:"ownerUserID"`
 	FriendUserIDs []string `protobuf:"bytes,2,rep,name=friendUserIDs,proto3" json:"friendUserIDs"`
 }
 
@@ -356,7 +358,7 @@ type GetPaginationFriendsApplyToReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID     string                   `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID     string                   `protobuf:"bytes,1,opt,name=userID,proto3"     json:"userID"`
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination"`
 }
 
@@ -412,7 +414,7 @@ type GetPaginationFriendsApplyToResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	FriendRequests []*sdkws.FriendRequest `protobuf:"bytes,1,rep,name=FriendRequests,proto3" json:"FriendRequests"`
-	Total          int32                  `protobuf:"varint,2,opt,name=total,proto3" json:"total"`
+	Total          int32                  `protobuf:"varint,2,opt,name=total,proto3"         json:"total"`
 }
 
 func (x *GetPaginationFriendsApplyToResp) Reset() {
@@ -466,7 +468,7 @@ type GetDesignatedFriendsReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID   string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID   string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3"   json:"ownerUserID"`
 	FriendUserIDs []string `protobuf:"bytes,2,rep,name=friendUserIDs,proto3" json:"friendUserIDs"`
 }
 
@@ -754,7 +756,7 @@ type GetPaginationBlacksReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID     string                   `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID     string                   `protobuf:"bytes,1,opt,name=userID,proto3"     json:"userID"`
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination"`
 }
 
@@ -1084,7 +1086,7 @@ type DeleteFriendReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID  string `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID  string `protobuf:"bytes,1,opt,name=ownerUserID,proto3"  json:"ownerUserID"`
 	FriendUserID string `protobuf:"bytes,2,opt,name=friendUserID,proto3" json:"friendUserID"`
 }
 
@@ -1178,10 +1180,10 @@ type RespondFriendApplyReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FromUserID   string `protobuf:"bytes,1,opt,name=fromUserID,proto3" json:"fromUserID"` //主动发起的申请者
+	FromUserID   string `protobuf:"bytes,1,opt,name=fromUserID,proto3"    json:"fromUserID"` //主动发起的申请者
-	ToUserID     string `protobuf:"bytes,2,opt,name=toUserID,proto3" json:"toUserID"`     //被动添加者
+	ToUserID     string `protobuf:"bytes,2,opt,name=toUserID,proto3"      json:"toUserID"`   //被动添加者
 	HandleResult int32  `protobuf:"varint,3,opt,name=handleResult,proto3" json:"handleResult"`
-	HandleMsg    string `protobuf:"bytes,4,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg    string `protobuf:"bytes,4,opt,name=handleMsg,proto3"     json:"handleMsg"`
 }
 
 func (x *RespondFriendApplyReq) Reset() {
@@ -1287,9 +1289,9 @@ type SetFriendRemarkReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID  string `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID  string `protobuf:"bytes,1,opt,name=ownerUserID,proto3"  json:"ownerUserID"`
 	FriendUserID string `protobuf:"bytes,2,opt,name=friendUserID,proto3" json:"friendUserID"`
-	Remark       string `protobuf:"bytes,3,opt,name=remark,proto3" json:"remark"`
+	Remark       string `protobuf:"bytes,3,opt,name=remark,proto3"       json:"remark"`
 }
 
 func (x *SetFriendRemarkReq) Reset() {
@@ -1388,7 +1390,7 @@ type GetPaginationFriendsApplyFromReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID     string                   `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID     string                   `protobuf:"bytes,1,opt,name=userID,proto3"     json:"userID"`
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination"`
 }
 
@@ -1444,7 +1446,7 @@ type GetPaginationFriendsApplyFromResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	FriendRequests []*sdkws.FriendRequest `protobuf:"bytes,1,rep,name=friendRequests,proto3" json:"friendRequests"`
-	Total          int32                  `protobuf:"varint,2,opt,name=total,proto3" json:"total"`
+	Total          int32                  `protobuf:"varint,2,opt,name=total,proto3"         json:"total"`
 }
 
 func (x *GetPaginationFriendsApplyFromResp) Reset() {

pkg/proto/group/group.pb.go

@@ -22,15 +22,17 @@ package group
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (
@@ -46,9 +48,9 @@ type CreateGroupReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	MemberUserIDs []string         `protobuf:"bytes,1,rep,name=memberUserIDs,proto3" json:"memberUserIDs"`
-	GroupInfo     *sdkws.GroupInfo `protobuf:"bytes,2,opt,name=groupInfo,proto3" json:"groupInfo"`
+	GroupInfo     *sdkws.GroupInfo `protobuf:"bytes,2,opt,name=groupInfo,proto3"     json:"groupInfo"`
-	AdminUserIDs  []string         `protobuf:"bytes,3,rep,name=adminUserIDs,proto3" json:"adminUserIDs"`
+	AdminUserIDs  []string         `protobuf:"bytes,3,rep,name=adminUserIDs,proto3"  json:"adminUserIDs"`
-	OwnerUserID   string           `protobuf:"bytes,4,opt,name=ownerUserID,proto3" json:"ownerUserID"` //owner
+	OwnerUserID   string           `protobuf:"bytes,4,opt,name=ownerUserID,proto3"   json:"ownerUserID"` //owner
 }
 
 func (x *CreateGroupReq) Reset() {
@@ -397,7 +399,7 @@ type GetGroupApplicationListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total         uint32                `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total         uint32                `protobuf:"varint,1,opt,name=total,proto3"        json:"total"`
 	GroupRequests []*sdkws.GroupRequest `protobuf:"bytes,2,rep,name=groupRequests,proto3" json:"groupRequests"`
 }
 
@@ -453,7 +455,7 @@ type GetUserReqApplicationListReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination"`
-	UserID     string                   `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID     string                   `protobuf:"bytes,2,opt,name=userID,proto3"     json:"userID"`
 }
 
 func (x *GetUserReqApplicationListReq) Reset() {
@@ -507,7 +509,7 @@ type GetUserReqApplicationListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total         uint32                `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total         uint32                `protobuf:"varint,1,opt,name=total,proto3"        json:"total"`
 	GroupRequests []*sdkws.GroupRequest `protobuf:"bytes,2,rep,name=groupRequests,proto3" json:"groupRequests"`
 }
 
@@ -562,7 +564,7 @@ type TransferGroupOwnerReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID        string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID        string `protobuf:"bytes,1,opt,name=groupID,proto3"        json:"groupID"`
 	OldOwnerUserID string `protobuf:"bytes,2,opt,name=oldOwnerUserID,proto3" json:"oldOwnerUserID"`
 	NewOwnerUserID string `protobuf:"bytes,3,opt,name=newOwnerUserID,proto3" json:"newOwnerUserID"`
 }
@@ -663,9 +665,9 @@ type JoinGroupReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID       string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID       string `protobuf:"bytes,1,opt,name=groupID,proto3"       json:"groupID"`
-	ReqMessage    string `protobuf:"bytes,2,opt,name=reqMessage,proto3" json:"reqMessage"`
+	ReqMessage    string `protobuf:"bytes,2,opt,name=reqMessage,proto3"    json:"reqMessage"`
-	JoinSource    int32  `protobuf:"varint,3,opt,name=joinSource,proto3" json:"joinSource"`
+	JoinSource    int32  `protobuf:"varint,3,opt,name=joinSource,proto3"   json:"joinSource"`
 	InviterUserID string `protobuf:"bytes,4,opt,name=inviterUserID,proto3" json:"inviterUserID"`
 }
 
@@ -772,9 +774,9 @@ type GroupApplicationResponseReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID      string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID      string `protobuf:"bytes,1,opt,name=groupID,proto3"       json:"groupID"`
-	FromUserID   string `protobuf:"bytes,2,opt,name=fromUserID,proto3" json:"fromUserID"` //
+	FromUserID   string `protobuf:"bytes,2,opt,name=fromUserID,proto3"    json:"fromUserID"` //
-	HandledMsg   string `protobuf:"bytes,3,opt,name=handledMsg,proto3" json:"handledMsg"`
+	HandledMsg   string `protobuf:"bytes,3,opt,name=handledMsg,proto3"    json:"handledMsg"`
 	HandleResult int32  `protobuf:"varint,4,opt,name=handleResult,proto3" json:"handleResult"`
 }
 
@@ -967,8 +969,8 @@ type GetGroupMemberListReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination"`
-	GroupID    string                   `protobuf:"bytes,2,opt,name=groupID,proto3" json:"groupID"`
+	GroupID    string                   `protobuf:"bytes,2,opt,name=groupID,proto3"    json:"groupID"`
-	Filter     int32                    `protobuf:"varint,3,opt,name=filter,proto3" json:"filter"`
+	Filter     int32                    `protobuf:"varint,3,opt,name=filter,proto3"    json:"filter"`
 }
 
 func (x *GetGroupMemberListReq) Reset() {
@@ -1029,7 +1031,7 @@ type GetGroupMemberListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total   uint32                       `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total   uint32                       `protobuf:"varint,1,opt,name=total,proto3"  json:"total"`
 	Members []*sdkws.GroupMemberFullInfo `protobuf:"bytes,2,rep,name=members,proto3" json:"members"`
 }
 
@@ -1186,9 +1188,9 @@ type KickGroupMemberReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID       string   `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID       string   `protobuf:"bytes,1,opt,name=groupID,proto3"       json:"groupID"`
 	KickedUserIDs []string `protobuf:"bytes,2,rep,name=kickedUserIDs,proto3" json:"kickedUserIDs"`
-	Reason        string   `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason"`
+	Reason        string   `protobuf:"bytes,3,opt,name=reason,proto3"        json:"reason"`
 }
 
 func (x *KickGroupMemberReq) Reset() {
@@ -1397,8 +1399,8 @@ type InviteUserToGroupReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID        string   `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID        string   `protobuf:"bytes,1,opt,name=groupID,proto3"        json:"groupID"`
-	Reason         string   `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason"`
+	Reason         string   `protobuf:"bytes,2,opt,name=reason,proto3"         json:"reason"`
 	InvitedUserIDs []string `protobuf:"bytes,3,rep,name=invitedUserIDs,proto3" json:"invitedUserIDs"`
 }
 
@@ -1499,7 +1501,7 @@ type GetGroupAllMemberReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination"`
-	GroupID    string                   `protobuf:"bytes,2,opt,name=groupID,proto3" json:"groupID"`
+	GroupID    string                   `protobuf:"bytes,2,opt,name=groupID,proto3"    json:"groupID"`
 }
 
 func (x *GetGroupAllMemberReq) Reset() {
@@ -1600,9 +1602,9 @@ type CMSGroup struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupInfo          *sdkws.GroupInfo `protobuf:"bytes,1,opt,name=groupInfo,proto3" json:"groupInfo"`
+	GroupInfo          *sdkws.GroupInfo `protobuf:"bytes,1,opt,name=groupInfo,proto3"          json:"groupInfo"`
 	GroupOwnerUserName string           `protobuf:"bytes,2,opt,name=groupOwnerUserName,proto3" json:"groupOwnerUserName"`
-	GroupOwnerUserID   string           `protobuf:"bytes,3,opt,name=groupOwnerUserID,proto3" json:"groupOwnerUserID"`
+	GroupOwnerUserID   string           `protobuf:"bytes,3,opt,name=groupOwnerUserID,proto3"   json:"groupOwnerUserID"`
 }
 
 func (x *CMSGroup) Reset() {
@@ -1664,8 +1666,8 @@ type GetGroupsReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination"`
-	GroupName  string                   `protobuf:"bytes,2,opt,name=groupName,proto3" json:"groupName"`
+	GroupName  string                   `protobuf:"bytes,2,opt,name=groupName,proto3"  json:"groupName"`
-	GroupID    string                   `protobuf:"bytes,3,opt,name=groupID,proto3" json:"groupID"`
+	GroupID    string                   `protobuf:"bytes,3,opt,name=groupID,proto3"    json:"groupID"`
 }
 
 func (x *GetGroupsReq) Reset() {
@@ -1829,8 +1831,8 @@ type GetGroupMembersCMSReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination"`
-	GroupID    string                   `protobuf:"bytes,2,opt,name=groupID,proto3" json:"groupID"`
+	GroupID    string                   `protobuf:"bytes,2,opt,name=groupID,proto3"    json:"groupID"`
-	UserName   string                   `protobuf:"bytes,3,opt,name=userName,proto3" json:"userName"`
+	UserName   string                   `protobuf:"bytes,3,opt,name=userName,proto3"   json:"userName"`
 }
 
 func (x *GetGroupMembersCMSReq) Reset() {
@@ -1891,7 +1893,7 @@ type GetGroupMembersCMSResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total   uint32                       `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total   uint32                       `protobuf:"varint,1,opt,name=total,proto3"  json:"total"`
 	Members []*sdkws.GroupMemberFullInfo `protobuf:"bytes,2,rep,name=members,proto3" json:"members"`
 }
 
@@ -1946,7 +1948,7 @@ type DismissGroupReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID      string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID      string `protobuf:"bytes,1,opt,name=groupID,proto3"       json:"groupID"`
 	DeleteMember bool   `protobuf:"varint,2,opt,name=deleteMember,proto3" json:"deleteMember"`
 }
 
@@ -2039,8 +2041,8 @@ type MuteGroupMemberReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID      string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID      string `protobuf:"bytes,1,opt,name=groupID,proto3"       json:"groupID"`
-	UserID       string `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID       string `protobuf:"bytes,2,opt,name=userID,proto3"        json:"userID"`
 	MutedSeconds uint32 `protobuf:"varint,3,opt,name=mutedSeconds,proto3" json:"mutedSeconds"`
 }
 
@@ -2141,7 +2143,7 @@ type CancelMuteGroupMemberReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	GroupID string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
-	UserID  string `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID  string `protobuf:"bytes,2,opt,name=userID,proto3"  json:"userID"`
 }
 
 func (x *CancelMuteGroupMemberReq) Reset() {
@@ -2591,12 +2593,12 @@ type SetGroupMemberInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID   string                  `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID   string                  `protobuf:"bytes,1,opt,name=groupID,proto3"   json:"groupID"`
-	UserID    string                  `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID    string                  `protobuf:"bytes,2,opt,name=userID,proto3"    json:"userID"`
-	Nickname  *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=nickname,proto3" json:"nickname"`
+	Nickname  *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=nickname,proto3"  json:"nickname"`
-	FaceURL   *wrapperspb.StringValue `protobuf:"bytes,4,opt,name=faceURL,proto3" json:"faceURL"`
+	FaceURL   *wrapperspb.StringValue `protobuf:"bytes,4,opt,name=faceURL,proto3"   json:"faceURL"`
 	RoleLevel *wrapperspb.Int32Value  `protobuf:"bytes,5,opt,name=roleLevel,proto3" json:"roleLevel"`
-	Ex        *wrapperspb.StringValue `protobuf:"bytes,6,opt,name=ex,proto3" json:"ex"`
+	Ex        *wrapperspb.StringValue `protobuf:"bytes,6,opt,name=ex,proto3"        json:"ex"`
 }
 
 func (x *SetGroupMemberInfo) Reset() {
@@ -2810,8 +2812,8 @@ type GroupAbstractInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID             string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID             string `protobuf:"bytes,1,opt,name=groupID,proto3"              json:"groupID"`
-	GroupMemberNumber   uint32 `protobuf:"varint,2,opt,name=groupMemberNumber,proto3" json:"groupMemberNumber"`
+	GroupMemberNumber   uint32 `protobuf:"varint,2,opt,name=groupMemberNumber,proto3"   json:"groupMemberNumber"`
 	GroupMemberListHash uint64 `protobuf:"varint,3,opt,name=groupMemberListHash,proto3" json:"groupMemberListHash"`
 }
 
@@ -2920,7 +2922,7 @@ type GetUserInGroupMembersReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID   string   `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID   string   `protobuf:"bytes,1,opt,name=userID,proto3"   json:"userID"`
 	GroupIDs []string `protobuf:"bytes,2,rep,name=groupIDs,proto3" json:"groupIDs"`
 }
 
@@ -3116,7 +3118,7 @@ type GetGroupMemberRoleLevelReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID    string  `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID    string  `protobuf:"bytes,1,opt,name=groupID,proto3"            json:"groupID"`
 	RoleLevels []int32 `protobuf:"varint,2,rep,packed,name=roleLevels,proto3" json:"roleLevels"`
 }
 
@@ -3312,7 +3314,7 @@ type GetGroupMemberCacheReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID       string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID       string `protobuf:"bytes,1,opt,name=groupID,proto3"       json:"groupID"`
 	GroupMemberID string `protobuf:"bytes,2,opt,name=groupMemberID,proto3" json:"groupMemberID"`
 }
 
@@ -3415,7 +3417,7 @@ type GroupCreateCountReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Start int64 `protobuf:"varint,1,opt,name=start,proto3" json:"start"`
-	End   int64 `protobuf:"varint,2,opt,name=end,proto3" json:"end"`
+	End   int64 `protobuf:"varint,2,opt,name=end,proto3"   json:"end"`
 }
 
 func (x *GroupCreateCountReq) Reset() {
@@ -3469,9 +3471,9 @@ type GroupCreateCountResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total  int64            `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total  int64            `protobuf:"varint,1,opt,name=total,proto3"  json:"total"`
 	Before int64            `protobuf:"varint,2,opt,name=before,proto3" json:"before"`
-	Count  map[string]int64 `protobuf:"bytes,3,rep,name=count,proto3" json:"count" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Count  map[string]int64 `protobuf:"bytes,3,rep,name=count,proto3"   json:"count"  protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
 func (x *GroupCreateCountResp) Reset() {

pkg/proto/msg/msg.pb.go

@@ -22,14 +22,16 @@ package msg
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (
@@ -44,7 +46,7 @@ type MsgDataToMQ struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Token   string         `protobuf:"bytes,1,opt,name=token,proto3" json:"token"`
+	Token   string         `protobuf:"bytes,1,opt,name=token,proto3"   json:"token"`
 	MsgData *sdkws.MsgData `protobuf:"bytes,2,opt,name=msgData,proto3" json:"msgData"`
 }
 
@@ -146,7 +148,7 @@ type PushMsgDataToMQ struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgData        *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3" json:"msgData"`
+	MsgData        *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3"        json:"msgData"`
 	ConversationID string         `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
 }
 
@@ -201,9 +203,9 @@ type MsgDataToMongoByMQ struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	LastSeq        int64            `protobuf:"varint,1,opt,name=lastSeq,proto3" json:"lastSeq"`
+	LastSeq        int64            `protobuf:"varint,1,opt,name=lastSeq,proto3"       json:"lastSeq"`
 	ConversationID string           `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
-	MsgData        []*sdkws.MsgData `protobuf:"bytes,3,rep,name=msgData,proto3" json:"msgData"`
+	MsgData        []*sdkws.MsgData `protobuf:"bytes,3,rep,name=msgData,proto3"        json:"msgData"`
 }
 
 func (x *MsgDataToMongoByMQ) Reset() {
@@ -415,7 +417,7 @@ type SendMsgResp struct {
 
 	ServerMsgID string `protobuf:"bytes,1,opt,name=serverMsgID,proto3" json:"serverMsgID"`
 	ClientMsgID string `protobuf:"bytes,2,opt,name=clientMsgID,proto3" json:"clientMsgID"`
-	SendTime    int64  `protobuf:"varint,3,opt,name=sendTime,proto3" json:"sendTime"`
+	SendTime    int64  `protobuf:"varint,3,opt,name=sendTime,proto3"   json:"sendTime"`
 }
 
 func (x *SendMsgResp) Reset() {
@@ -646,7 +648,7 @@ type MsgDataToModifyByMQ struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Messages       []*sdkws.MsgData `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages"`
+	Messages       []*sdkws.MsgData `protobuf:"bytes,1,rep,name=messages,proto3"       json:"messages"`
 	ConversationID string           `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
 }
 
@@ -778,8 +780,8 @@ type RevokeMsgReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	Seq            int64  `protobuf:"varint,2,opt,name=seq,proto3" json:"seq"`
+	Seq            int64  `protobuf:"varint,2,opt,name=seq,proto3"           json:"seq"`
-	UserID         string `protobuf:"bytes,3,opt,name=userID,proto3" json:"userID"`
+	UserID         string `protobuf:"bytes,3,opt,name=userID,proto3"         json:"userID"`
 }
 
 func (x *RevokeMsgReq) Reset() {
@@ -879,8 +881,8 @@ type MarkMsgsAsReadReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string  `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	Seqs           []int64 `protobuf:"varint,2,rep,packed,name=seqs,proto3" json:"seqs"`
+	Seqs           []int64 `protobuf:"varint,2,rep,packed,name=seqs,proto3"   json:"seqs"`
-	UserID         string  `protobuf:"bytes,3,opt,name=userID,proto3" json:"userID"`
+	UserID         string  `protobuf:"bytes,3,opt,name=userID,proto3"         json:"userID"`
 }
 
 func (x *MarkMsgsAsReadReq) Reset() {
@@ -980,9 +982,9 @@ type MarkConversationAsReadReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string  `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	UserID         string  `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID         string  `protobuf:"bytes,2,opt,name=userID,proto3"         json:"userID"`
-	HasReadSeq     int64   `protobuf:"varint,3,opt,name=hasReadSeq,proto3" json:"hasReadSeq"`
+	HasReadSeq     int64   `protobuf:"varint,3,opt,name=hasReadSeq,proto3"    json:"hasReadSeq"`
-	Seqs           []int64 `protobuf:"varint,4,rep,packed,name=seqs,proto3" json:"seqs"`
+	Seqs           []int64 `protobuf:"varint,4,rep,packed,name=seqs,proto3"   json:"seqs"`
 }
 
 func (x *MarkConversationAsReadReq) Reset() {
@@ -1089,8 +1091,8 @@ type SetConversationHasReadSeqReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	UserID         string `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID         string `protobuf:"bytes,2,opt,name=userID,proto3"         json:"userID"`
-	HasReadSeq     int64  `protobuf:"varint,3,opt,name=hasReadSeq,proto3" json:"hasReadSeq"`
+	HasReadSeq     int64  `protobuf:"varint,3,opt,name=hasReadSeq,proto3"    json:"hasReadSeq"`
 }
 
 func (x *SetConversationHasReadSeqReq) Reset() {
@@ -1189,7 +1191,7 @@ type DeleteSyncOpt struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	IsSyncSelf  bool `protobuf:"varint,3,opt,name=IsSyncSelf,proto3" json:"IsSyncSelf"`
+	IsSyncSelf  bool `protobuf:"varint,3,opt,name=IsSyncSelf,proto3"  json:"IsSyncSelf"`
 	IsSyncOther bool `protobuf:"varint,4,opt,name=IsSyncOther,proto3" json:"IsSyncOther"`
 }
 
@@ -1245,8 +1247,8 @@ type ClearConversationsMsgReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationIDs []string       `protobuf:"bytes,1,rep,name=conversationIDs,proto3" json:"conversationIDs"`
-	UserID          string         `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID          string         `protobuf:"bytes,2,opt,name=userID,proto3"          json:"userID"`
-	DeleteSyncOpt   *DeleteSyncOpt `protobuf:"bytes,3,opt,name=deleteSyncOpt,proto3" json:"deleteSyncOpt"`
+	DeleteSyncOpt   *DeleteSyncOpt `protobuf:"bytes,3,opt,name=deleteSyncOpt,proto3"   json:"deleteSyncOpt"`
 }
 
 func (x *ClearConversationsMsgReq) Reset() {
@@ -1345,7 +1347,7 @@ type UserClearAllMsgReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID        string         `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID        string         `protobuf:"bytes,1,opt,name=userID,proto3"        json:"userID"`
 	DeleteSyncOpt *DeleteSyncOpt `protobuf:"bytes,3,opt,name=deleteSyncOpt,proto3" json:"deleteSyncOpt"`
 }
 
@@ -1439,9 +1441,9 @@ type DeleteMsgsReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string         `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	Seqs           []int64        `protobuf:"varint,2,rep,packed,name=seqs,proto3" json:"seqs"`
+	Seqs           []int64        `protobuf:"varint,2,rep,packed,name=seqs,proto3"   json:"seqs"`
-	UserID         string         `protobuf:"bytes,3,opt,name=userID,proto3" json:"userID"`
+	UserID         string         `protobuf:"bytes,3,opt,name=userID,proto3"         json:"userID"`
-	DeleteSyncOpt  *DeleteSyncOpt `protobuf:"bytes,4,opt,name=deleteSyncOpt,proto3" json:"deleteSyncOpt"`
+	DeleteSyncOpt  *DeleteSyncOpt `protobuf:"bytes,4,opt,name=deleteSyncOpt,proto3"  json:"deleteSyncOpt"`
 }
 
 func (x *DeleteMsgsReq) Reset() {
@@ -1548,7 +1550,7 @@ type DeleteMsgPhysicalReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationIDs []string `protobuf:"bytes,1,rep,name=conversationIDs,proto3" json:"conversationIDs"`
-	Timestamp       int64    `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp"`
+	Timestamp       int64    `protobuf:"varint,2,opt,name=timestamp,proto3"      json:"timestamp"`
 }
 
 func (x *DeleteMsgPhysicalReq) Reset() {
@@ -1641,7 +1643,7 @@ type DeleteMsgPhysicalBySeqReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string  `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	Seqs           []int64 `protobuf:"varint,2,rep,packed,name=seqs,proto3" json:"seqs"`
+	Seqs           []int64 `protobuf:"varint,2,rep,packed,name=seqs,proto3"   json:"seqs"`
 }
 
 func (x *DeleteMsgPhysicalBySeqReq) Reset() {
@@ -1874,7 +1876,7 @@ type Seqs struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MaxSeq     int64 `protobuf:"varint,1,opt,name=maxSeq,proto3" json:"maxSeq"`
+	MaxSeq     int64 `protobuf:"varint,1,opt,name=maxSeq,proto3"     json:"maxSeq"`
 	HasReadSeq int64 `protobuf:"varint,2,opt,name=hasReadSeq,proto3" json:"hasReadSeq"`
 }
 
@@ -1976,10 +1978,10 @@ type GetActiveUserReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Start      int64                    `protobuf:"varint,1,opt,name=start,proto3" json:"start"`
+	Start      int64                    `protobuf:"varint,1,opt,name=start,proto3"     json:"start"`
-	End        int64                    `protobuf:"varint,2,opt,name=end,proto3" json:"end"`
+	End        int64                    `protobuf:"varint,2,opt,name=end,proto3"       json:"end"`
-	Ase        bool                     `protobuf:"varint,3,opt,name=ase,proto3" json:"ase"`
+	Ase        bool                     `protobuf:"varint,3,opt,name=ase,proto3"       json:"ase"`
-	Group      bool                     `protobuf:"varint,4,opt,name=group,proto3" json:"group"`
+	Group      bool                     `protobuf:"varint,4,opt,name=group,proto3"     json:"group"`
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,5,opt,name=pagination,proto3" json:"pagination"`
 }
 
@@ -2055,7 +2057,7 @@ type ActiveUser struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	User  *sdkws.UserInfo `protobuf:"bytes,1,opt,name=user,proto3" json:"user"`
+	User  *sdkws.UserInfo `protobuf:"bytes,1,opt,name=user,proto3"   json:"user"`
 	Count int64           `protobuf:"varint,2,opt,name=count,proto3" json:"count"`
 }
 
@@ -2110,10 +2112,10 @@ type GetActiveUserResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgCount  int64            `protobuf:"varint,1,opt,name=msgCount,proto3" json:"msgCount"`
+	MsgCount  int64            `protobuf:"varint,1,opt,name=msgCount,proto3"  json:"msgCount"`
 	UserCount int64            `protobuf:"varint,2,opt,name=userCount,proto3" json:"userCount"`
-	DateCount map[string]int64 `protobuf:"bytes,3,rep,name=dateCount,proto3" json:"dateCount" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	DateCount map[string]int64 `protobuf:"bytes,3,rep,name=dateCount,proto3"  json:"dateCount" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	Users     []*ActiveUser    `protobuf:"bytes,4,rep,name=users,proto3" json:"users"`
+	Users     []*ActiveUser    `protobuf:"bytes,4,rep,name=users,proto3"      json:"users"`
 }
 
 func (x *GetActiveUserResp) Reset() {
@@ -2181,9 +2183,9 @@ type GetActiveGroupReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Start      int64                    `protobuf:"varint,1,opt,name=start,proto3" json:"start"`
+	Start      int64                    `protobuf:"varint,1,opt,name=start,proto3"     json:"start"`
-	End        int64                    `protobuf:"varint,2,opt,name=end,proto3" json:"end"`
+	End        int64                    `protobuf:"varint,2,opt,name=end,proto3"       json:"end"`
-	Ase        bool                     `protobuf:"varint,3,opt,name=ase,proto3" json:"ase"`
+	Ase        bool                     `protobuf:"varint,3,opt,name=ase,proto3"       json:"ase"`
 	Pagination *sdkws.RequestPagination `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination"`
 }
 
@@ -2252,7 +2254,7 @@ type ActiveGroup struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group *sdkws.GroupInfo `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group *sdkws.GroupInfo `protobuf:"bytes,1,opt,name=group,proto3"  json:"group"`
 	Count int64            `protobuf:"varint,2,opt,name=count,proto3" json:"count"`
 }
 
@@ -2307,10 +2309,10 @@ type GetActiveGroupResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgCount   int64            `protobuf:"varint,1,opt,name=msgCount,proto3" json:"msgCount"`
+	MsgCount   int64            `protobuf:"varint,1,opt,name=msgCount,proto3"   json:"msgCount"`
 	GroupCount int64            `protobuf:"varint,2,opt,name=groupCount,proto3" json:"groupCount"`
-	DateCount  map[string]int64 `protobuf:"bytes,3,rep,name=dateCount,proto3" json:"dateCount" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	DateCount  map[string]int64 `protobuf:"bytes,3,rep,name=dateCount,proto3"   json:"dateCount"  protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	Groups     []*ActiveGroup   `protobuf:"bytes,4,rep,name=groups,proto3" json:"groups"`
+	Groups     []*ActiveGroup   `protobuf:"bytes,4,rep,name=groups,proto3"      json:"groups"`
 }
 
 func (x *GetActiveGroupResp) Reset() {
@@ -2378,12 +2380,12 @@ type SearchMessageReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	SendID      string                   `protobuf:"bytes,1,opt,name=sendID,proto3" json:"sendID"` //发送者ID
+	SendID      string                   `protobuf:"bytes,1,opt,name=sendID,proto3"       json:"sendID"` //发送者ID
-	RecvID      string                   `protobuf:"bytes,2,opt,name=recvID,proto3" json:"recvID"` //接收者ID
+	RecvID      string                   `protobuf:"bytes,2,opt,name=recvID,proto3"       json:"recvID"` //接收者ID
-	MsgType     int32                    `protobuf:"varint,3,opt,name=msgType,proto3" json:"msgType"`
+	MsgType     int32                    `protobuf:"varint,3,opt,name=msgType,proto3"     json:"msgType"`
-	SendTime    string                   `protobuf:"bytes,4,opt,name=sendTime,proto3" json:"sendTime"`
+	SendTime    string                   `protobuf:"bytes,4,opt,name=sendTime,proto3"     json:"sendTime"`
 	SessionType int32                    `protobuf:"varint,5,opt,name=sessionType,proto3" json:"sessionType"`
-	Pagination  *sdkws.RequestPagination `protobuf:"bytes,6,opt,name=pagination,proto3" json:"pagination"`
+	Pagination  *sdkws.RequestPagination `protobuf:"bytes,6,opt,name=pagination,proto3"   json:"pagination"`
 }
 
 func (x *SearchMessageReq) Reset() {
@@ -2465,7 +2467,7 @@ type SearchMessageResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ChatLogs    []*ChatLog `protobuf:"bytes,1,rep,name=chatLogs,proto3" json:"chatLogs"`
+	ChatLogs    []*ChatLog `protobuf:"bytes,1,rep,name=chatLogs,proto3"     json:"chatLogs"`
 	ChatLogsNum int32      `protobuf:"varint,2,opt,name=chatLogsNum,proto3" json:"chatLogsNum"`
 }
 
@@ -2520,29 +2522,29 @@ type ChatLog struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ServerMsgID      string `protobuf:"bytes,1,opt,name=serverMsgID,proto3" json:"serverMsgID"`
+	ServerMsgID      string `protobuf:"bytes,1,opt,name=serverMsgID,proto3"        json:"serverMsgID"`
-	ClientMsgID      string `protobuf:"bytes,2,opt,name=clientMsgID,proto3" json:"clientMsgID"`
+	ClientMsgID      string `protobuf:"bytes,2,opt,name=clientMsgID,proto3"        json:"clientMsgID"`
-	SendID           string `protobuf:"bytes,3,opt,name=sendID,proto3" json:"sendID"`
+	SendID           string `protobuf:"bytes,3,opt,name=sendID,proto3"             json:"sendID"`
-	RecvID           string `protobuf:"bytes,4,opt,name=recvID,proto3" json:"recvID"`
+	RecvID           string `protobuf:"bytes,4,opt,name=recvID,proto3"             json:"recvID"`
-	GroupID          string `protobuf:"bytes,5,opt,name=groupID,proto3" json:"groupID"`
+	GroupID          string `protobuf:"bytes,5,opt,name=groupID,proto3"            json:"groupID"`
-	RecvNickname     string `protobuf:"bytes,6,opt,name=recvNickname,proto3" json:"recvNickname"`
+	RecvNickname     string `protobuf:"bytes,6,opt,name=recvNickname,proto3"       json:"recvNickname"`
-	SenderPlatformID int32  `protobuf:"varint,7,opt,name=senderPlatformID,proto3" json:"senderPlatformID"`
+	SenderPlatformID int32  `protobuf:"varint,7,opt,name=senderPlatformID,proto3"  json:"senderPlatformID"`
-	SenderNickname   string `protobuf:"bytes,8,opt,name=senderNickname,proto3" json:"senderNickname"`
+	SenderNickname   string `protobuf:"bytes,8,opt,name=senderNickname,proto3"     json:"senderNickname"`
-	SenderFaceURL    string `protobuf:"bytes,9,opt,name=senderFaceURL,proto3" json:"senderFaceURL"`
+	SenderFaceURL    string `protobuf:"bytes,9,opt,name=senderFaceURL,proto3"      json:"senderFaceURL"`
-	GroupName        string `protobuf:"bytes,10,opt,name=groupName,proto3" json:"groupName"`
+	GroupName        string `protobuf:"bytes,10,opt,name=groupName,proto3"         json:"groupName"`
-	SessionType      int32  `protobuf:"varint,11,opt,name=sessionType,proto3" json:"sessionType"`
+	SessionType      int32  `protobuf:"varint,11,opt,name=sessionType,proto3"      json:"sessionType"`
-	MsgFrom          int32  `protobuf:"varint,12,opt,name=msgFrom,proto3" json:"msgFrom"`
+	MsgFrom          int32  `protobuf:"varint,12,opt,name=msgFrom,proto3"          json:"msgFrom"`
-	ContentType      int32  `protobuf:"varint,13,opt,name=contentType,proto3" json:"contentType"`
+	ContentType      int32  `protobuf:"varint,13,opt,name=contentType,proto3"      json:"contentType"`
-	Content          string `protobuf:"bytes,14,opt,name=content,proto3" json:"content"`
+	Content          string `protobuf:"bytes,14,opt,name=content,proto3"           json:"content"`
-	Status           int32  `protobuf:"varint,15,opt,name=status,proto3" json:"status"`
+	Status           int32  `protobuf:"varint,15,opt,name=status,proto3"           json:"status"`
-	SendTime         int64  `protobuf:"varint,16,opt,name=sendTime,proto3" json:"sendTime"`
+	SendTime         int64  `protobuf:"varint,16,opt,name=sendTime,proto3"         json:"sendTime"`
-	CreateTime       int64  `protobuf:"varint,17,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime       int64  `protobuf:"varint,17,opt,name=createTime,proto3"       json:"createTime"`
-	Ex               string `protobuf:"bytes,18,opt,name=ex,proto3" json:"ex"`
+	Ex               string `protobuf:"bytes,18,opt,name=ex,proto3"                json:"ex"`
-	GroupFaceURL     string `protobuf:"bytes,19,opt,name=groupFaceURL,proto3" json:"groupFaceURL"`
+	GroupFaceURL     string `protobuf:"bytes,19,opt,name=groupFaceURL,proto3"      json:"groupFaceURL"`
 	GroupMemberCount uint32 `protobuf:"varint,20,opt,name=groupMemberCount,proto3" json:"groupMemberCount"`
-	Seq              int64  `protobuf:"varint,21,opt,name=seq,proto3" json:"seq"`
+	Seq              int64  `protobuf:"varint,21,opt,name=seq,proto3"              json:"seq"`
-	GroupOwner       string `protobuf:"bytes,22,opt,name=groupOwner,proto3" json:"groupOwner"`
+	GroupOwner       string `protobuf:"bytes,22,opt,name=groupOwner,proto3"        json:"groupOwner"`
-	GroupType        int32  `protobuf:"varint,23,opt,name=groupType,proto3" json:"groupType"`
+	GroupType        int32  `protobuf:"varint,23,opt,name=groupType,proto3"        json:"groupType"`
 }
 
 func (x *ChatLog) Reset() {

pkg/proto/msggateway/msggateway.pb.go

@@ -22,14 +22,16 @@ package msggateway
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (
@@ -44,7 +46,7 @@ type OnlinePushMsgReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgData      *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3" json:"msgData"`
+	MsgData      *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3"      json:"msgData"`
 	PushToUserID string         `protobuf:"bytes,2,opt,name=pushToUserID,proto3" json:"pushToUserID"`
 }
 
@@ -146,8 +148,8 @@ type SingleMsgToUserResults struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID     string                     `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID     string                     `protobuf:"bytes,1,opt,name=userID,proto3"      json:"userID"`
-	Resp       []*SingleMsgToUserPlatform `protobuf:"bytes,2,rep,name=resp,proto3" json:"resp"`
+	Resp       []*SingleMsgToUserPlatform `protobuf:"bytes,2,rep,name=resp,proto3"        json:"resp"`
 	OnlinePush bool                       `protobuf:"varint,3,opt,name=onlinePush,proto3" json:"onlinePush"`
 }
 
@@ -209,7 +211,7 @@ type OnlineBatchPushOneMsgReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgData       *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3" json:"msgData"`
+	MsgData       *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3"       json:"msgData"`
 	PushToUserIDs []string       `protobuf:"bytes,2,rep,name=pushToUserIDs,proto3" json:"pushToUserIDs"`
 }
 
@@ -311,8 +313,8 @@ type SingleMsgToUserPlatform struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ResultCode     int64  `protobuf:"varint,1,opt,name=ResultCode,proto3" json:"ResultCode"`
+	ResultCode     int64  `protobuf:"varint,1,opt,name=ResultCode,proto3"     json:"ResultCode"`
-	RecvID         string `protobuf:"bytes,2,opt,name=RecvID,proto3" json:"RecvID"`
+	RecvID         string `protobuf:"bytes,2,opt,name=RecvID,proto3"          json:"RecvID"`
 	RecvPlatFormID int32  `protobuf:"varint,3,opt,name=RecvPlatFormID,proto3" json:"RecvPlatFormID"`
 }
 
@@ -422,7 +424,7 @@ type GetUsersOnlineStatusResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	SuccessResult []*GetUsersOnlineStatusResp_SuccessResult `protobuf:"bytes,1,rep,name=successResult,proto3" json:"successResult"`
-	FailedResult  []*GetUsersOnlineStatusResp_FailedDetail  `protobuf:"bytes,2,rep,name=failedResult,proto3" json:"failedResult"`
+	FailedResult  []*GetUsersOnlineStatusResp_FailedDetail  `protobuf:"bytes,2,rep,name=failedResult,proto3"  json:"failedResult"`
 }
 
 func (x *GetUsersOnlineStatusResp) Reset() {
@@ -476,8 +478,8 @@ type SingleDetail struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID              string                 `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID              string                 `protobuf:"bytes,1,opt,name=userID,proto3"              json:"userID"`
-	Status              string                 `protobuf:"bytes,2,opt,name=status,proto3" json:"status"`
+	Status              string                 `protobuf:"bytes,2,opt,name=status,proto3"              json:"status"`
 	SinglePlatformToken []*SinglePlatformToken `protobuf:"bytes,3,rep,name=singlePlatformToken,proto3" json:"singlePlatformToken"`
 }
 
@@ -540,8 +542,8 @@ type SinglePlatformToken struct {
 	unknownFields protoimpl.UnknownFields
 
 	Platform string   `protobuf:"bytes,1,opt,name=platform,proto3" json:"platform"`
-	Total    int32    `protobuf:"varint,2,opt,name=total,proto3" json:"total"`
+	Total    int32    `protobuf:"varint,2,opt,name=total,proto3"   json:"total"`
-	Token    []string `protobuf:"bytes,3,rep,name=token,proto3" json:"token"`
+	Token    []string `protobuf:"bytes,3,rep,name=token,proto3"    json:"token"`
 }
 
 func (x *SinglePlatformToken) Reset() {
@@ -602,7 +604,7 @@ type KickUserOfflineReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	PlatformID     int32    `protobuf:"varint,1,opt,name=platformID,proto3" json:"platformID"`
+	PlatformID     int32    `protobuf:"varint,1,opt,name=platformID,proto3"    json:"platformID"`
 	KickUserIDList []string `protobuf:"bytes,2,rep,name=kickUserIDList,proto3" json:"kickUserIDList"`
 }
 
@@ -695,9 +697,9 @@ type MultiTerminalLoginCheckReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID      string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID      string `protobuf:"bytes,1,opt,name=userID,proto3"      json:"userID"`
 	PlatformID  int32  `protobuf:"varint,2,opt,name=platformID,proto3" json:"platformID"`
-	Token       string `protobuf:"bytes,3,opt,name=token,proto3" json:"token"`
+	Token       string `protobuf:"bytes,3,opt,name=token,proto3"       json:"token"`
 	OperationID string `protobuf:"bytes,4,opt,name=operationID,proto3" json:"operationID"`
 }
 
@@ -804,11 +806,11 @@ type GetUsersOnlineStatusResp_SuccessDetail struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Platform     string `protobuf:"bytes,1,opt,name=platform,proto3" json:"platform"`
+	Platform     string `protobuf:"bytes,1,opt,name=platform,proto3"      json:"platform"`
-	Status       string `protobuf:"bytes,2,opt,name=status,proto3" json:"status"`
+	Status       string `protobuf:"bytes,2,opt,name=status,proto3"        json:"status"`
-	ConnID       string `protobuf:"bytes,3,opt,name=connID,proto3" json:"connID"`
+	ConnID       string `protobuf:"bytes,3,opt,name=connID,proto3"        json:"connID"`
 	IsBackground bool   `protobuf:"varint,4,opt,name=isBackground,proto3" json:"isBackground"`
-	Token        string `protobuf:"bytes,5,opt,name=token,proto3" json:"token"`
+	Token        string `protobuf:"bytes,5,opt,name=token,proto3"         json:"token"`
 }
 
 func (x *GetUsersOnlineStatusResp_SuccessDetail) Reset() {
@@ -930,8 +932,8 @@ type GetUsersOnlineStatusResp_SuccessResult struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID               string                                    `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID               string                                    `protobuf:"bytes,1,opt,name=userID,proto3"               json:"userID"`
-	Status               string                                    `protobuf:"bytes,2,opt,name=status,proto3" json:"status"`
+	Status               string                                    `protobuf:"bytes,2,opt,name=status,proto3"               json:"status"`
 	DetailPlatformStatus []*GetUsersOnlineStatusResp_SuccessDetail `protobuf:"bytes,3,rep,name=detailPlatformStatus,proto3" json:"detailPlatformStatus"`
 }
 

pkg/proto/push/push.pb.go

@@ -22,14 +22,16 @@ package push
 
 import (
 	context "context"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (
@@ -44,7 +46,7 @@ type PushMsgReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgData        *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3" json:"msgData"`
+	MsgData        *sdkws.MsgData `protobuf:"bytes,1,opt,name=msgData,proto3"        json:"msgData"`
 	ConversationID string         `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
 }
 
@@ -137,7 +139,7 @@ type DelUserPushTokenReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID     string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID     string `protobuf:"bytes,1,opt,name=userID,proto3"      json:"userID"`
 	PlatformID int32  `protobuf:"varint,2,opt,name=platformID,proto3" json:"platformID"`
 }
 

pkg/proto/sdkws/sdkws.pb.go

@@ -21,11 +21,13 @@
 package sdkws
 
 import (
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (
@@ -87,23 +89,23 @@ type GroupInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID                string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID                string `protobuf:"bytes,1,opt,name=groupID,proto3"                  json:"groupID"`
-	GroupName              string `protobuf:"bytes,2,opt,name=groupName,proto3" json:"groupName"`
+	GroupName              string `protobuf:"bytes,2,opt,name=groupName,proto3"                json:"groupName"`
-	Notification           string `protobuf:"bytes,3,opt,name=notification,proto3" json:"notification"`
+	Notification           string `protobuf:"bytes,3,opt,name=notification,proto3"             json:"notification"`
-	Introduction           string `protobuf:"bytes,4,opt,name=introduction,proto3" json:"introduction"`
+	Introduction           string `protobuf:"bytes,4,opt,name=introduction,proto3"             json:"introduction"`
-	FaceURL                string `protobuf:"bytes,5,opt,name=faceURL,proto3" json:"faceURL"`
+	FaceURL                string `protobuf:"bytes,5,opt,name=faceURL,proto3"                  json:"faceURL"`
-	OwnerUserID            string `protobuf:"bytes,6,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID            string `protobuf:"bytes,6,opt,name=ownerUserID,proto3"              json:"ownerUserID"`
-	CreateTime             int64  `protobuf:"varint,7,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime             int64  `protobuf:"varint,7,opt,name=createTime,proto3"              json:"createTime"`
-	MemberCount            uint32 `protobuf:"varint,8,opt,name=memberCount,proto3" json:"memberCount"`
+	MemberCount            uint32 `protobuf:"varint,8,opt,name=memberCount,proto3"             json:"memberCount"`
-	Ex                     string `protobuf:"bytes,9,opt,name=ex,proto3" json:"ex"`
+	Ex                     string `protobuf:"bytes,9,opt,name=ex,proto3"                       json:"ex"`
-	Status                 int32  `protobuf:"varint,10,opt,name=status,proto3" json:"status"`
+	Status                 int32  `protobuf:"varint,10,opt,name=status,proto3"                 json:"status"`
-	CreatorUserID          string `protobuf:"bytes,11,opt,name=creatorUserID,proto3" json:"creatorUserID"`
+	CreatorUserID          string `protobuf:"bytes,11,opt,name=creatorUserID,proto3"           json:"creatorUserID"`
-	GroupType              int32  `protobuf:"varint,12,opt,name=groupType,proto3" json:"groupType"`
+	GroupType              int32  `protobuf:"varint,12,opt,name=groupType,proto3"              json:"groupType"`
-	NeedVerification       int32  `protobuf:"varint,13,opt,name=needVerification,proto3" json:"needVerification"`
+	NeedVerification       int32  `protobuf:"varint,13,opt,name=needVerification,proto3"       json:"needVerification"`
-	LookMemberInfo         int32  `protobuf:"varint,14,opt,name=lookMemberInfo,proto3" json:"lookMemberInfo"`
+	LookMemberInfo         int32  `protobuf:"varint,14,opt,name=lookMemberInfo,proto3"         json:"lookMemberInfo"`
-	ApplyMemberFriend      int32  `protobuf:"varint,15,opt,name=applyMemberFriend,proto3" json:"applyMemberFriend"`
+	ApplyMemberFriend      int32  `protobuf:"varint,15,opt,name=applyMemberFriend,proto3"      json:"applyMemberFriend"`
 	NotificationUpdateTime int64  `protobuf:"varint,16,opt,name=notificationUpdateTime,proto3" json:"notificationUpdateTime"`
-	NotificationUserID     string `protobuf:"bytes,17,opt,name=notificationUserID,proto3" json:"notificationUserID"`
+	NotificationUserID     string `protobuf:"bytes,17,opt,name=notificationUserID,proto3"      json:"notificationUserID"`
 }
 
 func (x *GroupInfo) Reset() {
@@ -262,14 +264,14 @@ type GroupInfoForSet struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID           string                 `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID           string                 `protobuf:"bytes,1,opt,name=groupID,proto3"           json:"groupID"`
-	GroupName         string                 `protobuf:"bytes,2,opt,name=groupName,proto3" json:"groupName"`
+	GroupName         string                 `protobuf:"bytes,2,opt,name=groupName,proto3"         json:"groupName"`
-	Notification      string                 `protobuf:"bytes,3,opt,name=notification,proto3" json:"notification"`
+	Notification      string                 `protobuf:"bytes,3,opt,name=notification,proto3"      json:"notification"`
-	Introduction      string                 `protobuf:"bytes,4,opt,name=introduction,proto3" json:"introduction"`
+	Introduction      string                 `protobuf:"bytes,4,opt,name=introduction,proto3"      json:"introduction"`
-	FaceURL           string                 `protobuf:"bytes,5,opt,name=faceURL,proto3" json:"faceURL"`
+	FaceURL           string                 `protobuf:"bytes,5,opt,name=faceURL,proto3"           json:"faceURL"`
-	Ex                string                 `protobuf:"bytes,6,opt,name=ex,proto3" json:"ex"`
+	Ex                string                 `protobuf:"bytes,6,opt,name=ex,proto3"                json:"ex"`
-	NeedVerification  *wrapperspb.Int32Value `protobuf:"bytes,7,opt,name=needVerification,proto3" json:"needVerification"`
+	NeedVerification  *wrapperspb.Int32Value `protobuf:"bytes,7,opt,name=needVerification,proto3"  json:"needVerification"`
-	LookMemberInfo    *wrapperspb.Int32Value `protobuf:"bytes,8,opt,name=lookMemberInfo,proto3" json:"lookMemberInfo"`
+	LookMemberInfo    *wrapperspb.Int32Value `protobuf:"bytes,8,opt,name=lookMemberInfo,proto3"    json:"lookMemberInfo"`
 	ApplyMemberFriend *wrapperspb.Int32Value `protobuf:"bytes,9,opt,name=applyMemberFriend,proto3" json:"applyMemberFriend"`
 }
 
@@ -373,18 +375,18 @@ type GroupMemberFullInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupID        string `protobuf:"bytes,1,opt,name=groupID,proto3" json:"groupID"`
+	GroupID        string `protobuf:"bytes,1,opt,name=groupID,proto3"         json:"groupID"`
-	UserID         string `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID         string `protobuf:"bytes,2,opt,name=userID,proto3"          json:"userID"`
-	RoleLevel      int32  `protobuf:"varint,3,opt,name=roleLevel,proto3" json:"roleLevel"`
+	RoleLevel      int32  `protobuf:"varint,3,opt,name=roleLevel,proto3"      json:"roleLevel"`
-	JoinTime       int64  `protobuf:"varint,4,opt,name=joinTime,proto3" json:"joinTime"`
+	JoinTime       int64  `protobuf:"varint,4,opt,name=joinTime,proto3"       json:"joinTime"`
-	Nickname       string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"`
+	Nickname       string `protobuf:"bytes,5,opt,name=nickname,proto3"        json:"nickname"`
-	FaceURL        string `protobuf:"bytes,6,opt,name=faceURL,proto3" json:"faceURL"`
+	FaceURL        string `protobuf:"bytes,6,opt,name=faceURL,proto3"         json:"faceURL"`
 	AppMangerLevel int32  `protobuf:"varint,7,opt,name=appMangerLevel,proto3" json:"appMangerLevel"` //if >0
-	JoinSource     int32  `protobuf:"varint,8,opt,name=joinSource,proto3" json:"joinSource"`
+	JoinSource     int32  `protobuf:"varint,8,opt,name=joinSource,proto3"     json:"joinSource"`
-	OperatorUserID string `protobuf:"bytes,9,opt,name=operatorUserID,proto3" json:"operatorUserID"`
+	OperatorUserID string `protobuf:"bytes,9,opt,name=operatorUserID,proto3"  json:"operatorUserID"`
-	Ex             string `protobuf:"bytes,10,opt,name=ex,proto3" json:"ex"`
+	Ex             string `protobuf:"bytes,10,opt,name=ex,proto3"             json:"ex"`
-	MuteEndTime    int64  `protobuf:"varint,11,opt,name=muteEndTime,proto3" json:"muteEndTime"`
+	MuteEndTime    int64  `protobuf:"varint,11,opt,name=muteEndTime,proto3"   json:"muteEndTime"`
-	InviterUserID  string `protobuf:"bytes,12,opt,name=inviterUserID,proto3" json:"inviterUserID"`
+	InviterUserID  string `protobuf:"bytes,12,opt,name=inviterUserID,proto3"  json:"inviterUserID"`
 }
 
 func (x *GroupMemberFullInfo) Reset() {
@@ -508,10 +510,10 @@ type PublicUserInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID   string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID   string `protobuf:"bytes,1,opt,name=userID,proto3"   json:"userID"`
 	Nickname string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`
-	FaceURL  string `protobuf:"bytes,3,opt,name=faceURL,proto3" json:"faceURL"`
+	FaceURL  string `protobuf:"bytes,3,opt,name=faceURL,proto3"  json:"faceURL"`
-	Ex       string `protobuf:"bytes,4,opt,name=ex,proto3" json:"ex"`
+	Ex       string `protobuf:"bytes,4,opt,name=ex,proto3"       json:"ex"`
 }
 
 func (x *PublicUserInfo) Reset() {
@@ -579,12 +581,12 @@ type UserInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID           string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID           string `protobuf:"bytes,1,opt,name=userID,proto3"            json:"userID"`
-	Nickname         string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`
+	Nickname         string `protobuf:"bytes,2,opt,name=nickname,proto3"          json:"nickname"`
-	FaceURL          string `protobuf:"bytes,3,opt,name=faceURL,proto3" json:"faceURL"`
+	FaceURL          string `protobuf:"bytes,3,opt,name=faceURL,proto3"           json:"faceURL"`
-	Ex               string `protobuf:"bytes,4,opt,name=ex,proto3" json:"ex"`
+	Ex               string `protobuf:"bytes,4,opt,name=ex,proto3"                json:"ex"`
-	CreateTime       int64  `protobuf:"varint,5,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime       int64  `protobuf:"varint,5,opt,name=createTime,proto3"       json:"createTime"`
-	AppMangerLevel   int32  `protobuf:"varint,6,opt,name=appMangerLevel,proto3" json:"appMangerLevel"`
+	AppMangerLevel   int32  `protobuf:"varint,6,opt,name=appMangerLevel,proto3"   json:"appMangerLevel"`
 	GlobalRecvMsgOpt int32  `protobuf:"varint,7,opt,name=globalRecvMsgOpt,proto3" json:"globalRecvMsgOpt"`
 }
 
@@ -674,13 +676,13 @@ type FriendInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID    string    `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID    string    `protobuf:"bytes,1,opt,name=ownerUserID,proto3"    json:"ownerUserID"`
-	Remark         string    `protobuf:"bytes,2,opt,name=remark,proto3" json:"remark"`
+	Remark         string    `protobuf:"bytes,2,opt,name=remark,proto3"         json:"remark"`
-	CreateTime     int64     `protobuf:"varint,3,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime     int64     `protobuf:"varint,3,opt,name=createTime,proto3"    json:"createTime"`
-	FriendUser     *UserInfo `protobuf:"bytes,4,opt,name=friendUser,proto3" json:"friendUser"`
+	FriendUser     *UserInfo `protobuf:"bytes,4,opt,name=friendUser,proto3"     json:"friendUser"`
-	AddSource      int32     `protobuf:"varint,5,opt,name=addSource,proto3" json:"addSource"`
+	AddSource      int32     `protobuf:"varint,5,opt,name=addSource,proto3"     json:"addSource"`
 	OperatorUserID string    `protobuf:"bytes,6,opt,name=operatorUserID,proto3" json:"operatorUserID"`
-	Ex             string    `protobuf:"bytes,7,opt,name=ex,proto3" json:"ex"`
+	Ex             string    `protobuf:"bytes,7,opt,name=ex,proto3"             json:"ex"`
 }
 
 func (x *FriendInfo) Reset() {
@@ -769,12 +771,12 @@ type BlackInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID    string          `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID    string          `protobuf:"bytes,1,opt,name=ownerUserID,proto3"    json:"ownerUserID"`
-	CreateTime     int64           `protobuf:"varint,2,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime     int64           `protobuf:"varint,2,opt,name=createTime,proto3"    json:"createTime"`
-	BlackUserInfo  *PublicUserInfo `protobuf:"bytes,3,opt,name=blackUserInfo,proto3" json:"blackUserInfo"`
+	BlackUserInfo  *PublicUserInfo `protobuf:"bytes,3,opt,name=blackUserInfo,proto3"  json:"blackUserInfo"`
-	AddSource      int32           `protobuf:"varint,4,opt,name=addSource,proto3" json:"addSource"`
+	AddSource      int32           `protobuf:"varint,4,opt,name=addSource,proto3"     json:"addSource"`
 	OperatorUserID string          `protobuf:"bytes,5,opt,name=operatorUserID,proto3" json:"operatorUserID"`
-	Ex             string          `protobuf:"bytes,6,opt,name=ex,proto3" json:"ex"`
+	Ex             string          `protobuf:"bytes,6,opt,name=ex,proto3"             json:"ex"`
 }
 
 func (x *BlackInfo) Reset() {
@@ -856,16 +858,16 @@ type GroupRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserInfo      *PublicUserInfo `protobuf:"bytes,1,opt,name=userInfo,proto3" json:"userInfo"`
+	UserInfo      *PublicUserInfo `protobuf:"bytes,1,opt,name=userInfo,proto3"       json:"userInfo"`
-	GroupInfo     *GroupInfo      `protobuf:"bytes,2,opt,name=groupInfo,proto3" json:"groupInfo"`
+	GroupInfo     *GroupInfo      `protobuf:"bytes,2,opt,name=groupInfo,proto3"      json:"groupInfo"`
-	HandleResult  int32           `protobuf:"varint,3,opt,name=handleResult,proto3" json:"handleResult"`
+	HandleResult  int32           `protobuf:"varint,3,opt,name=handleResult,proto3"  json:"handleResult"`
-	ReqMsg        string          `protobuf:"bytes,4,opt,name=reqMsg,proto3" json:"reqMsg"`
+	ReqMsg        string          `protobuf:"bytes,4,opt,name=reqMsg,proto3"         json:"reqMsg"`
-	HandleMsg     string          `protobuf:"bytes,5,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg     string          `protobuf:"bytes,5,opt,name=handleMsg,proto3"      json:"handleMsg"`
-	ReqTime       int64           `protobuf:"varint,6,opt,name=reqTime,proto3" json:"reqTime"`
+	ReqTime       int64           `protobuf:"varint,6,opt,name=reqTime,proto3"       json:"reqTime"`
-	HandleUserID  string          `protobuf:"bytes,7,opt,name=handleUserID,proto3" json:"handleUserID"`
+	HandleUserID  string          `protobuf:"bytes,7,opt,name=handleUserID,proto3"   json:"handleUserID"`
-	HandleTime    int64           `protobuf:"varint,8,opt,name=handleTime,proto3" json:"handleTime"`
+	HandleTime    int64           `protobuf:"varint,8,opt,name=handleTime,proto3"    json:"handleTime"`
-	Ex            string          `protobuf:"bytes,9,opt,name=ex,proto3" json:"ex"`
+	Ex            string          `protobuf:"bytes,9,opt,name=ex,proto3"             json:"ex"`
-	JoinSource    int32           `protobuf:"varint,10,opt,name=joinSource,proto3" json:"joinSource"`
+	JoinSource    int32           `protobuf:"varint,10,opt,name=joinSource,proto3"   json:"joinSource"`
 	InviterUserID string          `protobuf:"bytes,11,opt,name=inviterUserID,proto3" json:"inviterUserID"`
 }
 
@@ -983,19 +985,19 @@ type FriendRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FromUserID    string `protobuf:"bytes,1,opt,name=fromUserID,proto3" json:"fromUserID"`
+	FromUserID    string `protobuf:"bytes,1,opt,name=fromUserID,proto3"     json:"fromUserID"`
-	FromNickname  string `protobuf:"bytes,2,opt,name=fromNickname,proto3" json:"fromNickname"`
+	FromNickname  string `protobuf:"bytes,2,opt,name=fromNickname,proto3"   json:"fromNickname"`
-	FromFaceURL   string `protobuf:"bytes,3,opt,name=fromFaceURL,proto3" json:"fromFaceURL"`
+	FromFaceURL   string `protobuf:"bytes,3,opt,name=fromFaceURL,proto3"    json:"fromFaceURL"`
-	ToUserID      string `protobuf:"bytes,4,opt,name=toUserID,proto3" json:"toUserID"`
+	ToUserID      string `protobuf:"bytes,4,opt,name=toUserID,proto3"       json:"toUserID"`
-	ToNickname    string `protobuf:"bytes,5,opt,name=toNickname,proto3" json:"toNickname"`
+	ToNickname    string `protobuf:"bytes,5,opt,name=toNickname,proto3"     json:"toNickname"`
-	ToFaceURL     string `protobuf:"bytes,6,opt,name=toFaceURL,proto3" json:"toFaceURL"`
+	ToFaceURL     string `protobuf:"bytes,6,opt,name=toFaceURL,proto3"      json:"toFaceURL"`
-	HandleResult  int32  `protobuf:"varint,7,opt,name=handleResult,proto3" json:"handleResult"`
+	HandleResult  int32  `protobuf:"varint,7,opt,name=handleResult,proto3"  json:"handleResult"`
-	ReqMsg        string `protobuf:"bytes,8,opt,name=reqMsg,proto3" json:"reqMsg"`
+	ReqMsg        string `protobuf:"bytes,8,opt,name=reqMsg,proto3"         json:"reqMsg"`
-	CreateTime    int64  `protobuf:"varint,9,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime    int64  `protobuf:"varint,9,opt,name=createTime,proto3"    json:"createTime"`
 	HandlerUserID string `protobuf:"bytes,10,opt,name=handlerUserID,proto3" json:"handlerUserID"`
-	HandleMsg     string `protobuf:"bytes,11,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg     string `protobuf:"bytes,11,opt,name=handleMsg,proto3"     json:"handleMsg"`
-	HandleTime    int64  `protobuf:"varint,12,opt,name=handleTime,proto3" json:"handleTime"`
+	HandleTime    int64  `protobuf:"varint,12,opt,name=handleTime,proto3"   json:"handleTime"`
-	Ex            string `protobuf:"bytes,13,opt,name=ex,proto3" json:"ex"`
+	Ex            string `protobuf:"bytes,13,opt,name=ex,proto3"            json:"ex"`
 }
 
 func (x *FriendRequest) Reset() {
@@ -1126,8 +1128,8 @@ type PullMessageBySeqsReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID    string      `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID    string      `protobuf:"bytes,1,opt,name=userID,proto3"                                   json:"userID"`
-	SeqRanges []*SeqRange `protobuf:"bytes,2,rep,name=seqRanges,proto3" json:"seqRanges"`
+	SeqRanges []*SeqRange `protobuf:"bytes,2,rep,name=seqRanges,proto3"                                json:"seqRanges"`
 	Order     PullOrder   `protobuf:"varint,3,opt,name=order,proto3,enum=OpenIMServer.sdkws.PullOrder" json:"order"`
 }
 
@@ -1190,9 +1192,9 @@ type SeqRange struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	Begin          int64  `protobuf:"varint,2,opt,name=begin,proto3" json:"begin"`
+	Begin          int64  `protobuf:"varint,2,opt,name=begin,proto3"         json:"begin"`
-	End            int64  `protobuf:"varint,3,opt,name=end,proto3" json:"end"`
+	End            int64  `protobuf:"varint,3,opt,name=end,proto3"           json:"end"`
-	Num            int64  `protobuf:"varint,4,opt,name=num,proto3" json:"num"`
+	Num            int64  `protobuf:"varint,4,opt,name=num,proto3"           json:"num"`
 }
 
 func (x *SeqRange) Reset() {
@@ -1260,7 +1262,7 @@ type PullMsgs struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Msgs  []*MsgData `protobuf:"bytes,1,rep,name=Msgs,proto3" json:"Msgs"`
+	Msgs  []*MsgData `protobuf:"bytes,1,rep,name=Msgs,proto3"   json:"Msgs"`
 	IsEnd bool       `protobuf:"varint,2,opt,name=isEnd,proto3" json:"isEnd"`
 }
 
@@ -1315,7 +1317,7 @@ type PullMessageBySeqsResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Msgs             map[string]*PullMsgs `protobuf:"bytes,1,rep,name=msgs,proto3" json:"msgs" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Msgs             map[string]*PullMsgs `protobuf:"bytes,1,rep,name=msgs,proto3"             json:"msgs"             protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	NotificationMsgs map[string]*PullMsgs `protobuf:"bytes,2,rep,name=notificationMsgs,proto3" json:"notificationMsgs" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -1474,7 +1476,7 @@ type UserSendMsgResp struct {
 
 	ServerMsgID string `protobuf:"bytes,1,opt,name=serverMsgID,proto3" json:"serverMsgID"`
 	ClientMsgID string `protobuf:"bytes,2,opt,name=clientMsgID,proto3" json:"clientMsgID"`
-	SendTime    int64  `protobuf:"varint,3,opt,name=sendTime,proto3" json:"sendTime"`
+	SendTime    int64  `protobuf:"varint,3,opt,name=sendTime,proto3"   json:"sendTime"`
 }
 
 func (x *UserSendMsgResp) Reset() {
@@ -1535,28 +1537,28 @@ type MsgData struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	SendID           string           `protobuf:"bytes,1,opt,name=sendID,proto3" json:"sendID"`
+	SendID           string           `protobuf:"bytes,1,opt,name=sendID,proto3"            json:"sendID"`
-	RecvID           string           `protobuf:"bytes,2,opt,name=recvID,proto3" json:"recvID"`
+	RecvID           string           `protobuf:"bytes,2,opt,name=recvID,proto3"            json:"recvID"`
-	GroupID          string           `protobuf:"bytes,3,opt,name=groupID,proto3" json:"groupID"`
+	GroupID          string           `protobuf:"bytes,3,opt,name=groupID,proto3"           json:"groupID"`
-	ClientMsgID      string           `protobuf:"bytes,4,opt,name=clientMsgID,proto3" json:"clientMsgID"`
+	ClientMsgID      string           `protobuf:"bytes,4,opt,name=clientMsgID,proto3"       json:"clientMsgID"`
-	ServerMsgID      string           `protobuf:"bytes,5,opt,name=serverMsgID,proto3" json:"serverMsgID"`
+	ServerMsgID      string           `protobuf:"bytes,5,opt,name=serverMsgID,proto3"       json:"serverMsgID"`
 	SenderPlatformID int32            `protobuf:"varint,6,opt,name=senderPlatformID,proto3" json:"senderPlatformID"`
-	SenderNickname   string           `protobuf:"bytes,7,opt,name=senderNickname,proto3" json:"senderNickname"`
+	SenderNickname   string           `protobuf:"bytes,7,opt,name=senderNickname,proto3"    json:"senderNickname"`
-	SenderFaceURL    string           `protobuf:"bytes,8,opt,name=senderFaceURL,proto3" json:"senderFaceURL"`
+	SenderFaceURL    string           `protobuf:"bytes,8,opt,name=senderFaceURL,proto3"     json:"senderFaceURL"`
-	SessionType      int32            `protobuf:"varint,9,opt,name=sessionType,proto3" json:"sessionType"`
+	SessionType      int32            `protobuf:"varint,9,opt,name=sessionType,proto3"      json:"sessionType"`
-	MsgFrom          int32            `protobuf:"varint,10,opt,name=msgFrom,proto3" json:"msgFrom"`
+	MsgFrom          int32            `protobuf:"varint,10,opt,name=msgFrom,proto3"         json:"msgFrom"`
-	ContentType      int32            `protobuf:"varint,11,opt,name=contentType,proto3" json:"contentType"`
+	ContentType      int32            `protobuf:"varint,11,opt,name=contentType,proto3"     json:"contentType"`
-	Content          []byte           `protobuf:"bytes,12,opt,name=content,proto3" json:"content"`
+	Content          []byte           `protobuf:"bytes,12,opt,name=content,proto3"          json:"content"`
-	Seq              int64            `protobuf:"varint,14,opt,name=seq,proto3" json:"seq"`
+	Seq              int64            `protobuf:"varint,14,opt,name=seq,proto3"             json:"seq"`
-	SendTime         int64            `protobuf:"varint,15,opt,name=sendTime,proto3" json:"sendTime"`
+	SendTime         int64            `protobuf:"varint,15,opt,name=sendTime,proto3"        json:"sendTime"`
-	CreateTime       int64            `protobuf:"varint,16,opt,name=createTime,proto3" json:"createTime"`
+	CreateTime       int64            `protobuf:"varint,16,opt,name=createTime,proto3"      json:"createTime"`
-	Status           int32            `protobuf:"varint,17,opt,name=status,proto3" json:"status"`
+	Status           int32            `protobuf:"varint,17,opt,name=status,proto3"          json:"status"`
-	IsRead           bool             `protobuf:"varint,18,opt,name=isRead,proto3" json:"isRead"`
+	IsRead           bool             `protobuf:"varint,18,opt,name=isRead,proto3"          json:"isRead"`
-	Options          map[string]bool  `protobuf:"bytes,19,rep,name=options,proto3" json:"options" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Options          map[string]bool  `protobuf:"bytes,19,rep,name=options,proto3"          json:"options"          protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	OfflinePushInfo  *OfflinePushInfo `protobuf:"bytes,20,opt,name=offlinePushInfo,proto3" json:"offlinePushInfo"`
+	OfflinePushInfo  *OfflinePushInfo `protobuf:"bytes,20,opt,name=offlinePushInfo,proto3"  json:"offlinePushInfo"`
-	AtUserIDList     []string         `protobuf:"bytes,21,rep,name=atUserIDList,proto3" json:"atUserIDList"`
+	AtUserIDList     []string         `protobuf:"bytes,21,rep,name=atUserIDList,proto3"     json:"atUserIDList"`
-	AttachedInfo     string           `protobuf:"bytes,22,opt,name=attachedInfo,proto3" json:"attachedInfo"`
+	AttachedInfo     string           `protobuf:"bytes,22,opt,name=attachedInfo,proto3"     json:"attachedInfo"`
-	Ex               string           `protobuf:"bytes,23,opt,name=ex,proto3" json:"ex"`
+	Ex               string           `protobuf:"bytes,23,opt,name=ex,proto3"               json:"ex"`
 }
 
 func (x *MsgData) Reset() {
@@ -1750,7 +1752,7 @@ type PushMessages struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Msgs             map[string]*PullMsgs `protobuf:"bytes,1,rep,name=msgs,proto3" json:"msgs" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Msgs             map[string]*PullMsgs `protobuf:"bytes,1,rep,name=msgs,proto3"             json:"msgs"             protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	NotificationMsgs map[string]*PullMsgs `protobuf:"bytes,2,rep,name=notificationMsgs,proto3" json:"notificationMsgs" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
@@ -1805,12 +1807,12 @@ type OfflinePushInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Title         string `protobuf:"bytes,1,opt,name=title,proto3" json:"title"`
+	Title         string `protobuf:"bytes,1,opt,name=title,proto3"          json:"title"`
-	Desc          string `protobuf:"bytes,2,opt,name=desc,proto3" json:"desc"`
+	Desc          string `protobuf:"bytes,2,opt,name=desc,proto3"           json:"desc"`
-	Ex            string `protobuf:"bytes,3,opt,name=ex,proto3" json:"ex"`
+	Ex            string `protobuf:"bytes,3,opt,name=ex,proto3"             json:"ex"`
-	IOSPushSound  string `protobuf:"bytes,4,opt,name=iOSPushSound,proto3" json:"iOSPushSound"`
+	IOSPushSound  string `protobuf:"bytes,4,opt,name=iOSPushSound,proto3"   json:"iOSPushSound"`
 	IOSBadgeCount bool   `protobuf:"varint,5,opt,name=iOSBadgeCount,proto3" json:"iOSBadgeCount"`
-	SignalInfo    string `protobuf:"bytes,6,opt,name=signalInfo,proto3" json:"signalInfo"`
+	SignalInfo    string `protobuf:"bytes,6,opt,name=signalInfo,proto3"     json:"signalInfo"`
 }
 
 func (x *OfflinePushInfo) Reset() {
@@ -1892,9 +1894,9 @@ type TipsComm struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Detail      []byte `protobuf:"bytes,1,opt,name=detail,proto3" json:"detail"`
+	Detail      []byte `protobuf:"bytes,1,opt,name=detail,proto3"      json:"detail"`
 	DefaultTips string `protobuf:"bytes,2,opt,name=defaultTips,proto3" json:"defaultTips"`
-	JsonDetail  string `protobuf:"bytes,3,opt,name=jsonDetail,proto3" json:"jsonDetail"`
+	JsonDetail  string `protobuf:"bytes,3,opt,name=jsonDetail,proto3"  json:"jsonDetail"`
 }
 
 func (x *TipsComm) Reset() {
@@ -1956,9 +1958,9 @@ type GroupCreatedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group          *GroupInfo             `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group          *GroupInfo             `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser         *GroupMemberFullInfo   `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser         *GroupMemberFullInfo   `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
-	MemberList     []*GroupMemberFullInfo `protobuf:"bytes,3,rep,name=memberList,proto3" json:"memberList"`
+	MemberList     []*GroupMemberFullInfo `protobuf:"bytes,3,rep,name=memberList,proto3"     json:"memberList"`
 	OperationTime  int64                  `protobuf:"varint,4,opt,name=operationTime,proto3" json:"operationTime"`
 	GroupOwnerUser *GroupMemberFullInfo   `protobuf:"bytes,5,opt,name=groupOwnerUser,proto3" json:"groupOwnerUser"`
 }
@@ -2036,9 +2038,9 @@ type GroupInfoSetTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OpUser   *GroupMemberFullInfo `protobuf:"bytes,1,opt,name=opUser,proto3" json:"opUser"` //who do this
+	OpUser   *GroupMemberFullInfo `protobuf:"bytes,1,opt,name=opUser,proto3"    json:"opUser"` //who do this
 	MuteTime int64                `protobuf:"varint,2,opt,name=muteTime,proto3" json:"muteTime"`
-	Group    *GroupInfo           `protobuf:"bytes,3,opt,name=group,proto3" json:"group"`
+	Group    *GroupInfo           `protobuf:"bytes,3,opt,name=group,proto3"     json:"group"`
 }
 
 func (x *GroupInfoSetTips) Reset() {
@@ -2100,7 +2102,7 @@ type GroupInfoSetNameTips struct {
 	unknownFields protoimpl.UnknownFields
 
 	OpUser *GroupMemberFullInfo `protobuf:"bytes,1,opt,name=opUser,proto3" json:"opUser"` //who do this
-	Group  *GroupInfo           `protobuf:"bytes,2,opt,name=group,proto3" json:"group"`
+	Group  *GroupInfo           `protobuf:"bytes,2,opt,name=group,proto3"  json:"group"`
 }
 
 func (x *GroupInfoSetNameTips) Reset() {
@@ -2155,7 +2157,7 @@ type GroupInfoSetAnnouncementTips struct {
 	unknownFields protoimpl.UnknownFields
 
 	OpUser *GroupMemberFullInfo `protobuf:"bytes,1,opt,name=opUser,proto3" json:"opUser"` //who do this
-	Group  *GroupInfo           `protobuf:"bytes,2,opt,name=group,proto3" json:"group"`
+	Group  *GroupInfo           `protobuf:"bytes,2,opt,name=group,proto3"  json:"group"`
 }
 
 func (x *GroupInfoSetAnnouncementTips) Reset() {
@@ -2210,9 +2212,9 @@ type JoinGroupApplicationTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group     *GroupInfo      `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group     *GroupInfo      `protobuf:"bytes,1,opt,name=group,proto3"     json:"group"`
 	Applicant *PublicUserInfo `protobuf:"bytes,2,opt,name=applicant,proto3" json:"applicant"`
-	ReqMsg    string          `protobuf:"bytes,3,opt,name=reqMsg,proto3" json:"reqMsg"`
+	ReqMsg    string          `protobuf:"bytes,3,opt,name=reqMsg,proto3"    json:"reqMsg"`
 }
 
 func (x *JoinGroupApplicationTips) Reset() {
@@ -2276,8 +2278,8 @@ type MemberQuitTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	QuitUser      *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=quitUser,proto3" json:"quitUser"`
+	QuitUser      *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=quitUser,proto3"       json:"quitUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
 }
 
@@ -2340,9 +2342,9 @@ type GroupApplicationAcceptedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group      *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group      *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"       json:"group"`
-	OpUser     *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser     *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"      json:"opUser"`
-	HandleMsg  string               `protobuf:"bytes,4,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg  string               `protobuf:"bytes,4,opt,name=handleMsg,proto3"   json:"handleMsg"`
 	ReceiverAs int32                `protobuf:"varint,5,opt,name=receiverAs,proto3" json:"receiverAs"` // admin(==1) or applicant(==0)
 }
 
@@ -2412,9 +2414,9 @@ type GroupApplicationRejectedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group      *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group      *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"       json:"group"`
-	OpUser     *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser     *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"      json:"opUser"`
-	HandleMsg  string               `protobuf:"bytes,4,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg  string               `protobuf:"bytes,4,opt,name=handleMsg,proto3"   json:"handleMsg"`
 	ReceiverAs int32                `protobuf:"varint,5,opt,name=receiverAs,proto3" json:"receiverAs"` // admin(==1) or applicant(==0)
 }
 
@@ -2484,9 +2486,9 @@ type GroupOwnerTransferredTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
-	NewGroupOwner *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=newGroupOwner,proto3" json:"newGroupOwner"`
+	NewGroupOwner *GroupMemberFullInfo `protobuf:"bytes,3,opt,name=newGroupOwner,proto3"  json:"newGroupOwner"`
 	OperationTime int64                `protobuf:"varint,4,opt,name=operationTime,proto3" json:"operationTime"`
 }
 
@@ -2556,8 +2558,8 @@ type MemberKickedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group          *GroupInfo             `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group          *GroupInfo             `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser         *GroupMemberFullInfo   `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser         *GroupMemberFullInfo   `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	KickedUserList []*GroupMemberFullInfo `protobuf:"bytes,3,rep,name=kickedUserList,proto3" json:"kickedUserList"`
 	OperationTime  int64                  `protobuf:"varint,4,opt,name=operationTime,proto3" json:"operationTime"`
 }
@@ -2628,10 +2630,10 @@ type MemberInvitedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group           *GroupInfo             `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group           *GroupInfo             `protobuf:"bytes,1,opt,name=group,proto3"           json:"group"`
-	OpUser          *GroupMemberFullInfo   `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser          *GroupMemberFullInfo   `protobuf:"bytes,2,opt,name=opUser,proto3"          json:"opUser"`
 	InvitedUserList []*GroupMemberFullInfo `protobuf:"bytes,3,rep,name=invitedUserList,proto3" json:"invitedUserList"`
-	OperationTime   int64                  `protobuf:"varint,4,opt,name=operationTime,proto3" json:"operationTime"`
+	OperationTime   int64                  `protobuf:"varint,4,opt,name=operationTime,proto3"  json:"operationTime"`
 }
 
 func (x *MemberInvitedTips) Reset() {
@@ -2700,8 +2702,8 @@ type MemberEnterTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	EntrantUser   *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=entrantUser,proto3" json:"entrantUser"`
+	EntrantUser   *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=entrantUser,proto3"    json:"entrantUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
 }
 
@@ -2763,8 +2765,8 @@ type GroupDismissedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
 }
 
@@ -2826,11 +2828,11 @@ type GroupMemberMutedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
-	MutedUser     *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=mutedUser,proto3" json:"mutedUser"`
+	MutedUser     *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=mutedUser,proto3"      json:"mutedUser"`
-	MutedSeconds  uint32               `protobuf:"varint,5,opt,name=mutedSeconds,proto3" json:"mutedSeconds"`
+	MutedSeconds  uint32               `protobuf:"varint,5,opt,name=mutedSeconds,proto3"  json:"mutedSeconds"`
 }
 
 func (x *GroupMemberMutedTips) Reset() {
@@ -2905,10 +2907,10 @@ type GroupMemberCancelMutedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
-	MutedUser     *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=mutedUser,proto3" json:"mutedUser"`
+	MutedUser     *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=mutedUser,proto3"      json:"mutedUser"`
 }
 
 func (x *GroupMemberCancelMutedTips) Reset() {
@@ -2976,8 +2978,8 @@ type GroupMutedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
 }
 
@@ -3039,8 +3041,8 @@ type GroupCancelMutedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
 }
 
@@ -3102,10 +3104,10 @@ type GroupMemberInfoSetTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3" json:"group"`
+	Group         *GroupInfo           `protobuf:"bytes,1,opt,name=group,proto3"          json:"group"`
-	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3" json:"opUser"`
+	OpUser        *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser,proto3"         json:"opUser"`
 	OperationTime int64                `protobuf:"varint,3,opt,name=operationTime,proto3" json:"operationTime"`
-	ChangedUser   *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=changedUser,proto3" json:"changedUser"`
+	ChangedUser   *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=changedUser,proto3"    json:"changedUser"`
 }
 
 func (x *GroupMemberInfoSetTips) Reset() {
@@ -3173,8 +3175,8 @@ type FriendApplication struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AddTime    int64  `protobuf:"varint,1,opt,name=addTime,proto3" json:"addTime"`
+	AddTime    int64  `protobuf:"varint,1,opt,name=addTime,proto3"   json:"addTime"`
-	AddSource  string `protobuf:"bytes,2,opt,name=addSource,proto3" json:"addSource"`
+	AddSource  string `protobuf:"bytes,2,opt,name=addSource,proto3"  json:"addSource"`
 	AddWording string `protobuf:"bytes,3,opt,name=addWording,proto3" json:"addWording"`
 }
 
@@ -3237,7 +3239,7 @@ type FromToUserID struct {
 	unknownFields protoimpl.UnknownFields
 
 	FromUserID string `protobuf:"bytes,1,opt,name=fromUserID,proto3" json:"fromUserID"`
-	ToUserID   string `protobuf:"bytes,2,opt,name=toUserID,proto3" json:"toUserID"`
+	ToUserID   string `protobuf:"bytes,2,opt,name=toUserID,proto3"   json:"toUserID"`
 }
 
 func (x *FromToUserID) Reset() {
@@ -3341,7 +3343,7 @@ type FriendApplicationApprovedTips struct {
 	unknownFields protoimpl.UnknownFields
 
 	FromToUserID *FromToUserID `protobuf:"bytes,1,opt,name=fromToUserID,proto3" json:"fromToUserID"` //from：同意者；to：请求发起者
-	HandleMsg    string        `protobuf:"bytes,2,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg    string        `protobuf:"bytes,2,opt,name=handleMsg,proto3"    json:"handleMsg"`
 }
 
 func (x *FriendApplicationApprovedTips) Reset() {
@@ -3397,7 +3399,7 @@ type FriendApplicationRejectedTips struct {
 	unknownFields protoimpl.UnknownFields
 
 	FromToUserID *FromToUserID `protobuf:"bytes,1,opt,name=fromToUserID,proto3" json:"fromToUserID"` //from：拒绝者；to：请求发起者
-	HandleMsg    string        `protobuf:"bytes,2,opt,name=handleMsg,proto3" json:"handleMsg"`
+	HandleMsg    string        `protobuf:"bytes,2,opt,name=handleMsg,proto3"    json:"handleMsg"`
 }
 
 func (x *FriendApplicationRejectedTips) Reset() {
@@ -3452,9 +3454,9 @@ type FriendAddedTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Friend        *FriendInfo     `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"`
+	Friend        *FriendInfo     `protobuf:"bytes,1,opt,name=friend,proto3"         json:"friend"`
 	OperationTime int64           `protobuf:"varint,2,opt,name=operationTime,proto3" json:"operationTime"`
-	OpUser        *PublicUserInfo `protobuf:"bytes,3,opt,name=opUser,proto3" json:"opUser"` //who do this
+	OpUser        *PublicUserInfo `protobuf:"bytes,3,opt,name=opUser,proto3"         json:"opUser"` //who do this
 }
 
 func (x *FriendAddedTips) Reset() {
@@ -3753,7 +3755,7 @@ type ConversationUpdateTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID             string   `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID             string   `protobuf:"bytes,1,opt,name=userID,proto3"             json:"userID"`
 	ConversationIDList []string `protobuf:"bytes,2,rep,name=conversationIDList,proto3" json:"conversationIDList"`
 }
 
@@ -3808,8 +3810,8 @@ type ConversationSetPrivateTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RecvID    string `protobuf:"bytes,1,opt,name=recvID,proto3" json:"recvID"`
+	RecvID    string `protobuf:"bytes,1,opt,name=recvID,proto3"     json:"recvID"`
-	SendID    string `protobuf:"bytes,2,opt,name=sendID,proto3" json:"sendID"`
+	SendID    string `protobuf:"bytes,2,opt,name=sendID,proto3"     json:"sendID"`
 	IsPrivate bool   `protobuf:"varint,3,opt,name=isPrivate,proto3" json:"isPrivate"`
 }
 
@@ -3871,9 +3873,9 @@ type ConversationHasReadTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID          string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID          string `protobuf:"bytes,1,opt,name=userID,proto3"           json:"userID"`
-	ConversationID  string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
+	ConversationID  string `protobuf:"bytes,2,opt,name=conversationID,proto3"   json:"conversationID"`
-	HasReadSeq      int64  `protobuf:"varint,3,opt,name=hasReadSeq,proto3" json:"hasReadSeq"`
+	HasReadSeq      int64  `protobuf:"varint,3,opt,name=hasReadSeq,proto3"      json:"hasReadSeq"`
 	UnreadCountTime int64  `protobuf:"varint,4,opt,name=unreadCountTime,proto3" json:"unreadCountTime"`
 }
 
@@ -4037,8 +4039,8 @@ type DeleteMessageTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OpUserID string  `protobuf:"bytes,1,opt,name=opUserID,proto3" json:"opUserID"`
+	OpUserID string  `protobuf:"bytes,1,opt,name=opUserID,proto3"     json:"opUserID"`
-	UserID   string  `protobuf:"bytes,2,opt,name=userID,proto3" json:"userID"`
+	UserID   string  `protobuf:"bytes,2,opt,name=userID,proto3"       json:"userID"`
 	Seqs     []int64 `protobuf:"varint,3,rep,packed,name=seqs,proto3" json:"seqs"`
 }
 
@@ -4100,11 +4102,11 @@ type RevokeMsgTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RevokerUserID  string `protobuf:"bytes,1,opt,name=revokerUserID,proto3" json:"revokerUserID"`
+	RevokerUserID  string `protobuf:"bytes,1,opt,name=revokerUserID,proto3"  json:"revokerUserID"`
-	ClientMsgID    string `protobuf:"bytes,2,opt,name=clientMsgID,proto3" json:"clientMsgID"`
+	ClientMsgID    string `protobuf:"bytes,2,opt,name=clientMsgID,proto3"    json:"clientMsgID"`
-	RevokeTime     int64  `protobuf:"varint,3,opt,name=revokeTime,proto3" json:"revokeTime"`
+	RevokeTime     int64  `protobuf:"varint,3,opt,name=revokeTime,proto3"    json:"revokeTime"`
-	SesstionType   int32  `protobuf:"varint,5,opt,name=sesstionType,proto3" json:"sesstionType"`
+	SesstionType   int32  `protobuf:"varint,5,opt,name=sesstionType,proto3"  json:"sesstionType"`
-	Seq            int64  `protobuf:"varint,6,opt,name=seq,proto3" json:"seq"`
+	Seq            int64  `protobuf:"varint,6,opt,name=seq,proto3"           json:"seq"`
 	ConversationID string `protobuf:"bytes,7,opt,name=conversationID,proto3" json:"conversationID"`
 }
 
@@ -4187,17 +4189,17 @@ type MessageRevokedContent struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RevokerID                   string `protobuf:"bytes,1,opt,name=revokerID,proto3" json:"revokerID"`
+	RevokerID                   string `protobuf:"bytes,1,opt,name=revokerID,proto3"                   json:"revokerID"`
-	RevokerRole                 int32  `protobuf:"varint,2,opt,name=revokerRole,proto3" json:"revokerRole"`
+	RevokerRole                 int32  `protobuf:"varint,2,opt,name=revokerRole,proto3"                json:"revokerRole"`
-	ClientMsgID                 string `protobuf:"bytes,3,opt,name=clientMsgID,proto3" json:"clientMsgID"`
+	ClientMsgID                 string `protobuf:"bytes,3,opt,name=clientMsgID,proto3"                 json:"clientMsgID"`
-	RevokerNickname             string `protobuf:"bytes,4,opt,name=revokerNickname,proto3" json:"revokerNickname"`
+	RevokerNickname             string `protobuf:"bytes,4,opt,name=revokerNickname,proto3"             json:"revokerNickname"`
-	RevokeTime                  int64  `protobuf:"varint,5,opt,name=revokeTime,proto3" json:"revokeTime"`
+	RevokeTime                  int64  `protobuf:"varint,5,opt,name=revokeTime,proto3"                 json:"revokeTime"`
-	SourceMessageSendTime       int64  `protobuf:"varint,6,opt,name=sourceMessageSendTime,proto3" json:"sourceMessageSendTime"`
+	SourceMessageSendTime       int64  `protobuf:"varint,6,opt,name=sourceMessageSendTime,proto3"      json:"sourceMessageSendTime"`
-	SourceMessageSendID         string `protobuf:"bytes,7,opt,name=sourceMessageSendID,proto3" json:"sourceMessageSendID"`
+	SourceMessageSendID         string `protobuf:"bytes,7,opt,name=sourceMessageSendID,proto3"         json:"sourceMessageSendID"`
 	SourceMessageSenderNickname string `protobuf:"bytes,8,opt,name=sourceMessageSenderNickname,proto3" json:"sourceMessageSenderNickname"`
-	SessionType                 int32  `protobuf:"varint,10,opt,name=sessionType,proto3" json:"sessionType"`
+	SessionType                 int32  `protobuf:"varint,10,opt,name=sessionType,proto3"               json:"sessionType"`
-	Seq                         int64  `protobuf:"varint,11,opt,name=seq,proto3" json:"seq"`
+	Seq                         int64  `protobuf:"varint,11,opt,name=seq,proto3"                       json:"seq"`
-	Ex                          string `protobuf:"bytes,12,opt,name=ex,proto3" json:"ex"`
+	Ex                          string `protobuf:"bytes,12,opt,name=ex,proto3"                         json:"ex"`
 }
 
 func (x *MessageRevokedContent) Reset() {
@@ -4314,7 +4316,7 @@ type ClearConversationTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID          string   `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID          string   `protobuf:"bytes,1,opt,name=userID,proto3"          json:"userID"`
 	ConversationIDs []string `protobuf:"bytes,2,rep,name=conversationIDs,proto3" json:"conversationIDs"`
 }
 
@@ -4369,9 +4371,9 @@ type DeleteMsgsTips struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID         string  `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID         string  `protobuf:"bytes,1,opt,name=userID,proto3"         json:"userID"`
 	ConversationID string  `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
-	Seqs           []int64 `protobuf:"varint,3,rep,packed,name=seqs,proto3" json:"seqs"`
+	Seqs           []int64 `protobuf:"varint,3,rep,packed,name=seqs,proto3"   json:"seqs"`
 }
 
 func (x *DeleteMsgsTips) Reset() {
@@ -4433,9 +4435,9 @@ type MarkAsReadTips struct {
 	unknownFields protoimpl.UnknownFields
 
 	MarkAsReadUserID string  `protobuf:"bytes,1,opt,name=markAsReadUserID,proto3" json:"markAsReadUserID"`
-	ConversationID   string  `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
+	ConversationID   string  `protobuf:"bytes,2,opt,name=conversationID,proto3"   json:"conversationID"`
-	Seqs             []int64 `protobuf:"varint,3,rep,packed,name=seqs,proto3" json:"seqs"`
+	Seqs             []int64 `protobuf:"varint,3,rep,packed,name=seqs,proto3"     json:"seqs"`
-	HasReadSeq       int64   `protobuf:"varint,4,opt,name=hasReadSeq,proto3" json:"hasReadSeq"`
+	HasReadSeq       int64   `protobuf:"varint,4,opt,name=hasReadSeq,proto3"      json:"hasReadSeq"`
 }
 
 func (x *MarkAsReadTips) Reset() {
@@ -4503,7 +4505,7 @@ type SetAppBackgroundStatusReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID       string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID       string `protobuf:"bytes,1,opt,name=userID,proto3"        json:"userID"`
 	IsBackground bool   `protobuf:"varint,2,opt,name=isBackground,proto3" json:"isBackground"`
 }
 

pkg/proto/statistics/statistics.pb.go

@@ -21,9 +21,10 @@
 package statistics
 
 import (
+	reflect "reflect"
+
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
 )
 
 const (

pkg/proto/third/third.pb.go

@@ -22,13 +22,14 @@ package third
 
 import (
 	context "context"
+	reflect "reflect"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -43,7 +44,7 @@ type KeyValues struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Key    string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key"`
+	Key    string   `protobuf:"bytes,1,opt,name=key,proto3"    json:"key"`
 	Values []string `protobuf:"bytes,2,rep,name=values,proto3" json:"values"`
 }
 
@@ -99,9 +100,9 @@ type SignPart struct {
 	unknownFields protoimpl.UnknownFields
 
 	PartNumber int32        `protobuf:"varint,1,opt,name=partNumber,proto3" json:"partNumber"`
-	Url        string       `protobuf:"bytes,2,opt,name=url,proto3" json:"url"`
+	Url        string       `protobuf:"bytes,2,opt,name=url,proto3"         json:"url"`
-	Query      []*KeyValues `protobuf:"bytes,3,rep,name=query,proto3" json:"query"`
+	Query      []*KeyValues `protobuf:"bytes,3,rep,name=query,proto3"       json:"query"`
-	Header     []*KeyValues `protobuf:"bytes,4,rep,name=header,proto3" json:"header"`
+	Header     []*KeyValues `protobuf:"bytes,4,rep,name=header,proto3"      json:"header"`
 }
 
 func (x *SignPart) Reset() {
@@ -169,10 +170,10 @@ type AuthSignParts struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Url    string       `protobuf:"bytes,1,opt,name=url,proto3" json:"url"`
+	Url    string       `protobuf:"bytes,1,opt,name=url,proto3"    json:"url"`
-	Query  []*KeyValues `protobuf:"bytes,2,rep,name=query,proto3" json:"query"`
+	Query  []*KeyValues `protobuf:"bytes,2,rep,name=query,proto3"  json:"query"`
 	Header []*KeyValues `protobuf:"bytes,3,rep,name=header,proto3" json:"header"`
-	Parts  []*SignPart  `protobuf:"bytes,4,rep,name=parts,proto3" json:"parts"`
+	Parts  []*SignPart  `protobuf:"bytes,4,rep,name=parts,proto3"  json:"parts"`
 }
 
 func (x *AuthSignParts) Reset() {
@@ -280,7 +281,7 @@ type PartLimitResp struct {
 
 	MinPartSize int64 `protobuf:"varint,1,opt,name=minPartSize,proto3" json:"minPartSize"`
 	MaxPartSize int64 `protobuf:"varint,2,opt,name=maxPartSize,proto3" json:"maxPartSize"`
-	MaxNumSize  int32 `protobuf:"varint,3,opt,name=maxNumSize,proto3" json:"maxNumSize"`
+	MaxNumSize  int32 `protobuf:"varint,3,opt,name=maxNumSize,proto3"  json:"maxNumSize"`
 }
 
 func (x *PartLimitResp) Reset() {
@@ -435,12 +436,12 @@ type InitiateMultipartUploadReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Hash        string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash"`
+	Hash        string `protobuf:"bytes,1,opt,name=hash,proto3"        json:"hash"`
-	Size        int64  `protobuf:"varint,2,opt,name=size,proto3" json:"size"`
+	Size        int64  `protobuf:"varint,2,opt,name=size,proto3"       json:"size"`
-	PartSize    int64  `protobuf:"varint,3,opt,name=partSize,proto3" json:"partSize"`
+	PartSize    int64  `protobuf:"varint,3,opt,name=partSize,proto3"   json:"partSize"`
-	MaxParts    int32  `protobuf:"varint,4,opt,name=maxParts,proto3" json:"maxParts"`
+	MaxParts    int32  `protobuf:"varint,4,opt,name=maxParts,proto3"   json:"maxParts"`
-	Cause       string `protobuf:"bytes,5,opt,name=cause,proto3" json:"cause"`
+	Cause       string `protobuf:"bytes,5,opt,name=cause,proto3"       json:"cause"`
-	Name        string `protobuf:"bytes,6,opt,name=name,proto3" json:"name"`
+	Name        string `protobuf:"bytes,6,opt,name=name,proto3"        json:"name"`
 	ContentType string `protobuf:"bytes,7,opt,name=contentType,proto3" json:"contentType"`
 }
 
@@ -530,9 +531,9 @@ type UploadInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UploadID   string         `protobuf:"bytes,1,opt,name=uploadID,proto3" json:"uploadID"`
+	UploadID   string         `protobuf:"bytes,1,opt,name=uploadID,proto3"    json:"uploadID"`
-	PartSize   int64          `protobuf:"varint,2,opt,name=partSize,proto3" json:"partSize"`
+	PartSize   int64          `protobuf:"varint,2,opt,name=partSize,proto3"   json:"partSize"`
-	Sign       *AuthSignParts `protobuf:"bytes,3,opt,name=sign,proto3" json:"sign"`
+	Sign       *AuthSignParts `protobuf:"bytes,3,opt,name=sign,proto3"        json:"sign"`
 	ExpireTime int64          `protobuf:"varint,4,opt,name=expireTime,proto3" json:"expireTime"`
 }
 
@@ -601,7 +602,7 @@ type InitiateMultipartUploadResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Url    string      `protobuf:"bytes,1,opt,name=url,proto3" json:"url"`
+	Url    string      `protobuf:"bytes,1,opt,name=url,proto3"    json:"url"`
 	Upload *UploadInfo `protobuf:"bytes,2,opt,name=upload,proto3" json:"upload"`
 }
 
@@ -656,7 +657,7 @@ type AuthSignReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UploadID    string  `protobuf:"bytes,1,opt,name=uploadID,proto3" json:"uploadID"`
+	UploadID    string  `protobuf:"bytes,1,opt,name=uploadID,proto3"            json:"uploadID"`
 	PartNumbers []int32 `protobuf:"varint,2,rep,packed,name=partNumbers,proto3" json:"partNumbers"`
 }
 
@@ -711,10 +712,10 @@ type AuthSignResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Url    string       `protobuf:"bytes,1,opt,name=url,proto3" json:"url"`
+	Url    string       `protobuf:"bytes,1,opt,name=url,proto3"    json:"url"`
-	Query  []*KeyValues `protobuf:"bytes,2,rep,name=query,proto3" json:"query"`
+	Query  []*KeyValues `protobuf:"bytes,2,rep,name=query,proto3"  json:"query"`
 	Header []*KeyValues `protobuf:"bytes,3,rep,name=header,proto3" json:"header"`
-	Parts  []*SignPart  `protobuf:"bytes,4,rep,name=parts,proto3" json:"parts"`
+	Parts  []*SignPart  `protobuf:"bytes,4,rep,name=parts,proto3"  json:"parts"`
 }
 
 func (x *AuthSignResp) Reset() {
@@ -782,11 +783,11 @@ type CompleteMultipartUploadReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UploadID    string   `protobuf:"bytes,1,opt,name=uploadID,proto3" json:"uploadID"`
+	UploadID    string   `protobuf:"bytes,1,opt,name=uploadID,proto3"    json:"uploadID"`
-	Parts       []string `protobuf:"bytes,2,rep,name=parts,proto3" json:"parts"`
+	Parts       []string `protobuf:"bytes,2,rep,name=parts,proto3"       json:"parts"`
-	Name        string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`
+	Name        string   `protobuf:"bytes,3,opt,name=name,proto3"        json:"name"`
 	ContentType string   `protobuf:"bytes,4,opt,name=contentType,proto3" json:"contentType"`
-	Cause       string   `protobuf:"bytes,5,opt,name=cause,proto3" json:"cause"`
+	Cause       string   `protobuf:"bytes,5,opt,name=cause,proto3"       json:"cause"`
 }
 
 func (x *CompleteMultipartUploadReq) Reset() {
@@ -955,7 +956,7 @@ type AccessURLResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Url        string `protobuf:"bytes,1,opt,name=url,proto3" json:"url"`
+	Url        string `protobuf:"bytes,1,opt,name=url,proto3"         json:"url"`
 	ExpireTime int64  `protobuf:"varint,2,opt,name=expireTime,proto3" json:"expireTime"`
 }
 
@@ -1011,8 +1012,8 @@ type FcmUpdateTokenReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	PlatformID int32  `protobuf:"varint,1,opt,name=platformID,proto3" json:"platformID"`
-	FcmToken   string `protobuf:"bytes,2,opt,name=fcmToken,proto3" json:"fcmToken"`
+	FcmToken   string `protobuf:"bytes,2,opt,name=fcmToken,proto3"    json:"fcmToken"`
-	Account    string `protobuf:"bytes,3,opt,name=account,proto3" json:"account"`
+	Account    string `protobuf:"bytes,3,opt,name=account,proto3"     json:"account"`
 	ExpireTime int64  `protobuf:"varint,4,opt,name=expireTime,proto3" json:"expireTime"`
 }
 
@@ -1119,7 +1120,7 @@ type SetAppBadgeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID         string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID         string `protobuf:"bytes,1,opt,name=userID,proto3"          json:"userID"`
 	AppUnreadCount int32  `protobuf:"varint,2,opt,name=appUnreadCount,proto3" json:"appUnreadCount"`
 }
 

pkg/proto/user/user.pb.go

@@ -22,15 +22,17 @@ package user
 
 import (
 	context "context"
-	conversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
+
-	sync "sync"
+	conversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (
@@ -92,7 +94,7 @@ type GetAllUserIDResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total   int32    `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total   int32    `protobuf:"varint,1,opt,name=total,proto3"  json:"total"`
 	UserIDs []string `protobuf:"bytes,2,rep,name=userIDs,proto3" json:"userIDs"`
 }
 
@@ -420,7 +422,7 @@ type SetGlobalRecvMessageOptReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID           string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID           string `protobuf:"bytes,1,opt,name=userID,proto3"            json:"userID"`
 	GlobalRecvMsgOpt int32  `protobuf:"varint,3,opt,name=globalRecvMsgOpt,proto3" json:"globalRecvMsgOpt"`
 }
 
@@ -513,9 +515,9 @@ type SetConversationReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Conversation     *conversation.Conversation `protobuf:"bytes,1,opt,name=conversation,proto3" json:"conversation"`
+	Conversation     *conversation.Conversation `protobuf:"bytes,1,opt,name=conversation,proto3"      json:"conversation"`
 	NotificationType int32                      `protobuf:"varint,2,opt,name=notificationType,proto3" json:"notificationType"`
-	OperationID      string                     `protobuf:"bytes,3,opt,name=operationID,proto3" json:"operationID"`
+	OperationID      string                     `protobuf:"bytes,3,opt,name=operationID,proto3"       json:"operationID"`
 }
 
 func (x *SetConversationReq) Reset() {
@@ -614,11 +616,11 @@ type SetRecvMsgOptReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID      string `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID      string `protobuf:"bytes,1,opt,name=ownerUserID,proto3"       json:"ownerUserID"`
-	ConversationID   string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID"`
+	ConversationID   string `protobuf:"bytes,2,opt,name=conversationID,proto3"    json:"conversationID"`
-	RecvMsgOpt       int32  `protobuf:"varint,3,opt,name=recvMsgOpt,proto3" json:"recvMsgOpt"`
+	RecvMsgOpt       int32  `protobuf:"varint,3,opt,name=recvMsgOpt,proto3"       json:"recvMsgOpt"`
 	NotificationType int32  `protobuf:"varint,4,opt,name=notificationType,proto3" json:"notificationType"`
-	OperationID      string `protobuf:"bytes,5,opt,name=operationID,proto3" json:"operationID"`
+	OperationID      string `protobuf:"bytes,5,opt,name=operationID,proto3"       json:"operationID"`
 }
 
 func (x *SetRecvMsgOptReq) Reset() {
@@ -732,8 +734,8 @@ type GetConversationReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	ConversationID string `protobuf:"bytes,1,opt,name=conversationID,proto3" json:"conversationID"`
-	OwnerUserID    string `protobuf:"bytes,2,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID    string `protobuf:"bytes,2,opt,name=ownerUserID,proto3"    json:"ownerUserID"`
-	OperationID    string `protobuf:"bytes,3,opt,name=operationID,proto3" json:"operationID"`
+	OperationID    string `protobuf:"bytes,3,opt,name=operationID,proto3"    json:"operationID"`
 }
 
 func (x *GetConversationReq) Reset() {
@@ -841,9 +843,9 @@ type GetConversationsReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OwnerUserID     string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID"`
+	OwnerUserID     string   `protobuf:"bytes,1,opt,name=ownerUserID,proto3"     json:"ownerUserID"`
 	ConversationIDs []string `protobuf:"bytes,2,rep,name=conversationIDs,proto3" json:"conversationIDs"`
-	OperationID     string   `protobuf:"bytes,3,opt,name=operationID,proto3" json:"operationID"`
+	OperationID     string   `protobuf:"bytes,3,opt,name=operationID,proto3"     json:"operationID"`
 }
 
 func (x *GetConversationsReq) Reset() {
@@ -1053,10 +1055,10 @@ type BatchSetConversationsReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Conversations    []*conversation.Conversation `protobuf:"bytes,1,rep,name=conversations,proto3" json:"conversations"`
+	Conversations    []*conversation.Conversation `protobuf:"bytes,1,rep,name=conversations,proto3"     json:"conversations"`
-	OwnerUserID      string                       `protobuf:"bytes,2,opt,name=OwnerUserID,proto3" json:"OwnerUserID"`
+	OwnerUserID      string                       `protobuf:"bytes,2,opt,name=OwnerUserID,proto3"       json:"OwnerUserID"`
 	NotificationType int32                        `protobuf:"varint,3,opt,name=notificationType,proto3" json:"notificationType"`
-	OperationID      string                       `protobuf:"bytes,4,opt,name=OperationID,proto3" json:"OperationID"`
+	OperationID      string                       `protobuf:"bytes,4,opt,name=OperationID,proto3"       json:"OperationID"`
 }
 
 func (x *BatchSetConversationsReq) Reset() {
@@ -1125,7 +1127,7 @@ type BatchSetConversationsResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Success []string `protobuf:"bytes,2,rep,name=Success,proto3" json:"Success"`
-	Failed  []string `protobuf:"bytes,3,rep,name=Failed,proto3" json:"Failed"`
+	Failed  []string `protobuf:"bytes,3,rep,name=Failed,proto3"  json:"Failed"`
 }
 
 func (x *BatchSetConversationsResp) Reset() {
@@ -1227,7 +1229,7 @@ type GetPaginationUsersResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Total int32             `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
-	Users []*sdkws.UserInfo `protobuf:"bytes,2,rep,name=users,proto3" json:"users"`
+	Users []*sdkws.UserInfo `protobuf:"bytes,2,rep,name=users,proto3"  json:"users"`
 }
 
 func (x *GetPaginationUsersResp) Reset() {
@@ -1282,7 +1284,7 @@ type UserRegisterReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Secret string            `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret"`
-	Users  []*sdkws.UserInfo `protobuf:"bytes,2,rep,name=users,proto3" json:"users"`
+	Users  []*sdkws.UserInfo `protobuf:"bytes,2,rep,name=users,proto3"  json:"users"`
 }
 
 func (x *UserRegisterReq) Reset() {
@@ -1469,7 +1471,7 @@ type UserRegisterCountReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Start int64 `protobuf:"varint,1,opt,name=start,proto3" json:"start"`
-	End   int64 `protobuf:"varint,2,opt,name=end,proto3" json:"end"`
+	End   int64 `protobuf:"varint,2,opt,name=end,proto3"   json:"end"`
 }
 
 func (x *UserRegisterCountReq) Reset() {
@@ -1523,9 +1525,9 @@ type UserRegisterCountResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Total  int64            `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Total  int64            `protobuf:"varint,1,opt,name=total,proto3"  json:"total"`
 	Before int64            `protobuf:"varint,2,opt,name=before,proto3" json:"before"`
-	Count  map[string]int64 `protobuf:"bytes,3,rep,name=count,proto3" json:"count" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Count  map[string]int64 `protobuf:"bytes,3,rep,name=count,proto3"   json:"count"  protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
 func (x *UserRegisterCountResp) Reset() {
@@ -1586,7 +1588,7 @@ type AccountCheckRespSingleUserStatus struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID        string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID"`
+	UserID        string `protobuf:"bytes,1,opt,name=userID,proto3"        json:"userID"`
 	AccountStatus string `protobuf:"bytes,2,opt,name=accountStatus,proto3" json:"accountStatus"`
 }
 

pkg/proto/wrapperspb/wrapperspb.pb.go

@@ -21,10 +21,11 @@
 package wrapperspb
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (

pkg/rpcclient/conversation.go

@@ -18,11 +18,12 @@ import (
 	"context"
 	"fmt"
 
+	"google.golang.org/grpc"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
-	"google.golang.org/grpc"
 )
 
 type Conversation struct {

pkg/rpcclient/msg.go

@@ -18,6 +18,9 @@ import (
 	"context"
 	"encoding/json"
 
+	"google.golang.org/grpc"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
@@ -25,8 +28,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
-	"google.golang.org/grpc"
-	"google.golang.org/protobuf/proto"
 	// "google.golang.org/protobuf/proto".
 )
 

pkg/rpcclient/notification/group.go

@@ -30,7 +30,12 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
-func NewGroupNotificationSender(db controller.GroupDatabase, msgRpcClient *rpcclient.MessageRpcClient, userRpcClient *rpcclient.UserRpcClient, fn func(ctx context.Context, userIDs []string) ([]CommonUser, error)) *GroupNotificationSender {
+func NewGroupNotificationSender(
+	db controller.GroupDatabase,
+	msgRpcClient *rpcclient.MessageRpcClient,
+	userRpcClient *rpcclient.UserRpcClient,
+	fn func(ctx context.Context, userIDs []string) ([]CommonUser, error),
+) *GroupNotificationSender {
 	return &GroupNotificationSender{
 		NotificationSender: rpcclient.NewNotificationSender(rpcclient.WithRpcClient(msgRpcClient), rpcclient.WithUserRpcClient(userRpcClient)),
 		getUsersInfo:       fn,