Merge branch 'OpenIMSDK:main' into main

2025-12-11 15:27:12 +08:00 · 2022-10-09 16:06:05 +08:00 · 2022-10-09 16:06:05 +08:00 · dc9b369122
commit dc9b369122
parent d27aff6d57 efeb394f3e
85 changed files with 24289 additions and 12313 deletions
--- a/cmd/open_im_api/main.go
+++ b/cmd/open_im_api/main.go
@ -214,7 +214,7 @@ func main() {

 		organizationGroup.POST("/get_department_member", organization.GetDepartmentMember)
 		organizationGroup.POST("/delete_user_in_department", organization.DeleteUserInDepartment)
-
+		organizationGroup.POST("/get_user_in_organization", organization.GetUserInOrganization)
 	}

 	initGroup := r.Group("/init")
--- a/config/config.yaml
+++ b/config/config.yaml
@ -764,6 +764,10 @@ demo:
  joinDepartmentGroups: false # 注册是否加部门群
  oaNotification: false # 注册是否发送OA通知

+workMoment:
+  onlyFriendCanSee: false
+
+
 rtc:
  signalTimeout: 35

--- a/deploy_k8s/admin_cms/deployment.yaml
+++ b/deploy_k8s/admin_cms/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
        - name: admin-cms
-          image: openim/admin_cms:v2.3.0release
+          image: openim/admin_cms:v2.3.3
          # imagePullPolicy: Always #每次启动都重新拉取镜像
          ports:
            - containerPort: 10200
--- a/deploy_k8s/api/deployment.yaml
+++ b/deploy_k8s/api/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: api
-        image: openim/api:v2.3.0release
+        image: openim/api:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10002
--- a/deploy_k8s/auth/deployment.yaml
+++ b/deploy_k8s/auth/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: auth
-        image: openim/auth:v2.3.0release
+        image: openim/auth:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10160
--- a/deploy_k8s/cache/deployment.yaml
+++ b/deploy_k8s/cache/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: cache
-        image: openim/cache:v2.3.0release
+        image: openim/cache:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10240
--- a/deploy_k8s/cms_api/deployment.yaml
+++ b/deploy_k8s/cms_api/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: cms-api
-        image: openim/cms_api:v2.3.0release
+        image: openim/cms_api:v2.3.3
        imagePullPolicy: Always
        ports:
        - containerPort: 10006
--- a/deploy_k8s/conversation/deployment.yaml
+++ b/deploy_k8s/conversation/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
        - name: conversation
-          image: openim/conversation:v2.3.0release
+          image: openim/conversation:v2.3.3
          # imagePullPolicy: Always
          ports:
            - containerPort: 10230
--- a/deploy_k8s/demo/deployment.yaml
+++ b/deploy_k8s/demo/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: demo
-        image: openim/demo:v2.3.0release
+        image: openim/demo:v2.3.3
        imagePullPolicy: Always
        ports:
        - containerPort: 10004
--- a/deploy_k8s/friend/deployment.yaml
+++ b/deploy_k8s/friend/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: friend
-        image: openim/friend:v2.3.0release
+        image: openim/friend:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10120
--- a/deploy_k8s/group/deployment.yaml
+++ b/deploy_k8s/group/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: group
-        image: openim/group:v2.3.0release
+        image: openim/group:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10150
--- a/deploy_k8s/msg/deployment.yaml
+++ b/deploy_k8s/msg/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: msg
-        image: openim/msg:v2.3.0release
+        image: openim/msg:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10130
--- a/deploy_k8s/msg_gateway/deployment.yaml
+++ b/deploy_k8s/msg_gateway/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: msg-gateway
-        image: openim/msg_gateway:v2.3.0release
+        image: openim/msg_gateway:v2.3.3
        # imagePullPolicy: Always
        ports:
        - name: rpc-port
--- a/deploy_k8s/msg_transfer/deployment.yaml
+++ b/deploy_k8s/msg_transfer/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: msg-transfer
-        image: openim/msg_transfer:v2.3.0release
+        image: openim/msg_transfer:v2.3.3
        # imagePullPolicy: Always
        volumeMounts:
          - name: config
--- a/deploy_k8s/office/deployment.yaml
+++ b/deploy_k8s/office/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: office
-        image: openim/office:v2.3.0release
+        image: openim/office:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10210
--- a/deploy_k8s/organization/deployment.yaml
+++ b/deploy_k8s/organization/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: organization
-        image: openim/organization:v2.3.0release
+        image: openim/organization:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10220
--- a/deploy_k8s/push/deployment.yaml
+++ b/deploy_k8s/push/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: push
-        image: openim/push:v2.3.0release
+        image: openim/push:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10170
--- a/deploy_k8s/sdk_server/deployment.yaml
+++ b/deploy_k8s/sdk_server/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: sdk-server
-        image: openim/sdk_server:v2.3.0release
+        image: openim/sdk_server:v2.3.3
        # imagePullPolicy: Always
        ports:
        - containerPort: 10003
--- a/deploy_k8s/user/deployment.yaml
+++ b/deploy_k8s/user/deployment.yaml
@ -15,7 +15,7 @@ spec:
    spec:
      containers:
      - name: user
-        image: openim/user:v2.3.0release
+        image: openim/user:v2.3.3
        # imagePullPolicy: Always
        volumeMounts:
          - name: config
--- a/go.mod
+++ b/go.mod
@ -24,7 +24,7 @@ require (
 	github.com/go-playground/validator/v10 v10.11.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang-jwt/jwt/v4 v4.1.0
+	github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/websocket v1.4.2
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
--- a/go.sum
+++ b/go.sum
@ -249,8 +249,8 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
-github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
+github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
--- a/internal/api/manage/management_chat.go
+++ b/internal/api/manage/management_chat.go
@ -503,9 +503,10 @@ type OANotificationElem struct {
 	Ex                  string      `mapstructure:"ex" json:"ex"`
 }
 type MessageRevoked struct {
-	RevokerID       string `mapstructure:"notificationName" json:"revokerID" validate:"required"`
-	RevokerRole     int32  `mapstructure:"notificationName" json:"revokerRole" validate:"required"`
-	ClientMsgID     string `mapstructure:"notificationName" json:"clientMsgID" validate:"required"`
-	RevokerNickname string `mapstructure:"notificationName" json:"revokerNickname"`
-	SessionType     int32  `mapstructure:"notificationName" json:"sessionType" validate:"required"`
+	RevokerID       string `mapstructure:"revokerID" json:"revokerID" validate:"required"`
+	RevokerRole     int32  `mapstructure:"revokerRole" json:"revokerRole" validate:"required"`
+	ClientMsgID     string `mapstructure:"clientMsgID" json:"clientMsgID" validate:"required"`
+	RevokerNickname string `mapstructure:"revokerNickname" json:"revokerNickname"`
+	SessionType     int32  `mapstructure:"sessionType" json:"sessionType" validate:"required"`
+	Seq             uint32 `mapstructure:"seq" json:"seq" validate:"required"`
 }
--- a/internal/api/msg/del_msg.go
+++ b/internal/api/msg/del_msg.go
@ -80,7 +80,8 @@ func DelSuperGroupMsg(c *gin.Context) {
 	)
 	rpcReq := &rpc.DelSuperGroupMsgReq{}
 	if err := c.BindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		log.NewError("", "args err:", err.Error())
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	utils.CopyStructFields(rpcReq, &req)
@ -91,7 +92,7 @@ func DelSuperGroupMsg(c *gin.Context) {
 	if !ok {
 		errMsg := req.OperationID + " " + rpcReq.OpUserID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
 	options := make(map[string]bool, 5)
--- a/internal/api/msg/send_msg.go
+++ b/internal/api/msg/send_msg.go
@ -80,7 +80,7 @@ func SendMsg(c *gin.Context) {
 	}
 	client := pbChat.NewMsgClient(etcdConn)

-	log.Info("", "", "api SendMsg call, api call rpc...")
+	log.Info(params.OperationID, "", "api SendMsg call, api call rpc...")

 	reply, err := client.SendMsg(context.Background(), pbData)
 	if err != nil {
--- a/internal/api/organization/organization.go
+++ b/internal/api/organization/organization.go
@ -657,3 +657,40 @@ func DeleteUserInDepartment(c *gin.Context) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp)
 	c.JSON(http.StatusOK, apiResp)
 }
+
+func GetUserInOrganization(c *gin.Context) {
+	req := api.GetUserInOrganizationReq{}
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(req.OperationID, "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	err, _ := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
+	if err != nil {
+		errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	reqPb := &rpc.GetUserInOrganizationReq{OperationID: req.OperationID, UserIDList: req.UserIDList}
+	client := rpc.NewOrganizationClient(etcdConn)
+	respPb, err := client.GetUserInOrganization(context.Background(), reqPb)
+	if err != nil {
+		errMsg := "rpc DeleteUserInDepartment failed " + err.Error() + reqPb.String()
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	apiResp := api.GetUserInOrganizationResp{CommResp: api.CommResp{ErrCode: respPb.ErrCode, ErrMsg: respPb.ErrMsg}, OrganizationUserList: respPb.OrganizationUsers}
+	apiResp.Data = jsonData.JsonDataList(apiResp.OrganizationUserList)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp)
+	c.JSON(http.StatusOK, apiResp)
+}
--- a/internal/api/user/user.go
+++ b/internal/api/user/user.go
@ -164,7 +164,7 @@ func GetUsersPublicInfo(c *gin.Context) {
 	params := api.GetUsersInfoReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()})
+		c.JSON(http.StatusOK, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()})
 		return
 	}
 	req := &rpc.GetUserInfoReq{}
@ -176,7 +176,7 @@ func GetUsersPublicInfo(c *gin.Context) {
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}

--- a/internal/cms_api/router.go
+++ b/internal/cms_api/router.go
@ -19,12 +19,12 @@ import (
 func NewGinRouter() *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
 	baseRouter := gin.New()
-	baseRouter.Use()
+	baseRouter.Use(gin.Recovery())
+	baseRouter.Use(middleware.CorsHandler())
 	if config.Config.Prometheus.Enable {
 		baseRouter.GET("/metrics", promePkg.PrometheusHandler())
 	}
 	router := baseRouter.Group("/cms")
-	router.Use(middleware.CorsHandler())
 	adminRouterGroup := router.Group("/admin")
 	{
 		adminRouterGroup.POST("/login", admin.AdminLogin)
@ -62,6 +62,8 @@ func NewGinRouter() *gin.Engine {
 	}
 	userRouterGroup := r2.Group("/user")
 	{
+		userRouterGroup.POST("/get_user_id_by_email_phone", user.GetUserIDByEmailAndPhoneNumber)
+
 		userRouterGroup.POST("/add_user", user.AddUser)
 		userRouterGroup.POST("/unblock_user", user.UnblockUser)
 		userRouterGroup.POST("/block_user", user.BlockUser)
--- a/internal/cms_api/user/user.go
+++ b/internal/cms_api/user/user.go
@ -5,6 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	pbAdminCms "Open_IM/pkg/proto/admin_cms"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	pb "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
@ -158,3 +159,38 @@ func GetBlockUsers(c *gin.Context) {
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", resp)
 	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }
+
+func GetUserIDByEmailAndPhoneNumber(c *gin.Context) {
+	var (
+		req    cms_api_struct.GetUserIDByEmailAndPhoneNumberRequest
+		resp   cms_api_struct.GetUserIDByEmailAndPhoneNumberResponse
+		reqPb  pbAdminCms.GetUserIDByEmailAndPhoneNumberReq
+		respPb *pbAdminCms.GetUserIDByEmailAndPhoneNumberResp
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	reqPb.OperationID = req.OperationID
+	reqPb.Email = req.Email
+	reqPb.PhoneNumber = req.PhoneNumber
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
+	if etcdConn == nil {
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
+		log.NewError(reqPb.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := pbAdminCms.NewAdminCMSClient(etcdConn)
+	respPb, err := client.GetUserIDByEmailAndPhoneNumber(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	resp.UserIDList = respPb.UserIDList
+	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
+}
--- a/internal/demo/register/login.go
+++ b/internal/demo/register/login.go
@ -7,7 +7,6 @@ import (
 	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	http2 "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/utils"
 	"encoding/json"
 	"fmt"
 	"net/http"
@ -61,7 +60,7 @@ func Login(c *gin.Context) {
 	if ip == "" {
 		ip = c.ClientIP()
 	}
-	url := fmt.Sprintf("http://%s:%d/auth/user_token", utils.ServerIP, config.Config.Api.GinPort[0])
+	url := fmt.Sprintf("%s/auth/user_token", config.Config.Demo.ImAPIURL)
 	openIMGetUserToken := api.UserTokenReq{}
 	openIMGetUserToken.OperationID = params.OperationID
 	openIMGetUserToken.Platform = params.Platform
--- a/internal/msg_gateway/gate/relay_rpc_server.go
+++ b/internal/msg_gateway/gate/relay_rpc_server.go
@ -323,7 +323,7 @@ func (r *RPCServer) KickUserOffline(_ context.Context, req *pbRelay.KickUserOffl
 		oldConnMap := ws.getUserAllCons(v)
 		if conn, ok := oldConnMap[int(req.PlatformID)]; ok { // user->map[platform->conn]
 			log.NewWarn(req.OperationID, "send kick msg, close connection ", req.PlatformID, v)
-			ws.sendKickMsg(conn, &UserConn{})
+			ws.sendKickMsg(conn)
 			conn.Close()
 		}
 	}
--- a/internal/msg_gateway/gate/ws_server.go
+++ b/internal/msg_gateway/gate/ws_server.go
@ -214,7 +214,7 @@ func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int, newConn
 		if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]
 			if oldConn, ok := oldConnMap[platformID]; ok {
 				log.NewDebug(operationID, uid, platformID, "kick old conn")
-				ws.sendKickMsg(oldConn, newConn)
+				ws.sendKickMsg(oldConn)
 				m, err := db.DB.GetTokenMapByUidPid(uid, constant.PlatformIDToName(platformID))
 				if err != nil && err != go_redis.Nil {
 					log.NewError(operationID, "get token from redis err", err.Error(), uid, constant.PlatformIDToName(platformID))
@ -263,7 +263,7 @@ func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int, newConn
 	case constant.WebAndOther:
 	}
 }
-func (ws *WServer) sendKickMsg(oldConn, newConn *UserConn) {
+func (ws *WServer) sendKickMsg(oldConn *UserConn) {
 	mReply := Resp{
 		ReqIdentifier: constant.WSKickOnlineMsg,
 		ErrCode:       constant.ErrTokenInvalid.ErrCode,
@ -273,12 +273,12 @@ func (ws *WServer) sendKickMsg(oldConn, newConn *UserConn) {
 	enc := gob.NewEncoder(&b)
 	err := enc.Encode(mReply)
 	if err != nil {
-		log.NewError(mReply.OperationID, mReply.ReqIdentifier, mReply.ErrCode, mReply.ErrMsg, "Encode Msg error", oldConn.RemoteAddr().String(), newConn.RemoteAddr().String(), err.Error())
+		log.NewError(mReply.OperationID, mReply.ReqIdentifier, mReply.ErrCode, mReply.ErrMsg, "Encode Msg error", oldConn.RemoteAddr().String(), err.Error())
 		return
 	}
 	err = ws.writeMsg(oldConn, websocket.BinaryMessage, b.Bytes())
 	if err != nil {
-		log.NewError(mReply.OperationID, mReply.ReqIdentifier, mReply.ErrCode, mReply.ErrMsg, "sendKickMsg WS WriteMsg error", oldConn.RemoteAddr().String(), newConn.RemoteAddr().String(), err.Error())
+		log.NewError(mReply.OperationID, mReply.ReqIdentifier, mReply.ErrCode, mReply.ErrMsg, "sendKickMsg WS WriteMsg error", oldConn.RemoteAddr().String(), err.Error())
 	}
 }

--- a/internal/msg_transfer/logic/online_history_msg_handler.go
+++ b/internal/msg_transfer/logic/online_history_msg_handler.go
@ -519,7 +519,7 @@ func sendMessageToPush(message *pbMsg.MsgDataToMQ, pushToUserID string) {
 	rpcPushMsg := pbPush.PushMsgReq{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
 	mqPushMsg := pbMsg.PushMsgDataToMQ{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
 	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImPushName, message.OperationID)
-	if grpcConn == nil {
+	if grpcConn != nil {
 		log.Error(rpcPushMsg.OperationID, "rpc dial failed", "push data", rpcPushMsg.String())
 		pid, offset, err := producer.SendMessage(&mqPushMsg, mqPushMsg.PushToUserID, rpcPushMsg.OperationID)
 		if err != nil {
--- a/internal/push/logic/callback.go
+++ b/internal/push/logic/callback.go
@ -62,7 +62,7 @@ func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb.

 func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.MsgData) cbApi.CommonCallbackResp {
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
-	if !config.Config.Callback.CallbackOnlinePush.Enable {
+	if !config.Config.Callback.CallbackOnlinePush.Enable || utils.IsContain(msg.SendID, userIDList) {
 		return callbackResp
 	}
 	req := cbApi.CallbackBeforePushReq{
@ -96,6 +96,11 @@ func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.M
 			return callbackResp
 		}
 	}
+	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow {
+		if resp.OfflinePushInfo != nil {
+			msg.OfflinePushInfo = resp.OfflinePushInfo
+		}
+	}
 	return callbackResp
 }

@ -133,8 +138,13 @@ func callbackBeforeSuperGroupOnlinePush(operationID string, groupID string, msg
 			return callbackResp
 		}
 	}
-	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow && len(resp.UserIDList) != 0 {
-		*pushToUserList = resp.UserIDList
+	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow {
+		if len(resp.UserIDList) != 0 {
+			*pushToUserList = resp.UserIDList
+		}
+		if resp.OfflinePushInfo != nil {
+			msg.OfflinePushInfo = resp.OfflinePushInfo
+		}
 	}
 	log.NewDebug(operationID, utils.GetSelfFuncName(), pushToUserList, resp.UserIDList)
 	return callbackResp
--- a/internal/push/logic/push_to_client.go
+++ b/internal/push/logic/push_to_client.go
@ -295,45 +295,3 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err

 	return opts, nil
 }
-
-//func SendMsgByWS(m *pbChat.WSToMsgSvrChatMsg) {
-//	m.MsgID = rpcChat.GetMsgID(m.SendID)
-//	m.ClientMsgID = m.MsgID
-//	switch m.SessionType {
-//	case constant.SingleChatType:
-//		sendMsgToKafka(m, m.SendID, "msgKey--sendID")
-//		sendMsgToKafka(m, m.RecvID, "msgKey--recvID")
-//	case constant.GroupChatType:
-//		etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
-//		client := pbGroup.NewGroupClient(etcdConn)
-//		req := &pbGroup.Req{
-//			GroupID:     m.RecvID,
-//			Token:       config.Config.Secret,
-//			OperationID: m.OperationID,
-//		}
-//		reply, err := client.(context.Background(), req)
-//		if err != nil {
-//			log.Error(m.Token, m.OperationID, "rpc  getGroupInfo failed, err = %s", err.Error())
-//			return
-//		}
-//		if reply.ErrorCode != 0 {
-//			log.Error(m.Token, m.OperationID, "rpc  getGroupInfo failed, err = %s", reply.ErrorMsg)
-//			return
-//		}
-//		groupID := m.RecvID
-//		for i, v := range reply.MemberList {
-//			m.RecvID = v.UserId + " " + groupID
-//			sendMsgToKafka(m, utils.IntToString(i), "msgKey--recvID+\" \"+groupID")
-//		}
-//	default:
-//
-//	}
-//}
-//
-//func sendMsgToKafka(m *pbChat.WSToMsgSvrChatMsg, key string, flag string) {
-//	pid, offset, err := producer.SendMessage(m, key)
-//	if err != nil {
-//		log.ErrorByKv("kafka send failed", m.OperationID, "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error(), flag, key)
-//	}
-//
-//}
--- a/internal/rpc/admin_cms/admin_cms.go
+++ b/internal/rpc/admin_cms/admin_cms.go
@ -651,6 +651,21 @@ func (s *adminCMSServer) GetUserFriends(_ context.Context, req *pbAdminCMS.GetUs
 	return resp, nil
 }

+func (s *adminCMSServer) GetUserIDByEmailAndPhoneNumber(_ context.Context, req *pbAdminCMS.GetUserIDByEmailAndPhoneNumberReq) (*pbAdminCMS.GetUserIDByEmailAndPhoneNumberResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp := &pbAdminCMS.GetUserIDByEmailAndPhoneNumberResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	userIDList, err := imdb.GetUserIDsByEmailAndID(req.PhoneNumber, req.Email)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.PhoneNumber, req.Email)
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	resp.UserIDList = userIDList
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	return resp, nil
+}
+
 func (s *adminCMSServer) GenerateInvitationCode(_ context.Context, req *pbAdminCMS.GenerateInvitationCodeReq) (*pbAdminCMS.GenerateInvitationCodeResp, error) {
 	return nil, nil
 }
--- a/internal/rpc/auth/auth.go
+++ b/internal/rpc/auth/auth.go
@ -56,6 +56,19 @@ func (rpc *rpcAuth) UserToken(_ context.Context, req *pbAuth.UserTokenReq) (*pbA
 	return &pbAuth.UserTokenResp{CommonResp: &pbAuth.CommonResp{}, Token: tokens, ExpiredTime: expTime}, nil
 }

+func (rpc *rpcAuth) ParseToken(_ context.Context, req *pbAuth.ParseTokenReq) (*pbAuth.ParseTokenResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String())
+	claims, err := token_verify.ParseToken(req.Token, req.OperationID)
+	if err != nil {
+		errMsg := "ParseToken failed " + err.Error() + req.OperationID + " token " + req.Token
+		log.Error(req.OperationID, errMsg, "token:", req.Token)
+		return &pbAuth.ParseTokenResp{CommonResp: &pbAuth.CommonResp{ErrCode: 4001, ErrMsg: errMsg}}, nil
+	}
+	resp := pbAuth.ParseTokenResp{CommonResp: &pbAuth.CommonResp{}, UserID: claims.UID, Platform: claims.Platform, ExpireTimeSeconds: uint32(claims.ExpiresAt.Unix())}
+	log.Info(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp.String())
+	return &resp, nil
+}
+
 func (rpc *rpcAuth) ForceLogout(_ context.Context, req *pbAuth.ForceLogoutReq) (*pbAuth.ForceLogoutResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String())
 	if !token_verify.IsManagerUserID(req.OpUserID) {
--- a/internal/rpc/auth/callback.go
+++ b/internal/rpc/auth/callback.go
@ -1 +0,0 @@
-package auth
--- a/internal/rpc/msg/query_msg.go
+++ b/internal/rpc/msg/query_msg.go
@ -0,0 +1,51 @@
+package msg
+
+import (
+	commonDB "Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	promePkg "Open_IM/pkg/common/prometheus"
+	"Open_IM/pkg/proto/msg"
+	"Open_IM/pkg/utils"
+	"context"
+	go_redis "github.com/go-redis/redis/v8"
+)
+
+func (rpc *rpcChat) GetSuperGroupMsg(context context.Context, req *msg.GetSuperGroupMsgReq) (*msg.GetSuperGroupMsgResp, error) {
+	log.Debug(req.OperationID, utils.GetSelfFuncName(), req.String())
+	resp := new(msg.GetSuperGroupMsgResp)
+	redisMsgList, failedSeqList, err := commonDB.DB.GetMessageListBySeq(req.GroupID, []uint32{req.Seq}, req.OperationID)
+	if err != nil {
+		if err != go_redis.Nil {
+			promePkg.PromeAdd(promePkg.MsgPullFromRedisFailedCounter, len(failedSeqList))
+			log.Error(req.OperationID, "get message from redis exception", err.Error(), failedSeqList)
+		} else {
+			log.Debug(req.OperationID, "get message from redis is nil", failedSeqList)
+		}
+		msgList, err1 := commonDB.DB.GetSuperGroupMsgBySeqListMongo(req.GroupID, failedSeqList, req.OperationID)
+		if err1 != nil {
+			promePkg.PromeAdd(promePkg.MsgPullFromMongoFailedCounter, len(failedSeqList))
+			log.Error(req.OperationID, "GetSuperGroupMsg data error", req.String(), err.Error())
+			resp.ErrCode = 201
+			resp.ErrMsg = err.Error()
+			return resp, nil
+		} else {
+			promePkg.PromeAdd(promePkg.MsgPullFromMongoSuccessCounter, len(msgList))
+			redisMsgList = append(redisMsgList, msgList...)
+			for _, m := range msgList {
+				resp.MsgData = m
+			}
+
+		}
+	} else {
+		promePkg.PromeAdd(promePkg.MsgPullFromRedisSuccessCounter, len(redisMsgList))
+		for _, m := range redisMsgList {
+			resp.MsgData = m
+		}
+	}
+	log.Debug(req.OperationID, utils.GetSelfFuncName(), resp.String())
+	return resp, nil
+}
+
+func (rpc *rpcChat) GetWriteDiffMsg(context context.Context, req *msg.GetWriteDiffMsgReq) (*msg.GetWriteDiffMsgResp, error) {
+	panic("implement me")
+}
--- a/internal/rpc/msg/rpcChat.go
+++ b/internal/rpc/msg/rpcChat.go
@ -10,6 +10,7 @@ import (
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
+	"github.com/golang/protobuf/proto"
 	"net"
 	"strconv"
 	"strings"
@ -19,17 +20,15 @@ import (
 	"google.golang.org/grpc"
 )

-//var (
-//	sendMsgSuccessCounter prometheus.Counter
-//	sendMsgFailedCounter  prometheus.Counter
-//)
-
+type MessageWriter interface {
+	SendMessage(m proto.Message, key string, operationID string) (int32, int64, error)
+}
 type rpcChat struct {
 	rpcPort         int
 	rpcRegisterName string
 	etcdSchema      string
 	etcdAddr        []string
-	onlineProducer  *kafka.Producer
+	messageWriter   MessageWriter
 	//offlineProducer *kafka.Producer
 	delMsgCh chan deleteMsg
 }
@ -49,7 +48,7 @@ func NewRpcChatServer(port int) *rpcChat {
 		etcdSchema:      config.Config.Etcd.EtcdSchema,
 		etcdAddr:        config.Config.Etcd.EtcdAddr,
 	}
-	rc.onlineProducer = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic)
+	rc.messageWriter = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic)
 	//rc.offlineProducer = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschatOffline.Addr, config.Config.Kafka.Ws2mschatOffline.Topic)
 	rc.delMsgCh = make(chan deleteMsg, 1000)
 	return &rc
--- a/internal/rpc/msg/send_msg.go
+++ b/internal/rpc/msg/send_msg.go
@ -12,6 +12,7 @@ import (
 	cacheRpc "Open_IM/pkg/proto/cache"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	pbChat "Open_IM/pkg/proto/msg"
+	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
@ -35,6 +36,26 @@ var (
 	ExcludeContentType = []int{constant.HasReadReceipt, constant.GroupHasReadReceipt}
 )

+type Validator interface {
+	validate(pb *pbChat.SendMsgReq) (bool, int32, string)
+}
+
+//type MessageValidator struct {
+//
+//}
+
+type MessageRevoked struct {
+	RevokerID                   string `json:"revokerID"`
+	RevokerRole                 int32  `json:"revokerRole"`
+	ClientMsgID                 string `json:"clientMsgID"`
+	RevokerNickname             string `json:"revokerNickname"`
+	RevokeTime                  int64  `json:"revokeTime"`
+	SourceMessageSendTime       int64  `json:"sourceMessageSendTime"`
+	SourceMessageSendID         string `json:"sourceMessageSendID"`
+	SourceMessageSenderNickname string `json:"sourceMessageSenderNickname"`
+	SessionType                 int32  `json:"sessionType"`
+	Seq                         uint32 `json:"seq"`
+}
 type MsgCallBackReq struct {
 	SendID       string `json:"sendID"`
 	RecvID       string `json:"recvID"`
@ -75,7 +96,7 @@ func isMessageHasReadEnabled(pb *pbChat.SendMsgReq) (bool, int32, string) {
 	return true, 0, ""
 }

-func messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string) {
+func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string) {
 	switch data.MsgData.SessionType {
 	case constant.SingleChatType:
 		if utils.IsContain(data.MsgData.SendID, config.Config.Manager.AppManagerUid) {
@ -139,6 +160,35 @@ func messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string
 		if err != nil {
 			return false, 201, err.Error(), nil
 		}
+		if data.MsgData.ContentType == constant.AdvancedRevoke {
+			revokeMessage := new(MessageRevoked)
+			err := utils.JsonStringToStruct(string(data.MsgData.Content), revokeMessage)
+			if err != nil {
+				log.Error(data.OperationID, "json unmarshal err:", err.Error())
+				return false, 201, err.Error(), nil
+			}
+			log.Debug(data.OperationID, "revoke message is", *revokeMessage)
+
+			if revokeMessage.RevokerID != revokeMessage.SourceMessageSendID {
+				req := pbChat.GetSuperGroupMsgReq{OperationID: data.OperationID, Seq: revokeMessage.Seq, GroupID: data.MsgData.GroupID}
+				resp, err := rpc.GetSuperGroupMsg(context.Background(), &req)
+				if err != nil {
+					log.Error(data.OperationID, "GetSuperGroupMsgReq err:", err.Error())
+				} else if resp.ErrCode != 0 {
+					log.Error(data.OperationID, "GetSuperGroupMsgReq err:", err.Error())
+				} else {
+					if resp.MsgData != nil && resp.MsgData.ClientMsgID == revokeMessage.ClientMsgID && resp.MsgData.Seq == revokeMessage.Seq {
+						revokeMessage.SourceMessageSendTime = resp.MsgData.SendTime
+						revokeMessage.SourceMessageSenderNickname = resp.MsgData.SenderNickname
+						revokeMessage.SourceMessageSendID = resp.MsgData.SendID
+						log.Debug(data.OperationID, "new revoke message is ", revokeMessage)
+						data.MsgData.Content = []byte(utils.StructToJsonString(revokeMessage))
+					} else {
+						return false, 201, errors.New("msg err").Error(), nil
+					}
+				}
+			}
+		}
 		if groupInfo.GroupType == constant.SuperGroup {
 			return true, 0, "", nil
 		} else {
@ -148,29 +198,6 @@ func messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string
 				log.NewError(data.OperationID, errMsg)
 				return false, 201, errMsg, nil
 			}
-
-			//
-			//getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: data.OperationID, GroupID: data.MsgData.GroupID}
-			//etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, data.OperationID)
-			//if etcdConn == nil {
-			//	errMsg := data.OperationID + "getcdv3.GetDefaultConn == nil"
-			//	log.NewError(data.OperationID, errMsg)
-			//	return false, 201, errMsg, nil
-			//}
-			//client := pbCache.NewCacheClient(etcdConn)
-			//	cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
-			//
-			//
-			//if err != nil {
-			//	log.NewError(data.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
-			//	//return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache failed", "", 0)
-			//	return false, 201, err.Error(), nil
-			//}
-			//if cacheResp.CommonResp.ErrCode != 0 {
-			//	log.NewError(data.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
-			//	//return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache logic failed", "", 0)
-			//	return false, cacheResp.CommonResp.ErrCode, cacheResp.CommonResp.ErrMsg, nil
-			//}
 			if !token_verify.IsManagerUserID(data.MsgData.SendID) {
 				if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {
 					return true, 0, "", userIDList
@ -237,27 +264,19 @@ func (rpc *rpcChat) encapsulateMsgData(msg *sdk_ws.MsgData) {
 }
 func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.SendMsgResp, error) {
 	replay := pbChat.SendMsgResp{}
-	newTime := db.GetCurrentTimestampByMill()
-	t1 := time.Now()
 	log.Info(pb.OperationID, "rpc sendMsg come here ", pb.String())
 	flag, errCode, errMsg := isMessageHasReadEnabled(pb)
-	log.Info(pb.OperationID, "isMessageHasReadEnabled ", flag)
 	if !flag {
 		return returnMsg(&replay, pb, errCode, errMsg, "", 0)
 	}
-	//flag, errCode, errMsg, _ = messageVerification(pb)
-	//log.Info(pb.OperationID, "messageVerification ", flag, " cost time: ", time.Since(t1))
-	//if !flag {
-	//	return returnMsg(&replay, pb, errCode, errMsg, "", 0)
-	//}
-	t1 = time.Now()
+	t1 := time.Now()
 	rpc.encapsulateMsgData(pb.MsgData)
-	log.Info(pb.OperationID, "encapsulateMsgData ", " cost time: ", time.Since(t1))
+	log.Debug(pb.OperationID, "encapsulateMsgData ", " cost time: ", time.Since(t1))
 	msgToMQSingle := pbChat.MsgDataToMQ{Token: pb.Token, OperationID: pb.OperationID, MsgData: pb.MsgData}
 	// callback
 	t1 = time.Now()
 	callbackResp := callbackWordFilter(pb)
-	log.Info(pb.OperationID, "callbackWordFilter ", callbackResp, "cost time: ", time.Since(t1))
+	log.Debug(pb.OperationID, "callbackWordFilter ", callbackResp, "cost time: ", time.Since(t1))
 	if callbackResp.ErrCode != 0 {
 		log.Error(pb.OperationID, utils.GetSelfFuncName(), "callbackWordFilter resp: ", callbackResp)
 	}
@ -275,7 +294,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 		// callback
 		t1 = time.Now()
 		callbackResp := callbackBeforeSendSingleMsg(pb)
-		log.Info(pb.OperationID, "callbackBeforeSendSingleMsg ", " cost time: ", time.Since(t1))
+		log.Debug(pb.OperationID, "callbackBeforeSendSingleMsg ", " cost time: ", time.Since(t1))
 		if callbackResp.ErrCode != 0 {
 			log.NewError(pb.OperationID, utils.GetSelfFuncName(), "callbackBeforeSendSingleMsg resp: ", callbackResp)
 		}
@ -287,8 +306,9 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			promePkg.PromeInc(promePkg.SingleChatMsgProcessFailedCounter)
 			return returnMsg(&replay, pb, int32(callbackResp.ErrCode), callbackResp.ErrMsg, "", 0)
 		}
-		flag, errCode, errMsg, _ = messageVerification(pb)
-		log.Info(pb.OperationID, "messageVerification ", flag, " cost time: ", time.Since(t1))
+		t1 = time.Now()
+		flag, errCode, errMsg, _ = rpc.messageVerification(pb)
+		log.Debug(pb.OperationID, "messageVerification ", flag, " cost time: ", time.Since(t1))
 		if !flag {
 			return returnMsg(&replay, pb, errCode, errMsg, "", 0)
 		}
@ -299,8 +319,8 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			msgToMQSingle.MsgData = pb.MsgData
 			log.NewInfo(msgToMQSingle.OperationID, msgToMQSingle)
 			t1 = time.Now()
-			err1 := rpc.sendMsgToKafka(&msgToMQSingle, msgToMQSingle.MsgData.RecvID, constant.OnlineStatus)
-			log.Info(pb.OperationID, "sendMsgToKafka ", " cost time: ", time.Since(t1))
+			err1 := rpc.sendMsgToWriter(&msgToMQSingle, msgToMQSingle.MsgData.RecvID, constant.OnlineStatus)
+			log.Info(pb.OperationID, "sendMsgToWriter ", " cost time: ", time.Since(t1))
 			if err1 != nil {
 				log.NewError(msgToMQSingle.OperationID, "kafka send msg err :RecvID", msgToMQSingle.MsgData.RecvID, msgToMQSingle.String(), err1.Error())
 				promePkg.PromeInc(promePkg.SingleChatMsgProcessFailedCounter)
@ -309,8 +329,8 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 		}
 		if msgToMQSingle.MsgData.SendID != msgToMQSingle.MsgData.RecvID { //Filter messages sent to yourself
 			t1 = time.Now()
-			err2 := rpc.sendMsgToKafka(&msgToMQSingle, msgToMQSingle.MsgData.SendID, constant.OnlineStatus)
-			log.Info(pb.OperationID, "sendMsgToKafka ", " cost time: ", time.Since(t1))
+			err2 := rpc.sendMsgToWriter(&msgToMQSingle, msgToMQSingle.MsgData.SendID, constant.OnlineStatus)
+			log.Info(pb.OperationID, "sendMsgToWriter ", " cost time: ", time.Since(t1))
 			if err2 != nil {
 				log.NewError(msgToMQSingle.OperationID, "kafka send msg err:SendID", msgToMQSingle.MsgData.SendID, msgToMQSingle.String())
 				promePkg.PromeInc(promePkg.SingleChatMsgProcessFailedCounter)
@ -324,7 +344,6 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 		if callbackResp.ErrCode != 0 {
 			log.NewError(pb.OperationID, utils.GetSelfFuncName(), "callbackAfterSendSingleMsg resp: ", callbackResp)
 		}
-		log.Debug(pb.OperationID, "send msg cost time all: ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID)
 		promePkg.PromeInc(promePkg.SingleChatMsgProcessSuccessCounter)
 		return returnMsg(&replay, pb, 0, "", msgToMQSingle.MsgData.ServerMsgID, msgToMQSingle.MsgData.SendTime)
 	case constant.GroupChatType:
@ -343,7 +362,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			return returnMsg(&replay, pb, int32(callbackResp.ErrCode), callbackResp.ErrMsg, "", 0)
 		}
 		var memberUserIDList []string
-		if flag, errCode, errMsg, memberUserIDList = messageVerification(pb); !flag {
+		if flag, errCode, errMsg, memberUserIDList = rpc.messageVerification(pb); !flag {
 			promePkg.PromeInc(promePkg.GroupChatMsgProcessFailedCounter)
 			return returnMsg(&replay, pb, errCode, errMsg, "", 0)
 		}
@ -375,8 +394,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 		}
 		m := make(map[string][]string, 2)
 		m[constant.OnlineStatus] = memberUserIDList
-		log.Debug(pb.OperationID, "send msg cost time1 ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID, pb)
-		newTime = db.GetCurrentTimestampByMill()
+		t1 = time.Now()

 		//split  parallel send
 		var wg sync.WaitGroup
@ -397,11 +415,11 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 				go rpc.sendMsgToGroupOptimization(v[split*(len(v)/split):], tmp, k, &sendTag, &wg)
 			}
 		}
-		log.Debug(pb.OperationID, "send msg cost time22 ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID, "uidList : ", len(addUidList))
+		log.Debug(pb.OperationID, "send msg cost time22 ", time.Since(t1), pb.MsgData.ClientMsgID, "uidList : ", len(addUidList))
 		//wg.Add(1)
 		//go rpc.sendMsgToGroup(addUidList, *pb, constant.OnlineStatus, &sendTag, &wg)
 		wg.Wait()
-		newTime = db.GetCurrentTimestampByMill()
+		t1 = time.Now()
 		// callback
 		callbackResp = callbackAfterSendGroupMsg(pb)
 		if callbackResp.ErrCode != 0 {
@ -473,28 +491,29 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 					}
 				}()
 			}
-			log.Debug(pb.OperationID, "send msg cost time3 ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID)
+			log.Debug(pb.OperationID, "send msg cost time3 ", time.Since(t1), pb.MsgData.ClientMsgID)
 			promePkg.PromeInc(promePkg.GroupChatMsgProcessSuccessCounter)
 			return returnMsg(&replay, pb, 0, "", msgToMQSingle.MsgData.ServerMsgID, msgToMQSingle.MsgData.SendTime)
 		}
 	case constant.NotificationChatType:
+		t1 = time.Now()
 		msgToMQSingle.MsgData = pb.MsgData
 		log.NewInfo(msgToMQSingle.OperationID, msgToMQSingle)
-		err1 := rpc.sendMsgToKafka(&msgToMQSingle, msgToMQSingle.MsgData.RecvID, constant.OnlineStatus)
+		err1 := rpc.sendMsgToWriter(&msgToMQSingle, msgToMQSingle.MsgData.RecvID, constant.OnlineStatus)
 		if err1 != nil {
 			log.NewError(msgToMQSingle.OperationID, "kafka send msg err:RecvID", msgToMQSingle.MsgData.RecvID, msgToMQSingle.String())
 			return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0)
 		}

 		if msgToMQSingle.MsgData.SendID != msgToMQSingle.MsgData.RecvID { //Filter messages sent to yourself
-			err2 := rpc.sendMsgToKafka(&msgToMQSingle, msgToMQSingle.MsgData.SendID, constant.OnlineStatus)
+			err2 := rpc.sendMsgToWriter(&msgToMQSingle, msgToMQSingle.MsgData.SendID, constant.OnlineStatus)
 			if err2 != nil {
 				log.NewError(msgToMQSingle.OperationID, "kafka send msg err:SendID", msgToMQSingle.MsgData.SendID, msgToMQSingle.String())
 				return returnMsg(&replay, pb, 201, "kafka send msg err", "", 0)
 			}
 		}

-		log.Debug(pb.OperationID, "send msg cost time ", db.GetCurrentTimestampByMill()-newTime, pb.MsgData.ClientMsgID)
+		log.Debug(pb.OperationID, "send msg cost time ", time.Since(t1), pb.MsgData.ClientMsgID)
 		return returnMsg(&replay, pb, 0, "", msgToMQSingle.MsgData.ServerMsgID, msgToMQSingle.MsgData.SendTime)
 	case constant.SuperGroupChatType:
 		promePkg.PromeInc(promePkg.WorkSuperGroupChatMsgRecvSuccessCounter)
@ -511,13 +530,13 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 			log.NewDebug(pb.OperationID, utils.GetSelfFuncName(), "callbackBeforeSendSuperGroupMsg result", "end rpc and return", callbackResp)
 			return returnMsg(&replay, pb, int32(callbackResp.ErrCode), callbackResp.ErrMsg, "", 0)
 		}
-		if flag, errCode, errMsg, _ = messageVerification(pb); !flag {
+		if flag, errCode, errMsg, _ = rpc.messageVerification(pb); !flag {
 			promePkg.PromeInc(promePkg.WorkSuperGroupChatMsgProcessFailedCounter)
 			return returnMsg(&replay, pb, errCode, errMsg, "", 0)
 		}
 		msgToMQSingle.MsgData = pb.MsgData
 		log.NewInfo(msgToMQSingle.OperationID, msgToMQSingle)
-		err1 := rpc.sendMsgToKafka(&msgToMQSingle, msgToMQSingle.MsgData.GroupID, constant.OnlineStatus)
+		err1 := rpc.sendMsgToWriter(&msgToMQSingle, msgToMQSingle.MsgData.GroupID, constant.OnlineStatus)
 		if err1 != nil {
 			log.NewError(msgToMQSingle.OperationID, "kafka send msg err:RecvID", msgToMQSingle.MsgData.RecvID, msgToMQSingle.String())
 			promePkg.PromeInc(promePkg.WorkSuperGroupChatMsgProcessFailedCounter)
@ -536,18 +555,34 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S
 	}
 }

-func (rpc *rpcChat) sendMsgToKafka(m *pbChat.MsgDataToMQ, key string, status string) error {
+func (rpc *rpcChat) sendMsgToWriter(m *pbChat.MsgDataToMQ, key string, status string) error {
 	switch status {
 	case constant.OnlineStatus:
-		pid, offset, err := rpc.onlineProducer.SendMessage(m, key, m.OperationID)
+		if m.MsgData.ContentType == constant.SignalingNotification {
+			rpcPushMsg := pbPush.PushMsgReq{OperationID: m.OperationID, MsgData: m.MsgData, PushToUserID: key}
+			grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImPushName, m.OperationID)
+			if grpcConn == nil {
+				log.Error(rpcPushMsg.OperationID, "rpc dial failed", "push data", rpcPushMsg.String())
+				return errors.New("grpcConn is nil")
+			}
+			msgClient := pbPush.NewPushMsgServiceClient(grpcConn)
+			_, err := msgClient.PushMsg(context.Background(), &rpcPushMsg)
+			if err != nil {
+				log.Error(rpcPushMsg.OperationID, "rpc send failed", rpcPushMsg.OperationID, "push data", rpcPushMsg.String(), "err", err.Error())
+				return err
+			} else {
+				return nil
+			}
+		}
+		pid, offset, err := rpc.messageWriter.SendMessage(m, key, m.OperationID)
 		if err != nil {
 			log.Error(m.OperationID, "kafka send failed", "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error(), "key", key, status)
 		} else {
-			//	log.NewWarn(m.OperationID, "sendMsgToKafka   client msgID ", m.MsgData.ClientMsgID)
+			//	log.NewWarn(m.OperationID, "sendMsgToWriter   client msgID ", m.MsgData.ClientMsgID)
 		}
 		return err
 	case constant.OfflineStatus:
-		pid, offset, err := rpc.onlineProducer.SendMessage(m, key, m.OperationID)
+		pid, offset, err := rpc.messageWriter.SendMessage(m, key, m.OperationID)
 		if err != nil {
 			log.Error(m.OperationID, "kafka send failed", "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error(), "key", key, status)
 		}
@ -924,6 +959,7 @@ func Notification(n *NotificationMsg) {
 		log.NewError(req.OperationID, "SendMsg rpc failed, ", req.String(), reply.ErrCode, reply.ErrMsg)
 	}
 }
+
 func getOnlineAndOfflineUserIDList(memberList []string, m map[string][]string, operationID string) {
 	var onllUserIDList, offlUserIDList []string
 	var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
@ -1004,15 +1040,15 @@ func (rpc *rpcChat) sendMsgToGroup(list []string, pb pbChat.SendMsgReq, status s
 		isSend := modifyMessageByUserMessageReceiveOpt(v, msgData.GroupID, constant.GroupChatType, &groupPB)
 		if isSend {
 			msgToMQGroup.MsgData = groupPB.MsgData
-			//	log.Debug(groupPB.OperationID, "sendMsgToKafka, ", v, groupID, msgToMQGroup.String())
-			err := rpc.sendMsgToKafka(&msgToMQGroup, v, status)
+			//	log.Debug(groupPB.OperationID, "sendMsgToWriter, ", v, groupID, msgToMQGroup.String())
+			err := rpc.sendMsgToWriter(&msgToMQGroup, v, status)
 			if err != nil {
 				log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String())
 			} else {
 				*sendTag = true
 			}
 		} else {
-			log.Debug(groupPB.OperationID, "not sendMsgToKafka, ", v)
+			log.Debug(groupPB.OperationID, "not sendMsgToWriter, ", v)
 		}
 	}
 	wg.Done()
@ -1037,14 +1073,14 @@ func (rpc *rpcChat) sendMsgToGroupOptimization(list []string, groupPB *pbChat.Se
 				log.Error(msgToMQGroup.OperationID, "sendMsgToGroupOptimization userID nil ", msgToMQGroup.String())
 				continue
 			}
-			err := rpc.sendMsgToKafka(&msgToMQGroup, v, status)
+			err := rpc.sendMsgToWriter(&msgToMQGroup, v, status)
 			if err != nil {
 				log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String())
 			} else {
 				*sendTag = true
 			}
 		} else {
-			log.Debug(groupPB.OperationID, "not sendMsgToKafka, ", v)
+			log.Debug(groupPB.OperationID, "not sendMsgToWriter, ", v)
 		}
 	}
 	wg.Done()
--- a/internal/rpc/office/office.go
+++ b/internal/rpc/office/office.go
@ -7,6 +7,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	rocksCache "Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
@ -646,7 +647,13 @@ func (s *officeServer) GetUserWorkMoments(_ context.Context, req *pbOffice.GetUs
 	if req.UserID == req.OpUserID {
 		workMoments, err = db.DB.GetUserSelfWorkMoments(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber)
 	} else {
-		workMoments, err = db.DB.GetUserWorkMoments(req.OpUserID, req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber)
+		friendIDList, err := rocksCache.GetFriendIDListFromCache(req.UserID)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error())
+			resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}
+			return resp, nil
+		}
+		workMoments, err = db.DB.GetUserWorkMoments(req.OpUserID, req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber, friendIDList)
 	}
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserWorkMoments failed", err.Error())
@ -674,7 +681,16 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
 	resp = &pbOffice.GetUserFriendWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}, WorkMoments: []*pbOffice.WorkMoment{}}
 	resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber}
-	workMoments, err := db.DB.GetUserFriendWorkMoments(req.Pagination.ShowNumber, req.Pagination.PageNumber, req.UserID)
+	var friendIDList []string
+	if config.Config.WorkMoment.OnlyFriendCanSee {
+		friendIDList, err = rocksCache.GetFriendIDListFromCache(req.UserID)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error())
+			resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}
+			return resp, nil
+		}
+	}
+	workMoments, err := db.DB.GetUserFriendWorkMoments(req.Pagination.ShowNumber, req.Pagination.PageNumber, req.UserID, friendIDList)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error())
 		resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}
@ -684,7 +700,7 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	for _, v := range resp.WorkMoments {
-		user, err := imdb.GetUserByUserID(v.UserID)
+		user, err := rocksCache.GetUserInfoFromCache(v.UserID)
 		if err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
 		}
--- a/internal/rpc/organization/organization.go
+++ b/internal/rpc/organization/organization.go
@ -552,3 +552,24 @@ func (s *organizationServer) GetDepartmentRelatedGroupIDList(ctx context.Context
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }
+
+func (s *organizationServer) GetUserInOrganization(_ context.Context, req *rpc.GetUserInOrganizationReq) (resp *rpc.GetUserInOrganizationResp, err error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp = &rpc.GetUserInOrganizationResp{}
+	organizationUserList, err := imdb.GetOrganizationUsers(req.UserIDList)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserIDList)
+		resp.ErrCode = constant.ErrDB.ErrCode
+		resp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	for _, v := range organizationUserList {
+		organizationUser := &open_im_sdk.OrganizationUser{}
+		utils.CopyStructFields(organizationUser, v)
+		organizationUser.CreateTime = uint32(v.CreateTime.Unix())
+		organizationUser.Birth = uint32(v.CreateTime.Unix())
+		resp.OrganizationUsers = append(resp.OrganizationUsers, organizationUser)
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	return resp, nil
+}
--- a/pkg/base_info/msg.go
+++ b/pkg/base_info/msg.go
@ -19,11 +19,11 @@ type CleanUpMsgResp struct {
 	CommResp
 }
 type DelSuperGroupMsgReq struct {
-	UserID      string   `json:"userID,omitempty" binding:"required"`
-	GroupID     string   `json:"groupID,omitempty" binding:"required"`
+	UserID      string   `json:"userID" binding:"required"`
+	GroupID     string   `json:"groupID" binding:"required"`
 	SeqList     []uint32 `json:"seqList,omitempty"`
 	IsAllDelete bool     `json:"isAllDelete"`
-	OperationID string   `json:"operationID,omitempty" binding:"required"`
+	OperationID string   `json:"operationID" binding:"required"`
 }

 type DelSuperGroupMsgResp struct {
--- a/pkg/base_info/organization_api_struct.go
+++ b/pkg/base_info/organization_api_struct.go
@ -108,3 +108,14 @@ type DeleteUserInDepartmentReq struct {
 type DeleteUserInDepartmentResp struct {
 	CommResp
 }
+
+type GetUserInOrganizationReq struct {
+	OperationID string   `json:"operationID" binding:"required"`
+	UserIDList  []string `json:"userIDList" binding:"required"`
+}
+
+type GetUserInOrganizationResp struct {
+	CommResp
+	OrganizationUserList []*open_im_sdk.OrganizationUser `json:"-"`
+	Data                 []map[string]interface{}        `json:"data" swaggerignore:"true"`
+}
--- a/pkg/call_back_struct/push.go
+++ b/pkg/call_back_struct/push.go
@ -34,5 +34,6 @@ type CallbackBeforeSuperGroupOnlinePushReq struct {

 type CallbackBeforeSuperGroupOnlinePushResp struct {
 	*CommonCallbackResp
-	UserIDList []string `json:"userIDList"`
+	UserIDList      []string                  `json:"userIDList"`
+	OfflinePushInfo *commonPb.OfflinePushInfo `json:"offlinePushInfo"`
 }
--- a/pkg/cms_api_struct/user.go
+++ b/pkg/cms_api_struct/user.go
@ -64,3 +64,13 @@ type GetBlockUsersResponse struct {
 	ResponsePagination
 	UserNums int32 `json:"userNums"`
 }
+
+type GetUserIDByEmailAndPhoneNumberRequest struct {
+	OperationID string `json:"operationID" binding:"required"`
+	PhoneNumber string `json:"phoneNumber"`
+	Email       string `json:"email"`
+}
+
+type GetUserIDByEmailAndPhoneNumberResponse struct {
+	UserIDList []string `json:"userIDList"`
+}
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@ -518,8 +518,11 @@ type config struct {
 		JoinDepartmentIDList                    []string `yaml:"joinDepartmentIDList"`
 		JoinDepartmentGroups                    bool     `yaml:"joinDepartmentGroups"`
 		OaNotification                          bool     `yaml:"oaNotification"`
-		CreateOrganizationUserAndJoinDepartment bool     `json:"createOrganizationUserAndJoinDepartment"`
+		CreateOrganizationUserAndJoinDepartment bool     `yaml:"createOrganizationUserAndJoinDepartment"`
 	}
+	WorkMoment struct {
+		OnlyFriendCanSee bool `yaml:"onlyFriendCanSee"`
+	} `yaml:"workMoment"`
 	Rtc struct {
 		SignalTimeout string `yaml:"signalTimeout"`
 	} `yaml:"rtc"`
--- a/pkg/common/constant/constant.go
+++ b/pkg/common/constant/constant.go
@ -337,4 +337,4 @@ const StatisticsTimeInterval = 60

 const MaxNotificationNum = 100

-const CurrentVersion = "v2.3.3"
+const CurrentVersion = "v2.3.4-rc0"
--- a/pkg/common/db/batch_insert_chat.go
+++ b/pkg/common/db/batch_insert_chat.go
@ -92,6 +92,8 @@ func (d *DataBases) BatchInsertChat2DB(userID string, msgList []*pbMsg.MsgDataTo
 				log.Error(operationID, "FindOneAndUpdate failed ", err.Error(), filter)
 				return utils.Wrap(err, "")
 			}
+		} else {
+			promePkg.PromeInc(promePkg.MsgInsertMongoSuccessCounter)
 		}
 	}
 	if seqUidNext != "" {
--- a/pkg/common/db/model.go
+++ b/pkg/common/db/model.go
@ -96,24 +96,31 @@ func init() {
 	// mongodb create index
 	if err := createMongoIndex(mongoClient, cSendLog, false, "send_id", "-send_time"); err != nil {
 		fmt.Println("send_id", "-send_time", "index create failed", err.Error())
+		panic(err.Error())
 	}
-	if err := createMongoIndex(mongoClient, cChat, true, "uid"); err != nil {
+	if err := createMongoIndex(mongoClient, cChat, false, "uid"); err != nil {
 		fmt.Println("uid", " index create failed", err.Error())
+		//panic(err.Error())
 	}
 	if err := createMongoIndex(mongoClient, cWorkMoment, true, "-create_time", "work_moment_id"); err != nil {
 		fmt.Println("-create_time", "work_moment_id", "index create failed", err.Error())
+		panic(err.Error())
 	}
 	if err := createMongoIndex(mongoClient, cWorkMoment, true, "work_moment_id"); err != nil {
 		fmt.Println("work_moment_id", "index create failed", err.Error())
+		panic(err.Error())
 	}
 	if err := createMongoIndex(mongoClient, cWorkMoment, false, "user_id", "-create_time"); err != nil {
 		fmt.Println("user_id", "-create_time", "index create failed", err.Error())
+		panic(err.Error())
 	}
 	if err := createMongoIndex(mongoClient, cTag, false, "user_id", "-create_time"); err != nil {
 		fmt.Println("user_id", "-create_time", "index create failed", err.Error())
+		panic(err.Error())
 	}
 	if err := createMongoIndex(mongoClient, cTag, true, "tag_id"); err != nil {
 		fmt.Println("tag_id", "index create failed", err.Error())
+		panic(err.Error())
 	}
 	fmt.Println("createMongoIndex success")
 	DB.mongoClient = mongoClient
--- a/pkg/common/db/mongoModel.go
+++ b/pkg/common/db/mongoModel.go
@ -970,7 +970,7 @@ func (d *DataBases) GetUserSelfWorkMoments(userID string, showNumber, pageNumber
 	return workMomentList, err
 }

-func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, pageNumber int32) ([]WorkMoment, error) {
+func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, pageNumber int32, friendIDList []string) ([]WorkMoment, error) {
 	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
 	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment)
 	var workMomentList []WorkMoment
@ -990,23 +990,36 @@ func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, page
 	return workMomentList, err
 }

-func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userID string) ([]WorkMoment, error) {
+func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userID string, friendIDList []string) ([]WorkMoment, error) {
 	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
 	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment)
 	var workMomentList []WorkMoment
 	findOpts := options.Find().SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)).SetSort(bson.M{"create_time": -1})
-	result, err := c.Find(ctx, bson.D{
+	var filter bson.D
+	permissionFilter := bson.D{
 		{"$or", bson.A{
-			bson.D{{"user_id", userID}}, //self
-			bson.D{
-				{"$or", bson.A{
-					bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{userID}}}}},
-					bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{userID}}}}},
-					bson.D{{"permission", constant.WorkMomentPublic}},
-				}}},
-		},
-		},
-	}, findOpts)
+			bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{userID}}}}},
+			bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{userID}}}}},
+			bson.D{{"permission", constant.WorkMomentPublic}},
+		}}}
+	if config.Config.WorkMoment.OnlyFriendCanSee {
+		filter = bson.D{
+			{"$or", bson.A{
+				bson.D{{"user_id", userID}}, //self
+				bson.D{{"$and", bson.A{permissionFilter, bson.D{{"user_id", bson.D{{"$in", friendIDList}}}}}}},
+			},
+			},
+		}
+	} else {
+		filter = bson.D{
+			{"$or", bson.A{
+				bson.D{{"user_id", userID}}, //self
+				permissionFilter,
+			},
+			},
+		}
+	}
+	result, err := c.Find(ctx, filter, findOpts)
 	if err != nil {
 		return workMomentList, err
 	}
--- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go
@ -62,6 +62,12 @@ func GetOrganizationUser(userID string) (error, *db.OrganizationUser) {
 	return err, &organizationUser
 }

+func GetOrganizationUsers(userIDList []string) ([]*db.OrganizationUser, error) {
+	var organizationUserList []*db.OrganizationUser
+	err := db.DB.MysqlDB.DefaultGormDB().Table("organization_users").Where("user_id in (?)", userIDList).Find(&organizationUserList).Error
+	return organizationUserList, err
+}
+
 func UpdateOrganizationUser(organizationUser *db.OrganizationUser, args map[string]interface{}) error {
 	if err := db.DB.MysqlDB.DefaultGormDB().Table("organization_users").Where("user_id=?", organizationUser.UserID).Updates(organizationUser).Error; err != nil {
 		return err
--- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
@ -257,6 +257,22 @@ func GetUsersByNameAndID(content string, showNumber, pageNumber int32) ([]db.Use
 	return users, count, err
 }

+func GetUserIDsByEmailAndID(phoneNumber, email string) ([]string, error) {
+	db := db.DB.MysqlDB.DefaultGormDB().Table("users")
+	if phoneNumber == "" && email == "" {
+		return nil, nil
+	}
+	if phoneNumber != "" {
+		db = db.Where("phone_number = ? ", phoneNumber)
+	}
+	if email != "" {
+		db = db.Where("email = ? ", email)
+	}
+	var userIDList []string
+	err := db.Pluck("user_id", &userIDList).Error
+	return userIDList, err
+}
+
 func GetUsersCount(userName string) (int32, error) {
 	var count int64
 	if err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where(" name like ? ", fmt.Sprintf("%%%s%%", userName)).Count(&count).Error; err != nil {
--- a/pkg/common/db/rocks_cache/rocks_cache.go
+++ b/pkg/common/db/rocks_cache/rocks_cache.go
@ -475,6 +475,9 @@ func GetGroupMemberNumFromCache(groupID string) (int64, error) {
 		return strconv.Itoa(int(num)), nil
 	}
 	groupMember, err := db.DB.Rc.Fetch(groupMemberNumCache+groupID, time.Second*30*60, getGroupMemberNum)
+	if err != nil {
+		return 0, utils.Wrap(err, "")
+	}
 	num, err := strconv.Atoi(groupMember)
 	return int64(num), err
 }
--- a/pkg/common/token_verify/jwt_token.go
+++ b/pkg/common/token_verify/jwt_token.go
@ -179,19 +179,6 @@ func ParseTokenGetUserID(token string, operationID string) (error, string) {
 func ParseToken(tokensString, operationID string) (claims *Claims, err error) {
 	claims, err = GetClaimFromToken(tokensString)
 	if err != nil {
-		//if errors.Is(err, constant.ErrTokenUnknown) {
-		//	errMsg := "GetClaimFromToken failed ErrTokenUnknown   " + err.Error()
-		//	log.Error(operationID, errMsg)
-		//}
-		//info := err.(constant.ErrInfo)
-		//log.Error(operationID, "detail info , ", info.ErrCode, info.ErrMsg)
-		//
-		//e := errors.Unwrap(err)
-		//if errors.Is(e, constant.ErrTokenUnknown) {
-		//	errMsg := "ParseToken failed ErrTokenUnknown " + e.Error()
-		//	log.Error(operationID, errMsg)
-		//}
-
 		return nil, utils.Wrap(err, "")
 	}

--- a/pkg/proto/admin_cms/admin_cms.pb.go
+++ b/pkg/proto/admin_cms/admin_cms.pb.go
--- a/pkg/proto/admin_cms/admin_cms.proto
+++ b/pkg/proto/admin_cms/admin_cms.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-option go_package = "./admin_cms;admin_cms";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/admin_cms;admin_cms";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
 package admin_cms;


@ -313,6 +313,19 @@ message GetUserFriendsResp {
    CommonResp commonResp = 4;
 }

+message GetUserIDByEmailAndPhoneNumberReq{
+  string operationID = 1;
+  string email = 2;
+  string phoneNumber = 3;
+}
+
+message GetUserIDByEmailAndPhoneNumberResp{
+  repeated string userIDList = 1;
+  CommonResp  commonResp = 2;
+}
+
+
+
 service adminCMS {
    rpc AdminLogin(AdminLoginReq) returns(AdminLoginResp);
    rpc AddUserRegisterAddFriendIDList(AddUserRegisterAddFriendIDListReq) returns(AddUserRegisterAddFriendIDListResp);
@ -342,4 +355,6 @@ service adminCMS {
    rpc SetClientInitConfig(SetClientInitConfigReq) returns(SetClientInitConfigResp);

    rpc GetUserFriends(GetUserFriendsReq) returns(GetUserFriendsResp);
+
+    rpc GetUserIDByEmailAndPhoneNumber(GetUserIDByEmailAndPhoneNumberReq) returns(GetUserIDByEmailAndPhoneNumberResp);
 }
--- a/pkg/proto/auth/auth.pb.go
+++ b/pkg/proto/auth/auth.pb.go
@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.27.1
 // 	protoc        v3.15.5
 // source: auth/auth.proto

@ -442,74 +442,220 @@ func (x *ForceLogoutResp) GetCommonResp() *CommonResp {
 	return nil
 }

+type ParseTokenReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Token       string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
+	OperationID string `protobuf:"bytes,2,opt,name=operationID,proto3" json:"operationID,omitempty"`
+}
+
+func (x *ParseTokenReq) Reset() {
+	*x = ParseTokenReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_auth_auth_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ParseTokenReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParseTokenReq) ProtoMessage() {}
+
+func (x *ParseTokenReq) ProtoReflect() protoreflect.Message {
+	mi := &file_auth_auth_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ParseTokenReq.ProtoReflect.Descriptor instead.
+func (*ParseTokenReq) Descriptor() ([]byte, []int) {
+	return file_auth_auth_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *ParseTokenReq) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+func (x *ParseTokenReq) GetOperationID() string {
+	if x != nil {
+		return x.OperationID
+	}
+	return ""
+}
+
+type ParseTokenResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserID            string      `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID,omitempty"`
+	Platform          string      `protobuf:"bytes,2,opt,name=platform,proto3" json:"platform,omitempty"`
+	CommonResp        *CommonResp `protobuf:"bytes,3,opt,name=commonResp,proto3" json:"commonResp,omitempty"`
+	ExpireTimeSeconds uint32      `protobuf:"varint,4,opt,name=expireTimeSeconds,proto3" json:"expireTimeSeconds,omitempty"`
+}
+
+func (x *ParseTokenResp) Reset() {
+	*x = ParseTokenResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_auth_auth_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ParseTokenResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParseTokenResp) ProtoMessage() {}
+
+func (x *ParseTokenResp) ProtoReflect() protoreflect.Message {
+	mi := &file_auth_auth_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ParseTokenResp.ProtoReflect.Descriptor instead.
+func (*ParseTokenResp) Descriptor() ([]byte, []int) {
+	return file_auth_auth_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *ParseTokenResp) GetUserID() string {
+	if x != nil {
+		return x.UserID
+	}
+	return ""
+}
+
+func (x *ParseTokenResp) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *ParseTokenResp) GetCommonResp() *CommonResp {
+	if x != nil {
+		return x.CommonResp
+	}
+	return nil
+}
+
+func (x *ParseTokenResp) GetExpireTimeSeconds() uint32 {
+	if x != nil {
+		return x.ExpireTimeSeconds
+	}
+	return 0
+}
+
 var File_auth_auth_proto protoreflect.FileDescriptor

 var file_auth_auth_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x06, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x1a, 0x21, 0x4f, 0x70, 0x65, 0x6e, 0x5f,
-	0x49, 0x4d, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x64, 0x6b,
-	0x5f, 0x77, 0x73, 0x2f, 0x77, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3e, 0x0a, 0x0a,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72,
-	0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72,
-	0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x6c, 0x0a, 0x0f,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12,
-	0x37, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70,
-	0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08,
-	0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x46, 0x0a, 0x10, 0x55, 0x73,
-	0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32,
-	0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x22, 0xa2, 0x01, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12,
-	0x1e, 0x0a, 0x0a, 0x46, 0x72, 0x6f, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x46, 0x72, 0x6f, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12,
-	0x1a, 0x0a, 0x08, 0x4f, 0x70, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x4f, 0x70, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x4f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x18, 0x0a,
-	0x07, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x49, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x49, 0x70, 0x22, 0x7b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70,
-	0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x54, 0x69, 0x6d,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64,
-	0x54, 0x69, 0x6d, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x0e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f,
-	0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
-	0x6f, 0x72, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x46, 0x72, 0x6f, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49,
-	0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x46, 0x72, 0x6f, 0x6d, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x4f, 0x70, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4f, 0x70, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12,
-	0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x04,
+	0x6f, 0x12, 0x06, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x1a, 0x28, 0x4f, 0x70, 0x65, 0x6e, 0x2d,
+	0x49, 0x4d, 0x2d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x64, 0x6b, 0x5f, 0x77, 0x73, 0x2f, 0x77, 0x73, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x3e, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65,
+	0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72,
+	0x4d, 0x73, 0x67, 0x22, 0x6c, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73,
+	0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x37, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x44, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74,
-	0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x32, 0xc3, 0x01, 0x0a, 0x04, 0x41, 0x75, 0x74,
-	0x68, 0x12, 0x41, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
-	0x72, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52,
-	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x41,
+	0x44, 0x22, 0x46, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x41, 0x75,
+	0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0xa2, 0x01, 0x0a, 0x0c, 0x55, 0x73,
+	0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c,
+	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x50, 0x6c,
+	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x46, 0x72, 0x6f, 0x6d, 0x55, 0x73,
+	0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x46, 0x72, 0x6f, 0x6d,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x4f, 0x70, 0x55, 0x73, 0x65, 0x72,
+	0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4f, 0x70, 0x55, 0x73, 0x65, 0x72,
+	0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
+	0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x49, 0x70, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x49, 0x70, 0x22, 0x7b,
+	0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x32, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x45, 0x78, 0x70,
+	0x69, 0x72, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
+	0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x0e,
+	0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a,
+	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x46, 0x72,
+	0x6f, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x46, 0x72, 0x6f, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x4f, 0x70,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4f, 0x70,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x6f, 0x72, 0x63,
+	0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0a, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x12, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22,
+	0x47, 0x0a, 0x0d, 0x50, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71,
+	0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0xa6, 0x01, 0x0a, 0x0e, 0x50, 0x61, 0x72,
+	0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75,
+	0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12,
+	0x32, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x43, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x2c, 0x0a, 0x11, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
+	0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11,
+	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64,
+	0x73, 0x32, 0x80, 0x02, 0x0a, 0x04, 0x41, 0x75, 0x74, 0x68, 0x12, 0x41, 0x0a, 0x0c, 0x55, 0x73,
+	0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x41,
 	0x75, 0x74, 0x68, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a, 0x09, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e,
-	0x0a, 0x0b, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12, 0x16, 0x2e,
-	0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f,
-	0x75, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x46,
-	0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0f,
-	0x5a, 0x0d, 0x2e, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x3b, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x38, 0x0a,
+	0x09, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x41,
+	0x75, 0x74, 0x68, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71,
+	0x1a, 0x15, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e, 0x0a, 0x0b, 0x46, 0x6f, 0x72, 0x63, 0x65,
+	0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12, 0x16, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e,
+	0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x17,
+	0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x67,
+	0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3b, 0x0a, 0x0a, 0x50, 0x61, 0x72, 0x73, 0x65,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x15, 0x2e, 0x70, 0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x50,
+	0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x70,
+	0x62, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x50, 0x61, 0x72, 0x73, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x42, 0x1f, 0x5a, 0x1d, 0x4f, 0x70, 0x65, 0x6e, 0x5f, 0x49, 0x4d, 0x2f,
+	0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x3b, 0x70,
+	0x62, 0x41, 0x75, 0x74, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@ -524,7 +670,7 @@ func file_auth_auth_proto_rawDescGZIP() []byte {
 	return file_auth_auth_proto_rawDescData
 }

-var file_auth_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_auth_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_auth_auth_proto_goTypes = []interface{}{
 	(*CommonResp)(nil),       // 0: pbAuth.CommonResp
 	(*UserRegisterReq)(nil),  // 1: pbAuth.UserRegisterReq
@ -533,24 +679,29 @@ var file_auth_auth_proto_goTypes = []interface{}{
 	(*UserTokenResp)(nil),    // 4: pbAuth.UserTokenResp
 	(*ForceLogoutReq)(nil),   // 5: pbAuth.ForceLogoutReq
 	(*ForceLogoutResp)(nil),  // 6: pbAuth.ForceLogoutResp
-	(*sdk_ws.UserInfo)(nil),  // 7: server_api_params.UserInfo
+	(*ParseTokenReq)(nil),    // 7: pbAuth.ParseTokenReq
+	(*ParseTokenResp)(nil),   // 8: pbAuth.ParseTokenResp
+	(*sdk_ws.UserInfo)(nil),  // 9: server_api_params.UserInfo
 }
 var file_auth_auth_proto_depIdxs = []int32{
-	7, // 0: pbAuth.UserRegisterReq.UserInfo:type_name -> server_api_params.UserInfo
+	9, // 0: pbAuth.UserRegisterReq.UserInfo:type_name -> server_api_params.UserInfo
 	0, // 1: pbAuth.UserRegisterResp.CommonResp:type_name -> pbAuth.CommonResp
 	0, // 2: pbAuth.UserTokenResp.CommonResp:type_name -> pbAuth.CommonResp
 	0, // 3: pbAuth.ForceLogoutResp.CommonResp:type_name -> pbAuth.CommonResp
-	1, // 4: pbAuth.Auth.UserRegister:input_type -> pbAuth.UserRegisterReq
-	3, // 5: pbAuth.Auth.UserToken:input_type -> pbAuth.UserTokenReq
-	5, // 6: pbAuth.Auth.ForceLogout:input_type -> pbAuth.ForceLogoutReq
-	2, // 7: pbAuth.Auth.UserRegister:output_type -> pbAuth.UserRegisterResp
-	4, // 8: pbAuth.Auth.UserToken:output_type -> pbAuth.UserTokenResp
-	6, // 9: pbAuth.Auth.ForceLogout:output_type -> pbAuth.ForceLogoutResp
-	7, // [7:10] is the sub-list for method output_type
-	4, // [4:7] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
+	0, // 4: pbAuth.ParseTokenResp.commonResp:type_name -> pbAuth.CommonResp
+	1, // 5: pbAuth.Auth.UserRegister:input_type -> pbAuth.UserRegisterReq
+	3, // 6: pbAuth.Auth.UserToken:input_type -> pbAuth.UserTokenReq
+	5, // 7: pbAuth.Auth.ForceLogout:input_type -> pbAuth.ForceLogoutReq
+	7, // 8: pbAuth.Auth.ParseToken:input_type -> pbAuth.ParseTokenReq
+	2, // 9: pbAuth.Auth.UserRegister:output_type -> pbAuth.UserRegisterResp
+	4, // 10: pbAuth.Auth.UserToken:output_type -> pbAuth.UserTokenResp
+	6, // 11: pbAuth.Auth.ForceLogout:output_type -> pbAuth.ForceLogoutResp
+	8, // 12: pbAuth.Auth.ParseToken:output_type -> pbAuth.ParseTokenResp
+	9, // [9:13] is the sub-list for method output_type
+	5, // [5:9] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }

 func init() { file_auth_auth_proto_init() }
@ -643,6 +794,30 @@ func file_auth_auth_proto_init() {
 				return nil
 			}
 		}
+		file_auth_auth_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ParseTokenReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_auth_auth_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ParseTokenResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@ -650,7 +825,7 @@ func file_auth_auth_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_auth_auth_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@ -679,6 +854,7 @@ type AuthClient interface {
 	UserRegister(ctx context.Context, in *UserRegisterReq, opts ...grpc.CallOption) (*UserRegisterResp, error)
 	UserToken(ctx context.Context, in *UserTokenReq, opts ...grpc.CallOption) (*UserTokenResp, error)
 	ForceLogout(ctx context.Context, in *ForceLogoutReq, opts ...grpc.CallOption) (*ForceLogoutResp, error)
+	ParseToken(ctx context.Context, in *ParseTokenReq, opts ...grpc.CallOption) (*ParseTokenResp, error)
 }

 type authClient struct {
@ -716,11 +892,21 @@ func (c *authClient) ForceLogout(ctx context.Context, in *ForceLogoutReq, opts .
 	return out, nil
 }

+func (c *authClient) ParseToken(ctx context.Context, in *ParseTokenReq, opts ...grpc.CallOption) (*ParseTokenResp, error) {
+	out := new(ParseTokenResp)
+	err := c.cc.Invoke(ctx, "/pbAuth.Auth/ParseToken", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // AuthServer is the server API for Auth service.
 type AuthServer interface {
 	UserRegister(context.Context, *UserRegisterReq) (*UserRegisterResp, error)
 	UserToken(context.Context, *UserTokenReq) (*UserTokenResp, error)
 	ForceLogout(context.Context, *ForceLogoutReq) (*ForceLogoutResp, error)
+	ParseToken(context.Context, *ParseTokenReq) (*ParseTokenResp, error)
 }

 // UnimplementedAuthServer can be embedded to have forward compatible implementations.
@ -736,6 +922,9 @@ func (*UnimplementedAuthServer) UserToken(context.Context, *UserTokenReq) (*User
 func (*UnimplementedAuthServer) ForceLogout(context.Context, *ForceLogoutReq) (*ForceLogoutResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ForceLogout not implemented")
 }
+func (*UnimplementedAuthServer) ParseToken(context.Context, *ParseTokenReq) (*ParseTokenResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ParseToken not implemented")
+}

 func RegisterAuthServer(s *grpc.Server, srv AuthServer) {
 	s.RegisterService(&_Auth_serviceDesc, srv)
@ -795,6 +984,24 @@ func _Auth_ForceLogout_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }

+func _Auth_ParseToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ParseTokenReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AuthServer).ParseToken(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/pbAuth.Auth/ParseToken",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AuthServer).ParseToken(ctx, req.(*ParseTokenReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Auth_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "pbAuth.Auth",
 	HandlerType: (*AuthServer)(nil),
@ -811,6 +1018,10 @@ var _Auth_serviceDesc = grpc.ServiceDesc{
 			MethodName: "ForceLogout",
 			Handler:    _Auth_ForceLogout_Handler,
 		},
+		{
+			MethodName: "ParseToken",
+			Handler:    _Auth_ParseToken_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "auth/auth.proto",
--- a/pkg/proto/auth/auth.proto
+++ b/pkg/proto/auth/auth.proto
@ -1,7 +1,7 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
 package pbAuth;
-option go_package = "./auth;pbAuth";
+option go_package = "Open_IM/pkg/proto/auth;pbAuth";

 message CommonResp{
    int32   errCode = 1;
@ -42,6 +42,18 @@ message ForceLogoutResp {
    CommonResp CommonResp = 1;
 }

+message ParseTokenReq{
+    string token = 1;
+    string operationID = 2;
+}
+
+
+message ParseTokenResp{
+    string userID = 1;
+    string platform = 2;
+    CommonResp commonResp = 3;
+    uint32 expireTimeSeconds = 4;
+}



@ -50,4 +62,7 @@ service Auth {
    rpc UserRegister(UserRegisterReq) returns(UserRegisterResp);
    rpc UserToken(UserTokenReq) returns(UserTokenResp);
    rpc ForceLogout(ForceLogoutReq) returns(ForceLogoutResp);
+    rpc ParseToken(ParseTokenReq)returns(ParseTokenResp);
 }
+
+
--- a/pkg/proto/auto_proto.sh
+++ b/pkg/proto/auto_proto.sh
@ -4,14 +4,26 @@ source ./proto_dir.cfg

 for ((i = 0; i < ${#all_proto[*]}; i++)); do
  proto=${all_proto[$i]}
-
  protoc -I ../../../  -I ./ --go_out=plugins=grpc:. $proto
-  s=`echo $proto | sed 's/ //g'`
-  v=${s//proto/pb.go}
-  protoc-go-inject-tag -input=./$v
  echo "protoc --go_out=plugins=grpc:." $proto
 done
-echo "proto file generate success..."
+echo "proto file generate success"
+
+
+j=0
+for file in $(find ./Open_IM -name   "*.go"); do # Not recommended, will break on whitespace
+    filelist[j]=$file
+    j=`expr $j + 1`
+done
+
+
+for ((i = 0; i < ${#filelist[*]}; i++)); do
+  proto=${filelist[$i]}
+  cp $proto  ${proto#*./Open_IM/pkg/proto/}
+done
+rm Open_IM -rf
+#find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdk_ws\"/\"Open_IM\/pkg\/proto\/sdk_ws\"/g'
+
+

-find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdk_ws\"/\"Open_IM\/pkg\/proto\/sdk_ws\"/g'

--- a/pkg/proto/cache/cache.pb.go
+++ b/pkg/proto/cache/cache.pb.go
--- a/pkg/proto/cache/cache.proto
+++ b/pkg/proto/cache/cache.proto
@ -1,6 +1,5 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./cache;cache";
+option go_package = "Open_IM/pkg/proto/cache;cache";
 package cache;

 message CommonResp{
--- a/pkg/proto/conversation/conversation.pb.go
+++ b/pkg/proto/conversation/conversation.pb.go
@ -1,368 +1,587 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.15.5
 // source: conversation/conversation.proto

-package conversation // import "Open_IM/pkg/proto/conversation"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+package conversation

 import (
-	context "golang.org/x/net/context"
+	context "context"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )

-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)

 type CommonResp struct {
-	ErrCode              int32    `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"`
-	ErrMsg               string   `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ErrCode int32  `protobuf:"varint,1,opt,name=errCode,proto3" json:"errCode,omitempty"`
+	ErrMsg  string `protobuf:"bytes,2,opt,name=errMsg,proto3" json:"errMsg,omitempty"`
 }

-func (m *CommonResp) Reset()         { *m = CommonResp{} }
-func (m *CommonResp) String() string { return proto.CompactTextString(m) }
-func (*CommonResp) ProtoMessage()    {}
+func (x *CommonResp) Reset() {
+	*x = CommonResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conversation_conversation_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CommonResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CommonResp) ProtoMessage() {}
+
+func (x *CommonResp) ProtoReflect() protoreflect.Message {
+	mi := &file_conversation_conversation_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CommonResp.ProtoReflect.Descriptor instead.
 func (*CommonResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_ac55165355a1b6e6, []int{0}
-}
-func (m *CommonResp) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CommonResp.Unmarshal(m, b)
-}
-func (m *CommonResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CommonResp.Marshal(b, m, deterministic)
-}
-func (dst *CommonResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CommonResp.Merge(dst, src)
-}
-func (m *CommonResp) XXX_Size() int {
-	return xxx_messageInfo_CommonResp.Size(m)
-}
-func (m *CommonResp) XXX_DiscardUnknown() {
-	xxx_messageInfo_CommonResp.DiscardUnknown(m)
+	return file_conversation_conversation_proto_rawDescGZIP(), []int{0}
 }

-var xxx_messageInfo_CommonResp proto.InternalMessageInfo
-
-func (m *CommonResp) GetErrCode() int32 {
-	if m != nil {
-		return m.ErrCode
+func (x *CommonResp) GetErrCode() int32 {
+	if x != nil {
+		return x.ErrCode
 	}
 	return 0
 }

-func (m *CommonResp) GetErrMsg() string {
-	if m != nil {
-		return m.ErrMsg
+func (x *CommonResp) GetErrMsg() string {
+	if x != nil {
+		return x.ErrMsg
 	}
 	return ""
 }

 type Conversation struct {
-	OwnerUserID           string   `protobuf:"bytes,1,opt,name=ownerUserID" json:"ownerUserID,omitempty"`
-	ConversationID        string   `protobuf:"bytes,2,opt,name=conversationID" json:"conversationID,omitempty"`
-	RecvMsgOpt            int32    `protobuf:"varint,3,opt,name=recvMsgOpt" json:"recvMsgOpt,omitempty"`
-	ConversationType      int32    `protobuf:"varint,4,opt,name=conversationType" json:"conversationType,omitempty"`
-	UserID                string   `protobuf:"bytes,5,opt,name=userID" json:"userID,omitempty"`
-	GroupID               string   `protobuf:"bytes,6,opt,name=groupID" json:"groupID,omitempty"`
-	UnreadCount           int32    `protobuf:"varint,7,opt,name=unreadCount" json:"unreadCount,omitempty"`
-	DraftTextTime         int64    `protobuf:"varint,8,opt,name=draftTextTime" json:"draftTextTime,omitempty"`
-	IsPinned              bool     `protobuf:"varint,9,opt,name=isPinned" json:"isPinned,omitempty"`
-	AttachedInfo          string   `protobuf:"bytes,10,opt,name=attachedInfo" json:"attachedInfo,omitempty"`
-	IsPrivateChat         bool     `protobuf:"varint,11,opt,name=isPrivateChat" json:"isPrivateChat,omitempty"`
-	GroupAtType           int32    `protobuf:"varint,12,opt,name=groupAtType" json:"groupAtType,omitempty"`
-	IsNotInGroup          bool     `protobuf:"varint,13,opt,name=isNotInGroup" json:"isNotInGroup,omitempty"`
-	Ex                    string   `protobuf:"bytes,14,opt,name=ex" json:"ex,omitempty"`
-	UpdateUnreadCountTime int64    `protobuf:"varint,15,opt,name=updateUnreadCountTime" json:"updateUnreadCountTime,omitempty"`
-	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
-	XXX_unrecognized      []byte   `json:"-"`
-	XXX_sizecache         int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OwnerUserID           string `protobuf:"bytes,1,opt,name=ownerUserID,proto3" json:"ownerUserID,omitempty"`
+	ConversationID        string `protobuf:"bytes,2,opt,name=conversationID,proto3" json:"conversationID,omitempty"`
+	RecvMsgOpt            int32  `protobuf:"varint,3,opt,name=recvMsgOpt,proto3" json:"recvMsgOpt,omitempty"`
+	ConversationType      int32  `protobuf:"varint,4,opt,name=conversationType,proto3" json:"conversationType,omitempty"`
+	UserID                string `protobuf:"bytes,5,opt,name=userID,proto3" json:"userID,omitempty"`
+	GroupID               string `protobuf:"bytes,6,opt,name=groupID,proto3" json:"groupID,omitempty"`
+	UnreadCount           int32  `protobuf:"varint,7,opt,name=unreadCount,proto3" json:"unreadCount,omitempty"`
+	DraftTextTime         int64  `protobuf:"varint,8,opt,name=draftTextTime,proto3" json:"draftTextTime,omitempty"`
+	IsPinned              bool   `protobuf:"varint,9,opt,name=isPinned,proto3" json:"isPinned,omitempty"`
+	AttachedInfo          string `protobuf:"bytes,10,opt,name=attachedInfo,proto3" json:"attachedInfo,omitempty"`
+	IsPrivateChat         bool   `protobuf:"varint,11,opt,name=isPrivateChat,proto3" json:"isPrivateChat,omitempty"`
+	GroupAtType           int32  `protobuf:"varint,12,opt,name=groupAtType,proto3" json:"groupAtType,omitempty"`
+	IsNotInGroup          bool   `protobuf:"varint,13,opt,name=isNotInGroup,proto3" json:"isNotInGroup,omitempty"`
+	Ex                    string `protobuf:"bytes,14,opt,name=ex,proto3" json:"ex,omitempty"`
+	UpdateUnreadCountTime int64  `protobuf:"varint,15,opt,name=updateUnreadCountTime,proto3" json:"updateUnreadCountTime,omitempty"`
 }

-func (m *Conversation) Reset()         { *m = Conversation{} }
-func (m *Conversation) String() string { return proto.CompactTextString(m) }
-func (*Conversation) ProtoMessage()    {}
+func (x *Conversation) Reset() {
+	*x = Conversation{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conversation_conversation_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Conversation) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Conversation) ProtoMessage() {}
+
+func (x *Conversation) ProtoReflect() protoreflect.Message {
+	mi := &file_conversation_conversation_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Conversation.ProtoReflect.Descriptor instead.
 func (*Conversation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_ac55165355a1b6e6, []int{1}
-}
-func (m *Conversation) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Conversation.Unmarshal(m, b)
-}
-func (m *Conversation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Conversation.Marshal(b, m, deterministic)
-}
-func (dst *Conversation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Conversation.Merge(dst, src)
-}
-func (m *Conversation) XXX_Size() int {
-	return xxx_messageInfo_Conversation.Size(m)
-}
-func (m *Conversation) XXX_DiscardUnknown() {
-	xxx_messageInfo_Conversation.DiscardUnknown(m)
+	return file_conversation_conversation_proto_rawDescGZIP(), []int{1}
 }

-var xxx_messageInfo_Conversation proto.InternalMessageInfo
-
-func (m *Conversation) GetOwnerUserID() string {
-	if m != nil {
-		return m.OwnerUserID
+func (x *Conversation) GetOwnerUserID() string {
+	if x != nil {
+		return x.OwnerUserID
 	}
 	return ""
 }

-func (m *Conversation) GetConversationID() string {
-	if m != nil {
-		return m.ConversationID
+func (x *Conversation) GetConversationID() string {
+	if x != nil {
+		return x.ConversationID
 	}
 	return ""
 }

-func (m *Conversation) GetRecvMsgOpt() int32 {
-	if m != nil {
-		return m.RecvMsgOpt
+func (x *Conversation) GetRecvMsgOpt() int32 {
+	if x != nil {
+		return x.RecvMsgOpt
 	}
 	return 0
 }

-func (m *Conversation) GetConversationType() int32 {
-	if m != nil {
-		return m.ConversationType
+func (x *Conversation) GetConversationType() int32 {
+	if x != nil {
+		return x.ConversationType
 	}
 	return 0
 }

-func (m *Conversation) GetUserID() string {
-	if m != nil {
-		return m.UserID
+func (x *Conversation) GetUserID() string {
+	if x != nil {
+		return x.UserID
 	}
 	return ""
 }

-func (m *Conversation) GetGroupID() string {
-	if m != nil {
-		return m.GroupID
+func (x *Conversation) GetGroupID() string {
+	if x != nil {
+		return x.GroupID
 	}
 	return ""
 }

-func (m *Conversation) GetUnreadCount() int32 {
-	if m != nil {
-		return m.UnreadCount
+func (x *Conversation) GetUnreadCount() int32 {
+	if x != nil {
+		return x.UnreadCount
 	}
 	return 0
 }

-func (m *Conversation) GetDraftTextTime() int64 {
-	if m != nil {
-		return m.DraftTextTime
+func (x *Conversation) GetDraftTextTime() int64 {
+	if x != nil {
+		return x.DraftTextTime
 	}
 	return 0
 }

-func (m *Conversation) GetIsPinned() bool {
-	if m != nil {
-		return m.IsPinned
+func (x *Conversation) GetIsPinned() bool {
+	if x != nil {
+		return x.IsPinned
 	}
 	return false
 }

-func (m *Conversation) GetAttachedInfo() string {
-	if m != nil {
-		return m.AttachedInfo
+func (x *Conversation) GetAttachedInfo() string {
+	if x != nil {
+		return x.AttachedInfo
 	}
 	return ""
 }

-func (m *Conversation) GetIsPrivateChat() bool {
-	if m != nil {
-		return m.IsPrivateChat
+func (x *Conversation) GetIsPrivateChat() bool {
+	if x != nil {
+		return x.IsPrivateChat
 	}
 	return false
 }

-func (m *Conversation) GetGroupAtType() int32 {
-	if m != nil {
-		return m.GroupAtType
+func (x *Conversation) GetGroupAtType() int32 {
+	if x != nil {
+		return x.GroupAtType
 	}
 	return 0
 }

-func (m *Conversation) GetIsNotInGroup() bool {
-	if m != nil {
-		return m.IsNotInGroup
+func (x *Conversation) GetIsNotInGroup() bool {
+	if x != nil {
+		return x.IsNotInGroup
 	}
 	return false
 }

-func (m *Conversation) GetEx() string {
-	if m != nil {
-		return m.Ex
+func (x *Conversation) GetEx() string {
+	if x != nil {
+		return x.Ex
 	}
 	return ""
 }

-func (m *Conversation) GetUpdateUnreadCountTime() int64 {
-	if m != nil {
-		return m.UpdateUnreadCountTime
+func (x *Conversation) GetUpdateUnreadCountTime() int64 {
+	if x != nil {
+		return x.UpdateUnreadCountTime
 	}
 	return 0
 }

 type ModifyConversationFieldReq struct {
-	Conversation         *Conversation `protobuf:"bytes,1,opt,name=conversation" json:"conversation,omitempty"`
-	FieldType            int32         `protobuf:"varint,2,opt,name=fieldType" json:"fieldType,omitempty"`
-	UserIDList           []string      `protobuf:"bytes,3,rep,name=userIDList" json:"userIDList,omitempty"`
-	OperationID          string        `protobuf:"bytes,4,opt,name=operationID" json:"operationID,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32         `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Conversation *Conversation `protobuf:"bytes,1,opt,name=conversation,proto3" json:"conversation,omitempty"`
+	FieldType    int32         `protobuf:"varint,2,opt,name=fieldType,proto3" json:"fieldType,omitempty"`
+	UserIDList   []string      `protobuf:"bytes,3,rep,name=userIDList,proto3" json:"userIDList,omitempty"`
+	OperationID  string        `protobuf:"bytes,4,opt,name=operationID,proto3" json:"operationID,omitempty"`
 }

-func (m *ModifyConversationFieldReq) Reset()         { *m = ModifyConversationFieldReq{} }
-func (m *ModifyConversationFieldReq) String() string { return proto.CompactTextString(m) }
-func (*ModifyConversationFieldReq) ProtoMessage()    {}
+func (x *ModifyConversationFieldReq) Reset() {
+	*x = ModifyConversationFieldReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conversation_conversation_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ModifyConversationFieldReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ModifyConversationFieldReq) ProtoMessage() {}
+
+func (x *ModifyConversationFieldReq) ProtoReflect() protoreflect.Message {
+	mi := &file_conversation_conversation_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ModifyConversationFieldReq.ProtoReflect.Descriptor instead.
 func (*ModifyConversationFieldReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_ac55165355a1b6e6, []int{2}
-}
-func (m *ModifyConversationFieldReq) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ModifyConversationFieldReq.Unmarshal(m, b)
-}
-func (m *ModifyConversationFieldReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ModifyConversationFieldReq.Marshal(b, m, deterministic)
-}
-func (dst *ModifyConversationFieldReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyConversationFieldReq.Merge(dst, src)
-}
-func (m *ModifyConversationFieldReq) XXX_Size() int {
-	return xxx_messageInfo_ModifyConversationFieldReq.Size(m)
-}
-func (m *ModifyConversationFieldReq) XXX_DiscardUnknown() {
-	xxx_messageInfo_ModifyConversationFieldReq.DiscardUnknown(m)
+	return file_conversation_conversation_proto_rawDescGZIP(), []int{2}
 }

-var xxx_messageInfo_ModifyConversationFieldReq proto.InternalMessageInfo
-
-func (m *ModifyConversationFieldReq) GetConversation() *Conversation {
-	if m != nil {
-		return m.Conversation
+func (x *ModifyConversationFieldReq) GetConversation() *Conversation {
+	if x != nil {
+		return x.Conversation
 	}
 	return nil
 }

-func (m *ModifyConversationFieldReq) GetFieldType() int32 {
-	if m != nil {
-		return m.FieldType
+func (x *ModifyConversationFieldReq) GetFieldType() int32 {
+	if x != nil {
+		return x.FieldType
 	}
 	return 0
 }

-func (m *ModifyConversationFieldReq) GetUserIDList() []string {
-	if m != nil {
-		return m.UserIDList
+func (x *ModifyConversationFieldReq) GetUserIDList() []string {
+	if x != nil {
+		return x.UserIDList
 	}
 	return nil
 }

-func (m *ModifyConversationFieldReq) GetOperationID() string {
-	if m != nil {
-		return m.OperationID
+func (x *ModifyConversationFieldReq) GetOperationID() string {
+	if x != nil {
+		return x.OperationID
 	}
 	return ""
 }

 type ModifyConversationFieldResp struct {
-	CommonResp           *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
-	XXX_unrecognized     []byte      `json:"-"`
-	XXX_sizecache        int32       `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp,proto3" json:"commonResp,omitempty"`
 }

-func (m *ModifyConversationFieldResp) Reset()         { *m = ModifyConversationFieldResp{} }
-func (m *ModifyConversationFieldResp) String() string { return proto.CompactTextString(m) }
-func (*ModifyConversationFieldResp) ProtoMessage()    {}
+func (x *ModifyConversationFieldResp) Reset() {
+	*x = ModifyConversationFieldResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_conversation_conversation_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ModifyConversationFieldResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ModifyConversationFieldResp) ProtoMessage() {}
+
+func (x *ModifyConversationFieldResp) ProtoReflect() protoreflect.Message {
+	mi := &file_conversation_conversation_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ModifyConversationFieldResp.ProtoReflect.Descriptor instead.
 func (*ModifyConversationFieldResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_ac55165355a1b6e6, []int{3}
-}
-func (m *ModifyConversationFieldResp) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ModifyConversationFieldResp.Unmarshal(m, b)
-}
-func (m *ModifyConversationFieldResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ModifyConversationFieldResp.Marshal(b, m, deterministic)
-}
-func (dst *ModifyConversationFieldResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ModifyConversationFieldResp.Merge(dst, src)
-}
-func (m *ModifyConversationFieldResp) XXX_Size() int {
-	return xxx_messageInfo_ModifyConversationFieldResp.Size(m)
-}
-func (m *ModifyConversationFieldResp) XXX_DiscardUnknown() {
-	xxx_messageInfo_ModifyConversationFieldResp.DiscardUnknown(m)
+	return file_conversation_conversation_proto_rawDescGZIP(), []int{3}
 }

-var xxx_messageInfo_ModifyConversationFieldResp proto.InternalMessageInfo
-
-func (m *ModifyConversationFieldResp) GetCommonResp() *CommonResp {
-	if m != nil {
-		return m.CommonResp
+func (x *ModifyConversationFieldResp) GetCommonResp() *CommonResp {
+	if x != nil {
+		return x.CommonResp
 	}
 	return nil
 }

-func init() {
-	proto.RegisterType((*CommonResp)(nil), "conversation.CommonResp")
-	proto.RegisterType((*Conversation)(nil), "conversation.Conversation")
-	proto.RegisterType((*ModifyConversationFieldReq)(nil), "conversation.ModifyConversationFieldReq")
-	proto.RegisterType((*ModifyConversationFieldResp)(nil), "conversation.ModifyConversationFieldResp")
+var File_conversation_conversation_proto protoreflect.FileDescriptor
+
+var file_conversation_conversation_proto_rawDesc = []byte{
+	0x0a, 0x1f, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x63,
+	0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x0c, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22,
+	0x3e, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a,
+	0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73,
+	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22,
+	0x90, 0x04, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72,
+	0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x76,
+	0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65,
+	0x63, 0x76, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x72, 0x65, 0x63, 0x76, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f,
+	0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x18,
+	0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x44, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x6e, 0x72, 0x65,
+	0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x75,
+	0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x64, 0x72,
+	0x61, 0x66, 0x74, 0x54, 0x65, 0x78, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x0d, 0x64, 0x72, 0x61, 0x66, 0x74, 0x54, 0x65, 0x78, 0x74, 0x54, 0x69, 0x6d, 0x65,
+	0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x69, 0x6e, 0x6e, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c,
+	0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f,
+	0x12, 0x24, 0x0a, 0x0d, 0x69, 0x73, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61,
+	0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x50, 0x72, 0x69, 0x76, 0x61,
+	0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x41,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x41, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x73, 0x4e, 0x6f,
+	0x74, 0x49, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c,
+	0x69, 0x73, 0x4e, 0x6f, 0x74, 0x49, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x0e, 0x0a, 0x02,
+	0x65, 0x78, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x65, 0x78, 0x12, 0x34, 0x0a, 0x15,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x75, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x69,
+	0x6d, 0x65, 0x22, 0xbc, 0x01, 0x0a, 0x1a, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x6e,
+	0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x65,
+	0x71, 0x12, 0x3e, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72,
+	0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x1e, 0x0a, 0x0a, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x0a, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x4c, 0x69, 0x73, 0x74, 0x12,
+	0x20, 0x0a, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
+	0x44, 0x22, 0x57, 0x0a, 0x1b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65,
+	0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x38, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x32, 0x7e, 0x0a, 0x0c, 0x63, 0x6f,
+	0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x6e, 0x0a, 0x17, 0x4d, 0x6f,
+	0x64, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65,
+	0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x1a,
+	0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d,
+	0x6f, 0x64, 0x69, 0x66, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x65, 0x73, 0x70, 0x42, 0x2d, 0x5a, 0x2b, 0x4f, 0x70,
+	0x65, 0x6e, 0x5f, 0x49, 0x4d, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6e,
+	0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
+}
+
+var (
+	file_conversation_conversation_proto_rawDescOnce sync.Once
+	file_conversation_conversation_proto_rawDescData = file_conversation_conversation_proto_rawDesc
+)
+
+func file_conversation_conversation_proto_rawDescGZIP() []byte {
+	file_conversation_conversation_proto_rawDescOnce.Do(func() {
+		file_conversation_conversation_proto_rawDescData = protoimpl.X.CompressGZIP(file_conversation_conversation_proto_rawDescData)
+	})
+	return file_conversation_conversation_proto_rawDescData
+}
+
+var file_conversation_conversation_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_conversation_conversation_proto_goTypes = []interface{}{
+	(*CommonResp)(nil),                  // 0: conversation.CommonResp
+	(*Conversation)(nil),                // 1: conversation.Conversation
+	(*ModifyConversationFieldReq)(nil),  // 2: conversation.ModifyConversationFieldReq
+	(*ModifyConversationFieldResp)(nil), // 3: conversation.ModifyConversationFieldResp
+}
+var file_conversation_conversation_proto_depIdxs = []int32{
+	1, // 0: conversation.ModifyConversationFieldReq.conversation:type_name -> conversation.Conversation
+	0, // 1: conversation.ModifyConversationFieldResp.commonResp:type_name -> conversation.CommonResp
+	2, // 2: conversation.conversation.ModifyConversationField:input_type -> conversation.ModifyConversationFieldReq
+	3, // 3: conversation.conversation.ModifyConversationField:output_type -> conversation.ModifyConversationFieldResp
+	3, // [3:4] is the sub-list for method output_type
+	2, // [2:3] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_conversation_conversation_proto_init() }
+func file_conversation_conversation_proto_init() {
+	if File_conversation_conversation_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_conversation_conversation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CommonResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conversation_conversation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Conversation); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conversation_conversation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ModifyConversationFieldReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conversation_conversation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ModifyConversationFieldResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_conversation_conversation_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_conversation_conversation_proto_goTypes,
+		DependencyIndexes: file_conversation_conversation_proto_depIdxs,
+		MessageInfos:      file_conversation_conversation_proto_msgTypes,
+	}.Build()
+	File_conversation_conversation_proto = out.File
+	file_conversation_conversation_proto_rawDesc = nil
+	file_conversation_conversation_proto_goTypes = nil
+	file_conversation_conversation_proto_depIdxs = nil
 }

 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface

 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for Conversation service
+const _ = grpc.SupportPackageIsVersion6

+// ConversationClient is the client API for Conversation service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ConversationClient interface {
 	ModifyConversationField(ctx context.Context, in *ModifyConversationFieldReq, opts ...grpc.CallOption) (*ModifyConversationFieldResp, error)
 }

 type conversationClient struct {
-	cc *grpc.ClientConn
+	cc grpc.ClientConnInterface
 }

-func NewConversationClient(cc *grpc.ClientConn) ConversationClient {
+func NewConversationClient(cc grpc.ClientConnInterface) ConversationClient {
 	return &conversationClient{cc}
 }

 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 := c.cc.Invoke(ctx, "/conversation.conversation/ModifyConversationField", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-// Server API for Conversation service
-
+// ConversationServer is the server API for Conversation service.
 type ConversationServer interface {
 	ModifyConversationField(context.Context, *ModifyConversationFieldReq) (*ModifyConversationFieldResp, error)
 }

+// UnimplementedConversationServer can be embedded to have forward compatible implementations.
+type UnimplementedConversationServer struct {
+}
+
+func (*UnimplementedConversationServer) ModifyConversationField(context.Context, *ModifyConversationFieldReq) (*ModifyConversationFieldResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ModifyConversationField not implemented")
+}
+
 func RegisterConversationServer(s *grpc.Server, srv ConversationServer) {
 	s.RegisterService(&_Conversation_serviceDesc, srv)
 }
@ -397,42 +616,3 @@ var _Conversation_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "conversation/conversation.proto",
 }
-
-func init() {
-	proto.RegisterFile("conversation/conversation.proto", fileDescriptor_conversation_ac55165355a1b6e6)
-}
-
-var fileDescriptor_conversation_ac55165355a1b6e6 = []byte{
-	// 494 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x5f, 0x8b, 0x13, 0x31,
-	0x14, 0xc5, 0x99, 0x6e, 0xb7, 0xdb, 0xde, 0x76, 0xab, 0x04, 0xd4, 0xd0, 0xf5, 0x4f, 0x19, 0x44,
-	0x46, 0x1f, 0x2a, 0xac, 0x3e, 0x08, 0xc2, 0x82, 0x4e, 0x51, 0x06, 0xac, 0x2e, 0xa1, 0x8b, 0xe0,
-	0xdb, 0xd8, 0xb9, 0xed, 0x06, 0x6c, 0x32, 0x26, 0x99, 0xda, 0x7d, 0xf1, 0x33, 0xf8, 0x81, 0xfc,
-	0x70, 0x92, 0x4c, 0xbb, 0x4d, 0x56, 0x0b, 0x3e, 0xde, 0x5f, 0xee, 0x9c, 0x9c, 0x33, 0x3d, 0x1d,
-	0x78, 0x34, 0x93, 0x62, 0x85, 0x4a, 0xe7, 0x86, 0x4b, 0xf1, 0xdc, 0x1f, 0x46, 0xa5, 0x92, 0x46,
-	0x92, 0x9e, 0xcf, 0xe2, 0x33, 0x80, 0x54, 0x2e, 0x97, 0x52, 0x30, 0xd4, 0x25, 0xa1, 0x70, 0x84,
-	0x4a, 0xa5, 0xb2, 0x40, 0x1a, 0x0d, 0xa3, 0xe4, 0x90, 0x6d, 0x47, 0x72, 0x17, 0x5a, 0xa8, 0xd4,
-	0x44, 0x2f, 0x68, 0x63, 0x18, 0x25, 0x1d, 0xb6, 0x99, 0xe2, 0x5f, 0x4d, 0xe8, 0xa5, 0x9e, 0x20,
-	0x19, 0x42, 0x57, 0xfe, 0x10, 0xa8, 0x2e, 0x34, 0xaa, 0x6c, 0xec, 0x64, 0x3a, 0xcc, 0x47, 0xe4,
-	0x09, 0xf4, 0x7d, 0x0b, 0xd9, 0x78, 0x23, 0x79, 0x83, 0x92, 0x87, 0x00, 0x0a, 0x67, 0xab, 0x89,
-	0x5e, 0x7c, 0x2a, 0x0d, 0x3d, 0x70, 0x7e, 0x3c, 0x42, 0x9e, 0xc1, 0x6d, 0xff, 0x89, 0xe9, 0x55,
-	0x89, 0xb4, 0xe9, 0xb6, 0xfe, 0xe2, 0xd6, 0x7e, 0x55, 0x1b, 0x3a, 0xac, 0xed, 0xd7, 0x93, 0x0d,
-	0xbc, 0x50, 0xb2, 0x2a, 0xb3, 0x31, 0x6d, 0xb9, 0x83, 0xed, 0x68, 0x73, 0x54, 0x42, 0x61, 0x5e,
-	0xa4, 0xb2, 0x12, 0x86, 0x1e, 0x39, 0x61, 0x1f, 0x91, 0xc7, 0x70, 0x5c, 0xa8, 0x7c, 0x6e, 0xa6,
-	0xb8, 0x36, 0x53, 0xbe, 0x44, 0xda, 0x1e, 0x46, 0xc9, 0x01, 0x0b, 0x21, 0x19, 0x40, 0x9b, 0xeb,
-	0x73, 0x2e, 0x04, 0x16, 0xb4, 0x33, 0x8c, 0x92, 0x36, 0xbb, 0x9e, 0x49, 0x0c, 0xbd, 0xdc, 0x98,
-	0x7c, 0x76, 0x89, 0x45, 0x26, 0xe6, 0x92, 0x82, 0xb3, 0x10, 0x30, 0x7b, 0x0b, 0xd7, 0xe7, 0x8a,
-	0xaf, 0x72, 0x83, 0xe9, 0x65, 0x6e, 0x68, 0xd7, 0x89, 0x84, 0xd0, 0xba, 0x75, 0xc6, 0xdf, 0x18,
-	0xf7, 0x1a, 0x7a, 0xb5, 0x5b, 0x0f, 0xd9, 0xbb, 0xb8, 0xfe, 0x28, 0x4d, 0x26, 0xde, 0x5b, 0x4a,
-	0x8f, 0x9d, 0x4c, 0xc0, 0x48, 0x1f, 0x1a, 0xb8, 0xa6, 0x7d, 0xe7, 0xa2, 0x81, 0x6b, 0xf2, 0x12,
-	0xee, 0x54, 0x65, 0x91, 0x1b, 0xbc, 0xd8, 0xc5, 0x76, 0x49, 0x6f, 0xb9, 0xa4, 0xff, 0x3e, 0x8c,
-	0x7f, 0x47, 0x30, 0x98, 0xc8, 0x82, 0xcf, 0xaf, 0xfc, 0x62, 0xbc, 0xe3, 0xf8, 0xad, 0x60, 0xf8,
-	0x9d, 0x9c, 0x41, 0xd0, 0x40, 0xd7, 0x90, 0xee, 0xe9, 0x60, 0x14, 0x54, 0xd5, 0x7f, 0x92, 0x05,
-	0xfb, 0xe4, 0x3e, 0x74, 0xe6, 0x56, 0xcb, 0x05, 0x6d, 0xb8, 0xa0, 0x3b, 0x60, 0x4b, 0x53, 0xff,
-	0xb4, 0x1f, 0xb8, 0xb6, 0xa5, 0x39, 0x48, 0x3a, 0xcc, 0x23, 0xae, 0x9e, 0x25, 0xaa, 0x6d, 0xf3,
-	0x9a, 0x9b, 0x7a, 0xee, 0x50, 0xfc, 0x19, 0x4e, 0xf6, 0xba, 0xd7, 0x25, 0x79, 0x05, 0x30, 0xbb,
-	0xfe, 0xc3, 0x6c, 0xcc, 0xd3, 0x9b, 0xe6, 0xb7, 0xe7, 0xcc, 0xdb, 0x3d, 0xfd, 0x19, 0x06, 0x27,
-	0x02, 0xee, 0xed, 0xb9, 0x88, 0x24, 0xa1, 0xe0, 0xfe, 0xb7, 0x39, 0x78, 0xfa, 0x9f, 0x9b, 0xba,
-	0x7c, 0xfb, 0xe0, 0xcb, 0xc9, 0x28, 0xf8, 0x20, 0xbc, 0xf6, 0x87, 0xaf, 0x2d, 0xf7, 0x79, 0x78,
-	0xf1, 0x27, 0x00, 0x00, 0xff, 0xff, 0x12, 0x56, 0xaa, 0x7b, 0x41, 0x04, 0x00, 0x00,
-}
--- a/pkg/proto/conversation/conversation.proto
+++ b/pkg/proto/conversation/conversation.proto
@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "./conversation;conversation";
+option go_package = "Open_IM/pkg/proto/conversation;conversation";
 package conversation;

 message CommonResp{
--- a/pkg/proto/friend/friend.pb.go
+++ b/pkg/proto/friend/friend.pb.go
--- a/pkg/proto/friend/friend.proto
+++ b/pkg/proto/friend/friend.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./friend;friend";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/friend;friend";
 package friend;

 message CommonResp{
@ -167,6 +167,6 @@ service friend{
  rpc setFriendRemark(SetFriendRemarkReq) returns(SetFriendRemarkResp);
  rpc importFriend(ImportFriendReq)  returns(ImportFriendResp);

-  rpc CheckFriendFromCache(IsFriendReq) returns(IsFriendResp);
-  rpc CheckBlockFromCache(IsInBlackListReq) returns(IsFriendResp);
+  // rpc CheckFriendFromCache(IsFriendReq) returns(IsFriendResp);
+  // rpc CheckBlockFromCache(IsInBlackListReq) returns(IsFriendResp);
 }
--- a/pkg/proto/group/group.pb.go
+++ b/pkg/proto/group/group.pb.go
--- a/pkg/proto/group/group.proto
+++ b/pkg/proto/group/group.proto
@ -1,7 +1,7 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-import "Open_IM/pkg/proto/sdk_ws/wrappers.proto";
-option go_package = "./group;group";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+import "Open-IM-Server/pkg/proto/sdk_ws/wrappers.proto";
+option go_package = "Open_IM/pkg/proto/group;group";
 package group;

 message CommonResp{
--- a/pkg/proto/msg/msg.pb.go
+++ b/pkg/proto/msg/msg.pb.go
@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: msg/msg.proto

-package msg // import "./msg"
+package msg // import "Open_IM/pkg/proto/msg"

 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@ -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_3997a326608d1183, []int{0}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{0}
 }
 func (m *MsgDataToMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToMQ.Unmarshal(m, b)
@ -90,7 +90,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_3997a326608d1183, []int{1}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{1}
 }
 func (m *MsgDataToDB) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToDB.Unmarshal(m, b)
@ -137,7 +137,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_3997a326608d1183, []int{2}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{2}
 }
 func (m *PushMsgDataToMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PushMsgDataToMQ.Unmarshal(m, b)
@ -192,7 +192,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_3997a326608d1183, []int{3}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{3}
 }
 func (m *MsgDataToMongoByMQ) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgDataToMongoByMQ.Unmarshal(m, b)
@ -272,7 +272,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_3997a326608d1183, []int{4}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{4}
 }
 func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b)
@ -320,7 +320,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_3997a326608d1183, []int{5}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{5}
 }
 func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b)
@ -381,7 +381,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_3997a326608d1183, []int{6}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{6}
 }
 func (m *SendMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendMsgReq.Unmarshal(m, b)
@ -437,7 +437,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_3997a326608d1183, []int{7}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{7}
 }
 func (m *SendMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendMsgResp.Unmarshal(m, b)
@ -505,7 +505,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_3997a326608d1183, []int{8}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{8}
 }
 func (m *ClearMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClearMsgReq.Unmarshal(m, b)
@ -558,7 +558,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_3997a326608d1183, []int{9}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{9}
 }
 func (m *ClearMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ClearMsgResp.Unmarshal(m, b)
@ -607,7 +607,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_3997a326608d1183, []int{10}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{10}
 }
 func (m *SetMsgMinSeqReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMsgMinSeqReq.Unmarshal(m, b)
@ -674,7 +674,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_3997a326608d1183, []int{11}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{11}
 }
 func (m *SetMsgMinSeqResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetMsgMinSeqResp.Unmarshal(m, b)
@ -720,7 +720,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_3997a326608d1183, []int{12}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{12}
 }
 func (m *SetSendMsgStatusReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetSendMsgStatusReq.Unmarshal(m, b)
@ -766,7 +766,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_3997a326608d1183, []int{13}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{13}
 }
 func (m *SetSendMsgStatusResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetSendMsgStatusResp.Unmarshal(m, b)
@ -811,7 +811,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_3997a326608d1183, []int{14}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{14}
 }
 func (m *GetSendMsgStatusReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSendMsgStatusReq.Unmarshal(m, b)
@ -851,7 +851,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_3997a326608d1183, []int{15}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{15}
 }
 func (m *GetSendMsgStatusResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetSendMsgStatusResp.Unmarshal(m, b)
@ -906,7 +906,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_3997a326608d1183, []int{16}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{16}
 }
 func (m *DelSuperGroupMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelSuperGroupMsgReq.Unmarshal(m, b)
@ -966,7 +966,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_3997a326608d1183, []int{17}
+	return fileDescriptor_msg_3f0146015dfd26d9, []int{17}
 }
 func (m *DelSuperGroupMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelSuperGroupMsgResp.Unmarshal(m, b)
@ -1000,6 +1000,214 @@ func (m *DelSuperGroupMsgResp) GetErrMsg() string {
 	return ""
 }

+type GetSuperGroupMsgReq struct {
+	OperationID          string   `protobuf:"bytes,1,opt,name=operationID" json:"operationID,omitempty"`
+	Seq                  uint32   `protobuf:"varint,2,opt,name=Seq" json:"Seq,omitempty"`
+	GroupID              string   `protobuf:"bytes,3,opt,name=groupID" json:"groupID,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+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_3f0146015dfd26d9, []int{18}
+}
+func (m *GetSuperGroupMsgReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSuperGroupMsgReq.Unmarshal(m, b)
+}
+func (m *GetSuperGroupMsgReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSuperGroupMsgReq.Marshal(b, m, deterministic)
+}
+func (dst *GetSuperGroupMsgReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSuperGroupMsgReq.Merge(dst, src)
+}
+func (m *GetSuperGroupMsgReq) XXX_Size() int {
+	return xxx_messageInfo_GetSuperGroupMsgReq.Size(m)
+}
+func (m *GetSuperGroupMsgReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSuperGroupMsgReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSuperGroupMsgReq proto.InternalMessageInfo
+
+func (m *GetSuperGroupMsgReq) GetOperationID() string {
+	if m != nil {
+		return m.OperationID
+	}
+	return ""
+}
+
+func (m *GetSuperGroupMsgReq) GetSeq() uint32 {
+	if m != nil {
+		return m.Seq
+	}
+	return 0
+}
+
+func (m *GetSuperGroupMsgReq) GetGroupID() string {
+	if m != nil {
+		return m.GroupID
+	}
+	return ""
+}
+
+type GetSuperGroupMsgResp struct {
+	ErrCode              int32           `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"`
+	ErrMsg               string          `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"`
+	MsgData              *sdk_ws.MsgData `protobuf:"bytes,3,opt,name=msgData" json:"msgData,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+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_3f0146015dfd26d9, []int{19}
+}
+func (m *GetSuperGroupMsgResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetSuperGroupMsgResp.Unmarshal(m, b)
+}
+func (m *GetSuperGroupMsgResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetSuperGroupMsgResp.Marshal(b, m, deterministic)
+}
+func (dst *GetSuperGroupMsgResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetSuperGroupMsgResp.Merge(dst, src)
+}
+func (m *GetSuperGroupMsgResp) XXX_Size() int {
+	return xxx_messageInfo_GetSuperGroupMsgResp.Size(m)
+}
+func (m *GetSuperGroupMsgResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetSuperGroupMsgResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetSuperGroupMsgResp proto.InternalMessageInfo
+
+func (m *GetSuperGroupMsgResp) GetErrCode() int32 {
+	if m != nil {
+		return m.ErrCode
+	}
+	return 0
+}
+
+func (m *GetSuperGroupMsgResp) GetErrMsg() string {
+	if m != nil {
+		return m.ErrMsg
+	}
+	return ""
+}
+
+func (m *GetSuperGroupMsgResp) GetMsgData() *sdk_ws.MsgData {
+	if m != nil {
+		return m.MsgData
+	}
+	return nil
+}
+
+type GetWriteDiffMsgReq struct {
+	OperationID          string   `protobuf:"bytes,1,opt,name=operationID" json:"operationID,omitempty"`
+	Seq                  uint32   `protobuf:"varint,2,opt,name=Seq" json:"Seq,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+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_3f0146015dfd26d9, []int{20}
+}
+func (m *GetWriteDiffMsgReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetWriteDiffMsgReq.Unmarshal(m, b)
+}
+func (m *GetWriteDiffMsgReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetWriteDiffMsgReq.Marshal(b, m, deterministic)
+}
+func (dst *GetWriteDiffMsgReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWriteDiffMsgReq.Merge(dst, src)
+}
+func (m *GetWriteDiffMsgReq) XXX_Size() int {
+	return xxx_messageInfo_GetWriteDiffMsgReq.Size(m)
+}
+func (m *GetWriteDiffMsgReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetWriteDiffMsgReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetWriteDiffMsgReq proto.InternalMessageInfo
+
+func (m *GetWriteDiffMsgReq) GetOperationID() string {
+	if m != nil {
+		return m.OperationID
+	}
+	return ""
+}
+
+func (m *GetWriteDiffMsgReq) GetSeq() uint32 {
+	if m != nil {
+		return m.Seq
+	}
+	return 0
+}
+
+type GetWriteDiffMsgResp struct {
+	ErrCode              int32           `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"`
+	ErrMsg               string          `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"`
+	MsgData              *sdk_ws.MsgData `protobuf:"bytes,3,opt,name=msgData" json:"msgData,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+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_3f0146015dfd26d9, []int{21}
+}
+func (m *GetWriteDiffMsgResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetWriteDiffMsgResp.Unmarshal(m, b)
+}
+func (m *GetWriteDiffMsgResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetWriteDiffMsgResp.Marshal(b, m, deterministic)
+}
+func (dst *GetWriteDiffMsgResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetWriteDiffMsgResp.Merge(dst, src)
+}
+func (m *GetWriteDiffMsgResp) XXX_Size() int {
+	return xxx_messageInfo_GetWriteDiffMsgResp.Size(m)
+}
+func (m *GetWriteDiffMsgResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetWriteDiffMsgResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetWriteDiffMsgResp proto.InternalMessageInfo
+
+func (m *GetWriteDiffMsgResp) GetErrCode() int32 {
+	if m != nil {
+		return m.ErrCode
+	}
+	return 0
+}
+
+func (m *GetWriteDiffMsgResp) GetErrMsg() string {
+	if m != nil {
+		return m.ErrMsg
+	}
+	return ""
+}
+
+func (m *GetWriteDiffMsgResp) GetMsgData() *sdk_ws.MsgData {
+	if m != nil {
+		return m.MsgData
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*MsgDataToMQ)(nil), "msg.MsgDataToMQ")
 	proto.RegisterType((*MsgDataToDB)(nil), "msg.MsgDataToDB")
@ -1019,6 +1227,10 @@ func init() {
 	proto.RegisterType((*GetSendMsgStatusResp)(nil), "msg.GetSendMsgStatusResp")
 	proto.RegisterType((*DelSuperGroupMsgReq)(nil), "msg.DelSuperGroupMsgReq")
 	proto.RegisterType((*DelSuperGroupMsgResp)(nil), "msg.DelSuperGroupMsgResp")
+	proto.RegisterType((*GetSuperGroupMsgReq)(nil), "msg.GetSuperGroupMsgReq")
+	proto.RegisterType((*GetSuperGroupMsgResp)(nil), "msg.GetSuperGroupMsgResp")
+	proto.RegisterType((*GetWriteDiffMsgReq)(nil), "msg.GetWriteDiffMsgReq")
+	proto.RegisterType((*GetWriteDiffMsgResp)(nil), "msg.GetWriteDiffMsgResp")
 }

 // Reference imports to suppress errors if they are not otherwise used.
@ -1041,6 +1253,8 @@ type MsgClient interface {
 	SetMsgMinSeq(ctx context.Context, in *SetMsgMinSeqReq, opts ...grpc.CallOption) (*SetMsgMinSeqResp, error)
 	SetSendMsgStatus(ctx context.Context, in *SetSendMsgStatusReq, opts ...grpc.CallOption) (*SetSendMsgStatusResp, error)
 	GetSendMsgStatus(ctx context.Context, in *GetSendMsgStatusReq, opts ...grpc.CallOption) (*GetSendMsgStatusResp, error)
+	GetSuperGroupMsg(ctx context.Context, in *GetSuperGroupMsgReq, opts ...grpc.CallOption) (*GetSuperGroupMsgResp, error)
+	GetWriteDiffMsg(ctx context.Context, in *GetWriteDiffMsgReq, opts ...grpc.CallOption) (*GetWriteDiffMsgResp, error)
 }

 type msgClient struct {
@ -1132,6 +1346,24 @@ func (c *msgClient) GetSendMsgStatus(ctx context.Context, in *GetSendMsgStatusRe
 	return out, nil
 }

+func (c *msgClient) GetSuperGroupMsg(ctx context.Context, in *GetSuperGroupMsgReq, opts ...grpc.CallOption) (*GetSuperGroupMsgResp, error) {
+	out := new(GetSuperGroupMsgResp)
+	err := grpc.Invoke(ctx, "/msg.msg/GetSuperGroupMsg", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *msgClient) GetWriteDiffMsg(ctx context.Context, in *GetWriteDiffMsgReq, opts ...grpc.CallOption) (*GetWriteDiffMsgResp, error) {
+	out := new(GetWriteDiffMsgResp)
+	err := grpc.Invoke(ctx, "/msg.msg/GetWriteDiffMsg", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for Msg service

 type MsgServer interface {
@ -1144,6 +1376,8 @@ type MsgServer interface {
 	SetMsgMinSeq(context.Context, *SetMsgMinSeqReq) (*SetMsgMinSeqResp, error)
 	SetSendMsgStatus(context.Context, *SetSendMsgStatusReq) (*SetSendMsgStatusResp, error)
 	GetSendMsgStatus(context.Context, *GetSendMsgStatusReq) (*GetSendMsgStatusResp, error)
+	GetSuperGroupMsg(context.Context, *GetSuperGroupMsgReq) (*GetSuperGroupMsgResp, error)
+	GetWriteDiffMsg(context.Context, *GetWriteDiffMsgReq) (*GetWriteDiffMsgResp, error)
 }

 func RegisterMsgServer(s *grpc.Server, srv MsgServer) {
@ -1312,6 +1546,42 @@ func _Msg_GetSendMsgStatus_Handler(srv interface{}, ctx context.Context, dec fun
 	return interceptor(ctx, in, info, handler)
 }

+func _Msg_GetSuperGroupMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetSuperGroupMsgReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).GetSuperGroupMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/msg.msg/GetSuperGroupMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).GetSuperGroupMsg(ctx, req.(*GetSuperGroupMsgReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_GetWriteDiffMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetWriteDiffMsgReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).GetWriteDiffMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/msg.msg/GetWriteDiffMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).GetWriteDiffMsg(ctx, req.(*GetWriteDiffMsgReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "msg.msg",
 	HandlerType: (*MsgServer)(nil),
@ -1352,66 +1622,79 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetSendMsgStatus",
 			Handler:    _Msg_GetSendMsgStatus_Handler,
 		},
+		{
+			MethodName: "GetSuperGroupMsg",
+			Handler:    _Msg_GetSuperGroupMsg_Handler,
+		},
+		{
+			MethodName: "GetWriteDiffMsg",
+			Handler:    _Msg_GetWriteDiffMsg_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "msg/msg.proto",
 }

-func init() { proto.RegisterFile("msg/msg.proto", fileDescriptor_msg_3997a326608d1183) }
+func init() { proto.RegisterFile("msg/msg.proto", fileDescriptor_msg_3f0146015dfd26d9) }

-var fileDescriptor_msg_3997a326608d1183 = []byte{
-	// 833 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4d, 0x6f, 0xeb, 0x44,
-	0x14, 0x95, 0xe3, 0x26, 0x79, 0xb9, 0x6e, 0x95, 0x30, 0x0d, 0x95, 0xb1, 0x58, 0xe4, 0x59, 0x80,
-	0x22, 0x40, 0x89, 0x14, 0x90, 0x58, 0xbc, 0x0d, 0xe4, 0xe5, 0x29, 0x54, 0xc2, 0xb4, 0xb5, 0xcb,
-	0x86, 0x4d, 0x6a, 0x9a, 0xd1, 0x34, 0x6a, 0x6c, 0x4f, 0x3c, 0x0e, 0x6d, 0x61, 0xcd, 0x92, 0x1f,
-	0xc0, 0x0a, 0x89, 0x05, 0xbf, 0x13, 0xcd, 0x47, 0x92, 0xf1, 0x47, 0xd5, 0x10, 0x21, 0x96, 0xf7,
-	0xfa, 0xfa, 0xdc, 0x73, 0xee, 0x9c, 0xb9, 0x36, 0x9c, 0x44, 0x8c, 0x0c, 0x23, 0x46, 0x06, 0x34,
-	0x4d, 0xb2, 0x04, 0x99, 0x11, 0x23, 0xce, 0xeb, 0x0b, 0x8a, 0xe3, 0xd9, 0xb9, 0x37, 0xa4, 0xf7,
-	0x64, 0x28, 0xf2, 0x43, 0x36, 0xbf, 0x9f, 0x3d, 0xb0, 0xe1, 0x03, 0x93, 0x75, 0xee, 0xaf, 0x60,
-	0x79, 0x8c, 0x4c, 0xc2, 0x2c, 0xbc, 0x4e, 0xbc, 0x2b, 0xd4, 0x85, 0x7a, 0x96, 0xdc, 0xe3, 0xd8,
-	0x36, 0x7a, 0x46, 0xbf, 0xe5, 0xcb, 0x00, 0xf5, 0xc0, 0x4a, 0x28, 0x4e, 0xc3, 0x6c, 0x91, 0xc4,
-	0xe7, 0x13, 0xbb, 0x26, 0x9e, 0xe9, 0x29, 0xf4, 0x25, 0x34, 0x23, 0x09, 0x63, 0x9b, 0x3d, 0xa3,
-	0x6f, 0x8d, 0x9c, 0x01, 0xc3, 0xe9, 0xcf, 0x38, 0x9d, 0x85, 0x74, 0x31, 0xa3, 0x61, 0x1a, 0x46,
-	0x6c, 0xa0, 0x1a, 0xf9, 0x9b, 0x52, 0x17, 0x6b, 0xcd, 0x27, 0x63, 0x1d, 0xc4, 0xd8, 0x1b, 0xe4,
-	0x65, 0x72, 0xee, 0xef, 0x06, 0xb4, 0x2f, 0xd7, 0xec, 0x4e, 0x17, 0xda, 0x03, 0xeb, 0x42, 0x7b,
-	0x4b, 0xca, 0xd5, 0x53, 0x3a, 0x9b, 0xda, 0xfe, 0x6c, 0x5c, 0x38, 0xa6, 0x6b, 0x76, 0x77, 0x9d,
-	0xfc, 0xc0, 0x70, 0x7a, 0x3e, 0x11, 0xd3, 0x68, 0xf9, 0xb9, 0x9c, 0xfb, 0xb7, 0x01, 0x68, 0xc7,
-	0x25, 0x89, 0x49, 0x32, 0x7e, 0xf2, 0xae, 0x90, 0x0d, 0xcd, 0x65, 0xc8, 0xb2, 0x00, 0xaf, 0x04,
-	0x9d, 0x23, 0x7f, 0x13, 0xa2, 0x8f, 0xe0, 0x24, 0x24, 0x24, 0xc5, 0x24, 0x2f, 0x32, 0x9f, 0x44,
-	0x23, 0xb0, 0x22, 0xcc, 0x58, 0x48, 0xf0, 0x77, 0x0b, 0x96, 0xd9, 0x66, 0xcf, 0xec, 0x5b, 0xa3,
-	0xce, 0x80, 0x7b, 0x42, 0x53, 0xee, 0xeb, 0x45, 0xe8, 0x43, 0x68, 0x65, 0xe9, 0x82, 0x10, 0xc1,
-	0xf5, 0x48, 0xa0, 0xee, 0x12, 0xee, 0xf7, 0x80, 0xa6, 0x38, 0xf3, 0xc2, 0xc7, 0x6f, 0xe2, 0xb9,
-	0xb7, 0x88, 0x03, 0xbc, 0xf2, 0xf1, 0x0a, 0x9d, 0x41, 0x43, 0x89, 0x93, 0x53, 0x53, 0x51, 0x71,
-	0xa4, 0xb5, 0xd2, 0x48, 0xdd, 0x07, 0x38, 0x2d, 0xe1, 0x31, 0xca, 0x85, 0xbf, 0x4b, 0xd3, 0xb7,
-	0xc9, 0x1c, 0x0b, 0xc4, 0xba, 0xbf, 0x09, 0x79, 0xab, 0x77, 0x69, 0xea, 0x31, 0xa2, 0xd0, 0x54,
-	0xc4, 0xf3, 0x5e, 0xf8, 0xc8, 0x27, 0xc5, 0xe7, 0x7b, 0xe2, 0xab, 0x48, 0xe4, 0x05, 0xae, 0xd0,
-	0xc2, 0xf3, 0x22, 0x72, 0x7f, 0x01, 0x08, 0x70, 0x3c, 0xf7, 0x18, 0xe1, 0x02, 0xfe, 0x5f, 0x93,
-	0xff, 0x69, 0x80, 0xb5, 0x6d, 0x2e, 0xd5, 0xe2, 0xbc, 0x5a, 0xbc, 0x53, 0x8b, 0x73, 0x6a, 0x65,
-	0xc4, 0x99, 0xc9, 0x3e, 0x1e, 0x23, 0xdb, 0x63, 0xd2, 0x53, 0xbc, 0xe2, 0x76, 0xb9, 0xc0, 0x71,
-	0x26, 0x2b, 0xea, 0xb2, 0x42, 0x4b, 0x21, 0x07, 0x5e, 0x31, 0x1c, 0xcf, 0xaf, 0x17, 0x11, 0xb6,
-	0x1b, 0x3d, 0xa3, 0x6f, 0xfa, 0xdb, 0xd8, 0xbd, 0x05, 0xeb, 0xed, 0x12, 0x87, 0xa9, 0x1a, 0xcf,
-	0x19, 0x34, 0xd6, 0xb9, 0xf3, 0x95, 0x11, 0x87, 0x48, 0xa8, 0x3a, 0x79, 0x49, 0x70, 0x1b, 0x17,
-	0x87, 0x67, 0x96, 0x2f, 0xe1, 0xd7, 0x70, 0xbc, 0x6b, 0x72, 0xc8, 0x18, 0xdc, 0x3f, 0x0c, 0x68,
-	0x07, 0x98, 0xeb, 0xc9, 0x79, 0xb1, 0x92, 0xab, 0x0d, 0x4d, 0x92, 0x26, 0x6b, 0xba, 0xa5, 0xba,
-	0x09, 0xf9, 0x1b, 0x91, 0xb4, 0x88, 0xb2, 0x8e, 0x8c, 0x8a, 0x0a, 0x8e, 0xca, 0xc7, 0xaf, 0xeb,
-	0xaf, 0xe7, 0xf5, 0xbb, 0x13, 0xe8, 0xe4, 0xa9, 0x1d, 0xa4, 0xf0, 0x02, 0x4e, 0x03, 0x9c, 0x29,
-	0xb3, 0x04, 0x59, 0x98, 0xad, 0x99, 0x5f, 0xa6, 0x66, 0x94, 0xa9, 0x9d, 0x41, 0x83, 0x89, 0x72,
-	0x01, 0x58, 0xf7, 0x55, 0xe4, 0x7e, 0x0b, 0xdd, 0x32, 0xe0, 0x41, 0xd4, 0xbe, 0x12, 0x57, 0xf7,
-	0xdf, 0x53, 0x73, 0x6f, 0xa0, 0x3b, 0xfd, 0x4f, 0x28, 0x68, 0x22, 0xcd, 0x9c, 0xc8, 0xdf, 0x0c,
-	0x38, 0x9d, 0xe0, 0x65, 0xb0, 0xa6, 0x38, 0x9d, 0xf2, 0x53, 0x56, 0x3e, 0xd6, 0xcf, 0xcb, 0x28,
-	0xf8, 0x75, 0xe7, 0x9b, 0xda, 0x73, 0xbe, 0x31, 0xf3, 0xbe, 0x79, 0xd1, 0x1f, 0x7c, 0xd8, 0x65,
-	0x1a, 0x87, 0x28, 0x1d, 0xfd, 0x55, 0x07, 0xfe, 0xfd, 0x46, 0x37, 0xd0, 0x2e, 0xec, 0x4b, 0xf4,
-	0x71, 0xc5, 0xca, 0x29, 0xef, 0x68, 0xe7, 0x93, 0x7d, 0xca, 0x18, 0x45, 0x09, 0x74, 0x2f, 0xd7,
-	0xcb, 0xa5, 0x27, 0x3f, 0x09, 0xe3, 0xa7, 0x00, 0xaf, 0xc4, 0x77, 0xe1, 0xd3, 0x8a, 0xf7, 0xab,
-	0x0a, 0x79, 0xaf, 0xcf, 0xf6, 0xae, 0x65, 0x14, 0x7d, 0x0e, 0x4d, 0xe5, 0x05, 0xd4, 0x16, 0x9f,
-	0xa6, 0xdd, 0x5e, 0x76, 0x3a, 0xf9, 0x04, 0xa3, 0xe8, 0x0a, 0x60, 0x82, 0x97, 0x1e, 0x23, 0x82,
-	0x54, 0xaf, 0xa2, 0xd1, 0xee, 0x31, 0x47, 0x78, 0xfd, 0x42, 0x05, 0xa3, 0x68, 0x0a, 0x9d, 0xe2,
-	0x29, 0x21, 0x5b, 0x34, 0xae, 0xf0, 0x90, 0xf3, 0xc1, 0x33, 0x4f, 0x18, 0x45, 0x43, 0x78, 0xb5,
-	0x59, 0x68, 0x48, 0x32, 0xd7, 0x96, 0xa8, 0xf3, 0x5e, 0x21, 0xc3, 0x28, 0x7a, 0x03, 0xc7, 0xfa,
-	0x8e, 0x40, 0x5d, 0x25, 0x37, 0xb7, 0xd1, 0x9c, 0xf7, 0x2b, 0xb2, 0x92, 0x76, 0xf1, 0x26, 0x2b,
-	0xda, 0x15, 0x1b, 0x43, 0xd1, 0xae, 0xbc, 0xfa, 0x53, 0xe8, 0x4c, 0xab, 0x81, 0xa6, 0xcf, 0x02,
-	0x55, 0x5d, 0xe0, 0xb1, 0xf5, 0x63, 0x6b, 0xc0, 0x7f, 0x38, 0xdf, 0x44, 0x8c, 0xfc, 0xd4, 0x10,
-	0x7f, 0x93, 0x5f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x68, 0x86, 0x7d, 0x0a, 0x86, 0x0a, 0x00,
-	0x00,
+var fileDescriptor_msg_3f0146015dfd26d9 = []byte{
+	// 928 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0xe3, 0x44,
+	0x14, 0x96, 0xe3, 0x26, 0xdd, 0xbe, 0xb4, 0x6a, 0x98, 0x86, 0xe2, 0x35, 0x1c, 0x82, 0x05, 0x28,
+	0x02, 0xb6, 0x91, 0x0a, 0x12, 0x87, 0xbd, 0x40, 0xd7, 0x2b, 0x6f, 0x25, 0x4c, 0xb7, 0x76, 0x11,
+	0x12, 0x97, 0xae, 0x69, 0x66, 0x67, 0xad, 0xc6, 0xf6, 0xd4, 0xcf, 0xa1, 0xbb, 0x20, 0xb8, 0x71,
+	0xe4, 0x0f, 0xe0, 0xc4, 0x8d, 0x3b, 0xff, 0x21, 0x9a, 0x19, 0x27, 0x19, 0xff, 0x28, 0x2d, 0x61,
+	0xb5, 0xb7, 0xbc, 0x37, 0x6f, 0xbe, 0xf7, 0x7d, 0x6f, 0xde, 0xcc, 0x8b, 0x61, 0x27, 0x41, 0x36,
+	0x49, 0x90, 0x1d, 0xf0, 0x3c, 0x2b, 0x32, 0x62, 0x26, 0xc8, 0xec, 0xf1, 0x09, 0xa7, 0xe9, 0x83,
+	0x63, 0xff, 0x41, 0x48, 0xf3, 0x1f, 0x69, 0x3e, 0xe1, 0x97, 0x6c, 0x22, 0x97, 0x27, 0x38, 0xbd,
+	0x3c, 0xbf, 0xc6, 0xc9, 0x35, 0xaa, 0x70, 0xe7, 0x67, 0xe8, 0xfb, 0xc8, 0xdc, 0xa8, 0x88, 0xce,
+	0x32, 0xff, 0x94, 0x0c, 0xa1, 0x5b, 0x64, 0x97, 0x34, 0xb5, 0x8c, 0x91, 0x31, 0xde, 0x0a, 0x94,
+	0x41, 0x46, 0xd0, 0xcf, 0x38, 0xcd, 0xa3, 0x22, 0xce, 0xd2, 0x63, 0xd7, 0xea, 0xc8, 0x35, 0xdd,
+	0x45, 0x3e, 0x87, 0xcd, 0x44, 0xc1, 0x58, 0xe6, 0xc8, 0x18, 0xf7, 0x0f, 0xed, 0x03, 0x94, 0xa9,
+	0xcf, 0x23, 0x1e, 0x9f, 0xf3, 0x28, 0x8f, 0x12, 0x3c, 0x28, 0x13, 0x05, 0x8b, 0x50, 0x87, 0x6a,
+	0xc9, 0xdd, 0x23, 0x1d, 0xc4, 0xb8, 0x33, 0xc8, 0xed, 0xe4, 0x9c, 0xdf, 0x0d, 0xd8, 0x7d, 0x3a,
+	0xc7, 0x17, 0xba, 0xd0, 0x11, 0xf4, 0x4f, 0xb4, 0x5d, 0x4a, 0xae, 0xee, 0xd2, 0xd9, 0x74, 0xee,
+	0xce, 0xc6, 0x81, 0x6d, 0x3e, 0xc7, 0x17, 0x67, 0xd9, 0xb7, 0x48, 0xf3, 0x63, 0x57, 0x56, 0x63,
+	0x2b, 0xa8, 0xf8, 0x9c, 0xbf, 0x0c, 0x20, 0x2b, 0x2e, 0x59, 0xca, 0xb2, 0xa3, 0x57, 0xfe, 0x29,
+	0xb1, 0x60, 0x73, 0x16, 0x61, 0x11, 0xd2, 0x2b, 0x49, 0x67, 0x23, 0x58, 0x98, 0xe4, 0x03, 0xd8,
+	0x89, 0x18, 0xcb, 0x29, 0xab, 0x8a, 0xac, 0x3a, 0xc9, 0x21, 0xf4, 0x13, 0x8a, 0x18, 0x31, 0xfa,
+	0x75, 0x8c, 0x85, 0x65, 0x8e, 0xcc, 0x71, 0xff, 0x70, 0x70, 0x20, 0x5a, 0x43, 0x53, 0x1e, 0xe8,
+	0x41, 0xe4, 0x3d, 0xd8, 0x2a, 0xf2, 0x98, 0x31, 0xc9, 0x75, 0x43, 0xa2, 0xae, 0x1c, 0xce, 0x37,
+	0x40, 0x3c, 0x5a, 0xf8, 0xd1, 0xcb, 0xaf, 0xd2, 0xa9, 0x1f, 0xa7, 0x21, 0xbd, 0x0a, 0xe8, 0x15,
+	0xd9, 0x87, 0x5e, 0x29, 0x4e, 0x55, 0xad, 0xb4, 0xea, 0x25, 0xed, 0x34, 0x4a, 0xea, 0x5c, 0xc3,
+	0x5e, 0x03, 0x0f, 0xb9, 0x10, 0xfe, 0x38, 0xcf, 0x1f, 0x65, 0x53, 0x2a, 0x11, 0xbb, 0xc1, 0xc2,
+	0x14, 0xa9, 0x1e, 0xe7, 0xb9, 0x8f, 0xac, 0x44, 0x2b, 0x2d, 0xe1, 0xf7, 0xa3, 0x97, 0xa2, 0x52,
+	0xa2, 0xbe, 0x3b, 0x41, 0x69, 0x49, 0xbf, 0xc4, 0x95, 0x5a, 0x84, 0x5f, 0x5a, 0xce, 0x4f, 0x00,
+	0x21, 0x4d, 0xa7, 0x3e, 0x32, 0x21, 0xe0, 0xcd, 0x36, 0xf9, 0x9f, 0x06, 0xf4, 0x97, 0xc9, 0x95,
+	0x5a, 0x5a, 0x55, 0x4b, 0x57, 0x6a, 0x69, 0x45, 0xad, 0xb2, 0x04, 0x33, 0x95, 0xc7, 0x47, 0xb6,
+	0x3c, 0x26, 0xdd, 0x25, 0x22, 0x2e, 0x66, 0x31, 0x4d, 0x0b, 0x15, 0xd1, 0x55, 0x11, 0x9a, 0x8b,
+	0xd8, 0x70, 0x0f, 0x69, 0x3a, 0x3d, 0x8b, 0x13, 0x6a, 0xf5, 0x46, 0xc6, 0xd8, 0x0c, 0x96, 0xb6,
+	0x73, 0x01, 0xfd, 0x47, 0x33, 0x1a, 0xe5, 0x65, 0x79, 0xf6, 0xa1, 0x37, 0xaf, 0x9c, 0xaf, 0xb2,
+	0x04, 0x44, 0xc6, 0xcb, 0x93, 0x57, 0x04, 0x97, 0x76, 0xbd, 0x78, 0x66, 0xf3, 0x12, 0x7e, 0x09,
+	0xdb, 0xab, 0x24, 0xeb, 0x94, 0xc1, 0xf9, 0xc3, 0x80, 0xdd, 0x90, 0x0a, 0x3d, 0x95, 0x5e, 0x6c,
+	0xe5, 0x6a, 0xc1, 0x26, 0xcb, 0xb3, 0x39, 0x5f, 0x52, 0x5d, 0x98, 0x62, 0x47, 0xa2, 0x5a, 0xa4,
+	0x6c, 0x1d, 0x65, 0xd5, 0x15, 0x6c, 0x34, 0x8f, 0x5f, 0xd7, 0xdf, 0xad, 0xea, 0x77, 0x5c, 0x18,
+	0x54, 0xa9, 0xad, 0xa5, 0xf0, 0x04, 0xf6, 0x42, 0x5a, 0x94, 0xcd, 0x12, 0x16, 0x51, 0x31, 0xc7,
+	0xa0, 0x49, 0xcd, 0x68, 0x52, 0xdb, 0x87, 0x1e, 0xca, 0x70, 0x09, 0xd8, 0x0d, 0x4a, 0xcb, 0x79,
+	0x02, 0xc3, 0x26, 0xe0, 0x5a, 0xd4, 0xbe, 0x90, 0x57, 0xf7, 0xbf, 0x53, 0x73, 0x9e, 0xc1, 0xd0,
+	0x7b, 0x2d, 0x14, 0x34, 0x91, 0x66, 0x45, 0xe4, 0x6f, 0x06, 0xec, 0xb9, 0x74, 0x16, 0xce, 0x39,
+	0xcd, 0x3d, 0x71, 0xca, 0x65, 0x1f, 0xeb, 0xe7, 0x65, 0xd4, 0xfa, 0x75, 0xd5, 0x37, 0x9d, 0x9b,
+	0xfa, 0xc6, 0xac, 0xf6, 0xcd, 0xad, 0xfd, 0x21, 0x8a, 0xdd, 0xa4, 0xb1, 0x56, 0xb1, 0x2f, 0x54,
+	0xb1, 0xeb, 0x82, 0x6e, 0xef, 0x83, 0x01, 0x98, 0xa2, 0xb3, 0x3b, 0xb2, 0xb3, 0xc5, 0xcf, 0x9b,
+	0x05, 0x39, 0xbf, 0xaa, 0x83, 0xf9, 0xff, 0x74, 0xd7, 0x7c, 0x17, 0x9f, 0xc8, 0xe1, 0xf2, 0x5d,
+	0x1e, 0x17, 0xd4, 0x8d, 0x9f, 0x3f, 0x5f, 0x5f, 0xa3, 0xf3, 0x8b, 0x2c, 0x57, 0x15, 0xe9, 0xcd,
+	0x09, 0x39, 0xfc, 0xbb, 0x07, 0xe2, 0x4f, 0x17, 0x79, 0x06, 0xbb, 0xb5, 0xe9, 0x46, 0x3e, 0x6c,
+	0xd9, 0xdf, 0x9c, 0xa8, 0xf6, 0x47, 0x77, 0x09, 0x43, 0x4e, 0x32, 0x18, 0x3e, 0x9d, 0xcf, 0x66,
+	0xbe, 0x1a, 0xe0, 0x47, 0xaf, 0x42, 0x7a, 0x25, 0xa7, 0xf8, 0xc7, 0x2d, 0xfb, 0xdb, 0x02, 0x45,
+	0xae, 0x4f, 0xee, 0x1c, 0x8b, 0x9c, 0x7c, 0x0a, 0x9b, 0xe5, 0xcd, 0x25, 0xbb, 0xf2, 0x8f, 0xc4,
+	0x6a, 0x8a, 0xda, 0x83, 0xaa, 0x03, 0x39, 0x39, 0x05, 0x70, 0xe9, 0xcc, 0x47, 0x26, 0x49, 0x8d,
+	0x5a, 0x12, 0xad, 0x96, 0x05, 0xc2, 0xfb, 0xb7, 0x44, 0x20, 0x27, 0x1e, 0x0c, 0xea, 0x77, 0x8a,
+	0x58, 0x32, 0x71, 0xcb, 0x8d, 0xb7, 0xef, 0xdf, 0xb0, 0x82, 0x9c, 0x4c, 0xe0, 0xde, 0x62, 0xfc,
+	0x10, 0xc5, 0x5c, 0x1b, 0x79, 0xf6, 0x5b, 0x35, 0x0f, 0x72, 0xf2, 0x10, 0xb6, 0xf5, 0x17, 0x9d,
+	0x0c, 0x4b, 0xb9, 0x95, 0xf9, 0x63, 0xbf, 0xdd, 0xe2, 0x55, 0xb4, 0xeb, 0xef, 0x6e, 0x49, 0xbb,
+	0xe5, 0x7d, 0x2f, 0x69, 0xb7, 0x3e, 0xd4, 0x1e, 0x0c, 0xbc, 0x76, 0x20, 0xef, 0x46, 0x20, 0xef,
+	0x5f, 0x80, 0x5a, 0x0a, 0xd9, 0xf2, 0xd2, 0x68, 0x40, 0x8d, 0x42, 0xba, 0xb2, 0xcb, 0xf5, 0xcb,
+	0x46, 0xde, 0x59, 0x44, 0xd7, 0x2e, 0xb3, 0x6d, 0xb5, 0x2f, 0x20, 0x3f, 0x7a, 0xf7, 0xfb, 0xfb,
+	0xe2, 0x13, 0xe5, 0xfc, 0xd8, 0xd7, 0xbe, 0x4d, 0x12, 0x64, 0x0f, 0x13, 0x64, 0x3f, 0xf4, 0xa4,
+	0xf9, 0xd9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0xc1, 0xb8, 0x4c, 0xda, 0x0c, 0x00, 0x00,
 }
--- a/pkg/proto/msg/msg.proto
+++ b/pkg/proto/msg/msg.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./msg;msg";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/msg;msg";
 package msg;

 message MsgDataToMQ{
@ -131,6 +131,29 @@ message DelSuperGroupMsgResp{
  int32 errCode = 1;
  string errMsg = 2;
 }
+message GetSuperGroupMsgReq{
+  string operationID = 1;
+  uint32 Seq = 2;
+  string groupID = 3;
+
+}
+message GetSuperGroupMsgResp{
+  int32 errCode = 1;
+  string errMsg = 2;
+  server_api_params.MsgData msgData = 3;
+}
+message GetWriteDiffMsgReq{
+    string operationID = 1;
+    uint32 Seq = 2;
+
+  }
+message GetWriteDiffMsgResp{
+  int32 errCode = 1;
+  string errMsg = 2;
+  server_api_params.MsgData msgData = 3;
+}
+
+
 service msg {
  rpc GetMaxAndMinSeq(server_api_params.GetMaxAndMinSeqReq) returns(server_api_params.GetMaxAndMinSeqResp);
  rpc PullMessageBySeqList(server_api_params.PullMessageBySeqListReq) returns(server_api_params.PullMessageBySeqListResp);
@ -141,4 +164,7 @@ service msg {
  rpc SetMsgMinSeq(SetMsgMinSeqReq) returns(SetMsgMinSeqResp);
  rpc SetSendMsgStatus(SetSendMsgStatusReq) returns(SetSendMsgStatusResp);
  rpc GetSendMsgStatus(GetSendMsgStatusReq) returns(GetSendMsgStatusResp);
+  rpc GetSuperGroupMsg(GetSuperGroupMsgReq) returns(GetSuperGroupMsgResp);
+  rpc GetWriteDiffMsg(GetWriteDiffMsgReq) returns(GetWriteDiffMsgResp);
+
 }
--- a/pkg/proto/office/office.pb.go
+++ b/pkg/proto/office/office.pb.go
--- a/pkg/proto/office/office.proto
+++ b/pkg/proto/office/office.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./office;office";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/office;office";
 package office;

 message CommonResp{
--- a/pkg/proto/organization/organization.pb.go
+++ b/pkg/proto/organization/organization.pb.go
--- a/pkg/proto/organization/organization.proto
+++ b/pkg/proto/organization/organization.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./organization;organization";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/organization;organization";
 package organization;


@ -171,6 +171,17 @@ message GetDepartmentRelatedGroupIDListResp {
  repeated string groupIDList = 3;
 }

+message GetUserInOrganizationReq{
+  repeated string userIDList = 1;
+  string operationID = 2;
+}
+
+message GetUserInOrganizationResp{
+  int32   errCode = 1;
+  string  errMsg = 2;
+  repeated server_api_params.OrganizationUser organizationUsers = 3;
+}
+
 service organization{
  rpc CreateDepartment(CreateDepartmentReq) returns(CreateDepartmentResp);
  rpc UpdateDepartment(UpdateDepartmentReq) returns(UpdateDepartmentResp);
@ -189,6 +200,8 @@ service organization{
  rpc UpdateUserInDepartment(UpdateUserInDepartmentReq) returns(UpdateUserInDepartmentResp);
  rpc GetDepartmentMember(GetDepartmentMemberReq) returns(GetDepartmentMemberResp);
  rpc GetDepartmentRelatedGroupIDList(GetDepartmentRelatedGroupIDListReq) returns(GetDepartmentRelatedGroupIDListResp);
+
+  rpc GetUserInOrganization(GetUserInOrganizationReq) returns(GetUserInOrganizationResp);
 }


--- a/pkg/proto/proto_dir.cfg
+++ b/pkg/proto/proto_dir.cfg
@ -1,16 +1,17 @@

 all_proto=(
-            message_cms/message_cms.proto
            admin_cms/admin_cms.proto
-            statistics/statistics.proto
            auth/auth.proto
            friend/friend.proto
            group/group.proto
            user/user.proto
            rtc/rtc.proto
-            chat/chat.proto
+            msg/msg.proto
            push/push.proto
            relay/relay.proto
            sdk_ws/ws.proto
            conversation/conversation.proto
+            office/office.proto
+            cache/cache.proto
+            organization/organization.proto
 )
--- a/pkg/proto/push/push.pb.go
+++ b/pkg/proto/push/push.pb.go
@ -1,163 +1,293 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.15.5
 // source: push/push.proto

-package pbPush // import "./push"
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import sdk_ws "Open_IM/pkg/proto/sdk_ws"
+package pbPush

 import (
-	context "golang.org/x/net/context"
+	sdk_ws "Open_IM/pkg/proto/sdk_ws"
+	context "context"
 	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )

-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)

 type PushMsgReq struct {
-	OperationID          string          `protobuf:"bytes,1,opt,name=operationID" json:"operationID,omitempty"`
-	MsgData              *sdk_ws.MsgData `protobuf:"bytes,2,opt,name=msgData" json:"msgData,omitempty"`
-	PushToUserID         string          `protobuf:"bytes,3,opt,name=pushToUserID" json:"pushToUserID,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
-	XXX_unrecognized     []byte          `json:"-"`
-	XXX_sizecache        int32           `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OperationID  string          `protobuf:"bytes,1,opt,name=operationID,proto3" json:"operationID,omitempty"`
+	MsgData      *sdk_ws.MsgData `protobuf:"bytes,2,opt,name=msgData,proto3" json:"msgData,omitempty"`
+	PushToUserID string          `protobuf:"bytes,3,opt,name=pushToUserID,proto3" json:"pushToUserID,omitempty"`
 }

-func (m *PushMsgReq) Reset()         { *m = PushMsgReq{} }
-func (m *PushMsgReq) String() string { return proto.CompactTextString(m) }
-func (*PushMsgReq) ProtoMessage()    {}
+func (x *PushMsgReq) Reset() {
+	*x = PushMsgReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_push_push_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PushMsgReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PushMsgReq) ProtoMessage() {}
+
+func (x *PushMsgReq) ProtoReflect() protoreflect.Message {
+	mi := &file_push_push_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PushMsgReq.ProtoReflect.Descriptor instead.
 func (*PushMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_push_76409d0b017416ef, []int{0}
-}
-func (m *PushMsgReq) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_PushMsgReq.Unmarshal(m, b)
-}
-func (m *PushMsgReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_PushMsgReq.Marshal(b, m, deterministic)
-}
-func (dst *PushMsgReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PushMsgReq.Merge(dst, src)
-}
-func (m *PushMsgReq) XXX_Size() int {
-	return xxx_messageInfo_PushMsgReq.Size(m)
-}
-func (m *PushMsgReq) XXX_DiscardUnknown() {
-	xxx_messageInfo_PushMsgReq.DiscardUnknown(m)
+	return file_push_push_proto_rawDescGZIP(), []int{0}
 }

-var xxx_messageInfo_PushMsgReq proto.InternalMessageInfo
-
-func (m *PushMsgReq) GetOperationID() string {
-	if m != nil {
-		return m.OperationID
+func (x *PushMsgReq) GetOperationID() string {
+	if x != nil {
+		return x.OperationID
 	}
 	return ""
 }

-func (m *PushMsgReq) GetMsgData() *sdk_ws.MsgData {
-	if m != nil {
-		return m.MsgData
+func (x *PushMsgReq) GetMsgData() *sdk_ws.MsgData {
+	if x != nil {
+		return x.MsgData
 	}
 	return nil
 }

-func (m *PushMsgReq) GetPushToUserID() string {
-	if m != nil {
-		return m.PushToUserID
+func (x *PushMsgReq) GetPushToUserID() string {
+	if x != nil {
+		return x.PushToUserID
 	}
 	return ""
 }

 type PushMsgResp struct {
-	ResultCode           int32    `protobuf:"varint,1,opt,name=ResultCode" json:"ResultCode,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ResultCode int32 `protobuf:"varint,1,opt,name=ResultCode,proto3" json:"ResultCode,omitempty"`
 }

-func (m *PushMsgResp) Reset()         { *m = PushMsgResp{} }
-func (m *PushMsgResp) String() string { return proto.CompactTextString(m) }
-func (*PushMsgResp) ProtoMessage()    {}
+func (x *PushMsgResp) Reset() {
+	*x = PushMsgResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_push_push_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PushMsgResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PushMsgResp) ProtoMessage() {}
+
+func (x *PushMsgResp) ProtoReflect() protoreflect.Message {
+	mi := &file_push_push_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PushMsgResp.ProtoReflect.Descriptor instead.
 func (*PushMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_push_76409d0b017416ef, []int{1}
-}
-func (m *PushMsgResp) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_PushMsgResp.Unmarshal(m, b)
-}
-func (m *PushMsgResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_PushMsgResp.Marshal(b, m, deterministic)
-}
-func (dst *PushMsgResp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PushMsgResp.Merge(dst, src)
-}
-func (m *PushMsgResp) XXX_Size() int {
-	return xxx_messageInfo_PushMsgResp.Size(m)
-}
-func (m *PushMsgResp) XXX_DiscardUnknown() {
-	xxx_messageInfo_PushMsgResp.DiscardUnknown(m)
+	return file_push_push_proto_rawDescGZIP(), []int{1}
 }

-var xxx_messageInfo_PushMsgResp proto.InternalMessageInfo
-
-func (m *PushMsgResp) GetResultCode() int32 {
-	if m != nil {
-		return m.ResultCode
+func (x *PushMsgResp) GetResultCode() int32 {
+	if x != nil {
+		return x.ResultCode
 	}
 	return 0
 }

-func init() {
-	proto.RegisterType((*PushMsgReq)(nil), "push.PushMsgReq")
-	proto.RegisterType((*PushMsgResp)(nil), "push.PushMsgResp")
+var File_push_push_proto protoreflect.FileDescriptor
+
+var file_push_push_proto_rawDesc = []byte{
+	0x0a, 0x0f, 0x70, 0x75, 0x73, 0x68, 0x2f, 0x70, 0x75, 0x73, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x04, 0x70, 0x75, 0x73, 0x68, 0x1a, 0x28, 0x4f, 0x70, 0x65, 0x6e, 0x2d, 0x49, 0x4d,
+	0x2d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2f, 0x73, 0x64, 0x6b, 0x5f, 0x77, 0x73, 0x2f, 0x77, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x22, 0x88, 0x01, 0x0a, 0x0a, 0x50, 0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71,
+	0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x44, 0x12, 0x34, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69,
+	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x4d, 0x73, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x07, 0x6d, 0x73, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x75, 0x73, 0x68,
+	0x54, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x70, 0x75, 0x73, 0x68, 0x54, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0b,
+	0x50, 0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x52,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0a, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x32, 0x40, 0x0a, 0x0e, 0x50,
+	0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a,
+	0x07, 0x50, 0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x12, 0x10, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x2e,
+	0x50, 0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x70, 0x75, 0x73,
+	0x68, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x42, 0x1f, 0x5a,
+	0x1d, 0x4f, 0x70, 0x65, 0x6e, 0x5f, 0x49, 0x4d, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2f, 0x70, 0x75, 0x73, 0x68, 0x3b, 0x70, 0x62, 0x50, 0x75, 0x73, 0x68, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_push_push_proto_rawDescOnce sync.Once
+	file_push_push_proto_rawDescData = file_push_push_proto_rawDesc
+)
+
+func file_push_push_proto_rawDescGZIP() []byte {
+	file_push_push_proto_rawDescOnce.Do(func() {
+		file_push_push_proto_rawDescData = protoimpl.X.CompressGZIP(file_push_push_proto_rawDescData)
+	})
+	return file_push_push_proto_rawDescData
+}
+
+var file_push_push_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_push_push_proto_goTypes = []interface{}{
+	(*PushMsgReq)(nil),     // 0: push.PushMsgReq
+	(*PushMsgResp)(nil),    // 1: push.PushMsgResp
+	(*sdk_ws.MsgData)(nil), // 2: server_api_params.MsgData
+}
+var file_push_push_proto_depIdxs = []int32{
+	2, // 0: push.PushMsgReq.msgData:type_name -> server_api_params.MsgData
+	0, // 1: push.PushMsgService.PushMsg:input_type -> push.PushMsgReq
+	1, // 2: push.PushMsgService.PushMsg:output_type -> push.PushMsgResp
+	2, // [2:3] is the sub-list for method output_type
+	1, // [1:2] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_push_push_proto_init() }
+func file_push_push_proto_init() {
+	if File_push_push_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_push_push_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PushMsgReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_push_push_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PushMsgResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_push_push_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_push_push_proto_goTypes,
+		DependencyIndexes: file_push_push_proto_depIdxs,
+		MessageInfos:      file_push_push_proto_msgTypes,
+	}.Build()
+	File_push_push_proto = out.File
+	file_push_push_proto_rawDesc = nil
+	file_push_push_proto_goTypes = nil
+	file_push_push_proto_depIdxs = nil
 }

 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
-var _ grpc.ClientConn
+var _ grpc.ClientConnInterface

 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion4
-
-// Client API for PushMsgService service
+const _ = grpc.SupportPackageIsVersion6

+// PushMsgServiceClient is the client API for PushMsgService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type PushMsgServiceClient interface {
 	PushMsg(ctx context.Context, in *PushMsgReq, opts ...grpc.CallOption) (*PushMsgResp, error)
 }

 type pushMsgServiceClient struct {
-	cc *grpc.ClientConn
+	cc grpc.ClientConnInterface
 }

-func NewPushMsgServiceClient(cc *grpc.ClientConn) PushMsgServiceClient {
+func NewPushMsgServiceClient(cc grpc.ClientConnInterface) PushMsgServiceClient {
 	return &pushMsgServiceClient{cc}
 }

 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 := c.cc.Invoke(ctx, "/push.PushMsgService/PushMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-// Server API for PushMsgService service
-
+// PushMsgServiceServer is the server API for PushMsgService service.
 type PushMsgServiceServer interface {
 	PushMsg(context.Context, *PushMsgReq) (*PushMsgResp, error)
 }

+// UnimplementedPushMsgServiceServer can be embedded to have forward compatible implementations.
+type UnimplementedPushMsgServiceServer struct {
+}
+
+func (*UnimplementedPushMsgServiceServer) PushMsg(context.Context, *PushMsgReq) (*PushMsgResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PushMsg not implemented")
+}
+
 func RegisterPushMsgServiceServer(s *grpc.Server, srv PushMsgServiceServer) {
 	s.RegisterService(&_PushMsgService_serviceDesc, srv)
 }
@ -192,25 +322,3 @@ var _PushMsgService_serviceDesc = grpc.ServiceDesc{
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "push/push.proto",
 }
-
-func init() { proto.RegisterFile("push/push.proto", fileDescriptor_push_76409d0b017416ef) }
-
-var fileDescriptor_push_76409d0b017416ef = []byte{
-	// 249 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x3d, 0x4f, 0xc3, 0x30,
-	0x10, 0x86, 0x15, 0xbe, 0x2a, 0x2e, 0x40, 0xc1, 0x53, 0x94, 0x01, 0x85, 0x4c, 0x5d, 0xb0, 0xa5,
-	0xc2, 0xc6, 0x82, 0x20, 0x4b, 0x86, 0x08, 0x64, 0x60, 0x61, 0x89, 0x5c, 0x7a, 0x4a, 0xa3, 0xd2,
-	0xfa, 0xf0, 0x25, 0xed, 0x5f, 0xe0, 0x67, 0xa3, 0xb8, 0x05, 0x02, 0x8b, 0x65, 0x3d, 0xf7, 0xe8,
-	0xf4, 0xde, 0x0b, 0x43, 0x6a, 0x79, 0xa6, 0xba, 0x47, 0x92, 0xb3, 0x8d, 0x15, 0x7b, 0xdd, 0x3f,
-	0xbe, 0x78, 0x20, 0x5c, 0x96, 0x79, 0xa1, 0x68, 0x5e, 0x29, 0x3f, 0x50, 0x3c, 0x9d, 0x97, 0x6b,
-	0x56, 0x6b, 0xde, 0x88, 0xe9, 0x67, 0x00, 0xf0, 0xd8, 0xf2, 0xac, 0xe0, 0x4a, 0xe3, 0x87, 0x48,
-	0x20, 0xb4, 0x84, 0xce, 0x34, 0xb5, 0x5d, 0xe6, 0x59, 0x14, 0x24, 0xc1, 0xe8, 0x50, 0xf7, 0x91,
-	0xb8, 0x86, 0xc1, 0x82, 0xab, 0xcc, 0x34, 0x26, 0xda, 0x49, 0x82, 0x51, 0x38, 0x8e, 0x25, 0xa3,
-	0x5b, 0xa1, 0x2b, 0x0d, 0xd5, 0x25, 0x19, 0x67, 0x16, 0x2c, 0x8b, 0x8d, 0xa1, 0xbf, 0x55, 0x91,
-	0xc2, 0x51, 0x97, 0xe8, 0xd9, 0xbe, 0x30, 0xba, 0x3c, 0x8b, 0x76, 0xfd, 0xe2, 0x3f, 0x2c, 0xbd,
-	0x84, 0xf0, 0x27, 0x09, 0x93, 0x38, 0x07, 0xd0, 0xc8, 0xed, 0x7b, 0x73, 0x6f, 0xa7, 0xe8, 0x93,
-	0xec, 0xeb, 0x1e, 0x19, 0xdf, 0xc2, 0xc9, 0x56, 0x7f, 0x42, 0xb7, 0xaa, 0xdf, 0x50, 0x48, 0x18,
-	0x6c, 0x89, 0x38, 0x95, 0xbe, 0x8c, 0xdf, 0xcb, 0xe2, 0xb3, 0x7f, 0x84, 0xe9, 0x6e, 0xf8, 0x7a,
-	0x2c, 0x7d, 0x69, 0x37, 0x34, 0xe9, 0xf8, 0xe4, 0xc0, 0x77, 0x72, 0xf5, 0x15, 0x00, 0x00, 0xff,
-	0xff, 0xbe, 0xb7, 0x7c, 0x1c, 0x4f, 0x01, 0x00, 0x00,
-}
--- a/pkg/proto/push/push.proto
+++ b/pkg/proto/push/push.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./push;pbPush";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/push;pbPush";
 package push;

 message PushMsgReq {
--- a/pkg/proto/relay/relay.pb.go
+++ b/pkg/proto/relay/relay.pb.go
--- a/pkg/proto/relay/relay.proto
+++ b/pkg/proto/relay/relay.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-option go_package = "./relay;pbRelay";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+option go_package = "Open_IM/pkg/proto/relay;pbRelay";
 package relay;

 message OnlinePushMsgReq {
--- a/pkg/proto/rtc/rtc.pb.go
+++ b/pkg/proto/rtc/rtc.pb.go
--- a/pkg/proto/rtc/rtc.proto
+++ b/pkg/proto/rtc/rtc.proto
@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "./rtc;rtc";
+option go_package = "Open_IM/pkg/proto/rtc;rtc";
 package proto;

 message CommonResp{
@ -100,7 +100,11 @@ message SignalReq {
      SignalAcceptReq accept = 4;
      SignalHungUpReq hungUp = 5;
      SignalRejectReq reject = 6;
-      SignalGetRoomByGroupIDReq GetRoomByGroupID = 7;
+      SignalGetRoomByGroupIDReq getRoomByGroupID = 7;
+
+      SignalOnRoomParticipantConnectedReq onRoomParticipantConnectedReq = 8;
+      SignalOnRoomParticipantDisconnectedReq onRoomParticipantDisconnectedReq = 9;
+      SignalGetTokenByRoomIDReq getTokenByRoomID = 10;
  }
 }

@ -108,11 +112,12 @@ message SignalResp {
  oneof payload {
    SignalInviteReply invite = 1;
    SignalInviteInGroupReply inviteInGroup= 2;
-    SignalCancelReply  cancel = 3;
+    SignalCancelReply cancel = 3;
    SignalAcceptReply accept = 4;
    SignalHungUpReply hungUp = 5;
    SignalRejectReply reject = 6;
-    SignalGetRoomByGroupIDReply GetRoomByGroupID = 7;
+    SignalGetRoomByGroupIDReply getRoomByGroupID = 7;
+    SignalGetTokenByRoomIDReply getTokenByRoomID = 8;
  }
 }

@ -127,6 +132,7 @@ message InvitationInfo  {
    int32 platformID = 8;
    int32 sessionType = 9;
    int32 initiateTime = 10;
+    repeated string busyLineUserIDList = 11;
 }


@ -142,6 +148,7 @@ message SignalInviteReply {
  string token = 1;
  string roomID = 2;
  string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }

 message SignalInviteInGroupReq {
@ -155,6 +162,7 @@ message SignalInviteInGroupReply {
  string token = 1;
  string roomID = 2;
  string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }

 message SignalCancelReq {
@ -208,16 +216,40 @@ message SignalRejectReply {
 message SignalGetRoomByGroupIDReq {
  string opUserID = 1;
  string groupID = 2;
+  ParticipantMetaData participant = 3;
 }

 message SignalGetRoomByGroupIDReply {
  InvitationInfo invitation = 1;
-  repeated string onConnectingUserIDList = 2;
-  string token = 3;
-  string roomID = 4;
-  string liveURL = 5;
+  repeated ParticipantMetaData participant = 2;
+  string roomID = 3;
 }

+message SignalOnRoomParticipantConnectedReq {
+  InvitationInfo invitation = 1;
+  repeated ParticipantMetaData participant = 2;
+  string groupID = 3;
+}
+
+message SignalOnRoomParticipantDisconnectedReq {
+  InvitationInfo invitation = 1;
+  repeated ParticipantMetaData participant = 2;
+  string groupID = 3;
+}
+
+message SignalGetTokenByRoomIDReq {
+  string roomID = 1;
+  string opUserID = 2;
+  ParticipantMetaData participant = 3;
+  string operationID = 4;
+}
+
+message SignalGetTokenByRoomIDReply {
+  string token = 1;
+  string liveURL = 2;
+}
+
+
 message SignalMessageAssembleReq {
 SignalReq signalReq = 1;
 string operationID = 2;
@ -230,6 +262,17 @@ message SignalMessageAssembleResp {
 MsgData msgData = 4;
 }

+message SignalGetRoomsReq {
+ string operationID = 1;
+ string roomID = 2;
+}
+
+message SignalGetRoomsResp {
+  CommonResp commonResp = 1;
+  repeated SignalGetRoomByGroupIDReply roomList = 2;
+}
+
 service RtcService {
 rpc SignalMessageAssemble(SignalMessageAssembleReq) returns(SignalMessageAssembleResp);
+ rpc SignalGetRooms(SignalGetRoomsReq) returns(SignalGetRoomsResp);
 }
--- a/pkg/proto/sdk_ws/ws.pb.go
+++ b/pkg/proto/sdk_ws/ws.pb.go
--- a/pkg/proto/sdk_ws/ws.proto
+++ b/pkg/proto/sdk_ws/ws.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/wrappers.proto";
-option go_package = "./sdk_ws;server_api_params";
+import "Open-IM-Server/pkg/proto/sdk_ws/wrappers.proto";
+option go_package = "Open_IM/pkg/proto/sdk_ws;server_api_params";
 package server_api_params;


@ -526,7 +526,11 @@ message SignalReq {
      SignalAcceptReq accept = 4;
      SignalHungUpReq hungUp = 5;
      SignalRejectReq reject = 6;
-      SignalGetRoomByGroupIDReq GetRoomByGroupID = 7;
+      SignalGetRoomByGroupIDReq getRoomByGroupID = 7;
+
+      SignalOnRoomParticipantConnectedReq onRoomParticipantConnectedReq = 8;
+      SignalOnRoomParticipantDisconnectedReq onRoomParticipantDisconnectedReq = 9;
+      SignalGetTokenByRoomIDReq getTokenByRoomID = 10;
  }
 }

@ -534,14 +538,16 @@ message SignalResp {
  oneof payload {
    SignalInviteReply invite = 1;
    SignalInviteInGroupReply inviteInGroup= 2;
-    SignalCancelReply  cancel = 3;
+    SignalCancelReply cancel = 3;
    SignalAcceptReply accept = 4;
    SignalHungUpReply hungUp = 5;
    SignalRejectReply reject = 6;
-    SignalGetRoomByGroupIDReply GetRoomByGroupID = 7;
+    SignalGetRoomByGroupIDReply getRoomByGroupID = 7;
+    SignalGetTokenByRoomIDReply getTokenByRoomID = 8;
  }
 }

+
 message InvitationInfo  {
    string inviterUserID = 1;
    repeated string inviteeUserIDList = 2;
@ -553,6 +559,7 @@ message InvitationInfo  {
    int32 platformID = 8;
    int32 sessionType = 9;
    int32 initiateTime = 10;
+    repeated string busyLineUserIDList = 11;
 }

 message ParticipantMetaData{
@ -573,6 +580,7 @@ message SignalInviteReply {
  string token = 1;
  string roomID = 2;
  string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }

 message SignalInviteInGroupReq {
@ -586,6 +594,7 @@ message SignalInviteInGroupReply {
  string token = 1;
  string roomID = 2;
  string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }

 message SignalCancelReq {
@ -639,14 +648,37 @@ message SignalRejectReply {
 message SignalGetRoomByGroupIDReq {
  string opUserID = 1;
  string groupID = 2;
+  ParticipantMetaData participant = 3;
 }

 message SignalGetRoomByGroupIDReply {
  InvitationInfo invitation = 1;
-  repeated string onConnectingUserIDList = 2;
-  string token = 3;
-  string roomID = 4;
-  string liveURL = 5;
+  repeated ParticipantMetaData participant = 2;
+  string roomID = 3;
+}
+
+message SignalOnRoomParticipantConnectedReq {
+  InvitationInfo invitation = 1;
+  repeated ParticipantMetaData participant = 2;
+  string groupID = 3;
+}
+
+message SignalOnRoomParticipantDisconnectedReq {
+  InvitationInfo invitation = 1;
+  repeated ParticipantMetaData participant = 2;
+  string groupID = 3;
+}
+
+message SignalGetTokenByRoomIDReq {
+  string roomID = 1;
+  string opUserID = 2;
+  ParticipantMetaData participant = 3;
+  string operationID = 4;
+}
+
+message SignalGetTokenByRoomIDReply {
+  string token = 1;
+  string liveURL = 2;
 }


--- a/pkg/proto/user/user.pb.go
+++ b/pkg/proto/user/user.pb.go
--- a/pkg/proto/user/user.proto
+++ b/pkg/proto/user/user.proto
@ -1,7 +1,7 @@
 syntax = "proto3";
-import "Open_IM/pkg/proto/sdk_ws/ws.proto";
-import "Open_IM/pkg/proto/conversation/conversation.proto";
-option go_package = "./user;user";
+import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
+import "Open-IM-Server/pkg/proto/conversation/conversation.proto";
+option go_package = "Open_IM/pkg/proto/user;user";
 package user;

 message CommonResp{