Merge remote-tracking branch 'origin/errcode' into errcode

# Conflicts:
#	cmd/msggateway/main.go
#	go.sum
#	internal/msggateway/init.go

cmd/api/main.go

@@ -5,59 +5,45 @@ import (
 	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/log"
+	"OpenIM/pkg/common/mw"
 	"fmt"
-	"github.com/spf13/cobra"
+	"github.com/OpenIMSDK/openKeeper"
 	"os"
-
 	"strconv"
 
 	"OpenIM/pkg/common/constant"
 )
 
-var startCmd = &cobra.Command{
+func main() {
-	Use:   "start",
+	apiCmd := cmd.NewApiCmd()
-	Short: "Start the server",
+	apiCmd.AddPortFlag()
-	Run: func(cmd *cobra.Command, args []string) {
+	apiCmd.AddApi(run)
-		port, _ := cmd.Flags().GetInt(constant.FlagPort)
+	if err := apiCmd.Execute(); err != nil {
-		configFolderPath, _ := cmd.Flags().GetString(constant.FlagConf)
+		fmt.Println(err)
-		if err := run(configFolderPath, port); err != nil {
+		os.Exit(1)
-			panic(err.Error())
-		}
-	},
-}
-
-func init() {
-	startCmd.Flags().IntP(constant.FlagPort, "p", 0, "Port to listen on")
-	startCmd.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
-}
-
-func run(configFolderPath string, port int) error {
-	if err := config.InitConfig(configFolderPath); err != nil {
-		return err
 	}
+}
+
+func run(port int) error {
 	if port == 0 {
 		port = config.Config.Api.GinPort[0]
 	}
+	zk, err := openKeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema, 10, config.Config.Zookeeper.UserName, config.Config.Zookeeper.Password)
+	if err != nil {
+		return err
+	}
 	log.NewPrivateLog(constant.LogFileName)
-	router := api.NewGinRouter()
+	zk.AddOption(mw.GrpcClient())
+	router := api.NewGinRouter(zk)
 	address := constant.LocalHost + ":" + strconv.Itoa(port)
 	if config.Config.Api.ListenIP != "" {
 		address = config.Config.Api.ListenIP + ":" + strconv.Itoa(port)
 	}
-	fmt.Println("start api server, address: ", address, ", OpenIM version: ", constant.CurrentVersion)
+	fmt.Println("start api server, address: ", address, ", OpenIM version: ", config.Version)
-	err := router.Run(address)
+	err = router.Run(address)
 	if err != nil {
 		log.Error("", "api run failed ", address, err.Error())
 		return err
 	}
 	return nil
 }
-
-func main() {
-	rootCmd := cmd.NewRootCmd()
-	rootCmd.AddCommand(startCmd)
-	if err := startCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}

cmd/cmdutils/main.go

@@ -1,97 +1,23 @@
 package main
 
 import (
-	"OpenIM/internal/tools"
 	"OpenIM/pkg/common/cmd"
-	"OpenIM/pkg/common/config"
-	"OpenIM/pkg/common/constant"
-	"flag"
 	"fmt"
-	"github.com/spf13/cobra"
 	"os"
 )
 
-
-var showSeqCmd = &cobra.Command{
-	Use:   "show-seq",
-	Short: "Start the server",
-	Run: func(cmd *cobra.Command, args []string) {
-		configFolderPath, _ := cmd.Flags().GetString(constant.FlagConf)
-		config.InitConfig(configFolderPath)
-	},
-}
-
-var
-
-
-func init() {
-	showSeqCmd.Flags().StringP("userID", "u", "", "openIM userID")
-	showSeqCmd.Flags().StringP("groupID", "g", "", "openIM groupID")
-	startCmd.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
-
-}
-
-func run(configFolderPath string, cmd *cobra.Command) error {
-	if err := config.InitConfig(configFolderPath); err != nil {
-		return err
-	}
-
-
-	return nil
-}
-
 func main() {
-	rootCmd := cmd.NewRootCmd()
+	msgUtilsCmd := cmd.NewMsgUtilsCmd()
-	rootCmd.AddCommand(showSeqCmd)
+	msgUtilsCmd.AddSuperGroupIDFlag()
-	if err := rootCmd.Execute(); err != nil {
+	msgUtilsCmd.AddUserIDFlag()
+	seqCmd := cmd.NewSeqCmd()
+	msgCmd := cmd.NewMsgCmd()
+	cmd.GetCmd.AddCommand(seqCmd.Command, msgCmd.Command)
+	cmd.FixCmd.AddCommand(seqCmd.Command)
+	cmd.GetCmd.AddCommand(msgCmd.Command)
+	msgUtilsCmd.AddCommand(cmd.GetCmd, cmd.FixCmd, cmd.ClearCmd)
+	if err := msgUtilsCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 }
-
-
-//
-func main() {
-	if err := config.InitConfig(""); err != nil {
-		panic(err.Error())
-	}
-	// clear msg by id
-	var userIDClearMsg = flag.String("user_id_fix_seq", "", "userID to clear msg and reset seq")
-	var superGroupIDClearMsg = flag.String("super_group_id_fix_seq", "", "superGroupID to clear msg and reset seq")
-	// show seq by id
-	var userIDShowSeq = flag.String("user_id_show_seq", "", "show userID")
-	var superGroupIDShowSeq = flag.String("super_group_id_show_seq", "", "userID to clear msg and reset seq")
-	// fix seq by id
-	var userIDFixSeq = flag.String("user_id_fix_seq", "", "userID to Fix Seq")
-	var superGroupIDFixSeq = flag.String("super_group_id_fix_seq", "", "super groupID to fix Seq")
-	var fixAllSeq = flag.Bool("fix_all_seq", false, "fix seq")
-	flag.Parse()
-	msgTool, err := tools.InitMsgTool()
-	if err != nil {
-		panic(err.Error())
-	}
-	ctx := context.Background()
-	if userIDFixSeq != nil {
-		msgTool.GetAndFixUserSeqs(ctx, *userIDFixSeq)
-	}
-	if superGroupIDFixSeq != nil {
-		msgTool.FixGroupSeq(ctx, *superGroupIDFixSeq)
-	}
-	if fixAllSeq != nil {
-		msgTool.FixAllSeq(ctx)
-	}
-	if userIDClearMsg != nil {
-		msgTool.ClearUsersMsg(ctx, []string{*userIDClearMsg})
-	}
-
-	if superGroupIDClearMsg != nil {
-		msgTool.ClearSuperGroupMsg(ctx, []string{*superGroupIDClearMsg})
-	}
-	if userIDShowSeq != nil {
-		msgTool.ShowUserSeqs(ctx, *userIDShowSeq)
-	}
-
-	if superGroupIDShowSeq != nil {
-		msgTool.ShowSuperGroupSeqs(ctx, *superGroupIDShowSeq)
-	}
-}

cmd/crontask/main.go

@@ -2,17 +2,15 @@ package main
 
 import (
 	"OpenIM/internal/tools"
-	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/cmd"
 	"fmt"
-	"time"
+	"os"
 )
 
 func main() {
-	fmt.Println(time.Now(), "start cronTask")
+	cronTaskCmd := cmd.NewCronTaskCmd()
-	if err := config.InitConfig(""); err != nil {
+	if err := cronTaskCmd.Exec(tools.StartCronTask); err != nil {
-		panic(err.Error())
+		fmt.Println(err)
-	}
+		os.Exit(1)
-	if err := tools.StartCronTask(); err != nil {
-		panic(err.Error())
 	}
 }

cmd/msgtransfer/main.go

@@ -1,24 +1,16 @@
 package main
 
 import (
-	"OpenIM/internal/msgtransfer"
+	"OpenIM/pkg/common/cmd"
-	"OpenIM/pkg/common/config"
+	"fmt"
-	"OpenIM/pkg/common/constant"
+	"os"
-	"OpenIM/pkg/common/log"
-	"flag"
-	"sync"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	msgTransferCmd := cmd.NewMsgTransferCmd()
-		panic(err.Error())
+	msgTransferCmd.AddPrometheusPortFlag()
+	if err := msgTransferCmd.Exec(); err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
-	var wg sync.WaitGroup
-	wg.Add(1)
-	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
-	log.NewPrivateLog(constant.LogFileName)
-	if err := msgtransfer.StartTransfer(*prometheusPort); err != nil {
-		panic(err)
-	}
-	wg.Wait()
 }

cmd/push/main.go

@@ -1,19 +1,18 @@
 package main
 
 import (
-	"OpenIM/internal/push"
+	"OpenIM/pkg/common/cmd"
-	"OpenIM/internal/startrpc"
+	"fmt"
-	"OpenIM/pkg/common/config"
+	"os"
-	"OpenIM/pkg/common/constant"
-	"OpenIM/pkg/common/log"
 )
 
 func main() {
-	if err := config.InitConfig(); err != nil {
+	pushCmd := cmd.NewPushCmd()
-		panic(err.Error())
+	pushCmd.AddPortFlag()
-	}
+	pushCmd.AddPrometheusPortFlag()
-	log.NewPrivateLog(constant.LogFileName)
+	pushCmd.AddPush()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImAuthPort[0], config.Config.RpcRegisterName.OpenImAuthName, config.Config.Prometheus.AuthPrometheusPort[0], push.Start); err != nil {
+	if err := pushCmd.Execute(); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/auth/main.go

@@ -2,15 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/rpc/auth"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImAuthName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImAuthPort[0], config.Config.RpcRegisterName.OpenImAuthName, config.Config.Prometheus.AuthPrometheusPort[0], auth.Start); err != nil {
+	if err := rpcCmd.Exec(auth.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/conversation/main.go

@@ -2,15 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/rpc/conversation"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImConversationName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImConversationPort[0], config.Config.RpcRegisterName.OpenImConversationName, config.Config.Prometheus.ConversationPrometheusPort[0], conversation.Start); err != nil {
+	if err := rpcCmd.Exec(conversation.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/friend/main.go

@@ -2,15 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/rpc/friend"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImFriendName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImFriendPort[0], config.Config.RpcRegisterName.OpenImFriendName, config.Config.Prometheus.FriendPrometheusPort[0], friend.Start); err != nil {
+	if err := rpcCmd.Exec(friend.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/group/main.go

@@ -1,16 +1,19 @@
 package main
 
 import (
-	"OpenIM/internal/rpc/group"
+	"OpenIM/internal/rpc/friend"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImGroupName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImGroupPort[0], config.Config.RpcRegisterName.OpenImGroupName, config.Config.Prometheus.GroupPrometheusPort[0], group.Start); err != nil {
+	if err := rpcCmd.Exec(friend.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/msg/main.go

@@ -2,15 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/rpc/msg"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImMsgName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImMessagePort[0], config.Config.RpcRegisterName.OpenImMsgName, config.Config.Prometheus.AuthPrometheusPort[0], msg.Start); err != nil {
+	if err := rpcCmd.Exec(msg.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/third/main.go

@@ -2,15 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/rpc/third"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImThirdName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImThirdPort[0], config.Config.RpcRegisterName.OpenImThirdName, config.Config.Prometheus.ThirdPrometheusPort[0], third.Start); err != nil {
+	if err := rpcCmd.Exec(third.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

cmd/rpc/user/main.go

@@ -2,15 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/rpc/user"
-	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/cmd"
 	"OpenIM/pkg/common/config"
+	"fmt"
+	"os"
 )
 
 func main() {
-	if err := config.InitConfig(""); err != nil {
+	rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImUserName)
-		panic(err.Error())
+	rpcCmd.AddPortFlag()
-	}
+	rpcCmd.AddPrometheusPortFlag()
-	if err := startrpc.Start(config.Config.RpcPort.OpenImUserPort[0], config.Config.RpcRegisterName.OpenImUserName, config.Config.Prometheus.UserPrometheusPort[0], user.Start); err != nil {
+	if err := rpcCmd.Exec(user.Start); err != nil {
-		panic(err.Error())
+		fmt.Println(err.Error())
+		os.Exit(1)
 	}
 }

go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
-	github.com/OpenIMSDK/openKeeper v0.0.2
+	github.com/OpenIMSDK/openKeeper v0.0.3
 	github.com/OpenIMSDK/open_utils v1.0.8
 	github.com/Shopify/sarama v1.32.0
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
@@ -47,78 +47,6 @@ require (
 	github.com/minio/minio-go v6.0.14+incompatible
 )
 
-require (
-	cloud.google.com/go v0.105.0 // indirect
-	cloud.google.com/go/compute v1.13.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.1 // indirect
-	cloud.google.com/go/firestore v1.9.0 // indirect
-	cloud.google.com/go/iam v0.8.0 // indirect
-	cloud.google.com/go/longrunning v0.3.0 // indirect
-	cloud.google.com/go/storage v1.27.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/eapache/go-resiliency v1.2.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
-	github.com/eapache/queue v1.1.0 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/go-zookeeper/zk v1.0.3 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/golang/snappy v0.0.3 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
-	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
-	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.0.0 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
-	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/klauspost/cpuid v1.3.1 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/lithammer/shortuuid v3.0.0+incompatible // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/minio/md5-simd v1.1.0 // indirect
-	github.com/minio/sha256-simd v0.1.1 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/pierrec/lz4 v2.6.0+incompatible // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/rs/xid v1.2.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.0.2 // indirect
-	github.com/xdg-go/stringprep v1.0.2 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
-	golang.org/x/time v0.1.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-)
-
 require (
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect

internal/api/auth.go

@@ -3,24 +3,24 @@ package api
 import (
 	"OpenIM/internal/api/a2r"
 	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
 	auth "OpenIM/pkg/proto/auth"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
 	"github.com/gin-gonic/gin"
 )
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewAuth(zk *openKeeper.ZkClient) *Auth {
+func NewAuth(c discoveryregistry.SvcDiscoveryRegistry) *Auth {
-	return &Auth{zk: zk}
+	return &Auth{c: c}
 }
 
 type Auth struct {
-	zk *openKeeper.ZkClient
+	c discoveryregistry.SvcDiscoveryRegistry
 }
 
 func (o *Auth) client() (auth.AuthClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImAuthName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImAuthName)
 	if err != nil {
 		return nil, err
 	}

internal/api/conversation.go

@@ -3,24 +3,24 @@ package api
 import (
 	"OpenIM/internal/api/a2r"
 	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/proto/conversation"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
 	"github.com/gin-gonic/gin"
 )
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewConversation(zk *openKeeper.ZkClient) *Conversation {
+func NewConversation(c discoveryregistry.SvcDiscoveryRegistry) *Conversation {
-	return &Conversation{zk: zk}
+	return &Conversation{c: c}
 }
 
 type Conversation struct {
-	zk *openKeeper.ZkClient
+	c discoveryregistry.SvcDiscoveryRegistry
 }
 
 func (o *Conversation) client() (conversation.ConversationClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImConversationName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImConversationName)
 	if err != nil {
 		return nil, err
 	}

internal/api/friend.go

@@ -3,24 +3,25 @@ package api
 import (
 	"OpenIM/internal/api/a2r"
 	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/proto/friend"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
+
 	"github.com/gin-gonic/gin"
 )
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewFriend(zk *openKeeper.ZkClient) *Friend {
+func NewFriend(c discoveryregistry.SvcDiscoveryRegistry) *Friend {
-	return &Friend{zk: zk}
+	return &Friend{c: c}
 }
 
 type Friend struct {
-	zk *openKeeper.ZkClient
+	c discoveryregistry.SvcDiscoveryRegistry
 }
 
 func (o *Friend) client() (friend.FriendClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImFriendName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImFriendName)
 	if err != nil {
 		return nil, err
 	}

internal/api/group.go

@@ -3,24 +3,25 @@ package api
 import (
 	"OpenIM/internal/api/a2r"
 	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/proto/group"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
+
 	"github.com/gin-gonic/gin"
 )
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewGroup(zk *openKeeper.ZkClient) *Group {
+func NewGroup(c discoveryregistry.SvcDiscoveryRegistry) *Group {
-	return &Group{zk: zk}
+	return &Group{c: c}
 }
 
 type Group struct {
-	zk *openKeeper.ZkClient
+	c discoveryregistry.SvcDiscoveryRegistry
 }
 
 func (o *Group) client() (group.GroupClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImGroupName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
 	if err != nil {
 		return nil, err
 	}

internal/api/msg.go

@@ -7,13 +7,13 @@ import (
 	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/constant"
 	"OpenIM/pkg/common/log"
+	"OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/errs"
 	"OpenIM/pkg/proto/msg"
 	"OpenIM/pkg/proto/sdkws"
 	"OpenIM/pkg/utils"
 	"context"
 	"errors"
-	"github.com/OpenIMSDK/openKeeper"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 	"github.com/golang/protobuf/proto"
@@ -22,12 +22,12 @@ import (
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewMsg(zk *openKeeper.ZkClient) *Msg {
+func NewMsg(c discoveryregistry.SvcDiscoveryRegistry) *Msg {
-	return &Msg{zk: zk, validate: validator.New()}
+	return &Msg{c: c, validate: validator.New()}
 }
 
 type Msg struct {
-	zk       *openKeeper.ZkClient
+	c        discoveryregistry.SvcDiscoveryRegistry
 	validate *validator.Validate
 }
 
@@ -107,7 +107,7 @@ func newUserSendMsgReq(params *apistruct.ManagementSendMsgReq) *msg.SendMsgReq {
 }
 
 func (o *Msg) client() (msg.MsgClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImMsgName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImMsgName)
 	if err != nil {
 		return nil, err
 	}
@@ -214,7 +214,7 @@ func (o *Msg) ManagementSendMsg(c *gin.Context) {
 	}
 	log.NewInfo(params.OperationID, "Ws call success to ManagementSendMsgReq", params)
 	pbData := newUserSendMsgReq(&params)
-	conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImMsgName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImMsgName)
 	if err != nil {
 		apiresp.GinError(c, errs.ErrInternalServer)
 		return

internal/api/route.go

@@ -5,15 +5,13 @@ import (
 	"OpenIM/pkg/common/log"
 	"OpenIM/pkg/common/mw"
 	"OpenIM/pkg/common/prome"
-	"github.com/OpenIMSDK/openKeeper"
+	"OpenIM/pkg/discoveryregistry"
 	"github.com/gin-gonic/gin"
-	"google.golang.org/grpc"
 	"io"
 	"os"
 )
 
-func NewGinRouter() *gin.Engine {
+func NewGinRouter(zk discoveryregistry.SvcDiscoveryRegistry) *gin.Engine {
-	openKeeper.DefaultOptions = []grpc.DialOption{mw.GrpcClient()} // 默认RPC中间件
 	gin.SetMode(gin.ReleaseMode)
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
@@ -28,9 +26,7 @@ func NewGinRouter() *gin.Engine {
 		r.Use(prome.PrometheusMiddleware)
 		r.GET("/metrics", prome.PrometheusHandler())
 	}
-
+	zk.AddOption(mw.GrpcClient()) // 默认RPC中间件
-	var zk *openKeeper.ZkClient
-
 	userRouterGroup := r.Group("/user")
 	{
 		u := NewUser(zk)

internal/api/third.go

@@ -3,24 +3,25 @@ package api
 import (
 	"OpenIM/internal/api/a2r"
 	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/proto/third"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
+
 	"github.com/gin-gonic/gin"
 )
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewThird(zk *openKeeper.ZkClient) *Third {
+func NewThird(c discoveryregistry.SvcDiscoveryRegistry) *Third {
-	return &Third{zk: zk}
+	return &Third{c: c}
 }
 
 type Third struct {
-	zk *openKeeper.ZkClient
+	c discoveryregistry.SvcDiscoveryRegistry
 }
 
 func (o *Third) client() (third.ThirdClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImThirdName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImThirdName)
 	if err != nil {
 		return nil, err
 	}

internal/api/user.go

@@ -3,24 +3,24 @@ package api
 import (
 	"OpenIM/internal/api/a2r"
 	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/discoveryregistry"
 	"OpenIM/pkg/proto/user"
 	"context"
-	"github.com/OpenIMSDK/openKeeper"
 	"github.com/gin-gonic/gin"
 )
 
 var _ context.Context // 解决goland编辑器bug
 
-func NewUser(zk *openKeeper.ZkClient) *User {
+func NewUser(client discoveryregistry.SvcDiscoveryRegistry) *User {
-	return &User{zk: zk}
+	return &User{c: client}
 }
 
 type User struct {
-	zk *openKeeper.ZkClient
+	c discoveryregistry.SvcDiscoveryRegistry
 }
 
 func (o *User) client() (user.UserClient, error) {
-	conn, err := o.zk.GetDefaultConn(config.Config.RpcRegisterName.OpenImUserName)
+	conn, err := o.c.GetConn(config.Config.RpcRegisterName.OpenImUserName)
 	if err != nil {
 		return nil, err
 	}

internal/common/check/friend.go

@@ -2,9 +2,7 @@ package check
 
 import (
 	"OpenIM/pkg/common/config"
-	"OpenIM/pkg/common/constant"
 	discoveryRegistry "OpenIM/pkg/discoveryregistry"
-	"OpenIM/pkg/errs"
 	"OpenIM/pkg/proto/friend"
 	sdkws "OpenIM/pkg/proto/sdkws"
 	"context"
@@ -51,26 +49,15 @@ func (f *FriendChecker) IsFriend(ctx context.Context, possibleFriendUserID, user
 
 }
 
-func (f *FriendChecker) GetAllPageFriends(ctx context.Context, ownerUserID string) (resp []*sdkws.FriendInfo, err error) {
+func (f *FriendChecker) GetFriendIDs(ctx context.Context, ownerUserID string) (friendIDs []string, err error) {
 	cc, err := f.getConn()
 	if err != nil {
 		return nil, err
 	}
-	page := int32(0)
+	req := friend.GetFriendIDsReq{UserID: ownerUserID}
-	req := friend.GetPaginationFriendsReq{UserID: ownerUserID}
+	resp, err := friend.NewFriendClient(cc).GetFriendIDs(ctx, &req)
-	for {
+	if err != nil {
-		req.Pagination = &sdkws.RequestPagination{PageNumber: page, ShowNumber: constant.ShowNumber}
+		return nil, err
-		tmp, err := friend.NewFriendClient(cc).GetPaginationFriends(ctx, &req)
-		if err != nil {
-			return nil, err
-		}
-		if len(tmp.FriendsInfo) == 0 {
-			if tmp.Total == int32(len(resp)) {
-				return resp, nil
-			}
-			return nil, errs.ErrData.Wrap("The total number of results and expectations are different, but result is nil")
-		}
-		resp = append(resp, tmp.FriendsInfo...)
-		page++
 	}
+	return resp.FriendIDs, err
 }

internal/common/check/msg.go

@@ -47,21 +47,3 @@ func (m *MsgCheck) PullMessageBySeqList(ctx context.Context, req *sdkws.PullMess
 	resp, err := msg.NewMsgClient(cc).PullMessageBySeqs(ctx, req)
 	return resp, err
 }
-
-//func (m *MsgCheck) SendMsg(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error) {
-//	cc, err := m.getConn()
-//	if err != nil {
-//		return nil, err
-//	}
-//	resp, err := msg.NewMsgClient(cc).SendMsg(ctx, req)
-//	return resp, err
-//}
-//
-//func (m *MsgCheck) SendMsg(ctx context.Context, req *msg.SendMsgReq) (*msg.SendMsgResp, error) {
-//	cc, err := m.getConn()
-//	if err != nil {
-//		return nil, err
-//	}
-//	resp, err := msg.NewMsgClient(cc).SendMsg(ctx, req)
-//	return resp, err
-//}

internal/msgtransfer/init.go

@@ -9,6 +9,7 @@ import (
 	"OpenIM/pkg/common/db/unrelation"
 	"OpenIM/pkg/common/prome"
 	"fmt"
+	"sync"
 )
 
 type MsgTransfer struct {
@@ -64,6 +65,8 @@ func (m *MsgTransfer) initPrometheus() {
 }
 
 func (m *MsgTransfer) Start(prometheusPort int) error {
+	var wg sync.WaitGroup
+	wg.Add(4)
 	if config.Config.ChatPersistenceMysql {
 		go m.persistentCH.persistentConsumerGroup.RegisterHandleAndConsumer(m.persistentCH)
 	} else {
@@ -76,5 +79,6 @@ func (m *MsgTransfer) Start(prometheusPort int) error {
 	if err != nil {
 		return err
 	}
+	wg.Wait()
 	return nil
 }

internal/msgtransfer/online_history_msg_handler.go

@@ -242,7 +242,7 @@ func (och *OnlineHistoryRedisConsumerHandler) ConsumeClaim(sess sarama.ConsumerG
 
 func (och *OnlineHistoryRedisConsumerHandler) sendMessageToPushMQ(ctx context.Context, message *pbMsg.MsgDataToMQ, pushToUserID string) {
 	mqPushMsg := pbMsg.PushMsgDataToMQ{MsgData: message.MsgData, SourceID: pushToUserID}
-	pid, offset, err := och.producerToPush.SendMessage(ctx, &mqPushMsg, mqPushMsg.SourceID)
+	pid, offset, err := och.producerToPush.SendMessage(ctx, mqPushMsg.SourceID, &mqPushMsg)
 	if err != nil {
 		log.Error(tracelog.GetOperationID(ctx), "kafka send failed", "send data", message.String(), "pid", pid, "offset", offset, "err", err.Error())
 	}
@@ -251,7 +251,7 @@ func (och *OnlineHistoryRedisConsumerHandler) sendMessageToPushMQ(ctx context.Co
 
 func (och *OnlineHistoryRedisConsumerHandler) sendMessageToModifyMQ(ctx context.Context, aggregationID string, triggerID string, messages []*pbMsg.MsgDataToMQ) {
 	if len(messages) > 0 {
-		pid, offset, err := och.producerToModify.SendMessage(ctx, &pbMsg.MsgDataToModifyByMQ{AggregationID: aggregationID, Messages: messages, TriggerID: triggerID}, aggregationID)
+		pid, offset, err := och.producerToModify.SendMessage(ctx, aggregationID, &pbMsg.MsgDataToModifyByMQ{AggregationID: aggregationID, Messages: messages, TriggerID: triggerID})
 		if err != nil {
 			log.Error(triggerID, "kafka send failed", "send data", len(messages), "pid", pid, "offset", offset, "err", err.Error(), "key", aggregationID)
 		}
@@ -260,7 +260,7 @@ func (och *OnlineHistoryRedisConsumerHandler) sendMessageToModifyMQ(ctx context.
 
 func (och *OnlineHistoryRedisConsumerHandler) SendMessageToMongoCH(ctx context.Context, aggregationID string, triggerID string, messages []*pbMsg.MsgDataToMQ, lastSeq int64) {
 	if len(messages) > 0 {
-		pid, offset, err := och.producerToMongo.SendMessage(ctx, &pbMsg.MsgDataToMongoByMQ{LastSeq: lastSeq, AggregationID: aggregationID, Messages: messages, TriggerID: triggerID}, aggregationID)
+		pid, offset, err := och.producerToMongo.SendMessage(ctx, aggregationID, &pbMsg.MsgDataToMongoByMQ{LastSeq: lastSeq, AggregationID: aggregationID, Messages: messages, TriggerID: triggerID})
 		if err != nil {
 			log.Error(triggerID, "kafka send failed", "send data", len(messages), "pid", pid, "offset", offset, "err", err.Error(), "key", aggregationID)
 		}

internal/msgtransfer/online_msg_to_mongo_handler.go

@@ -24,7 +24,7 @@ func NewOnlineHistoryMongoConsumerHandler(database controller.MsgDatabase) *Onli
 	mc := &OnlineHistoryMongoConsumerHandler{
 		historyConsumerGroup: kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0,
 			OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false}, []string{config.Config.Kafka.MsgToMongo.Topic},
-			config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.ConsumerGroupID.MsgToMongo),
+			config.Config.Kafka.MsgToMongo.Addr, config.Config.Kafka.ConsumerGroupID.MsgToMongo),
 		msgDatabase: database,
 	}
 	return mc

internal/rpc/user/user.go

@@ -83,13 +83,13 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserI
 	if err != nil {
 		return nil, err
 	}
-	friends, err := s.friendCheck.GetAllPageFriends(ctx, req.UserInfo.UserID)
+	friends, err := s.friendCheck.GetFriendIDs(ctx, req.UserInfo.UserID)
 	if err != nil {
 		return nil, err
 	}
 	go func() {
 		for _, v := range friends {
-			s.notification.FriendInfoUpdatedNotification(ctx, req.UserInfo.UserID, v.FriendUser.UserID, tracelog.GetOpUserID(ctx))
+			s.notification.FriendInfoUpdatedNotification(ctx, req.UserInfo.UserID, v, tracelog.GetOpUserID(ctx))
 		}
 	}()
 	s.notification.UserInfoUpdatedNotification(ctx, tracelog.GetOpUserID(ctx), req.UserInfo.UserID)

internal/startrpc/start.go

@@ -20,7 +20,7 @@ func start(rpcPort int, rpcRegisterName string, prometheusPorts int, rpcFn func(
 	flagRpcPort := flag.Int("port", rpcPort, "get RpcGroupPort from cmd,default 16000 as port")
 	flagPrometheusPort := flag.Int("prometheus_port", prometheusPorts, "groupPrometheusPort default listen port")
 	flag.Parse()
-	fmt.Println("start group rpc server, port: ", *flagRpcPort, ", OpenIM version: ", constant.CurrentVersion)
+	fmt.Println("start group rpc server, port: ", *flagRpcPort, ", OpenIM version: ", config.Version)
 	log.NewPrivateLog(constant.LogFileName)
 	listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", config.Config.ListenIP, *flagRpcPort))
 	if err != nil {

internal/tools/msg.go

@@ -11,6 +11,7 @@ import (
 	"OpenIM/pkg/common/tracelog"
 	"OpenIM/pkg/utils"
 	"context"
+	"errors"
 	"fmt"
 	"github.com/go-redis/redis/v8"
 	"math"
@@ -22,6 +23,8 @@ type MsgTool struct {
 	groupDatabase controller.GroupDatabase
 }
 
+var errSeq = errors.New("cache max seq and mongo max seq is diff > 10")
+
 func NewMsgTool(msgDatabase controller.MsgDatabase, userDatabase controller.UserDatabase, groupDatabase controller.GroupDatabase) *MsgTool {
 	return &MsgTool{
 		msgDatabase:   msgDatabase,
@@ -125,7 +128,9 @@ func (c *MsgTool) fixGroupSeq(ctx context.Context, groupID string, userIDs []str
 			continue
 		}
 	}
-	c.CheckMaxSeqWithMongo(ctx, groupID, maxSeqCache, maxSeqMongo, constant.WriteDiffusion)
+	if err := c.CheckMaxSeqWithMongo(ctx, groupID, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		log.NewWarn(tracelog.GetOperationID(ctx), "cache max seq and mongo max seq is diff > 10", groupID, maxSeqCache, maxSeqMongo, constant.WriteDiffusion)
+	}
 	return nil
 }
 
@@ -162,10 +167,11 @@ func (c *MsgTool) GetAndFixGroupUserSeq(ctx context.Context, userID string, grou
 	return minSeqCache, nil
 }
 
-func (c *MsgTool) CheckMaxSeqWithMongo(ctx context.Context, sourceID string, maxSeqCache, maxSeqMongo int64, diffusionType int) {
+func (c *MsgTool) CheckMaxSeqWithMongo(ctx context.Context, sourceID string, maxSeqCache, maxSeqMongo int64, diffusionType int) error {
 	if math.Abs(float64(maxSeqMongo-maxSeqCache)) > 10 {
-		log.NewWarn(tracelog.GetOperationID(ctx), "cache max seq and mongo max seq is diff > 10", sourceID, maxSeqCache, maxSeqMongo, diffusionType)
+		return errSeq
 	}
+	return nil
 }
 
 func (c *MsgTool) ShowUserSeqs(ctx context.Context, userID string) {
@@ -180,10 +186,10 @@ func (c *MsgTool) ShowSuperGroupUserSeqs(ctx context.Context, groupID, userID st
 
 }
 
-func (c *MsgTool) FixAllSeq(ctx context.Context) {
+func (c *MsgTool) FixAllSeq(ctx context.Context) error {
 	userIDs, err := c.userDatabase.GetAllUserID(ctx)
 	if err != nil {
-		panic(err.Error())
+		return err
 	}
 	for _, userID := range userIDs {
 		userCurrentMinSeq, err := c.msgDatabase.GetUserMinSeq(ctx, userID)
@@ -204,7 +210,7 @@ func (c *MsgTool) FixAllSeq(ctx context.Context) {
 	fmt.Println("fix users seq success")
 	groupIDs, err := c.groupDatabase.GetGroupIDsByGroupType(ctx, constant.WorkingGroup)
 	if err != nil {
-		panic(err.Error())
+		return err
 	}
 	for _, groupID := range groupIDs {
 		maxSeq, err := c.msgDatabase.GetGroupMaxSeq(ctx, groupID)
@@ -232,4 +238,5 @@ func (c *MsgTool) FixAllSeq(ctx context.Context) {
 		}
 	}
 	fmt.Println("fix all seq finished")
+	return nil
 }

internal/tools/msg_test.go

@@ -2,22 +2,24 @@ package tools
 
 import (
 	"OpenIM/pkg/common/constant"
+	"OpenIM/pkg/common/db/cache"
+	"OpenIM/pkg/common/tracelog"
 	"OpenIM/pkg/proto/sdkws"
+	"OpenIM/pkg/utils"
 	"context"
-	"fmt"
+	"github.com/golang/protobuf/proto"
+	"go.mongodb.org/mongo-driver/bson"
 	"strconv"
 
-	"github.com/go-redis/redis/v8"
+	unRelationTb "OpenIM/pkg/common/db/table/unrelation"
-	"github.com/golang/protobuf/proto"
+	"OpenIM/pkg/common/db/unrelation"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 
 	"testing"
 	"time"
 )
 
-func GenUserChat(startSeq, stopSeq, delSeq, index int64, userID string) *mongo2.UserChat {
+func GenMsgDoc(startSeq, stopSeq, delSeq, index int64, userID string) *unRelationTb.MsgDocModel {
-	chat := &mongo2.UserChat{UID: userID + strconv.Itoa(int(index))}
+	msgDoc := &unRelationTb.MsgDocModel{DocID: userID + strconv.Itoa(int(index))}
 	for i := startSeq; i <= stopSeq; i++ {
 		msg := sdkws.MsgData{
 			SendID:           "sendID1",
@@ -31,57 +33,281 @@ func GenUserChat(startSeq, stopSeq, delSeq, index int64, userID string) *mongo2.
 			SessionType:      1,
 			MsgFrom:          100,
 			ContentType:      101,
-			Content:          []byte("testFaceURL.com"),
+			Content:          []byte("testFaceURL"),
 			Seq:              i,
 			SendTime:         time.Now().Unix(),
 			CreateTime:       time.Now().Unix(),
 			Status:           1,
 		}
 		bytes, _ := proto.Marshal(&msg)
-		sendTime := 0
+		var sendTime int64
-		chat.Msg = append(chat.Msg, mongo2.MsgInfo{SendTime: int64(sendTime), Msg: bytes})
+		if i <= delSeq {
+			sendTime = 10000
+		} else {
+			sendTime = utils.GetCurrentTimestampByMill()
+		}
+		msgDoc.Msg = append(msgDoc.Msg, unRelationTb.MsgInfoModel{SendTime: int64(sendTime), Msg: bytes})
 	}
-	return chat
+	return msgDoc
 }
 
-func SetUserMaxSeq(userID string, seq int) error {
+func TestDeleteMongoMsgAndResetRedisSeq(t *testing.T) {
-	return redisClient.Set(context.Background(), "REDIS_USER_INCR_SEQ"+userID, seq, 0).Err()
+	operationID := "test"
-}
 
-func CreateChat(userChat *mongo2.UserChat) error {
+	rdb, err := cache.NewRedis()
-	_, err := mongoClient.InsertOne(context.Background(), userChat)
-	return err
-}
-
-func TestDeleteUserMsgsAndSetMinSeq(t *testing.T) {
-	operationID := getCronTaskOperationID()
-	redisClient = redis.NewClient(&redis.Options{
-		Addr:     "127.0.0.1:16379",
-		Password: "openIM123", // no password set
-		DB:       13,          // use default DB
-	})
-	mongoUri := fmt.Sprintf("mongodb://%s:%s@%s/%s?maxPoolSize=%d&authSource=admin",
-		"root", "openIM123", "127.0.0.1:37017",
-		"openIM", 100)
-	client, err := mongo.Connect(context.TODO(), options.Client().ApplyURI(mongoUri))
-	mongoClient = client.Database("openIM").Collection("msg")
-	testUID1 := "test_del_id1"
-	//testUID2 := "test_del_id2"
-	//testUID3 := "test_del_id3"
-	//testUID4 := "test_del_id4"
-	//testUID5 := "test_del_id5"
-	//testUID6 := "test_del_id6"
-	err = SetUserMaxSeq(testUID1, 600)
-	userChat := GenUserChat(1, 500, 200, 0, testUID1)
-	err = CreateChat(userChat)
-
-	if err := DeleteUserMsgsAndSetMinSeq(operationID, testUID1); err != nil {
-		t.Error("checkMaxSeqWithMongo failed", testUID1)
-	}
-	if err := checkMaxSeqWithMongo(operationID, testUID1, constant.WriteDiffusion); err != nil {
-		t.Error("checkMaxSeqWithMongo failed", testUID1)
-	}
 	if err != nil {
-		t.Error("err is not nil", testUID1, err.Error())
+		return
+	}
+	mgo, err := unrelation.NewMongo()
+	if err != nil {
+		return
+	}
+	cacheModel := cache.NewCacheModel(rdb)
+	mongoClient := mgo.GetDatabase().Collection(unRelationTb.MsgDocModel{}.TableName())
+
+	ctx := context.Background()
+	tracelog.SetOperationID(ctx, operationID)
+	testUID1 := "test_del_id1"
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID1 + ":" + strconv.Itoa(0)})
+	if err != nil {
+		t.Error("DeleteOne failed")
+		return
+	}
+	err = cacheModel.SetUserMaxSeq(ctx, testUID1, 600)
+	if err != nil {
+		t.Error("SetUserMaxSeq failed")
+	}
+	msgDoc := GenMsgDoc(1, 600, 200, 0, testUID1)
+	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
+		t.Error("InsertOne failed", testUID1)
+	}
+
+	msgTools, err := InitMsgTool()
+	if err != nil {
+		t.Error("init failed")
+		return
+	}
+	msgTools.ClearUsersMsg(ctx, []string{testUID1})
+	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err := msgTools.msgDatabase.GetUserMinMaxSeqInMongoAndCache(ctx, testUID1)
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	if err := msgTools.CheckMaxSeqWithMongo(ctx, testUID1, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		t.Error("checkMaxSeqWithMongo failed", testUID1)
+	}
+	if minSeqMongo != minSeqCache {
+		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
+	}
+	if minSeqCache != 201 {
+		t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201)
+	}
+
+	/////// uid2
+
+	testUID2 := "test_del_id2"
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID2 + ":" + strconv.Itoa(0)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID2 + ":" + strconv.Itoa(1)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+
+	err = cacheModel.SetUserMaxSeq(ctx, testUID2, 7000)
+	if err != nil {
+		t.Error("SetUserMaxSeq failed")
+	}
+	msgDoc = GenMsgDoc(1, 4999, 5000, 0, testUID2)
+	msgDoc2 := GenMsgDoc(5000, 7000, 6000, 1, testUID2)
+	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
+		t.Error("InsertOne failed", testUID1)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
+		t.Error("InsertOne failed", testUID1)
+	}
+
+	msgTools.ClearUsersMsg(ctx, []string{testUID2})
+	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetUserMinMaxSeqInMongoAndCache(ctx, testUID2)
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	if err := msgTools.CheckMaxSeqWithMongo(ctx, testUID2, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		t.Error("checkMaxSeqWithMongo failed", testUID2)
+	}
+	if minSeqMongo != minSeqCache {
+		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
+	}
+	if minSeqCache != 6001 {
+		t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201)
+	}
+
+	/////// uid3
+	testUID3 := "test_del_id3"
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID3 + ":" + strconv.Itoa(0)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	err = cacheModel.SetUserMaxSeq(ctx, testUID3, 4999)
+	if err != nil {
+		t.Error("SetUserMaxSeq failed")
+	}
+	msgDoc = GenMsgDoc(1, 4999, 5000, 0, testUID3)
+	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
+		t.Error("InsertOne failed", testUID3)
+	}
+
+	msgTools.ClearUsersMsg(ctx, []string{testUID3})
+	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetUserMinMaxSeqInMongoAndCache(ctx, testUID3)
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	if err := msgTools.CheckMaxSeqWithMongo(ctx, testUID3, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		t.Error("checkMaxSeqWithMongo failed", testUID3)
+	}
+	if minSeqMongo != minSeqCache {
+		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
+	}
+	if minSeqCache != 5000 {
+		t.Error("test1 is not the same", "minSeq:", minSeqCache, "targetSeq", 201)
+	}
+
+	//// uid4
+	testUID4 := "test_del_id4"
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID4 + ":" + strconv.Itoa(0)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID4 + ":" + strconv.Itoa(1)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID4 + ":" + strconv.Itoa(2)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+
+	err = cacheModel.SetUserMaxSeq(ctx, testUID4, 12000)
+	msgDoc = GenMsgDoc(1, 4999, 5000, 0, testUID4)
+	msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, testUID4)
+	msgDoc3 := GenMsgDoc(10000, 12000, 11000, 2, testUID4)
+	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc3); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+
+	msgTools.ClearUsersMsg(ctx, []string{testUID4})
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetUserMinMaxSeqInMongoAndCache(ctx, testUID4)
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	if err := msgTools.CheckMaxSeqWithMongo(ctx, testUID4, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		t.Error("checkMaxSeqWithMongo failed", testUID4)
+	}
+	if minSeqMongo != minSeqCache {
+		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
+	}
+	if minSeqCache != 5000 {
+		t.Error("test1 is not the same", "minSeq:", minSeqCache)
+	}
+
+	testUID5 := "test_del_id5"
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID5 + ":" + strconv.Itoa(0)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID5 + ":" + strconv.Itoa(1)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	err = cacheModel.SetUserMaxSeq(ctx, testUID5, 9999)
+	msgDoc = GenMsgDoc(1, 4999, 5000, 0, testUID5)
+	msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, testUID5)
+	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
+		t.Error("InsertOne failed", testUID5)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
+		t.Error("InsertOne failed", testUID5)
+	}
+
+	msgTools.ClearUsersMsg(ctx, []string{testUID5})
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetUserMinMaxSeqInMongoAndCache(ctx, testUID5)
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	if err := msgTools.CheckMaxSeqWithMongo(ctx, testUID5, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		t.Error("checkMaxSeqWithMongo failed", testUID5)
+	}
+	if minSeqMongo != minSeqCache {
+		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
+	}
+	if minSeqCache != 10000 {
+		t.Error("test1 is not the same", "minSeq:", minSeqCache)
+	}
+
+	testUID6 := "test_del_id6"
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID6 + ":" + strconv.Itoa(0)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID6 + ":" + strconv.Itoa(1)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID6 + ":" + strconv.Itoa(2)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	_, err = mongoClient.DeleteOne(ctx, bson.M{"uid": testUID6 + ":" + strconv.Itoa(3)})
+	if err != nil {
+		t.Error("delete failed")
+	}
+	msgDoc = GenMsgDoc(1, 4999, 5000, 0, testUID6)
+	msgDoc2 = GenMsgDoc(5000, 9999, 10000, 1, testUID6)
+	msgDoc3 = GenMsgDoc(10000, 14999, 13000, 2, testUID6)
+	msgDoc4 := GenMsgDoc(15000, 19999, 0, 3, testUID6)
+	if _, err := mongoClient.InsertOne(ctx, msgDoc); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc2); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc3); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+	if _, err := mongoClient.InsertOne(ctx, msgDoc4); err != nil {
+		t.Error("InsertOne failed", testUID4)
+	}
+	minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache, err = msgTools.msgDatabase.GetUserMinMaxSeqInMongoAndCache(ctx, testUID6)
+	if err != nil {
+		t.Error("GetSuperGroupMinMaxSeqInMongoAndCache failed")
+		return
+	}
+	if err := msgTools.CheckMaxSeqWithMongo(ctx, testUID6, maxSeqCache, maxSeqMongo, constant.WriteDiffusion); err != nil {
+		t.Error("checkMaxSeqWithMongo failed", testUID6)
+	}
+	if minSeqMongo != minSeqCache {
+		t.Error("minSeqMongo != minSeqCache", minSeqMongo, minSeqCache)
+	}
+	if minSeqCache != 13001 {
+		t.Error("test1 is not the same", "minSeq:", minSeqCache)
 	}
 }

pkg/apistruct/auth.go

@@ -13,7 +13,6 @@ type UserTokenInfo struct {
 	ExpiredTime int64  `json:"expiredTime"`
 }
 type UserRegisterResp struct {
-	CommResp
 	UserToken UserTokenInfo `json:"data"`
 }
 
@@ -25,7 +24,6 @@ type UserTokenReq struct {
 }
 
 type UserTokenResp struct {
-	CommResp
 	UserToken UserTokenInfo `json:"data"`
 }
 
@@ -36,7 +34,6 @@ type ForceLogoutReq struct {
 }
 
 type ForceLogoutResp struct {
-	CommResp
 }
 
 type ParseTokenReq struct {
@@ -44,7 +41,7 @@ type ParseTokenReq struct {
 }
 
 //type ParseTokenResp struct {
-//	CommResp
+//
 //	ExpireTime int64 `json:"expireTime" binding:"required"`
 //}
 
@@ -53,7 +50,6 @@ type ExpireTime struct {
 }
 
 type ParseTokenResp struct {
-	CommResp
 	Data       map[string]interface{} `json:"data" swaggerignore:"true"`
 	ExpireTime ExpireTime             `json:"-"`
 }

pkg/apistruct/aws.go

@@ -14,7 +14,6 @@ type AwsStorageCredentialRespData struct {
 }
 
 type AwsStorageCredentialResp struct {
-	CommResp
 	CosData AwsStorageCredentialRespData
 	Data    map[string]interface{} `json:"data"`
 }

pkg/apistruct/common.go

@@ -1,6 +0,0 @@
-package apistruct
-
-type RequestPagination struct {
-	PageNumber int `json:"pageNumber"  binding:"required"`
-	ShowNumber int `json:"showNumber"  binding:"required"`
-}

pkg/apistruct/conversation.go

@@ -9,7 +9,6 @@ type GetAllConversationMessageOptReq struct {
 	FromUserID  string `json:"fromUserID" binding:"required"`
 }
 type GetAllConversationMessageOptResp struct {
-	CommResp
 	ConversationOptResultList []*OptResult `json:"data"`
 }
 type GetReceiveMessageOptReq struct {
@@ -18,7 +17,6 @@ type GetReceiveMessageOptReq struct {
 	FromUserID         string   `json:"fromUserID" binding:"required"`
 }
 type GetReceiveMessageOptResp struct {
-	CommResp
 	ConversationOptResultList []*OptResult `json:"data"`
 }
 type SetReceiveMessageOptReq struct {
@@ -28,7 +26,6 @@ type SetReceiveMessageOptReq struct {
 	ConversationIDList []string `json:"conversationIDList" binding:"required"`
 }
 type SetReceiveMessageOptResp struct {
-	CommResp
 	ConversationOptResultList []*OptResult `json:"data"`
 }
 
@@ -58,7 +55,6 @@ type SetConversationReq struct {
 }
 
 type SetConversationResp struct {
-	CommResp
 }
 type ModifyConversationFieldReq struct {
 	Conversation
@@ -67,7 +63,6 @@ type ModifyConversationFieldReq struct {
 	OperationID string   `json:"operationID" binding:"required"`
 }
 type ModifyConversationFieldResp struct {
-	CommResp
 }
 
 type BatchSetConversationsReq struct {
@@ -78,7 +73,6 @@ type BatchSetConversationsReq struct {
 }
 
 type BatchSetConversationsResp struct {
-	CommResp
 	Data struct {
 		Success []string `json:"success"`
 		Failed  []string `json:"failed"`
@@ -92,7 +86,6 @@ type GetConversationReq struct {
 }
 
 type GetConversationResp struct {
-	CommResp
 	Conversation Conversation `json:"data"`
 }
 
@@ -102,7 +95,6 @@ type GetAllConversationsReq struct {
 }
 
 type GetAllConversationsResp struct {
-	CommResp
 	Conversations []Conversation `json:"data"`
 }
 
@@ -113,7 +105,6 @@ type GetConversationsReq struct {
 }
 
 type GetConversationsResp struct {
-	CommResp
 	Conversations []Conversation `json:"data"`
 }
 
@@ -126,5 +117,4 @@ type SetRecvMsgOptReq struct {
 }
 
 type SetRecvMsgOptResp struct {
-	CommResp
 }

pkg/apistruct/cos.go

@@ -13,7 +13,6 @@ type TencentCloudStorageCredentialRespData struct {
 }
 
 type TencentCloudStorageCredentialResp struct {
-	CommResp
 	CosData TencentCloudStorageCredentialRespData `json:"-"`
 
 	Data map[string]interface{} `json:"data"`

pkg/apistruct/friend.go

@@ -10,7 +10,7 @@ package apistruct
 //	ParamsCommFriend
 //}
 //type AddBlacklistResp struct {
-//	CommResp
+//
 //}
 //
 //type ImportFriendReq struct {
@@ -23,7 +23,7 @@ package apistruct
 //	Result int32  `json:"result"`
 //}
 //type ImportFriendResp struct {
-//	CommResp
+//
 //	UserIDResultList []UserIDResult `json:"data"`
 //}
 //
@@ -32,7 +32,7 @@ package apistruct
 //	ReqMsg string `json:"reqMsg"`
 //}
 //type AddFriendResp struct {
-//	CommResp
+//
 //}
 //
 //type AddFriendResponseReq struct {
@@ -41,14 +41,14 @@ package apistruct
 //	HandleMsg string `json:"handleMsg"`
 //}
 //type AddFriendResponseResp struct {
-//	CommResp
+//
 //}
 //
 //type DeleteFriendReq struct {
 //	ParamsCommFriend
 //}
 //type DeleteFriendResp struct {
-//	CommResp
+//
 //}
 //
 //type GetBlackListReq struct {
@@ -56,7 +56,7 @@ package apistruct
 //	FromUserID  string `json:"fromUserID" binding:"required"`
 //}
 //type GetBlackListResp struct {
-//	CommResp
+//
 //	BlackUserInfoList []*sdkws.PublicUserInfo `json:"-"`
 //	Map              []map[string]interface{}      `json:"data" swaggerignore:"true"`
 //}
@@ -73,14 +73,14 @@ package apistruct
 //	Remark string `json:"remark"`
 //}
 //type SetFriendRemarkResp struct {
-//	CommResp
+//
 //}
 //
 //type RemoveBlacklistReq struct {
 //	ParamsCommFriend
 //}
 //type RemoveBlacklistResp struct {
-//	CommResp
+//
 //}
 //
 //type IsFriendReq struct {
@@ -90,7 +90,7 @@ package apistruct
 //	Friend bool `json:"isFriend"`
 //}
 //type IsFriendResp struct {
-//	CommResp
+//
 //	Response Response `json:"data"`
 //}
 //
@@ -98,7 +98,7 @@ package apistruct
 //	ParamsCommFriend
 //}
 //type GetFriendsInfoResp struct {
-//	CommResp
+//
 //	FriendInfoList []*sdkws.FriendInfo `json:"-"`
 //	Map           []map[string]interface{}  `json:"data" swaggerignore:"true"`
 //}
@@ -108,7 +108,7 @@ package apistruct
 //	FromUserID  string `json:"fromUserID" binding:"required"`
 //}
 //type GetFriendListResp struct {
-//	CommResp
+//
 //	FriendInfoList []*sdkws.FriendInfo `json:"-"`
 //	Map           []map[string]interface{}  `json:"data" swaggerignore:"true"`
 //}
@@ -118,7 +118,7 @@ package apistruct
 //	FromUserID  string `json:"fromUserID" binding:"required"`
 //}
 //type GetFriendApplyListResp struct {
-//	CommResp
+//
 //	FriendRequestList []*sdkws.FriendRequest `json:"-"`
 //	Map              []map[string]interface{}     `json:"data" swaggerignore:"true"`
 //}
@@ -128,7 +128,7 @@ package apistruct
 //	FromUserID  string `json:"fromUserID" binding:"required"`
 //}
 //type GetSelfApplyListResp struct {
-//	CommResp
+//
 //	FriendRequestList []*sdkws.FriendRequest `json:"-"`
 //	Map              []map[string]interface{}     `json:"data" swaggerignore:"true"`
 //}
@@ -180,7 +180,7 @@ type ImportFriendReq struct {
 }
 
 type ImportFriendResp struct {
-	//CommResp
+	//
 }
 
 type AddFriendReq struct {
@@ -189,7 +189,7 @@ type AddFriendReq struct {
 	ReqMsg     string `json:"reqMsg"`
 }
 type AddFriendResp struct {
-	//CommResp
+	//
 }
 
 type AddFriendResponseReq struct {

pkg/apistruct/group.go

@@ -4,16 +4,6 @@ import (
 	sdkws "OpenIM/pkg/proto/sdkws"
 )
 
-type CommResp struct {
-	ErrCode int32  `json:"errCode"`
-	ErrMsg  string `json:"errMsg"`
-}
-
-type CommDataResp struct {
-	CommResp
-	Data []map[string]interface{} `json:"data"`
-}
-
 type KickGroupMemberReq struct {
 	GroupID          string   `json:"groupID" binding:"required"`
 	KickedUserIDList []string `json:"kickedUserIDList" binding:"required"`
@@ -21,7 +11,7 @@ type KickGroupMemberReq struct {
 	OperationID      string   `json:"operationID" binding:"required"`
 }
 type KickGroupMemberResp struct {
-	CommResp
+
 	//UserIDResultList []*UserIDResult `json:"data"`
 }
 
@@ -31,7 +21,6 @@ type GetGroupMembersInfoReq struct {
 	OperationID string   `json:"operationID" binding:"required"`
 }
 type GetGroupMembersInfoResp struct {
-	CommResp
 	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
 	Data       []map[string]interface{}     `json:"data" swaggerignore:"true"`
 }
@@ -43,7 +32,7 @@ type InviteUserToGroupReq struct {
 	OperationID       string   `json:"operationID" binding:"required"`
 }
 type InviteUserToGroupResp struct {
-	CommResp
+
 	//UserIDResultList []*UserIDResult `json:"data"`
 }
 
@@ -52,7 +41,6 @@ type GetJoinedGroupListReq struct {
 	FromUserID  string `json:"fromUserID" binding:"required"`
 }
 type GetJoinedGroupListResp struct {
-	CommResp
 	GroupInfoList []*sdkws.GroupInfo       `json:"-"`
 	Data          []map[string]interface{} `json:"data" swaggerignore:"true"`
 }
@@ -64,7 +52,6 @@ type GetGroupMemberListReq struct {
 	OperationID string `json:"operationID"`
 }
 type GetGroupMemberListResp struct {
-	CommResp
 	NextSeq    int32                        `json:"nextSeq"`
 	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
 	Data       []map[string]interface{}     `json:"data" swaggerignore:"true"`
@@ -77,7 +64,6 @@ type GetGroupAllMemberReq struct {
 	Count       int32  `json:"count"`
 }
 type GetGroupAllMemberResp struct {
-	CommResp
 	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
 	Data       []map[string]interface{}     `json:"data" swaggerignore:"true"`
 }
@@ -90,7 +76,7 @@ type GetGroupAllMemberResp struct {
 //	Count       int32  `json:"count" binding:"required"`
 //}
 //type GetGroupAllMemberListBySplitResp struct {
-//	CommResp
+//
 //	MemberList []*sdkws.GroupMemberFullInfo `json:"-"`
 //	Map       []map[string]interface{}           `json:"data" swaggerignore:"true"`
 //}
@@ -108,7 +94,6 @@ type CreateGroupReq struct {
 	GroupID      string                `json:"groupID"`
 }
 type CreateGroupResp struct {
-	CommResp
 	GroupInfo sdkws.GroupInfo        `json:"-"`
 	Data      map[string]interface{} `json:"data" swaggerignore:"true"`
 }
@@ -118,7 +103,6 @@ type GetGroupApplicationListReq struct {
 	FromUserID  string `json:"fromUserID" binding:"required"` //作为管理员或群主收到的 进群申请
 }
 type GetGroupApplicationListResp struct {
-	CommResp
 	GroupRequestList []*sdkws.GroupRequest    `json:"-"`
 	Data             []map[string]interface{} `json:"data" swaggerignore:"true"`
 }
@@ -137,7 +121,6 @@ type GetGroupInfoReq struct {
 	OperationID string   `json:"operationID" binding:"required"`
 }
 type GetGroupInfoResp struct {
-	CommResp
 	GroupInfoList []*sdkws.GroupInfo       `json:"-"`
 	Data          []map[string]interface{} `json:"data" swaggerignore:"true"`
 }
@@ -171,7 +154,6 @@ type ApplicationGroupResponseReq struct {
 	HandleResult int32  `json:"handleResult" binding:"required,oneof=-1 1"`
 }
 type ApplicationGroupResponseResp struct {
-	CommResp
 }
 
 type JoinGroupReq struct {
@@ -183,7 +165,6 @@ type JoinGroupReq struct {
 }
 
 type JoinGroupResp struct {
-	CommResp
 }
 
 type QuitGroupReq struct {
@@ -191,7 +172,6 @@ type QuitGroupReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 }
 type QuitGroupResp struct {
-	CommResp
 }
 
 type SetGroupInfoReq struct {
@@ -208,7 +188,6 @@ type SetGroupInfoReq struct {
 }
 
 type SetGroupInfoResp struct {
-	CommResp
 }
 
 type TransferGroupOwnerReq struct {
@@ -218,7 +197,6 @@ type TransferGroupOwnerReq struct {
 	OperationID    string `json:"operationID" binding:"required"`
 }
 type TransferGroupOwnerResp struct {
-	CommResp
 }
 
 type DismissGroupReq struct {
@@ -226,7 +204,6 @@ type DismissGroupReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 }
 type DismissGroupResp struct {
-	CommResp
 }
 
 type MuteGroupMemberReq struct {
@@ -236,7 +213,6 @@ type MuteGroupMemberReq struct {
 	MutedSeconds uint32 `json:"mutedSeconds" binding:"required"`
 }
 type MuteGroupMemberResp struct {
-	CommResp
 }
 
 type CancelMuteGroupMemberReq struct {
@@ -245,7 +221,6 @@ type CancelMuteGroupMemberReq struct {
 	UserID      string `json:"userID" binding:"required"`
 }
 type CancelMuteGroupMemberResp struct {
-	CommResp
 }
 
 type MuteGroupReq struct {
@@ -253,7 +228,6 @@ type MuteGroupReq struct {
 	GroupID     string `json:"groupID" binding:"required"`
 }
 type MuteGroupResp struct {
-	CommResp
 }
 
 type CancelMuteGroupReq struct {
@@ -261,7 +235,6 @@ type CancelMuteGroupReq struct {
 	GroupID     string `json:"groupID" binding:"required"`
 }
 type CancelMuteGroupResp struct {
-	CommResp
 }
 
 type SetGroupMemberNicknameReq struct {
@@ -272,7 +245,6 @@ type SetGroupMemberNicknameReq struct {
 }
 
 type SetGroupMemberNicknameResp struct {
-	CommResp
 }
 
 type SetGroupMemberInfoReq struct {
@@ -286,7 +258,6 @@ type SetGroupMemberInfoReq struct {
 }
 
 type SetGroupMemberInfoResp struct {
-	CommResp
 }
 
 type GetGroupAbstractInfoReq struct {
@@ -295,7 +266,6 @@ type GetGroupAbstractInfoReq struct {
 }
 
 type GetGroupAbstractInfoResp struct {
-	CommResp
 	GroupMemberNumber   int32  `json:"groupMemberNumber"`
 	GroupMemberListHash uint64 `json:"groupMemberListHash"`
 }

pkg/apistruct/manage.go

@@ -9,14 +9,12 @@ type DeleteUsersReq struct {
 	DeleteUserIDList []string `json:"deleteUserIDList" binding:"required"`
 }
 type DeleteUsersResp struct {
-	CommResp
 	FailedUserIDList []string `json:"data"`
 }
 type GetAllUsersUidReq struct {
 	OperationID string `json:"operationID" binding:"required"`
 }
 type GetAllUsersUidResp struct {
-	CommResp
 	UserIDList []string `json:"data"`
 }
 type GetUsersOnlineStatusReq struct {
@@ -24,7 +22,7 @@ type GetUsersOnlineStatusReq struct {
 	UserIDList  []string `json:"userIDList" binding:"required,lte=200"`
 }
 type GetUsersOnlineStatusResp struct {
-	CommResp
+
 	//SuccessResult []*msggateway.GetUsersOnlineStatusResp_SuccessResult `json:"data"`
 }
 type AccountCheckReq struct {
@@ -32,7 +30,7 @@ type AccountCheckReq struct {
 	CheckUserIDList []string `json:"checkUserIDList" binding:"required,lte=100"`
 }
 type AccountCheckResp struct {
-	CommResp
+
 	//ResultList []*pbUser.AccountCheckResp_SingleUserStatus `json:"data"`
 }
 
@@ -69,7 +67,6 @@ type ManagementBatchSendMsgReq struct {
 }
 
 type ManagementBatchSendMsgResp struct {
-	CommResp
 	Data struct {
 		ResultList   []*SingleReturnResult `json:"resultList"`
 		FailedIDList []string
@@ -87,7 +84,6 @@ type CheckMsgIsSendSuccessReq struct {
 }
 
 type CheckMsgIsSendSuccessResp struct {
-	CommResp
 	Status int32 `json:"status"`
 }
 
@@ -119,7 +115,6 @@ type CMSUser struct {
 }
 
 type GetUsersResp struct {
-	CommResp
 	Data struct {
 		UserList    []*CMSUser `json:"userList"`
 		TotalNum    int32      `json:"totalNum"`

pkg/apistruct/msg.go

@@ -12,7 +12,6 @@ type DelMsgReq struct {
 }
 
 type DelMsgResp struct {
-	CommResp
 }
 
 type CleanUpMsgReq struct {
@@ -21,7 +20,6 @@ type CleanUpMsgReq struct {
 }
 
 type CleanUpMsgResp struct {
-	CommResp
 }
 
 type DelSuperGroupMsgReq struct {
@@ -33,7 +31,6 @@ type DelSuperGroupMsgReq struct {
 }
 
 type DelSuperGroupMsgResp struct {
-	CommResp
 }
 
 type MsgDeleteNotificationElem struct {
@@ -50,7 +47,6 @@ type SetMsgMinSeqReq struct {
 }
 
 type SetMsgMinSeqResp struct {
-	CommResp
 }
 
 type ModifyMessageReactionExtensionsReq struct {
@@ -67,7 +63,6 @@ type ModifyMessageReactionExtensionsReq struct {
 }
 
 type ModifyMessageReactionExtensionsResp struct {
-	CommResp
 	Data struct {
 		ResultKeyValue     []*msg.KeyValueResp `json:"result"`
 		MsgFirstModifyTime int64               `json:"msgFirstModifyTime"`
@@ -83,7 +78,6 @@ type ModifyMessageReactionExtensionsResp struct {
 //}
 
 type OperateMessageListReactionExtensionsResp struct {
-	CommResp
 	Data struct {
 		SuccessList []*msg.ExtendMsgResp `json:"successList"`
 		FailedList  []*msg.ExtendMsgResp `json:"failedList"`
@@ -97,7 +91,6 @@ type SetMessageReactionExtensionsCallbackResp ModifyMessageReactionExtensionsRes
 //type GetMessageListReactionExtensionsReq OperateMessageListReactionExtensionsReq
 
 type GetMessageListReactionExtensionsResp struct {
-	CommResp
 	Data []*msg.SingleMessageExtensionResult `json:"data"`
 }
 
@@ -116,7 +109,6 @@ type DeleteMessageReactionExtensionsReq struct {
 }
 
 type DeleteMessageReactionExtensionsResp struct {
-	CommResp
 	Data []*msg.KeyValueResp
 }
 

pkg/apistruct/oss.go

@@ -16,7 +16,6 @@ type OSSCredentialRespData struct {
 }
 
 type OSSCredentialResp struct {
-	CommResp
 	OssData OSSCredentialRespData  `json:"-"`
 	Data    map[string]interface{} `json:"data"`
 }

pkg/apistruct/third.go

@@ -29,7 +29,6 @@ type MinioUploadFile struct {
 }
 
 type MinioUploadFileResp struct {
-	CommResp
 	Data struct {
 		MinioUploadFile
 	} `json:"data"`
@@ -46,7 +45,6 @@ type UploadUpdateAppReq struct {
 }
 
 type UploadUpdateAppResp struct {
-	CommResp
 }
 
 type GetDownloadURLReq struct {
@@ -56,7 +54,6 @@ type GetDownloadURLReq struct {
 }
 
 type GetDownloadURLResp struct {
-	CommResp
 	Data struct {
 		HasNewVersion bool   `json:"hasNewVersion"`
 		ForceUpdate   bool   `json:"forceUpdate"`
@@ -73,7 +70,6 @@ type GetRTCInvitationInfoReq struct {
 }
 
 type GetRTCInvitationInfoResp struct {
-	CommResp
 	Data struct {
 		OpUserID   string `json:"opUserID"`
 		Invitation struct {
@@ -110,7 +106,6 @@ type FcmUpdateTokenReq struct {
 }
 
 type FcmUpdateTokenResp struct {
-	CommResp
 }
 type SetAppBadgeReq struct {
 	OperationID    string `json:"operationID" binding:"required"`
@@ -119,5 +114,4 @@ type SetAppBadgeReq struct {
 }
 
 type SetAppBadgeResp struct {
-	CommResp
 }

pkg/common/cmd/api.go

@@ -0,0 +1,17 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+type ApiCmd struct {
+	*RootCmd
+}
+
+func NewApiCmd() *ApiCmd {
+	return &ApiCmd{NewRootCmd()}
+}
+
+func (a *ApiCmd) AddApi(f func(port int) error) {
+	a.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return f(a.getPortFlag(cmd))
+	}
+}

pkg/common/cmd/cron_task.go

@@ -0,0 +1,22 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+type CronTaskCmd struct {
+	*RootCmd
+}
+
+func NewCronTaskCmd() *CronTaskCmd {
+	return &CronTaskCmd{NewRootCmd()}
+}
+
+func (c *CronTaskCmd) addRunE(f func() error) {
+	c.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return f()
+	}
+}
+
+func (c *CronTaskCmd) Exec(f func() error) error {
+	c.addRunE(f)
+	return c.Execute()
+}

pkg/common/cmd/msg_gateway.go

@@ -0,0 +1,36 @@
+package cmd
+
+import (
+	//"OpenIM/internal/msggateway"
+	"OpenIM/pkg/common/constant"
+	"github.com/spf13/cobra"
+)
+
+type MsgGatewayCmd struct {
+	*RootCmd
+}
+
+func NewMsgGatewayCmd() MsgGatewayCmd {
+	return MsgGatewayCmd{NewRootCmd()}
+}
+
+func (m *MsgGatewayCmd) AddWsPortFlag() {
+	m.Command.Flags().IntP(constant.FlagWsPort, "w", 0, "ws server listen port")
+}
+
+func (m *MsgGatewayCmd) getWsPortFlag(cmd *cobra.Command) int {
+	port, _ := cmd.Flags().GetInt(constant.FlagWsPort)
+	return port
+}
+
+func (m *MsgGatewayCmd) addRun() {
+	m.Command.Run = func(cmd *cobra.Command, args []string) {
+		//msggateway.Init(m.getPortFlag(cmd), m.getWsPortFlag(cmd))
+		//msggateway.Run(m.getPrometheusPortFlag(cmd))
+	}
+}
+
+func (m *MsgGatewayCmd) Exec() error {
+	m.addRun()
+	return m.Execute()
+}

pkg/common/cmd/msg_transfer.go

@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"OpenIM/internal/msgtransfer"
+	"github.com/spf13/cobra"
+)
+
+type MsgTransferCmd struct {
+	*RootCmd
+}
+
+func NewMsgTransferCmd() MsgTransferCmd {
+	return MsgTransferCmd{NewRootCmd()}
+}
+
+func (m *MsgTransferCmd) addRunE() {
+	m.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return msgtransfer.StartTransfer(m.getPrometheusPortFlag(cmd))
+	}
+}
+
+func (m *MsgTransferCmd) Exec() error {
+	m.addRunE()
+	return m.Execute()
+}

pkg/common/cmd/msg_utils.go

@@ -0,0 +1,157 @@
+package cmd
+
+import (
+	"OpenIM/internal/tools"
+	"context"
+	"github.com/spf13/cobra"
+)
+
+type MsgUtilsCmd struct {
+	*RootCmd
+	userID string
+
+	superGroupID string
+
+	clearAll bool
+
+	fixAll bool
+}
+
+func NewMsgUtilsCmd() MsgUtilsCmd {
+	return MsgUtilsCmd{RootCmd: NewRootCmd()}
+}
+
+func (m *MsgUtilsCmd) AddUserIDFlag() {
+	m.Command.PersistentFlags().StringP("userID", "u", "", "openIM userID")
+}
+
+func (m *MsgUtilsCmd) GetUserIDFlag() string {
+	return m.userID
+}
+
+func (m *MsgUtilsCmd) AddFixAllFlag() {
+	m.Command.PersistentFlags().BoolP("fixAll", "c", false, "openIM fix all seqs")
+}
+
+func (m *MsgUtilsCmd) GetFixAllFlag() bool {
+	return m.fixAll
+}
+
+func (m *MsgUtilsCmd) AddSuperGroupIDFlag() {
+	m.Command.PersistentFlags().StringP("super-groupID", "u", "", "openIM superGroupID")
+}
+
+func (m *MsgUtilsCmd) GetSuperGroupIDFlag() string {
+	return m.superGroupID
+}
+
+func (m *MsgUtilsCmd) AddClearAllFlag() bool {
+	return m.clearAll
+}
+
+func (m *MsgUtilsCmd) GetClearAllFlag() bool {
+	return m.clearAll
+}
+
+type SeqCmd struct {
+	Command *cobra.Command
+}
+
+func (SeqCmd) RunCommand(cmdLines *cobra.Command, args []string) error {
+	msgTool, err := tools.InitMsgTool()
+	if err != nil {
+		return err
+	}
+	userID, _ := cmdLines.Flags().GetString("userID")
+	superGroupID, _ := cmdLines.Flags().GetString("superGroupID")
+	fixAll, _ := cmdLines.Flags().GetBool("fixAll")
+	ctx := context.Background()
+	switch {
+	case cmdLines.Parent() == GetCmd:
+		switch {
+		case userID != "":
+			msgTool.ShowUserSeqs(ctx, userID)
+		case superGroupID != "":
+			msgTool.ShowSuperGroupSeqs(ctx, superGroupID)
+		}
+	case cmdLines.Parent() == FixCmd:
+		switch {
+		case userID != "":
+			_, _, err = msgTool.GetAndFixUserSeqs(ctx, userID)
+		case superGroupID != "":
+			err = msgTool.FixGroupSeq(ctx, userID)
+		case fixAll:
+			err = msgTool.FixAllSeq(ctx)
+		}
+	}
+	return err
+}
+
+func NewSeqCmd() SeqCmd {
+	seqCmd := SeqCmd{&cobra.Command{
+		Use:   "seq",
+		Short: "seq operation",
+	}}
+	seqCmd.Command.Flags().BoolP("fixAll", "c", false, "openIM fix all seqs")
+	seqCmd.Command.RunE = seqCmd.RunCommand
+	return seqCmd
+}
+
+type MsgCmd struct {
+	Command *cobra.Command
+}
+
+func NewMsgCmd() MsgCmd {
+	msgCmd := MsgCmd{&cobra.Command{
+		Use:   "msg",
+		Short: "msg operation",
+	}}
+	msgCmd.Command.RunE = msgCmd.RunCommand
+	msgCmd.Command.Flags().BoolP("clearAll", "c", false, "openIM clear all timeout msgs")
+	return msgCmd
+}
+
+func (*MsgCmd) RunCommand(cmdLines *cobra.Command, args []string) error {
+	msgTool, err := tools.InitMsgTool()
+	if err != nil {
+		return err
+	}
+	userID, _ := cmdLines.Flags().GetString("userID")
+	superGroupID, _ := cmdLines.Flags().GetString("superGroupID")
+	clearAll, _ := cmdLines.Flags().GetBool("clearAll")
+	ctx := context.Background()
+	switch {
+	case cmdLines.Parent() == GetCmd:
+		switch {
+		case userID != "":
+			msgTool.ShowUserSeqs(ctx, userID)
+		case superGroupID != "":
+			msgTool.ShowSuperGroupSeqs(ctx, superGroupID)
+		}
+	case cmdLines.Parent() == ClearCmd:
+		switch {
+		case userID != "":
+			msgTool.ClearUsersMsg(ctx, []string{userID})
+		case superGroupID != "":
+			msgTool.ClearSuperGroupMsg(ctx, []string{superGroupID})
+		case clearAll:
+			msgTool.AllUserClearMsgAndFixSeq()
+		}
+	}
+	return nil
+}
+
+var GetCmd = &cobra.Command{
+	Use:   "get",
+	Short: "get operation",
+}
+
+var FixCmd = &cobra.Command{
+	Use:   "fix",
+	Short: "fix seq operation",
+}
+
+var ClearCmd = &cobra.Command{
+	Use:   "clear",
+	Short: "clear operation",
+}

pkg/common/cmd/push.go

@@ -0,0 +1,22 @@
+package cmd
+
+import (
+	"OpenIM/internal/push"
+	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/common/config"
+	"github.com/spf13/cobra"
+)
+
+type PushCmd struct {
+	*RpcCmd
+}
+
+func NewPushCmd() *PushCmd {
+	return &PushCmd{NewRpcCmd(config.Config.RpcRegisterName.OpenImPushName)}
+}
+
+func (r *RpcCmd) AddPush() {
+	r.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return startrpc.Start(r.getPortFlag(cmd), r.rpcRegisterName, r.getPrometheusPortFlag(cmd), push.Start)
+	}
+}

pkg/common/cmd/root.go

@@ -1,13 +1,73 @@
 package cmd
 
 import (
+	"OpenIM/pkg/common/config"
+	"OpenIM/pkg/common/constant"
 	"github.com/spf13/cobra"
 )
 
-func NewRootCmd() *cobra.Command {
+type RootCmd struct {
-	return &cobra.Command{
+	Command cobra.Command
+}
+
+func NewRootCmd() (rootCmd *RootCmd) {
+	rootCmd = &RootCmd{}
+	c := cobra.Command{
 		Use:   "start",
 		Short: "Start the server",
 		Long:  `Start the server`,
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return rootCmd.getConfFromCmdAndInit(cmd)
+		},
+	}
+	rootCmd.Command = c
+	rootCmd.init()
+	return rootCmd
+}
+
+func (r *RootCmd) AddRunE(f func(cmd RootCmd) error) {
+	r.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return f(*r)
 	}
 }
+
+func (r *RootCmd) AddRpc(f func(port, prometheusPort int) error) {
+	r.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return f(r.getPortFlag(cmd), r.getPrometheusPortFlag(cmd))
+	}
+}
+
+func (r *RootCmd) init() {
+	r.Command.Flags().StringP(constant.FlagConf, "c", "", "Path to config file folder")
+}
+
+func (r *RootCmd) AddPortFlag() {
+	r.Command.Flags().IntP(constant.FlagPort, "p", 0, "server listen port")
+}
+
+func (r *RootCmd) getPortFlag(cmd *cobra.Command) int {
+	port, _ := cmd.Flags().GetInt(constant.FlagPort)
+	return port
+}
+
+func (r *RootCmd) AddPrometheusPortFlag() {
+	r.Command.Flags().String(constant.FlagPrometheusPort, "", "server prometheus listen port")
+}
+
+func (r *RootCmd) getPrometheusPortFlag(cmd *cobra.Command) int {
+	port, _ := cmd.Flags().GetInt(constant.FlagPrometheusPort)
+	return port
+}
+
+func (r *RootCmd) getConfFromCmdAndInit(cmdLines *cobra.Command) error {
+	configFolderPath, _ := cmdLines.Flags().GetString(constant.FlagConf)
+	return config.InitConfig(configFolderPath)
+}
+
+func (r *RootCmd) Execute() error {
+	return r.Command.Execute()
+}
+
+func (r *RootCmd) AddCommand(cmds ...*cobra.Command) {
+	r.Command.AddCommand(cmds...)
+}

pkg/common/cmd/rpc.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"OpenIM/internal/startrpc"
+	"OpenIM/pkg/discoveryregistry"
+	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
+)
+
+type RpcCmd struct {
+	*RootCmd
+	rpcRegisterName string
+}
+
+func NewRpcCmd(rpcRegisterName string) *RpcCmd {
+	return &RpcCmd{NewRootCmd(), rpcRegisterName}
+}
+
+func (r *RpcCmd) AddRpc(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) {
+	r.Command.RunE = func(cmd *cobra.Command, args []string) error {
+		return startrpc.Start(r.getPortFlag(cmd), r.rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn)
+	}
+}
+
+func (r *RpcCmd) Exec(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
+	r.AddRpc(rpcFn)
+	return r.Execute()
+}

pkg/common/config/config.go

@@ -8,9 +8,13 @@ import (
 	"path/filepath"
 	"runtime"
 
+	_ "embed"
 	"gopkg.in/yaml.v3"
 )
 
+//go:embed version
+var Version string
+
 var (
 	_, b, _, _ = runtime.Caller(0)
 	// Root folder of this project
@@ -502,6 +506,9 @@ func (c *config) initConfig(config interface{}, configName, configFolderPath str
 		configFolderPath = DefaultFolderPath
 	}
 	configPath := filepath.Join(configFolderPath, configName)
+	defer func() {
+		fmt.Println("use config", configPath)
+	}()
 	_, err := os.Stat(configPath)
 	if err != nil {
 		if !os.IsNotExist(err) {

pkg/common/config/version

@@ -0,0 +1 @@
+v3.0.0

pkg/common/constant/constant.go

@@ -310,17 +310,15 @@ func GroupIsBanPrivateChat(status int32) bool {
 	return true
 }
 
-const BigVersion = "v2"
-
 const LogFileName = "OpenIM.log"
 
-const CurrentVersion = "v2.3.4-rc0"
-
 const LocalHost = "0.0.0.0"
 
 // flag parse
 const (
-	FlagPort       = "port"
+	FlagPort   = "port"
-	PrometheusPort = "prometheus_port"
+	FlagWsPort = "ws_port"
-	FlagConf       = "config_folder_path"
+
+	FlagPrometheusPort = "prometheus_port"
+	FlagConf           = "config_folder_path"
 )

pkg/common/constant/error_info.go

@@ -1,89 +0,0 @@
-package constant
-
-import (
-	"github.com/pkg/errors"
-	"strings"
-)
-
-type ErrInfo struct {
-	ErrCode      int32
-	ErrMsg       string
-	DetailErrMsg string
-}
-
-func NewErrInfo(code int32, msg, detail string) *ErrInfo {
-	return &ErrInfo{
-		ErrCode:      code,
-		ErrMsg:       msg,
-		DetailErrMsg: detail,
-	}
-}
-
-func (e *ErrInfo) Error() string {
-	return "errMsg: " + e.ErrMsg + " detail errMsg: " + e.DetailErrMsg
-}
-
-func (e *ErrInfo) Code() int32 {
-	return e.ErrCode
-}
-
-func (e *ErrInfo) Msg() string {
-	return e.ErrMsg
-}
-
-func (e *ErrInfo) Detail() string {
-	return e.DetailErrMsg
-}
-
-func (e *ErrInfo) Wrap(msg ...string) error {
-	return errors.Wrap(e, strings.Join(msg, "--"))
-}
-
-func NewErrNetwork(err error) error {
-	return toDetail(err, ErrNetwork)
-}
-
-func NewErrData(err error) error {
-	return toDetail(err, ErrData)
-}
-
-func toDetail(err error, info *ErrInfo) *ErrInfo {
-	errInfo := *info
-	errInfo.DetailErrMsg = err.Error()
-	return &errInfo
-}
-
-func ToAPIErrWithErr(err error) *ErrInfo {
-	return &ErrInfo{}
-	//unwrap := utils.Unwrap(err)
-	//if unwrap == gorm.ErrRecordNotFound {
-	//	return &ErrInfo{
-	//		ErrCode:      ErrRecordNotFound.Code(),
-	//		ErrMsg:       ErrRecordNotFound.Msg(),
-	//		DetailErrMsg: fmt.Sprintf("%+v", err),
-	//	}
-	//}
-	//if errInfo, ok := unwrap.(*ErrInfo); ok {
-	//	return &ErrInfo{
-	//		ErrCode:      errInfo.Code(),
-	//		ErrMsg:       errInfo.Msg(),
-	//		DetailErrMsg: fmt.Sprintf("%+v", err),
-	//	}
-	//}
-	//
-	//errComm := errors.New("")
-	//var marshalErr *json.MarshalerError
-	//errInfo := &ErrInfo{}
-	//switch {
-	//case errors.As(err, &errComm):
-	//	if errors.Is(err, gorm.ErrRecordNotFound) {
-	//		return toDetail(err, ErrRecordNotFound)
-	//	}
-	//	return toDetail(err, ErrData)
-	//case errors.As(err, &marshalErr):
-	//	return toDetail(err, ErrData)
-	//case errors.As(err, &errInfo):
-	//	return toDetail(err, errInfo)
-	//}
-	//return toDetail(err, ErrDefaultOther)
-}

pkg/common/db/controller/extend_msg.go

@@ -5,6 +5,7 @@ import (
 	"context"
 )
 
+// for mongoDB
 type ExtendMsgDatabase interface {
 	CreateExtendMsgSet(ctx context.Context, set *unRelationTb.ExtendMsgSetModel) error
 	GetAllExtendMsgSet(ctx context.Context, ID string, opts *unRelationTb.GetAllExtendMsgSetOpts) (sets []*unRelationTb.ExtendMsgSetModel, err error)

pkg/common/db/controller/msg.go

@@ -1,10 +1,12 @@
 package controller
 
 import (
+	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/constant"
 	"OpenIM/pkg/common/db/cache"
 	unRelationTb "OpenIM/pkg/common/db/table/unrelation"
 	"OpenIM/pkg/common/db/unrelation"
+	"OpenIM/pkg/common/kafka"
 	"OpenIM/pkg/common/log"
 	"OpenIM/pkg/common/prome"
 	"OpenIM/pkg/common/tracelog"
@@ -68,7 +70,7 @@ type MsgDatabase interface {
 	DeleteReactionExtendMsgSet(ctx context.Context, sourceID string, sessionType int32, clientMsgID string, msgFirstModifyTime int64, reactionExtensionList map[string]*sdkws.KeyValue) error
 	SetSendMsgStatus(ctx context.Context, id string, status int32) error
 	GetSendMsgStatus(ctx context.Context, id string) (int32, error)
-	MsgToMQ(ctx context.Context, key string, mq *pbMsg.MsgDataToMQ) error
+	MsgToMQ(ctx context.Context, key string, msg2mq *pbMsg.MsgDataToMQ) error
 	GetUserMaxSeq(ctx context.Context, userID string) (int64, error)
 	GetUserMinSeq(ctx context.Context, userID string) (int64, error)
 	GetGroupMaxSeq(ctx context.Context, groupID string) (int64, error)
@@ -79,6 +81,7 @@ func NewMsgDatabase(msgDocModel unRelationTb.MsgDocModelInterface, cacheModel ca
 	return &msgDatabase{
 		msgDocDatabase: msgDocModel,
 		cache:          cacheModel,
+		producer:       kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic),
 	}
 }
 
@@ -93,6 +96,8 @@ type msgDatabase struct {
 	msgDocDatabase    unRelationTb.MsgDocModelInterface
 	extendMsgDatabase unRelationTb.ExtendMsgSetModelInterface
 	cache             cache.Model
+	producer          *kafka.Producer
+	// model
 	msg               unRelationTb.MsgDocModel
 	extendMsgSetModel unRelationTb.ExtendMsgSetModel
 }
@@ -165,9 +170,9 @@ func (db *msgDatabase) GetSendMsgStatus(ctx context.Context, id string) (int32,
 	return db.cache.GetSendMsgStatus(ctx, id)
 }
 
-func (db *msgDatabase) MsgToMQ(ctx context.Context, key string, mq *pbMsg.MsgDataToMQ) error {
+func (db *msgDatabase) MsgToMQ(ctx context.Context, key string, msg2mq *pbMsg.MsgDataToMQ) error {
-	//TODO implement me
+	_, _, err := db.producer.SendMessage(ctx, key, msg2mq)
-	panic("implement me")
+	return err
 }
 
 func (db *msgDatabase) GetUserMaxSeq(ctx context.Context, userID string) (int64, error) {

pkg/common/db/table/unrelation/msg.go

@@ -10,7 +10,7 @@ import (
 
 const (
 	singleGocMsgNum = 5000
-	CChat           = "msg"
+	Msg             = "msg"
 	OldestList      = 0
 	NewestList      = -1
 )
@@ -38,7 +38,7 @@ type MsgDocModelInterface interface {
 }
 
 func (MsgDocModel) TableName() string {
-	return CChat
+	return Msg
 }
 
 func (MsgDocModel) GetSingleGocMsgNum() int64 {

pkg/common/db/unrelation/mongo.go

@@ -61,7 +61,7 @@ func (m *Mongo) GetDatabase() *mongo.Database {
 }
 
 func (m *Mongo) CreateMsgIndex() error {
-	return m.createMongoIndex(unrelation.CChat, false, "uid")
+	return m.createMongoIndex(unrelation.Msg, false, "uid")
 }
 
 func (m *Mongo) CreateSuperGroupIndex() error {

pkg/common/http/http_client.go

@@ -9,7 +9,6 @@ package http
 import (
 	"OpenIM/pkg/callbackstruct"
 	"OpenIM/pkg/common/config"
-	"OpenIM/pkg/common/constant"
 	"OpenIM/pkg/errs"
 	"bytes"
 	"encoding/json"
@@ -79,13 +78,13 @@ func callBackPostReturn(url, command string, input interface{}, output callbacks
 		if callbackConfig.CallbackFailedContinue != nil && *callbackConfig.CallbackFailedContinue {
 			return errs.ErrCallbackContinue
 		}
-		return constant.NewErrNetwork(err)
+		return errs.ErrNetwork.Wrap(err.Error())
 	}
 	if err = json.Unmarshal(b, output); err != nil {
 		if callbackConfig.CallbackFailedContinue != nil && *callbackConfig.CallbackFailedContinue {
 			return errs.ErrCallbackContinue
 		}
-		return constant.NewErrData(err)
+		return errs.ErrData.Wrap(err.Error())
 	}
 	return output.Parse()
 }

pkg/common/kafka/producer.go

@@ -46,7 +46,7 @@ func NewKafkaProducer(addr []string, topic string) *Producer {
 	return &p
 }
 
-func (p *Producer) SendMessage(ctx context.Context, m proto.Message, key string) (int32, int64, error) {
+func (p *Producer) SendMessage(ctx context.Context, key string, m proto.Message) (int32, int64, error) {
 	operationID := tracelog.GetOperationID(ctx)
 	log.Info(operationID, "SendMessage", "key ", key, m.String(), p.producer)
 	kMsg := &sarama.ProducerMessage{}

pkg/discoveryregistry/discovery_register.go

@@ -9,6 +9,7 @@ type SvcDiscoveryRegistry interface {
 	UnRegister() error
 	GetConns(serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error)
 	GetConn(serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error)
+	AddOption(opts ...grpc.DialOption)
 
 	RegisterConf2Registry(key string, conf []byte) error
 	GetConfFromRegistry(key string) ([]byte, error)

pkg/proto/auth/auth.pb.go

@@ -35,7 +35,7 @@ func (m *UserTokenReq) Reset()         { *m = UserTokenReq{} }
 func (m *UserTokenReq) String() string { return proto.CompactTextString(m) }
 func (*UserTokenReq) ProtoMessage()    {}
 func (*UserTokenReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_dbaba8127a30b2f2, []int{0}
+	return fileDescriptor_auth_6fb89f4c8f0019ff, []int{0}
 }
 func (m *UserTokenReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserTokenReq.Unmarshal(m, b)
@@ -81,7 +81,7 @@ func (m *UserTokenResp) Reset()         { *m = UserTokenResp{} }
 func (m *UserTokenResp) String() string { return proto.CompactTextString(m) }
 func (*UserTokenResp) ProtoMessage()    {}
 func (*UserTokenResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_dbaba8127a30b2f2, []int{1}
+	return fileDescriptor_auth_6fb89f4c8f0019ff, []int{1}
 }
 func (m *UserTokenResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserTokenResp.Unmarshal(m, b)
@@ -127,7 +127,7 @@ func (m *ForceLogoutReq) Reset()         { *m = ForceLogoutReq{} }
 func (m *ForceLogoutReq) String() string { return proto.CompactTextString(m) }
 func (*ForceLogoutReq) ProtoMessage()    {}
 func (*ForceLogoutReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_dbaba8127a30b2f2, []int{2}
+	return fileDescriptor_auth_6fb89f4c8f0019ff, []int{2}
 }
 func (m *ForceLogoutReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ForceLogoutReq.Unmarshal(m, b)
@@ -171,7 +171,7 @@ func (m *ForceLogoutResp) Reset()         { *m = ForceLogoutResp{} }
 func (m *ForceLogoutResp) String() string { return proto.CompactTextString(m) }
 func (*ForceLogoutResp) ProtoMessage()    {}
 func (*ForceLogoutResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_dbaba8127a30b2f2, []int{3}
+	return fileDescriptor_auth_6fb89f4c8f0019ff, []int{3}
 }
 func (m *ForceLogoutResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ForceLogoutResp.Unmarshal(m, b)
@@ -202,7 +202,7 @@ func (m *ParseTokenReq) Reset()         { *m = ParseTokenReq{} }
 func (m *ParseTokenReq) String() string { return proto.CompactTextString(m) }
 func (*ParseTokenReq) ProtoMessage()    {}
 func (*ParseTokenReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_dbaba8127a30b2f2, []int{4}
+	return fileDescriptor_auth_6fb89f4c8f0019ff, []int{4}
 }
 func (m *ParseTokenReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParseTokenReq.Unmarshal(m, b)
@@ -242,7 +242,7 @@ func (m *ParseTokenResp) Reset()         { *m = ParseTokenResp{} }
 func (m *ParseTokenResp) String() string { return proto.CompactTextString(m) }
 func (*ParseTokenResp) ProtoMessage()    {}
 func (*ParseTokenResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_dbaba8127a30b2f2, []int{5}
+	return fileDescriptor_auth_6fb89f4c8f0019ff, []int{5}
 }
 func (m *ParseTokenResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParseTokenResp.Unmarshal(m, b)
@@ -284,12 +284,12 @@ func (m *ParseTokenResp) GetExpireTimeSeconds() int64 {
 }
 
 func init() {
-	proto.RegisterType((*UserTokenReq)(nil), "pbAuth.userTokenReq")
+	proto.RegisterType((*UserTokenReq)(nil), "OpenIMServer.pbAuth.userTokenReq")
-	proto.RegisterType((*UserTokenResp)(nil), "pbAuth.userTokenResp")
+	proto.RegisterType((*UserTokenResp)(nil), "OpenIMServer.pbAuth.userTokenResp")
-	proto.RegisterType((*ForceLogoutReq)(nil), "pbAuth.forceLogoutReq")
+	proto.RegisterType((*ForceLogoutReq)(nil), "OpenIMServer.pbAuth.forceLogoutReq")
-	proto.RegisterType((*ForceLogoutResp)(nil), "pbAuth.forceLogoutResp")
+	proto.RegisterType((*ForceLogoutResp)(nil), "OpenIMServer.pbAuth.forceLogoutResp")
-	proto.RegisterType((*ParseTokenReq)(nil), "pbAuth.parseTokenReq")
+	proto.RegisterType((*ParseTokenReq)(nil), "OpenIMServer.pbAuth.parseTokenReq")
-	proto.RegisterType((*ParseTokenResp)(nil), "pbAuth.parseTokenResp")
+	proto.RegisterType((*ParseTokenResp)(nil), "OpenIMServer.pbAuth.parseTokenResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -321,7 +321,7 @@ func NewAuthClient(cc *grpc.ClientConn) AuthClient {
 
 func (c *authClient) UserToken(ctx context.Context, in *UserTokenReq, opts ...grpc.CallOption) (*UserTokenResp, error) {
 	out := new(UserTokenResp)
-	err := grpc.Invoke(ctx, "/pbAuth.Auth/userToken", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.pbAuth.Auth/userToken", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -330,7 +330,7 @@ func (c *authClient) UserToken(ctx context.Context, in *UserTokenReq, opts ...gr
 
 func (c *authClient) ForceLogout(ctx context.Context, in *ForceLogoutReq, opts ...grpc.CallOption) (*ForceLogoutResp, error) {
 	out := new(ForceLogoutResp)
-	err := grpc.Invoke(ctx, "/pbAuth.Auth/forceLogout", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.pbAuth.Auth/forceLogout", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -339,7 +339,7 @@ func (c *authClient) ForceLogout(ctx context.Context, in *ForceLogoutReq, opts .
 
 func (c *authClient) ParseToken(ctx context.Context, in *ParseTokenReq, opts ...grpc.CallOption) (*ParseTokenResp, error) {
 	out := new(ParseTokenResp)
-	err := grpc.Invoke(ctx, "/pbAuth.Auth/parseToken", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.pbAuth.Auth/parseToken", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -371,7 +371,7 @@ func _Auth_UserToken_Handler(srv interface{}, ctx context.Context, dec func(inte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/pbAuth.Auth/UserToken",
+		FullMethod: "/OpenIMServer.pbAuth.Auth/UserToken",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(AuthServer).UserToken(ctx, req.(*UserTokenReq))
@@ -389,7 +389,7 @@ func _Auth_ForceLogout_Handler(srv interface{}, ctx context.Context, dec func(in
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/pbAuth.Auth/ForceLogout",
+		FullMethod: "/OpenIMServer.pbAuth.Auth/ForceLogout",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(AuthServer).ForceLogout(ctx, req.(*ForceLogoutReq))
@@ -407,7 +407,7 @@ func _Auth_ParseToken_Handler(srv interface{}, ctx context.Context, dec func(int
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/pbAuth.Auth/ParseToken",
+		FullMethod: "/OpenIMServer.pbAuth.Auth/ParseToken",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(AuthServer).ParseToken(ctx, req.(*ParseTokenReq))
@@ -416,7 +416,7 @@ func _Auth_ParseToken_Handler(srv interface{}, ctx context.Context, dec func(int
 }
 
 var _Auth_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pbAuth.Auth",
+	ServiceName: "OpenIMServer.pbAuth.Auth",
 	HandlerType: (*AuthServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -436,28 +436,28 @@ var _Auth_serviceDesc = grpc.ServiceDesc{
 	Metadata: "auth/auth.proto",
 }
 
-func init() { proto.RegisterFile("auth/auth.proto", fileDescriptor_auth_dbaba8127a30b2f2) }
+func init() { proto.RegisterFile("auth/auth.proto", fileDescriptor_auth_6fb89f4c8f0019ff) }
 
-var fileDescriptor_auth_dbaba8127a30b2f2 = []byte{
+var fileDescriptor_auth_6fb89f4c8f0019ff = []byte{
-	// 311 bytes of a gzipped FileDescriptorProto
+	// 320 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x4b, 0x4b, 0xf3, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xdf, 0x4b, 0x02, 0x41,
-	0x14, 0x65, 0xbe, 0x3e, 0xf8, 0x7a, 0xb5, 0x2d, 0xbd, 0xd4, 0x5a, 0x82, 0x94, 0x12, 0x10, 0xb2,
+	0x10, 0xc7, 0x59, 0x7f, 0x91, 0x53, 0x2a, 0x4e, 0x11, 0x72, 0x84, 0xd8, 0x5a, 0xe0, 0x43, 0x9c,
-	0x90, 0x04, 0x74, 0x23, 0x14, 0x04, 0xa5, 0x88, 0x01, 0x45, 0x48, 0xbb, 0x72, 0x97, 0xd6, 0xe9,
+	0x50, 0x8f, 0x3d, 0x15, 0x12, 0x09, 0x45, 0x70, 0x1a, 0x44, 0x6f, 0x6a, 0xe3, 0x0f, 0x4c, 0x77,
-	0x83, 0xda, 0xcc, 0x75, 0x66, 0x02, 0xfe, 0x39, 0xff, 0x9b, 0xe4, 0xd1, 0x38, 0xc1, 0xb8, 0x72,
+	0xda, 0xdd, 0x8b, 0xfe, 0x87, 0xfe, 0xe9, 0x38, 0xb5, 0x6b, 0xa5, 0x8b, 0x7b, 0xe8, 0xe5, 0xe0,
-	0x13, 0x38, 0x27, 0x87, 0x39, 0xe7, 0xdc, 0x7b, 0xa1, 0x1b, 0xc6, 0x7a, 0xe3, 0x25, 0x1f, 0x97,
+	0xbb, 0xf7, 0xd9, 0x9d, 0xef, 0x7c, 0x67, 0xa0, 0x32, 0x08, 0xed, 0xb4, 0x1d, 0x7d, 0x7c, 0xd6,
-	0xa4, 0xd0, 0x02, 0x9b, 0xb4, 0xb8, 0x8d, 0xf5, 0xc6, 0xbe, 0x87, 0xe3, 0x58, 0x71, 0x39, 0x17,
+	0xca, 0x2a, 0xdc, 0x7f, 0x60, 0x5a, 0x76, 0xef, 0x7b, 0xa4, 0xdf, 0x49, 0xfb, 0x3c, 0xbc, 0x0a,
-	0x3b, 0x1e, 0x05, 0xfc, 0x1d, 0x47, 0x00, 0xf4, 0x16, 0xea, 0x95, 0x90, 0x7b, 0x7f, 0x3a, 0x64,
+	0xed, 0x54, 0xde, 0xc0, 0x5e, 0x68, 0x48, 0xf7, 0xd5, 0x9c, 0x96, 0x01, 0xbd, 0x61, 0x1d, 0x80,
-	0x63, 0xe6, 0x34, 0x02, 0x83, 0xc1, 0x01, 0x34, 0x13, 0xbd, 0x3f, 0x1d, 0xfe, 0x1b, 0x33, 0xa7,
+	0x5f, 0x07, 0x76, 0xac, 0xf4, 0xa2, 0xdb, 0xa9, 0x89, 0x86, 0x68, 0xe5, 0x03, 0xe7, 0x04, 0x0f,
-	0x15, 0xe4, 0xc8, 0x9e, 0x41, 0xdb, 0x78, 0x47, 0x11, 0xf6, 0xa1, 0xa1, 0x13, 0x90, 0xeb, 0x32,
+	0xa1, 0x10, 0xf1, 0xdd, 0x4e, 0x2d, 0xd3, 0x10, 0xad, 0x62, 0xb0, 0x51, 0xb2, 0x07, 0x25, 0xe7,
-	0x80, 0x17, 0xd0, 0xe3, 0x1f, 0xb4, 0x95, 0x7c, 0xbe, 0xdd, 0xf3, 0x19, 0x5f, 0x8a, 0xe8, 0x55,
+	0x1d, 0xc3, 0x78, 0x00, 0x79, 0x1b, 0x89, 0x0d, 0xb7, 0x16, 0x78, 0x06, 0x55, 0xfa, 0xe0, 0x99,
-	0x0d, 0x6b, 0x63, 0xe6, 0xd4, 0x82, 0x9f, 0x3f, 0xec, 0x07, 0xe8, 0xac, 0x84, 0x5c, 0xf2, 0x47,
+	0xa6, 0xfe, 0x6c, 0x41, 0x3d, 0x1a, 0xa9, 0xe5, 0x8b, 0xa9, 0x65, 0x1b, 0xa2, 0x95, 0x0d, 0x7e,
-	0xb1, 0x16, 0xb1, 0xfe, 0x4b, 0xbc, 0x1e, 0x74, 0x4b, 0x2f, 0x29, 0xb2, 0xcf, 0xa1, 0x4d, 0xa1,
+	0xff, 0x90, 0xb7, 0x50, 0x1e, 0x2b, 0x3d, 0xa2, 0x3b, 0x35, 0x51, 0xa1, 0xfd, 0x8f, 0xbd, 0x2a,
-	0x54, 0xbc, 0xa8, 0x5e, 0x24, 0x66, 0x46, 0x62, 0x5b, 0x42, 0xc7, 0x94, 0x29, 0x32, 0x3c, 0x98,
+	0x54, 0xb6, 0x5e, 0x32, 0x2c, 0x4f, 0xa1, 0xc4, 0x03, 0x6d, 0x28, 0x6e, 0x3d, 0x76, 0x2c, 0x1c,
-	0xe9, 0x81, 0x16, 0xfc, 0x3f, 0x24, 0xc9, 0xdd, 0x0b, 0x5c, 0xdd, 0xbb, 0xfe, 0x4b, 0xef, 0xcb,
+	0xc7, 0x52, 0x43, 0xd9, 0xc5, 0x0c, 0x3b, 0x35, 0x84, 0x5b, 0x03, 0x3d, 0xd8, 0xf9, 0x76, 0xb2,
-	0x4f, 0x06, 0xf5, 0x64, 0x3b, 0x78, 0x0d, 0xad, 0x62, 0xaa, 0xd8, 0x77, 0xb3, 0x9d, 0xb9, 0xe6,
+	0xa9, 0x1e, 0xeb, 0xe4, 0xbe, 0x73, 0x7f, 0xf4, 0x7d, 0xfe, 0x99, 0x81, 0x5c, 0x34, 0x1d, 0x0c,
-	0xc2, 0xac, 0x93, 0x0a, 0x56, 0x11, 0xde, 0xc0, 0x91, 0x51, 0x18, 0x07, 0x07, 0x55, 0x79, 0x9e,
+	0xa0, 0x18, 0xa7, 0x8a, 0xc7, 0x7e, 0xc2, 0x00, 0x7d, 0x77, 0x7a, 0x9e, 0x4c, 0x43, 0x0c, 0xe3,
-	0xd6, 0x69, 0x25, 0xaf, 0x08, 0x27, 0x00, 0xdf, 0xb5, 0xb1, 0x30, 0x29, 0x4d, 0xcc, 0x1a, 0x54,
+	0x13, 0xec, 0x3a, 0x51, 0x60, 0x33, 0xf1, 0xca, 0x76, 0xec, 0xde, 0x49, 0x3a, 0x64, 0x18, 0x1f,
-	0xd1, 0x8a, 0xee, 0x46, 0x2f, 0x67, 0xcf, 0xc4, 0x23, 0xff, 0xc9, 0xa3, 0xdd, 0xda, 0x4b, 0x0f,
+	0x01, 0x7e, 0xa2, 0xc2, 0x64, 0x2f, 0x5b, 0x91, 0x7b, 0xcd, 0x54, 0xc6, 0xf0, 0x75, 0xfd, 0xf9,
-	0x2e, 0xbd, 0xbd, 0x49, 0x26, 0x5f, 0x34, 0x53, 0xea, 0xea, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xc0,
+	0x68, 0x4d, 0xb5, 0x79, 0x3e, 0x69, 0xaf, 0x76, 0x79, 0xb5, 0xd6, 0x97, 0x6b, 0x7c, 0x58, 0x58,
-	0x33, 0xd1, 0x21, 0x96, 0x02, 0x00, 0x00,
+	0x1d, 0x5d, 0x7c, 0x05, 0x00, 0x00, 0xff, 0xff, 0x40, 0xb2, 0x28, 0x6e, 0xf1, 0x02, 0x00, 0x00,
 }

pkg/proto/auth/auth.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package pbAuth;
+package OpenIMServer.pbAuth;
 option go_package = "OpenIM/pkg/proto/auth;pbAuth";
 
 

pkg/proto/conversation/conversation.pb.go

@@ -49,7 +49,7 @@ func (m *Conversation) Reset()         { *m = Conversation{} }
 func (m *Conversation) String() string { return proto.CompactTextString(m) }
 func (*Conversation) ProtoMessage()    {}
 func (*Conversation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{0}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{0}
 }
 func (m *Conversation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Conversation.Unmarshal(m, b)
@@ -194,7 +194,7 @@ func (m *ModifyConversationFieldReq) Reset()         { *m = ModifyConversationFi
 func (m *ModifyConversationFieldReq) String() string { return proto.CompactTextString(m) }
 func (*ModifyConversationFieldReq) ProtoMessage()    {}
 func (*ModifyConversationFieldReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{1}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{1}
 }
 func (m *ModifyConversationFieldReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyConversationFieldReq.Unmarshal(m, b)
@@ -245,7 +245,7 @@ func (m *ModifyConversationFieldResp) Reset()         { *m = ModifyConversationF
 func (m *ModifyConversationFieldResp) String() string { return proto.CompactTextString(m) }
 func (*ModifyConversationFieldResp) ProtoMessage()    {}
 func (*ModifyConversationFieldResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{2}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{2}
 }
 func (m *ModifyConversationFieldResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyConversationFieldResp.Unmarshal(m, b)
@@ -277,7 +277,7 @@ func (m *SetConversationReq) Reset()         { *m = SetConversationReq{} }
 func (m *SetConversationReq) String() string { return proto.CompactTextString(m) }
 func (*SetConversationReq) ProtoMessage()    {}
 func (*SetConversationReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{3}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{3}
 }
 func (m *SetConversationReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetConversationReq.Unmarshal(m, b)
@@ -321,7 +321,7 @@ func (m *SetConversationResp) Reset()         { *m = SetConversationResp{} }
 func (m *SetConversationResp) String() string { return proto.CompactTextString(m) }
 func (*SetConversationResp) ProtoMessage()    {}
 func (*SetConversationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{4}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{4}
 }
 func (m *SetConversationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetConversationResp.Unmarshal(m, b)
@@ -355,7 +355,7 @@ func (m *SetRecvMsgOptReq) Reset()         { *m = SetRecvMsgOptReq{} }
 func (m *SetRecvMsgOptReq) String() string { return proto.CompactTextString(m) }
 func (*SetRecvMsgOptReq) ProtoMessage()    {}
 func (*SetRecvMsgOptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{5}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{5}
 }
 func (m *SetRecvMsgOptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRecvMsgOptReq.Unmarshal(m, b)
@@ -413,7 +413,7 @@ func (m *SetRecvMsgOptResp) Reset()         { *m = SetRecvMsgOptResp{} }
 func (m *SetRecvMsgOptResp) String() string { return proto.CompactTextString(m) }
 func (*SetRecvMsgOptResp) ProtoMessage()    {}
 func (*SetRecvMsgOptResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{6}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{6}
 }
 func (m *SetRecvMsgOptResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRecvMsgOptResp.Unmarshal(m, b)
@@ -445,7 +445,7 @@ func (m *GetConversationReq) Reset()         { *m = GetConversationReq{} }
 func (m *GetConversationReq) String() string { return proto.CompactTextString(m) }
 func (*GetConversationReq) ProtoMessage()    {}
 func (*GetConversationReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{7}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{7}
 }
 func (m *GetConversationReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationReq.Unmarshal(m, b)
@@ -490,7 +490,7 @@ func (m *GetConversationResp) Reset()         { *m = GetConversationResp{} }
 func (m *GetConversationResp) String() string { return proto.CompactTextString(m) }
 func (*GetConversationResp) ProtoMessage()    {}
 func (*GetConversationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{8}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{8}
 }
 func (m *GetConversationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationResp.Unmarshal(m, b)
@@ -529,7 +529,7 @@ func (m *GetConversationsReq) Reset()         { *m = GetConversationsReq{} }
 func (m *GetConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*GetConversationsReq) ProtoMessage()    {}
 func (*GetConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{9}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{9}
 }
 func (m *GetConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationsReq.Unmarshal(m, b)
@@ -574,7 +574,7 @@ func (m *GetConversationsResp) Reset()         { *m = GetConversationsResp{} }
 func (m *GetConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*GetConversationsResp) ProtoMessage()    {}
 func (*GetConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{10}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{10}
 }
 func (m *GetConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationsResp.Unmarshal(m, b)
@@ -612,7 +612,7 @@ func (m *GetAllConversationsReq) Reset()         { *m = GetAllConversationsReq{}
 func (m *GetAllConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*GetAllConversationsReq) ProtoMessage()    {}
 func (*GetAllConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{11}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{11}
 }
 func (m *GetAllConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllConversationsReq.Unmarshal(m, b)
@@ -650,7 +650,7 @@ func (m *GetAllConversationsResp) Reset()         { *m = GetAllConversationsResp
 func (m *GetAllConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*GetAllConversationsResp) ProtoMessage()    {}
 func (*GetAllConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{12}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{12}
 }
 func (m *GetAllConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllConversationsResp.Unmarshal(m, b)
@@ -690,7 +690,7 @@ func (m *BatchSetConversationsReq) Reset()         { *m = BatchSetConversationsR
 func (m *BatchSetConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*BatchSetConversationsReq) ProtoMessage()    {}
 func (*BatchSetConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{13}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{13}
 }
 func (m *BatchSetConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchSetConversationsReq.Unmarshal(m, b)
@@ -743,7 +743,7 @@ func (m *BatchSetConversationsResp) Reset()         { *m = BatchSetConversations
 func (m *BatchSetConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*BatchSetConversationsResp) ProtoMessage()    {}
 func (*BatchSetConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{14}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{14}
 }
 func (m *BatchSetConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchSetConversationsResp.Unmarshal(m, b)
@@ -788,7 +788,7 @@ func (m *GetRecvMsgNotNotifyUserIDsReq) Reset()         { *m = GetRecvMsgNotNoti
 func (m *GetRecvMsgNotNotifyUserIDsReq) String() string { return proto.CompactTextString(m) }
 func (*GetRecvMsgNotNotifyUserIDsReq) ProtoMessage()    {}
 func (*GetRecvMsgNotNotifyUserIDsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{15}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{15}
 }
 func (m *GetRecvMsgNotNotifyUserIDsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetRecvMsgNotNotifyUserIDsReq.Unmarshal(m, b)
@@ -826,7 +826,7 @@ func (m *GetRecvMsgNotNotifyUserIDsResp) Reset()         { *m = GetRecvMsgNotNot
 func (m *GetRecvMsgNotNotifyUserIDsResp) String() string { return proto.CompactTextString(m) }
 func (*GetRecvMsgNotNotifyUserIDsResp) ProtoMessage()    {}
 func (*GetRecvMsgNotNotifyUserIDsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_f3f9347ed949ef7d, []int{16}
+	return fileDescriptor_conversation_46a825ce5b85f7cf, []int{16}
 }
 func (m *GetRecvMsgNotNotifyUserIDsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetRecvMsgNotNotifyUserIDsResp.Unmarshal(m, b)
@@ -854,23 +854,23 @@ func (m *GetRecvMsgNotNotifyUserIDsResp) GetUserIDs() []string {
 }
 
 func init() {
-	proto.RegisterType((*Conversation)(nil), "conversation.Conversation")
+	proto.RegisterType((*Conversation)(nil), "OpenIMServer.conversation.Conversation")
-	proto.RegisterType((*ModifyConversationFieldReq)(nil), "conversation.ModifyConversationFieldReq")
+	proto.RegisterType((*ModifyConversationFieldReq)(nil), "OpenIMServer.conversation.ModifyConversationFieldReq")
-	proto.RegisterType((*ModifyConversationFieldResp)(nil), "conversation.ModifyConversationFieldResp")
+	proto.RegisterType((*ModifyConversationFieldResp)(nil), "OpenIMServer.conversation.ModifyConversationFieldResp")
-	proto.RegisterType((*SetConversationReq)(nil), "conversation.SetConversationReq")
+	proto.RegisterType((*SetConversationReq)(nil), "OpenIMServer.conversation.SetConversationReq")
-	proto.RegisterType((*SetConversationResp)(nil), "conversation.SetConversationResp")
+	proto.RegisterType((*SetConversationResp)(nil), "OpenIMServer.conversation.SetConversationResp")
-	proto.RegisterType((*SetRecvMsgOptReq)(nil), "conversation.SetRecvMsgOptReq")
+	proto.RegisterType((*SetRecvMsgOptReq)(nil), "OpenIMServer.conversation.SetRecvMsgOptReq")
-	proto.RegisterType((*SetRecvMsgOptResp)(nil), "conversation.SetRecvMsgOptResp")
+	proto.RegisterType((*SetRecvMsgOptResp)(nil), "OpenIMServer.conversation.SetRecvMsgOptResp")
-	proto.RegisterType((*GetConversationReq)(nil), "conversation.GetConversationReq")
+	proto.RegisterType((*GetConversationReq)(nil), "OpenIMServer.conversation.GetConversationReq")
-	proto.RegisterType((*GetConversationResp)(nil), "conversation.GetConversationResp")
+	proto.RegisterType((*GetConversationResp)(nil), "OpenIMServer.conversation.GetConversationResp")
-	proto.RegisterType((*GetConversationsReq)(nil), "conversation.GetConversationsReq")
+	proto.RegisterType((*GetConversationsReq)(nil), "OpenIMServer.conversation.GetConversationsReq")
-	proto.RegisterType((*GetConversationsResp)(nil), "conversation.GetConversationsResp")
+	proto.RegisterType((*GetConversationsResp)(nil), "OpenIMServer.conversation.GetConversationsResp")
-	proto.RegisterType((*GetAllConversationsReq)(nil), "conversation.GetAllConversationsReq")
+	proto.RegisterType((*GetAllConversationsReq)(nil), "OpenIMServer.conversation.GetAllConversationsReq")
-	proto.RegisterType((*GetAllConversationsResp)(nil), "conversation.GetAllConversationsResp")
+	proto.RegisterType((*GetAllConversationsResp)(nil), "OpenIMServer.conversation.GetAllConversationsResp")
-	proto.RegisterType((*BatchSetConversationsReq)(nil), "conversation.BatchSetConversationsReq")
+	proto.RegisterType((*BatchSetConversationsReq)(nil), "OpenIMServer.conversation.BatchSetConversationsReq")
-	proto.RegisterType((*BatchSetConversationsResp)(nil), "conversation.BatchSetConversationsResp")
+	proto.RegisterType((*BatchSetConversationsResp)(nil), "OpenIMServer.conversation.BatchSetConversationsResp")
-	proto.RegisterType((*GetRecvMsgNotNotifyUserIDsReq)(nil), "conversation.GetRecvMsgNotNotifyUserIDsReq")
+	proto.RegisterType((*GetRecvMsgNotNotifyUserIDsReq)(nil), "OpenIMServer.conversation.GetRecvMsgNotNotifyUserIDsReq")
-	proto.RegisterType((*GetRecvMsgNotNotifyUserIDsResp)(nil), "conversation.GetRecvMsgNotNotifyUserIDsResp")
+	proto.RegisterType((*GetRecvMsgNotNotifyUserIDsResp)(nil), "OpenIMServer.conversation.GetRecvMsgNotNotifyUserIDsResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -904,7 +904,7 @@ func NewConversationClient(cc *grpc.ClientConn) ConversationClient {
 
 func (c *conversationClient) ModifyConversationField(ctx context.Context, in *ModifyConversationFieldReq, opts ...grpc.CallOption) (*ModifyConversationFieldResp, error) {
 	out := new(ModifyConversationFieldResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/ModifyConversationField", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/ModifyConversationField", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -913,7 +913,7 @@ func (c *conversationClient) ModifyConversationField(ctx context.Context, in *Mo
 
 func (c *conversationClient) GetConversation(ctx context.Context, in *GetConversationReq, opts ...grpc.CallOption) (*GetConversationResp, error) {
 	out := new(GetConversationResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/GetConversation", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/GetConversation", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -922,7 +922,7 @@ func (c *conversationClient) GetConversation(ctx context.Context, in *GetConvers
 
 func (c *conversationClient) GetAllConversations(ctx context.Context, in *GetAllConversationsReq, opts ...grpc.CallOption) (*GetAllConversationsResp, error) {
 	out := new(GetAllConversationsResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/GetAllConversations", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/GetAllConversations", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -931,7 +931,7 @@ func (c *conversationClient) GetAllConversations(ctx context.Context, in *GetAll
 
 func (c *conversationClient) GetConversations(ctx context.Context, in *GetConversationsReq, opts ...grpc.CallOption) (*GetConversationsResp, error) {
 	out := new(GetConversationsResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/GetConversations", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/GetConversations", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -940,7 +940,7 @@ func (c *conversationClient) GetConversations(ctx context.Context, in *GetConver
 
 func (c *conversationClient) BatchSetConversations(ctx context.Context, in *BatchSetConversationsReq, opts ...grpc.CallOption) (*BatchSetConversationsResp, error) {
 	out := new(BatchSetConversationsResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/BatchSetConversations", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/BatchSetConversations", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -949,7 +949,7 @@ func (c *conversationClient) BatchSetConversations(ctx context.Context, in *Batc
 
 func (c *conversationClient) SetConversation(ctx context.Context, in *SetConversationReq, opts ...grpc.CallOption) (*SetConversationResp, error) {
 	out := new(SetConversationResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/SetConversation", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/SetConversation", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -958,7 +958,7 @@ func (c *conversationClient) SetConversation(ctx context.Context, in *SetConvers
 
 func (c *conversationClient) SetRecvMsgOpt(ctx context.Context, in *SetRecvMsgOptReq, opts ...grpc.CallOption) (*SetRecvMsgOptResp, error) {
 	out := new(SetRecvMsgOptResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/SetRecvMsgOpt", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/SetRecvMsgOpt", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -967,7 +967,7 @@ func (c *conversationClient) SetRecvMsgOpt(ctx context.Context, in *SetRecvMsgOp
 
 func (c *conversationClient) GetRecvMsgNotNotifyUserIDs(ctx context.Context, in *GetRecvMsgNotNotifyUserIDsReq, opts ...grpc.CallOption) (*GetRecvMsgNotNotifyUserIDsResp, error) {
 	out := new(GetRecvMsgNotNotifyUserIDsResp)
-	err := grpc.Invoke(ctx, "/conversation.conversation/GetRecvMsgNotNotifyUserIDs", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.conversation.conversation/GetRecvMsgNotNotifyUserIDs", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1001,7 +1001,7 @@ func _Conversation_ModifyConversationField_Handler(srv interface{}, ctx context.
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/ModifyConversationField",
+		FullMethod: "/OpenIMServer.conversation.conversation/ModifyConversationField",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).ModifyConversationField(ctx, req.(*ModifyConversationFieldReq))
@@ -1019,7 +1019,7 @@ func _Conversation_GetConversation_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/GetConversation",
+		FullMethod: "/OpenIMServer.conversation.conversation/GetConversation",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).GetConversation(ctx, req.(*GetConversationReq))
@@ -1037,7 +1037,7 @@ func _Conversation_GetAllConversations_Handler(srv interface{}, ctx context.Cont
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/GetAllConversations",
+		FullMethod: "/OpenIMServer.conversation.conversation/GetAllConversations",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).GetAllConversations(ctx, req.(*GetAllConversationsReq))
@@ -1055,7 +1055,7 @@ func _Conversation_GetConversations_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/GetConversations",
+		FullMethod: "/OpenIMServer.conversation.conversation/GetConversations",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).GetConversations(ctx, req.(*GetConversationsReq))
@@ -1073,7 +1073,7 @@ func _Conversation_BatchSetConversations_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/BatchSetConversations",
+		FullMethod: "/OpenIMServer.conversation.conversation/BatchSetConversations",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).BatchSetConversations(ctx, req.(*BatchSetConversationsReq))
@@ -1091,7 +1091,7 @@ func _Conversation_SetConversation_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/SetConversation",
+		FullMethod: "/OpenIMServer.conversation.conversation/SetConversation",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).SetConversation(ctx, req.(*SetConversationReq))
@@ -1109,7 +1109,7 @@ func _Conversation_SetRecvMsgOpt_Handler(srv interface{}, ctx context.Context, d
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/SetRecvMsgOpt",
+		FullMethod: "/OpenIMServer.conversation.conversation/SetRecvMsgOpt",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).SetRecvMsgOpt(ctx, req.(*SetRecvMsgOptReq))
@@ -1127,7 +1127,7 @@ func _Conversation_GetRecvMsgNotNotifyUserIDs_Handler(srv interface{}, ctx conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/conversation.conversation/GetRecvMsgNotNotifyUserIDs",
+		FullMethod: "/OpenIMServer.conversation.conversation/GetRecvMsgNotNotifyUserIDs",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ConversationServer).GetRecvMsgNotNotifyUserIDs(ctx, req.(*GetRecvMsgNotNotifyUserIDsReq))
@@ -1136,7 +1136,7 @@ func _Conversation_GetRecvMsgNotNotifyUserIDs_Handler(srv interface{}, ctx conte
 }
 
 var _Conversation_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "conversation.conversation",
+	ServiceName: "OpenIMServer.conversation.conversation",
 	HandlerType: (*ConversationServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -1177,62 +1177,63 @@ var _Conversation_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("conversation/conversation.proto", fileDescriptor_conversation_f3f9347ed949ef7d)
+	proto.RegisterFile("conversation/conversation.proto", fileDescriptor_conversation_46a825ce5b85f7cf)
 }
 
-var fileDescriptor_conversation_f3f9347ed949ef7d = []byte{
+var fileDescriptor_conversation_46a825ce5b85f7cf = []byte{
-	// 841 bytes of a gzipped FileDescriptorProto
+	// 864 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdb, 0x4f, 0x3b, 0x45,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x53, 0xfb, 0x44,
-	0x14, 0xce, 0xb6, 0xfc, 0x0a, 0x3d, 0x6d, 0xa1, 0x0e, 0x02, 0xe3, 0x2a, 0x50, 0x27, 0x88, 0x15,
+	0x14, 0x9f, 0xb4, 0x7c, 0x81, 0xbe, 0xb6, 0x50, 0x17, 0x81, 0x25, 0x0a, 0x76, 0x32, 0x8e, 0x76,
-	0x09, 0x24, 0xe8, 0x8b, 0x98, 0x18, 0xa1, 0x0d, 0x4d, 0x13, 0x4b, 0xc9, 0x16, 0x8c, 0x97, 0xc4,
+	0x10, 0xdb, 0x11, 0xd0, 0x11, 0x3c, 0x41, 0x3b, 0x74, 0x3a, 0x5a, 0xca, 0xa4, 0x70, 0xf1, 0xe0,
-	0x64, 0xe9, 0x4e, 0xe9, 0xc6, 0xba, 0x3b, 0xee, 0xcc, 0x72, 0x79, 0xf3, 0xef, 0xf0, 0xd1, 0x27,
+	0x4c, 0x68, 0xb6, 0x34, 0x5a, 0x93, 0x35, 0xbb, 0xa9, 0x30, 0xe3, 0xc9, 0x93, 0x17, 0x0f, 0xfe,
-	0xe3, 0xb3, 0x7f, 0xa0, 0xd9, 0xd9, 0x52, 0x76, 0x3a, 0xbb, 0xbd, 0x24, 0x3e, 0x9e, 0x6f, 0xcf,
+	0x15, 0xfa, 0x07, 0x38, 0xe3, 0x5f, 0xe6, 0xdd, 0xc9, 0xa6, 0x94, 0x6c, 0x37, 0xa9, 0x04, 0xbe,
-	0xe5, 0x3b, 0x67, 0xbe, 0x33, 0xb3, 0xb0, 0xdf, 0xf7, 0xbd, 0x47, 0x1a, 0x70, 0x5b, 0xb8, 0xbe,
+	0xc7, 0xfd, 0x64, 0xdf, 0x7b, 0x9f, 0xf7, 0xe3, 0xb3, 0x6f, 0x02, 0x1f, 0x0c, 0x3c, 0x77, 0x42,
-	0x77, 0x9a, 0x34, 0x4e, 0x58, 0xe0, 0x0b, 0x1f, 0x95, 0x93, 0x18, 0xf9, 0x77, 0x05, 0xca, 0x8d,
+	0x7c, 0x66, 0x71, 0xc7, 0x73, 0x1b, 0xf1, 0x43, 0x9d, 0xfa, 0x1e, 0xf7, 0xd0, 0x4e, 0x8f, 0x12,
-	0x04, 0x80, 0x6a, 0x50, 0xf2, 0x9f, 0x3c, 0x1a, 0xdc, 0x71, 0x1a, 0xb4, 0x9b, 0xd8, 0xa8, 0x19,
+	0xb7, 0xd3, 0xed, 0x13, 0x7f, 0x42, 0xfc, 0x7a, 0xfc, 0x82, 0xf1, 0xf7, 0x12, 0x94, 0x9a, 0x31,
-	0xf5, 0xa2, 0x95, 0x84, 0xd0, 0x21, 0xac, 0x27, 0x53, 0xb4, 0x9b, 0x38, 0x27, 0x9d, 0xa6, 0x50,
+	0x00, 0x55, 0xa1, 0xe8, 0xfd, 0xec, 0x12, 0xff, 0x86, 0x11, 0xbf, 0xd3, 0xc2, 0x5a, 0x55, 0xab,
-	0xb4, 0x07, 0x10, 0xd0, 0xfe, 0x63, 0x87, 0x3f, 0x74, 0x99, 0xc0, 0xf9, 0x9a, 0x51, 0x7f, 0x67,
+	0x15, 0xcc, 0x38, 0x84, 0x3e, 0x82, 0xb5, 0xb8, 0x8b, 0x4e, 0x0b, 0xe7, 0xc4, 0xa5, 0x39, 0x14,
-	0x25, 0x10, 0x74, 0x04, 0xd5, 0x64, 0xc4, 0xed, 0x0b, 0xa3, 0x78, 0x45, 0x7a, 0x69, 0x38, 0xda,
+	0xed, 0x01, 0xf8, 0x64, 0x30, 0xe9, 0xb2, 0xbb, 0x1e, 0xe5, 0x38, 0x5f, 0xd5, 0x6a, 0x6f, 0xcc,
-	0x86, 0x42, 0x18, 0x13, 0x7a, 0x27, 0x6b, 0x8d, 0x2d, 0x84, 0x61, 0xf5, 0x21, 0xf0, 0x43, 0xd6,
+	0x18, 0x82, 0xf6, 0xa1, 0x12, 0xb7, 0xb8, 0x7e, 0xa0, 0x04, 0x2f, 0x89, 0x5b, 0x0a, 0x8e, 0xb6,
-	0x6e, 0xe2, 0x82, 0xfc, 0xf0, 0x6a, 0x46, 0x7d, 0x84, 0x5e, 0x40, 0x6d, 0xa7, 0xe1, 0x87, 0x9e,
+	0x60, 0x39, 0x88, 0x08, 0xbd, 0x11, 0xb1, 0xa6, 0x27, 0x84, 0x61, 0xe5, 0xce, 0xf7, 0x02, 0xda,
-	0xc0, 0xab, 0x32, 0x71, 0x12, 0x42, 0x07, 0x50, 0x71, 0x02, 0x7b, 0x20, 0x6e, 0xe9, 0xb3, 0xb8,
+	0x69, 0xe1, 0x65, 0xf1, 0xe1, 0xf1, 0x18, 0xe6, 0x11, 0xb8, 0x3e, 0xb1, 0xec, 0xa6, 0x17, 0xb8,
-	0x75, 0x7f, 0xa3, 0x78, 0xad, 0x66, 0xd4, 0xf3, 0x96, 0x0a, 0x22, 0x13, 0xd6, 0x5c, 0x7e, 0xe3,
+	0x1c, 0xaf, 0x08, 0xc7, 0x71, 0x08, 0x7d, 0x08, 0x65, 0xdb, 0xb7, 0x86, 0xfc, 0x9a, 0xdc, 0xf3,
-	0x7a, 0x1e, 0x75, 0x70, 0xb1, 0x66, 0xd4, 0xd7, 0xac, 0x89, 0x8d, 0x08, 0x94, 0x6d, 0x21, 0xec,
+	0x6b, 0xe7, 0x47, 0x82, 0x57, 0xab, 0x5a, 0x2d, 0x6f, 0xca, 0x20, 0xd2, 0x61, 0xd5, 0x61, 0x57,
-	0xfe, 0x90, 0x3a, 0x6d, 0x6f, 0xe0, 0x63, 0x90, 0x14, 0x14, 0x2c, 0xaa, 0xe2, 0xf2, 0x9b, 0xc0,
+	0x8e, 0xeb, 0x12, 0x1b, 0x17, 0xaa, 0x5a, 0x6d, 0xd5, 0x9c, 0x9d, 0x91, 0x01, 0x25, 0x8b, 0x73,
-	0x7d, 0xb4, 0x05, 0x6d, 0x0c, 0x6d, 0x81, 0x4b, 0x32, 0x89, 0x0a, 0x46, 0x6c, 0x25, 0xf1, 0x0b,
+	0x6b, 0x30, 0x22, 0x76, 0xc7, 0x1d, 0x7a, 0x18, 0x04, 0x05, 0x09, 0x0b, 0xa3, 0x38, 0xec, 0xca,
-	0x21, 0xc7, 0x50, 0x8e, 0xd9, 0x26, 0xa0, 0xa8, 0x96, 0xcb, 0xaf, 0x7d, 0xd1, 0xf6, 0x5a, 0x11,
+	0x77, 0x26, 0x16, 0x27, 0xcd, 0x91, 0xc5, 0x71, 0x51, 0x38, 0x91, 0xc1, 0x90, 0xad, 0x20, 0x7e,
-	0x8a, 0x2b, 0x32, 0x8d, 0x82, 0xa1, 0x75, 0xc8, 0xd1, 0x67, 0xbc, 0x2e, 0x59, 0xe4, 0xe8, 0x33,
+	0xc6, 0x45, 0x19, 0x4a, 0x11, 0xdb, 0x18, 0x14, 0xc6, 0x72, 0xd8, 0xa5, 0xc7, 0x3b, 0x6e, 0x3b,
-	0xfa, 0x12, 0xb6, 0x42, 0xe6, 0xd8, 0x82, 0xde, 0xbd, 0xb5, 0x2d, 0x3b, 0xdd, 0x90, 0x9d, 0xa6,
+	0x44, 0x71, 0x59, 0xb8, 0x91, 0x30, 0xb4, 0x06, 0x39, 0x72, 0x8f, 0xd7, 0x04, 0x8b, 0x1c, 0xb9,
-	0x7f, 0x8c, 0x2a, 0xdd, 0x87, 0x81, 0xd7, 0x0c, 0x03, 0x39, 0x7f, 0x5c, 0x95, 0x64, 0x14, 0x8c,
+	0x47, 0xc7, 0xb0, 0x19, 0x50, 0xdb, 0xe2, 0xe4, 0xe6, 0x29, 0x6d, 0x91, 0xe9, 0xba, 0xc8, 0x34,
-	0xfc, 0x69, 0x80, 0xd9, 0xf1, 0x1d, 0x77, 0xf0, 0x92, 0x14, 0xcf, 0x95, 0x4b, 0x47, 0x8e, 0x45,
+	0xf9, 0x63, 0x18, 0xe9, 0x36, 0xf0, 0xdd, 0x56, 0xe0, 0x8b, 0xfa, 0xe3, 0x8a, 0x20, 0x23, 0x61,
-	0x7f, 0x47, 0xdf, 0x80, 0xa2, 0x32, 0xa9, 0xa2, 0xd2, 0x99, 0x79, 0xa2, 0xc8, 0x31, 0x19, 0x69,
+	0xc6, 0x9f, 0x1a, 0xe8, 0x5d, 0xcf, 0x76, 0x86, 0x0f, 0xf1, 0xe1, 0xb9, 0x70, 0xc8, 0xd8, 0x36,
-	0x29, 0xfe, 0xe8, 0x23, 0x28, 0x0e, 0xa2, 0x5c, 0x72, 0x18, 0x39, 0x59, 0xff, 0x0d, 0x88, 0x84,
+	0xc9, 0x4f, 0xe8, 0x6b, 0x28, 0xc5, 0x5b, 0x28, 0xa6, 0xa8, 0x78, 0xf8, 0x71, 0x3d, 0x75, 0x0e,
-	0x15, 0x1f, 0xff, 0x77, 0x2e, 0x8f, 0x84, 0x95, 0xaf, 0x17, 0xad, 0x04, 0x42, 0x76, 0xe1, 0xc3,
+	0xeb, 0x71, 0x37, 0xa6, 0x64, 0x8c, 0xde, 0x87, 0xc2, 0x30, 0x74, 0x2c, 0x2a, 0x93, 0x13, 0x64,
-	0x4c, 0x6e, 0x9c, 0x91, 0x3f, 0x0c, 0x40, 0x3d, 0x2a, 0x94, 0xf2, 0x31, 0xe7, 0xc6, 0x92, 0x9c,
+	0x9e, 0x80, 0x70, 0xca, 0xa2, 0x59, 0xf8, 0xc6, 0x61, 0xe1, 0x94, 0xe5, 0x6b, 0x05, 0x33, 0x86,
-	0x95, 0xc5, 0x39, 0x82, 0xaa, 0xe7, 0x0b, 0x77, 0xe0, 0xf6, 0xdf, 0xe4, 0x1c, 0x53, 0xd7, 0x70,
+	0x18, 0xbb, 0xf0, 0x5e, 0x2a, 0x51, 0x46, 0x8d, 0xdf, 0x35, 0x40, 0x7d, 0xc2, 0xa5, 0xf0, 0x51,
-	0xb2, 0x05, 0x9b, 0x1a, 0x03, 0xce, 0xc8, 0xdf, 0x06, 0x54, 0x7b, 0x54, 0x58, 0x93, 0x1d, 0x89,
+	0x02, 0xcd, 0xd7, 0x24, 0x20, 0x49, 0x6a, 0x1f, 0x2a, 0xae, 0xc7, 0x9d, 0xa1, 0x33, 0x78, 0x1a,
-	0x78, 0xd5, 0xa0, 0xd4, 0xd5, 0x17, 0xb2, 0xab, 0x2e, 0x64, 0x23, 0x75, 0x21, 0x1b, 0xda, 0x42,
+	0xf4, 0x28, 0x0f, 0x05, 0x37, 0x36, 0x61, 0x43, 0xa1, 0xc3, 0xa8, 0xf1, 0x97, 0x06, 0x95, 0x3e,
-	0x5a, 0xda, 0x42, 0x5a, 0xca, 0x42, 0x6a, 0x1d, 0xac, 0x64, 0x74, 0xb0, 0x09, 0xef, 0x4d, 0x31,
+	0xe1, 0xe6, 0x4c, 0x3d, 0x21, 0xc9, 0x2a, 0x14, 0x7b, 0xaa, 0x54, 0x7b, 0xb2, 0x54, 0x9b, 0x89,
-	0xe5, 0x8c, 0xfc, 0x02, 0xa8, 0xa5, 0x0f, 0x56, 0xa7, 0x67, 0xa4, 0xd2, 0x9b, 0x6a, 0x34, 0xa7,
+	0x52, 0x6d, 0x2a, 0x52, 0x35, 0x15, 0xa9, 0x9a, 0x92, 0x54, 0x95, 0x0c, 0x96, 0x52, 0x32, 0xd8,
-	0x35, 0x4a, 0xee, 0x60, 0xb3, 0xa5, 0x8f, 0x4d, 0x3b, 0xb9, 0xdc, 0x72, 0x27, 0x47, 0x6c, 0x2d,
+	0x80, 0x77, 0xe6, 0x98, 0x32, 0x6a, 0x7c, 0x07, 0xa8, 0xad, 0x56, 0x59, 0xa5, 0xa7, 0x25, 0xd2,
-	0x2d, 0x5f, 0x6c, 0xf0, 0x75, 0xd8, 0x50, 0x7b, 0xe0, 0x38, 0x27, 0xd5, 0x38, 0x0d, 0x93, 0x1f,
+	0x9b, 0x4b, 0x34, 0xa7, 0x24, 0x6a, 0xdc, 0xc2, 0x46, 0x5b, 0x2d, 0x9b, 0xd2, 0xc6, 0xdc, 0x2b,
-	0xe0, 0x7d, 0xbd, 0x04, 0x67, 0xe8, 0x5b, 0xa8, 0x28, 0xa0, 0x8c, 0x9f, 0xcd, 0x5d, 0x0d, 0x20,
+	0xda, 0x68, 0x58, 0x4a, 0x0c, 0xf6, 0xbc, 0x2e, 0xd4, 0x60, 0x5d, 0x4e, 0x88, 0xe1, 0x9c, 0x98,
-	0xe7, 0xb0, 0xdd, 0xa2, 0xe2, 0x62, 0x34, 0x5a, 0x9e, 0x3f, 0xf9, 0x19, 0x76, 0x52, 0x63, 0xff,
+	0xd3, 0x79, 0xd8, 0x20, 0xf0, 0xae, 0x1a, 0x82, 0x51, 0xd4, 0x85, 0xb2, 0x04, 0x0a, 0xfb, 0x0c,
-	0x17, 0x62, 0xff, 0x18, 0x80, 0x2f, 0x6d, 0xd1, 0x1f, 0xf6, 0x52, 0x66, 0xab, 0xa5, 0x37, 0x96,
+	0x89, 0xc8, 0xd6, 0xc6, 0x29, 0x6c, 0xb5, 0x09, 0x3f, 0x1b, 0x8f, 0xb3, 0x27, 0x63, 0x8c, 0x60,
-	0x4c, 0x3f, 0x5f, 0x2d, 0xa9, 0x72, 0xce, 0x67, 0xc8, 0xb9, 0x03, 0x1f, 0x64, 0x70, 0xe5, 0x2c,
+	0x3b, 0xd1, 0xf6, 0xed, 0xb3, 0xfc, 0x47, 0x03, 0x7c, 0x6e, 0xf1, 0xc1, 0xa8, 0x9f, 0x50, 0x75,
-	0x7a, 0x64, 0x7a, 0x61, 0xbf, 0x4f, 0x79, 0x4c, 0xb3, 0x68, 0xbd, 0x9a, 0xd1, 0xb3, 0x74, 0x65,
+	0x25, 0x96, 0xf6, 0x9a, 0x58, 0xff, 0x3f, 0x61, 0x89, 0x12, 0xc8, 0xa7, 0x48, 0xa0, 0x0b, 0x3b,
-	0xbb, 0x23, 0xea, 0x8c, 0xcf, 0x7d, 0x6c, 0x91, 0xaf, 0x60, 0xb7, 0x35, 0xd9, 0x8e, 0x6b, 0x5f,
+	0x29, 0xc4, 0x19, 0x0d, 0x57, 0x56, 0x3f, 0x18, 0x0c, 0x08, 0x8b, 0x38, 0x17, 0xcc, 0xc7, 0x63,
-	0x5c, 0x47, 0xf5, 0x5e, 0x62, 0x5e, 0xb2, 0xff, 0xc4, 0xbb, 0x65, 0x28, 0xef, 0x16, 0x39, 0x87,
+	0xb8, 0xe4, 0x2e, 0x2c, 0x67, 0x4c, 0xec, 0xe9, 0x78, 0x4c, 0x4f, 0xc6, 0x09, 0xec, 0xb6, 0x67,
-	0xbd, 0x59, 0xa1, 0x31, 0x9d, 0xf8, 0xb2, 0x9b, 0xd0, 0x19, 0x9b, 0x67, 0x7f, 0x15, 0xd4, 0x7b,
+	0x8a, 0xba, 0xf4, 0xf8, 0x65, 0x18, 0xef, 0x21, 0xe2, 0x25, 0x8a, 0x11, 0xdb, 0x82, 0x9a, 0xb4,
-	0x17, 0x79, 0xb0, 0x93, 0x71, 0x13, 0xa2, 0xba, 0x3a, 0xea, 0xec, 0xcb, 0xdc, 0xfc, 0x6c, 0x41,
+	0x05, 0x8d, 0x53, 0xd8, 0x5b, 0x64, 0x1a, 0xd1, 0x89, 0x5e, 0xcb, 0x19, 0x9d, 0xe9, 0xf1, 0xf0,
-	0x4f, 0xce, 0xd0, 0xf7, 0xb0, 0x31, 0x25, 0x73, 0x54, 0x53, 0xa3, 0xf5, 0xfb, 0xc1, 0xfc, 0x78,
+	0xdf, 0x15, 0xf9, 0x15, 0x47, 0xbf, 0x69, 0xb0, 0x9d, 0xf2, 0x96, 0xa2, 0xcf, 0x17, 0x14, 0x3e,
-	0x8e, 0x07, 0x67, 0xe8, 0x5e, 0x6e, 0xe8, 0xb4, 0x50, 0xd1, 0x81, 0x16, 0x99, 0xb2, 0x07, 0xe6,
+	0x7d, 0x51, 0xe8, 0x5f, 0xbc, 0xc4, 0x8c, 0x51, 0x44, 0x61, 0x7d, 0x4e, 0x28, 0xe8, 0xd3, 0x05,
-	0x27, 0x0b, 0x78, 0x71, 0x86, 0x7e, 0x84, 0xea, 0xf4, 0x8a, 0xa2, 0xd9, 0xd4, 0x64, 0x76, 0x32,
+	0xae, 0xd4, 0xb7, 0x47, 0xaf, 0x67, 0xb9, 0xce, 0x28, 0xfa, 0x45, 0xa8, 0x7f, 0x7e, 0xee, 0xd1,
-	0xcf, 0x85, 0x33, 0x34, 0x84, 0xad, 0x54, 0x75, 0xa1, 0x43, 0x35, 0x38, 0x6b, 0x5d, 0xcc, 0x4f,
+	0x67, 0x8b, 0xdd, 0x24, 0x68, 0x4c, 0x3f, 0xcc, 0x6a, 0xc2, 0x28, 0x62, 0x50, 0x99, 0x7f, 0x18,
-	0x17, 0xf2, 0x8b, 0x0f, 0xa0, 0x37, 0xfb, 0x00, 0x7a, 0x73, 0x0f, 0x20, 0xe5, 0x65, 0x42, 0x37,
+	0x50, 0x86, 0x0c, 0x44, 0xdc, 0x46, 0xa6, 0xfb, 0x8c, 0xa2, 0x5f, 0x35, 0xd8, 0x4c, 0x9c, 0x63,
-	0x50, 0x51, 0xae, 0x7b, 0xb4, 0xa7, 0xc5, 0x28, 0xaf, 0x96, 0xb9, 0x3f, 0xf3, 0x3b, 0x67, 0xe8,
+	0x74, 0xb4, 0xc0, 0x55, 0x9a, 0x64, 0xf5, 0xe3, 0xec, 0x46, 0x51, 0xa7, 0xfb, 0x19, 0x3a, 0xdd,
-	0x09, 0xcc, 0x6c, 0x9d, 0xa3, 0xcf, 0xb5, 0xa9, 0x66, 0x2f, 0x93, 0x79, 0xbc, 0xb8, 0x33, 0x67,
+	0xcf, 0xd6, 0xe9, 0x84, 0x5d, 0x8b, 0xbe, 0x87, 0xb2, 0xb4, 0xc0, 0xd0, 0x27, 0x8b, 0x1d, 0x48,
-	0x97, 0xc7, 0x3f, 0x1d, 0x75, 0x19, 0xf5, 0xda, 0x9d, 0x53, 0xf6, 0xeb, 0xc3, 0xa9, 0xfc, 0x27,
+	0x4b, 0x59, 0x3f, 0x78, 0xfe, 0x65, 0x46, 0xd1, 0x1f, 0x1a, 0xe8, 0xe9, 0x02, 0x45, 0x5f, 0x2e,
-	0x56, 0x7e, 0x93, 0xbf, 0x4e, 0x1a, 0xf7, 0x05, 0xe9, 0xf0, 0xc5, 0x7f, 0x01, 0x00, 0x00, 0xff,
+	0x6e, 0x59, 0xfa, 0x93, 0xa0, 0x9f, 0xbc, 0xd0, 0x92, 0xd1, 0xf3, 0x83, 0x6f, 0xf7, 0x23, 0xdb,
-	0xff, 0xfd, 0xe0, 0xa6, 0xa6, 0x57, 0x0b, 0x00, 0x00,
+	0x06, 0xfd, 0xe1, 0xae, 0x21, 0xfe, 0x20, 0xa4, 0x9f, 0x8a, 0xaf, 0xe2, 0x87, 0xdb, 0x65, 0x71,
+	0xe1, 0xe8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2b, 0xd1, 0xfb, 0x68, 0x85, 0x0c, 0x00, 0x00,
 }

pkg/proto/conversation/conversation.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = "OpenIM/pkg/proto/conversation;conversation";
-package conversation;
+package OpenIMServer.conversation;
 
 message Conversation{
   string ownerUserID = 1;

pkg/proto/friend/friend.pb.go

@@ -36,7 +36,7 @@ func (m *GetPaginationFriendsReq) Reset()         { *m = GetPaginationFriendsReq
 func (m *GetPaginationFriendsReq) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationFriendsReq) ProtoMessage()    {}
 func (*GetPaginationFriendsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{0}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{0}
 }
 func (m *GetPaginationFriendsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationFriendsReq.Unmarshal(m, b)
@@ -82,7 +82,7 @@ func (m *GetPaginationFriendsResp) Reset()         { *m = GetPaginationFriendsRe
 func (m *GetPaginationFriendsResp) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationFriendsResp) ProtoMessage()    {}
 func (*GetPaginationFriendsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{1}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{1}
 }
 func (m *GetPaginationFriendsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationFriendsResp.Unmarshal(m, b)
@@ -130,7 +130,7 @@ func (m *ApplyToAddFriendReq) Reset()         { *m = ApplyToAddFriendReq{} }
 func (m *ApplyToAddFriendReq) String() string { return proto.CompactTextString(m) }
 func (*ApplyToAddFriendReq) ProtoMessage()    {}
 func (*ApplyToAddFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{2}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{2}
 }
 func (m *ApplyToAddFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyToAddFriendReq.Unmarshal(m, b)
@@ -188,7 +188,7 @@ func (m *ApplyToAddFriendResp) Reset()         { *m = ApplyToAddFriendResp{} }
 func (m *ApplyToAddFriendResp) String() string { return proto.CompactTextString(m) }
 func (*ApplyToAddFriendResp) ProtoMessage()    {}
 func (*ApplyToAddFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{3}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{3}
 }
 func (m *ApplyToAddFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyToAddFriendResp.Unmarshal(m, b)
@@ -220,7 +220,7 @@ func (m *ImportFriendReq) Reset()         { *m = ImportFriendReq{} }
 func (m *ImportFriendReq) String() string { return proto.CompactTextString(m) }
 func (*ImportFriendReq) ProtoMessage()    {}
 func (*ImportFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{4}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{4}
 }
 func (m *ImportFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportFriendReq.Unmarshal(m, b)
@@ -264,7 +264,7 @@ func (m *ImportFriendResp) Reset()         { *m = ImportFriendResp{} }
 func (m *ImportFriendResp) String() string { return proto.CompactTextString(m) }
 func (*ImportFriendResp) ProtoMessage()    {}
 func (*ImportFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{5}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{5}
 }
 func (m *ImportFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ImportFriendResp.Unmarshal(m, b)
@@ -296,7 +296,7 @@ func (m *GetPaginationFriendsApplyToReq) Reset()         { *m = GetPaginationFri
 func (m *GetPaginationFriendsApplyToReq) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationFriendsApplyToReq) ProtoMessage()    {}
 func (*GetPaginationFriendsApplyToReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{6}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{6}
 }
 func (m *GetPaginationFriendsApplyToReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationFriendsApplyToReq.Unmarshal(m, b)
@@ -342,7 +342,7 @@ func (m *GetPaginationFriendsApplyToResp) Reset()         { *m = GetPaginationFr
 func (m *GetPaginationFriendsApplyToResp) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationFriendsApplyToResp) ProtoMessage()    {}
 func (*GetPaginationFriendsApplyToResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{7}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{7}
 }
 func (m *GetPaginationFriendsApplyToResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationFriendsApplyToResp.Unmarshal(m, b)
@@ -388,7 +388,7 @@ func (m *GetDesignatedFriendsReq) Reset()         { *m = GetDesignatedFriendsReq
 func (m *GetDesignatedFriendsReq) String() string { return proto.CompactTextString(m) }
 func (*GetDesignatedFriendsReq) ProtoMessage()    {}
 func (*GetDesignatedFriendsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{8}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{8}
 }
 func (m *GetDesignatedFriendsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDesignatedFriendsReq.Unmarshal(m, b)
@@ -433,7 +433,7 @@ func (m *GetDesignatedFriendsResp) Reset()         { *m = GetDesignatedFriendsRe
 func (m *GetDesignatedFriendsResp) String() string { return proto.CompactTextString(m) }
 func (*GetDesignatedFriendsResp) ProtoMessage()    {}
 func (*GetDesignatedFriendsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{9}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{9}
 }
 func (m *GetDesignatedFriendsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDesignatedFriendsResp.Unmarshal(m, b)
@@ -472,7 +472,7 @@ func (m *AddBlackReq) Reset()         { *m = AddBlackReq{} }
 func (m *AddBlackReq) String() string { return proto.CompactTextString(m) }
 func (*AddBlackReq) ProtoMessage()    {}
 func (*AddBlackReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{10}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{10}
 }
 func (m *AddBlackReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddBlackReq.Unmarshal(m, b)
@@ -516,7 +516,7 @@ func (m *AddBlackResp) Reset()         { *m = AddBlackResp{} }
 func (m *AddBlackResp) String() string { return proto.CompactTextString(m) }
 func (*AddBlackResp) ProtoMessage()    {}
 func (*AddBlackResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{11}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{11}
 }
 func (m *AddBlackResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddBlackResp.Unmarshal(m, b)
@@ -548,7 +548,7 @@ func (m *RemoveBlackReq) Reset()         { *m = RemoveBlackReq{} }
 func (m *RemoveBlackReq) String() string { return proto.CompactTextString(m) }
 func (*RemoveBlackReq) ProtoMessage()    {}
 func (*RemoveBlackReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{12}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{12}
 }
 func (m *RemoveBlackReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveBlackReq.Unmarshal(m, b)
@@ -592,7 +592,7 @@ func (m *RemoveBlackResp) Reset()         { *m = RemoveBlackResp{} }
 func (m *RemoveBlackResp) String() string { return proto.CompactTextString(m) }
 func (*RemoveBlackResp) ProtoMessage()    {}
 func (*RemoveBlackResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{13}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{13}
 }
 func (m *RemoveBlackResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RemoveBlackResp.Unmarshal(m, b)
@@ -624,7 +624,7 @@ func (m *GetPaginationBlacksReq) Reset()         { *m = GetPaginationBlacksReq{}
 func (m *GetPaginationBlacksReq) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationBlacksReq) ProtoMessage()    {}
 func (*GetPaginationBlacksReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{14}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{14}
 }
 func (m *GetPaginationBlacksReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationBlacksReq.Unmarshal(m, b)
@@ -670,7 +670,7 @@ func (m *GetPaginationBlacksResp) Reset()         { *m = GetPaginationBlacksResp
 func (m *GetPaginationBlacksResp) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationBlacksResp) ProtoMessage()    {}
 func (*GetPaginationBlacksResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{15}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{15}
 }
 func (m *GetPaginationBlacksResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationBlacksResp.Unmarshal(m, b)
@@ -716,7 +716,7 @@ func (m *IsFriendReq) Reset()         { *m = IsFriendReq{} }
 func (m *IsFriendReq) String() string { return proto.CompactTextString(m) }
 func (*IsFriendReq) ProtoMessage()    {}
 func (*IsFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{16}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{16}
 }
 func (m *IsFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsFriendReq.Unmarshal(m, b)
@@ -762,7 +762,7 @@ func (m *IsFriendResp) Reset()         { *m = IsFriendResp{} }
 func (m *IsFriendResp) String() string { return proto.CompactTextString(m) }
 func (*IsFriendResp) ProtoMessage()    {}
 func (*IsFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{17}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{17}
 }
 func (m *IsFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsFriendResp.Unmarshal(m, b)
@@ -808,7 +808,7 @@ func (m *IsBlackReq) Reset()         { *m = IsBlackReq{} }
 func (m *IsBlackReq) String() string { return proto.CompactTextString(m) }
 func (*IsBlackReq) ProtoMessage()    {}
 func (*IsBlackReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{18}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{18}
 }
 func (m *IsBlackReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsBlackReq.Unmarshal(m, b)
@@ -854,7 +854,7 @@ func (m *IsBlackResp) Reset()         { *m = IsBlackResp{} }
 func (m *IsBlackResp) String() string { return proto.CompactTextString(m) }
 func (*IsBlackResp) ProtoMessage()    {}
 func (*IsBlackResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{19}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{19}
 }
 func (m *IsBlackResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_IsBlackResp.Unmarshal(m, b)
@@ -900,7 +900,7 @@ func (m *DeleteFriendReq) Reset()         { *m = DeleteFriendReq{} }
 func (m *DeleteFriendReq) String() string { return proto.CompactTextString(m) }
 func (*DeleteFriendReq) ProtoMessage()    {}
 func (*DeleteFriendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{20}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{20}
 }
 func (m *DeleteFriendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteFriendReq.Unmarshal(m, b)
@@ -944,7 +944,7 @@ func (m *DeleteFriendResp) Reset()         { *m = DeleteFriendResp{} }
 func (m *DeleteFriendResp) String() string { return proto.CompactTextString(m) }
 func (*DeleteFriendResp) ProtoMessage()    {}
 func (*DeleteFriendResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{21}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{21}
 }
 func (m *DeleteFriendResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteFriendResp.Unmarshal(m, b)
@@ -979,7 +979,7 @@ func (m *RespondFriendApplyReq) Reset()         { *m = RespondFriendApplyReq{} }
 func (m *RespondFriendApplyReq) String() string { return proto.CompactTextString(m) }
 func (*RespondFriendApplyReq) ProtoMessage()    {}
 func (*RespondFriendApplyReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{22}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{22}
 }
 func (m *RespondFriendApplyReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RespondFriendApplyReq.Unmarshal(m, b)
@@ -1037,7 +1037,7 @@ func (m *RespondFriendApplyResp) Reset()         { *m = RespondFriendApplyResp{}
 func (m *RespondFriendApplyResp) String() string { return proto.CompactTextString(m) }
 func (*RespondFriendApplyResp) ProtoMessage()    {}
 func (*RespondFriendApplyResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{23}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{23}
 }
 func (m *RespondFriendApplyResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RespondFriendApplyResp.Unmarshal(m, b)
@@ -1070,7 +1070,7 @@ func (m *SetFriendRemarkReq) Reset()         { *m = SetFriendRemarkReq{} }
 func (m *SetFriendRemarkReq) String() string { return proto.CompactTextString(m) }
 func (*SetFriendRemarkReq) ProtoMessage()    {}
 func (*SetFriendRemarkReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{24}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{24}
 }
 func (m *SetFriendRemarkReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetFriendRemarkReq.Unmarshal(m, b)
@@ -1121,7 +1121,7 @@ func (m *SetFriendRemarkResp) Reset()         { *m = SetFriendRemarkResp{} }
 func (m *SetFriendRemarkResp) String() string { return proto.CompactTextString(m) }
 func (*SetFriendRemarkResp) ProtoMessage()    {}
 func (*SetFriendRemarkResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{25}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{25}
 }
 func (m *SetFriendRemarkResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetFriendRemarkResp.Unmarshal(m, b)
@@ -1153,7 +1153,7 @@ func (m *GetPaginationFriendsApplyFromReq) Reset()         { *m = GetPaginationF
 func (m *GetPaginationFriendsApplyFromReq) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationFriendsApplyFromReq) ProtoMessage()    {}
 func (*GetPaginationFriendsApplyFromReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{26}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{26}
 }
 func (m *GetPaginationFriendsApplyFromReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationFriendsApplyFromReq.Unmarshal(m, b)
@@ -1199,7 +1199,7 @@ func (m *GetPaginationFriendsApplyFromResp) Reset()         { *m = GetPagination
 func (m *GetPaginationFriendsApplyFromResp) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationFriendsApplyFromResp) ProtoMessage()    {}
 func (*GetPaginationFriendsApplyFromResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{27}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{27}
 }
 func (m *GetPaginationFriendsApplyFromResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationFriendsApplyFromResp.Unmarshal(m, b)
@@ -1244,7 +1244,7 @@ func (m *GetFriendIDsReq) Reset()         { *m = GetFriendIDsReq{} }
 func (m *GetFriendIDsReq) String() string { return proto.CompactTextString(m) }
 func (*GetFriendIDsReq) ProtoMessage()    {}
 func (*GetFriendIDsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{28}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{28}
 }
 func (m *GetFriendIDsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendIDsReq.Unmarshal(m, b)
@@ -1282,7 +1282,7 @@ func (m *GetFriendIDsResp) Reset()         { *m = GetFriendIDsResp{} }
 func (m *GetFriendIDsResp) String() string { return proto.CompactTextString(m) }
 func (*GetFriendIDsResp) ProtoMessage()    {}
 func (*GetFriendIDsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_friend_daca65d86d106412, []int{29}
+	return fileDescriptor_friend_9d5fa64eec103c7c, []int{29}
 }
 func (m *GetFriendIDsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetFriendIDsResp.Unmarshal(m, b)
@@ -1310,36 +1310,36 @@ func (m *GetFriendIDsResp) GetFriendIDs() []string {
 }
 
 func init() {
-	proto.RegisterType((*GetPaginationFriendsReq)(nil), "friend.getPaginationFriendsReq")
+	proto.RegisterType((*GetPaginationFriendsReq)(nil), "OpenIMServer.friend.getPaginationFriendsReq")
-	proto.RegisterType((*GetPaginationFriendsResp)(nil), "friend.getPaginationFriendsResp")
+	proto.RegisterType((*GetPaginationFriendsResp)(nil), "OpenIMServer.friend.getPaginationFriendsResp")
-	proto.RegisterType((*ApplyToAddFriendReq)(nil), "friend.applyToAddFriendReq")
+	proto.RegisterType((*ApplyToAddFriendReq)(nil), "OpenIMServer.friend.applyToAddFriendReq")
-	proto.RegisterType((*ApplyToAddFriendResp)(nil), "friend.applyToAddFriendResp")
+	proto.RegisterType((*ApplyToAddFriendResp)(nil), "OpenIMServer.friend.applyToAddFriendResp")
-	proto.RegisterType((*ImportFriendReq)(nil), "friend.importFriendReq")
+	proto.RegisterType((*ImportFriendReq)(nil), "OpenIMServer.friend.importFriendReq")
-	proto.RegisterType((*ImportFriendResp)(nil), "friend.importFriendResp")
+	proto.RegisterType((*ImportFriendResp)(nil), "OpenIMServer.friend.importFriendResp")
-	proto.RegisterType((*GetPaginationFriendsApplyToReq)(nil), "friend.getPaginationFriendsApplyToReq")
+	proto.RegisterType((*GetPaginationFriendsApplyToReq)(nil), "OpenIMServer.friend.getPaginationFriendsApplyToReq")
-	proto.RegisterType((*GetPaginationFriendsApplyToResp)(nil), "friend.getPaginationFriendsApplyToResp")
+	proto.RegisterType((*GetPaginationFriendsApplyToResp)(nil), "OpenIMServer.friend.getPaginationFriendsApplyToResp")
-	proto.RegisterType((*GetDesignatedFriendsReq)(nil), "friend.getDesignatedFriendsReq")
+	proto.RegisterType((*GetDesignatedFriendsReq)(nil), "OpenIMServer.friend.getDesignatedFriendsReq")
-	proto.RegisterType((*GetDesignatedFriendsResp)(nil), "friend.getDesignatedFriendsResp")
+	proto.RegisterType((*GetDesignatedFriendsResp)(nil), "OpenIMServer.friend.getDesignatedFriendsResp")
-	proto.RegisterType((*AddBlackReq)(nil), "friend.addBlackReq")
+	proto.RegisterType((*AddBlackReq)(nil), "OpenIMServer.friend.addBlackReq")
-	proto.RegisterType((*AddBlackResp)(nil), "friend.addBlackResp")
+	proto.RegisterType((*AddBlackResp)(nil), "OpenIMServer.friend.addBlackResp")
-	proto.RegisterType((*RemoveBlackReq)(nil), "friend.removeBlackReq")
+	proto.RegisterType((*RemoveBlackReq)(nil), "OpenIMServer.friend.removeBlackReq")
-	proto.RegisterType((*RemoveBlackResp)(nil), "friend.removeBlackResp")
+	proto.RegisterType((*RemoveBlackResp)(nil), "OpenIMServer.friend.removeBlackResp")
-	proto.RegisterType((*GetPaginationBlacksReq)(nil), "friend.getPaginationBlacksReq")
+	proto.RegisterType((*GetPaginationBlacksReq)(nil), "OpenIMServer.friend.getPaginationBlacksReq")
-	proto.RegisterType((*GetPaginationBlacksResp)(nil), "friend.getPaginationBlacksResp")
+	proto.RegisterType((*GetPaginationBlacksResp)(nil), "OpenIMServer.friend.getPaginationBlacksResp")
-	proto.RegisterType((*IsFriendReq)(nil), "friend.isFriendReq")
+	proto.RegisterType((*IsFriendReq)(nil), "OpenIMServer.friend.isFriendReq")
-	proto.RegisterType((*IsFriendResp)(nil), "friend.isFriendResp")
+	proto.RegisterType((*IsFriendResp)(nil), "OpenIMServer.friend.isFriendResp")
-	proto.RegisterType((*IsBlackReq)(nil), "friend.isBlackReq")
+	proto.RegisterType((*IsBlackReq)(nil), "OpenIMServer.friend.isBlackReq")
-	proto.RegisterType((*IsBlackResp)(nil), "friend.isBlackResp")
+	proto.RegisterType((*IsBlackResp)(nil), "OpenIMServer.friend.isBlackResp")
-	proto.RegisterType((*DeleteFriendReq)(nil), "friend.deleteFriendReq")
+	proto.RegisterType((*DeleteFriendReq)(nil), "OpenIMServer.friend.deleteFriendReq")
-	proto.RegisterType((*DeleteFriendResp)(nil), "friend.deleteFriendResp")
+	proto.RegisterType((*DeleteFriendResp)(nil), "OpenIMServer.friend.deleteFriendResp")
-	proto.RegisterType((*RespondFriendApplyReq)(nil), "friend.respondFriendApplyReq")
+	proto.RegisterType((*RespondFriendApplyReq)(nil), "OpenIMServer.friend.respondFriendApplyReq")
-	proto.RegisterType((*RespondFriendApplyResp)(nil), "friend.respondFriendApplyResp")
+	proto.RegisterType((*RespondFriendApplyResp)(nil), "OpenIMServer.friend.respondFriendApplyResp")
-	proto.RegisterType((*SetFriendRemarkReq)(nil), "friend.setFriendRemarkReq")
+	proto.RegisterType((*SetFriendRemarkReq)(nil), "OpenIMServer.friend.setFriendRemarkReq")
-	proto.RegisterType((*SetFriendRemarkResp)(nil), "friend.setFriendRemarkResp")
+	proto.RegisterType((*SetFriendRemarkResp)(nil), "OpenIMServer.friend.setFriendRemarkResp")
-	proto.RegisterType((*GetPaginationFriendsApplyFromReq)(nil), "friend.getPaginationFriendsApplyFromReq")
+	proto.RegisterType((*GetPaginationFriendsApplyFromReq)(nil), "OpenIMServer.friend.getPaginationFriendsApplyFromReq")
-	proto.RegisterType((*GetPaginationFriendsApplyFromResp)(nil), "friend.getPaginationFriendsApplyFromResp")
+	proto.RegisterType((*GetPaginationFriendsApplyFromResp)(nil), "OpenIMServer.friend.getPaginationFriendsApplyFromResp")
-	proto.RegisterType((*GetFriendIDsReq)(nil), "friend.getFriendIDsReq")
+	proto.RegisterType((*GetFriendIDsReq)(nil), "OpenIMServer.friend.getFriendIDsReq")
-	proto.RegisterType((*GetFriendIDsResp)(nil), "friend.getFriendIDsResp")
+	proto.RegisterType((*GetFriendIDsResp)(nil), "OpenIMServer.friend.getFriendIDsResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1395,7 +1395,7 @@ func NewFriendClient(cc *grpc.ClientConn) FriendClient {
 
 func (c *friendClient) ApplyToAddFriend(ctx context.Context, in *ApplyToAddFriendReq, opts ...grpc.CallOption) (*ApplyToAddFriendResp, error) {
 	out := new(ApplyToAddFriendResp)
-	err := grpc.Invoke(ctx, "/friend.friend/applyToAddFriend", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/applyToAddFriend", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1404,7 +1404,7 @@ func (c *friendClient) ApplyToAddFriend(ctx context.Context, in *ApplyToAddFrien
 
 func (c *friendClient) GetPaginationFriendsApplyTo(ctx context.Context, in *GetPaginationFriendsApplyToReq, opts ...grpc.CallOption) (*GetPaginationFriendsApplyToResp, error) {
 	out := new(GetPaginationFriendsApplyToResp)
-	err := grpc.Invoke(ctx, "/friend.friend/getPaginationFriendsApplyTo", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/getPaginationFriendsApplyTo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1413,7 +1413,7 @@ func (c *friendClient) GetPaginationFriendsApplyTo(ctx context.Context, in *GetP
 
 func (c *friendClient) GetPaginationFriendsApplyFrom(ctx context.Context, in *GetPaginationFriendsApplyFromReq, opts ...grpc.CallOption) (*GetPaginationFriendsApplyFromResp, error) {
 	out := new(GetPaginationFriendsApplyFromResp)
-	err := grpc.Invoke(ctx, "/friend.friend/getPaginationFriendsApplyFrom", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/getPaginationFriendsApplyFrom", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1422,7 +1422,7 @@ func (c *friendClient) GetPaginationFriendsApplyFrom(ctx context.Context, in *Ge
 
 func (c *friendClient) AddBlack(ctx context.Context, in *AddBlackReq, opts ...grpc.CallOption) (*AddBlackResp, error) {
 	out := new(AddBlackResp)
-	err := grpc.Invoke(ctx, "/friend.friend/addBlack", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/addBlack", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1431,7 +1431,7 @@ func (c *friendClient) AddBlack(ctx context.Context, in *AddBlackReq, opts ...gr
 
 func (c *friendClient) RemoveBlack(ctx context.Context, in *RemoveBlackReq, opts ...grpc.CallOption) (*RemoveBlackResp, error) {
 	out := new(RemoveBlackResp)
-	err := grpc.Invoke(ctx, "/friend.friend/removeBlack", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/removeBlack", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1440,7 +1440,7 @@ func (c *friendClient) RemoveBlack(ctx context.Context, in *RemoveBlackReq, opts
 
 func (c *friendClient) IsFriend(ctx context.Context, in *IsFriendReq, opts ...grpc.CallOption) (*IsFriendResp, error) {
 	out := new(IsFriendResp)
-	err := grpc.Invoke(ctx, "/friend.friend/isFriend", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/isFriend", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1449,7 +1449,7 @@ func (c *friendClient) IsFriend(ctx context.Context, in *IsFriendReq, opts ...gr
 
 func (c *friendClient) IsBlack(ctx context.Context, in *IsBlackReq, opts ...grpc.CallOption) (*IsBlackResp, error) {
 	out := new(IsBlackResp)
-	err := grpc.Invoke(ctx, "/friend.friend/isBlack", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/isBlack", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1458,7 +1458,7 @@ func (c *friendClient) IsBlack(ctx context.Context, in *IsBlackReq, opts ...grpc
 
 func (c *friendClient) GetPaginationBlacks(ctx context.Context, in *GetPaginationBlacksReq, opts ...grpc.CallOption) (*GetPaginationBlacksResp, error) {
 	out := new(GetPaginationBlacksResp)
-	err := grpc.Invoke(ctx, "/friend.friend/getPaginationBlacks", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/getPaginationBlacks", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1467,7 +1467,7 @@ func (c *friendClient) GetPaginationBlacks(ctx context.Context, in *GetPaginatio
 
 func (c *friendClient) DeleteFriend(ctx context.Context, in *DeleteFriendReq, opts ...grpc.CallOption) (*DeleteFriendResp, error) {
 	out := new(DeleteFriendResp)
-	err := grpc.Invoke(ctx, "/friend.friend/deleteFriend", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/deleteFriend", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1476,7 +1476,7 @@ func (c *friendClient) DeleteFriend(ctx context.Context, in *DeleteFriendReq, op
 
 func (c *friendClient) RespondFriendApply(ctx context.Context, in *RespondFriendApplyReq, opts ...grpc.CallOption) (*RespondFriendApplyResp, error) {
 	out := new(RespondFriendApplyResp)
-	err := grpc.Invoke(ctx, "/friend.friend/respondFriendApply", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/respondFriendApply", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1485,7 +1485,7 @@ func (c *friendClient) RespondFriendApply(ctx context.Context, in *RespondFriend
 
 func (c *friendClient) SetFriendRemark(ctx context.Context, in *SetFriendRemarkReq, opts ...grpc.CallOption) (*SetFriendRemarkResp, error) {
 	out := new(SetFriendRemarkResp)
-	err := grpc.Invoke(ctx, "/friend.friend/setFriendRemark", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/setFriendRemark", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1494,7 +1494,7 @@ func (c *friendClient) SetFriendRemark(ctx context.Context, in *SetFriendRemarkR
 
 func (c *friendClient) ImportFriends(ctx context.Context, in *ImportFriendReq, opts ...grpc.CallOption) (*ImportFriendResp, error) {
 	out := new(ImportFriendResp)
-	err := grpc.Invoke(ctx, "/friend.friend/importFriends", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/importFriends", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1503,7 +1503,7 @@ func (c *friendClient) ImportFriends(ctx context.Context, in *ImportFriendReq, o
 
 func (c *friendClient) GetDesignatedFriends(ctx context.Context, in *GetDesignatedFriendsReq, opts ...grpc.CallOption) (*GetDesignatedFriendsResp, error) {
 	out := new(GetDesignatedFriendsResp)
-	err := grpc.Invoke(ctx, "/friend.friend/getDesignatedFriends", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/getDesignatedFriends", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1512,7 +1512,7 @@ func (c *friendClient) GetDesignatedFriends(ctx context.Context, in *GetDesignat
 
 func (c *friendClient) GetPaginationFriends(ctx context.Context, in *GetPaginationFriendsReq, opts ...grpc.CallOption) (*GetPaginationFriendsResp, error) {
 	out := new(GetPaginationFriendsResp)
-	err := grpc.Invoke(ctx, "/friend.friend/getPaginationFriends", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/getPaginationFriends", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1521,7 +1521,7 @@ func (c *friendClient) GetPaginationFriends(ctx context.Context, in *GetPaginati
 
 func (c *friendClient) GetFriendIDs(ctx context.Context, in *GetFriendIDsReq, opts ...grpc.CallOption) (*GetFriendIDsResp, error) {
 	out := new(GetFriendIDsResp)
-	err := grpc.Invoke(ctx, "/friend.friend/getFriendIDs", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.friend.friend/getFriendIDs", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1577,7 +1577,7 @@ func _Friend_ApplyToAddFriend_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/ApplyToAddFriend",
+		FullMethod: "/OpenIMServer.friend.friend/ApplyToAddFriend",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).ApplyToAddFriend(ctx, req.(*ApplyToAddFriendReq))
@@ -1595,7 +1595,7 @@ func _Friend_GetPaginationFriendsApplyTo_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/GetPaginationFriendsApplyTo",
+		FullMethod: "/OpenIMServer.friend.friend/GetPaginationFriendsApplyTo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).GetPaginationFriendsApplyTo(ctx, req.(*GetPaginationFriendsApplyToReq))
@@ -1613,7 +1613,7 @@ func _Friend_GetPaginationFriendsApplyFrom_Handler(srv interface{}, ctx context.
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/GetPaginationFriendsApplyFrom",
+		FullMethod: "/OpenIMServer.friend.friend/GetPaginationFriendsApplyFrom",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).GetPaginationFriendsApplyFrom(ctx, req.(*GetPaginationFriendsApplyFromReq))
@@ -1631,7 +1631,7 @@ func _Friend_AddBlack_Handler(srv interface{}, ctx context.Context, dec func(int
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/AddBlack",
+		FullMethod: "/OpenIMServer.friend.friend/AddBlack",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).AddBlack(ctx, req.(*AddBlackReq))
@@ -1649,7 +1649,7 @@ func _Friend_RemoveBlack_Handler(srv interface{}, ctx context.Context, dec func(
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/RemoveBlack",
+		FullMethod: "/OpenIMServer.friend.friend/RemoveBlack",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).RemoveBlack(ctx, req.(*RemoveBlackReq))
@@ -1667,7 +1667,7 @@ func _Friend_IsFriend_Handler(srv interface{}, ctx context.Context, dec func(int
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/IsFriend",
+		FullMethod: "/OpenIMServer.friend.friend/IsFriend",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).IsFriend(ctx, req.(*IsFriendReq))
@@ -1685,7 +1685,7 @@ func _Friend_IsBlack_Handler(srv interface{}, ctx context.Context, dec func(inte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/IsBlack",
+		FullMethod: "/OpenIMServer.friend.friend/IsBlack",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).IsBlack(ctx, req.(*IsBlackReq))
@@ -1703,7 +1703,7 @@ func _Friend_GetPaginationBlacks_Handler(srv interface{}, ctx context.Context, d
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/GetPaginationBlacks",
+		FullMethod: "/OpenIMServer.friend.friend/GetPaginationBlacks",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).GetPaginationBlacks(ctx, req.(*GetPaginationBlacksReq))
@@ -1721,7 +1721,7 @@ func _Friend_DeleteFriend_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/DeleteFriend",
+		FullMethod: "/OpenIMServer.friend.friend/DeleteFriend",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).DeleteFriend(ctx, req.(*DeleteFriendReq))
@@ -1739,7 +1739,7 @@ func _Friend_RespondFriendApply_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/RespondFriendApply",
+		FullMethod: "/OpenIMServer.friend.friend/RespondFriendApply",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).RespondFriendApply(ctx, req.(*RespondFriendApplyReq))
@@ -1757,7 +1757,7 @@ func _Friend_SetFriendRemark_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/SetFriendRemark",
+		FullMethod: "/OpenIMServer.friend.friend/SetFriendRemark",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).SetFriendRemark(ctx, req.(*SetFriendRemarkReq))
@@ -1775,7 +1775,7 @@ func _Friend_ImportFriends_Handler(srv interface{}, ctx context.Context, dec fun
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/ImportFriends",
+		FullMethod: "/OpenIMServer.friend.friend/ImportFriends",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).ImportFriends(ctx, req.(*ImportFriendReq))
@@ -1793,7 +1793,7 @@ func _Friend_GetDesignatedFriends_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/GetDesignatedFriends",
+		FullMethod: "/OpenIMServer.friend.friend/GetDesignatedFriends",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).GetDesignatedFriends(ctx, req.(*GetDesignatedFriendsReq))
@@ -1811,7 +1811,7 @@ func _Friend_GetPaginationFriends_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/GetPaginationFriends",
+		FullMethod: "/OpenIMServer.friend.friend/GetPaginationFriends",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).GetPaginationFriends(ctx, req.(*GetPaginationFriendsReq))
@@ -1829,7 +1829,7 @@ func _Friend_GetFriendIDs_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/friend.friend/GetFriendIDs",
+		FullMethod: "/OpenIMServer.friend.friend/GetFriendIDs",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(FriendServer).GetFriendIDs(ctx, req.(*GetFriendIDsReq))
@@ -1838,7 +1838,7 @@ func _Friend_GetFriendIDs_Handler(srv interface{}, ctx context.Context, dec func
 }
 
 var _Friend_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "friend.friend",
+	ServiceName: "OpenIMServer.friend.friend",
 	HandlerType: (*FriendServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -1906,71 +1906,73 @@ var _Friend_serviceDesc = grpc.ServiceDesc{
 	Metadata: "friend/friend.proto",
 }
 
-func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_daca65d86d106412) }
+func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_9d5fa64eec103c7c) }
 
-var fileDescriptor_friend_daca65d86d106412 = []byte{
+var fileDescriptor_friend_9d5fa64eec103c7c = []byte{
-	// 994 bytes of a gzipped FileDescriptorProto
+	// 1029 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x51, 0x6f, 0xdb, 0x46,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0xdb, 0xc6,
-	0x0c, 0x86, 0x9d, 0x25, 0x4d, 0x68, 0xd7, 0x4e, 0x69, 0xd7, 0x15, 0x94, 0xd6, 0xf1, 0x0e, 0x43,
+	0x12, 0x06, 0xe5, 0x67, 0xc7, 0x1e, 0x29, 0x92, 0xdf, 0xc8, 0x71, 0x05, 0xb6, 0x71, 0xe8, 0x6d,
-	0xeb, 0x3e, 0x34, 0x5e, 0x5d, 0x0c, 0x18, 0xb0, 0x61, 0x98, 0x83, 0xa0, 0x80, 0x07, 0x04, 0xdd,
+	0xd2, 0x28, 0x4d, 0x2c, 0x35, 0x4a, 0xd3, 0x4b, 0x2f, 0xb1, 0xe1, 0x06, 0x10, 0x50, 0x23, 0x2d,
-	0xd4, 0x76, 0x43, 0xf6, 0x30, 0x40, 0x9d, 0xcf, 0x9e, 0x67, 0x5b, 0xba, 0x88, 0x4a, 0xd3, 0xfe,
+	0x9b, 0xa0, 0x4d, 0x13, 0x14, 0x60, 0xca, 0x95, 0x2a, 0x58, 0x22, 0xd7, 0x1c, 0x3a, 0x76, 0x4e,
-	0x90, 0x01, 0xfb, 0xb9, 0x83, 0x74, 0x27, 0xdd, 0x49, 0x96, 0x55, 0x77, 0x4d, 0x9f, 0x0c, 0x92,
+	0x45, 0x8b, 0x1e, 0x7a, 0xea, 0xad, 0xf7, 0xfe, 0xa9, 0x05, 0xb9, 0xa4, 0xb8, 0xa4, 0x96, 0xb2,
-	0xdf, 0x91, 0x3c, 0x92, 0xfa, 0x78, 0x86, 0xd6, 0x34, 0x98, 0x73, 0x6f, 0x32, 0x90, 0x3f, 0x27,
+	0xe4, 0x1a, 0x39, 0x09, 0x33, 0xfa, 0xe6, 0xc7, 0xce, 0xcc, 0xce, 0xb7, 0x84, 0xe6, 0x20, 0x18,
-	0x22, 0xf0, 0x43, 0x1f, 0xf7, 0xa4, 0x64, 0x3f, 0x7a, 0x21, 0xb8, 0xf7, 0x64, 0x7c, 0xfe, 0xe4,
+	0x71, 0xcf, 0xed, 0xca, 0x9f, 0x8e, 0x08, 0xfc, 0xd0, 0xc7, 0xe6, 0x33, 0xc1, 0xbd, 0xfe, 0xd1,
-	0x25, 0x0f, 0xde, 0xf2, 0x60, 0x20, 0x16, 0xb3, 0x41, 0x8c, 0x18, 0xd0, 0x64, 0x71, 0x4d, 0x83,
+	0x77, 0x3c, 0x78, 0xcb, 0x83, 0x8e, 0xfc, 0xcb, 0xbc, 0x1b, 0x29, 0xf7, 0xfa, 0x47, 0x7b, 0x52,
-	0x6b, 0x92, 0x07, 0xd8, 0x02, 0xee, 0xcd, 0x78, 0xf8, 0xb3, 0x3b, 0x9b, 0x7b, 0x6e, 0x38, 0xf7,
+	0xdd, 0x15, 0xc7, 0xc3, 0x6e, 0x0c, 0xef, 0x92, 0x7b, 0x7c, 0x46, 0xdd, 0x33, 0x92, 0xd6, 0xec,
-	0xbd, 0xe7, 0xf1, 0x79, 0x72, 0xf8, 0x25, 0x7e, 0x0b, 0x20, 0x52, 0xbd, 0x55, 0xe9, 0x55, 0xfa,
+	0x1c, 0x3e, 0x18, 0xf2, 0xf0, 0x1b, 0x67, 0x38, 0xf2, 0x9c, 0x70, 0xe4, 0x7b, 0x4f, 0x63, 0x7b,
-	0xb5, 0xa1, 0x75, 0x12, 0x9f, 0x3f, 0x71, 0xf8, 0xe5, 0x15, 0x27, 0xe3, 0x9c, 0x63, 0x60, 0xb1,
+	0xb2, 0xf9, 0x09, 0x7e, 0x05, 0x20, 0xa6, 0xfa, 0x96, 0x61, 0x19, 0xed, 0x6a, 0xef, 0x4e, 0x27,
-	0x03, 0x7b, 0x57, 0xc4, 0x83, 0xf1, 0x99, 0x55, 0xed, 0x55, 0xfa, 0x07, 0x8e, 0x92, 0x18, 0x07,
+	0x17, 0x2d, 0x76, 0xd6, 0xb1, 0xf9, 0xc9, 0x29, 0x27, 0xc5, 0x89, 0xad, 0x18, 0xe2, 0x36, 0xac,
-	0xab, 0x38, 0x18, 0x09, 0x7c, 0x06, 0x35, 0x25, 0x8e, 0xbd, 0xa9, 0x6f, 0x55, 0x7a, 0x3b, 0xfd,
+	0x9d, 0x12, 0x0f, 0xfa, 0x87, 0xad, 0x8a, 0x65, 0xb4, 0x37, 0xec, 0x44, 0x62, 0x01, 0xb4, 0xf4,
-	0xda, 0xf0, 0x8e, 0x0a, 0x27, 0x2d, 0x91, 0xc1, 0x31, 0x51, 0xd8, 0x86, 0xdd, 0xd0, 0x0f, 0xdd,
+	0x91, 0x49, 0xe0, 0x13, 0xa8, 0x26, 0x62, 0xdf, 0x1b, 0xf8, 0x2d, 0xc3, 0x5a, 0x69, 0x57, 0x7b,
-	0x65, 0x1c, 0x67, 0xd7, 0x91, 0x02, 0x7b, 0x0f, 0x2d, 0x57, 0x88, 0xe5, 0xfb, 0x57, 0xfe, 0x68,
+	0x3b, 0xba, 0xd8, 0x12, 0x16, 0xa1, 0x6c, 0xd5, 0x04, 0xb7, 0x60, 0x35, 0xf4, 0x43, 0x67, 0x1c,
-	0x32, 0x91, 0xf0, 0xe8, 0x3e, 0x5d, 0x80, 0x69, 0xe0, 0xaf, 0x5e, 0xcb, 0xcc, 0x2a, 0x71, 0x66,
+	0x07, 0x5d, 0xb5, 0xa5, 0xc0, 0xde, 0x41, 0xd3, 0x11, 0x62, 0xfc, 0xee, 0xb9, 0xbf, 0xef, 0xba,
-	0x86, 0x06, 0x6d, 0xd8, 0x0f, 0xfd, 0xd7, 0x66, 0xde, 0xa9, 0x1c, 0xdd, 0x28, 0xe0, 0x97, 0xe7,
+	0x12, 0x1e, 0x9d, 0x74, 0x07, 0x60, 0x10, 0xf8, 0x93, 0x17, 0x32, 0x4d, 0x23, 0x4e, 0x53, 0xd1,
-	0x34, 0xb3, 0x76, 0xe4, 0x8d, 0xa4, 0x84, 0x0d, 0xa8, 0xf2, 0x77, 0xd6, 0x17, 0xb1, 0xae, 0xca,
+	0xa0, 0x09, 0xeb, 0xa1, 0xff, 0x42, 0x3d, 0xc4, 0x54, 0x8e, 0x8e, 0x17, 0xf0, 0x93, 0x23, 0x1a,
-	0xdf, 0xb1, 0x0e, 0xb4, 0xd7, 0x43, 0x93, 0x60, 0x17, 0xd0, 0x9c, 0xaf, 0x84, 0x1f, 0x84, 0x3a,
+	0xb6, 0x56, 0xe4, 0xf1, 0xa4, 0x84, 0x75, 0xa8, 0xf0, 0xf3, 0xd6, 0xff, 0x62, 0x5d, 0x85, 0x9f,
-	0x9d, 0x1e, 0xd4, 0xfc, 0x6b, 0x8f, 0x07, 0x99, 0x7c, 0x4c, 0x15, 0x7e, 0x05, 0xb7, 0x65, 0x3b,
+	0xb3, 0x6d, 0xd8, 0x9a, 0x0d, 0x4d, 0x82, 0xbd, 0x84, 0xc6, 0x68, 0x22, 0xfc, 0x20, 0xcc, 0xd2,
-	0xa5, 0x4c, 0x56, 0xb5, 0xb7, 0xd3, 0x3f, 0x70, 0xb2, 0x4a, 0x86, 0x70, 0x98, 0x75, 0x4d, 0x82,
+	0xb1, 0xa0, 0xea, 0x9f, 0x79, 0x3c, 0xc8, 0xe5, 0xa3, 0xaa, 0xf0, 0x36, 0x5c, 0x97, 0x8d, 0x96,
-	0x05, 0xd0, 0x2d, 0x2a, 0xf4, 0x48, 0xa6, 0x16, 0x45, 0xd7, 0x2d, 0xaa, 0x98, 0x2d, 0xca, 0x35,
+	0x32, 0xb5, 0x2a, 0xd6, 0x4a, 0x7b, 0xc3, 0xce, 0x2b, 0x19, 0xc2, 0x66, 0xde, 0x35, 0x09, 0xf6,
-	0xbd, 0xba, 0x7d, 0xd3, 0xd9, 0x15, 0x1c, 0x97, 0xc6, 0x24, 0x81, 0xdf, 0x43, 0x23, 0xbd, 0x7f,
+	0x2b, 0xec, 0xe8, 0xaa, 0xbe, 0x2f, 0x53, 0x8b, 0xa2, 0x67, 0xfd, 0x32, 0xd4, 0x7e, 0x15, 0xc6,
-	0xe4, 0x89, 0x54, 0x9b, 0xdb, 0x99, 0x36, 0x2b, 0xa3, 0x93, 0xc3, 0x6e, 0x68, 0xb6, 0x1b, 0x0f,
+	0xa1, 0x72, 0xc9, 0x71, 0x60, 0xbf, 0x1b, 0x70, 0x6b, 0x6e, 0x06, 0x24, 0xb0, 0x0f, 0xf5, 0x69,
-	0xf0, 0x19, 0xa7, 0xf9, 0xcc, 0x73, 0x43, 0x3e, 0x31, 0x06, 0xf8, 0xa6, 0x2a, 0xfc, 0x22, 0x1e,
+	0x35, 0x22, 0x57, 0x94, 0x4c, 0xc0, 0x6e, 0xf9, 0x04, 0x24, 0x48, 0xbb, 0x60, 0x58, 0x32, 0x07,
-	0xdb, 0x82, 0x10, 0x72, 0x6c, 0xa7, 0x5b, 0x8d, 0xad, 0x81, 0x62, 0xbf, 0x40, 0xcd, 0x9d, 0x4c,
+	0x4e, 0x3c, 0xf5, 0x87, 0x9c, 0x46, 0x43, 0xcf, 0x09, 0xb9, 0xab, 0x4c, 0xfd, 0x55, 0x15, 0xff,
-	0x4e, 0x97, 0xee, 0x9f, 0x8b, 0xed, 0xf2, 0xec, 0x41, 0xed, 0x4d, 0x84, 0xce, 0x4c, 0xa7, 0xa9,
+	0x75, 0x3c, 0xde, 0x9a, 0x10, 0x72, 0xbc, 0x07, 0xcb, 0x8f, 0xb7, 0x62, 0xc2, 0xbe, 0x85, 0xaa,
-	0x62, 0x0d, 0xa8, 0x6b, 0x97, 0x24, 0xd8, 0x2b, 0x68, 0x04, 0x7c, 0xe5, 0xbf, 0xe5, 0x37, 0x1a,
+	0xe3, 0xba, 0x07, 0x63, 0xe7, 0xe7, 0xe3, 0xc5, 0x92, 0xb6, 0xa0, 0xfa, 0x26, 0x42, 0xe7, 0xa6,
-	0xe5, 0x0e, 0x34, 0x33, 0x5e, 0x49, 0xb0, 0xbf, 0xa1, 0x93, 0x69, 0x7b, 0x6c, 0xa1, 0xcf, 0x33,
+	0x58, 0x55, 0xb1, 0x3a, 0xd4, 0x32, 0x97, 0x24, 0xd8, 0x73, 0xa8, 0x07, 0x7c, 0xe2, 0xbf, 0xe5,
-	0x62, 0x17, 0x39, 0xb2, 0x4a, 0x62, 0x91, 0xc0, 0x3e, 0xec, 0xc5, 0x89, 0x26, 0x23, 0x75, 0xa8,
+	0x57, 0x1a, 0xe5, 0xff, 0xd0, 0xc8, 0x79, 0x25, 0xc1, 0xce, 0x60, 0x3b, 0x37, 0x10, 0xf1, 0x3f,
-	0x1c, 0xc6, 0x90, 0xb8, 0x03, 0xca, 0xbe, 0x61, 0x8c, 0x46, 0x50, 0x9b, 0x93, 0xfe, 0x38, 0x2d,
+	0xf4, 0x1e, 0x46, 0x71, 0x50, 0xd8, 0x7d, 0x69, 0x60, 0x12, 0xf8, 0x18, 0xd6, 0xe2, 0xac, 0xd3,
-	0xb8, 0x25, 0xb3, 0x7d, 0xaa, 0x92, 0x4f, 0x44, 0x6d, 0x19, 0xaa, 0x02, 0x25, 0x22, 0xfb, 0x03,
+	0xc9, 0xbb, 0xa9, 0xf3, 0x1e, 0xe3, 0xe3, 0xde, 0x24, 0xe0, 0x92, 0x69, 0xdb, 0x87, 0xea, 0x88,
-	0xea, 0xda, 0x05, 0x09, 0x7c, 0x08, 0x8d, 0xb9, 0x17, 0x15, 0xee, 0xa9, 0x1a, 0x98, 0xd8, 0xd5,
+	0xb2, 0xeb, 0xdd, 0x82, 0x6b, 0xf2, 0x1c, 0x0f, 0x93, 0x63, 0xa5, 0x62, 0xf6, 0x4f, 0x2f, 0x29,
-	0xbe, 0x93, 0xd3, 0x6a, 0xdc, 0x30, 0xc1, 0x55, 0x4d, 0x5c, 0xa2, 0x65, 0x3f, 0x02, 0xcc, 0x29,
+	0x5d, 0x2a, 0xb2, 0x9f, 0xa0, 0x96, 0xb9, 0x20, 0x81, 0x9f, 0x40, 0x7d, 0xe4, 0x45, 0x25, 0x7d,
-	0x6d, 0xe7, 0xff, 0xc9, 0xf0, 0x22, 0xba, 0x64, 0xda, 0xba, 0x68, 0xfa, 0x55, 0x2a, 0xa7, 0x49,
+	0x98, 0xcc, 0x55, 0xec, 0x6a, 0xdd, 0x2e, 0x68, 0x33, 0x5c, 0x2f, 0xc5, 0x55, 0x54, 0x5c, 0xaa,
-	0xe9, 0xa2, 0xb8, 0x59, 0xa5, 0x46, 0x0d, 0x15, 0xaa, 0x6a, 0xa2, 0x94, 0x92, 0xfd, 0x06, 0xcd,
+	0x65, 0x4f, 0x00, 0x46, 0x34, 0x6d, 0xf4, 0x65, 0x32, 0x7c, 0x19, 0x1d, 0x72, 0xda, 0xd4, 0xe8,
-	0x09, 0x5f, 0xf2, 0x90, 0x7f, 0x0c, 0xc1, 0x31, 0xa8, 0x9b, 0x5f, 0x9a, 0x4a, 0x37, 0xa3, 0x8b,
+	0x92, 0x24, 0xa9, 0x1c, 0xa4, 0x75, 0x8c, 0xe2, 0xe6, 0x95, 0x19, 0xaa, 0x97, 0xa0, 0x2a, 0x2a,
-	0xe8, 0x2d, 0xeb, 0x98, 0x04, 0xfb, 0xa7, 0x02, 0x77, 0x03, 0x4e, 0xc2, 0xf7, 0xd4, 0xb7, 0x18,
+	0x2a, 0x51, 0xb2, 0xef, 0xa1, 0xe1, 0xf2, 0x31, 0x0f, 0xf9, 0x32, 0x2b, 0x92, 0x41, 0x4d, 0xbd,
-	0x93, 0xcc, 0xa7, 0x72, 0x3c, 0x83, 0xfa, 0x5f, 0xae, 0x37, 0x59, 0x72, 0x87, 0xd3, 0xd5, 0x32,
+	0x90, 0x49, 0xba, 0x39, 0x5d, 0xb4, 0x20, 0xf3, 0x8e, 0x49, 0xb0, 0xbf, 0x0d, 0xb8, 0x11, 0x70,
-	0x8c, 0x99, 0x7e, 0xd7, 0xc9, 0xe8, 0xf0, 0x3e, 0x1c, 0x48, 0x39, 0x5a, 0x05, 0x92, 0xf6, 0xb5,
+	0x12, 0xbe, 0x97, 0x5c, 0xd9, 0x78, 0x31, 0xfd, 0x57, 0x96, 0x60, 0x50, 0xfb, 0xc5, 0xf1, 0xdc,
-	0x82, 0x59, 0xd0, 0x29, 0x4a, 0x2b, 0x26, 0x64, 0x24, 0x9e, 0x32, 0xf4, 0xca, 0x0d, 0x16, 0x37,
+	0x31, 0xb7, 0x39, 0x9d, 0x8e, 0xc3, 0x98, 0x2b, 0x56, 0xed, 0x9c, 0x0e, 0x3f, 0x82, 0x0d, 0x29,
-	0x56, 0x21, 0xb9, 0x9b, 0x22, 0x97, 0x7a, 0x37, 0x45, 0x12, 0xbb, 0x0b, 0xad, 0xb5, 0x98, 0x24,
+	0x47, 0x64, 0x22, 0x89, 0x23, 0x53, 0xb0, 0x16, 0x6c, 0xeb, 0xd2, 0x22, 0xc1, 0x02, 0x40, 0xe2,
-	0x58, 0x08, 0xbd, 0x8d, 0x3c, 0xfd, 0x3c, 0xf0, 0x57, 0x9f, 0xe7, 0xd3, 0xbd, 0x86, 0x2f, 0x3f,
+	0xd3, 0x1d, 0x3f, 0x71, 0x82, 0xe3, 0x2b, 0xab, 0x90, 0x64, 0xb7, 0xc8, 0x65, 0xc6, 0x6e, 0x91,
-	0x10, 0x55, 0xee, 0x87, 0xe9, 0x47, 0xec, 0x87, 0xe9, 0x36, 0xfb, 0xe1, 0x31, 0x34, 0x67, 0x49,
+	0xc4, 0x6e, 0x40, 0x73, 0x26, 0x26, 0x09, 0xf6, 0x9b, 0x01, 0x56, 0xe9, 0x72, 0x7f, 0x1a, 0xf8,
-	0x15, 0xc6, 0x67, 0x65, 0xc4, 0xc4, 0xbe, 0x86, 0xc3, 0x2c, 0x94, 0x44, 0xd4, 0xf0, 0x69, 0xa2,
+	0x93, 0xf7, 0x70, 0xab, 0xff, 0x30, 0x60, 0xf7, 0x82, 0x1c, 0x24, 0xc5, 0x0c, 0x2e, 0x4b, 0x31,
-	0x88, 0xb3, 0x39, 0x70, 0xb4, 0x62, 0xf8, 0xef, 0x01, 0xa8, 0x17, 0x17, 0x9e, 0xc3, 0x61, 0x7e,
+	0x83, 0x45, 0x28, 0xe6, 0x1e, 0x34, 0x86, 0x69, 0x85, 0xfa, 0x87, 0xf3, 0xd6, 0x19, 0xfb, 0x0c,
-	0xf3, 0xe3, 0xd1, 0x89, 0x7a, 0x9c, 0x15, 0x3c, 0x47, 0xec, 0xfb, 0x9b, 0x8d, 0x24, 0xd0, 0x83,
+	0x36, 0xf3, 0x50, 0x12, 0xd1, 0x30, 0x0c, 0x52, 0x45, 0x9c, 0xda, 0x86, 0x9d, 0x29, 0x7a, 0xff,
-	0xa3, 0x92, 0x6d, 0x8a, 0x0f, 0x93, 0xc3, 0xe5, 0x6b, 0xde, 0x7e, 0xb4, 0x15, 0x8e, 0x04, 0x86,
+	0xd4, 0x60, 0x4d, 0x4a, 0x38, 0x84, 0xcd, 0xe2, 0xbb, 0x02, 0xdb, 0x1d, 0xcd, 0x9b, 0xb0, 0xa3,
-	0xf0, 0xa0, 0xb4, 0x3f, 0xd8, 0xff, 0xa0, 0x27, 0x35, 0x3c, 0xf6, 0xe3, 0x2d, 0x91, 0x24, 0xf0,
+	0x79, 0xf9, 0x98, 0xf7, 0x16, 0x44, 0x92, 0xc0, 0x3f, 0x0d, 0xf8, 0x70, 0x0e, 0x71, 0xe3, 0x23,
-	0x1b, 0xd8, 0x4f, 0xb6, 0x16, 0xb6, 0xd2, 0x7a, 0xe8, 0xd5, 0x68, 0xb7, 0xd7, 0x95, 0x24, 0xf0,
+	0xad, 0xab, 0xf9, 0x8f, 0x0d, 0xf3, 0xf3, 0xe5, 0x8d, 0x48, 0xe0, 0x5f, 0x06, 0xdc, 0x9c, 0xdb,
-	0x07, 0xa8, 0x19, 0x6b, 0x08, 0x3b, 0x09, 0x28, 0xbb, 0xf1, 0xec, 0x7b, 0x85, 0x7a, 0x19, 0x36,
+	0x62, 0x7c, 0xbc, 0x9c, 0xdf, 0x64, 0x34, 0xcd, 0x2f, 0x2e, 0x63, 0x46, 0x02, 0x9f, 0xc1, 0x7a,
-	0x61, 0x6a, 0x1d, 0xd6, 0xa0, 0x7f, 0x1d, 0x36, 0x43, 0xe8, 0x43, 0xb8, 0xa5, 0xe8, 0x13, 0x51,
+	0xca, 0x9d, 0x68, 0xe9, 0x4b, 0x9a, 0xb1, 0xb5, 0xb9, 0x7b, 0x01, 0x82, 0x04, 0xfe, 0x00, 0x55,
-	0x03, 0xd2, 0x70, 0xad, 0x35, 0x1d, 0x09, 0xfc, 0x15, 0x5a, 0x05, 0x2b, 0x0b, 0xbb, 0x85, 0x35,
+	0x85, 0x26, 0xf1, 0x63, 0xad, 0x45, 0x9e, 0x9e, 0xcd, 0xdb, 0x17, 0x83, 0x64, 0xaa, 0x29, 0x93,
-	0x4a, 0x77, 0xa7, 0x7d, 0x5c, 0x6a, 0x27, 0x81, 0x23, 0xa8, 0x9b, 0xb4, 0x88, 0xe9, 0x5d, 0x73,
+	0x94, 0xa4, 0xaa, 0x70, 0x55, 0x49, 0xaa, 0x39, 0x2a, 0xfa, 0x1a, 0xae, 0x25, 0x8b, 0x1f, 0x6f,
-	0x2c, 0x6c, 0x5b, 0xc5, 0x06, 0x12, 0xf8, 0x12, 0x70, 0x9d, 0xad, 0xf0, 0x81, 0x2e, 0x5a, 0x01,
+	0x95, 0xa0, 0xa7, 0x29, 0x5a, 0xf3, 0x01, 0x24, 0x50, 0x40, 0x53, 0xc3, 0xc9, 0x78, 0xff, 0xe2,
-	0xc1, 0xda, 0xdd, 0x32, 0x33, 0x09, 0xfc, 0x09, 0x9a, 0x39, 0xd2, 0x41, 0x3b, 0x39, 0xb2, 0xce,
+	0xc6, 0x4c, 0x9f, 0x0d, 0xe6, 0x83, 0xc5, 0xc1, 0x24, 0xf0, 0x15, 0xd4, 0x54, 0x12, 0x40, 0x7d,
-	0x80, 0xf6, 0xd1, 0x46, 0x1b, 0x09, 0x3c, 0x85, 0xdb, 0xe6, 0xcb, 0x96, 0xf4, 0x25, 0x73, 0x6f,
+	0x19, 0x0b, 0x04, 0x64, 0xde, 0x59, 0x00, 0x45, 0x02, 0x27, 0x80, 0xb3, 0x5b, 0x1b, 0x3f, 0x2d,
-	0x69, 0x7d, 0xc9, 0xfc, 0x4b, 0x18, 0x2f, 0xa0, 0x5d, 0xf4, 0x76, 0x43, 0xb3, 0xc0, 0x45, 0x8f,
+	0xe9, 0x94, 0x86, 0x75, 0xcc, 0xfb, 0x0b, 0x63, 0x49, 0xa0, 0x0b, 0x8d, 0xc2, 0x5a, 0xc6, 0xbb,
-	0x47, 0xbb, 0x57, 0x0e, 0x48, 0x5d, 0xaf, 0x4d, 0x38, 0x1e, 0x97, 0xcd, 0x7f, 0xde, 0x75, 0xf1,
+	0x5a, 0xfb, 0x59, 0xc2, 0x30, 0xdb, 0x8b, 0x01, 0x49, 0xe0, 0x6b, 0xb8, 0xae, 0x7e, 0x57, 0x50,
-	0x9f, 0xa1, 0x11, 0xd4, 0x4d, 0x26, 0xd2, 0x17, 0xcf, 0x51, 0x99, 0xbe, 0x78, 0x9e, 0xb8, 0x4e,
+	0x49, 0xc9, 0x0a, 0x9f, 0x35, 0x25, 0x25, 0x2b, 0x7e, 0xa1, 0x20, 0xc1, 0x96, 0xee, 0xe1, 0x8c,
-	0x7b, 0xbf, 0x77, 0xa3, 0xff, 0x80, 0xe3, 0x73, 0xe3, 0xbf, 0x9f, 0xc4, 0x7e, 0x27, 0x7f, 0xde,
+	0xa5, 0x5d, 0xd5, 0x3d, 0xe3, 0xcd, 0xbd, 0x25, 0xd0, 0xd3, 0xa0, 0x33, 0xb7, 0x1c, 0x1f, 0x2c,
-	0xec, 0xc5, 0xca, 0x67, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x03, 0x81, 0x43, 0x21, 0x49, 0x0e,
+	0xbc, 0x10, 0xe6, 0x06, 0xd5, 0x7f, 0xe5, 0xbe, 0x82, 0x9a, 0xba, 0xf7, 0x4b, 0xca, 0x58, 0x60,
-	0x00, 0x00,
+	0x91, 0x92, 0x32, 0x16, 0x09, 0xe4, 0xc0, 0xfa, 0x71, 0x47, 0xe2, 0x94, 0x6f, 0x7f, 0x89, 0xfd,
+	0x52, 0xfe, 0xbc, 0x59, 0x8b, 0x95, 0x8f, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x16, 0x81, 0x4d,
+	0x78, 0x56, 0x10, 0x00, 0x00,
 }

pkg/proto/friend/friend.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 option go_package = "OpenIM/pkg/proto/friend;friend";
-package friend;
+package OpenIMServer.friend;
 
 message getPaginationFriendsReq{
   sdkws.RequestPagination pagination = 1;

pkg/proto/group/group.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
 option go_package = "OpenIM/pkg/proto/group;group";
-package group;
+package OpenIMServer.group;
 
 
 

pkg/proto/msg/msg.pb.go

@@ -37,7 +37,7 @@ func (m *MsgDataToMQ) Reset()         { *m = MsgDataToMQ{} }
 func (m *MsgDataToMQ) String() string { return proto.CompactTextString(m) }
 func (*MsgDataToMQ) ProtoMessage()    {}
 func (*MsgDataToMQ) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{0}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{0}
 }
 func (m *MsgDataToMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToMQ.Unmarshal(m, b)
@@ -82,7 +82,7 @@ func (m *MsgDataToDB) Reset()         { *m = MsgDataToDB{} }
 func (m *MsgDataToDB) String() string { return proto.CompactTextString(m) }
 func (*MsgDataToDB) ProtoMessage()    {}
 func (*MsgDataToDB) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{1}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{1}
 }
 func (m *MsgDataToDB) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToDB.Unmarshal(m, b)
@@ -121,7 +121,7 @@ func (m *PushMsgDataToMQ) Reset()         { *m = PushMsgDataToMQ{} }
 func (m *PushMsgDataToMQ) String() string { return proto.CompactTextString(m) }
 func (*PushMsgDataToMQ) ProtoMessage()    {}
 func (*PushMsgDataToMQ) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{2}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{2}
 }
 func (m *PushMsgDataToMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushMsgDataToMQ.Unmarshal(m, b)
@@ -169,7 +169,7 @@ func (m *MsgDataToMongoByMQ) Reset()         { *m = MsgDataToMongoByMQ{} }
 func (m *MsgDataToMongoByMQ) String() string { return proto.CompactTextString(m) }
 func (*MsgDataToMongoByMQ) ProtoMessage()    {}
 func (*MsgDataToMongoByMQ) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{3}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{3}
 }
 func (m *MsgDataToMongoByMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToMongoByMQ.Unmarshal(m, b)
@@ -228,7 +228,7 @@ func (m *GetMaxAndMinSeqReq) Reset()         { *m = GetMaxAndMinSeqReq{} }
 func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) }
 func (*GetMaxAndMinSeqReq) ProtoMessage()    {}
 func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{4}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{4}
 }
 func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b)
@@ -267,7 +267,7 @@ func (m *GetMaxAndMinSeqResp) Reset()         { *m = GetMaxAndMinSeqResp{} }
 func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) }
 func (*GetMaxAndMinSeqResp) ProtoMessage()    {}
 func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{5}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{5}
 }
 func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b)
@@ -312,7 +312,7 @@ func (m *SendMsgReq) Reset()         { *m = SendMsgReq{} }
 func (m *SendMsgReq) String() string { return proto.CompactTextString(m) }
 func (*SendMsgReq) ProtoMessage()    {}
 func (*SendMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{6}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{6}
 }
 func (m *SendMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendMsgReq.Unmarshal(m, b)
@@ -352,7 +352,7 @@ func (m *SendMsgResp) Reset()         { *m = SendMsgResp{} }
 func (m *SendMsgResp) String() string { return proto.CompactTextString(m) }
 func (*SendMsgResp) ProtoMessage()    {}
 func (*SendMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{7}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{7}
 }
 func (m *SendMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendMsgResp.Unmarshal(m, b)
@@ -404,7 +404,7 @@ func (m *ClearMsgReq) Reset()         { *m = ClearMsgReq{} }
 func (m *ClearMsgReq) String() string { return proto.CompactTextString(m) }
 func (*ClearMsgReq) ProtoMessage()    {}
 func (*ClearMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{8}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{8}
 }
 func (m *ClearMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClearMsgReq.Unmarshal(m, b)
@@ -441,7 +441,7 @@ func (m *ClearMsgResp) Reset()         { *m = ClearMsgResp{} }
 func (m *ClearMsgResp) String() string { return proto.CompactTextString(m) }
 func (*ClearMsgResp) ProtoMessage()    {}
 func (*ClearMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{9}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{9}
 }
 func (m *ClearMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClearMsgResp.Unmarshal(m, b)
@@ -474,7 +474,7 @@ func (m *SetMsgMinSeqReq) Reset()         { *m = SetMsgMinSeqReq{} }
 func (m *SetMsgMinSeqReq) String() string { return proto.CompactTextString(m) }
 func (*SetMsgMinSeqReq) ProtoMessage()    {}
 func (*SetMsgMinSeqReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{10}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{10}
 }
 func (m *SetMsgMinSeqReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMsgMinSeqReq.Unmarshal(m, b)
@@ -525,7 +525,7 @@ func (m *SetMsgMinSeqResp) Reset()         { *m = SetMsgMinSeqResp{} }
 func (m *SetMsgMinSeqResp) String() string { return proto.CompactTextString(m) }
 func (*SetMsgMinSeqResp) ProtoMessage()    {}
 func (*SetMsgMinSeqResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{11}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{11}
 }
 func (m *SetMsgMinSeqResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMsgMinSeqResp.Unmarshal(m, b)
@@ -556,7 +556,7 @@ func (m *SetSendMsgStatusReq) Reset()         { *m = SetSendMsgStatusReq{} }
 func (m *SetSendMsgStatusReq) String() string { return proto.CompactTextString(m) }
 func (*SetSendMsgStatusReq) ProtoMessage()    {}
 func (*SetSendMsgStatusReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{12}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{12}
 }
 func (m *SetSendMsgStatusReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetSendMsgStatusReq.Unmarshal(m, b)
@@ -593,7 +593,7 @@ func (m *SetSendMsgStatusResp) Reset()         { *m = SetSendMsgStatusResp{} }
 func (m *SetSendMsgStatusResp) String() string { return proto.CompactTextString(m) }
 func (*SetSendMsgStatusResp) ProtoMessage()    {}
 func (*SetSendMsgStatusResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{13}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{13}
 }
 func (m *SetSendMsgStatusResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetSendMsgStatusResp.Unmarshal(m, b)
@@ -623,7 +623,7 @@ func (m *GetSendMsgStatusReq) Reset()         { *m = GetSendMsgStatusReq{} }
 func (m *GetSendMsgStatusReq) String() string { return proto.CompactTextString(m) }
 func (*GetSendMsgStatusReq) ProtoMessage()    {}
 func (*GetSendMsgStatusReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{14}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{14}
 }
 func (m *GetSendMsgStatusReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSendMsgStatusReq.Unmarshal(m, b)
@@ -654,7 +654,7 @@ func (m *GetSendMsgStatusResp) Reset()         { *m = GetSendMsgStatusResp{} }
 func (m *GetSendMsgStatusResp) String() string { return proto.CompactTextString(m) }
 func (*GetSendMsgStatusResp) ProtoMessage()    {}
 func (*GetSendMsgStatusResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{15}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{15}
 }
 func (m *GetSendMsgStatusResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSendMsgStatusResp.Unmarshal(m, b)
@@ -693,7 +693,7 @@ func (m *DelSuperGroupMsgReq) Reset()         { *m = DelSuperGroupMsgReq{} }
 func (m *DelSuperGroupMsgReq) String() string { return proto.CompactTextString(m) }
 func (*DelSuperGroupMsgReq) ProtoMessage()    {}
 func (*DelSuperGroupMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{16}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{16}
 }
 func (m *DelSuperGroupMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelSuperGroupMsgReq.Unmarshal(m, b)
@@ -737,7 +737,7 @@ func (m *DelSuperGroupMsgResp) Reset()         { *m = DelSuperGroupMsgResp{} }
 func (m *DelSuperGroupMsgResp) String() string { return proto.CompactTextString(m) }
 func (*DelSuperGroupMsgResp) ProtoMessage()    {}
 func (*DelSuperGroupMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{17}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{17}
 }
 func (m *DelSuperGroupMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelSuperGroupMsgResp.Unmarshal(m, b)
@@ -769,7 +769,7 @@ func (m *GetSuperGroupMsgReq) Reset()         { *m = GetSuperGroupMsgReq{} }
 func (m *GetSuperGroupMsgReq) String() string { return proto.CompactTextString(m) }
 func (*GetSuperGroupMsgReq) ProtoMessage()    {}
 func (*GetSuperGroupMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{18}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{18}
 }
 func (m *GetSuperGroupMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSuperGroupMsgReq.Unmarshal(m, b)
@@ -814,7 +814,7 @@ func (m *GetSuperGroupMsgResp) Reset()         { *m = GetSuperGroupMsgResp{} }
 func (m *GetSuperGroupMsgResp) String() string { return proto.CompactTextString(m) }
 func (*GetSuperGroupMsgResp) ProtoMessage()    {}
 func (*GetSuperGroupMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{19}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{19}
 }
 func (m *GetSuperGroupMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSuperGroupMsgResp.Unmarshal(m, b)
@@ -852,7 +852,7 @@ func (m *GetWriteDiffMsgReq) Reset()         { *m = GetWriteDiffMsgReq{} }
 func (m *GetWriteDiffMsgReq) String() string { return proto.CompactTextString(m) }
 func (*GetWriteDiffMsgReq) ProtoMessage()    {}
 func (*GetWriteDiffMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{20}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{20}
 }
 func (m *GetWriteDiffMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetWriteDiffMsgReq.Unmarshal(m, b)
@@ -890,7 +890,7 @@ func (m *GetWriteDiffMsgResp) Reset()         { *m = GetWriteDiffMsgResp{} }
 func (m *GetWriteDiffMsgResp) String() string { return proto.CompactTextString(m) }
 func (*GetWriteDiffMsgResp) ProtoMessage()    {}
 func (*GetWriteDiffMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{21}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{21}
 }
 func (m *GetWriteDiffMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetWriteDiffMsgResp.Unmarshal(m, b)
@@ -936,7 +936,7 @@ func (m *ModifyMessageReactionExtensionsReq) Reset()         { *m = ModifyMessag
 func (m *ModifyMessageReactionExtensionsReq) String() string { return proto.CompactTextString(m) }
 func (*ModifyMessageReactionExtensionsReq) ProtoMessage()    {}
 func (*ModifyMessageReactionExtensionsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{22}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{22}
 }
 func (m *ModifyMessageReactionExtensionsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyMessageReactionExtensionsReq.Unmarshal(m, b)
@@ -1038,7 +1038,7 @@ func (m *SetMessageReactionExtensionsReq) Reset()         { *m = SetMessageReact
 func (m *SetMessageReactionExtensionsReq) String() string { return proto.CompactTextString(m) }
 func (*SetMessageReactionExtensionsReq) ProtoMessage()    {}
 func (*SetMessageReactionExtensionsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{23}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{23}
 }
 func (m *SetMessageReactionExtensionsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMessageReactionExtensionsReq.Unmarshal(m, b)
@@ -1135,7 +1135,7 @@ func (m *SetMessageReactionExtensionsResp) Reset()         { *m = SetMessageReac
 func (m *SetMessageReactionExtensionsResp) String() string { return proto.CompactTextString(m) }
 func (*SetMessageReactionExtensionsResp) ProtoMessage()    {}
 func (*SetMessageReactionExtensionsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{24}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{24}
 }
 func (m *SetMessageReactionExtensionsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMessageReactionExtensionsResp.Unmarshal(m, b)
@@ -1197,7 +1197,7 @@ func (m *GetMessagesReactionExtensionsReq) Reset()         { *m = GetMessagesRea
 func (m *GetMessagesReactionExtensionsReq) String() string { return proto.CompactTextString(m) }
 func (*GetMessagesReactionExtensionsReq) ProtoMessage()    {}
 func (*GetMessagesReactionExtensionsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{25}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{25}
 }
 func (m *GetMessagesReactionExtensionsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMessagesReactionExtensionsReq.Unmarshal(m, b)
@@ -1261,7 +1261,7 @@ func (m *GetMessagesReactionExtensionsReq_MessageReactionKey) String() string {
 }
 func (*GetMessagesReactionExtensionsReq_MessageReactionKey) ProtoMessage() {}
 func (*GetMessagesReactionExtensionsReq_MessageReactionKey) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{25, 0}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{25, 0}
 }
 func (m *GetMessagesReactionExtensionsReq_MessageReactionKey) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMessagesReactionExtensionsReq_MessageReactionKey.Unmarshal(m, b)
@@ -1306,7 +1306,7 @@ func (m *GetMessagesReactionExtensionsResp) Reset()         { *m = GetMessagesRe
 func (m *GetMessagesReactionExtensionsResp) String() string { return proto.CompactTextString(m) }
 func (*GetMessagesReactionExtensionsResp) ProtoMessage()    {}
 func (*GetMessagesReactionExtensionsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{26}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{26}
 }
 func (m *GetMessagesReactionExtensionsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMessagesReactionExtensionsResp.Unmarshal(m, b)
@@ -1345,7 +1345,7 @@ func (m *SingleMessageExtensionResult) Reset()         { *m = SingleMessageExten
 func (m *SingleMessageExtensionResult) String() string { return proto.CompactTextString(m) }
 func (*SingleMessageExtensionResult) ProtoMessage()    {}
 func (*SingleMessageExtensionResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{27}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{27}
 }
 func (m *SingleMessageExtensionResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SingleMessageExtensionResult.Unmarshal(m, b)
@@ -1391,7 +1391,7 @@ func (m *ModifyMessageReactionExtensionsResp) Reset()         { *m = ModifyMessa
 func (m *ModifyMessageReactionExtensionsResp) String() string { return proto.CompactTextString(m) }
 func (*ModifyMessageReactionExtensionsResp) ProtoMessage()    {}
 func (*ModifyMessageReactionExtensionsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{28}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{28}
 }
 func (m *ModifyMessageReactionExtensionsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ModifyMessageReactionExtensionsResp.Unmarshal(m, b)
@@ -1443,7 +1443,7 @@ func (m *DeleteMessagesReactionExtensionsReq) Reset()         { *m = DeleteMessa
 func (m *DeleteMessagesReactionExtensionsReq) String() string { return proto.CompactTextString(m) }
 func (*DeleteMessagesReactionExtensionsReq) ProtoMessage()    {}
 func (*DeleteMessagesReactionExtensionsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{29}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{29}
 }
 func (m *DeleteMessagesReactionExtensionsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteMessagesReactionExtensionsReq.Unmarshal(m, b)
@@ -1530,7 +1530,7 @@ func (m *DeleteMessagesReactionExtensionsResp) Reset()         { *m = DeleteMess
 func (m *DeleteMessagesReactionExtensionsResp) String() string { return proto.CompactTextString(m) }
 func (*DeleteMessagesReactionExtensionsResp) ProtoMessage()    {}
 func (*DeleteMessagesReactionExtensionsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{30}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{30}
 }
 func (m *DeleteMessagesReactionExtensionsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteMessagesReactionExtensionsResp.Unmarshal(m, b)
@@ -1568,7 +1568,7 @@ func (m *ExtendMsgResp) Reset()         { *m = ExtendMsgResp{} }
 func (m *ExtendMsgResp) String() string { return proto.CompactTextString(m) }
 func (*ExtendMsgResp) ProtoMessage()    {}
 func (*ExtendMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{31}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{31}
 }
 func (m *ExtendMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtendMsgResp.Unmarshal(m, b)
@@ -1610,7 +1610,7 @@ func (m *ExtendMsg) Reset()         { *m = ExtendMsg{} }
 func (m *ExtendMsg) String() string { return proto.CompactTextString(m) }
 func (*ExtendMsg) ProtoMessage()    {}
 func (*ExtendMsg) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{32}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{32}
 }
 func (m *ExtendMsg) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ExtendMsg.Unmarshal(m, b)
@@ -1678,7 +1678,7 @@ func (m *KeyValueResp) Reset()         { *m = KeyValueResp{} }
 func (m *KeyValueResp) String() string { return proto.CompactTextString(m) }
 func (*KeyValueResp) ProtoMessage()    {}
 func (*KeyValueResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{33}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{33}
 }
 func (m *KeyValueResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KeyValueResp.Unmarshal(m, b)
@@ -1732,7 +1732,7 @@ func (m *MsgDataToModifyByMQ) Reset()         { *m = MsgDataToModifyByMQ{} }
 func (m *MsgDataToModifyByMQ) String() string { return proto.CompactTextString(m) }
 func (*MsgDataToModifyByMQ) ProtoMessage()    {}
 func (*MsgDataToModifyByMQ) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{34}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{34}
 }
 func (m *MsgDataToModifyByMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToModifyByMQ.Unmarshal(m, b)
@@ -1785,7 +1785,7 @@ func (m *DelMsgsReq) Reset()         { *m = DelMsgsReq{} }
 func (m *DelMsgsReq) String() string { return proto.CompactTextString(m) }
 func (*DelMsgsReq) ProtoMessage()    {}
 func (*DelMsgsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{35}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{35}
 }
 func (m *DelMsgsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelMsgsReq.Unmarshal(m, b)
@@ -1829,7 +1829,7 @@ func (m *DelMsgsResp) Reset()         { *m = DelMsgsResp{} }
 func (m *DelMsgsResp) String() string { return proto.CompactTextString(m) }
 func (*DelMsgsResp) ProtoMessage()    {}
 func (*DelMsgsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_b6efe9433739ba68, []int{36}
+	return fileDescriptor_msg_dea1cc40e98cef94, []int{36}
 }
 func (m *DelMsgsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelMsgsResp.Unmarshal(m, b)
@@ -1850,48 +1850,48 @@ func (m *DelMsgsResp) XXX_DiscardUnknown() {
 var xxx_messageInfo_DelMsgsResp proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MsgDataToMQ)(nil), "msg.MsgDataToMQ")
+	proto.RegisterType((*MsgDataToMQ)(nil), "OpenIMServer.msg.MsgDataToMQ")
-	proto.RegisterType((*MsgDataToDB)(nil), "msg.MsgDataToDB")
+	proto.RegisterType((*MsgDataToDB)(nil), "OpenIMServer.msg.MsgDataToDB")
-	proto.RegisterType((*PushMsgDataToMQ)(nil), "msg.PushMsgDataToMQ")
+	proto.RegisterType((*PushMsgDataToMQ)(nil), "OpenIMServer.msg.PushMsgDataToMQ")
-	proto.RegisterType((*MsgDataToMongoByMQ)(nil), "msg.MsgDataToMongoByMQ")
+	proto.RegisterType((*MsgDataToMongoByMQ)(nil), "OpenIMServer.msg.MsgDataToMongoByMQ")
-	proto.RegisterType((*GetMaxAndMinSeqReq)(nil), "msg.GetMaxAndMinSeqReq")
+	proto.RegisterType((*GetMaxAndMinSeqReq)(nil), "OpenIMServer.msg.GetMaxAndMinSeqReq")
-	proto.RegisterType((*GetMaxAndMinSeqResp)(nil), "msg.GetMaxAndMinSeqResp")
+	proto.RegisterType((*GetMaxAndMinSeqResp)(nil), "OpenIMServer.msg.GetMaxAndMinSeqResp")
-	proto.RegisterType((*SendMsgReq)(nil), "msg.SendMsgReq")
+	proto.RegisterType((*SendMsgReq)(nil), "OpenIMServer.msg.SendMsgReq")
-	proto.RegisterType((*SendMsgResp)(nil), "msg.SendMsgResp")
+	proto.RegisterType((*SendMsgResp)(nil), "OpenIMServer.msg.SendMsgResp")
-	proto.RegisterType((*ClearMsgReq)(nil), "msg.ClearMsgReq")
+	proto.RegisterType((*ClearMsgReq)(nil), "OpenIMServer.msg.ClearMsgReq")
-	proto.RegisterType((*ClearMsgResp)(nil), "msg.ClearMsgResp")
+	proto.RegisterType((*ClearMsgResp)(nil), "OpenIMServer.msg.ClearMsgResp")
-	proto.RegisterType((*SetMsgMinSeqReq)(nil), "msg.SetMsgMinSeqReq")
+	proto.RegisterType((*SetMsgMinSeqReq)(nil), "OpenIMServer.msg.SetMsgMinSeqReq")
-	proto.RegisterType((*SetMsgMinSeqResp)(nil), "msg.SetMsgMinSeqResp")
+	proto.RegisterType((*SetMsgMinSeqResp)(nil), "OpenIMServer.msg.SetMsgMinSeqResp")
-	proto.RegisterType((*SetSendMsgStatusReq)(nil), "msg.SetSendMsgStatusReq")
+	proto.RegisterType((*SetSendMsgStatusReq)(nil), "OpenIMServer.msg.SetSendMsgStatusReq")
-	proto.RegisterType((*SetSendMsgStatusResp)(nil), "msg.SetSendMsgStatusResp")
+	proto.RegisterType((*SetSendMsgStatusResp)(nil), "OpenIMServer.msg.SetSendMsgStatusResp")
-	proto.RegisterType((*GetSendMsgStatusReq)(nil), "msg.GetSendMsgStatusReq")
+	proto.RegisterType((*GetSendMsgStatusReq)(nil), "OpenIMServer.msg.GetSendMsgStatusReq")
-	proto.RegisterType((*GetSendMsgStatusResp)(nil), "msg.GetSendMsgStatusResp")
+	proto.RegisterType((*GetSendMsgStatusResp)(nil), "OpenIMServer.msg.GetSendMsgStatusResp")
-	proto.RegisterType((*DelSuperGroupMsgReq)(nil), "msg.DelSuperGroupMsgReq")
+	proto.RegisterType((*DelSuperGroupMsgReq)(nil), "OpenIMServer.msg.DelSuperGroupMsgReq")
-	proto.RegisterType((*DelSuperGroupMsgResp)(nil), "msg.DelSuperGroupMsgResp")
+	proto.RegisterType((*DelSuperGroupMsgResp)(nil), "OpenIMServer.msg.DelSuperGroupMsgResp")
-	proto.RegisterType((*GetSuperGroupMsgReq)(nil), "msg.GetSuperGroupMsgReq")
+	proto.RegisterType((*GetSuperGroupMsgReq)(nil), "OpenIMServer.msg.GetSuperGroupMsgReq")
-	proto.RegisterType((*GetSuperGroupMsgResp)(nil), "msg.GetSuperGroupMsgResp")
+	proto.RegisterType((*GetSuperGroupMsgResp)(nil), "OpenIMServer.msg.GetSuperGroupMsgResp")
-	proto.RegisterType((*GetWriteDiffMsgReq)(nil), "msg.GetWriteDiffMsgReq")
+	proto.RegisterType((*GetWriteDiffMsgReq)(nil), "OpenIMServer.msg.GetWriteDiffMsgReq")
-	proto.RegisterType((*GetWriteDiffMsgResp)(nil), "msg.GetWriteDiffMsgResp")
+	proto.RegisterType((*GetWriteDiffMsgResp)(nil), "OpenIMServer.msg.GetWriteDiffMsgResp")
-	proto.RegisterType((*ModifyMessageReactionExtensionsReq)(nil), "msg.ModifyMessageReactionExtensionsReq")
+	proto.RegisterType((*ModifyMessageReactionExtensionsReq)(nil), "OpenIMServer.msg.ModifyMessageReactionExtensionsReq")
-	proto.RegisterMapType((map[string]*sdkws.KeyValue)(nil), "msg.ModifyMessageReactionExtensionsReq.ReactionExtensionsEntry")
+	proto.RegisterMapType((map[string]*sdkws.KeyValue)(nil), "OpenIMServer.msg.ModifyMessageReactionExtensionsReq.ReactionExtensionsEntry")
-	proto.RegisterType((*SetMessageReactionExtensionsReq)(nil), "msg.SetMessageReactionExtensionsReq")
+	proto.RegisterType((*SetMessageReactionExtensionsReq)(nil), "OpenIMServer.msg.SetMessageReactionExtensionsReq")
-	proto.RegisterMapType((map[string]*sdkws.KeyValue)(nil), "msg.SetMessageReactionExtensionsReq.ReactionExtensionsEntry")
+	proto.RegisterMapType((map[string]*sdkws.KeyValue)(nil), "OpenIMServer.msg.SetMessageReactionExtensionsReq.ReactionExtensionsEntry")
-	proto.RegisterType((*SetMessageReactionExtensionsResp)(nil), "msg.SetMessageReactionExtensionsResp")
+	proto.RegisterType((*SetMessageReactionExtensionsResp)(nil), "OpenIMServer.msg.SetMessageReactionExtensionsResp")
-	proto.RegisterType((*GetMessagesReactionExtensionsReq)(nil), "msg.GetMessagesReactionExtensionsReq")
+	proto.RegisterType((*GetMessagesReactionExtensionsReq)(nil), "OpenIMServer.msg.GetMessagesReactionExtensionsReq")
-	proto.RegisterType((*GetMessagesReactionExtensionsReq_MessageReactionKey)(nil), "msg.GetMessagesReactionExtensionsReq.MessageReactionKey")
+	proto.RegisterType((*GetMessagesReactionExtensionsReq_MessageReactionKey)(nil), "OpenIMServer.msg.GetMessagesReactionExtensionsReq.MessageReactionKey")
-	proto.RegisterType((*GetMessagesReactionExtensionsResp)(nil), "msg.GetMessagesReactionExtensionsResp")
+	proto.RegisterType((*GetMessagesReactionExtensionsResp)(nil), "OpenIMServer.msg.GetMessagesReactionExtensionsResp")
-	proto.RegisterType((*SingleMessageExtensionResult)(nil), "msg.SingleMessageExtensionResult")
+	proto.RegisterType((*SingleMessageExtensionResult)(nil), "OpenIMServer.msg.SingleMessageExtensionResult")
-	proto.RegisterMapType((map[string]*sdkws.KeyValue)(nil), "msg.SingleMessageExtensionResult.ReactionExtensionsEntry")
+	proto.RegisterMapType((map[string]*sdkws.KeyValue)(nil), "OpenIMServer.msg.SingleMessageExtensionResult.ReactionExtensionsEntry")
-	proto.RegisterType((*ModifyMessageReactionExtensionsResp)(nil), "msg.ModifyMessageReactionExtensionsResp")
+	proto.RegisterType((*ModifyMessageReactionExtensionsResp)(nil), "OpenIMServer.msg.ModifyMessageReactionExtensionsResp")
-	proto.RegisterType((*DeleteMessagesReactionExtensionsReq)(nil), "msg.DeleteMessagesReactionExtensionsReq")
+	proto.RegisterType((*DeleteMessagesReactionExtensionsReq)(nil), "OpenIMServer.msg.DeleteMessagesReactionExtensionsReq")
-	proto.RegisterType((*DeleteMessagesReactionExtensionsResp)(nil), "msg.DeleteMessagesReactionExtensionsResp")
+	proto.RegisterType((*DeleteMessagesReactionExtensionsResp)(nil), "OpenIMServer.msg.DeleteMessagesReactionExtensionsResp")
-	proto.RegisterType((*ExtendMsgResp)(nil), "msg.ExtendMsgResp")
+	proto.RegisterType((*ExtendMsgResp)(nil), "OpenIMServer.msg.ExtendMsgResp")
-	proto.RegisterType((*ExtendMsg)(nil), "msg.ExtendMsg")
+	proto.RegisterType((*ExtendMsg)(nil), "OpenIMServer.msg.ExtendMsg")
-	proto.RegisterMapType((map[string]*KeyValueResp)(nil), "msg.ExtendMsg.ReactionExtensionsEntry")
+	proto.RegisterMapType((map[string]*KeyValueResp)(nil), "OpenIMServer.msg.ExtendMsg.ReactionExtensionsEntry")
-	proto.RegisterType((*KeyValueResp)(nil), "msg.KeyValueResp")
+	proto.RegisterType((*KeyValueResp)(nil), "OpenIMServer.msg.KeyValueResp")
-	proto.RegisterType((*MsgDataToModifyByMQ)(nil), "msg.MsgDataToModifyByMQ")
+	proto.RegisterType((*MsgDataToModifyByMQ)(nil), "OpenIMServer.msg.MsgDataToModifyByMQ")
-	proto.RegisterType((*DelMsgsReq)(nil), "msg.DelMsgsReq")
+	proto.RegisterType((*DelMsgsReq)(nil), "OpenIMServer.msg.DelMsgsReq")
-	proto.RegisterType((*DelMsgsResp)(nil), "msg.DelMsgsResp")
+	proto.RegisterType((*DelMsgsResp)(nil), "OpenIMServer.msg.DelMsgsResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1938,7 +1938,7 @@ func NewMsgClient(cc *grpc.ClientConn) MsgClient {
 
 func (c *msgClient) GetMaxAndMinSeq(ctx context.Context, in *sdkws.GetMaxAndMinSeqReq, opts ...grpc.CallOption) (*sdkws.GetMaxAndMinSeqResp, error) {
 	out := new(sdkws.GetMaxAndMinSeqResp)
-	err := grpc.Invoke(ctx, "/msg.msg/GetMaxAndMinSeq", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/GetMaxAndMinSeq", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1947,7 +1947,7 @@ func (c *msgClient) GetMaxAndMinSeq(ctx context.Context, in *sdkws.GetMaxAndMinS
 
 func (c *msgClient) PullMessageBySeqs(ctx context.Context, in *sdkws.PullMessageBySeqsReq, opts ...grpc.CallOption) (*sdkws.PullMessageBySeqsResp, error) {
 	out := new(sdkws.PullMessageBySeqsResp)
-	err := grpc.Invoke(ctx, "/msg.msg/PullMessageBySeqs", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/PullMessageBySeqs", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1956,7 +1956,7 @@ func (c *msgClient) PullMessageBySeqs(ctx context.Context, in *sdkws.PullMessage
 
 func (c *msgClient) SendMsg(ctx context.Context, in *SendMsgReq, opts ...grpc.CallOption) (*SendMsgResp, error) {
 	out := new(SendMsgResp)
-	err := grpc.Invoke(ctx, "/msg.msg/SendMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/SendMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1965,7 +1965,7 @@ func (c *msgClient) SendMsg(ctx context.Context, in *SendMsgReq, opts ...grpc.Ca
 
 func (c *msgClient) DelMsgs(ctx context.Context, in *DelMsgsReq, opts ...grpc.CallOption) (*DelMsgsResp, error) {
 	out := new(DelMsgsResp)
-	err := grpc.Invoke(ctx, "/msg.msg/DelMsgs", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/DelMsgs", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1974,7 +1974,7 @@ func (c *msgClient) DelMsgs(ctx context.Context, in *DelMsgsReq, opts ...grpc.Ca
 
 func (c *msgClient) DelSuperGroupMsg(ctx context.Context, in *DelSuperGroupMsgReq, opts ...grpc.CallOption) (*DelSuperGroupMsgResp, error) {
 	out := new(DelSuperGroupMsgResp)
-	err := grpc.Invoke(ctx, "/msg.msg/DelSuperGroupMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/DelSuperGroupMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1983,7 +1983,7 @@ func (c *msgClient) DelSuperGroupMsg(ctx context.Context, in *DelSuperGroupMsgRe
 
 func (c *msgClient) ClearMsg(ctx context.Context, in *ClearMsgReq, opts ...grpc.CallOption) (*ClearMsgResp, error) {
 	out := new(ClearMsgResp)
-	err := grpc.Invoke(ctx, "/msg.msg/ClearMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/ClearMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1992,7 +1992,7 @@ func (c *msgClient) ClearMsg(ctx context.Context, in *ClearMsgReq, opts ...grpc.
 
 func (c *msgClient) SetSendMsgStatus(ctx context.Context, in *SetSendMsgStatusReq, opts ...grpc.CallOption) (*SetSendMsgStatusResp, error) {
 	out := new(SetSendMsgStatusResp)
-	err := grpc.Invoke(ctx, "/msg.msg/SetSendMsgStatus", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/SetSendMsgStatus", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2001,7 +2001,7 @@ func (c *msgClient) SetSendMsgStatus(ctx context.Context, in *SetSendMsgStatusRe
 
 func (c *msgClient) GetSendMsgStatus(ctx context.Context, in *GetSendMsgStatusReq, opts ...grpc.CallOption) (*GetSendMsgStatusResp, error) {
 	out := new(GetSendMsgStatusResp)
-	err := grpc.Invoke(ctx, "/msg.msg/GetSendMsgStatus", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/GetSendMsgStatus", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2010,7 +2010,7 @@ func (c *msgClient) GetSendMsgStatus(ctx context.Context, in *GetSendMsgStatusRe
 
 func (c *msgClient) SetMessageReactionExtensions(ctx context.Context, in *SetMessageReactionExtensionsReq, opts ...grpc.CallOption) (*SetMessageReactionExtensionsResp, error) {
 	out := new(SetMessageReactionExtensionsResp)
-	err := grpc.Invoke(ctx, "/msg.msg/SetMessageReactionExtensions", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/SetMessageReactionExtensions", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2019,7 +2019,7 @@ func (c *msgClient) SetMessageReactionExtensions(ctx context.Context, in *SetMes
 
 func (c *msgClient) GetMessagesReactionExtensions(ctx context.Context, in *GetMessagesReactionExtensionsReq, opts ...grpc.CallOption) (*GetMessagesReactionExtensionsResp, error) {
 	out := new(GetMessagesReactionExtensionsResp)
-	err := grpc.Invoke(ctx, "/msg.msg/GetMessagesReactionExtensions", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/GetMessagesReactionExtensions", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2028,7 +2028,7 @@ func (c *msgClient) GetMessagesReactionExtensions(ctx context.Context, in *GetMe
 
 func (c *msgClient) AddMessageReactionExtensions(ctx context.Context, in *ModifyMessageReactionExtensionsReq, opts ...grpc.CallOption) (*ModifyMessageReactionExtensionsResp, error) {
 	out := new(ModifyMessageReactionExtensionsResp)
-	err := grpc.Invoke(ctx, "/msg.msg/AddMessageReactionExtensions", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/AddMessageReactionExtensions", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2037,7 +2037,7 @@ func (c *msgClient) AddMessageReactionExtensions(ctx context.Context, in *Modify
 
 func (c *msgClient) DeleteMessageReactionExtensions(ctx context.Context, in *DeleteMessagesReactionExtensionsReq, opts ...grpc.CallOption) (*DeleteMessagesReactionExtensionsResp, error) {
 	out := new(DeleteMessagesReactionExtensionsResp)
-	err := grpc.Invoke(ctx, "/msg.msg/DeleteMessageReactionExtensions", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msg.msg/DeleteMessageReactionExtensions", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2084,7 +2084,7 @@ func _Msg_GetMaxAndMinSeq_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/GetMaxAndMinSeq",
+		FullMethod: "/OpenIMServer.msg.msg/GetMaxAndMinSeq",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).GetMaxAndMinSeq(ctx, req.(*sdkws.GetMaxAndMinSeqReq))
@@ -2102,7 +2102,7 @@ func _Msg_PullMessageBySeqs_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/PullMessageBySeqs",
+		FullMethod: "/OpenIMServer.msg.msg/PullMessageBySeqs",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).PullMessageBySeqs(ctx, req.(*sdkws.PullMessageBySeqsReq))
@@ -2120,7 +2120,7 @@ func _Msg_SendMsg_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/SendMsg",
+		FullMethod: "/OpenIMServer.msg.msg/SendMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).SendMsg(ctx, req.(*SendMsgReq))
@@ -2138,7 +2138,7 @@ func _Msg_DelMsgs_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/DelMsgs",
+		FullMethod: "/OpenIMServer.msg.msg/DelMsgs",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).DelMsgs(ctx, req.(*DelMsgsReq))
@@ -2156,7 +2156,7 @@ func _Msg_DelSuperGroupMsg_Handler(srv interface{}, ctx context.Context, dec fun
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/DelSuperGroupMsg",
+		FullMethod: "/OpenIMServer.msg.msg/DelSuperGroupMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).DelSuperGroupMsg(ctx, req.(*DelSuperGroupMsgReq))
@@ -2174,7 +2174,7 @@ func _Msg_ClearMsg_Handler(srv interface{}, ctx context.Context, dec func(interf
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/ClearMsg",
+		FullMethod: "/OpenIMServer.msg.msg/ClearMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).ClearMsg(ctx, req.(*ClearMsgReq))
@@ -2192,7 +2192,7 @@ func _Msg_SetSendMsgStatus_Handler(srv interface{}, ctx context.Context, dec fun
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/SetSendMsgStatus",
+		FullMethod: "/OpenIMServer.msg.msg/SetSendMsgStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).SetSendMsgStatus(ctx, req.(*SetSendMsgStatusReq))
@@ -2210,7 +2210,7 @@ func _Msg_GetSendMsgStatus_Handler(srv interface{}, ctx context.Context, dec fun
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/GetSendMsgStatus",
+		FullMethod: "/OpenIMServer.msg.msg/GetSendMsgStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).GetSendMsgStatus(ctx, req.(*GetSendMsgStatusReq))
@@ -2228,7 +2228,7 @@ func _Msg_SetMessageReactionExtensions_Handler(srv interface{}, ctx context.Cont
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/SetMessageReactionExtensions",
+		FullMethod: "/OpenIMServer.msg.msg/SetMessageReactionExtensions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).SetMessageReactionExtensions(ctx, req.(*SetMessageReactionExtensionsReq))
@@ -2246,7 +2246,7 @@ func _Msg_GetMessagesReactionExtensions_Handler(srv interface{}, ctx context.Con
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/GetMessagesReactionExtensions",
+		FullMethod: "/OpenIMServer.msg.msg/GetMessagesReactionExtensions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).GetMessagesReactionExtensions(ctx, req.(*GetMessagesReactionExtensionsReq))
@@ -2264,7 +2264,7 @@ func _Msg_AddMessageReactionExtensions_Handler(srv interface{}, ctx context.Cont
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/AddMessageReactionExtensions",
+		FullMethod: "/OpenIMServer.msg.msg/AddMessageReactionExtensions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).AddMessageReactionExtensions(ctx, req.(*ModifyMessageReactionExtensionsReq))
@@ -2282,7 +2282,7 @@ func _Msg_DeleteMessageReactionExtensions_Handler(srv interface{}, ctx context.C
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msg.msg/DeleteMessageReactionExtensions",
+		FullMethod: "/OpenIMServer.msg.msg/DeleteMessageReactionExtensions",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).DeleteMessageReactionExtensions(ctx, req.(*DeleteMessagesReactionExtensionsReq))
@@ -2291,7 +2291,7 @@ func _Msg_DeleteMessageReactionExtensions_Handler(srv interface{}, ctx context.C
 }
 
 var _Msg_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "msg.msg",
+	ServiceName: "OpenIMServer.msg.msg",
 	HandlerType: (*MsgServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -2347,102 +2347,104 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 	Metadata: "msg/msg.proto",
 }
 
-func init() { proto.RegisterFile("msg/msg.proto", fileDescriptor_msg_b6efe9433739ba68) }
+func init() { proto.RegisterFile("msg/msg.proto", fileDescriptor_msg_dea1cc40e98cef94) }
 
-var fileDescriptor_msg_b6efe9433739ba68 = []byte{
+var fileDescriptor_msg_dea1cc40e98cef94 = []byte{
-	// 1497 bytes of a gzipped FileDescriptorProto
+	// 1531 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0xdd, 0x72, 0xdb, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcb, 0x6f, 0xdb, 0x46,
-	0x14, 0x1e, 0xd9, 0xf9, 0xf3, 0x71, 0xd3, 0xa4, 0x9b, 0x50, 0x5c, 0x11, 0xa6, 0xee, 0xb6, 0x69,
+	0x13, 0x07, 0x25, 0xbf, 0x34, 0x8a, 0x13, 0x7f, 0x6b, 0x7f, 0xf9, 0x04, 0x7e, 0x4e, 0xa2, 0x32,
-	0xd3, 0x21, 0x71, 0x66, 0x02, 0x03, 0xe5, 0x6f, 0xda, 0xa6, 0x2e, 0x26, 0x53, 0x44, 0x5b, 0xb9,
+	0x2f, 0x17, 0x88, 0x65, 0xd4, 0x79, 0x20, 0x69, 0x0f, 0xad, 0x1d, 0x39, 0x86, 0x1b, 0x13, 0x4d,
-	0xb4, 0x0c, 0x5c, 0xa9, 0xf1, 0x46, 0x15, 0x91, 0xa5, 0x8d, 0x8e, 0xdc, 0xc6, 0xd7, 0x5c, 0x70,
+	0xa8, 0xb4, 0x05, 0x52, 0xa0, 0x28, 0x23, 0xad, 0x18, 0xc2, 0x14, 0xb9, 0xe6, 0x50, 0x89, 0x55,
-	0xc9, 0x2b, 0xf0, 0x12, 0x5c, 0x30, 0x5c, 0xf2, 0x00, 0xf0, 0x18, 0x3c, 0x06, 0xb3, 0xab, 0x95,
+	0xf4, 0x1a, 0xa0, 0x40, 0x2e, 0x3d, 0xf4, 0xda, 0x3f, 0xa0, 0x87, 0xfe, 0x1b, 0xbd, 0xf6, 0xd4,
-	0x2c, 0x59, 0x92, 0xed, 0x0c, 0xed, 0x0c, 0x17, 0xdc, 0xe9, 0xec, 0x7e, 0xe7, 0x67, 0xcf, 0x9f,
+	0x63, 0xff, 0x8c, 0xde, 0x8b, 0x5d, 0x3e, 0x44, 0x8a, 0x2b, 0x4a, 0x72, 0x92, 0xa2, 0x87, 0xde,
-	0x76, 0x0f, 0x2c, 0xf7, 0xd1, 0xde, 0xed, 0xa3, 0xdd, 0xe2, 0x81, 0x1f, 0xfa, 0xa4, 0xda, 0x47,
+	0x34, 0xcb, 0x99, 0xdf, 0xcc, 0xce, 0x6b, 0x77, 0x47, 0xb0, 0xdc, 0x43, 0x6b, 0xab, 0x87, 0x56,
-	0x5b, 0xbf, 0xf1, 0x90, 0x33, 0x6f, 0xe7, 0xc0, 0xd8, 0xe9, 0xb2, 0xe0, 0x25, 0x0b, 0x76, 0xf9,
+	0x83, 0xf9, 0x5e, 0xe0, 0x91, 0x95, 0xcf, 0x18, 0x75, 0x0f, 0xf4, 0x16, 0xf5, 0x5f, 0x50, 0xbf,
-	0xb1, 0xbd, 0x2b, 0xb7, 0x77, 0xb1, 0x77, 0xfc, 0x0a, 0x77, 0x5f, 0x61, 0x84, 0xd6, 0x77, 0xa6,
+	0xd1, 0x43, 0x4b, 0xbd, 0xce, 0x57, 0x36, 0x0f, 0xf4, 0xcd, 0x70, 0x6d, 0x8b, 0x1d, 0x59, 0x5b,
-	0x01, 0x03, 0x8b, 0x73, 0x16, 0x28, 0x38, 0x35, 0xa0, 0x6e, 0xa0, 0xdd, 0xb6, 0x42, 0xeb, 0x89,
+	0x82, 0x77, 0x0b, 0x3b, 0x47, 0x2f, 0x71, 0xeb, 0x25, 0x86, 0xa2, 0xea, 0xe6, 0x24, 0x46, 0xdf,
-	0x6f, 0x3c, 0x26, 0xeb, 0x30, 0x1f, 0xfa, 0xc7, 0xcc, 0x6b, 0x68, 0x4d, 0x6d, 0xab, 0x66, 0x46,
+	0x64, 0x8c, 0xfa, 0x11, 0xbb, 0xf6, 0x14, 0xaa, 0x3a, 0x5a, 0x4d, 0x33, 0x30, 0x9f, 0x78, 0xfa,
-	0x04, 0xd9, 0x82, 0xc5, 0x7e, 0x04, 0x6a, 0x54, 0x9a, 0xda, 0x56, 0x7d, 0xef, 0x7c, 0x4b, 0x0a,
+	0x63, 0xb2, 0x06, 0xf3, 0x81, 0x77, 0x44, 0xdd, 0x9a, 0x52, 0x57, 0x36, 0x2a, 0x46, 0x48, 0x90,
-	0x6b, 0x29, 0x56, 0x33, 0xde, 0xa6, 0x1f, 0xa5, 0xc4, 0xb5, 0xf7, 0xd3, 0x8c, 0xda, 0x64, 0xc6,
+	0xdb, 0xb0, 0xd8, 0x0b, 0x99, 0x6a, 0xa5, 0xba, 0xb2, 0x51, 0xdd, 0xfe, 0x7f, 0x23, 0x63, 0xa0,
-	0x67, 0xb0, 0xf2, 0x68, 0x80, 0x2f, 0xd2, 0xb6, 0xcc, 0xcc, 0x4c, 0x74, 0x58, 0x42, 0x7f, 0x10,
+	0x40, 0x6e, 0x44, 0x38, 0x46, 0xcc, 0xab, 0x35, 0x53, 0xd8, 0xcd, 0xdd, 0x34, 0x8a, 0x32, 0x03,
-	0x1c, 0xb2, 0x83, 0xb6, 0x34, 0xb0, 0x66, 0x26, 0x34, 0xfd, 0x45, 0x03, 0x32, 0x92, 0xea, 0x7b,
+	0x4a, 0x07, 0xce, 0x3d, 0xea, 0xe3, 0xf3, 0xb4, 0x95, 0xa7, 0x43, 0x22, 0x2a, 0x2c, 0xa1, 0xd7,
-	0xb6, 0xbf, 0x3f, 0x34, 0x1e, 0x93, 0x06, 0x2c, 0xba, 0x16, 0x86, 0x5d, 0x76, 0x22, 0x85, 0x57,
+	0xf7, 0xdb, 0xf4, 0xa0, 0x29, 0xf6, 0x51, 0x31, 0x12, 0x5a, 0xfb, 0x45, 0x01, 0x32, 0x54, 0xe1,
-	0xcd, 0x98, 0x24, 0xd7, 0x60, 0xd9, 0xb2, 0xed, 0x80, 0xd9, 0x56, 0xe8, 0xf8, 0x5e, 0x22, 0x31,
+	0xb9, 0x96, 0xb7, 0x3b, 0xd0, 0x1f, 0x93, 0x1a, 0x2c, 0x3a, 0x26, 0x06, 0x2d, 0x7a, 0x2c, 0x34,
-	0xbb, 0x48, 0xb6, 0x61, 0xa9, 0xcf, 0x10, 0x2d, 0x9b, 0x61, 0xa3, 0xda, 0xac, 0x6e, 0xd5, 0xf7,
+	0x95, 0x8d, 0x98, 0x24, 0x57, 0x60, 0xd9, 0xb4, 0x2c, 0x9f, 0x5a, 0x66, 0x60, 0x7b, 0x6e, 0x82,
-	0x56, 0x5b, 0x22, 0x64, 0xa9, 0x03, 0x98, 0x09, 0x82, 0x6c, 0x40, 0x2d, 0x0c, 0x1c, 0xdb, 0x66,
+	0x98, 0x5d, 0x24, 0xf7, 0x60, 0xa9, 0x47, 0x11, 0x4d, 0x8b, 0x62, 0xad, 0x5c, 0x2f, 0x6f, 0x54,
-	0xc1, 0x41, 0xbb, 0x31, 0x27, 0xe5, 0x8d, 0x16, 0xe8, 0x36, 0x90, 0x0e, 0x0b, 0x0d, 0xeb, 0xf4,
+	0xb7, 0x2f, 0x34, 0x46, 0x63, 0xdb, 0x48, 0x6d, 0xcd, 0x48, 0xd8, 0xc9, 0x3a, 0x54, 0x02, 0xdf,
-	0xae, 0xd7, 0x33, 0x1c, 0xaf, 0xcb, 0x4e, 0x4c, 0x76, 0x42, 0x2e, 0xc2, 0xc2, 0x37, 0x28, 0x19,
+	0xb6, 0x2c, 0xea, 0x1f, 0x34, 0x6b, 0x73, 0x02, 0x7c, 0xb8, 0xa0, 0xdd, 0x00, 0xb2, 0x4f, 0x03,
-	0xa2, 0x58, 0x28, 0x8a, 0xde, 0x87, 0xb5, 0x1c, 0x1a, 0xb9, 0x80, 0x1b, 0xd6, 0xe9, 0xe8, 0x3c,
+	0xdd, 0x3c, 0xd9, 0x71, 0x3b, 0xba, 0xed, 0xb6, 0xe8, 0xb1, 0x41, 0x8f, 0xc9, 0x79, 0x58, 0xf8,
-	0x8a, 0x92, 0xeb, 0x12, 0x25, 0xcf, 0x21, 0xd6, 0x25, 0x45, 0x3f, 0x04, 0xe8, 0x32, 0xaf, 0x67,
+	0x1c, 0x85, 0x40, 0x18, 0xbf, 0x88, 0xd2, 0xf6, 0x60, 0x35, 0xc7, 0x8d, 0x8c, 0xb3, 0xeb, 0xe6,
-	0xa0, 0x2d, 0x94, 0xa5, 0x7c, 0x5d, 0x9d, 0x1c, 0xa8, 0x3e, 0xd4, 0x13, 0x3e, 0xe4, 0xa4, 0x09,
+	0xc9, 0x70, 0x73, 0x11, 0x25, 0xd6, 0x05, 0x97, 0xd8, 0x14, 0x5f, 0x17, 0x94, 0x76, 0x1f, 0xa0,
-	0x75, 0x94, 0x89, 0x66, 0xa0, 0x9d, 0x98, 0x9a, 0x5e, 0x12, 0x88, 0x43, 0xd7, 0x61, 0x5e, 0x18,
+	0x45, 0xdd, 0x8e, 0x8e, 0x16, 0x57, 0x96, 0x8a, 0x42, 0x79, 0x86, 0x78, 0xf6, 0xa0, 0x9a, 0x80,
-	0x21, 0x22, 0x6f, 0xa6, 0x97, 0x64, 0xf8, 0x98, 0xd7, 0x7b, 0xe2, 0xf4, 0x99, 0xd4, 0x5e, 0x35,
+	0x20, 0x23, 0x75, 0xa8, 0xa2, 0xe0, 0xd7, 0xd1, 0x4a, 0xec, 0x4e, 0x2f, 0x71, 0x8e, 0xb6, 0x63,
-	0x13, 0x9a, 0x6e, 0x42, 0xfd, 0x9e, 0xcb, 0xac, 0x40, 0xd9, 0x79, 0x11, 0x16, 0x06, 0x19, 0xa7,
+	0x53, 0x37, 0x08, 0x39, 0x42, 0x3f, 0xa7, 0x97, 0x44, 0x60, 0xa9, 0xdb, 0x79, 0x62, 0xf7, 0xa8,
-	0x44, 0x14, 0x3d, 0x0f, 0xe7, 0x46, 0x30, 0xe4, 0xf4, 0x7b, 0x58, 0xe9, 0x32, 0x21, 0x3e, 0xe3,
+	0x30, 0xa5, 0x6c, 0x24, 0xb4, 0x76, 0x15, 0xaa, 0xf7, 0x1d, 0x6a, 0xfa, 0x91, 0xd1, 0xe7, 0x61,
-	0xcf, 0x22, 0x56, 0x91, 0x09, 0x76, 0xe0, 0x0f, 0x78, 0x62, 0x5b, 0x4c, 0x0a, 0x8e, 0x7e, 0xe4,
+	0xa1, 0x9f, 0xf1, 0x50, 0x48, 0x69, 0x67, 0xe1, 0xcc, 0x90, 0x0d, 0x99, 0xf6, 0x15, 0x9c, 0x6b,
-	0x3a, 0x61, 0xd5, 0xb2, 0xa9, 0x28, 0x4a, 0x60, 0x35, 0x2b, 0x1c, 0x39, 0xdd, 0x81, 0xb5, 0x2e,
+	0x51, 0x0e, 0x9f, 0x71, 0xae, 0x4c, 0x94, 0xe7, 0x88, 0xe5, 0x7b, 0x7d, 0x96, 0xd8, 0x16, 0x93,
-	0x0b, 0x95, 0x67, 0xba, 0xa1, 0x15, 0x0e, 0x50, 0x29, 0x45, 0x49, 0x48, 0xa5, 0xf3, 0xa6, 0xa2,
+	0x5c, 0xa2, 0x17, 0xfa, 0x91, 0x5b, 0xb5, 0x6c, 0x44, 0x94, 0x46, 0x60, 0x25, 0x0b, 0x8e, 0x4c,
-	0xe8, 0x45, 0x58, 0xcf, 0xc3, 0x91, 0xd3, 0xb7, 0x64, 0x70, 0xc7, 0xc5, 0xd0, 0x16, 0xac, 0x77,
+	0xdb, 0x84, 0xd5, 0x16, 0x0d, 0x22, 0xcf, 0xb4, 0x02, 0x33, 0xe8, 0x63, 0xa4, 0x14, 0x05, 0x21,
-	0x0a, 0xe0, 0xa5, 0xe2, 0x3b, 0xb0, 0xd6, 0x66, 0x6e, 0x77, 0xc0, 0x59, 0xd0, 0x11, 0x87, 0x99,
+	0x94, 0xce, 0x1b, 0x11, 0xa5, 0x9d, 0x87, 0xb5, 0x3c, 0x3b, 0x32, 0xed, 0xbf, 0x22, 0xd2, 0xa3,
-	0xec, 0xbd, 0x72, 0x17, 0x08, 0x3b, 0xf3, 0x82, 0x90, 0xd3, 0xbb, 0x91, 0x9d, 0xe3, 0x0a, 0x56,
+	0x30, 0x5a, 0x03, 0xd6, 0xf6, 0x25, 0xec, 0x63, 0xe1, 0xf7, 0x61, 0xb5, 0x49, 0x9d, 0x56, 0x9f,
-	0xa1, 0x3a, 0xca, 0x40, 0xf1, 0x39, 0x41, 0xf4, 0x9d, 0xe8, 0x4c, 0xe3, 0xa2, 0xcf, 0xd0, 0x33,
+	0x51, 0x7f, 0x9f, 0x6f, 0xa6, 0xd8, 0x7b, 0xe3, 0x5d, 0xc0, 0xed, 0xcc, 0x03, 0x21, 0xd3, 0x76,
-	0xae, 0xcb, 0xba, 0x79, 0x16, 0x38, 0x21, 0x6b, 0x3b, 0x47, 0x47, 0x65, 0x36, 0xd0, 0xdb, 0xd2,
+	0x42, 0x3b, 0x47, 0x15, 0xac, 0x40, 0x79, 0x98, 0x8e, 0xfc, 0x67, 0x01, 0xb4, 0x1e, 0xee, 0x69,
-	0xd8, 0x2c, 0x2e, 0xab, 0x68, 0x4a, 0x57, 0xfb, 0x7d, 0x0e, 0xa8, 0xe1, 0xf7, 0x9c, 0xa3, 0xa1,
+	0x14, 0xfa, 0xb4, 0x7d, 0xe6, 0x9a, 0xa8, 0xa8, 0x2f, 0x7d, 0x3b, 0xa0, 0x4d, 0xbb, 0xdb, 0x1d,
-	0x11, 0x55, 0xb4, 0xc9, 0xac, 0x43, 0xd1, 0x08, 0xee, 0x9f, 0x86, 0xcc, 0x43, 0xc7, 0xf7, 0x64,
+	0x67, 0x90, 0x76, 0x28, 0x2c, 0xcf, 0xf2, 0x65, 0xb5, 0xce, 0xd2, 0x23, 0x7f, 0x9f, 0x03, 0x4d,
-	0xb0, 0xd3, 0x6d, 0x48, 0xcb, 0xb6, 0xa1, 0xa8, 0x4e, 0x50, 0x40, 0x9f, 0x0c, 0x39, 0x93, 0x0a,
+	0xf7, 0x3a, 0x76, 0x77, 0xa0, 0x87, 0x85, 0x6f, 0x50, 0xb3, 0xcd, 0x9b, 0xc7, 0xde, 0x49, 0x40,
-	0xe7, 0xcd, 0xf4, 0x12, 0xf1, 0x81, 0x04, 0x39, 0xb1, 0xaa, 0xb7, 0xdc, 0x8e, 0x7a, 0xcb, 0x54,
+	0x5d, 0xb4, 0x3d, 0x57, 0xa4, 0x41, 0xba, 0x75, 0x29, 0xd9, 0xd6, 0x15, 0x56, 0x10, 0x72, 0xd6,
-	0x13, 0x5a, 0xf9, 0xd5, 0xfb, 0x5e, 0x18, 0x0c, 0xcd, 0x02, 0xd1, 0xe3, 0x85, 0x39, 0x97, 0x2f,
+	0x27, 0x03, 0x46, 0x85, 0xf6, 0x79, 0x23, 0xbd, 0x44, 0xbe, 0x03, 0xe2, 0xe7, 0x60, 0xa3, 0x7e,
-	0xcc, 0x6d, 0xa8, 0xb0, 0xd3, 0xc6, 0xbc, 0x74, 0xce, 0x46, 0xcb, 0xf6, 0x7d, 0xdb, 0x65, 0xd1,
+	0x74, 0x28, 0xe9, 0x47, 0x13, 0xed, 0x69, 0xe4, 0x57, 0xf7, 0xdc, 0xc0, 0x1f, 0x18, 0x12, 0x3d,
-	0x7f, 0xe3, 0xf9, 0xe0, 0xa8, 0xd5, 0x0d, 0x03, 0xc7, 0xb3, 0x9f, 0x5a, 0xee, 0x80, 0x99, 0x15,
+	0xa3, 0xf5, 0x3b, 0x97, 0xaf, 0xdf, 0x1b, 0x50, 0xa2, 0x27, 0xb5, 0x79, 0xe1, 0xb6, 0xf5, 0x86,
-	0x76, 0x4a, 0xee, 0xc0, 0x39, 0x2b, 0x0c, 0xad, 0xc3, 0x17, 0xac, 0x77, 0xe0, 0x1d, 0xf9, 0x8d,
+	0xe5, 0x79, 0x96, 0x43, 0xc3, 0xf3, 0xe9, 0x59, 0xbf, 0xdb, 0x68, 0x05, 0xbe, 0xed, 0x5a, 0x5f,
-	0x85, 0x19, 0xf8, 0x32, 0x1c, 0x22, 0x59, 0x1c, 0x94, 0x47, 0x68, 0x2c, 0x36, 0xb5, 0xad, 0x25,
+	0x98, 0x4e, 0x9f, 0x1a, 0x25, 0x7a, 0x42, 0x3e, 0x81, 0x33, 0x66, 0x10, 0x98, 0xed, 0xe7, 0xb4,
-	0x33, 0x26, 0xc9, 0x1e, 0xac, 0x3b, 0x28, 0x6c, 0x0f, 0x3c, 0xcb, 0x4d, 0xb9, 0x67, 0x49, 0xc2,
+	0x73, 0xe0, 0x76, 0xbd, 0xda, 0xc2, 0x14, 0x72, 0x19, 0x09, 0x9e, 0x53, 0x36, 0x8a, 0x2d, 0xd4,
-	0x0a, 0xf7, 0x48, 0x0b, 0x48, 0x1f, 0xed, 0x2f, 0x9c, 0x00, 0xc3, 0xc8, 0x73, 0xb2, 0xc1, 0xd4,
+	0x16, 0xeb, 0xca, 0xc6, 0x92, 0x11, 0x93, 0x64, 0x1b, 0xd6, 0x6c, 0xe4, 0xb6, 0xfb, 0xae, 0xe9,
-	0x64, 0x5e, 0x14, 0xec, 0xe8, 0x4f, 0xe1, 0xed, 0x12, 0xf7, 0x89, 0x9c, 0x3a, 0x66, 0x43, 0x15,
+	0xa4, 0x7c, 0xb5, 0x24, 0xd8, 0xa4, 0xdf, 0x48, 0x03, 0x48, 0x0f, 0xad, 0x07, 0xb6, 0x8f, 0x41,
-	0x54, 0xf1, 0x49, 0x36, 0x61, 0xfe, 0xa5, 0x38, 0x81, 0x4a, 0x9d, 0x15, 0x95, 0x3a, 0x0f, 0xd8,
+	0xe8, 0x39, 0xd1, 0x87, 0x2a, 0x22, 0x63, 0x24, 0x5f, 0xd4, 0x36, 0xfc, 0x6f, 0x8c, 0xfb, 0x78,
-	0x30, 0x3a, 0x58, 0xb4, 0xfb, 0x49, 0xe5, 0x96, 0x46, 0x7f, 0x9d, 0x83, 0xcb, 0xa2, 0x5f, 0xbc,
+	0xb6, 0x1d, 0xd1, 0x41, 0x14, 0x61, 0xfe, 0x93, 0x6c, 0xc3, 0xfc, 0x0b, 0xbe, 0x83, 0x28, 0xa9,
-	0xb9, 0xd4, 0x71, 0x27, 0xa4, 0xce, 0x67, 0x32, 0x75, 0xa6, 0xe8, 0xff, 0x3f, 0x6f, 0xfe, 0x83,
+	0xd6, 0x65, 0x49, 0xf5, 0x90, 0x0e, 0xc2, 0x5d, 0x86, 0xac, 0x1f, 0x96, 0xee, 0x2a, 0xda, 0x6f,
-	0x79, 0xf3, 0x9b, 0x06, 0xcd, 0xc9, 0x71, 0x8b, 0xfe, 0xbf, 0xe9, 0x60, 0x68, 0xf9, 0x60, 0x14,
+	0x73, 0x70, 0x89, 0xf7, 0x98, 0x77, 0x97, 0x54, 0x83, 0x82, 0xa4, 0x3a, 0xc8, 0x27, 0xd5, 0x04,
-	0x1f, 0xa7, 0x52, 0x76, 0x9c, 0xb4, 0x33, 0xab, 0x59, 0x67, 0xde, 0x84, 0x85, 0x80, 0xe1, 0xc0,
+	0x63, 0xfe, 0xcd, 0xa8, 0x7f, 0x7a, 0x46, 0xfd, 0xaa, 0x40, 0xbd, 0x38, 0x88, 0xe1, 0x69, 0x9e,
-	0x0d, 0x1b, 0x73, 0x32, 0xb5, 0x2e, 0xc8, 0xd4, 0x4a, 0x4c, 0x67, 0xc8, 0x4d, 0x05, 0xa0, 0x7f,
+	0x8e, 0x8c, 0x92, 0x8f, 0x8c, 0x7c, 0x6f, 0xa5, 0x71, 0x7b, 0x4b, 0x7b, 0xb6, 0x9c, 0xf5, 0xec,
-	0x55, 0xa0, 0xd9, 0x49, 0x6c, 0xc7, 0x37, 0x91, 0xf4, 0x3f, 0xc0, 0x5a, 0x3f, 0xeb, 0x9a, 0x07,
+	0x1d, 0x58, 0xf0, 0x29, 0xf6, 0x9d, 0xa0, 0x36, 0x27, 0x92, 0xee, 0x62, 0x3e, 0xe9, 0x92, 0x7d,
-	0x6c, 0x18, 0x67, 0xfd, 0x2d, 0x69, 0xda, 0x34, 0x0b, 0x5a, 0x46, 0x4e, 0x80, 0x59, 0x24, 0x54,
+	0x50, 0x64, 0x46, 0xc4, 0xad, 0xfd, 0x51, 0x82, 0xfa, 0x7e, 0xb2, 0x11, 0x7c, 0x17, 0xb5, 0xf1,
-	0x58, 0x2a, 0x74, 0x4a, 0x05, 0xe2, 0xec, 0x35, 0x33, 0xa1, 0xf5, 0x23, 0x20, 0x79, 0x31, 0xaf,
+	0x12, 0x56, 0x7b, 0x59, 0x3f, 0x3d, 0xa4, 0x83, 0xb8, 0x38, 0xf6, 0xf2, 0x76, 0x4e, 0x32, 0xa7,
-	0x3f, 0x2e, 0xf4, 0x14, 0xae, 0x4c, 0x39, 0x0f, 0x72, 0xd2, 0x85, 0x35, 0x74, 0x3c, 0xdb, 0x65,
+	0xa1, 0xe7, 0xd0, 0x0c, 0x99, 0x06, 0x6e, 0x36, 0x37, 0x40, 0x68, 0xe3, 0x5e, 0xa9, 0x18, 0x09,
-	0x89, 0x49, 0x32, 0x5e, 0x9a, 0x74, 0xca, 0x95, 0xa8, 0x15, 0xa4, 0xf7, 0x13, 0xf6, 0x08, 0x68,
+	0xad, 0x76, 0x81, 0xe4, 0x61, 0xde, 0x7e, 0xc4, 0xb4, 0x57, 0x0a, 0xbc, 0x37, 0x61, 0x43, 0xc8,
-	0x16, 0x71, 0xd3, 0x1f, 0x2b, 0xb0, 0x31, 0x89, 0x8b, 0x38, 0x85, 0xfd, 0x27, 0x52, 0xfa, 0xf1,
+	0xc8, 0x37, 0xb0, 0x8a, 0xb6, 0x6b, 0x39, 0x34, 0xb1, 0x49, 0x84, 0x52, 0x11, 0x2e, 0x6a, 0x48,
-	0x54, 0xa5, 0xff, 0xa6, 0xf9, 0xe4, 0x6f, 0x93, 0x6f, 0xac, 0x1c, 0x7f, 0xd6, 0xe0, 0xea, 0xd4,
+	0xfa, 0x47, 0x9a, 0x39, 0xc1, 0x0a, 0xa5, 0x0c, 0x19, 0x94, 0xf6, 0x53, 0x09, 0xd6, 0x8b, 0xa4,
-	0x3f, 0x30, 0x72, 0xf2, 0x01, 0xd4, 0x71, 0x70, 0x78, 0xc8, 0x10, 0xbf, 0x72, 0x30, 0x76, 0x3d,
+	0xc8, 0x0b, 0x69, 0x07, 0x0b, 0x2d, 0x78, 0x30, 0x9b, 0x05, 0x6f, 0xd2, 0xbe, 0xf2, 0x17, 0xda,
-	0x91, 0x5e, 0x90, 0xc8, 0xf8, 0xea, 0x6c, 0xa6, 0x61, 0x64, 0x0f, 0xe0, 0xc8, 0x72, 0x5c, 0xd6,
+	0xbf, 0xa7, 0xa0, 0x7f, 0x56, 0xe0, 0xf2, 0xc4, 0xa3, 0x1e, 0x19, 0xd9, 0x81, 0x2a, 0xf6, 0xdb,
-	0x93, 0x4c, 0x95, 0x52, 0xa6, 0x14, 0x8a, 0xfe, 0x5d, 0x81, 0xab, 0x6d, 0xe6, 0xb2, 0x90, 0x4d,
+	0x6d, 0x8a, 0x78, 0x68, 0x63, 0x1c, 0xa1, 0x4b, 0x79, 0xff, 0x08, 0xb1, 0xf8, 0x5e, 0x6f, 0xa4,
-	0xae, 0xb3, 0x26, 0xd4, 0x7d, 0xce, 0x82, 0xf8, 0x3d, 0xa3, 0x72, 0x31, 0xb5, 0x24, 0xf2, 0xdb,
+	0x65, 0xc8, 0xc7, 0x00, 0x5d, 0xd3, 0x76, 0x68, 0x47, 0x20, 0x94, 0xa6, 0x43, 0x48, 0x89, 0x68,
-	0xe7, 0xea, 0xb5, 0xa1, 0x1e, 0x50, 0x31, 0x9d, 0xa9, 0xd2, 0xea, 0xe4, 0x2a, 0x9d, 0xcb, 0x57,
+	0x7f, 0x96, 0xe0, 0x72, 0x93, 0x3a, 0x34, 0xa0, 0xc5, 0x65, 0x5b, 0x87, 0xaa, 0xc7, 0xa8, 0x1f,
-	0xe9, 0x58, 0xbc, 0xe6, 0xf3, 0x75, 0x50, 0xd6, 0xa2, 0x17, 0xce, 0xdc, 0xa2, 0x17, 0x4b, 0x7b,
+	0xbf, 0xc9, 0xa2, 0x6c, 0x4e, 0x2d, 0xf1, 0x0a, 0xf1, 0x58, 0xf4, 0x48, 0x8a, 0x1e, 0x81, 0x31,
-	0xda, 0xed, 0xc2, 0x04, 0x5d, 0x92, 0x5e, 0xce, 0xc5, 0xbc, 0x00, 0x4a, 0x1f, 0xc3, 0xb5, 0xe9,
+	0x9d, 0x29, 0xfa, 0x72, 0x71, 0xd1, 0xcf, 0xe5, 0x8b, 0x7e, 0x24, 0xac, 0xf3, 0xf9, 0x4a, 0x1a,
-	0x9e, 0x46, 0x9e, 0x6a, 0x91, 0xda, 0xb4, 0x16, 0xf9, 0x39, 0x2c, 0x67, 0x42, 0x4b, 0xb6, 0xa1,
+	0x77, 0x16, 0x2c, 0xcc, 0x7c, 0x16, 0x2c, 0x8e, 0xed, 0x97, 0x87, 0xd2, 0xa4, 0x5e, 0x12, 0x2e,
-	0xc6, 0xe2, 0x85, 0xe4, 0xea, 0x9b, 0xcd, 0x80, 0x11, 0x80, 0xfe, 0x51, 0x81, 0x5a, 0xb2, 0x41,
+	0x2f, 0x4e, 0x0d, 0x89, 0x9c, 0xf6, 0x35, 0x5c, 0x99, 0xec, 0x76, 0x64, 0xa9, 0x5e, 0xac, 0xcc,
-	0x9e, 0x4e, 0xa8, 0xc0, 0xeb, 0x59, 0x21, 0xaf, 0xb7, 0xdc, 0x4a, 0x42, 0x51, 0x2d, 0x0d, 0x05,
+	0xd4, 0x8b, 0x3f, 0x85, 0xe5, 0x4c, 0xd0, 0xc9, 0x3d, 0xa8, 0xd0, 0x78, 0x41, 0x7e, 0x7d, 0xcf,
-	0x1d, 0xfb, 0xdb, 0x47, 0xd7, 0x87, 0xec, 0xff, 0xfc, 0x7c, 0x72, 0x7f, 0xa8, 0x89, 0x1b, 0x82,
+	0x26, 0xca, 0x90, 0x9b, 0xf7, 0xf5, 0x4a, 0xf2, 0x81, 0xb4, 0x0b, 0x8a, 0xfb, 0x66, 0x01, 0xe2,
-	0xfe, 0xed, 0x59, 0x4a, 0xfa, 0x46, 0xb6, 0xa4, 0x0b, 0x22, 0x90, 0x2a, 0xea, 0x3e, 0x9c, 0x4b,
+	0xdb, 0xad, 0xe4, 0x31, 0xe1, 0x2b, 0x8f, 0x0d, 0x9f, 0x36, 0x72, 0x15, 0x09, 0xef, 0x36, 0xd9,
-	0x6f, 0x91, 0xf7, 0x60, 0xe9, 0x58, 0xd1, 0x2a, 0x04, 0xb9, 0xf4, 0x48, 0x00, 0xe2, 0x4f, 0xc9,
+	0xcb, 0xc6, 0xd9, 0xe4, 0x72, 0x53, 0xe1, 0xd7, 0x17, 0x95, 0xce, 0xd2, 0x2d, 0x6e, 0x65, 0xbb,
-	0x82, 0xe0, 0x9e, 0xdf, 0x8b, 0xff, 0x4f, 0x31, 0x29, 0x1e, 0x5a, 0x2c, 0x10, 0x8f, 0x51, 0x55,
+	0xc5, 0xa4, 0x40, 0xa5, 0xfa, 0xc5, 0xb7, 0x70, 0x26, 0xfd, 0x89, 0xdc, 0x85, 0xa5, 0xa3, 0x88,
-	0x31, 0x8a, 0xa2, 0x3f, 0x69, 0xb0, 0x96, 0x1a, 0x46, 0x08, 0xa7, 0xc8, 0x69, 0x44, 0x7a, 0x9a,
+	0x8e, 0x22, 0x55, 0x9c, 0x5f, 0x09, 0x37, 0x3f, 0xd3, 0xa9, 0xef, 0xdf, 0xf7, 0x3a, 0xf1, 0xe1,
-	0xa0, 0x9d, 0x6d, 0x9a, 0x50, 0x19, 0x9b, 0x26, 0xe4, 0xe7, 0x17, 0xd5, 0x82, 0xf9, 0x05, 0xbd,
+	0x19, 0x93, 0xfc, 0x81, 0x49, 0x7d, 0xfe, 0x08, 0x8f, 0xea, 0x2f, 0xa2, 0xb4, 0x1f, 0x15, 0x58,
-	0x05, 0xd0, 0x66, 0xae, 0x81, 0x36, 0x66, 0x1f, 0x86, 0x95, 0xcc, 0xc3, 0x90, 0xc0, 0x1c, 0xb2,
+	0x4d, 0x8d, 0x67, 0xb8, 0xbb, 0xc4, 0x7c, 0x26, 0x3d, 0x5f, 0x51, 0xde, 0x60, 0xbe, 0x52, 0x1a,
-	0x93, 0xe8, 0xa7, 0x5a, 0x35, 0xe5, 0x37, 0x5d, 0x86, 0x7a, 0xc2, 0x89, 0x7c, 0xef, 0xcf, 0x45,
+	0x99, 0xaf, 0xe4, 0xc7, 0x3b, 0x65, 0xc9, 0x78, 0x47, 0xbb, 0x0b, 0xd0, 0xa4, 0x8e, 0x8e, 0x16,
-	0xa8, 0xf6, 0xd1, 0x26, 0x5f, 0xc2, 0xca, 0xd8, 0x58, 0x82, 0x5c, 0x52, 0xae, 0xcb, 0x0f, 0x37,
+	0x66, 0x5f, 0xc7, 0xa5, 0xcc, 0xeb, 0x98, 0xc0, 0x1c, 0xd2, 0xe3, 0xf0, 0xf8, 0x2f, 0x1b, 0xe2,
-	0x74, 0xbd, 0x6c, 0x0b, 0x39, 0xf9, 0x1a, 0x2e, 0x3c, 0x1a, 0xb8, 0xae, 0xaa, 0xb4, 0xfd, 0x61,
+	0xb7, 0xb6, 0x0c, 0xd5, 0x44, 0x12, 0xd9, 0xf6, 0x6b, 0x80, 0x72, 0x0f, 0x2d, 0xf2, 0x0c, 0xce,
-	0x97, 0x9d, 0x20, 0x79, 0x47, 0x31, 0xe4, 0x76, 0x84, 0xb4, 0x8d, 0xf2, 0x4d, 0x59, 0x57, 0x8b,
+	0x8d, 0x0c, 0x6a, 0xc8, 0x35, 0x99, 0x53, 0xf3, 0xb3, 0x1f, 0xf5, 0xfa, 0x54, 0x7c, 0xc8, 0xc8,
-	0xea, 0xe5, 0x4c, 0x56, 0xd4, 0x65, 0x38, 0x9e, 0x7b, 0xe8, 0xab, 0xd9, 0x85, 0x08, 0xad, 0x8e,
+	0x73, 0xf8, 0xcf, 0xa3, 0xbe, 0xe3, 0x44, 0x15, 0xbd, 0x3b, 0x68, 0xd1, 0x63, 0x24, 0x1b, 0x32,
-	0xa7, 0xd0, 0x23, 0x37, 0x29, 0x74, 0xea, 0xf4, 0xa4, 0x03, 0xab, 0xe3, 0xef, 0x63, 0xd2, 0x88,
+	0xe9, 0x1c, 0x1b, 0xd7, 0xf3, 0xfe, 0x94, 0x9c, 0xc8, 0xc8, 0x03, 0x58, 0x8c, 0x46, 0x0e, 0x64,
-	0x51, 0xe3, 0xcf, 0x63, 0xfd, 0x52, 0xc9, 0x0e, 0x72, 0xb2, 0x0b, 0x4b, 0xf1, 0x00, 0x83, 0x44,
+	0x5d, 0xf6, 0x22, 0x88, 0x47, 0x49, 0xea, 0x85, 0x82, 0xaf, 0x21, 0x4e, 0xe4, 0x2c, 0x19, 0xce,
-	0x6a, 0x52, 0x63, 0x0f, 0xfd, 0xc2, 0xd8, 0x4a, 0xa4, 0x79, 0x7c, 0x82, 0xa0, 0x34, 0x17, 0xcc,
+	0x30, 0x02, 0x32, 0x9c, 0x94, 0x97, 0x89, 0x09, 0x2b, 0xa3, 0xc3, 0x08, 0x72, 0x55, 0x2a, 0x32,
-	0x21, 0x94, 0xe6, 0xa2, 0x91, 0x83, 0x10, 0xd4, 0x29, 0x16, 0xd4, 0x29, 0x15, 0x54, 0x38, 0x8c,
+	0x3a, 0x98, 0x50, 0xaf, 0x4d, 0xc3, 0x86, 0x8c, 0x1c, 0xc0, 0x52, 0x3c, 0x47, 0x22, 0x12, 0x6b,
-	0x38, 0x86, 0x8d, 0x49, 0xd7, 0x55, 0x72, 0x6d, 0x96, 0x97, 0x88, 0xbe, 0x39, 0x03, 0x0a, 0x39,
+	0x52, 0xa3, 0x28, 0xf5, 0x62, 0xd1, 0xe7, 0xd0, 0xda, 0xd1, 0x11, 0x8f, 0xcc, 0x5a, 0xc9, 0xd4,
-	0xf1, 0xe0, 0xdd, 0x89, 0xb7, 0x21, 0xb2, 0x39, 0xd3, 0x0d, 0x50, 0xbf, 0x3e, 0x0b, 0x0c, 0x39,
+	0x48, 0x66, 0xad, 0x6c, 0x5a, 0xc4, 0x55, 0xec, 0x4f, 0xa1, 0x62, 0x7f, 0x3a, 0x15, 0xd2, 0x09,
-	0x39, 0x81, 0x8d, 0xbb, 0xbd, 0x5e, 0xf9, 0xe1, 0x6e, 0xcc, 0xf8, 0x42, 0xd7, 0xb7, 0x66, 0x03,
+	0xd3, 0x2b, 0x05, 0xd6, 0x8b, 0x9e, 0x0d, 0xe4, 0x83, 0x99, 0xdf, 0x8a, 0xea, 0xf6, 0xac, 0x22,
-	0x22, 0x27, 0x2f, 0xe1, 0x72, 0xe6, 0x9f, 0x53, 0xa0, 0x75, 0x2b, 0x4e, 0xa8, 0x69, 0x77, 0x00,
+	0xc8, 0xc8, 0xf7, 0x0a, 0x5c, 0x28, 0xbc, 0x95, 0x92, 0xed, 0xd9, 0xef, 0xe5, 0xea, 0xcd, 0x99,
-	0xfd, 0xe6, 0x8c, 0x48, 0xe4, 0xfb, 0xfa, 0x77, 0x8d, 0x87, 0x9c, 0x79, 0x07, 0x46, 0x6a, 0x76,
+	0x65, 0x90, 0x91, 0xd7, 0x0a, 0xac, 0xef, 0x74, 0x3a, 0xe3, 0x5d, 0x72, 0xeb, 0x34, 0x33, 0x19,
-	0xdc, 0x47, 0xfb, 0xd3, 0x3e, 0xda, 0xcf, 0x17, 0x24, 0xf9, 0xfe, 0x3f, 0x01, 0x00, 0x00, 0xff,
+	0xf5, 0xf6, 0x29, 0xa4, 0x90, 0x91, 0x1f, 0x14, 0xb8, 0x94, 0x39, 0xe3, 0x25, 0x06, 0xdd, 0x96,
-	0xff, 0x8e, 0xd0, 0xc6, 0xc7, 0xa3, 0x16, 0x00, 0x00,
+	0x66, 0xff, 0xa4, 0xdb, 0x98, 0x7a, 0xe7, 0x34, 0x62, 0xc8, 0x76, 0xd5, 0xa7, 0xb5, 0x50, 0x30,
+	0xf5, 0xef, 0x45, 0x0f, 0xad, 0x8f, 0x7a, 0x68, 0x3d, 0x5b, 0x10, 0xe4, 0xcd, 0xbf, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0x89, 0xdf, 0xfb, 0x49, 0x32, 0x19, 0x00, 0x00,
 }

pkg/proto/msg/msg.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
 option go_package = "OpenIM/pkg/proto/msg;msg";
-package msg;
+package OpenIMServer.msg;
 
 message MsgDataToMQ{
   string token = 1;

pkg/proto/msggateway/msg_gateway.pb.go

@@ -36,7 +36,7 @@ func (m *OnlinePushMsgReq) Reset()         { *m = OnlinePushMsgReq{} }
 func (m *OnlinePushMsgReq) String() string { return proto.CompactTextString(m) }
 func (*OnlinePushMsgReq) ProtoMessage()    {}
 func (*OnlinePushMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{0}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{0}
 }
 func (m *OnlinePushMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OnlinePushMsgReq.Unmarshal(m, b)
@@ -81,7 +81,7 @@ func (m *OnlinePushMsgResp) Reset()         { *m = OnlinePushMsgResp{} }
 func (m *OnlinePushMsgResp) String() string { return proto.CompactTextString(m) }
 func (*OnlinePushMsgResp) ProtoMessage()    {}
 func (*OnlinePushMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{1}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{1}
 }
 func (m *OnlinePushMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OnlinePushMsgResp.Unmarshal(m, b)
@@ -121,7 +121,7 @@ func (m *SingleMsgToUserResults) Reset()         { *m = SingleMsgToUserResults{}
 func (m *SingleMsgToUserResults) String() string { return proto.CompactTextString(m) }
 func (*SingleMsgToUserResults) ProtoMessage()    {}
 func (*SingleMsgToUserResults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{2}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{2}
 }
 func (m *SingleMsgToUserResults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SingleMsgToUserResults.Unmarshal(m, b)
@@ -174,7 +174,7 @@ func (m *OnlineBatchPushOneMsgReq) Reset()         { *m = OnlineBatchPushOneMsgR
 func (m *OnlineBatchPushOneMsgReq) String() string { return proto.CompactTextString(m) }
 func (*OnlineBatchPushOneMsgReq) ProtoMessage()    {}
 func (*OnlineBatchPushOneMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{3}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{3}
 }
 func (m *OnlineBatchPushOneMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OnlineBatchPushOneMsgReq.Unmarshal(m, b)
@@ -219,7 +219,7 @@ func (m *OnlineBatchPushOneMsgResp) Reset()         { *m = OnlineBatchPushOneMsg
 func (m *OnlineBatchPushOneMsgResp) String() string { return proto.CompactTextString(m) }
 func (*OnlineBatchPushOneMsgResp) ProtoMessage()    {}
 func (*OnlineBatchPushOneMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{4}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{4}
 }
 func (m *OnlineBatchPushOneMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OnlineBatchPushOneMsgResp.Unmarshal(m, b)
@@ -259,7 +259,7 @@ func (m *SingleMsgToUserPlatform) Reset()         { *m = SingleMsgToUserPlatform
 func (m *SingleMsgToUserPlatform) String() string { return proto.CompactTextString(m) }
 func (*SingleMsgToUserPlatform) ProtoMessage()    {}
 func (*SingleMsgToUserPlatform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{5}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{5}
 }
 func (m *SingleMsgToUserPlatform) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SingleMsgToUserPlatform.Unmarshal(m, b)
@@ -311,7 +311,7 @@ func (m *GetUsersOnlineStatusReq) Reset()         { *m = GetUsersOnlineStatusReq
 func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusReq) ProtoMessage()    {}
 func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{6}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{6}
 }
 func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b)
@@ -350,7 +350,7 @@ func (m *GetUsersOnlineStatusResp) Reset()         { *m = GetUsersOnlineStatusRe
 func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{7}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{7}
 }
 func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b)
@@ -400,7 +400,7 @@ func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() {
 func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{7, 0}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{7, 0}
 }
 func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b)
@@ -459,7 +459,7 @@ func (m *GetUsersOnlineStatusResp_FailedDetail) Reset()         { *m = GetUsersO
 func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{7, 1}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{7, 1}
 }
 func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b)
@@ -501,7 +501,7 @@ func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() {
 func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{7, 2}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{7, 2}
 }
 func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b)
@@ -554,7 +554,7 @@ func (m *KickUserOfflineReq) Reset()         { *m = KickUserOfflineReq{} }
 func (m *KickUserOfflineReq) String() string { return proto.CompactTextString(m) }
 func (*KickUserOfflineReq) ProtoMessage()    {}
 func (*KickUserOfflineReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{8}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{8}
 }
 func (m *KickUserOfflineReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KickUserOfflineReq.Unmarshal(m, b)
@@ -598,7 +598,7 @@ func (m *KickUserOfflineResp) Reset()         { *m = KickUserOfflineResp{} }
 func (m *KickUserOfflineResp) String() string { return proto.CompactTextString(m) }
 func (*KickUserOfflineResp) ProtoMessage()    {}
 func (*KickUserOfflineResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{9}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{9}
 }
 func (m *KickUserOfflineResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_KickUserOfflineResp.Unmarshal(m, b)
@@ -632,7 +632,7 @@ func (m *MultiTerminalLoginCheckReq) Reset()         { *m = MultiTerminalLoginCh
 func (m *MultiTerminalLoginCheckReq) String() string { return proto.CompactTextString(m) }
 func (*MultiTerminalLoginCheckReq) ProtoMessage()    {}
 func (*MultiTerminalLoginCheckReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{10}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{10}
 }
 func (m *MultiTerminalLoginCheckReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MultiTerminalLoginCheckReq.Unmarshal(m, b)
@@ -690,7 +690,7 @@ func (m *MultiTerminalLoginCheckResp) Reset()         { *m = MultiTerminalLoginC
 func (m *MultiTerminalLoginCheckResp) String() string { return proto.CompactTextString(m) }
 func (*MultiTerminalLoginCheckResp) ProtoMessage()    {}
 func (*MultiTerminalLoginCheckResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_msg_gateway_608f885807bb70a0, []int{11}
+	return fileDescriptor_msg_gateway_e7f707bdf43cbba6, []int{11}
 }
 func (m *MultiTerminalLoginCheckResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MultiTerminalLoginCheckResp.Unmarshal(m, b)
@@ -711,21 +711,21 @@ func (m *MultiTerminalLoginCheckResp) XXX_DiscardUnknown() {
 var xxx_messageInfo_MultiTerminalLoginCheckResp proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*OnlinePushMsgReq)(nil), "msggateway.OnlinePushMsgReq")
+	proto.RegisterType((*OnlinePushMsgReq)(nil), "OpenIMServer.msggateway.OnlinePushMsgReq")
-	proto.RegisterType((*OnlinePushMsgResp)(nil), "msggateway.OnlinePushMsgResp")
+	proto.RegisterType((*OnlinePushMsgResp)(nil), "OpenIMServer.msggateway.OnlinePushMsgResp")
-	proto.RegisterType((*SingleMsgToUserResults)(nil), "msggateway.SingleMsgToUserResults")
+	proto.RegisterType((*SingleMsgToUserResults)(nil), "OpenIMServer.msggateway.SingleMsgToUserResults")
-	proto.RegisterType((*OnlineBatchPushOneMsgReq)(nil), "msggateway.OnlineBatchPushOneMsgReq")
+	proto.RegisterType((*OnlineBatchPushOneMsgReq)(nil), "OpenIMServer.msggateway.OnlineBatchPushOneMsgReq")
-	proto.RegisterType((*OnlineBatchPushOneMsgResp)(nil), "msggateway.OnlineBatchPushOneMsgResp")
+	proto.RegisterType((*OnlineBatchPushOneMsgResp)(nil), "OpenIMServer.msggateway.OnlineBatchPushOneMsgResp")
-	proto.RegisterType((*SingleMsgToUserPlatform)(nil), "msggateway.SingleMsgToUserPlatform")
+	proto.RegisterType((*SingleMsgToUserPlatform)(nil), "OpenIMServer.msggateway.SingleMsgToUserPlatform")
-	proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "msggateway.GetUsersOnlineStatusReq")
+	proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "OpenIMServer.msggateway.GetUsersOnlineStatusReq")
-	proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "msggateway.GetUsersOnlineStatusResp")
+	proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "OpenIMServer.msggateway.GetUsersOnlineStatusResp")
-	proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "msggateway.GetUsersOnlineStatusResp.SuccessDetail")
+	proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "OpenIMServer.msggateway.GetUsersOnlineStatusResp.SuccessDetail")
-	proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "msggateway.GetUsersOnlineStatusResp.FailedDetail")
+	proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "OpenIMServer.msggateway.GetUsersOnlineStatusResp.FailedDetail")
-	proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "msggateway.GetUsersOnlineStatusResp.SuccessResult")
+	proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "OpenIMServer.msggateway.GetUsersOnlineStatusResp.SuccessResult")
-	proto.RegisterType((*KickUserOfflineReq)(nil), "msggateway.KickUserOfflineReq")
+	proto.RegisterType((*KickUserOfflineReq)(nil), "OpenIMServer.msggateway.KickUserOfflineReq")
-	proto.RegisterType((*KickUserOfflineResp)(nil), "msggateway.KickUserOfflineResp")
+	proto.RegisterType((*KickUserOfflineResp)(nil), "OpenIMServer.msggateway.KickUserOfflineResp")
-	proto.RegisterType((*MultiTerminalLoginCheckReq)(nil), "msggateway.MultiTerminalLoginCheckReq")
+	proto.RegisterType((*MultiTerminalLoginCheckReq)(nil), "OpenIMServer.msggateway.MultiTerminalLoginCheckReq")
-	proto.RegisterType((*MultiTerminalLoginCheckResp)(nil), "msggateway.MultiTerminalLoginCheckResp")
+	proto.RegisterType((*MultiTerminalLoginCheckResp)(nil), "OpenIMServer.msggateway.MultiTerminalLoginCheckResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -757,7 +757,7 @@ func NewMsgGatewayClient(cc *grpc.ClientConn) MsgGatewayClient {
 
 func (c *msgGatewayClient) OnlinePushMsg(ctx context.Context, in *OnlinePushMsgReq, opts ...grpc.CallOption) (*OnlinePushMsgResp, error) {
 	out := new(OnlinePushMsgResp)
-	err := grpc.Invoke(ctx, "/msggateway.msgGateway/OnlinePushMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msggateway.msgGateway/OnlinePushMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -766,7 +766,7 @@ func (c *msgGatewayClient) OnlinePushMsg(ctx context.Context, in *OnlinePushMsgR
 
 func (c *msgGatewayClient) GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) {
 	out := new(GetUsersOnlineStatusResp)
-	err := grpc.Invoke(ctx, "/msggateway.msgGateway/GetUsersOnlineStatus", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msggateway.msgGateway/GetUsersOnlineStatus", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -775,7 +775,7 @@ func (c *msgGatewayClient) GetUsersOnlineStatus(ctx context.Context, in *GetUser
 
 func (c *msgGatewayClient) OnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatchPushOneMsgReq, opts ...grpc.CallOption) (*OnlineBatchPushOneMsgResp, error) {
 	out := new(OnlineBatchPushOneMsgResp)
-	err := grpc.Invoke(ctx, "/msggateway.msgGateway/OnlineBatchPushOneMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msggateway.msgGateway/OnlineBatchPushOneMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -784,7 +784,7 @@ func (c *msgGatewayClient) OnlineBatchPushOneMsg(ctx context.Context, in *Online
 
 func (c *msgGatewayClient) SuperGroupOnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatchPushOneMsgReq, opts ...grpc.CallOption) (*OnlineBatchPushOneMsgResp, error) {
 	out := new(OnlineBatchPushOneMsgResp)
-	err := grpc.Invoke(ctx, "/msggateway.msgGateway/SuperGroupOnlineBatchPushOneMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msggateway.msgGateway/SuperGroupOnlineBatchPushOneMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -793,7 +793,7 @@ func (c *msgGatewayClient) SuperGroupOnlineBatchPushOneMsg(ctx context.Context,
 
 func (c *msgGatewayClient) KickUserOffline(ctx context.Context, in *KickUserOfflineReq, opts ...grpc.CallOption) (*KickUserOfflineResp, error) {
 	out := new(KickUserOfflineResp)
-	err := grpc.Invoke(ctx, "/msggateway.msgGateway/KickUserOffline", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msggateway.msgGateway/KickUserOffline", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -802,7 +802,7 @@ func (c *msgGatewayClient) KickUserOffline(ctx context.Context, in *KickUserOffl
 
 func (c *msgGatewayClient) MultiTerminalLoginCheck(ctx context.Context, in *MultiTerminalLoginCheckReq, opts ...grpc.CallOption) (*MultiTerminalLoginCheckResp, error) {
 	out := new(MultiTerminalLoginCheckResp)
-	err := grpc.Invoke(ctx, "/msggateway.msgGateway/MultiTerminalLoginCheck", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.msggateway.msgGateway/MultiTerminalLoginCheck", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -834,7 +834,7 @@ func _MsgGateway_OnlinePushMsg_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msggateway.msgGateway/OnlinePushMsg",
+		FullMethod: "/OpenIMServer.msggateway.msgGateway/OnlinePushMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgGatewayServer).OnlinePushMsg(ctx, req.(*OnlinePushMsgReq))
@@ -852,7 +852,7 @@ func _MsgGateway_GetUsersOnlineStatus_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msggateway.msgGateway/GetUsersOnlineStatus",
+		FullMethod: "/OpenIMServer.msggateway.msgGateway/GetUsersOnlineStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgGatewayServer).GetUsersOnlineStatus(ctx, req.(*GetUsersOnlineStatusReq))
@@ -870,7 +870,7 @@ func _MsgGateway_OnlineBatchPushOneMsg_Handler(srv interface{}, ctx context.Cont
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msggateway.msgGateway/OnlineBatchPushOneMsg",
+		FullMethod: "/OpenIMServer.msggateway.msgGateway/OnlineBatchPushOneMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgGatewayServer).OnlineBatchPushOneMsg(ctx, req.(*OnlineBatchPushOneMsgReq))
@@ -888,7 +888,7 @@ func _MsgGateway_SuperGroupOnlineBatchPushOneMsg_Handler(srv interface{}, ctx co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msggateway.msgGateway/SuperGroupOnlineBatchPushOneMsg",
+		FullMethod: "/OpenIMServer.msggateway.msgGateway/SuperGroupOnlineBatchPushOneMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgGatewayServer).SuperGroupOnlineBatchPushOneMsg(ctx, req.(*OnlineBatchPushOneMsgReq))
@@ -906,7 +906,7 @@ func _MsgGateway_KickUserOffline_Handler(srv interface{}, ctx context.Context, d
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msggateway.msgGateway/KickUserOffline",
+		FullMethod: "/OpenIMServer.msggateway.msgGateway/KickUserOffline",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgGatewayServer).KickUserOffline(ctx, req.(*KickUserOfflineReq))
@@ -924,7 +924,7 @@ func _MsgGateway_MultiTerminalLoginCheck_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/msggateway.msgGateway/MultiTerminalLoginCheck",
+		FullMethod: "/OpenIMServer.msggateway.msgGateway/MultiTerminalLoginCheck",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgGatewayServer).MultiTerminalLoginCheck(ctx, req.(*MultiTerminalLoginCheckReq))
@@ -933,7 +933,7 @@ func _MsgGateway_MultiTerminalLoginCheck_Handler(srv interface{}, ctx context.Co
 }
 
 var _MsgGateway_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "msggateway.msgGateway",
+	ServiceName: "OpenIMServer.msggateway.msgGateway",
 	HandlerType: (*MsgGatewayServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -966,58 +966,60 @@ var _MsgGateway_serviceDesc = grpc.ServiceDesc{
 }
 
 func init() {
-	proto.RegisterFile("msggateway/msg_gateway.proto", fileDescriptor_msg_gateway_608f885807bb70a0)
+	proto.RegisterFile("msggateway/msg_gateway.proto", fileDescriptor_msg_gateway_e7f707bdf43cbba6)
 }
 
-var fileDescriptor_msg_gateway_608f885807bb70a0 = []byte{
+var fileDescriptor_msg_gateway_e7f707bdf43cbba6 = []byte{
-	// 782 bytes of a gzipped FileDescriptorProto
+	// 803 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4d, 0x4f, 0xf3, 0x46,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdd, 0x4e, 0xeb, 0x46,
-	0x10, 0x96, 0x49, 0xf8, 0x1a, 0x08, 0xa5, 0x5b, 0x3e, 0x5c, 0x97, 0x8f, 0xc8, 0xd0, 0x90, 0x0b,
+	0x10, 0x96, 0x49, 0xc2, 0xcf, 0x40, 0x5a, 0xba, 0x05, 0xe2, 0x9a, 0x96, 0x46, 0x56, 0x45, 0xd3,
-	0x89, 0x1a, 0x0e, 0x3d, 0xf4, 0x06, 0x11, 0x28, 0x6a, 0xd2, 0xa0, 0x0d, 0x48, 0x55, 0x55, 0xa9,
+	0x1f, 0x12, 0x08, 0xed, 0x55, 0xa5, 0x56, 0x82, 0x08, 0x14, 0x95, 0x28, 0xc8, 0xa1, 0x17, 0xfd,
-	0x75, 0x9d, 0x8d, 0x63, 0xec, 0xd8, 0x8b, 0xc7, 0x06, 0x71, 0xea, 0xb9, 0x52, 0x7f, 0x43, 0xaf,
+	0x91, 0x2a, 0xe3, 0x6c, 0x1c, 0x2b, 0xfe, 0x59, 0x3c, 0x36, 0x29, 0xaa, 0xd4, 0xde, 0xf4, 0xa2,
-	0xfd, 0x41, 0xfd, 0x43, 0xd5, 0xda, 0x9b, 0xc4, 0x4e, 0x62, 0xde, 0x70, 0x79, 0x6f, 0x3b, 0xcf,
+	0x17, 0xe7, 0xfa, 0x3c, 0xc9, 0x79, 0x85, 0xf3, 0x40, 0xe7, 0x0d, 0x8e, 0xd6, 0xbb, 0x09, 0x76,
-	0xec, 0xcc, 0x3c, 0xfb, 0xcc, 0xec, 0xda, 0x70, 0x34, 0x42, 0xcb, 0x32, 0x42, 0xf6, 0x6a, 0xbc,
+	0x12, 0xeb, 0x10, 0x71, 0x71, 0xee, 0xbc, 0xdf, 0xce, 0x7c, 0x33, 0xf3, 0xcd, 0x4c, 0x36, 0xf0,
-	0xd5, 0x47, 0x68, 0xfd, 0x26, 0xd7, 0x35, 0x1e, 0xf8, 0xa1, 0x4f, 0x60, 0xea, 0xd5, 0x2e, 0xba,
+	0xa9, 0x87, 0xb6, 0x6d, 0x46, 0x74, 0x6c, 0x3e, 0x34, 0x3c, 0xb4, 0xff, 0x94, 0xdf, 0x75, 0x16,
-	0x9c, 0x79, 0x97, 0xad, 0xce, 0x65, 0x8f, 0x05, 0x2f, 0x2c, 0xa8, 0x73, 0xc7, 0xaa, 0xc7, 0xbb,
+	0x06, 0x51, 0x40, 0x2a, 0x5d, 0x46, 0xfd, 0x76, 0xa7, 0x47, 0xc3, 0x7b, 0x1a, 0xd6, 0x1f, 0x4d,
-	0xea, 0xd8, 0x77, 0x5e, 0xb1, 0xfe, 0x8a, 0x49, 0x90, 0xfe, 0x3b, 0xec, 0x76, 0x3d, 0xd7, 0xf6,
+	0xb5, 0x2f, 0xf9, 0xc5, 0x51, 0xbb, 0x73, 0x24, 0xae, 0x1a, 0x6c, 0x64, 0x37, 0x12, 0x97, 0x06,
-	0xd8, 0x7d, 0x84, 0xc3, 0x0e, 0x5a, 0x94, 0x3d, 0x93, 0x2a, 0xac, 0x8f, 0xd0, 0x6a, 0x1a, 0xa1,
+	0xf6, 0x47, 0x63, 0x6c, 0x8c, 0x51, 0x30, 0xe8, 0x1e, 0x6c, 0x77, 0x7d, 0xd7, 0xf1, 0xe9, 0x75,
-	0xa1, 0x2a, 0x65, 0xa5, 0xba, 0xd5, 0xd8, 0xa9, 0xc5, 0x51, 0xb5, 0x4e, 0x82, 0xd2, 0xb1, 0x9b,
+	0x8c, 0xc3, 0x0e, 0xda, 0x06, 0xbd, 0x23, 0xdf, 0xc3, 0x9a, 0x87, 0x76, 0xcb, 0x8c, 0x4c, 0x55,
-	0xe8, 0xb0, 0xcd, 0x23, 0x1c, 0x3e, 0xf8, 0x8f, 0xc8, 0x82, 0x56, 0x53, 0x5d, 0x29, 0x2b, 0xd5,
+	0xa9, 0x2a, 0xb5, 0xcd, 0xe6, 0x7e, 0x3d, 0x13, 0x27, 0xa1, 0xa8, 0x77, 0x84, 0x89, 0x31, 0xb1,
-	0x4d, 0x9a, 0xc1, 0xf4, 0x36, 0x7c, 0x39, 0x53, 0x01, 0x39, 0xf9, 0x1e, 0x8a, 0x01, 0x43, 0xae,
+	0x25, 0x3a, 0x6c, 0xb1, 0x18, 0x87, 0x37, 0xc1, 0x2f, 0x48, 0xc3, 0x76, 0x4b, 0x5d, 0xa9, 0x2a,
-	0x2a, 0xe5, 0x42, 0x75, 0xab, 0x71, 0x56, 0x9b, 0x52, 0xaf, 0xf5, 0x6c, 0xcf, 0x72, 0x59, 0x07,
+	0xb5, 0x0d, 0x23, 0x83, 0xe9, 0xbf, 0xc2, 0x47, 0x33, 0xe1, 0x90, 0x91, 0x16, 0x14, 0x43, 0x8a,
-	0xad, 0x24, 0xc3, 0xbd, 0x6b, 0x84, 0x03, 0x3f, 0x18, 0xd1, 0x38, 0x40, 0xff, 0x4b, 0x81, 0x83,
+	0x4c, 0x55, 0xaa, 0x85, 0xda, 0x66, 0xf3, 0xb8, 0x9e, 0x53, 0x54, 0xbd, 0xe7, 0xf8, 0xb6, 0x4b,
-	0x99, 0x1d, 0x94, 0x61, 0xe4, 0x86, 0x48, 0x0e, 0x60, 0x2d, 0x4a, 0x68, 0x28, 0x31, 0x0d, 0x69,
+	0x3b, 0x68, 0x0b, 0xba, 0x6b, 0xd7, 0x8c, 0x06, 0x41, 0xe8, 0x19, 0x89, 0xb7, 0xfe, 0x52, 0x81,
-	0x4d, 0x6a, 0xad, 0x7c, 0xb0, 0x16, 0x39, 0x01, 0xf0, 0x27, 0xcc, 0xd5, 0x42, 0x59, 0xa9, 0x6e,
+	0xbd, 0x19, 0x0b, 0x83, 0x62, 0xec, 0x46, 0x48, 0xf6, 0x60, 0x35, 0x16, 0x39, 0x29, 0x49, 0x4e,
-	0xd0, 0x14, 0xa2, 0x3f, 0x81, 0x9a, 0x9c, 0xec, 0xda, 0x08, 0xcd, 0xa1, 0x80, 0xba, 0x1e, 0xfb,
+	0xf2, 0x34, 0x0d, 0xbc, 0xf2, 0x9c, 0xc0, 0xe4, 0x00, 0x20, 0x98, 0xd6, 0xa4, 0x16, 0xaa, 0x4a,
-	0xb0, 0x86, 0xe7, 0x50, 0x4a, 0xeb, 0x85, 0x31, 0xcf, 0x4d, 0x9a, 0x05, 0x75, 0x07, 0xbe, 0xce,
+	0x6d, 0xdd, 0x48, 0x21, 0xfa, 0x18, 0x54, 0x51, 0xf3, 0x99, 0x19, 0x59, 0x43, 0x0e, 0x75, 0x7d,
-	0xa9, 0x85, 0x9c, 0xfc, 0x04, 0xbb, 0x18, 0x9f, 0x44, 0xe0, 0x89, 0x1c, 0x52, 0x59, 0xfd, 0x9d,
+	0xfa, 0x3c, 0xa9, 0xbf, 0x80, 0x72, 0x5a, 0x56, 0x4c, 0x2a, 0xd8, 0x30, 0xb2, 0xa0, 0xfe, 0x17,
-	0xd3, 0x4a, 0xdd, 0xe8, 0x5c, 0xac, 0xfe, 0x06, 0x87, 0x39, 0xca, 0x08, 0x4d, 0x92, 0x4d, 0x37,
+	0x7c, 0x92, 0x13, 0x18, 0x19, 0xf9, 0x1d, 0xb6, 0x31, 0x29, 0x8b, 0xe3, 0x42, 0x28, 0xd9, 0x80,
-	0x7e, 0x9f, 0xc5, 0x47, 0x2b, 0xd0, 0x14, 0x22, 0x9a, 0x40, 0x99, 0xf9, 0x32, 0x99, 0x05, 0x69,
+	0xc6, 0x53, 0x75, 0x90, 0xf2, 0x1a, 0x73, 0x44, 0xfa, 0x03, 0x54, 0x72, 0x34, 0xe3, 0x6a, 0x09,
-	0x91, 0x0a, 0xec, 0x88, 0x95, 0xc8, 0x73, 0xeb, 0x07, 0xa3, 0x56, 0x33, 0xd6, 0x73, 0x95, 0xce,
+	0xa3, 0xf3, 0xa0, 0x4f, 0x93, 0xa2, 0x0b, 0x46, 0x0a, 0xe1, 0xbd, 0x32, 0xa8, 0x75, 0x3f, 0x9d,
-	0xa0, 0xfa, 0x15, 0x1c, 0xde, 0xb1, 0x50, 0x94, 0xc4, 0xe4, 0xbc, 0xbd, 0xd0, 0x08, 0x23, 0x14,
+	0x1f, 0x79, 0x22, 0x87, 0xf0, 0x01, 0xff, 0xe2, 0x3c, 0x17, 0x41, 0xe8, 0xb5, 0x5b, 0x89, 0xd2,
-	0x92, 0xaa, 0xb0, 0x1e, 0x49, 0x89, 0x94, 0x58, 0xa2, 0xb1, 0xa9, 0xff, 0x53, 0x04, 0x75, 0x71,
+	0x25, 0x63, 0x06, 0xd5, 0x4f, 0xa1, 0x72, 0x49, 0x23, 0x1e, 0x12, 0x45, 0xf1, 0xbd, 0xc8, 0x8c,
-	0x14, 0x72, 0xf2, 0x33, 0x94, 0x30, 0x32, 0x4d, 0x86, 0x98, 0x51, 0xa6, 0x91, 0x56, 0x26, 0x2f,
+	0x62, 0xe4, 0x62, 0xab, 0xb0, 0x16, 0x4b, 0xbd, 0x94, 0x44, 0xaf, 0xc9, 0x51, 0x7f, 0x5d, 0x04,
-	0xb8, 0xd6, 0x4b, 0x47, 0xd2, 0x6c, 0x22, 0xf2, 0x08, 0xdb, 0x03, 0xc3, 0x76, 0x59, 0x5f, 0x26,
+	0x75, 0xb1, 0x17, 0x32, 0x42, 0xa1, 0x8c, 0xb1, 0x65, 0x51, 0xc4, 0x8c, 0x4c, 0x3f, 0xe5, 0xca,
-	0x4e, 0x06, 0xec, 0xbb, 0xa5, 0x12, 0xdf, 0xc6, 0x81, 0x4d, 0x16, 0x1a, 0xb6, 0x4b, 0x33, 0x69,
+	0x94, 0xc7, 0x54, 0xef, 0xa5, 0x69, 0x8c, 0x2c, 0x2b, 0xb9, 0x85, 0xad, 0x81, 0xe9, 0xb8, 0xb4,
-	0xb4, 0x3f, 0xa1, 0x24, 0xcb, 0x26, 0x6e, 0xa2, 0xc1, 0x06, 0x97, 0xfa, 0xcb, 0xd1, 0x9e, 0xd8,
+	0x2f, 0xa3, 0x88, 0xa1, 0xfc, 0x71, 0xf9, 0x28, 0x17, 0x09, 0x4b, 0x8b, 0x46, 0xa6, 0xe3, 0x1a,
-	0x42, 0x6f, 0x8c, 0xb3, 0x8e, 0xf5, 0x4e, 0x2c, 0x81, 0x9b, 0xbe, 0xe7, 0x49, 0x9d, 0x37, 0xa9,
+	0x19, 0x4e, 0xed, 0x5f, 0x28, 0xcb, 0x1c, 0xc4, 0x35, 0xd1, 0x60, 0x9d, 0xc9, 0xce, 0xc8, 0xdd,
-	0xb4, 0xc4, 0x8d, 0xb5, 0xf1, 0xda, 0x30, 0x1d, 0x2b, 0xf0, 0x23, 0xaf, 0xaf, 0x16, 0xe3, 0xa9,
+	0x98, 0x9e, 0x79, 0x27, 0x30, 0x61, 0x9d, 0x74, 0x42, 0x9c, 0x38, 0x6e, 0x05, 0xbe, 0x2f, 0x3b,
-	0xce, 0x60, 0x5a, 0x05, 0xb6, 0xd3, 0xf4, 0xf2, 0x2e, 0x96, 0xf6, 0xaf, 0x32, 0x61, 0x2a, 0x15,
+	0xb0, 0x61, 0xc8, 0x13, 0xdf, 0x7f, 0x07, 0xcf, 0x4c, 0x6b, 0x64, 0x87, 0x41, 0xec, 0xf7, 0xd5,
-	0xc9, 0xbb, 0x82, 0x79, 0x2c, 0x07, 0xb0, 0xd7, 0x8f, 0x6b, 0x8c, 0xe7, 0x2b, 0x51, 0x48, 0x2d,
+	0x62, 0xb2, 0x09, 0x19, 0x4c, 0x3b, 0x84, 0xad, 0x74, 0x7a, 0x79, 0x9b, 0xa9, 0xbd, 0x52, 0xa6,
-	0x7c, 0xbc, 0x45, 0x52, 0xca, 0x85, 0xf9, 0xf4, 0x5f, 0x81, 0xfc, 0x68, 0x9b, 0x8e, 0x48, 0xd0,
+	0x99, 0x4a, 0x79, 0xf2, 0x76, 0x38, 0x2f, 0x4b, 0x84, 0x9d, 0x7e, 0x12, 0x63, 0x32, 0x79, 0x42,
-	0x1d, 0x0c, 0x44, 0x02, 0x31, 0x50, 0x27, 0x00, 0x63, 0x1d, 0x25, 0xe3, 0x55, 0x9a, 0x42, 0xc4,
+	0x21, 0xb5, 0xf0, 0xcc, 0xe6, 0x49, 0x5d, 0x17, 0x92, 0xeb, 0x7f, 0x00, 0xf9, 0xd9, 0xb1, 0x46,
-	0xcc, 0x3a, 0x32, 0xaa, 0xd5, 0x6c, 0xdb, 0x18, 0xca, 0xab, 0x39, 0x83, 0xea, 0xfb, 0xf0, 0xd5,
+	0x9c, 0xa0, 0x3b, 0x18, 0x70, 0x02, 0x3e, 0x77, 0x07, 0x00, 0x13, 0x51, 0x65, 0xfa, 0x25, 0x23,
-	0x5c, 0x76, 0xe4, 0xfa, 0xdf, 0x0a, 0x68, 0x9d, 0xc8, 0x0d, 0xed, 0x07, 0x16, 0x8c, 0x6c, 0xcf,
+	0x85, 0xf0, 0xd1, 0x1e, 0x49, 0xaf, 0x76, 0xeb, 0xca, 0xc1, 0x48, 0xae, 0xf3, 0x0c, 0xaa, 0xef,
-	0x70, 0xdb, 0xbe, 0x65, 0x7b, 0x37, 0x43, 0x66, 0x3a, 0xa2, 0x7a, 0x9e, 0x56, 0x59, 0x56, 0x2b,
+	0xc2, 0xc7, 0x73, 0xec, 0xc8, 0xf4, 0x17, 0x0a, 0x68, 0x9d, 0xd8, 0x8d, 0x9c, 0x1b, 0x1a, 0x7a,
-	0x73, 0xac, 0xf6, 0x60, 0x35, 0xf4, 0x1d, 0xe6, 0xc9, 0xc6, 0x26, 0x06, 0x29, 0xc3, 0x96, 0xcf,
+	0x8e, 0x6f, 0xba, 0x57, 0x81, 0xed, 0xf8, 0xe7, 0x43, 0x6a, 0x8d, 0x78, 0xf4, 0x3c, 0xe1, 0xb2,
-	0x59, 0x60, 0x84, 0xb6, 0x2f, 0x9a, 0x5e, 0x8c, 0x7d, 0x69, 0x48, 0x3f, 0x86, 0x6f, 0x72, 0xd9,
+	0x59, 0xad, 0xcc, 0x65, 0xb5, 0x03, 0xa5, 0x28, 0x18, 0x51, 0x5f, 0x76, 0x59, 0x1c, 0x48, 0x15,
-	0x20, 0x6f, 0xfc, 0x57, 0x04, 0xf1, 0x01, 0xb9, 0x4b, 0xe4, 0x26, 0x6d, 0x28, 0x65, 0x5e, 0x6d,
+	0x36, 0x03, 0x46, 0x43, 0x33, 0x72, 0x02, 0x3e, 0x01, 0xc5, 0xe4, 0x2e, 0x0d, 0xe9, 0x9f, 0xc1,
-	0x72, 0x94, 0x6e, 0xc6, 0xec, 0x27, 0x43, 0x3b, 0x7e, 0xc7, 0x8b, 0x9c, 0x18, 0xb0, 0xb7, 0xa8,
+	0x7e, 0x6e, 0x36, 0xc8, 0x9a, 0x6f, 0x4a, 0x00, 0x1e, 0xda, 0x97, 0x42, 0x6e, 0x32, 0x80, 0x72,
-	0x7f, 0xe4, 0xec, 0xd3, 0x1d, 0x7e, 0xd6, 0xce, 0x97, 0x19, 0x03, 0xd2, 0x87, 0xfd, 0x85, 0x0f,
+	0xe6, 0x41, 0x20, 0x5f, 0xe5, 0x76, 0x66, 0xf6, 0x9d, 0xd2, 0xbe, 0x7e, 0xaa, 0x29, 0x32, 0xf2,
-	0x24, 0x39, 0x9f, 0xa7, 0x36, 0xff, 0x5e, 0x6b, 0xdf, 0x2e, 0xb1, 0x0b, 0x39, 0xf1, 0xe0, 0xb4,
+	0x37, 0xec, 0x2c, 0xea, 0x2c, 0x39, 0x5e, 0x72, 0x10, 0xee, 0xb4, 0x93, 0xa5, 0x47, 0x87, 0xfc,
-	0x17, 0x71, 0x16, 0xdc, 0x05, 0x7e, 0xc4, 0x3f, 0x43, 0x3d, 0x0a, 0x5f, 0xcc, 0x8c, 0x16, 0x39,
+	0x03, 0xbb, 0x0b, 0x7f, 0x88, 0xc9, 0xc9, 0x3b, 0x2a, 0x98, 0x7f, 0x31, 0xb4, 0xe6, 0xb2, 0x2e,
-	0x49, 0x47, 0xce, 0x4f, 0xb5, 0x76, 0xfa, 0xae, 0x1f, 0x39, 0x79, 0x82, 0xc3, 0x9c, 0x41, 0x20,
+	0xc8, 0xc8, 0xff, 0x0a, 0x7c, 0xde, 0x8b, 0x19, 0x0d, 0x2f, 0xc3, 0x20, 0x66, 0xef, 0x35, 0x15,
-	0x95, 0x74, 0x6c, 0xfe, 0xec, 0x6a, 0x17, 0x4b, 0xed, 0x43, 0x7e, 0x5d, 0xfd, 0xa5, 0x22, 0xfe,
+	0x17, 0x3e, 0x9c, 0x99, 0x61, 0xf2, 0x4d, 0x2e, 0xcd, 0xfc, 0x2e, 0x69, 0xdf, 0x3e, 0xdd, 0x18,
-	0x44, 0x5a, 0x9d, 0xd4, 0x1f, 0xc8, 0x34, 0xf4, 0x87, 0xe9, 0xf2, 0x8f, 0xb5, 0xd8, 0x79, 0xf5,
+	0x19, 0xf9, 0x4f, 0x81, 0x4a, 0xce, 0x30, 0x92, 0xd3, 0x5c, 0xa6, 0xfc, 0x65, 0xd2, 0xbe, 0x5b,
-	0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x23, 0x19, 0x93, 0xb2, 0xe4, 0x08, 0x00, 0x00,
+	0xde, 0x09, 0xd9, 0x59, 0xed, 0xb7, 0x43, 0xe1, 0x96, 0xfa, 0x1f, 0xf6, 0xe8, 0xfa, 0xc3, 0xe3,
+	0xe7, 0xed, 0x6a, 0x72, 0x79, 0xfa, 0x36, 0x00, 0x00, 0xff, 0xff, 0xea, 0x09, 0x51, 0x6b, 0xf7,
+	0x09, 0x00, 0x00,
 }

pkg/proto/msggateway/msg_gateway.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 option go_package = "OpenIM/pkg/proto/msggateway;msggateway";
-package msggateway;
+package OpenIMServer.msggateway;
 
 message OnlinePushMsgReq {
   sdkws.MsgData msgData = 1;

pkg/proto/push/push.pb.go

@@ -36,7 +36,7 @@ func (m *PushMsgReq) Reset()         { *m = PushMsgReq{} }
 func (m *PushMsgReq) String() string { return proto.CompactTextString(m) }
 func (*PushMsgReq) ProtoMessage()    {}
 func (*PushMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_push_8111188de42e41d8, []int{0}
+	return fileDescriptor_push_81fcc0e39a4f87ed, []int{0}
 }
 func (m *PushMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushMsgReq.Unmarshal(m, b)
@@ -80,7 +80,7 @@ func (m *PushMsgResp) Reset()         { *m = PushMsgResp{} }
 func (m *PushMsgResp) String() string { return proto.CompactTextString(m) }
 func (*PushMsgResp) ProtoMessage()    {}
 func (*PushMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_push_8111188de42e41d8, []int{1}
+	return fileDescriptor_push_81fcc0e39a4f87ed, []int{1}
 }
 func (m *PushMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushMsgResp.Unmarshal(m, b)
@@ -112,7 +112,7 @@ func (m *DelUserPushTokenReq) Reset()         { *m = DelUserPushTokenReq{} }
 func (m *DelUserPushTokenReq) String() string { return proto.CompactTextString(m) }
 func (*DelUserPushTokenReq) ProtoMessage()    {}
 func (*DelUserPushTokenReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_push_8111188de42e41d8, []int{2}
+	return fileDescriptor_push_81fcc0e39a4f87ed, []int{2}
 }
 func (m *DelUserPushTokenReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelUserPushTokenReq.Unmarshal(m, b)
@@ -156,7 +156,7 @@ func (m *DelUserPushTokenResp) Reset()         { *m = DelUserPushTokenResp{} }
 func (m *DelUserPushTokenResp) String() string { return proto.CompactTextString(m) }
 func (*DelUserPushTokenResp) ProtoMessage()    {}
 func (*DelUserPushTokenResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_push_8111188de42e41d8, []int{3}
+	return fileDescriptor_push_81fcc0e39a4f87ed, []int{3}
 }
 func (m *DelUserPushTokenResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelUserPushTokenResp.Unmarshal(m, b)
@@ -177,10 +177,10 @@ func (m *DelUserPushTokenResp) XXX_DiscardUnknown() {
 var xxx_messageInfo_DelUserPushTokenResp proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*PushMsgReq)(nil), "push.PushMsgReq")
+	proto.RegisterType((*PushMsgReq)(nil), "OpenIMServer.push.PushMsgReq")
-	proto.RegisterType((*PushMsgResp)(nil), "push.PushMsgResp")
+	proto.RegisterType((*PushMsgResp)(nil), "OpenIMServer.push.PushMsgResp")
-	proto.RegisterType((*DelUserPushTokenReq)(nil), "push.DelUserPushTokenReq")
+	proto.RegisterType((*DelUserPushTokenReq)(nil), "OpenIMServer.push.DelUserPushTokenReq")
-	proto.RegisterType((*DelUserPushTokenResp)(nil), "push.DelUserPushTokenResp")
+	proto.RegisterType((*DelUserPushTokenResp)(nil), "OpenIMServer.push.DelUserPushTokenResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -208,7 +208,7 @@ func NewPushMsgServiceClient(cc *grpc.ClientConn) PushMsgServiceClient {
 
 func (c *pushMsgServiceClient) PushMsg(ctx context.Context, in *PushMsgReq, opts ...grpc.CallOption) (*PushMsgResp, error) {
 	out := new(PushMsgResp)
-	err := grpc.Invoke(ctx, "/push.PushMsgService/PushMsg", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.push.PushMsgService/PushMsg", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -217,7 +217,7 @@ func (c *pushMsgServiceClient) PushMsg(ctx context.Context, in *PushMsgReq, opts
 
 func (c *pushMsgServiceClient) DelUserPushToken(ctx context.Context, in *DelUserPushTokenReq, opts ...grpc.CallOption) (*DelUserPushTokenResp, error) {
 	out := new(DelUserPushTokenResp)
-	err := grpc.Invoke(ctx, "/push.PushMsgService/DelUserPushToken", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.push.PushMsgService/DelUserPushToken", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -245,7 +245,7 @@ func _PushMsgService_PushMsg_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/push.PushMsgService/PushMsg",
+		FullMethod: "/OpenIMServer.push.PushMsgService/PushMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(PushMsgServiceServer).PushMsg(ctx, req.(*PushMsgReq))
@@ -263,7 +263,7 @@ func _PushMsgService_DelUserPushToken_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/push.PushMsgService/DelUserPushToken",
+		FullMethod: "/OpenIMServer.push.PushMsgService/DelUserPushToken",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(PushMsgServiceServer).DelUserPushToken(ctx, req.(*DelUserPushTokenReq))
@@ -272,7 +272,7 @@ func _PushMsgService_DelUserPushToken_Handler(srv interface{}, ctx context.Conte
 }
 
 var _PushMsgService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "push.PushMsgService",
+	ServiceName: "OpenIMServer.push.PushMsgService",
 	HandlerType: (*PushMsgServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -288,26 +288,27 @@ var _PushMsgService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "push/push.proto",
 }
 
-func init() { proto.RegisterFile("push/push.proto", fileDescriptor_push_8111188de42e41d8) }
+func init() { proto.RegisterFile("push/push.proto", fileDescriptor_push_81fcc0e39a4f87ed) }
 
-var fileDescriptor_push_8111188de42e41d8 = []byte{
+var fileDescriptor_push_81fcc0e39a4f87ed = []byte{
-	// 278 bytes of a gzipped FileDescriptorProto
+	// 291 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x4f, 0xfa, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x4f, 0x4b, 0xf3, 0x40,
-	0x10, 0xc5, 0xd3, 0x7f, 0xfe, 0x82, 0x0c, 0x11, 0x71, 0x35, 0x04, 0x1b, 0x43, 0x48, 0x2f, 0xf6,
+	0x10, 0xc6, 0xc9, 0x0b, 0x6f, 0x6b, 0xa7, 0xf8, 0x6f, 0x95, 0x52, 0xa2, 0x86, 0x92, 0x83, 0xed,
-	0x42, 0x9b, 0xe0, 0xd1, 0x9b, 0xe9, 0xa5, 0x87, 0x8d, 0x66, 0xd5, 0x8b, 0xb7, 0x82, 0x63, 0x31,
+	0xa5, 0x1b, 0xa8, 0x78, 0xf2, 0x26, 0x39, 0x98, 0x43, 0x50, 0xa2, 0x5e, 0xbc, 0x48, 0x1a, 0xc7,
-	0x05, 0x76, 0xdc, 0x69, 0xe5, 0x43, 0xf8, 0xa5, 0xcd, 0x6e, 0x2b, 0x12, 0xd4, 0x4b, 0xd3, 0xf9,
+	0x54, 0xd2, 0x76, 0xc7, 0x9d, 0xc4, 0x7e, 0x3c, 0xbf, 0x9a, 0x6c, 0x12, 0x6b, 0xb5, 0x45, 0xbc,
-	0xcd, 0xcb, 0x7b, 0x79, 0xb3, 0x70, 0x4c, 0x15, 0x2f, 0x62, 0xfb, 0x89, 0xc8, 0xe8, 0x52, 0x8b,
+	0x2c, 0xcc, 0x33, 0xbf, 0x79, 0x9e, 0xdd, 0x59, 0xd8, 0xa5, 0x82, 0x27, 0x9e, 0x39, 0x24, 0x69,
-	0xff, 0xf6, 0xdf, 0xbf, 0xbc, 0x25, 0x5c, 0x4f, 0x52, 0x39, 0xb9, 0x47, 0xf3, 0x8e, 0x26, 0xa6,
+	0x95, 0x2b, 0xb1, 0x7f, 0x4d, 0x38, 0x0f, 0xc2, 0x5b, 0xd4, 0x6f, 0xa8, 0xa5, 0x69, 0xd8, 0x7d,
-	0x22, 0x8f, 0xdd, 0x3e, 0xe6, 0xe7, 0x62, 0xc3, 0xf1, 0x86, 0x6b, 0x79, 0xa0, 0x00, 0xee, 0x2a,
+	0x23, 0x0d, 0x83, 0x70, 0x58, 0x89, 0x1e, 0x65, 0xa9, 0x57, 0xc2, 0x1e, 0x3f, 0x65, 0x0b, 0xf6,
-	0x5e, 0x48, 0xce, 0x15, 0xbe, 0x89, 0x10, 0xda, 0x2b, 0xce, 0x93, 0xac, 0xcc, 0x86, 0xde, 0xd8,
+	0x16, 0x5c, 0xcd, 0xba, 0x8f, 0x00, 0x37, 0x05, 0x4f, 0x42, 0x4e, 0x23, 0x7c, 0x15, 0xe7, 0xd0,
-	0x0b, 0xbb, 0xd3, 0x5e, 0xe4, 0xf4, 0x91, 0xac, 0xa9, 0xfa, 0x5a, 0x0b, 0x1f, 0x0e, 0x59, 0x57,
+	0x9c, 0x71, 0xea, 0xc7, 0x79, 0xdc, 0xb5, 0x7a, 0xd6, 0xa0, 0x3d, 0x3a, 0x92, 0xdf, 0xbc, 0xcb,
-	0x66, 0x8e, 0x69, 0x32, 0xfc, 0x37, 0xf6, 0xc2, 0x8e, 0xda, 0xce, 0xc1, 0x11, 0x74, 0xb7, 0x9e,
+	0x61, 0x19, 0x56, 0x48, 0xf4, 0xc9, 0x0a, 0x1b, 0xb6, 0x58, 0x15, 0x3a, 0xc1, 0xc0, 0xef, 0xfe,
-	0x4c, 0x81, 0x84, 0xd3, 0x04, 0x97, 0x8f, 0x8c, 0xc6, 0xd2, 0x07, 0x5d, 0xe0, 0xda, 0x66, 0x0d,
+	0xeb, 0x59, 0x83, 0x56, 0xb4, 0xac, 0xdd, 0x6d, 0x68, 0x2f, 0x03, 0x98, 0xdc, 0x10, 0x0e, 0x7c,
-	0xa0, 0x55, 0x31, 0x9a, 0x34, 0x71, 0x51, 0x1d, 0xd5, 0x4c, 0x62, 0x04, 0x40, 0xcb, 0xac, 0x7c,
+	0x9c, 0xde, 0x33, 0x6a, 0xa3, 0xde, 0xa9, 0x0c, 0xe7, 0x26, 0xb8, 0x03, 0x8d, 0x82, 0x51, 0x07,
-	0xd1, 0x66, 0xd5, 0x78, 0x1f, 0xa8, 0x1d, 0x12, 0x0c, 0xe0, 0xec, 0xa7, 0x1d, 0xd3, 0xf4, 0xc3,
+	0x7e, 0x99, 0xdb, 0x8a, 0xea, 0x4a, 0x38, 0x00, 0x34, 0x8d, 0xf3, 0x67, 0xa5, 0x67, 0xb5, 0xf7,
-	0x83, 0x5e, 0x13, 0x6b, 0x4b, 0xbf, 0xce, 0x51, 0x44, 0xd0, 0x6e, 0x88, 0xe8, 0x47, 0xee, 0x46,
+	0xff, 0x68, 0x45, 0x71, 0x3b, 0x70, 0xb8, 0x6e, 0xc7, 0x34, 0x7a, 0xb7, 0x60, 0xa7, 0x8e, 0x35,
-	0xdf, 0x5d, 0xfd, 0x93, 0x3d, 0xc2, 0x24, 0x52, 0xe8, 0xef, 0x5b, 0x8b, 0xf3, 0x5a, 0xf6, 0x4b,
+	0x57, 0x7f, 0x49, 0x50, 0x5c, 0x41, 0xb3, 0x56, 0xc4, 0x89, 0x5c, 0xdb, 0x98, 0xfc, 0xda, 0x82,
-	0x03, 0xdf, 0xff, 0x6b, 0xc5, 0x74, 0x33, 0x7a, 0xba, 0xb0, 0x4f, 0x90, 0xca, 0x9d, 0xd3, 0x5b,
+	0xed, 0xfc, 0xd6, 0x66, 0x12, 0x09, 0xec, 0xfd, 0x0c, 0x15, 0xa7, 0x1b, 0x66, 0x36, 0x3c, 0xd4,
-	0xf5, 0x35, 0xcd, 0xac, 0x70, 0xd6, 0x72, 0xe8, 0xea, 0x33, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x9e,
+	0xee, 0xff, 0x89, 0x63, 0xba, 0x74, 0x1e, 0x8e, 0x2b, 0x72, 0xe5, 0xef, 0x0c, 0x7d, 0x41, 0x63,
-	0x84, 0x31, 0xc0, 0x01, 0x00, 0x00,
+	0x03, 0x8e, 0x1b, 0xa5, 0x74, 0xf6, 0x11, 0x00, 0x00, 0xff, 0xff, 0x38, 0x6e, 0x86, 0xe1, 0x0e,
+	0x02, 0x00, 0x00,
 }

pkg/proto/push/push.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 option go_package = "OpenIM/pkg/proto/push;pbPush";
-package push;
+package OpenIMServer.push;
 
 message PushMsgReq {
   sdkws.MsgData msgData = 1;

pkg/proto/rtc/rtc.pb.go

@@ -36,7 +36,7 @@ func (m *SignalMessageAssembleReq) Reset()         { *m = SignalMessageAssembleR
 func (m *SignalMessageAssembleReq) String() string { return proto.CompactTextString(m) }
 func (*SignalMessageAssembleReq) ProtoMessage()    {}
 func (*SignalMessageAssembleReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_62b2557b8d73c35e, []int{0}
+	return fileDescriptor_rtc_1c78526032681b55, []int{0}
 }
 func (m *SignalMessageAssembleReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalMessageAssembleReq.Unmarshal(m, b)
@@ -83,7 +83,7 @@ func (m *SignalMessageAssembleResp) Reset()         { *m = SignalMessageAssemble
 func (m *SignalMessageAssembleResp) String() string { return proto.CompactTextString(m) }
 func (*SignalMessageAssembleResp) ProtoMessage()    {}
 func (*SignalMessageAssembleResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_62b2557b8d73c35e, []int{1}
+	return fileDescriptor_rtc_1c78526032681b55, []int{1}
 }
 func (m *SignalMessageAssembleResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalMessageAssembleResp.Unmarshal(m, b)
@@ -135,7 +135,7 @@ func (m *SignalGetRoomsReq) Reset()         { *m = SignalGetRoomsReq{} }
 func (m *SignalGetRoomsReq) String() string { return proto.CompactTextString(m) }
 func (*SignalGetRoomsReq) ProtoMessage()    {}
 func (*SignalGetRoomsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_62b2557b8d73c35e, []int{2}
+	return fileDescriptor_rtc_1c78526032681b55, []int{2}
 }
 func (m *SignalGetRoomsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalGetRoomsReq.Unmarshal(m, b)
@@ -173,7 +173,7 @@ func (m *SignalGetRoomsResp) Reset()         { *m = SignalGetRoomsResp{} }
 func (m *SignalGetRoomsResp) String() string { return proto.CompactTextString(m) }
 func (*SignalGetRoomsResp) ProtoMessage()    {}
 func (*SignalGetRoomsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_62b2557b8d73c35e, []int{3}
+	return fileDescriptor_rtc_1c78526032681b55, []int{3}
 }
 func (m *SignalGetRoomsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalGetRoomsResp.Unmarshal(m, b)
@@ -201,10 +201,10 @@ func (m *SignalGetRoomsResp) GetRooms() []*sdkws.SignalGetRoomByGroupIDReply {
 }
 
 func init() {
-	proto.RegisterType((*SignalMessageAssembleReq)(nil), "rtc.SignalMessageAssembleReq")
+	proto.RegisterType((*SignalMessageAssembleReq)(nil), "OpenIMServer.rtc.SignalMessageAssembleReq")
-	proto.RegisterType((*SignalMessageAssembleResp)(nil), "rtc.SignalMessageAssembleResp")
+	proto.RegisterType((*SignalMessageAssembleResp)(nil), "OpenIMServer.rtc.SignalMessageAssembleResp")
-	proto.RegisterType((*SignalGetRoomsReq)(nil), "rtc.SignalGetRoomsReq")
+	proto.RegisterType((*SignalGetRoomsReq)(nil), "OpenIMServer.rtc.SignalGetRoomsReq")
-	proto.RegisterType((*SignalGetRoomsResp)(nil), "rtc.SignalGetRoomsResp")
+	proto.RegisterType((*SignalGetRoomsResp)(nil), "OpenIMServer.rtc.SignalGetRoomsResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -232,7 +232,7 @@ func NewRtcServiceClient(cc *grpc.ClientConn) RtcServiceClient {
 
 func (c *rtcServiceClient) SignalMessageAssemble(ctx context.Context, in *SignalMessageAssembleReq, opts ...grpc.CallOption) (*SignalMessageAssembleResp, error) {
 	out := new(SignalMessageAssembleResp)
-	err := grpc.Invoke(ctx, "/rtc.RtcService/SignalMessageAssemble", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.rtc.RtcService/SignalMessageAssemble", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -241,7 +241,7 @@ func (c *rtcServiceClient) SignalMessageAssemble(ctx context.Context, in *Signal
 
 func (c *rtcServiceClient) SignalGetRooms(ctx context.Context, in *SignalGetRoomsReq, opts ...grpc.CallOption) (*SignalGetRoomsResp, error) {
 	out := new(SignalGetRoomsResp)
-	err := grpc.Invoke(ctx, "/rtc.RtcService/SignalGetRooms", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.rtc.RtcService/SignalGetRooms", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -269,7 +269,7 @@ func _RtcService_SignalMessageAssemble_Handler(srv interface{}, ctx context.Cont
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/rtc.RtcService/SignalMessageAssemble",
+		FullMethod: "/OpenIMServer.rtc.RtcService/SignalMessageAssemble",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RtcServiceServer).SignalMessageAssemble(ctx, req.(*SignalMessageAssembleReq))
@@ -287,7 +287,7 @@ func _RtcService_SignalGetRooms_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/rtc.RtcService/SignalGetRooms",
+		FullMethod: "/OpenIMServer.rtc.RtcService/SignalGetRooms",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(RtcServiceServer).SignalGetRooms(ctx, req.(*SignalGetRoomsReq))
@@ -296,7 +296,7 @@ func _RtcService_SignalGetRooms_Handler(srv interface{}, ctx context.Context, de
 }
 
 var _RtcService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "rtc.RtcService",
+	ServiceName: "OpenIMServer.rtc.RtcService",
 	HandlerType: (*RtcServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -312,31 +312,31 @@ var _RtcService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "rtc/rtc.proto",
 }
 
-func init() { proto.RegisterFile("rtc/rtc.proto", fileDescriptor_rtc_62b2557b8d73c35e) }
+func init() { proto.RegisterFile("rtc/rtc.proto", fileDescriptor_rtc_1c78526032681b55) }
 
-var fileDescriptor_rtc_62b2557b8d73c35e = []byte{
+var fileDescriptor_rtc_1c78526032681b55 = []byte{
-	// 359 bytes of a gzipped FileDescriptorProto
+	// 368 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6a, 0xe3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xdd, 0x4a, 0xe3, 0x40,
-	0x10, 0x86, 0xf1, 0x86, 0xcd, 0x6e, 0xc6, 0x6c, 0xd8, 0x08, 0x36, 0xeb, 0x1a, 0x5a, 0x82, 0x2f,
+	0x14, 0x80, 0xc9, 0x96, 0xed, 0x6e, 0x4f, 0xd8, 0x65, 0x77, 0x60, 0x4b, 0x36, 0xa2, 0x94, 0x28,
-	0x35, 0x94, 0xd8, 0xd4, 0xbd, 0x14, 0x7a, 0x4a, 0x30, 0x04, 0x1f, 0xdc, 0x16, 0x05, 0x7a, 0xe8,
+	0x58, 0x2c, 0x4d, 0x20, 0xe2, 0x55, 0x41, 0xb0, 0x44, 0x4a, 0x2e, 0x82, 0x32, 0xbd, 0xb3, 0x57,
-	0xcd, 0x71, 0x85, 0x31, 0xb1, 0x23, 0x45, 0xa3, 0x36, 0xe4, 0x2d, 0xfa, 0x16, 0x7d, 0xcd, 0x62,
+	0x69, 0x1c, 0x42, 0x68, 0xd3, 0x99, 0xce, 0x19, 0x2d, 0x7d, 0x25, 0x5f, 0xc9, 0x97, 0x91, 0x4c,
-	0xd9, 0xa1, 0x4e, 0x48, 0x7a, 0x9c, 0xff, 0xff, 0x46, 0xf3, 0x4b, 0x23, 0xf8, 0x23, 0x55, 0xea,
+	0x5a, 0x4c, 0x4b, 0xa3, 0x5e, 0x9e, 0x33, 0xdf, 0x77, 0x7e, 0x66, 0x06, 0x7e, 0x49, 0x95, 0x78,
-	0x4b, 0x95, 0x7a, 0x42, 0x72, 0xc5, 0x49, 0x47, 0xaa, 0xd4, 0xbe, 0x7c, 0x10, 0x6c, 0x35, 0x8e,
+	0x52, 0x25, 0xae, 0x90, 0x5c, 0x71, 0xf2, 0xe7, 0x4e, 0xb0, 0x45, 0x18, 0x8d, 0x99, 0x7c, 0x66,
-	0xe2, 0xf1, 0x9c, 0xc9, 0x37, 0x26, 0x7d, 0xb1, 0xcc, 0x7c, 0x6d, 0xfb, 0xf8, 0xb2, 0xdc, 0xa0,
+	0xd2, 0x95, 0x2a, 0xb1, 0xcf, 0x8b, 0x4c, 0x3f, 0x8c, 0xfa, 0x65, 0xce, 0x13, 0xb3, 0xd4, 0xd3,
-	0xbf, 0xc1, 0x9a, 0x76, 0x0a, 0xb0, 0xe6, 0x79, 0xb6, 0x4a, 0x8a, 0x98, 0x21, 0x26, 0x19, 0x9b,
+	0xac, 0x87, 0x8f, 0xb3, 0x15, 0x7a, 0x2b, 0x2c, 0x55, 0x67, 0x0d, 0xd6, 0x38, 0x4b, 0x17, 0xf1,
-	0x20, 0xb2, 0x72, 0x51, 0x30, 0xca, 0xd6, 0xc4, 0x83, 0x1e, 0x6a, 0x8f, 0xb2, 0xb5, 0x65, 0x8c,
+	0x3c, 0x62, 0x88, 0x71, 0xca, 0x6e, 0x10, 0x59, 0x3e, 0x9d, 0x33, 0xca, 0x96, 0x64, 0x00, 0x2d,
-	0x0c, 0xd7, 0x0c, 0xfe, 0x7a, 0xba, 0xdf, 0x9b, 0xef, 0x74, 0xfa, 0x85, 0x90, 0x11, 0x98, 0x5c,
+	0xd4, 0x67, 0x94, 0x2d, 0x2d, 0xa3, 0x63, 0x74, 0x4d, 0xff, 0xd8, 0xdd, 0x69, 0xa5, 0x8b, 0xb9,
-	0x30, 0x99, 0xa8, 0x9c, 0xaf, 0xa2, 0xd0, 0xfa, 0x31, 0x32, 0xdc, 0x1e, 0x6d, 0x4b, 0xce, 0xbb,
+	0xe3, 0x2d, 0x44, 0xdf, 0x79, 0xd2, 0x01, 0x93, 0x0b, 0x26, 0x63, 0x95, 0xf1, 0x45, 0x18, 0x58,
-	0x01, 0x67, 0x27, 0xc6, 0xa1, 0x20, 0x43, 0xe8, 0xe6, 0xf8, 0x98, 0x20, 0xea, 0x61, 0xbf, 0x69,
+	0xdf, 0x3a, 0x46, 0xb7, 0x45, 0xab, 0x29, 0xe7, 0xc5, 0x80, 0xff, 0x35, 0xbd, 0x51, 0x90, 0x36,
-	0x53, 0x91, 0x6b, 0x80, 0xdd, 0x10, 0x14, 0xfa, 0x58, 0x33, 0x18, 0x1c, 0x04, 0x41, 0x41, 0x5b,
+	0x34, 0x33, 0xbc, 0x8f, 0x11, 0x75, 0xe7, 0x9f, 0x74, 0x13, 0x91, 0x6b, 0x80, 0x6d, 0x13, 0x14,
-	0x10, 0x71, 0xe1, 0x57, 0x89, 0x59, 0x98, 0xa8, 0xc4, 0xea, 0x68, 0xbe, 0xdf, 0xf0, 0x71, 0xad,
+	0xba, 0xac, 0xe9, 0x9f, 0x7c, 0x34, 0x15, 0x0a, 0x5a, 0x31, 0xc8, 0x15, 0xfc, 0xc8, 0x31, 0x0d,
-	0xd2, 0x9d, 0xed, 0x5c, 0xc1, 0xa0, 0x3e, 0x63, 0xc6, 0x14, 0xe5, 0xbc, 0xc4, 0xea, 0x26, 0x43,
+	0x62, 0x15, 0x5b, 0x0d, 0x2d, 0x1f, 0x1d, 0x92, 0xa3, 0x12, 0xa1, 0x5b, 0xd6, 0xe9, 0xc1, 0xdf,
-	0xe8, 0x4a, 0xce, 0xcb, 0x28, 0xd4, 0x49, 0x7a, 0xb4, 0xa9, 0x9c, 0x7b, 0x20, 0x87, 0x30, 0x0a,
+	0xb2, 0xe0, 0x88, 0x29, 0xca, 0x79, 0x8e, 0xc5, 0x8e, 0x6d, 0x68, 0x4a, 0xce, 0xf3, 0x30, 0xd0,
-	0x72, 0x0b, 0x3f, 0x2b, 0xbf, 0x8a, 0xdd, 0x71, 0xcd, 0xc0, 0xd9, 0x8b, 0xd6, 0x90, 0xd3, 0xed,
+	0x33, 0xb6, 0xe8, 0x26, 0x72, 0x26, 0x40, 0xf6, 0x61, 0x14, 0xe4, 0x16, 0xbe, 0x17, 0xe7, 0xc5,
-	0x4c, 0xf2, 0x57, 0x11, 0x85, 0x94, 0x89, 0x62, 0x4b, 0xeb, 0x86, 0xe0, 0xc3, 0x00, 0xa0, 0x2a,
+	0x42, 0x8d, 0xae, 0xe9, 0x7b, 0xf5, 0x43, 0x6f, 0xb4, 0xe1, 0x7a, 0x24, 0xf9, 0x93, 0x08, 0x03,
-	0xad, 0x96, 0x94, 0xa7, 0x8c, 0x3c, 0xc1, 0xbf, 0xa3, 0xaf, 0x43, 0xce, 0xbd, 0x6a, 0xbf, 0xa7,
+	0xca, 0xc4, 0x7c, 0x4d, 0x4b, 0xdb, 0x7f, 0x35, 0x00, 0xa8, 0x4a, 0x0a, 0x2d, 0x4b, 0x18, 0x11,
-	0x16, 0x65, 0x5f, 0x7c, 0x67, 0xa3, 0x20, 0x13, 0xe8, 0xef, 0xc7, 0x26, 0xc3, 0x56, 0x47, 0xeb,
+	0xf0, 0xef, 0xe0, 0x25, 0x92, 0x0b, 0x77, 0xff, 0x57, 0xb8, 0x75, 0x2f, 0x6d, 0xf7, 0xbe, 0xcc,
-	0xe2, 0xf6, 0xff, 0xa3, 0x3a, 0x8a, 0xa9, 0xfd, 0x6c, 0x55, 0x5f, 0x2a, 0x8a, 0x5b, 0x5f, 0x49,
+	0xa2, 0x20, 0x13, 0xf8, 0xbd, 0xbb, 0x1d, 0x39, 0xad, 0xd3, 0x2b, 0x97, 0x65, 0x9f, 0x7d, 0x0e,
-	0xaa, 0xf4, 0x4e, 0xaa, 0x74, 0xd1, 0xd5, 0xe5, 0xcd, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49,
+	0xa1, 0x18, 0xda, 0x0f, 0x56, 0x89, 0x55, 0xbe, 0xac, 0x54, 0xc9, 0x40, 0xaa, 0x64, 0xda, 0xd4,
-	0x81, 0xcb, 0x8d, 0x89, 0x02, 0x00, 0x00,
+	0xe1, 0xe5, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x79, 0xb8, 0x52, 0xfe, 0x02, 0x00, 0x00,
 }

pkg/proto/rtc/rtc.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 option go_package = "OpenIM/pkg/proto/rtc;rtc";
-package rtc;
+package OpenIMServer.rtc;
 
 message SignalMessageAssembleReq {
  sdkws.SignalReq signalReq = 1;

pkg/proto/sdkws/ws.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/wrappers.proto";
 option go_package = "OpenIM/pkg/proto/sdkws;sdkws";
-package sdkws;
+package OpenIMServer.sdkws;
 
 
 ////////////////////////////////base///////////////////////////////

pkg/proto/third/third.pb.go

@@ -39,7 +39,7 @@ func (m *ApplyPutReq) Reset()         { *m = ApplyPutReq{} }
 func (m *ApplyPutReq) String() string { return proto.CompactTextString(m) }
 func (*ApplyPutReq) ProtoMessage()    {}
 func (*ApplyPutReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{0}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{0}
 }
 func (m *ApplyPutReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyPutReq.Unmarshal(m, b)
@@ -109,7 +109,7 @@ func (m *ApplyPutResp) Reset()         { *m = ApplyPutResp{} }
 func (m *ApplyPutResp) String() string { return proto.CompactTextString(m) }
 func (*ApplyPutResp) ProtoMessage()    {}
 func (*ApplyPutResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{1}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{1}
 }
 func (m *ApplyPutResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ApplyPutResp.Unmarshal(m, b)
@@ -168,7 +168,7 @@ func (m *ConfirmPutReq) Reset()         { *m = ConfirmPutReq{} }
 func (m *ConfirmPutReq) String() string { return proto.CompactTextString(m) }
 func (*ConfirmPutReq) ProtoMessage()    {}
 func (*ConfirmPutReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{2}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{2}
 }
 func (m *ConfirmPutReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfirmPutReq.Unmarshal(m, b)
@@ -206,7 +206,7 @@ func (m *ConfirmPutResp) Reset()         { *m = ConfirmPutResp{} }
 func (m *ConfirmPutResp) String() string { return proto.CompactTextString(m) }
 func (*ConfirmPutResp) ProtoMessage()    {}
 func (*ConfirmPutResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{3}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{3}
 }
 func (m *ConfirmPutResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConfirmPutResp.Unmarshal(m, b)
@@ -244,7 +244,7 @@ func (m *GetPutReq) Reset()         { *m = GetPutReq{} }
 func (m *GetPutReq) String() string { return proto.CompactTextString(m) }
 func (*GetPutReq) ProtoMessage()    {}
 func (*GetPutReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{4}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{4}
 }
 func (m *GetPutReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPutReq.Unmarshal(m, b)
@@ -283,7 +283,7 @@ func (m *GetPutFragment) Reset()         { *m = GetPutFragment{} }
 func (m *GetPutFragment) String() string { return proto.CompactTextString(m) }
 func (*GetPutFragment) ProtoMessage()    {}
 func (*GetPutFragment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{5}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{5}
 }
 func (m *GetPutFragment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPutFragment.Unmarshal(m, b)
@@ -333,7 +333,7 @@ func (m *GetPutResp) Reset()         { *m = GetPutResp{} }
 func (m *GetPutResp) String() string { return proto.CompactTextString(m) }
 func (*GetPutResp) ProtoMessage()    {}
 func (*GetPutResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{6}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{6}
 }
 func (m *GetPutResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPutResp.Unmarshal(m, b)
@@ -406,7 +406,7 @@ func (m *GetSignalInvitationInfoReq) Reset()         { *m = GetSignalInvitationI
 func (m *GetSignalInvitationInfoReq) String() string { return proto.CompactTextString(m) }
 func (*GetSignalInvitationInfoReq) ProtoMessage()    {}
 func (*GetSignalInvitationInfoReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{7}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{7}
 }
 func (m *GetSignalInvitationInfoReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSignalInvitationInfoReq.Unmarshal(m, b)
@@ -445,7 +445,7 @@ func (m *GetSignalInvitationInfoResp) Reset()         { *m = GetSignalInvitation
 func (m *GetSignalInvitationInfoResp) String() string { return proto.CompactTextString(m) }
 func (*GetSignalInvitationInfoResp) ProtoMessage()    {}
 func (*GetSignalInvitationInfoResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{8}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{8}
 }
 func (m *GetSignalInvitationInfoResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSignalInvitationInfoResp.Unmarshal(m, b)
@@ -490,7 +490,7 @@ func (m *GetSignalInvitationInfoStartAppReq) Reset()         { *m = GetSignalInv
 func (m *GetSignalInvitationInfoStartAppReq) String() string { return proto.CompactTextString(m) }
 func (*GetSignalInvitationInfoStartAppReq) ProtoMessage()    {}
 func (*GetSignalInvitationInfoStartAppReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{9}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{9}
 }
 func (m *GetSignalInvitationInfoStartAppReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSignalInvitationInfoStartAppReq.Unmarshal(m, b)
@@ -529,7 +529,7 @@ func (m *GetSignalInvitationInfoStartAppResp) Reset()         { *m = GetSignalIn
 func (m *GetSignalInvitationInfoStartAppResp) String() string { return proto.CompactTextString(m) }
 func (*GetSignalInvitationInfoStartAppResp) ProtoMessage()    {}
 func (*GetSignalInvitationInfoStartAppResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{10}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{10}
 }
 func (m *GetSignalInvitationInfoStartAppResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSignalInvitationInfoStartAppResp.Unmarshal(m, b)
@@ -577,7 +577,7 @@ func (m *FcmUpdateTokenReq) Reset()         { *m = FcmUpdateTokenReq{} }
 func (m *FcmUpdateTokenReq) String() string { return proto.CompactTextString(m) }
 func (*FcmUpdateTokenReq) ProtoMessage()    {}
 func (*FcmUpdateTokenReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{11}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{11}
 }
 func (m *FcmUpdateTokenReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FcmUpdateTokenReq.Unmarshal(m, b)
@@ -635,7 +635,7 @@ func (m *FcmUpdateTokenResp) Reset()         { *m = FcmUpdateTokenResp{} }
 func (m *FcmUpdateTokenResp) String() string { return proto.CompactTextString(m) }
 func (*FcmUpdateTokenResp) ProtoMessage()    {}
 func (*FcmUpdateTokenResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{12}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{12}
 }
 func (m *FcmUpdateTokenResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FcmUpdateTokenResp.Unmarshal(m, b)
@@ -667,7 +667,7 @@ func (m *SetAppBadgeReq) Reset()         { *m = SetAppBadgeReq{} }
 func (m *SetAppBadgeReq) String() string { return proto.CompactTextString(m) }
 func (*SetAppBadgeReq) ProtoMessage()    {}
 func (*SetAppBadgeReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{13}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{13}
 }
 func (m *SetAppBadgeReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetAppBadgeReq.Unmarshal(m, b)
@@ -711,7 +711,7 @@ func (m *SetAppBadgeResp) Reset()         { *m = SetAppBadgeResp{} }
 func (m *SetAppBadgeResp) String() string { return proto.CompactTextString(m) }
 func (*SetAppBadgeResp) ProtoMessage()    {}
 func (*SetAppBadgeResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_third_1a1336c138d6f5b7, []int{14}
+	return fileDescriptor_third_bcb47e8b7c85b36b, []int{14}
 }
 func (m *SetAppBadgeResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetAppBadgeResp.Unmarshal(m, b)
@@ -732,21 +732,21 @@ func (m *SetAppBadgeResp) XXX_DiscardUnknown() {
 var xxx_messageInfo_SetAppBadgeResp proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*ApplyPutReq)(nil), "third.ApplyPutReq")
+	proto.RegisterType((*ApplyPutReq)(nil), "OpenIMServer.third.ApplyPutReq")
-	proto.RegisterType((*ApplyPutResp)(nil), "third.ApplyPutResp")
+	proto.RegisterType((*ApplyPutResp)(nil), "OpenIMServer.third.ApplyPutResp")
-	proto.RegisterType((*ConfirmPutReq)(nil), "third.ConfirmPutReq")
+	proto.RegisterType((*ConfirmPutReq)(nil), "OpenIMServer.third.ConfirmPutReq")
-	proto.RegisterType((*ConfirmPutResp)(nil), "third.ConfirmPutResp")
+	proto.RegisterType((*ConfirmPutResp)(nil), "OpenIMServer.third.ConfirmPutResp")
-	proto.RegisterType((*GetPutReq)(nil), "third.GetPutReq")
+	proto.RegisterType((*GetPutReq)(nil), "OpenIMServer.third.GetPutReq")
-	proto.RegisterType((*GetPutFragment)(nil), "third.GetPutFragment")
+	proto.RegisterType((*GetPutFragment)(nil), "OpenIMServer.third.GetPutFragment")
-	proto.RegisterType((*GetPutResp)(nil), "third.GetPutResp")
+	proto.RegisterType((*GetPutResp)(nil), "OpenIMServer.third.GetPutResp")
-	proto.RegisterType((*GetSignalInvitationInfoReq)(nil), "third.GetSignalInvitationInfoReq")
+	proto.RegisterType((*GetSignalInvitationInfoReq)(nil), "OpenIMServer.third.GetSignalInvitationInfoReq")
-	proto.RegisterType((*GetSignalInvitationInfoResp)(nil), "third.GetSignalInvitationInfoResp")
+	proto.RegisterType((*GetSignalInvitationInfoResp)(nil), "OpenIMServer.third.GetSignalInvitationInfoResp")
-	proto.RegisterType((*GetSignalInvitationInfoStartAppReq)(nil), "third.GetSignalInvitationInfoStartAppReq")
+	proto.RegisterType((*GetSignalInvitationInfoStartAppReq)(nil), "OpenIMServer.third.GetSignalInvitationInfoStartAppReq")
-	proto.RegisterType((*GetSignalInvitationInfoStartAppResp)(nil), "third.GetSignalInvitationInfoStartAppResp")
+	proto.RegisterType((*GetSignalInvitationInfoStartAppResp)(nil), "OpenIMServer.third.GetSignalInvitationInfoStartAppResp")
-	proto.RegisterType((*FcmUpdateTokenReq)(nil), "third.FcmUpdateTokenReq")
+	proto.RegisterType((*FcmUpdateTokenReq)(nil), "OpenIMServer.third.FcmUpdateTokenReq")
-	proto.RegisterType((*FcmUpdateTokenResp)(nil), "third.FcmUpdateTokenResp")
+	proto.RegisterType((*FcmUpdateTokenResp)(nil), "OpenIMServer.third.FcmUpdateTokenResp")
-	proto.RegisterType((*SetAppBadgeReq)(nil), "third.SetAppBadgeReq")
+	proto.RegisterType((*SetAppBadgeReq)(nil), "OpenIMServer.third.SetAppBadgeReq")
-	proto.RegisterType((*SetAppBadgeResp)(nil), "third.SetAppBadgeResp")
+	proto.RegisterType((*SetAppBadgeResp)(nil), "OpenIMServer.third.SetAppBadgeResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -779,7 +779,7 @@ func NewThirdClient(cc *grpc.ClientConn) ThirdClient {
 
 func (c *thirdClient) ApplyPut(ctx context.Context, in *ApplyPutReq, opts ...grpc.CallOption) (*ApplyPutResp, error) {
 	out := new(ApplyPutResp)
-	err := grpc.Invoke(ctx, "/third.third/ApplyPut", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/ApplyPut", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -788,7 +788,7 @@ func (c *thirdClient) ApplyPut(ctx context.Context, in *ApplyPutReq, opts ...grp
 
 func (c *thirdClient) GetPut(ctx context.Context, in *GetPutReq, opts ...grpc.CallOption) (*GetPutResp, error) {
 	out := new(GetPutResp)
-	err := grpc.Invoke(ctx, "/third.third/GetPut", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/GetPut", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -797,7 +797,7 @@ func (c *thirdClient) GetPut(ctx context.Context, in *GetPutReq, opts ...grpc.Ca
 
 func (c *thirdClient) ConfirmPut(ctx context.Context, in *ConfirmPutReq, opts ...grpc.CallOption) (*ConfirmPutResp, error) {
 	out := new(ConfirmPutResp)
-	err := grpc.Invoke(ctx, "/third.third/ConfirmPut", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/ConfirmPut", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -806,7 +806,7 @@ func (c *thirdClient) ConfirmPut(ctx context.Context, in *ConfirmPutReq, opts ..
 
 func (c *thirdClient) GetSignalInvitationInfo(ctx context.Context, in *GetSignalInvitationInfoReq, opts ...grpc.CallOption) (*GetSignalInvitationInfoResp, error) {
 	out := new(GetSignalInvitationInfoResp)
-	err := grpc.Invoke(ctx, "/third.third/GetSignalInvitationInfo", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/GetSignalInvitationInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -815,7 +815,7 @@ func (c *thirdClient) GetSignalInvitationInfo(ctx context.Context, in *GetSignal
 
 func (c *thirdClient) GetSignalInvitationInfoStartApp(ctx context.Context, in *GetSignalInvitationInfoStartAppReq, opts ...grpc.CallOption) (*GetSignalInvitationInfoStartAppResp, error) {
 	out := new(GetSignalInvitationInfoStartAppResp)
-	err := grpc.Invoke(ctx, "/third.third/GetSignalInvitationInfoStartApp", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/GetSignalInvitationInfoStartApp", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -824,7 +824,7 @@ func (c *thirdClient) GetSignalInvitationInfoStartApp(ctx context.Context, in *G
 
 func (c *thirdClient) FcmUpdateToken(ctx context.Context, in *FcmUpdateTokenReq, opts ...grpc.CallOption) (*FcmUpdateTokenResp, error) {
 	out := new(FcmUpdateTokenResp)
-	err := grpc.Invoke(ctx, "/third.third/FcmUpdateToken", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/FcmUpdateToken", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -833,7 +833,7 @@ func (c *thirdClient) FcmUpdateToken(ctx context.Context, in *FcmUpdateTokenReq,
 
 func (c *thirdClient) SetAppBadge(ctx context.Context, in *SetAppBadgeReq, opts ...grpc.CallOption) (*SetAppBadgeResp, error) {
 	out := new(SetAppBadgeResp)
-	err := grpc.Invoke(ctx, "/third.third/SetAppBadge", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.third.third/SetAppBadge", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -866,7 +866,7 @@ func _Third_ApplyPut_Handler(srv interface{}, ctx context.Context, dec func(inte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/ApplyPut",
+		FullMethod: "/OpenIMServer.third.third/ApplyPut",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).ApplyPut(ctx, req.(*ApplyPutReq))
@@ -884,7 +884,7 @@ func _Third_GetPut_Handler(srv interface{}, ctx context.Context, dec func(interf
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/GetPut",
+		FullMethod: "/OpenIMServer.third.third/GetPut",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).GetPut(ctx, req.(*GetPutReq))
@@ -902,7 +902,7 @@ func _Third_ConfirmPut_Handler(srv interface{}, ctx context.Context, dec func(in
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/ConfirmPut",
+		FullMethod: "/OpenIMServer.third.third/ConfirmPut",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).ConfirmPut(ctx, req.(*ConfirmPutReq))
@@ -920,7 +920,7 @@ func _Third_GetSignalInvitationInfo_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/GetSignalInvitationInfo",
+		FullMethod: "/OpenIMServer.third.third/GetSignalInvitationInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).GetSignalInvitationInfo(ctx, req.(*GetSignalInvitationInfoReq))
@@ -938,7 +938,7 @@ func _Third_GetSignalInvitationInfoStartApp_Handler(srv interface{}, ctx context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/GetSignalInvitationInfoStartApp",
+		FullMethod: "/OpenIMServer.third.third/GetSignalInvitationInfoStartApp",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).GetSignalInvitationInfoStartApp(ctx, req.(*GetSignalInvitationInfoStartAppReq))
@@ -956,7 +956,7 @@ func _Third_FcmUpdateToken_Handler(srv interface{}, ctx context.Context, dec fun
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/FcmUpdateToken",
+		FullMethod: "/OpenIMServer.third.third/FcmUpdateToken",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).FcmUpdateToken(ctx, req.(*FcmUpdateTokenReq))
@@ -974,7 +974,7 @@ func _Third_SetAppBadge_Handler(srv interface{}, ctx context.Context, dec func(i
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/third.third/SetAppBadge",
+		FullMethod: "/OpenIMServer.third.third/SetAppBadge",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ThirdServer).SetAppBadge(ctx, req.(*SetAppBadgeReq))
@@ -983,7 +983,7 @@ func _Third_SetAppBadge_Handler(srv interface{}, ctx context.Context, dec func(i
 }
 
 var _Third_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "third.third",
+	ServiceName: "OpenIMServer.third.third",
 	HandlerType: (*ThirdServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -1019,52 +1019,53 @@ var _Third_serviceDesc = grpc.ServiceDesc{
 	Metadata: "third/third.proto",
 }
 
-func init() { proto.RegisterFile("third/third.proto", fileDescriptor_third_1a1336c138d6f5b7) }
+func init() { proto.RegisterFile("third/third.proto", fileDescriptor_third_bcb47e8b7c85b36b) }
 
-var fileDescriptor_third_1a1336c138d6f5b7 = []byte{
+var fileDescriptor_third_bcb47e8b7c85b36b = []byte{
-	// 703 bytes of a gzipped FileDescriptorProto
+	// 717 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xd1, 0x6e, 0xd3, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xc1, 0x6e, 0xd3, 0x4a,
-	0x10, 0x95, 0x93, 0x26, 0xb7, 0x99, 0xf4, 0xa6, 0xcd, 0xdc, 0xb6, 0xd7, 0x98, 0xaa, 0xa4, 0x8b,
+	0x14, 0x95, 0x93, 0x26, 0xaf, 0xb9, 0xe9, 0x4b, 0x5f, 0xaf, 0xaa, 0x47, 0x64, 0x4a, 0x9b, 0x4e,
-	0x80, 0x80, 0xd4, 0x46, 0x6a, 0x5f, 0x40, 0x14, 0x44, 0x5b, 0x68, 0x15, 0x89, 0xaa, 0x91, 0xd3,
+	0xd5, 0x92, 0x4d, 0x13, 0xa9, 0x48, 0x80, 0x04, 0x42, 0xb4, 0x45, 0xad, 0x82, 0x88, 0x1a, 0x39,
-	0xbe, 0xf0, 0x84, 0x49, 0x36, 0x89, 0x55, 0x7b, 0xbd, 0x78, 0xd7, 0x6d, 0xe1, 0x07, 0x10, 0xe2,
+	0x2d, 0x0b, 0x36, 0xc8, 0x24, 0x93, 0xc4, 0xaa, 0x3d, 0x1e, 0x3c, 0xe3, 0x16, 0xfa, 0x07, 0x88,
-	0x1f, 0x78, 0xe4, 0x37, 0xf8, 0x35, 0xb4, 0x6b, 0x27, 0xb1, 0xd3, 0xa4, 0xe5, 0x0d, 0x5e, 0xac,
+	0x1d, 0x5f, 0xc3, 0x0a, 0xf1, 0x01, 0x7c, 0x14, 0xf2, 0xd8, 0x49, 0xec, 0xc4, 0x49, 0x28, 0x1b,
-	0x9d, 0xe3, 0x33, 0xb3, 0x33, 0xe3, 0x33, 0x63, 0xa8, 0xca, 0x81, 0x1b, 0x76, 0x1b, 0xfa, 0xb9,
+	0xd8, 0x44, 0x33, 0xc7, 0xe7, 0x9e, 0x39, 0x73, 0xe7, 0xde, 0xab, 0xc0, 0x9a, 0x1c, 0x58, 0x5e,
-	0xc5, 0xc3, 0x40, 0x06, 0x58, 0xd0, 0x86, 0xf5, 0xe8, 0x84, 0x53, 0xb6, 0xd9, 0x3c, 0xde, 0x6c,
+	0xb7, 0xae, 0x7e, 0x6b, 0xdc, 0x73, 0xa5, 0x8b, 0x78, 0xc6, 0x29, 0x6b, 0x34, 0xdb, 0xd4, 0xbb,
-	0xd3, 0xf0, 0x82, 0x86, 0x0d, 0x7e, 0xde, 0x6f, 0x68, 0x42, 0x43, 0x74, 0xcf, 0x2f, 0x45, 0xe3,
+	0xa2, 0x5e, 0x4d, 0x7d, 0xd1, 0xef, 0x07, 0xd8, 0x7e, 0xa3, 0xb9, 0x1f, 0xa2, 0x75, 0x7e, 0xd9,
-	0x52, 0xc4, 0x7c, 0xf2, 0xcd, 0x80, 0xf2, 0x1e, 0xe7, 0xde, 0xa7, 0x56, 0x24, 0x6d, 0xfa, 0x11,
+	0xaf, 0x2b, 0x76, 0x5d, 0x74, 0x2f, 0xaf, 0x45, 0xfd, 0x5a, 0x84, 0xc1, 0xe4, 0xb3, 0x06, 0xc5,
-	0x11, 0xe6, 0x98, 0xe3, 0x53, 0xd3, 0xa8, 0x19, 0xf5, 0x92, 0xad, 0xcf, 0x0a, 0x13, 0xee, 0x67,
+	0x43, 0xce, 0xed, 0x8f, 0x2d, 0x5f, 0x1a, 0xf4, 0x3d, 0x22, 0x2c, 0x31, 0xd3, 0xa1, 0x65, 0xad,
-	0x6a, 0xe6, 0x6a, 0x46, 0x3d, 0x6f, 0xeb, 0xb3, 0xc2, 0x06, 0x8e, 0x18, 0x98, 0xf9, 0x98, 0xa7,
+	0xa2, 0x55, 0x0b, 0x86, 0x5a, 0x07, 0x98, 0xb0, 0x6e, 0x68, 0x39, 0x53, 0xd1, 0xaa, 0x59, 0x43,
-	0xce, 0x48, 0x60, 0xa1, 0x17, 0x3a, 0x7d, 0x9f, 0x32, 0xd9, 0x56, 0xfc, 0x39, 0xcd, 0xcf, 0x60,
+	0xad, 0x03, 0x6c, 0x60, 0x8a, 0x41, 0x39, 0x1b, 0xf2, 0x82, 0x35, 0x12, 0x58, 0xe9, 0x79, 0x66,
-	0xb8, 0x06, 0xa5, 0x8e, 0x47, 0x1d, 0x76, 0xea, 0xfa, 0xd4, 0x2c, 0x68, 0xc2, 0x18, 0x20, 0x12,
+	0xdf, 0xa1, 0x4c, 0xb6, 0x03, 0xfe, 0x92, 0xe2, 0x27, 0x30, 0xdc, 0x80, 0x42, 0xc7, 0xa6, 0x26,
-	0x16, 0xc6, 0xc9, 0x08, 0x8e, 0x4b, 0x90, 0x8f, 0x42, 0x2f, 0x49, 0x46, 0x1d, 0x71, 0x19, 0x0a,
+	0x3b, 0xb7, 0x1c, 0x5a, 0xce, 0x29, 0xc2, 0x18, 0x20, 0x12, 0x56, 0xc6, 0x66, 0x04, 0xc7, 0xff,
-	0x3c, 0x92, 0xcd, 0xd7, 0x3a, 0x99, 0x92, 0x1d, 0x1b, 0xd7, 0x6e, 0xce, 0x4f, 0xb9, 0xd9, 0x84,
+	0x20, 0xeb, 0x7b, 0x76, 0x64, 0x26, 0x58, 0xe2, 0x3a, 0xe4, 0xb8, 0x2f, 0x1b, 0x2f, 0x94, 0x99,
-	0x7f, 0x5a, 0x91, 0x3c, 0xb3, 0xdf, 0x0a, 0xb3, 0x50, 0xcb, 0xd7, 0x4b, 0xf6, 0xd0, 0x24, 0x0f,
+	0x82, 0x11, 0x6e, 0xa6, 0x4e, 0xce, 0xa6, 0x9c, 0x5c, 0x86, 0x7f, 0x5a, 0xbe, 0xbc, 0x30, 0x5e,
-	0xe0, 0xdf, 0x83, 0x80, 0xf5, 0xdc, 0xd0, 0x4f, 0x9a, 0x30, 0xba, 0xc4, 0x48, 0x5d, 0x42, 0x08,
+	0x89, 0x72, 0xae, 0x92, 0xad, 0x16, 0x8c, 0xe1, 0x96, 0xec, 0xc2, 0xbf, 0xc7, 0x2e, 0xeb, 0x59,
-	0x54, 0xd2, 0xb4, 0x69, 0xe9, 0x91, 0x0d, 0x28, 0x1d, 0x51, 0x79, 0x63, 0x98, 0xa7, 0x50, 0x89,
+	0x9e, 0x13, 0x25, 0x61, 0x74, 0x88, 0x16, 0x3b, 0x84, 0x10, 0x28, 0xc5, 0x69, 0x69, 0xf6, 0xc8,
-	0x29, 0x87, 0x49, 0x76, 0xa3, 0xfe, 0x1a, 0x53, 0xfa, 0x9b, 0x1b, 0xf7, 0x97, 0xfc, 0x34, 0x00,
+	0x36, 0x14, 0x4e, 0xa9, 0x9c, 0x2b, 0xf3, 0x18, 0x4a, 0x21, 0xe5, 0x24, 0x72, 0x37, 0xca, 0xaf,
-	0x86, 0xd1, 0x05, 0xff, 0xb3, 0x9f, 0x0a, 0x77, 0xa0, 0x34, 0x64, 0x0b, 0xb3, 0x58, 0xcb, 0xd7,
+	0x96, 0x92, 0xdf, 0xcc, 0x38, 0xbf, 0xe4, 0x87, 0x06, 0x30, 0x54, 0x17, 0xfc, 0xcf, 0x3e, 0x15,
-	0xcb, 0xdb, 0x2b, 0x5b, 0xb1, 0x12, 0xb3, 0xe5, 0xd9, 0x63, 0x1e, 0x79, 0x09, 0xd6, 0x11, 0x95,
+	0x3e, 0x87, 0xc2, 0x90, 0x2d, 0xca, 0xf9, 0x4a, 0xb6, 0x5a, 0x3c, 0x20, 0xb5, 0xe9, 0x4a, 0xac,
-	0x6d, 0xb7, 0xcf, 0x1c, 0xaf, 0xc9, 0x2e, 0x5c, 0xe9, 0x48, 0x37, 0x60, 0x4d, 0xd6, 0x0b, 0x54,
+	0x25, 0xef, 0x6a, 0x8c, 0x83, 0xc8, 0x33, 0xd0, 0x4f, 0xa9, 0x6c, 0x5b, 0x7d, 0x66, 0xda, 0x0d,
-	0xbf, 0x6a, 0x50, 0x3e, 0xf0, 0x5c, 0xca, 0xe4, 0xb1, 0xe8, 0x8f, 0xba, 0x96, 0x86, 0xc8, 0x77,
+	0x76, 0x65, 0x49, 0x53, 0x5a, 0x2e, 0x6b, 0xb0, 0x9e, 0x1b, 0x24, 0xaf, 0x02, 0xc5, 0x63, 0xdb,
-	0x03, 0xee, 0xce, 0x0c, 0x20, 0x38, 0xbe, 0x80, 0x8a, 0x9b, 0x41, 0x75, 0x10, 0x95, 0x99, 0x96,
+	0xa2, 0x4c, 0x36, 0x45, 0x7f, 0x94, 0xc2, 0x38, 0x44, 0xbe, 0x6a, 0x70, 0x77, 0xa6, 0x80, 0xe0,
-	0xfd, 0xd6, 0x84, 0xcb, 0x04, 0x19, 0x5f, 0xc1, 0x62, 0xd0, 0xeb, 0x79, 0x2e, 0xa3, 0xad, 0x48,
+	0xf8, 0x12, 0x4a, 0x56, 0x02, 0x55, 0x22, 0x53, 0x36, 0x55, 0x43, 0xd4, 0x26, 0xe2, 0x27, 0x22,
-	0x0c, 0xb4, 0x7f, 0x4e, 0xfb, 0xaf, 0x26, 0xfe, 0x27, 0xd9, 0xb7, 0xf6, 0x24, 0x9d, 0xec, 0x02,
+	0xb1, 0x09, 0xab, 0x6e, 0xaf, 0x67, 0x5b, 0x8c, 0xb6, 0x7c, 0x31, 0x50, 0x62, 0x19, 0x25, 0xb6,
-	0x99, 0x91, 0x5f, 0x5b, 0x3a, 0xa1, 0xdc, 0xe3, 0x5c, 0x15, 0xba, 0x0a, 0xc5, 0x48, 0xd0, 0x70,
+	0x93, 0x26, 0x76, 0x96, 0xa4, 0x1a, 0x93, 0xb1, 0xe4, 0x29, 0x90, 0x19, 0xce, 0xdb, 0xd2, 0xf4,
-	0x54, 0x63, 0x62, 0x91, 0x1f, 0x06, 0xdc, 0xbf, 0xd5, 0xfd, 0x6f, 0x28, 0xf3, 0xab, 0x01, 0xd5,
+	0xe4, 0x21, 0xe7, 0x41, 0x0a, 0xfe, 0x87, 0xbc, 0x2f, 0xa8, 0x37, 0xba, 0x7d, 0xb4, 0x23, 0xdf,
-	0xc3, 0x8e, 0x7f, 0xc6, 0xbb, 0x8e, 0xa4, 0xa7, 0xc1, 0x39, 0x65, 0xaa, 0xac, 0x75, 0x80, 0x96,
+	0x35, 0xd8, 0x59, 0x18, 0xfe, 0x77, 0x27, 0xe0, 0x93, 0x06, 0x6b, 0x27, 0x1d, 0xe7, 0x82, 0x77,
-	0xe7, 0xc8, 0x5e, 0x10, 0xfa, 0x49, 0x69, 0x05, 0x3b, 0x85, 0xa0, 0x05, 0xf3, 0x87, 0x1d, 0x5f,
+	0x4d, 0x49, 0xcf, 0xdd, 0x4b, 0xca, 0x82, 0x0b, 0x6f, 0x02, 0xb4, 0x6c, 0x53, 0xf6, 0x5c, 0xcf,
-	0xd3, 0x13, 0x5d, 0x8f, 0x6c, 0x35, 0x9d, 0x4e, 0xa7, 0x13, 0x44, 0x4c, 0x26, 0x3a, 0x1d, 0x9a,
+	0x89, 0x2e, 0x9d, 0x33, 0x62, 0x08, 0xea, 0xb0, 0x7c, 0xd2, 0x71, 0x14, 0x3d, 0x6a, 0x8c, 0xd1,
-	0x2a, 0x2a, 0xbd, 0xe2, 0x6e, 0x48, 0xb5, 0x0e, 0x63, 0xa1, 0xa6, 0x10, 0xb2, 0x0c, 0x38, 0x99,
+	0x3e, 0x68, 0x6f, 0xb3, 0xd3, 0x71, 0x7d, 0x26, 0xa3, 0x42, 0x1f, 0x6e, 0x03, 0x55, 0xfa, 0x81,
-	0x8a, 0xe0, 0xa4, 0x05, 0x95, 0x36, 0x55, 0x0d, 0xdb, 0x77, 0xba, 0x7d, 0x7a, 0x43, 0xd3, 0xf1,
+	0x5b, 0x1e, 0x55, 0x85, 0x1c, 0x56, 0x7a, 0x0c, 0x21, 0xeb, 0x80, 0x93, 0x56, 0x04, 0x27, 0x2d,
-	0x21, 0x54, 0xf6, 0x38, 0x3f, 0x63, 0x21, 0x75, 0xba, 0x07, 0x3a, 0x81, 0x9c, 0xce, 0x7c, 0x02,
+	0x28, 0xb5, 0x69, 0x90, 0xca, 0x23, 0xb3, 0xdb, 0xa7, 0x73, 0x9e, 0x03, 0xf7, 0xa0, 0x74, 0xc8,
-	0x25, 0x55, 0x58, 0xcc, 0x44, 0x14, 0x7c, 0xfb, 0xcb, 0x1c, 0xc4, 0xfb, 0x16, 0x77, 0x60, 0x7e,
+	0xf9, 0x05, 0xf3, 0xa8, 0xd9, 0x3d, 0x56, 0x06, 0x32, 0xca, 0xf9, 0x04, 0x4a, 0xd6, 0x60, 0x35,
-	0xb8, 0xb8, 0x10, 0x93, 0x31, 0x48, 0xad, 0x55, 0xeb, 0xbf, 0x6b, 0x98, 0xe0, 0xb8, 0x09, 0xc5,
+	0xa1, 0x28, 0xf8, 0xc1, 0xb7, 0x1c, 0xe4, 0x54, 0x9b, 0x60, 0x13, 0x96, 0x87, 0x93, 0x0f, 0xb7,
-	0x78, 0x54, 0x70, 0x29, 0x33, 0x39, 0xca, 0xa1, 0x3a, 0x81, 0x08, 0x8e, 0xcf, 0x00, 0xc6, 0xfb,
+	0xd2, 0xfa, 0x28, 0x36, 0xa4, 0xf5, 0xca, 0x7c, 0x82, 0xe0, 0x78, 0x0a, 0xf9, 0xb0, 0xf1, 0xf0,
-	0x07, 0x97, 0x13, 0x42, 0x66, 0x73, 0x59, 0x2b, 0x53, 0x50, 0xc1, 0xf1, 0x3d, 0xfc, 0x3f, 0x43,
+	0xde, 0xec, 0xa6, 0x0c, 0xa4, 0x36, 0xe7, 0x7d, 0x16, 0x1c, 0xdb, 0x00, 0xe3, 0xa1, 0x87, 0xdb,
-	0x57, 0xb8, 0x31, 0xbe, 0x68, 0xc6, 0x5c, 0x5a, 0xe4, 0x36, 0x8a, 0xe0, 0x78, 0x05, 0xf7, 0x6e,
+	0x69, 0xec, 0xc4, 0xec, 0xd4, 0xc9, 0x22, 0x8a, 0xe0, 0x78, 0x03, 0x77, 0x66, 0xd4, 0x2f, 0xd6,
-	0x51, 0x2e, 0x3e, 0xbe, 0x39, 0x4c, 0x6a, 0x40, 0xac, 0x27, 0xbf, 0x4b, 0x15, 0x1c, 0xdf, 0x40,
+	0x66, 0xf8, 0x99, 0x31, 0x26, 0xf4, 0xfa, 0xad, 0xf8, 0x82, 0xe3, 0x17, 0x0d, 0xb6, 0x16, 0x34,
-	0x25, 0xfb, 0xfd, 0xd1, 0x4c, 0xbc, 0xaf, 0x29, 0xd4, 0xba, 0x33, 0xe3, 0x8d, 0xe0, 0xb8, 0x0b,
+	0x0f, 0x3e, 0xbc, 0x85, 0x68, 0xac, 0x61, 0xf5, 0x47, 0xbf, 0x15, 0x27, 0x38, 0xbe, 0x85, 0x52,
-	0xe5, 0xd4, 0xe7, 0xc5, 0x61, 0x23, 0xb3, 0x22, 0xb2, 0x56, 0xa7, 0xc1, 0x82, 0xef, 0xaf, 0xbf,
+	0xb2, 0x04, 0x71, 0x37, 0x4d, 0x6a, 0xaa, 0x63, 0xf4, 0xbd, 0x5f, 0xa1, 0x09, 0x8e, 0xaf, 0xa1,
-	0x5b, 0x53, 0x7f, 0xdc, 0xe6, 0x71, 0xea, 0x4f, 0xab, 0x99, 0xcf, 0xf5, 0xf3, 0x43, 0x51, 0x43,
+	0x18, 0xab, 0x3d, 0x4c, 0x7d, 0xa4, 0x64, 0xb9, 0xeb, 0x3b, 0x0b, 0x39, 0x82, 0x1f, 0x6d, 0xbe,
-	0x3b, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x98, 0xab, 0xbe, 0xfd, 0xb2, 0x07, 0x00, 0x00,
+	0xd9, 0x08, 0x59, 0xb1, 0x7f, 0x18, 0x8a, 0xf9, 0x44, 0xfd, 0xbe, 0xcb, 0x2b, 0xe8, 0xc1, 0xcf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x2e, 0xa0, 0xaa, 0xb7, 0x08, 0x00, 0x00,
 }

pkg/proto/third/third.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 option go_package = "OpenIM/pkg/proto/third;third";
-package third;
+package OpenIMServer.third;
 
 message ApplyPutReq {
   string name = 1;

pkg/proto/user/user.pb.go

@@ -36,7 +36,7 @@ func (m *GetAllUserIDReq) Reset()         { *m = GetAllUserIDReq{} }
 func (m *GetAllUserIDReq) String() string { return proto.CompactTextString(m) }
 func (*GetAllUserIDReq) ProtoMessage()    {}
 func (*GetAllUserIDReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{0}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{0}
 }
 func (m *GetAllUserIDReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllUserIDReq.Unmarshal(m, b)
@@ -75,7 +75,7 @@ func (m *GetAllUserIDResp) Reset()         { *m = GetAllUserIDResp{} }
 func (m *GetAllUserIDResp) String() string { return proto.CompactTextString(m) }
 func (*GetAllUserIDResp) ProtoMessage()    {}
 func (*GetAllUserIDResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{1}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{1}
 }
 func (m *GetAllUserIDResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllUserIDResp.Unmarshal(m, b)
@@ -120,7 +120,7 @@ func (m *AccountCheckReq) Reset()         { *m = AccountCheckReq{} }
 func (m *AccountCheckReq) String() string { return proto.CompactTextString(m) }
 func (*AccountCheckReq) ProtoMessage()    {}
 func (*AccountCheckReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{2}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{2}
 }
 func (m *AccountCheckReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountCheckReq.Unmarshal(m, b)
@@ -158,7 +158,7 @@ func (m *AccountCheckResp) Reset()         { *m = AccountCheckResp{} }
 func (m *AccountCheckResp) String() string { return proto.CompactTextString(m) }
 func (*AccountCheckResp) ProtoMessage()    {}
 func (*AccountCheckResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{3}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{3}
 }
 func (m *AccountCheckResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountCheckResp.Unmarshal(m, b)
@@ -197,7 +197,7 @@ func (m *AccountCheckRespSingleUserStatus) Reset()         { *m = AccountCheckRe
 func (m *AccountCheckRespSingleUserStatus) String() string { return proto.CompactTextString(m) }
 func (*AccountCheckRespSingleUserStatus) ProtoMessage()    {}
 func (*AccountCheckRespSingleUserStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{3, 0}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{3, 0}
 }
 func (m *AccountCheckRespSingleUserStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountCheckRespSingleUserStatus.Unmarshal(m, b)
@@ -242,7 +242,7 @@ func (m *GetDesignateUsersReq) Reset()         { *m = GetDesignateUsersReq{} }
 func (m *GetDesignateUsersReq) String() string { return proto.CompactTextString(m) }
 func (*GetDesignateUsersReq) ProtoMessage()    {}
 func (*GetDesignateUsersReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{4}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{4}
 }
 func (m *GetDesignateUsersReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDesignateUsersReq.Unmarshal(m, b)
@@ -280,7 +280,7 @@ func (m *GetDesignateUsersResp) Reset()         { *m = GetDesignateUsersResp{} }
 func (m *GetDesignateUsersResp) String() string { return proto.CompactTextString(m) }
 func (*GetDesignateUsersResp) ProtoMessage()    {}
 func (*GetDesignateUsersResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{5}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{5}
 }
 func (m *GetDesignateUsersResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetDesignateUsersResp.Unmarshal(m, b)
@@ -318,7 +318,7 @@ func (m *UpdateUserInfoReq) Reset()         { *m = UpdateUserInfoReq{} }
 func (m *UpdateUserInfoReq) String() string { return proto.CompactTextString(m) }
 func (*UpdateUserInfoReq) ProtoMessage()    {}
 func (*UpdateUserInfoReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{6}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{6}
 }
 func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b)
@@ -355,7 +355,7 @@ func (m *UpdateUserInfoResp) Reset()         { *m = UpdateUserInfoResp{} }
 func (m *UpdateUserInfoResp) String() string { return proto.CompactTextString(m) }
 func (*UpdateUserInfoResp) ProtoMessage()    {}
 func (*UpdateUserInfoResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{7}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{7}
 }
 func (m *UpdateUserInfoResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateUserInfoResp.Unmarshal(m, b)
@@ -387,7 +387,7 @@ func (m *SetGlobalRecvMessageOptReq) Reset()         { *m = SetGlobalRecvMessage
 func (m *SetGlobalRecvMessageOptReq) String() string { return proto.CompactTextString(m) }
 func (*SetGlobalRecvMessageOptReq) ProtoMessage()    {}
 func (*SetGlobalRecvMessageOptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{8}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{8}
 }
 func (m *SetGlobalRecvMessageOptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetGlobalRecvMessageOptReq.Unmarshal(m, b)
@@ -431,7 +431,7 @@ func (m *SetGlobalRecvMessageOptResp) Reset()         { *m = SetGlobalRecvMessag
 func (m *SetGlobalRecvMessageOptResp) String() string { return proto.CompactTextString(m) }
 func (*SetGlobalRecvMessageOptResp) ProtoMessage()    {}
 func (*SetGlobalRecvMessageOptResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{9}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{9}
 }
 func (m *SetGlobalRecvMessageOptResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetGlobalRecvMessageOptResp.Unmarshal(m, b)
@@ -464,7 +464,7 @@ func (m *SetConversationReq) Reset()         { *m = SetConversationReq{} }
 func (m *SetConversationReq) String() string { return proto.CompactTextString(m) }
 func (*SetConversationReq) ProtoMessage()    {}
 func (*SetConversationReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{10}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{10}
 }
 func (m *SetConversationReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetConversationReq.Unmarshal(m, b)
@@ -515,7 +515,7 @@ func (m *SetConversationResp) Reset()         { *m = SetConversationResp{} }
 func (m *SetConversationResp) String() string { return proto.CompactTextString(m) }
 func (*SetConversationResp) ProtoMessage()    {}
 func (*SetConversationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{11}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{11}
 }
 func (m *SetConversationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetConversationResp.Unmarshal(m, b)
@@ -550,7 +550,7 @@ func (m *SetRecvMsgOptReq) Reset()         { *m = SetRecvMsgOptReq{} }
 func (m *SetRecvMsgOptReq) String() string { return proto.CompactTextString(m) }
 func (*SetRecvMsgOptReq) ProtoMessage()    {}
 func (*SetRecvMsgOptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{12}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{12}
 }
 func (m *SetRecvMsgOptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRecvMsgOptReq.Unmarshal(m, b)
@@ -615,7 +615,7 @@ func (m *SetRecvMsgOptResp) Reset()         { *m = SetRecvMsgOptResp{} }
 func (m *SetRecvMsgOptResp) String() string { return proto.CompactTextString(m) }
 func (*SetRecvMsgOptResp) ProtoMessage()    {}
 func (*SetRecvMsgOptResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{13}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{13}
 }
 func (m *SetRecvMsgOptResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRecvMsgOptResp.Unmarshal(m, b)
@@ -648,7 +648,7 @@ func (m *GetConversationReq) Reset()         { *m = GetConversationReq{} }
 func (m *GetConversationReq) String() string { return proto.CompactTextString(m) }
 func (*GetConversationReq) ProtoMessage()    {}
 func (*GetConversationReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{14}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{14}
 }
 func (m *GetConversationReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationReq.Unmarshal(m, b)
@@ -700,7 +700,7 @@ func (m *GetConversationResp) Reset()         { *m = GetConversationResp{} }
 func (m *GetConversationResp) String() string { return proto.CompactTextString(m) }
 func (*GetConversationResp) ProtoMessage()    {}
 func (*GetConversationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{15}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{15}
 }
 func (m *GetConversationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationResp.Unmarshal(m, b)
@@ -740,7 +740,7 @@ func (m *GetConversationsReq) Reset()         { *m = GetConversationsReq{} }
 func (m *GetConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*GetConversationsReq) ProtoMessage()    {}
 func (*GetConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{16}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{16}
 }
 func (m *GetConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationsReq.Unmarshal(m, b)
@@ -792,7 +792,7 @@ func (m *GetConversationsResp) Reset()         { *m = GetConversationsResp{} }
 func (m *GetConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*GetConversationsResp) ProtoMessage()    {}
 func (*GetConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{17}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{17}
 }
 func (m *GetConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationsResp.Unmarshal(m, b)
@@ -831,7 +831,7 @@ func (m *GetAllConversationsReq) Reset()         { *m = GetAllConversationsReq{}
 func (m *GetAllConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*GetAllConversationsReq) ProtoMessage()    {}
 func (*GetAllConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{18}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{18}
 }
 func (m *GetAllConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllConversationsReq.Unmarshal(m, b)
@@ -876,7 +876,7 @@ func (m *GetAllConversationsResp) Reset()         { *m = GetAllConversationsResp
 func (m *GetAllConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*GetAllConversationsResp) ProtoMessage()    {}
 func (*GetAllConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{19}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{19}
 }
 func (m *GetAllConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllConversationsResp.Unmarshal(m, b)
@@ -917,7 +917,7 @@ func (m *BatchSetConversationsReq) Reset()         { *m = BatchSetConversationsR
 func (m *BatchSetConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*BatchSetConversationsReq) ProtoMessage()    {}
 func (*BatchSetConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{20}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{20}
 }
 func (m *BatchSetConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchSetConversationsReq.Unmarshal(m, b)
@@ -977,7 +977,7 @@ func (m *BatchSetConversationsResp) Reset()         { *m = BatchSetConversations
 func (m *BatchSetConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*BatchSetConversationsResp) ProtoMessage()    {}
 func (*BatchSetConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{21}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{21}
 }
 func (m *BatchSetConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchSetConversationsResp.Unmarshal(m, b)
@@ -1022,7 +1022,7 @@ func (m *GetPaginationUsersReq) Reset()         { *m = GetPaginationUsersReq{} }
 func (m *GetPaginationUsersReq) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationUsersReq) ProtoMessage()    {}
 func (*GetPaginationUsersReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{22}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{22}
 }
 func (m *GetPaginationUsersReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationUsersReq.Unmarshal(m, b)
@@ -1061,7 +1061,7 @@ func (m *GetPaginationUsersResp) Reset()         { *m = GetPaginationUsersResp{}
 func (m *GetPaginationUsersResp) String() string { return proto.CompactTextString(m) }
 func (*GetPaginationUsersResp) ProtoMessage()    {}
 func (*GetPaginationUsersResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{23}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{23}
 }
 func (m *GetPaginationUsersResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetPaginationUsersResp.Unmarshal(m, b)
@@ -1106,7 +1106,7 @@ func (m *UserRegisterReq) Reset()         { *m = UserRegisterReq{} }
 func (m *UserRegisterReq) String() string { return proto.CompactTextString(m) }
 func (*UserRegisterReq) ProtoMessage()    {}
 func (*UserRegisterReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{24}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{24}
 }
 func (m *UserRegisterReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserRegisterReq.Unmarshal(m, b)
@@ -1143,7 +1143,7 @@ func (m *UserRegisterResp) Reset()         { *m = UserRegisterResp{} }
 func (m *UserRegisterResp) String() string { return proto.CompactTextString(m) }
 func (*UserRegisterResp) ProtoMessage()    {}
 func (*UserRegisterResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{25}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{25}
 }
 func (m *UserRegisterResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserRegisterResp.Unmarshal(m, b)
@@ -1174,7 +1174,7 @@ func (m *GetGlobalRecvMessageOptReq) Reset()         { *m = GetGlobalRecvMessage
 func (m *GetGlobalRecvMessageOptReq) String() string { return proto.CompactTextString(m) }
 func (*GetGlobalRecvMessageOptReq) ProtoMessage()    {}
 func (*GetGlobalRecvMessageOptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{26}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{26}
 }
 func (m *GetGlobalRecvMessageOptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGlobalRecvMessageOptReq.Unmarshal(m, b)
@@ -1212,7 +1212,7 @@ func (m *GetGlobalRecvMessageOptResp) Reset()         { *m = GetGlobalRecvMessag
 func (m *GetGlobalRecvMessageOptResp) String() string { return proto.CompactTextString(m) }
 func (*GetGlobalRecvMessageOptResp) ProtoMessage()    {}
 func (*GetGlobalRecvMessageOptResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_2b6c497a7ff2fabe, []int{27}
+	return fileDescriptor_user_74bf7c7fd74a4bda, []int{27}
 }
 func (m *GetGlobalRecvMessageOptResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetGlobalRecvMessageOptResp.Unmarshal(m, b)
@@ -1240,35 +1240,35 @@ func (m *GetGlobalRecvMessageOptResp) GetGlobalRecvMsgOpt() int32 {
 }
 
 func init() {
-	proto.RegisterType((*GetAllUserIDReq)(nil), "user.getAllUserIDReq")
+	proto.RegisterType((*GetAllUserIDReq)(nil), "OpenIMServer.user.getAllUserIDReq")
-	proto.RegisterType((*GetAllUserIDResp)(nil), "user.getAllUserIDResp")
+	proto.RegisterType((*GetAllUserIDResp)(nil), "OpenIMServer.user.getAllUserIDResp")
-	proto.RegisterType((*AccountCheckReq)(nil), "user.accountCheckReq")
+	proto.RegisterType((*AccountCheckReq)(nil), "OpenIMServer.user.accountCheckReq")
-	proto.RegisterType((*AccountCheckResp)(nil), "user.accountCheckResp")
+	proto.RegisterType((*AccountCheckResp)(nil), "OpenIMServer.user.accountCheckResp")
-	proto.RegisterType((*AccountCheckRespSingleUserStatus)(nil), "user.accountCheckResp.singleUserStatus")
+	proto.RegisterType((*AccountCheckRespSingleUserStatus)(nil), "OpenIMServer.user.accountCheckResp.singleUserStatus")
-	proto.RegisterType((*GetDesignateUsersReq)(nil), "user.getDesignateUsersReq")
+	proto.RegisterType((*GetDesignateUsersReq)(nil), "OpenIMServer.user.getDesignateUsersReq")
-	proto.RegisterType((*GetDesignateUsersResp)(nil), "user.getDesignateUsersResp")
+	proto.RegisterType((*GetDesignateUsersResp)(nil), "OpenIMServer.user.getDesignateUsersResp")
-	proto.RegisterType((*UpdateUserInfoReq)(nil), "user.updateUserInfoReq")
+	proto.RegisterType((*UpdateUserInfoReq)(nil), "OpenIMServer.user.updateUserInfoReq")
-	proto.RegisterType((*UpdateUserInfoResp)(nil), "user.updateUserInfoResp")
+	proto.RegisterType((*UpdateUserInfoResp)(nil), "OpenIMServer.user.updateUserInfoResp")
-	proto.RegisterType((*SetGlobalRecvMessageOptReq)(nil), "user.setGlobalRecvMessageOptReq")
+	proto.RegisterType((*SetGlobalRecvMessageOptReq)(nil), "OpenIMServer.user.setGlobalRecvMessageOptReq")
-	proto.RegisterType((*SetGlobalRecvMessageOptResp)(nil), "user.setGlobalRecvMessageOptResp")
+	proto.RegisterType((*SetGlobalRecvMessageOptResp)(nil), "OpenIMServer.user.setGlobalRecvMessageOptResp")
-	proto.RegisterType((*SetConversationReq)(nil), "user.setConversationReq")
+	proto.RegisterType((*SetConversationReq)(nil), "OpenIMServer.user.setConversationReq")
-	proto.RegisterType((*SetConversationResp)(nil), "user.setConversationResp")
+	proto.RegisterType((*SetConversationResp)(nil), "OpenIMServer.user.setConversationResp")
-	proto.RegisterType((*SetRecvMsgOptReq)(nil), "user.setRecvMsgOptReq")
+	proto.RegisterType((*SetRecvMsgOptReq)(nil), "OpenIMServer.user.setRecvMsgOptReq")
-	proto.RegisterType((*SetRecvMsgOptResp)(nil), "user.setRecvMsgOptResp")
+	proto.RegisterType((*SetRecvMsgOptResp)(nil), "OpenIMServer.user.setRecvMsgOptResp")
-	proto.RegisterType((*GetConversationReq)(nil), "user.getConversationReq")
+	proto.RegisterType((*GetConversationReq)(nil), "OpenIMServer.user.getConversationReq")
-	proto.RegisterType((*GetConversationResp)(nil), "user.getConversationResp")
+	proto.RegisterType((*GetConversationResp)(nil), "OpenIMServer.user.getConversationResp")
-	proto.RegisterType((*GetConversationsReq)(nil), "user.getConversationsReq")
+	proto.RegisterType((*GetConversationsReq)(nil), "OpenIMServer.user.getConversationsReq")
-	proto.RegisterType((*GetConversationsResp)(nil), "user.getConversationsResp")
+	proto.RegisterType((*GetConversationsResp)(nil), "OpenIMServer.user.getConversationsResp")
-	proto.RegisterType((*GetAllConversationsReq)(nil), "user.getAllConversationsReq")
+	proto.RegisterType((*GetAllConversationsReq)(nil), "OpenIMServer.user.getAllConversationsReq")
-	proto.RegisterType((*GetAllConversationsResp)(nil), "user.getAllConversationsResp")
+	proto.RegisterType((*GetAllConversationsResp)(nil), "OpenIMServer.user.getAllConversationsResp")
-	proto.RegisterType((*BatchSetConversationsReq)(nil), "user.batchSetConversationsReq")
+	proto.RegisterType((*BatchSetConversationsReq)(nil), "OpenIMServer.user.batchSetConversationsReq")
-	proto.RegisterType((*BatchSetConversationsResp)(nil), "user.batchSetConversationsResp")
+	proto.RegisterType((*BatchSetConversationsResp)(nil), "OpenIMServer.user.batchSetConversationsResp")
-	proto.RegisterType((*GetPaginationUsersReq)(nil), "user.getPaginationUsersReq")
+	proto.RegisterType((*GetPaginationUsersReq)(nil), "OpenIMServer.user.getPaginationUsersReq")
-	proto.RegisterType((*GetPaginationUsersResp)(nil), "user.getPaginationUsersResp")
+	proto.RegisterType((*GetPaginationUsersResp)(nil), "OpenIMServer.user.getPaginationUsersResp")
-	proto.RegisterType((*UserRegisterReq)(nil), "user.userRegisterReq")
+	proto.RegisterType((*UserRegisterReq)(nil), "OpenIMServer.user.userRegisterReq")
-	proto.RegisterType((*UserRegisterResp)(nil), "user.userRegisterResp")
+	proto.RegisterType((*UserRegisterResp)(nil), "OpenIMServer.user.userRegisterResp")
-	proto.RegisterType((*GetGlobalRecvMessageOptReq)(nil), "user.getGlobalRecvMessageOptReq")
+	proto.RegisterType((*GetGlobalRecvMessageOptReq)(nil), "OpenIMServer.user.getGlobalRecvMessageOptReq")
-	proto.RegisterType((*GetGlobalRecvMessageOptResp)(nil), "user.getGlobalRecvMessageOptResp")
+	proto.RegisterType((*GetGlobalRecvMessageOptResp)(nil), "OpenIMServer.user.getGlobalRecvMessageOptResp")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1308,7 +1308,7 @@ func NewUserClient(cc *grpc.ClientConn) UserClient {
 
 func (c *userClient) GetDesignateUsers(ctx context.Context, in *GetDesignateUsersReq, opts ...grpc.CallOption) (*GetDesignateUsersResp, error) {
 	out := new(GetDesignateUsersResp)
-	err := grpc.Invoke(ctx, "/user.user/getDesignateUsers", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/getDesignateUsers", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1317,7 +1317,7 @@ func (c *userClient) GetDesignateUsers(ctx context.Context, in *GetDesignateUser
 
 func (c *userClient) UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*UpdateUserInfoResp, error) {
 	out := new(UpdateUserInfoResp)
-	err := grpc.Invoke(ctx, "/user.user/updateUserInfo", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/updateUserInfo", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1326,7 +1326,7 @@ func (c *userClient) UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq,
 
 func (c *userClient) SetGlobalRecvMessageOpt(ctx context.Context, in *SetGlobalRecvMessageOptReq, opts ...grpc.CallOption) (*SetGlobalRecvMessageOptResp, error) {
 	out := new(SetGlobalRecvMessageOptResp)
-	err := grpc.Invoke(ctx, "/user.user/setGlobalRecvMessageOpt", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/setGlobalRecvMessageOpt", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1335,7 +1335,7 @@ func (c *userClient) SetGlobalRecvMessageOpt(ctx context.Context, in *SetGlobalR
 
 func (c *userClient) GetGlobalRecvMessageOpt(ctx context.Context, in *GetGlobalRecvMessageOptReq, opts ...grpc.CallOption) (*GetGlobalRecvMessageOptResp, error) {
 	out := new(GetGlobalRecvMessageOptResp)
-	err := grpc.Invoke(ctx, "/user.user/getGlobalRecvMessageOpt", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/getGlobalRecvMessageOpt", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1344,7 +1344,7 @@ func (c *userClient) GetGlobalRecvMessageOpt(ctx context.Context, in *GetGlobalR
 
 func (c *userClient) AccountCheck(ctx context.Context, in *AccountCheckReq, opts ...grpc.CallOption) (*AccountCheckResp, error) {
 	out := new(AccountCheckResp)
-	err := grpc.Invoke(ctx, "/user.user/accountCheck", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/accountCheck", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1353,7 +1353,7 @@ func (c *userClient) AccountCheck(ctx context.Context, in *AccountCheckReq, opts
 
 func (c *userClient) GetPaginationUsers(ctx context.Context, in *GetPaginationUsersReq, opts ...grpc.CallOption) (*GetPaginationUsersResp, error) {
 	out := new(GetPaginationUsersResp)
-	err := grpc.Invoke(ctx, "/user.user/getPaginationUsers", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/getPaginationUsers", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1362,7 +1362,7 @@ func (c *userClient) GetPaginationUsers(ctx context.Context, in *GetPaginationUs
 
 func (c *userClient) UserRegister(ctx context.Context, in *UserRegisterReq, opts ...grpc.CallOption) (*UserRegisterResp, error) {
 	out := new(UserRegisterResp)
-	err := grpc.Invoke(ctx, "/user.user/userRegister", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/OpenIMServer.user.user/userRegister", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1402,7 +1402,7 @@ func _User_GetDesignateUsers_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/GetDesignateUsers",
+		FullMethod: "/OpenIMServer.user.user/GetDesignateUsers",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).GetDesignateUsers(ctx, req.(*GetDesignateUsersReq))
@@ -1420,7 +1420,7 @@ func _User_UpdateUserInfo_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/UpdateUserInfo",
+		FullMethod: "/OpenIMServer.user.user/UpdateUserInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).UpdateUserInfo(ctx, req.(*UpdateUserInfoReq))
@@ -1438,7 +1438,7 @@ func _User_SetGlobalRecvMessageOpt_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/SetGlobalRecvMessageOpt",
+		FullMethod: "/OpenIMServer.user.user/SetGlobalRecvMessageOpt",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).SetGlobalRecvMessageOpt(ctx, req.(*SetGlobalRecvMessageOptReq))
@@ -1456,7 +1456,7 @@ func _User_GetGlobalRecvMessageOpt_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/GetGlobalRecvMessageOpt",
+		FullMethod: "/OpenIMServer.user.user/GetGlobalRecvMessageOpt",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).GetGlobalRecvMessageOpt(ctx, req.(*GetGlobalRecvMessageOptReq))
@@ -1474,7 +1474,7 @@ func _User_AccountCheck_Handler(srv interface{}, ctx context.Context, dec func(i
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/AccountCheck",
+		FullMethod: "/OpenIMServer.user.user/AccountCheck",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).AccountCheck(ctx, req.(*AccountCheckReq))
@@ -1492,7 +1492,7 @@ func _User_GetPaginationUsers_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/GetPaginationUsers",
+		FullMethod: "/OpenIMServer.user.user/GetPaginationUsers",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).GetPaginationUsers(ctx, req.(*GetPaginationUsersReq))
@@ -1510,7 +1510,7 @@ func _User_UserRegister_Handler(srv interface{}, ctx context.Context, dec func(i
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/user.user/UserRegister",
+		FullMethod: "/OpenIMServer.user.user/UserRegister",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(UserServer).UserRegister(ctx, req.(*UserRegisterReq))
@@ -1519,7 +1519,7 @@ func _User_UserRegister_Handler(srv interface{}, ctx context.Context, dec func(i
 }
 
 var _User_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "user.user",
+	ServiceName: "OpenIMServer.user.user",
 	HandlerType: (*UserServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -1555,66 +1555,67 @@ var _User_serviceDesc = grpc.ServiceDesc{
 	Metadata: "user/user.proto",
 }
 
-func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_2b6c497a7ff2fabe) }
+func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_74bf7c7fd74a4bda) }
 
-var fileDescriptor_user_2b6c497a7ff2fabe = []byte{
+var fileDescriptor_user_74bf7c7fd74a4bda = []byte{
-	// 925 bytes of a gzipped FileDescriptorProto
+	// 943 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x6d, 0x6f, 0xe4, 0x34,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x51, 0x6f, 0x1b, 0x45,
-	0x10, 0x56, 0xb6, 0xdd, 0x3b, 0x3a, 0xed, 0xdd, 0x6e, 0xdd, 0xb7, 0x90, 0x1e, 0xa8, 0x58, 0xc0,
+	0x10, 0xd6, 0x39, 0x71, 0x4b, 0x26, 0x69, 0xe3, 0x6c, 0xd2, 0xd6, 0x5c, 0x0b, 0x8a, 0x96, 0x96,
-	0x55, 0xa0, 0xee, 0xa2, 0x02, 0x52, 0x25, 0x04, 0xba, 0xa3, 0xd5, 0xc1, 0x8a, 0xab, 0xf6, 0x48,
+	0x04, 0xa4, 0xd8, 0x28, 0x14, 0xa9, 0x82, 0x27, 0x68, 0x0a, 0x58, 0x60, 0x5c, 0x9d, 0xa9, 0x40,
-	0xa9, 0x84, 0x00, 0x21, 0xd2, 0xd4, 0xcd, 0x45, 0x8d, 0x12, 0x6f, 0xc6, 0x69, 0xc5, 0x37, 0x24,
+	0x08, 0x10, 0xe7, 0xcb, 0x66, 0x73, 0x8a, 0x75, 0xb7, 0xbe, 0xd9, 0x4b, 0xe0, 0x0d, 0x89, 0x1f,
-	0xfe, 0x09, 0x5f, 0xe0, 0xb7, 0x20, 0x7e, 0x14, 0xb2, 0x9d, 0xed, 0x3a, 0x71, 0xd2, 0x76, 0x11,
+	0xc4, 0x0b, 0xbf, 0x82, 0x7f, 0xc0, 0x0b, 0xbf, 0x05, 0xed, 0xde, 0x25, 0xde, 0xbd, 0xbd, 0x4b,
-	0x5f, 0x76, 0xe3, 0x79, 0x79, 0x3c, 0xcf, 0x78, 0xec, 0x19, 0xe8, 0x15, 0xc8, 0xf2, 0xa1, 0xfc,
+	0xed, 0x96, 0x17, 0xb7, 0x33, 0x3b, 0xf3, 0xcd, 0x7e, 0xb3, 0x33, 0x37, 0x13, 0xd8, 0xcc, 0x91,
-	0x19, 0xf0, 0x3c, 0x13, 0x19, 0x59, 0x94, 0xdf, 0xde, 0xd3, 0x31, 0x67, 0xe9, 0xde, 0xe8, 0x78,
+	0x65, 0x7d, 0xf5, 0xd3, 0x13, 0x59, 0x2a, 0x53, 0xb2, 0x35, 0x12, 0x2c, 0x19, 0x0c, 0xc7, 0x2c,
-	0xef, 0x84, 0xe5, 0x57, 0x2c, 0x1f, 0xf2, 0xcb, 0x68, 0xa8, 0xf4, 0x43, 0x3c, 0xbf, 0xbc, 0xc6,
+	0x3b, 0x67, 0x59, 0x4f, 0x1d, 0xf8, 0x7b, 0x4a, 0x75, 0x30, 0x18, 0x1e, 0x14, 0xca, 0xbe, 0x38,
-	0xe1, 0x35, 0x6a, 0x73, 0xef, 0xa0, 0xd5, 0x30, 0xcc, 0xd2, 0x2b, 0x96, 0x63, 0x20, 0xe2, 0x2c,
+	0xe3, 0x7d, 0x6d, 0xdc, 0xc7, 0xe3, 0xb3, 0x0b, 0xec, 0x5f, 0x60, 0xe1, 0xeb, 0x3f, 0x69, 0x34,
-	0xad, 0x2c, 0xb4, 0x27, 0xfd, 0x06, 0x7a, 0x11, 0x13, 0xcf, 0x93, 0xe4, 0x14, 0x59, 0x3e, 0x3a,
+	0x8c, 0xd2, 0xe4, 0x9c, 0x65, 0x18, 0xca, 0x38, 0x4d, 0x2c, 0xa1, 0xf0, 0xa4, 0xdf, 0xc3, 0x26,
-	0xf2, 0xd9, 0x84, 0x1c, 0x00, 0xf0, 0x20, 0x8a, 0x53, 0x65, 0xe6, 0x3a, 0x3b, 0xce, 0xee, 0xf2,
+	0x67, 0xf2, 0xd3, 0xe9, 0xf4, 0x05, 0xb2, 0x6c, 0x70, 0x14, 0xb0, 0x19, 0x79, 0x06, 0x20, 0x42,
-	0xbe, 0x3b, 0x50, 0x3b, 0x0e, 0x7c, 0x36, 0x29, 0x18, 0x8a, 0x57, 0x37, 0x7a, 0xdf, 0xb0, 0xa5,
+	0x1e, 0x27, 0xda, 0xac, 0xeb, 0xed, 0x7a, 0xfb, 0xeb, 0x87, 0x8f, 0x7a, 0xd6, 0xed, 0x74, 0xf8,
-	0x5f, 0x43, 0xbf, 0x0a, 0x86, 0x9c, 0xac, 0x43, 0x57, 0x64, 0x22, 0x48, 0x14, 0x50, 0xd7, 0xd7,
+	0x5e, 0xc0, 0x66, 0x39, 0x43, 0xf9, 0xfc, 0xca, 0x38, 0x30, 0x1c, 0xe9, 0x97, 0xd0, 0xb1, 0x91,
-	0x0b, 0xf2, 0x36, 0x40, 0xa1, 0x6c, 0x5e, 0xc6, 0x28, 0xdc, 0xce, 0xce, 0xc2, 0xee, 0x92, 0x6f,
+	0x51, 0x90, 0x1d, 0x68, 0xcb, 0x54, 0x86, 0x53, 0x8d, 0xda, 0x0e, 0x0a, 0x81, 0xbc, 0x0d, 0x90,
-	0x48, 0xe8, 0xa7, 0xd0, 0x0b, 0xc2, 0x30, 0x2b, 0x52, 0x71, 0xf8, 0x9a, 0x85, 0x97, 0x32, 0x2c,
+	0x6b, 0x9b, 0xaf, 0x63, 0x94, 0xdd, 0xd6, 0xee, 0xca, 0xfe, 0x5a, 0x60, 0x68, 0xe8, 0x47, 0xb0,
-	0x0a, 0x2b, 0xa1, 0xfc, 0xd6, 0xd8, 0xe8, 0x3a, 0xca, 0xa9, 0x22, 0xa3, 0x7f, 0x3a, 0xd0, 0xaf,
+	0x19, 0x46, 0x51, 0x9a, 0x27, 0xf2, 0xe9, 0x29, 0x8b, 0xce, 0xd4, 0x1d, 0x29, 0x6c, 0x44, 0xea,
-	0xfa, 0x21, 0x27, 0xcf, 0xe1, 0x61, 0xce, 0xb0, 0x48, 0x84, 0xf6, 0x59, 0xde, 0x7f, 0x3a, 0x50,
+	0xff, 0x05, 0x36, 0x76, 0x3d, 0xed, 0x64, 0xe9, 0xe8, 0x5f, 0x1e, 0x74, 0x6c, 0x3f, 0x14, 0xe4,
-	0x99, 0xae, 0x1b, 0x0e, 0x30, 0x4e, 0xa3, 0x84, 0x49, 0xac, 0x13, 0x11, 0x88, 0x02, 0xfd, 0xa9,
+	0x1b, 0xb8, 0x99, 0x31, 0xcc, 0xa7, 0xb2, 0xf0, 0x59, 0x3f, 0x7c, 0xdc, 0x73, 0xf2, 0xde, 0xab,
-	0x9f, 0xf7, 0x0a, 0xfa, 0x75, 0x25, 0xd9, 0x84, 0x07, 0x3a, 0x60, 0xc5, 0x6c, 0xc9, 0x2f, 0x57,
+	0x7a, 0xf5, 0x30, 0x4e, 0xf8, 0x94, 0x29, 0xe0, 0xb1, 0x0c, 0x65, 0x8e, 0xc1, 0x25, 0x88, 0xff,
-	0xe4, 0x5d, 0x78, 0x54, 0x22, 0x6b, 0x43, 0xb7, 0xa3, 0xd4, 0x55, 0x21, 0xfd, 0x08, 0xd6, 0x23,
+	0x1c, 0x3a, 0xd5, 0x43, 0x72, 0x17, 0x6e, 0x14, 0xb7, 0xd7, 0x34, 0xd7, 0x82, 0x52, 0x22, 0x0f,
-	0x26, 0x8e, 0x18, 0xc6, 0x51, 0x1a, 0x08, 0x85, 0x8b, 0x92, 0xa5, 0x0b, 0x0f, 0x8b, 0x0a, 0xc1,
+	0xe1, 0x56, 0x89, 0x5c, 0x18, 0x76, 0x5b, 0xfa, 0xd8, 0x56, 0xd2, 0x0f, 0x60, 0x87, 0x33, 0x79,
-	0xe9, 0x92, 0xbe, 0x80, 0x8d, 0x06, 0x0f, 0xe4, 0x64, 0x0f, 0x96, 0xa4, 0x0d, 0x8e, 0xd2, 0x8b,
+	0xc4, 0x30, 0xe6, 0x49, 0x28, 0x35, 0x2e, 0x2a, 0xca, 0x5d, 0xb8, 0x99, 0x5b, 0x6c, 0x2f, 0x45,
-	0xac, 0x64, 0xd8, 0x2b, 0x8f, 0x4b, 0xe5, 0x25, 0xbd, 0xc8, 0xfc, 0x99, 0x05, 0x7d, 0x06, 0xab,
+	0x3a, 0x86, 0x3b, 0x35, 0x1e, 0x28, 0xc8, 0xc7, 0xb0, 0xa6, 0x6c, 0x70, 0x90, 0x9c, 0xa4, 0x25,
-	0x05, 0x3f, 0x2f, 0x11, 0x94, 0x92, 0x4d, 0xc8, 0x87, 0xf0, 0x46, 0x51, 0x2e, 0xcb, 0x13, 0xb7,
+	0xdd, 0x07, 0x75, 0x0f, 0xa9, 0x33, 0x96, 0x9c, 0xa4, 0xc1, 0xdc, 0x9c, 0x0e, 0x61, 0x2b, 0x17,
-	0x20, 0x6e, 0x0c, 0xe8, 0x3a, 0x90, 0x3a, 0x02, 0x72, 0xfa, 0x0b, 0x78, 0xc8, 0xc4, 0x57, 0x49,
+	0xc7, 0x25, 0x9c, 0x3e, 0x64, 0x33, 0xf2, 0x04, 0xde, 0xc8, 0x4b, 0xb1, 0x2c, 0x8c, 0xeb, 0xf1,
-	0x76, 0x16, 0x24, 0x3e, 0x0b, 0xaf, 0x8e, 0x19, 0x62, 0x10, 0xb1, 0x31, 0x17, 0x72, 0x83, 0xb6,
+	0xae, 0xac, 0xe9, 0x0e, 0x90, 0x2a, 0x1c, 0x0a, 0xfa, 0x0b, 0xf8, 0xc8, 0xe4, 0x17, 0xd3, 0x74,
-	0x6c, 0x7d, 0x00, 0xfd, 0x68, 0xe6, 0x82, 0xd1, 0x98, 0x0b, 0x77, 0x41, 0x55, 0x8a, 0x25, 0xa7,
+	0x12, 0x4e, 0x03, 0x16, 0x9d, 0x0f, 0x19, 0x62, 0xc8, 0xd9, 0x48, 0x48, 0x15, 0xad, 0x29, 0x8f,
-	0x6f, 0xc1, 0x76, 0xeb, 0x0e, 0xc8, 0xe9, 0x1f, 0x0e, 0x10, 0x64, 0xe2, 0xd0, 0x28, 0x72, 0xb9,
+	0xef, 0x43, 0x87, 0xcf, 0x5d, 0x90, 0x8f, 0x84, 0xec, 0xae, 0xe8, 0x82, 0x72, 0xf4, 0xf4, 0x2d,
-	0xf3, 0x17, 0xb0, 0x62, 0xd6, 0x7d, 0x49, 0xcf, 0x1b, 0x54, 0x2e, 0x43, 0xc5, 0xa9, 0x62, 0x2f,
+	0xb8, 0xdf, 0x18, 0x01, 0x05, 0xfd, 0xd3, 0x03, 0x82, 0x4c, 0x3e, 0x35, 0x1a, 0x43, 0x45, 0xfe,
-	0x23, 0x4c, 0x33, 0x11, 0x5f, 0xc4, 0xa1, 0x5a, 0x7f, 0xf7, 0x2b, 0x67, 0xea, 0x48, 0xbb, 0xbe,
+	0x0a, 0x36, 0xcc, 0x5e, 0x29, 0xb9, 0xee, 0xd9, 0x5c, 0xad, 0x6e, 0xb2, 0x10, 0x2c, 0x67, 0x75,
-	0x25, 0x27, 0x3b, 0xb0, 0x9c, 0x71, 0x96, 0x2b, 0xc1, 0xe8, 0x48, 0x11, 0x59, 0xf2, 0x4d, 0x11,
+	0xdd, 0x24, 0x95, 0xf1, 0x49, 0x1c, 0x69, 0xf9, 0xdb, 0xdf, 0x04, 0xd3, 0x2f, 0xdf, 0x0e, 0x1c,
-	0xdd, 0x80, 0x35, 0x2b, 0x46, 0xe4, 0xf4, 0x6f, 0x07, 0xfa, 0xc8, 0xc4, 0x8c, 0xac, 0x8c, 0x5c,
+	0x3d, 0xd9, 0x85, 0xf5, 0x54, 0xb0, 0x4c, 0x2b, 0x06, 0x47, 0x9a, 0xd5, 0x5a, 0x60, 0xaa, 0xe8,
-	0xa2, 0x5d, 0xa7, 0x2c, 0x3f, 0x35, 0x13, 0x67, 0x8a, 0xc8, 0xfb, 0xf0, 0xd8, 0x8c, 0x75, 0x74,
+	0x1d, 0xd8, 0x76, 0x2e, 0x8c, 0x82, 0xfe, 0xed, 0x41, 0x07, 0x99, 0x9c, 0x33, 0x57, 0x34, 0x14,
-	0x54, 0x16, 0x5b, 0x4d, 0x2a, 0xaf, 0x5b, 0x5e, 0xcf, 0xaf, 0x21, 0x69, 0xe4, 0xb8, 0x78, 0x3f,
+	0xda, 0x45, 0xc2, 0xb2, 0x17, 0x66, 0x16, 0x4d, 0x15, 0x79, 0x17, 0x6e, 0x9b, 0x77, 0x1d, 0x1c,
-	0x8e, 0x5d, 0x9b, 0xe3, 0x1a, 0xac, 0xd6, 0xb8, 0x20, 0xa7, 0xbf, 0x39, 0x40, 0x22, 0xfb, 0x74,
+	0x95, 0x35, 0x59, 0xd1, 0xaa, 0x16, 0xcd, 0xaa, 0xc9, 0x36, 0x34, 0xb5, 0x1c, 0x57, 0x17, 0xe3,
-	0x6c, 0x06, 0x4e, 0x23, 0x83, 0x5a, 0x2e, 0x3a, 0x76, 0x2e, 0xee, 0xce, 0xfd, 0x29, 0xac, 0x45,
+	0xd8, 0x76, 0x39, 0x6e, 0xc3, 0x56, 0x85, 0x0b, 0x0a, 0xfa, 0xbb, 0x07, 0x84, 0xbb, 0x4f, 0xe5,
-	0x76, 0xee, 0xad, 0x02, 0xe9, 0xcc, 0x57, 0x20, 0xf4, 0x77, 0xc7, 0xc2, 0xc5, 0xfb, 0x1d, 0xdf,
+	0x32, 0xf0, 0x6a, 0x19, 0x54, 0x72, 0xd1, 0x72, 0x73, 0xf1, 0xf2, 0xdc, 0x4f, 0x60, 0x9b, 0xbb,
-	0x2e, 0xf4, 0xaa, 0x34, 0xb1, 0x7c, 0x0a, 0xeb, 0xe2, 0x7b, 0x90, 0xfb, 0x5e, 0x3d, 0x28, 0xb5,
+	0xb9, 0x77, 0xaa, 0xa5, 0xf5, 0x1a, 0xd5, 0x42, 0xff, 0xf0, 0x9c, 0x20, 0xb8, 0xd8, 0x5b, 0xee,
-	0x20, 0x90, 0x93, 0x67, 0xf0, 0xc8, 0x04, 0xd3, 0x3b, 0xdc, 0x4e, 0xaf, 0xea, 0x40, 0x7f, 0x82,
+	0xc3, 0xa6, 0xcd, 0x19, 0xcb, 0x6f, 0x69, 0x55, 0xbd, 0x00, 0x53, 0xa6, 0x3f, 0x42, 0x95, 0x4b,
-	0x4d, 0xfd, 0xaa, 0xff, 0x07, 0x86, 0xb5, 0xb8, 0x3b, 0x76, 0xdc, 0x3f, 0xc2, 0x56, 0x23, 0xfa,
+	0xa0, 0x20, 0x43, 0xb8, 0x65, 0x82, 0x15, 0x11, 0x96, 0xe0, 0x6a, 0x7b, 0xd3, 0x1f, 0xe1, 0x6e,
-	0xff, 0x12, 0xfa, 0x3f, 0x0e, 0xb8, 0x67, 0x81, 0x08, 0x5f, 0x9f, 0x34, 0x9c, 0x8f, 0x05, 0xef,
+	0x31, 0x23, 0x5e, 0x81, 0x6e, 0x85, 0x44, 0xcb, 0x25, 0x71, 0x0a, 0xf7, 0x6a, 0xd1, 0xff, 0x7f,
-	0xcc, 0x09, 0x2f, 0xd9, 0x8d, 0xed, 0xa2, 0x34, 0x44, 0x8d, 0x17, 0x6b, 0xa1, 0xfd, 0x62, 0x8d,
+	0x1e, 0xff, 0x78, 0xd0, 0x9d, 0x84, 0x32, 0x3a, 0x1d, 0xd7, 0xbc, 0x9c, 0x13, 0xcb, 0x7b, 0x9d,
-	0x8d, 0x5c, 0x2d, 0x96, 0x68, 0x46, 0xae, 0x8e, 0xe1, 0xcd, 0x16, 0x36, 0xc8, 0x65, 0xe7, 0x38,
+	0x58, 0x8a, 0xf7, 0xc8, 0x2d, 0x64, 0x43, 0x55, 0xdb, 0x8c, 0x2b, 0xcd, 0xcd, 0x38, 0x32, 0xb2,
-	0x29, 0xc2, 0x90, 0xe1, 0xb4, 0x88, 0xa6, 0x4b, 0xf9, 0xf6, 0xbe, 0x08, 0xe2, 0x84, 0x9d, 0xbb,
+	0xb8, 0x5a, 0xa2, 0x19, 0x59, 0x1c, 0xc2, 0x9b, 0x0d, 0xd4, 0x50, 0xa8, 0xa1, 0x34, 0xce, 0xa3,
-	0x0b, 0x4a, 0x51, 0xae, 0xe8, 0xb7, 0xaa, 0xa3, 0xcc, 0x7a, 0xf9, 0x4d, 0x13, 0xaa, 0x4e, 0x00,
+	0x88, 0xe1, 0x65, 0xad, 0x5d, 0x8a, 0xea, 0xe3, 0xfd, 0x79, 0x18, 0x4f, 0xd9, 0x71, 0x77, 0x45,
-	0x9d, 0x39, 0x26, 0x80, 0x53, 0x55, 0x2b, 0x16, 0x64, 0xeb, 0x1c, 0xf0, 0x1e, 0x74, 0x55, 0x67,
+	0x1f, 0x94, 0x12, 0xfd, 0x59, 0x0f, 0xab, 0xf9, 0xce, 0x70, 0x35, 0xdf, 0xec, 0xb5, 0xa3, 0xf5,
-	0x2a, 0x8f, 0xd6, 0x6a, 0x3a, 0x5a, 0x4b, 0x0f, 0xf4, 0x84, 0xe4, 0xb3, 0x28, 0x46, 0x21, 0xff,
+	0xaa, 0x6b, 0xc7, 0x44, 0x97, 0x94, 0x83, 0xdf, 0xb8, 0x7c, 0x1c, 0x42, 0x5b, 0x0f, 0xbd, 0xb2,
-	0x27, 0x33, 0x4f, 0xe7, 0x56, 0x4f, 0x02, 0xfd, 0xaa, 0x27, 0x72, 0xfa, 0x09, 0x78, 0xd1, 0xdc,
+	0x02, 0xae, 0x9f, 0x67, 0x85, 0x29, 0x7d, 0x56, 0x6c, 0x6f, 0x01, 0xe3, 0x31, 0x4a, 0xf5, 0xef,
-	0x9d, 0x8a, 0x8e, 0x60, 0x3b, 0x6a, 0xef, 0x3e, 0x8d, 0x8d, 0xcc, 0x69, 0x6e, 0x64, 0xfb, 0x7f,
+	0x6c, 0x0e, 0xe3, 0x2d, 0x0e, 0x43, 0xa0, 0x63, 0xc3, 0xa0, 0xa0, 0x8f, 0xc1, 0xe7, 0x4b, 0x4f,
-	0x2d, 0x82, 0x1a, 0xf0, 0xc8, 0x4b, 0x58, 0xb5, 0x7a, 0x3a, 0xf1, 0xf4, 0x78, 0xd2, 0x34, 0x1e,
+	0x44, 0x3a, 0x80, 0xfb, 0xbc, 0x79, 0xca, 0xd5, 0x0e, 0x4c, 0xaf, 0x7e, 0x60, 0x1e, 0xfe, 0xdb,
-	0x78, 0xdb, 0xad, 0x3a, 0xe4, 0xe4, 0x10, 0x1e, 0x57, 0xfb, 0x32, 0xd9, 0xd2, 0xe6, 0x56, 0xbf,
+	0x86, 0x55, 0x85, 0x4a, 0x4e, 0x60, 0xcb, 0xd9, 0x2a, 0xc8, 0x5e, 0xcd, 0xb6, 0x54, 0xb7, 0xad,
-	0xf7, 0xdc, 0x66, 0x05, 0x72, 0xf2, 0x33, 0x6c, 0xb5, 0x34, 0x59, 0xb2, 0xa3, 0x9d, 0xda, 0xbb,
+	0xf8, 0xfb, 0x8b, 0x19, 0xa2, 0x20, 0x3f, 0xc1, 0x6d, 0x7b, 0x33, 0x20, 0x0f, 0x6b, 0x7c, 0x9d,
-	0xbc, 0xf7, 0xce, 0x1d, 0x16, 0x1a, 0x3f, 0xba, 0x1d, 0x3f, 0xba, 0x13, 0xff, 0xb6, 0x73, 0xf8,
+	0x5d, 0xc4, 0x7f, 0xb4, 0x80, 0x15, 0x0a, 0xf2, 0x2b, 0xdc, 0x6b, 0x58, 0x00, 0xc8, 0x41, 0x0d,
-	0x1c, 0x56, 0xcc, 0xc1, 0x8e, 0x6c, 0x34, 0x0d, 0x7b, 0x13, 0x6f, 0xb3, 0x79, 0x06, 0x24, 0x63,
+	0x42, 0xf3, 0x3a, 0xe2, 0xf7, 0x96, 0x31, 0x2f, 0x22, 0xf3, 0x25, 0x22, 0xf3, 0xe5, 0x22, 0x5f,
-	0xd5, 0xa5, 0x6a, 0x05, 0x4c, 0x66, 0x69, 0xb7, 0x6f, 0x8b, 0xf7, 0xa4, 0x5d, 0xa9, 0xe3, 0x31,
+	0xf7, 0xde, 0xdf, 0xc1, 0x86, 0xb9, 0xc2, 0x12, 0xfa, 0xd2, 0x1d, 0x77, 0xe6, 0xbf, 0xb3, 0xc0,
-	0x0b, 0x70, 0x1a, 0x4f, 0xad, 0x9c, 0xa7, 0xf1, 0xd4, 0x6b, 0xf5, 0xcb, 0x27, 0x3f, 0x78, 0x72,
+	0x1e, 0x4c, 0x62, 0x3d, 0x82, 0x2b, 0xcd, 0x45, 0x1a, 0xde, 0xda, 0xed, 0x71, 0xff, 0xbd, 0x05,
-	0xb6, 0x1f, 0x1d, 0x1b, 0x33, 0xbd, 0x34, 0xfa, 0x4c, 0xfe, 0x9c, 0x3d, 0x50, 0x82, 0x8f, 0xff,
+	0x2d, 0x0b, 0x0e, 0x66, 0x73, 0xd4, 0x72, 0xa8, 0x34, 0x61, 0x2d, 0x87, 0x6a, 0x87, 0x7d, 0xf6,
-	0x0d, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x5c, 0x8a, 0x8c, 0x40, 0x0c, 0x00, 0x00,
+	0xe0, 0x07, 0xbf, 0xb0, 0x32, 0xfe, 0x4a, 0x52, 0x46, 0x9f, 0xa8, 0x9f, 0xc9, 0x0d, 0xad, 0xf8,
+	0xf0, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x93, 0x45, 0x3c, 0x9f, 0x0d, 0x00, 0x00,
 }

pkg/proto/user/user.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
 import "Open-IM-Server/pkg/proto/conversation/conversation.proto";
 option go_package = "OpenIM/pkg/proto/user;user";
-package user;
+package OpenIMServer.user;
 
 
 

pkg/utils/utils_v2.go

@@ -34,7 +34,19 @@ func SliceSubAny[E comparable, T any](a []E, b []T, fn func(t T) E) []E {
 
 // SliceAnySub a中存在,b中不存在 (a-b) fn 返回的是uuid
 func SliceAnySub[E any, T comparable](a, b []E, fn func(t E) T) []E {
-	panic("todo")
+	m := make(map[T]E)
+	for i := 0; i < len(b); i++ {
+		v := b[i]
+		m[fn(v)] = v
+	}
+	var es []E
+	for i := 0; i < len(a); i++ {
+		v := a[i]
+		if _, ok := m[fn(v)]; !ok {
+			es = append(es, v)
+		}
+	}
+	return es
 }
 
 // DistinctAny 去重

script/msg_gateway_start.sh

@@ -31,7 +31,7 @@ fi
 sleep 1
 cd ${msg_gateway_binary_root}
 for ((i = 0; i < ${#ws_ports[@]}; i++)); do
-  nohup ./${msg_gateway_name} -rpc_port ${rpc_ports[$i]} -ws_port ${ws_ports[$i]} -prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 &
+  nohup ./${msg_gateway_name} -port ${rpc_ports[$i]} -ws_port ${ws_ports[$i]} -prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 &
 done
 
 #Check launched service process

script/msg_transfer_start.sh

@@ -25,7 +25,7 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
       prome_port=${prome_ports[$i]}
       cmd="nohup ./${msg_transfer_name}"
       if [ $prome_port != "" ]; then
-        cmd="$cmd -prometheus_port $prome_port"
+        cmd="$cmd --prometheus_port $prome_port"
       fi
       $cmd >>../logs/openIM.log 2>&1 &
 done

script/push_start.sh

@@ -25,7 +25,7 @@ sleep 1
 cd ${push_binary_root}
 
 for ((i = 0; i < ${#rpc_ports[@]}; i++)); do
-  nohup ./${push_name} -port ${rpc_ports[$i]} -prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 &
+  nohup ./${push_name} --port ${rpc_ports[$i]} --prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 &
 done
 
 sleep 3

script/start_rpc_service.sh

@@ -70,9 +70,13 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do
   #Start related rpc services based on the number of ports
   for ((j = 0; j < ${#service_ports[*]}; j++)); do
     #Start the service in the background
-    cmd="./${service_filename[$i]} -port ${service_ports[$j]} -prometheus_port ${prome_ports[$j]}"
+    if [ -z "${prome_ports[$j]}" ]; then
+      cmd="./${service_filename[$i]} --port ${service_ports[$j]}"
+    else
+      cmd="./${service_filename[$i]} --port ${service_ports[$j]} --prometheus_port ${prome_ports[$j]}"
+    fi
     if [ $i -eq 0 -o $i -eq 1 ]; then
-      cmd="./${service_filename[$i]} -port ${service_ports[$j]}"
+      cmd="./${service_filename[$i]} --port ${service_ports[$j]}"
     fi
     echo $cmd
     nohup $cmd >>../logs/openIM.log 2>&1 &