GlobalRecvMsgOpt

internal/api/user/user.go

@@ -114,7 +114,9 @@ func UpdateUserInfo(c *gin.Context) {
 		return
 	}
 	log.NewInfo(params.OperationID, "UpdateUserInfo args ", req.String())
-
+	if params.GlobalRecvMsgOpt != nil {
+		req.GlobalRecvMsgOpt.Value = *params.GlobalRecvMsgOpt
+	}
 	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
 	client := rpc.NewUserClient(etcdConn)
 	RpcResp, err := client.UpdateUserInfo(context.Background(), req)

internal/rpc/user/user.go

@@ -356,7 +356,16 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI
 	if req.UserInfo.Birth != 0 {
 		user.Birth = utils.UnixSecondToTime(int64(req.UserInfo.Birth))
 	}
-	err := imdb.UpdateUserInfo(user)
+	m := make(map[string]interface{}, 1)
+	if req.GlobalRecvMsgOpt != nil {
+		m["global_recv_msg_opt"] = req.GlobalRecvMsgOpt
+		err := db.DB.SetUserGlobalMsgRecvOpt(user.UserID, req.GlobalRecvMsgOpt.Value)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), "SetUserGlobalMsgRecvOpt failed ", err.Error(), user)
+			return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
+		}
+	}
+	err := imdb.UpdateUserInfo(user, m)
 	if err != nil {
 		log.NewError(req.OperationID, "UpdateUserInfo failed ", err.Error(), user)
 		return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil

pkg/base_info/public_struct.go

@@ -13,7 +13,7 @@ type ApiUserInfo struct {
 	PhoneNumber      string `json:"phoneNumber" binding:"omitempty,max=32"`
 	Birth            uint32 `json:"birth" binding:"omitempty"`
 	Email            string `json:"email" binding:"omitempty,max=64"`
-	GlobalRecvMsgOpt int32  `json:"globalRecvMsgOpt" binding:"omitempty,oneof=0 1 2"`
+	GlobalRecvMsgOpt *int32 `json:"globalRecvMsgOpt" binding:"omitempty,oneof=0 1 2"`
 	Ex               string `json:"ex" binding:"omitempty,max=1024"`
 }
 

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

@@ -86,13 +86,16 @@ func GetUserNameByUserID(userID string) (string, error) {
 	return user.Nickname, nil
 }
 
-func UpdateUserInfo(user db.User) error {
+func UpdateUserInfo(user db.User, m ...map[string]interface{}) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
 	}
 	dbConn.LogMode(false)
 	err = dbConn.Table("users").Where("user_id=?", user.UserID).Update(&user).Error
+	if len(m) > 0 {
+		err = dbConn.Table("users").Where("user_id=?", user.UserID).Updates(m[0]).Error
+	}
 	return err
 }
 

pkg/proto/user/user.pb.go

@@ -7,6 +7,7 @@ import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import sdk_ws "Open_IM/pkg/proto/sdk_ws"
+import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 
 import (
 	context "golang.org/x/net/context"
@@ -36,7 +37,7 @@ func (m *CommonResp) Reset()         { *m = CommonResp{} }
 func (m *CommonResp) String() string { return proto.CompactTextString(m) }
 func (*CommonResp) ProtoMessage()    {}
 func (*CommonResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{0}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{0}
 }
 func (m *CommonResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommonResp.Unmarshal(m, b)
@@ -83,7 +84,7 @@ func (m *DeleteUsersReq) Reset()         { *m = DeleteUsersReq{} }
 func (m *DeleteUsersReq) String() string { return proto.CompactTextString(m) }
 func (*DeleteUsersReq) ProtoMessage()    {}
 func (*DeleteUsersReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{1}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{1}
 }
 func (m *DeleteUsersReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteUsersReq.Unmarshal(m, b)
@@ -136,7 +137,7 @@ func (m *DeleteUsersResp) Reset()         { *m = DeleteUsersResp{} }
 func (m *DeleteUsersResp) String() string { return proto.CompactTextString(m) }
 func (*DeleteUsersResp) ProtoMessage()    {}
 func (*DeleteUsersResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{2}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{2}
 }
 func (m *DeleteUsersResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteUsersResp.Unmarshal(m, b)
@@ -182,7 +183,7 @@ func (m *GetAllUserIDReq) Reset()         { *m = GetAllUserIDReq{} }
 func (m *GetAllUserIDReq) String() string { return proto.CompactTextString(m) }
 func (*GetAllUserIDReq) ProtoMessage()    {}
 func (*GetAllUserIDReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{3}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{3}
 }
 func (m *GetAllUserIDReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllUserIDReq.Unmarshal(m, b)
@@ -228,7 +229,7 @@ func (m *GetAllUserIDResp) Reset()         { *m = GetAllUserIDResp{} }
 func (m *GetAllUserIDResp) String() string { return proto.CompactTextString(m) }
 func (*GetAllUserIDResp) ProtoMessage()    {}
 func (*GetAllUserIDResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{4}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{4}
 }
 func (m *GetAllUserIDResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllUserIDResp.Unmarshal(m, b)
@@ -275,7 +276,7 @@ func (m *AccountCheckReq) Reset()         { *m = AccountCheckReq{} }
 func (m *AccountCheckReq) String() string { return proto.CompactTextString(m) }
 func (*AccountCheckReq) ProtoMessage()    {}
 func (*AccountCheckReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{5}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{5}
 }
 func (m *AccountCheckReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountCheckReq.Unmarshal(m, b)
@@ -328,7 +329,7 @@ func (m *AccountCheckResp) Reset()         { *m = AccountCheckResp{} }
 func (m *AccountCheckResp) String() string { return proto.CompactTextString(m) }
 func (*AccountCheckResp) ProtoMessage()    {}
 func (*AccountCheckResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{6}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{6}
 }
 func (m *AccountCheckResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountCheckResp.Unmarshal(m, b)
@@ -374,7 +375,7 @@ func (m *AccountCheckResp_SingleUserStatus) Reset()         { *m = AccountCheckR
 func (m *AccountCheckResp_SingleUserStatus) String() string { return proto.CompactTextString(m) }
 func (*AccountCheckResp_SingleUserStatus) ProtoMessage()    {}
 func (*AccountCheckResp_SingleUserStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{6, 0}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{6, 0}
 }
 func (m *AccountCheckResp_SingleUserStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AccountCheckResp_SingleUserStatus.Unmarshal(m, b)
@@ -421,7 +422,7 @@ func (m *GetUserInfoReq) Reset()         { *m = GetUserInfoReq{} }
 func (m *GetUserInfoReq) String() string { return proto.CompactTextString(m) }
 func (*GetUserInfoReq) ProtoMessage()    {}
 func (*GetUserInfoReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{7}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{7}
 }
 func (m *GetUserInfoReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUserInfoReq.Unmarshal(m, b)
@@ -474,7 +475,7 @@ func (m *GetUserInfoResp) Reset()         { *m = GetUserInfoResp{} }
 func (m *GetUserInfoResp) String() string { return proto.CompactTextString(m) }
 func (*GetUserInfoResp) ProtoMessage()    {}
 func (*GetUserInfoResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{8}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{8}
 }
 func (m *GetUserInfoResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUserInfoResp.Unmarshal(m, b)
@@ -509,19 +510,20 @@ func (m *GetUserInfoResp) GetUserInfoList() []*sdk_ws.UserInfo {
 }
 
 type UpdateUserInfoReq struct {
-	UserInfo             *sdk_ws.UserInfo `protobuf:"bytes,1,opt,name=UserInfo" json:"UserInfo,omitempty"`
+	UserInfo             *sdk_ws.UserInfo       `protobuf:"bytes,1,opt,name=UserInfo" json:"UserInfo,omitempty"`
-	OpUserID             string           `protobuf:"bytes,2,opt,name=OpUserID" json:"OpUserID,omitempty"`
+	OpUserID             string                 `protobuf:"bytes,2,opt,name=OpUserID" json:"OpUserID,omitempty"`
-	OperationID          string           `protobuf:"bytes,3,opt,name=operationID" json:"operationID,omitempty"`
+	OperationID          string                 `protobuf:"bytes,3,opt,name=operationID" json:"operationID,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	GlobalRecvMsgOpt     *wrapperspb.Int32Value `protobuf:"bytes,4,opt,name=globalRecvMsgOpt" json:"globalRecvMsgOpt,omitempty"`
-	XXX_unrecognized     []byte           `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
 func (m *UpdateUserInfoReq) Reset()         { *m = UpdateUserInfoReq{} }
 func (m *UpdateUserInfoReq) String() string { return proto.CompactTextString(m) }
 func (*UpdateUserInfoReq) ProtoMessage()    {}
 func (*UpdateUserInfoReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{9}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{9}
 }
 func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b)
@@ -562,6 +564,13 @@ func (m *UpdateUserInfoReq) GetOperationID() string {
 	return ""
 }
 
+func (m *UpdateUserInfoReq) GetGlobalRecvMsgOpt() *wrapperspb.Int32Value {
+	if m != nil {
+		return m.GlobalRecvMsgOpt
+	}
+	return nil
+}
+
 type UpdateUserInfoResp struct {
 	CommonResp           *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
@@ -573,7 +582,7 @@ func (m *UpdateUserInfoResp) Reset()         { *m = UpdateUserInfoResp{} }
 func (m *UpdateUserInfoResp) String() string { return proto.CompactTextString(m) }
 func (*UpdateUserInfoResp) ProtoMessage()    {}
 func (*UpdateUserInfoResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{10}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{10}
 }
 func (m *UpdateUserInfoResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UpdateUserInfoResp.Unmarshal(m, b)
@@ -624,7 +633,7 @@ func (m *Conversation) Reset()         { *m = Conversation{} }
 func (m *Conversation) String() string { return proto.CompactTextString(m) }
 func (*Conversation) ProtoMessage()    {}
 func (*Conversation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{11}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{11}
 }
 func (m *Conversation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Conversation.Unmarshal(m, b)
@@ -755,7 +764,7 @@ func (m *SetConversationReq) Reset()         { *m = SetConversationReq{} }
 func (m *SetConversationReq) String() string { return proto.CompactTextString(m) }
 func (*SetConversationReq) ProtoMessage()    {}
 func (*SetConversationReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{12}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{12}
 }
 func (m *SetConversationReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetConversationReq.Unmarshal(m, b)
@@ -807,7 +816,7 @@ func (m *SetConversationResp) Reset()         { *m = SetConversationResp{} }
 func (m *SetConversationResp) String() string { return proto.CompactTextString(m) }
 func (*SetConversationResp) ProtoMessage()    {}
 func (*SetConversationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{13}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{13}
 }
 func (m *SetConversationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetConversationResp.Unmarshal(m, b)
@@ -849,7 +858,7 @@ func (m *SetRecvMsgOptReq) Reset()         { *m = SetRecvMsgOptReq{} }
 func (m *SetRecvMsgOptReq) String() string { return proto.CompactTextString(m) }
 func (*SetRecvMsgOptReq) ProtoMessage()    {}
 func (*SetRecvMsgOptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{14}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{14}
 }
 func (m *SetRecvMsgOptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRecvMsgOptReq.Unmarshal(m, b)
@@ -915,7 +924,7 @@ func (m *SetRecvMsgOptResp) Reset()         { *m = SetRecvMsgOptResp{} }
 func (m *SetRecvMsgOptResp) String() string { return proto.CompactTextString(m) }
 func (*SetRecvMsgOptResp) ProtoMessage()    {}
 func (*SetRecvMsgOptResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{15}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{15}
 }
 func (m *SetRecvMsgOptResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SetRecvMsgOptResp.Unmarshal(m, b)
@@ -955,7 +964,7 @@ func (m *GetConversationReq) Reset()         { *m = GetConversationReq{} }
 func (m *GetConversationReq) String() string { return proto.CompactTextString(m) }
 func (*GetConversationReq) ProtoMessage()    {}
 func (*GetConversationReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{16}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{16}
 }
 func (m *GetConversationReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationReq.Unmarshal(m, b)
@@ -1008,7 +1017,7 @@ func (m *GetConversationResp) Reset()         { *m = GetConversationResp{} }
 func (m *GetConversationResp) String() string { return proto.CompactTextString(m) }
 func (*GetConversationResp) ProtoMessage()    {}
 func (*GetConversationResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{17}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{17}
 }
 func (m *GetConversationResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationResp.Unmarshal(m, b)
@@ -1055,7 +1064,7 @@ func (m *GetConversationsReq) Reset()         { *m = GetConversationsReq{} }
 func (m *GetConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*GetConversationsReq) ProtoMessage()    {}
 func (*GetConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{18}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{18}
 }
 func (m *GetConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationsReq.Unmarshal(m, b)
@@ -1108,7 +1117,7 @@ func (m *GetConversationsResp) Reset()         { *m = GetConversationsResp{} }
 func (m *GetConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*GetConversationsResp) ProtoMessage()    {}
 func (*GetConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{19}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{19}
 }
 func (m *GetConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetConversationsResp.Unmarshal(m, b)
@@ -1154,7 +1163,7 @@ func (m *GetAllConversationsReq) Reset()         { *m = GetAllConversationsReq{}
 func (m *GetAllConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*GetAllConversationsReq) ProtoMessage()    {}
 func (*GetAllConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{20}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{20}
 }
 func (m *GetAllConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllConversationsReq.Unmarshal(m, b)
@@ -1200,7 +1209,7 @@ func (m *GetAllConversationsResp) Reset()         { *m = GetAllConversationsResp
 func (m *GetAllConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*GetAllConversationsResp) ProtoMessage()    {}
 func (*GetAllConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{21}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{21}
 }
 func (m *GetAllConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetAllConversationsResp.Unmarshal(m, b)
@@ -1248,7 +1257,7 @@ func (m *BatchSetConversationsReq) Reset()         { *m = BatchSetConversationsR
 func (m *BatchSetConversationsReq) String() string { return proto.CompactTextString(m) }
 func (*BatchSetConversationsReq) ProtoMessage()    {}
 func (*BatchSetConversationsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{22}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{22}
 }
 func (m *BatchSetConversationsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchSetConversationsReq.Unmarshal(m, b)
@@ -1309,7 +1318,7 @@ func (m *BatchSetConversationsResp) Reset()         { *m = BatchSetConversations
 func (m *BatchSetConversationsResp) String() string { return proto.CompactTextString(m) }
 func (*BatchSetConversationsResp) ProtoMessage()    {}
 func (*BatchSetConversationsResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{23}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{23}
 }
 func (m *BatchSetConversationsResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BatchSetConversationsResp.Unmarshal(m, b)
@@ -1362,7 +1371,7 @@ func (m *ResignUserReq) Reset()         { *m = ResignUserReq{} }
 func (m *ResignUserReq) String() string { return proto.CompactTextString(m) }
 func (*ResignUserReq) ProtoMessage()    {}
 func (*ResignUserReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{24}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{24}
 }
 func (m *ResignUserReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResignUserReq.Unmarshal(m, b)
@@ -1407,7 +1416,7 @@ func (m *ResignUserResp) Reset()         { *m = ResignUserResp{} }
 func (m *ResignUserResp) String() string { return proto.CompactTextString(m) }
 func (*ResignUserResp) ProtoMessage()    {}
 func (*ResignUserResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{25}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{25}
 }
 func (m *ResignUserResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResignUserResp.Unmarshal(m, b)
@@ -1446,7 +1455,7 @@ func (m *GetUserByIdReq) Reset()         { *m = GetUserByIdReq{} }
 func (m *GetUserByIdReq) String() string { return proto.CompactTextString(m) }
 func (*GetUserByIdReq) ProtoMessage()    {}
 func (*GetUserByIdReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{26}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{26}
 }
 func (m *GetUserByIdReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUserByIdReq.Unmarshal(m, b)
@@ -1495,7 +1504,7 @@ func (m *User) Reset()         { *m = User{} }
 func (m *User) String() string { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()    {}
 func (*User) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{27}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{27}
 }
 func (m *User) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_User.Unmarshal(m, b)
@@ -1562,7 +1571,7 @@ func (m *GetUserByIdResp) Reset()         { *m = GetUserByIdResp{} }
 func (m *GetUserByIdResp) String() string { return proto.CompactTextString(m) }
 func (*GetUserByIdResp) ProtoMessage()    {}
 func (*GetUserByIdResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{28}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{28}
 }
 func (m *GetUserByIdResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUserByIdResp.Unmarshal(m, b)
@@ -1609,7 +1618,7 @@ func (m *GetUsersByNameReq) Reset()         { *m = GetUsersByNameReq{} }
 func (m *GetUsersByNameReq) String() string { return proto.CompactTextString(m) }
 func (*GetUsersByNameReq) ProtoMessage()    {}
 func (*GetUsersByNameReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{29}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{29}
 }
 func (m *GetUsersByNameReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersByNameReq.Unmarshal(m, b)
@@ -1663,7 +1672,7 @@ func (m *GetUsersByNameResp) Reset()         { *m = GetUsersByNameResp{} }
 func (m *GetUsersByNameResp) String() string { return proto.CompactTextString(m) }
 func (*GetUsersByNameResp) ProtoMessage()    {}
 func (*GetUsersByNameResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{30}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{30}
 }
 func (m *GetUsersByNameResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersByNameResp.Unmarshal(m, b)
@@ -1720,7 +1729,7 @@ func (m *AlterUserReq) Reset()         { *m = AlterUserReq{} }
 func (m *AlterUserReq) String() string { return proto.CompactTextString(m) }
 func (*AlterUserReq) ProtoMessage()    {}
 func (*AlterUserReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{31}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{31}
 }
 func (m *AlterUserReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlterUserReq.Unmarshal(m, b)
@@ -1793,7 +1802,7 @@ func (m *AlterUserResp) Reset()         { *m = AlterUserResp{} }
 func (m *AlterUserResp) String() string { return proto.CompactTextString(m) }
 func (*AlterUserResp) ProtoMessage()    {}
 func (*AlterUserResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{32}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{32}
 }
 func (m *AlterUserResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AlterUserResp.Unmarshal(m, b)
@@ -1833,7 +1842,7 @@ func (m *GetUsersReq) Reset()         { *m = GetUsersReq{} }
 func (m *GetUsersReq) String() string { return proto.CompactTextString(m) }
 func (*GetUsersReq) ProtoMessage()    {}
 func (*GetUsersReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{33}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{33}
 }
 func (m *GetUsersReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersReq.Unmarshal(m, b)
@@ -1888,7 +1897,7 @@ func (m *GetUsersResp) Reset()         { *m = GetUsersResp{} }
 func (m *GetUsersResp) String() string { return proto.CompactTextString(m) }
 func (*GetUsersResp) ProtoMessage()    {}
 func (*GetUsersResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{34}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{34}
 }
 func (m *GetUsersResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersResp.Unmarshal(m, b)
@@ -1951,7 +1960,7 @@ func (m *AddUserReq) Reset()         { *m = AddUserReq{} }
 func (m *AddUserReq) String() string { return proto.CompactTextString(m) }
 func (*AddUserReq) ProtoMessage()    {}
 func (*AddUserReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{35}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{35}
 }
 func (m *AddUserReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddUserReq.Unmarshal(m, b)
@@ -2017,7 +2026,7 @@ func (m *AddUserResp) Reset()         { *m = AddUserResp{} }
 func (m *AddUserResp) String() string { return proto.CompactTextString(m) }
 func (*AddUserResp) ProtoMessage()    {}
 func (*AddUserResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{36}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{36}
 }
 func (m *AddUserResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AddUserResp.Unmarshal(m, b)
@@ -2058,7 +2067,7 @@ func (m *BlockUserReq) Reset()         { *m = BlockUserReq{} }
 func (m *BlockUserReq) String() string { return proto.CompactTextString(m) }
 func (*BlockUserReq) ProtoMessage()    {}
 func (*BlockUserReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{37}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{37}
 }
 func (m *BlockUserReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockUserReq.Unmarshal(m, b)
@@ -2117,7 +2126,7 @@ func (m *BlockUserResp) Reset()         { *m = BlockUserResp{} }
 func (m *BlockUserResp) String() string { return proto.CompactTextString(m) }
 func (*BlockUserResp) ProtoMessage()    {}
 func (*BlockUserResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{38}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{38}
 }
 func (m *BlockUserResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockUserResp.Unmarshal(m, b)
@@ -2157,7 +2166,7 @@ func (m *UnBlockUserReq) Reset()         { *m = UnBlockUserReq{} }
 func (m *UnBlockUserReq) String() string { return proto.CompactTextString(m) }
 func (*UnBlockUserReq) ProtoMessage()    {}
 func (*UnBlockUserReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{39}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{39}
 }
 func (m *UnBlockUserReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnBlockUserReq.Unmarshal(m, b)
@@ -2209,7 +2218,7 @@ func (m *UnBlockUserResp) Reset()         { *m = UnBlockUserResp{} }
 func (m *UnBlockUserResp) String() string { return proto.CompactTextString(m) }
 func (*UnBlockUserResp) ProtoMessage()    {}
 func (*UnBlockUserResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{40}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{40}
 }
 func (m *UnBlockUserResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UnBlockUserResp.Unmarshal(m, b)
@@ -2249,7 +2258,7 @@ func (m *GetBlockUsersReq) Reset()         { *m = GetBlockUsersReq{} }
 func (m *GetBlockUsersReq) String() string { return proto.CompactTextString(m) }
 func (*GetBlockUsersReq) ProtoMessage()    {}
 func (*GetBlockUsersReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{41}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{41}
 }
 func (m *GetBlockUsersReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockUsersReq.Unmarshal(m, b)
@@ -2303,7 +2312,7 @@ func (m *BlockUser) Reset()         { *m = BlockUser{} }
 func (m *BlockUser) String() string { return proto.CompactTextString(m) }
 func (*BlockUser) ProtoMessage()    {}
 func (*BlockUser) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{42}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{42}
 }
 func (m *BlockUser) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlockUser.Unmarshal(m, b)
@@ -2358,7 +2367,7 @@ func (m *GetBlockUsersResp) Reset()         { *m = GetBlockUsersResp{} }
 func (m *GetBlockUsersResp) String() string { return proto.CompactTextString(m) }
 func (*GetBlockUsersResp) ProtoMessage()    {}
 func (*GetBlockUsersResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{43}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{43}
 }
 func (m *GetBlockUsersResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockUsersResp.Unmarshal(m, b)
@@ -2418,7 +2427,7 @@ func (m *GetBlockUserByIdReq) Reset()         { *m = GetBlockUserByIdReq{} }
 func (m *GetBlockUserByIdReq) String() string { return proto.CompactTextString(m) }
 func (*GetBlockUserByIdReq) ProtoMessage()    {}
 func (*GetBlockUserByIdReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{44}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{44}
 }
 func (m *GetBlockUserByIdReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockUserByIdReq.Unmarshal(m, b)
@@ -2463,7 +2472,7 @@ func (m *GetBlockUserByIdResp) Reset()         { *m = GetBlockUserByIdResp{} }
 func (m *GetBlockUserByIdResp) String() string { return proto.CompactTextString(m) }
 func (*GetBlockUserByIdResp) ProtoMessage()    {}
 func (*GetBlockUserByIdResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{45}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{45}
 }
 func (m *GetBlockUserByIdResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetBlockUserByIdResp.Unmarshal(m, b)
@@ -2503,7 +2512,7 @@ func (m *DeleteUserReq) Reset()         { *m = DeleteUserReq{} }
 func (m *DeleteUserReq) String() string { return proto.CompactTextString(m) }
 func (*DeleteUserReq) ProtoMessage()    {}
 func (*DeleteUserReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{46}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{46}
 }
 func (m *DeleteUserReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteUserReq.Unmarshal(m, b)
@@ -2555,7 +2564,7 @@ func (m *DeleteUserResp) Reset()         { *m = DeleteUserResp{} }
 func (m *DeleteUserResp) String() string { return proto.CompactTextString(m) }
 func (*DeleteUserResp) ProtoMessage()    {}
 func (*DeleteUserResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_e11c6a5241e13fcd, []int{47}
+	return fileDescriptor_user_1b2c9183e940b6c0, []int{47}
 }
 func (m *DeleteUserResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DeleteUserResp.Unmarshal(m, b)
@@ -2667,6 +2676,7 @@ type UserClient interface {
 	GetBlockUsers(ctx context.Context, in *GetBlockUsersReq, opts ...grpc.CallOption) (*GetBlockUsersResp, error)
 	GetBlockUserById(ctx context.Context, in *GetBlockUserByIdReq, opts ...grpc.CallOption) (*GetBlockUserByIdResp, error)
 	DeleteUser(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*DeleteUserResp, error)
+	GetUserInfoFromCache(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResp, error)
 }
 
 type userClient struct {
@@ -2875,6 +2885,15 @@ func (c *userClient) DeleteUser(ctx context.Context, in *DeleteUserReq, opts ...
 	return out, nil
 }
 
+func (c *userClient) GetUserInfoFromCache(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResp, error) {
+	out := new(GetUserInfoResp)
+	err := grpc.Invoke(ctx, "/user.user/GetUserInfoFromCache", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for User service
 
 type UserServer interface {
@@ -2900,6 +2919,7 @@ type UserServer interface {
 	GetBlockUsers(context.Context, *GetBlockUsersReq) (*GetBlockUsersResp, error)
 	GetBlockUserById(context.Context, *GetBlockUserByIdReq) (*GetBlockUserByIdResp, error)
 	DeleteUser(context.Context, *DeleteUserReq) (*DeleteUserResp, error)
+	GetUserInfoFromCache(context.Context, *GetUserInfoReq) (*GetUserInfoResp, error)
 }
 
 func RegisterUserServer(s *grpc.Server, srv UserServer) {
@@ -3302,6 +3322,24 @@ func _User_DeleteUser_Handler(srv interface{}, ctx context.Context, dec func(int
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_GetUserInfoFromCache_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetUserInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).GetUserInfoFromCache(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/user.user/GetUserInfoFromCache",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).GetUserInfoFromCache(ctx, req.(*GetUserInfoReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _User_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "user.user",
 	HandlerType: (*UserServer)(nil),
@@ -3394,130 +3432,138 @@ var _User_serviceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteUser",
 			Handler:    _User_DeleteUser_Handler,
 		},
+		{
+			MethodName: "GetUserInfoFromCache",
+			Handler:    _User_GetUserInfoFromCache_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user/user.proto",
 }
 
-func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_e11c6a5241e13fcd) }
+func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_1b2c9183e940b6c0) }
-
+
-var fileDescriptor_user_e11c6a5241e13fcd = []byte{
+var fileDescriptor_user_1b2c9183e940b6c0 = []byte{
-	// 1857 bytes of a gzipped FileDescriptorProto
+	// 1922 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xdd, 0x4f, 0x24, 0x4b,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0x23, 0x49,
-	0x15, 0x4f, 0xcf, 0xc7, 0x02, 0x67, 0x98, 0x61, 0x28, 0xb8, 0xd0, 0xb7, 0x55, 0xc4, 0xce, 0xf5,
+	0x15, 0x57, 0xdb, 0xce, 0x24, 0x79, 0x8e, 0x1d, 0xa7, 0x26, 0x3b, 0xe9, 0x6d, 0x60, 0x08, 0xad,
-	0x4a, 0x48, 0x04, 0x5d, 0x8d, 0x6b, 0xd6, 0xe8, 0x2e, 0x33, 0xb0, 0x64, 0x8c, 0x0b, 0x93, 0x9e,
+	0x65, 0x37, 0x1a, 0x09, 0x07, 0x66, 0x11, 0x83, 0x16, 0xc1, 0x6e, 0xec, 0x64, 0x2c, 0x23, 0x26,
-	0x25, 0x31, 0xc6, 0x84, 0xf4, 0xce, 0x14, 0xd0, 0x61, 0xa6, 0xbb, 0xb7, 0xab, 0x87, 0x5d, 0x7c,
+	0xb1, 0xda, 0x33, 0x08, 0x21, 0xa4, 0xa8, 0x63, 0x57, 0x9c, 0x56, 0xec, 0xee, 0xde, 0xae, 0x76,
-	0x59, 0xe3, 0xc7, 0x8b, 0xf1, 0xc5, 0xa7, 0x5d, 0x7d, 0xf0, 0xef, 0xf0, 0x5d, 0x9f, 0xfc, 0x0f,
+	0x66, 0xc2, 0x65, 0x11, 0x1f, 0x37, 0x2e, 0x9c, 0x58, 0x38, 0xf0, 0x77, 0x70, 0x87, 0x13, 0x57,
-	0xf4, 0xc5, 0x7f, 0xc5, 0xd4, 0x47, 0x77, 0x57, 0x55, 0x37, 0x30, 0xb7, 0x21, 0xfb, 0x02, 0x53,
+	0x4e, 0x20, 0x24, 0xfe, 0x95, 0x55, 0x7d, 0x74, 0x77, 0x55, 0x75, 0x3b, 0xf1, 0x74, 0xa2, 0xb9,
-	0xa7, 0xbe, 0x7e, 0xe7, 0x9c, 0xdf, 0x39, 0x75, 0xaa, 0x1a, 0x96, 0xa6, 0x04, 0x47, 0xbb, 0xf4,
+	0x24, 0xae, 0x57, 0x5f, 0xbf, 0xf7, 0xde, 0xef, 0xbd, 0x7a, 0x55, 0x0d, 0x9b, 0x73, 0x82, 0xa3,
-	0xcf, 0x4e, 0x18, 0x05, 0x71, 0x80, 0x6a, 0xf4, 0xb7, 0xf5, 0xad, 0xe3, 0x10, 0xfb, 0xa7, 0xbd,
+	0x7d, 0xfa, 0xa7, 0x1d, 0x46, 0x41, 0x1c, 0xa0, 0x1a, 0xfd, 0x6d, 0x7d, 0xeb, 0x24, 0xc4, 0xfe,
-	0x97, 0xbb, 0xe1, 0xe5, 0xf9, 0x2e, 0xeb, 0xd8, 0x25, 0xa3, 0xcb, 0xd3, 0xb7, 0x64, 0xf7, 0x2d,
+	0x69, 0xff, 0xc5, 0x7e, 0x78, 0x39, 0xd9, 0x67, 0x1d, 0xfb, 0x64, 0x7c, 0x79, 0xfa, 0x9a, 0xec,
-	0xe1, 0x03, 0xed, 0x9f, 0x01, 0x74, 0x83, 0xc9, 0x24, 0xf0, 0x1d, 0x4c, 0x42, 0x64, 0xc2, 0x1c,
+	0xbf, 0x26, 0x7c, 0xa0, 0xf5, 0xd1, 0xe2, 0x21, 0x91, 0x1b, 0x86, 0x38, 0x12, 0x03, 0xed, 0x9f,
-	0x8e, 0xa2, 0x6e, 0x30, 0xc2, 0xa6, 0xb1, 0x69, 0x6c, 0xd5, 0x9d, 0xa4, 0x89, 0xd6, 0xe0, 0x11,
+	0x00, 0x74, 0x83, 0xd9, 0x2c, 0xf0, 0x1d, 0x4c, 0x42, 0x64, 0xc2, 0x2a, 0x8e, 0xa2, 0x6e, 0x30,
-	0x8e, 0xa2, 0x97, 0xe4, 0xdc, 0xac, 0x6c, 0x1a, 0x5b, 0x0b, 0x8e, 0x68, 0xd9, 0xbf, 0x81, 0xd6,
+	0xc6, 0xa6, 0xb1, 0x6b, 0xec, 0xad, 0x38, 0x49, 0x13, 0x3d, 0x82, 0x07, 0x38, 0x8a, 0x5e, 0x90,
-	0x3e, 0x1e, 0xe3, 0x18, 0x9f, 0x10, 0x1c, 0x11, 0x07, 0xbf, 0x41, 0xdb, 0xd0, 0xce, 0x24, 0xbd,
+	0x89, 0x59, 0xd9, 0x35, 0xf6, 0xd6, 0x1d, 0xd1, 0xb2, 0x7f, 0x0d, 0xcd, 0x43, 0x3c, 0xc5, 0x31,
-	0xfd, 0x5f, 0x78, 0x24, 0x36, 0x2b, 0x9b, 0xd5, 0xad, 0x05, 0x27, 0x27, 0x47, 0x16, 0xcc, 0x1f,
+	0x7e, 0x45, 0x70, 0x44, 0x1c, 0xfc, 0x39, 0x7a, 0x02, 0xad, 0x4c, 0xd2, 0x3f, 0xfc, 0x99, 0x47,
-	0x87, 0xbc, 0x6d, 0x56, 0xd9, 0xba, 0x69, 0x1b, 0x6d, 0x42, 0xe3, 0x38, 0xc4, 0x91, 0x1b, 0x7b,
+	0x62, 0xb3, 0xb2, 0x5b, 0xdd, 0x5b, 0x77, 0x72, 0x72, 0x64, 0xc1, 0xda, 0x49, 0xc8, 0xdb, 0x66,
-	0x81, 0xdf, 0xdb, 0x37, 0x6b, 0xac, 0x5b, 0x16, 0xd9, 0x01, 0x2c, 0x29, 0x7b, 0x93, 0x10, 0x7d,
+	0x95, 0xad, 0x9b, 0xb6, 0xd1, 0x2e, 0xd4, 0x4f, 0x42, 0x1c, 0xb9, 0xb1, 0x17, 0xf8, 0xfd, 0x43,
-	0x4f, 0x56, 0x87, 0xe9, 0xd0, 0x78, 0xdc, 0xde, 0x61, 0x86, 0xc9, 0xe4, 0x8e, 0xac, 0xf2, 0x36,
+	0xb3, 0xc6, 0xba, 0x65, 0x91, 0x1d, 0xc0, 0xa6, 0xb2, 0x37, 0x09, 0xd1, 0x77, 0x65, 0x75, 0x98,
-	0xb4, 0x5f, 0xb8, 0xde, 0x18, 0x8f, 0xf2, 0x70, 0x75, 0xb9, 0x7d, 0x0c, 0x4b, 0x87, 0x38, 0xde,
+	0x0e, 0xf5, 0xa7, 0xad, 0x36, 0xb3, 0x60, 0x26, 0x77, 0x64, 0x95, 0x9f, 0x40, 0xeb, 0xb9, 0xeb,
-	0x1b, 0x8f, 0xb9, 0x8c, 0x6a, 0x6b, 0xc1, 0x7c, 0x90, 0x68, 0x60, 0x70, 0x0d, 0x02, 0x49, 0x83,
+	0x4d, 0xf1, 0x38, 0x0f, 0x57, 0x97, 0xdb, 0x27, 0xb0, 0xd9, 0xc3, 0xf1, 0xc1, 0x74, 0xca, 0x65,
-	0x40, 0xd2, 0x80, 0x1b, 0x4e, 0x16, 0xd9, 0x23, 0x68, 0xab, 0x0b, 0x96, 0x52, 0x61, 0x03, 0x20,
+	0x54, 0x5b, 0x0b, 0xd6, 0x82, 0x44, 0x03, 0x83, 0x6b, 0x10, 0x48, 0x1a, 0x04, 0x92, 0x06, 0xdc,
-	0x07, 0x5e, 0x92, 0xd8, 0xd7, 0xb0, 0xb4, 0x37, 0x1c, 0x06, 0x53, 0x3f, 0xee, 0x5e, 0xe0, 0xe1,
+	0x70, 0xb2, 0xc8, 0x1e, 0x43, 0x4b, 0x5d, 0xb0, 0x94, 0x0a, 0x8f, 0x01, 0x72, 0xe0, 0x25, 0x89,
-	0x25, 0x85, 0xbd, 0x05, 0x4b, 0xec, 0xb7, 0x34, 0xcf, 0x60, 0xf3, 0x74, 0xb1, 0xe2, 0xa2, 0xca,
+	0x7d, 0x0d, 0x9b, 0x07, 0xa3, 0x51, 0x30, 0xf7, 0xe3, 0xee, 0x05, 0x1e, 0x5d, 0x52, 0xd8, 0x7b,
-	0xed, 0x2e, 0xaa, 0xe6, 0x5d, 0xf4, 0x3f, 0x03, 0xda, 0xea, 0xde, 0x5c, 0xc3, 0xe1, 0x0c, 0x1a,
+	0xb0, 0xc9, 0x7e, 0x4b, 0xf3, 0x0c, 0x36, 0x4f, 0x17, 0x2b, 0x2e, 0xaa, 0xdc, 0xec, 0xa2, 0x6a,
-	0x66, 0x63, 0xd0, 0x21, 0x80, 0x83, 0xc9, 0x74, 0x1c, 0xa7, 0x1a, 0x36, 0x1e, 0x7f, 0x87, 0xcf,
+	0xde, 0x45, 0xff, 0x37, 0xa0, 0xa5, 0xee, 0xcd, 0x35, 0x1c, 0x2d, 0xa1, 0x61, 0x36, 0x06, 0xf5,
-	0xd0, 0x57, 0xdf, 0x19, 0x78, 0xfe, 0xf9, 0x98, 0x51, 0x62, 0x10, 0xbb, 0xf1, 0x94, 0x38, 0xd2,
+	0x00, 0x1c, 0x4c, 0xe6, 0xd3, 0x38, 0xd5, 0xb0, 0xfe, 0xf4, 0x23, 0x3e, 0x43, 0x5f, 0xbd, 0x3d,
-	0x54, 0xab, 0x0f, 0x6d, 0xbd, 0x9f, 0x52, 0x7b, 0x2a, 0x3b, 0x50, 0xb4, 0xd0, 0x17, 0xd0, 0x74,
+	0xf4, 0xfc, 0xc9, 0x94, 0x51, 0x62, 0x18, 0xbb, 0xf1, 0x9c, 0x38, 0xd2, 0x54, 0x6b, 0x00, 0x2d,
-	0xf9, 0xe2, 0x7c, 0xa0, 0x50, 0x5f, 0x15, 0xda, 0x3e, 0xb4, 0x0e, 0x71, 0xcc, 0x0c, 0xe2, 0x9f,
+	0xbd, 0x9f, 0x52, 0x7b, 0x2e, 0x3b, 0x50, 0xb4, 0xd0, 0x07, 0xd0, 0x70, 0xf9, 0xe2, 0x7c, 0xa0,
-	0x05, 0xd4, 0xb6, 0x1b, 0x00, 0x53, 0xdd, 0xac, 0x92, 0xe4, 0x9e, 0x16, 0xfd, 0x83, 0xc1, 0x48,
+	0x50, 0x5f, 0x15, 0xda, 0x3e, 0x34, 0x7b, 0x38, 0x66, 0x06, 0xf1, 0xcf, 0x03, 0x6a, 0xdb, 0xc7,
-	0x98, 0x6d, 0x58, 0xca, 0xa0, 0xcf, 0x60, 0x31, 0x59, 0x81, 0xa1, 0xac, 0x32, 0x93, 0x7e, 0x6d,
+	0x00, 0x73, 0xdd, 0xac, 0x92, 0xe4, 0x8e, 0x16, 0xfd, 0xbd, 0xc1, 0x48, 0x98, 0x6d, 0x58, 0xca,
-	0x87, 0xe0, 0xe8, 0x0a, 0x47, 0xa7, 0x6e, 0xe8, 0x9d, 0x86, 0x6e, 0xe4, 0x4e, 0xc8, 0x4e, 0xba,
+	0xa0, 0x9f, 0xc2, 0x46, 0xb2, 0x02, 0x43, 0x59, 0x65, 0x26, 0xfd, 0x5a, 0x9b, 0xe0, 0xe8, 0x0a,
-	0x91, 0x32, 0xc1, 0xfe, 0x93, 0x01, 0xcb, 0x27, 0xe1, 0xc8, 0x15, 0xe1, 0x2c, 0x54, 0x7f, 0x02,
+	0x47, 0xa7, 0x6e, 0xe8, 0x9d, 0x86, 0x6e, 0xe4, 0xce, 0x48, 0x3b, 0xdd, 0x48, 0x99, 0x60, 0xff,
-	0xf3, 0x49, 0x53, 0xc0, 0xb8, 0x75, 0xc9, 0x74, 0xf0, 0x5d, 0x36, 0x09, 0xf2, 0x36, 0x91, 0xc3,
+	0xdb, 0x80, 0xad, 0x57, 0xe1, 0xd8, 0x15, 0xe1, 0x2c, 0x54, 0x7f, 0x06, 0x6b, 0x49, 0x53, 0xc0,
-	0xe8, 0x05, 0x20, 0x1d, 0x4b, 0x19, 0xab, 0xd8, 0xff, 0xad, 0xc2, 0x62, 0x37, 0xf0, 0xaf, 0x70,
+	0xb8, 0x71, 0xc9, 0x74, 0xf0, 0x6d, 0x36, 0x09, 0xf2, 0x36, 0x91, 0x44, 0xa8, 0x07, 0xad, 0xc9,
-	0x44, 0xd8, 0xd2, 0xcc, 0x1d, 0x6f, 0x7d, 0x1c, 0x29, 0x01, 0x2e, 0x8b, 0xd0, 0x97, 0xd0, 0x92,
+	0x34, 0x38, 0x73, 0xa7, 0x0e, 0x1e, 0x5d, 0xbd, 0x20, 0x93, 0x93, 0x30, 0x66, 0xf9, 0x82, 0x6e,
-	0x67, 0xa4, 0xf0, 0x35, 0x29, 0x25, 0x85, 0x83, 0x87, 0x57, 0x2f, 0xc9, 0xf9, 0x71, 0x18, 0x33,
+	0x3f, 0x09, 0x82, 0xc9, 0x14, 0xf3, 0x6c, 0x77, 0x36, 0x3f, 0x6f, 0xf7, 0xfd, 0xf8, 0xe3, 0xa7,
-	0x1d, 0xea, 0x8e, 0x24, 0xa1, 0x69, 0x48, 0x9e, 0xf1, 0xea, 0x3a, 0xc4, 0x2c, 0xe5, 0xd5, 0x9d,
+	0x3f, 0x77, 0xa7, 0x73, 0xec, 0xe4, 0x26, 0xd9, 0xcf, 0x01, 0xe9, 0x4a, 0x95, 0x31, 0xaf, 0xfd,
-	0x9c, 0x9c, 0x12, 0x56, 0x00, 0xaa, 0x73, 0xc2, 0x0a, 0x2c, 0x26, 0xcc, 0x1d, 0x46, 0xc1, 0x34,
+	0xdf, 0x2a, 0x6c, 0x74, 0x03, 0xff, 0x0a, 0x47, 0x84, 0x61, 0x64, 0x7e, 0x7d, 0xed, 0xe3, 0x48,
-	0xec, 0xed, 0x9b, 0x8f, 0x58, 0x47, 0xd2, 0xa4, 0x7a, 0x9c, 0xf8, 0x11, 0x76, 0x47, 0x5d, 0xca,
+	0xc9, 0x14, 0xb2, 0x08, 0x7d, 0x08, 0x4d, 0x79, 0x46, 0x6a, 0x07, 0x4d, 0x4a, 0xd9, 0x25, 0x69,
-	0x5c, 0x73, 0x8e, 0x2d, 0x2c, 0x8b, 0x28, 0xd9, 0xf7, 0x23, 0xf7, 0x2c, 0x7e, 0x85, 0xdf, 0xc5,
+	0x59, 0x65, 0x59, 0x5a, 0x92, 0xd0, 0x7c, 0x26, 0xcf, 0x78, 0x79, 0x1d, 0x62, 0x66, 0x8b, 0x15,
-	0xaf, 0xbc, 0x09, 0x36, 0xe7, 0x37, 0x8d, 0xad, 0xaa, 0xa3, 0x0a, 0xa9, 0x9b, 0x7a, 0xa4, 0xef,
+	0x27, 0x27, 0xa7, 0xcc, 0x17, 0x80, 0x56, 0x38, 0xf3, 0x05, 0x16, 0x13, 0x56, 0x7b, 0x51, 0x30,
-	0xf9, 0x3e, 0x1e, 0x99, 0x0b, 0x9b, 0xc6, 0xd6, 0xbc, 0x93, 0xb6, 0x91, 0x0d, 0x8b, 0x7b, 0x71,
+	0x0f, 0xfb, 0x87, 0xe6, 0x03, 0xd6, 0x91, 0x34, 0xa9, 0x1e, 0xaf, 0xfc, 0x08, 0xbb, 0xe3, 0x2e,
-	0xec, 0x0e, 0x2f, 0xf0, 0x88, 0xf9, 0x1f, 0x18, 0x04, 0x45, 0x46, 0x77, 0xe9, 0x91, 0x7e, 0xe4,
+	0x0d, 0x01, 0x73, 0x95, 0x2d, 0x2c, 0x8b, 0x68, 0xd4, 0x1c, 0x46, 0xee, 0x79, 0xfc, 0x12, 0xbf,
-	0x5d, 0xb9, 0x31, 0xee, 0x5e, 0xb8, 0xb1, 0xd9, 0x60, 0x8b, 0xa8, 0x42, 0x8a, 0x96, 0x01, 0xdf,
+	0x89, 0x5f, 0x7a, 0x33, 0x6c, 0xae, 0xed, 0x1a, 0x7b, 0x55, 0x47, 0x15, 0x52, 0x7f, 0xf7, 0xc9,
-	0x8b, 0x99, 0x19, 0x16, 0x39, 0x5a, 0x49, 0x44, 0xf7, 0xea, 0x91, 0xa3, 0x20, 0xee, 0xf9, 0x4c,
+	0xc0, 0xf3, 0x7d, 0x3c, 0x36, 0xd7, 0x77, 0x8d, 0xbd, 0x35, 0x27, 0x6d, 0x23, 0x1b, 0x36, 0x0e,
-	0x6a, 0x36, 0xd9, 0x32, 0x8a, 0x0c, 0xb5, 0xa0, 0x72, 0xf0, 0xce, 0x6c, 0x31, 0x14, 0x95, 0x83,
+	0xe2, 0xd8, 0x1d, 0x5d, 0xe0, 0x31, 0x23, 0x12, 0x30, 0x08, 0x8a, 0x8c, 0xee, 0xd2, 0x27, 0x83,
-	0x77, 0xf6, 0xdf, 0x0c, 0x40, 0x03, 0x1c, 0xcb, 0xd6, 0xa4, 0x94, 0xfd, 0x91, 0xea, 0x72, 0xc1,
+	0xc8, 0xbb, 0x72, 0x63, 0xdc, 0xbd, 0x70, 0x63, 0xb3, 0xce, 0x16, 0x51, 0x85, 0x14, 0x2d, 0x03,
-	0x13, 0x94, 0xf0, 0x44, 0x1a, 0xac, 0x52, 0x63, 0x1b, 0xda, 0x7e, 0x10, 0x7b, 0x67, 0xde, 0x30,
+	0x7e, 0x10, 0x33, 0x33, 0x6c, 0x70, 0xb4, 0x92, 0x88, 0xee, 0xd5, 0x27, 0xc7, 0x41, 0xdc, 0xf7,
-	0x73, 0x58, 0x85, 0x3b, 0x4c, 0x97, 0xcf, 0x10, 0xd5, 0x87, 0xb0, 0x92, 0xc3, 0x56, 0x8a, 0xc2,
+	0x99, 0xd4, 0x6c, 0xb0, 0x65, 0x14, 0x19, 0x6a, 0x42, 0xe5, 0xe8, 0x8d, 0xd9, 0x64, 0x28, 0x2a,
-	0xff, 0x36, 0xa0, 0x3d, 0xc0, 0x71, 0xc6, 0x2c, 0xaa, 0xe3, 0x27, 0xa5, 0x71, 0xce, 0x2a, 0xb5,
+	0x47, 0x6f, 0xec, 0xbf, 0x1a, 0x80, 0x86, 0x38, 0x96, 0xad, 0x49, 0xb9, 0xff, 0x03, 0xd5, 0xe5,
-	0xd9, 0xac, 0x52, 0xcf, 0x5b, 0xe5, 0x00, 0x96, 0x35, 0x5d, 0x4a, 0xd9, 0xe4, 0xb7, 0x06, 0xa0,
+	0x82, 0x27, 0x28, 0xe1, 0x89, 0x34, 0x58, 0xa5, 0xc6, 0x13, 0x68, 0xf9, 0x41, 0xec, 0x9d, 0x7b,
-	0xc3, 0xbc, 0xe7, 0xf3, 0x3a, 0x1b, 0x85, 0x3a, 0x6b, 0xd6, 0xab, 0xe4, 0xad, 0x77, 0xb7, 0x7f,
+	0xa3, 0xcc, 0x61, 0x15, 0xee, 0x30, 0x5d, 0xbe, 0x44, 0x7a, 0xe8, 0xc1, 0xc3, 0x1c, 0xb6, 0x52,
-	0xdf, 0xc3, 0xca, 0xe1, 0x43, 0xf8, 0x37, 0x47, 0xd7, 0xca, 0x6c, 0x74, 0xb5, 0x7f, 0x6f, 0xe4,
+	0x14, 0xfe, 0x97, 0x01, 0xad, 0x21, 0x8e, 0x33, 0x66, 0x51, 0x1d, 0xdf, 0x29, 0x8d, 0x73, 0x56,
-	0x10, 0x90, 0xd9, 0xa8, 0x41, 0x4b, 0x05, 0xc5, 0x20, 0x44, 0x94, 0x18, 0xba, 0x78, 0x06, 0x33,
+	0xa9, 0x2d, 0x67, 0x95, 0x95, 0xbc, 0x55, 0x8e, 0x60, 0x4b, 0xd3, 0xa5, 0x94, 0x4d, 0x7e, 0x63,
-	0xfc, 0xce, 0x80, 0xd5, 0x3c, 0x8a, 0x52, 0x86, 0xf8, 0x31, 0x34, 0x95, 0x65, 0x44, 0x55, 0x50,
+	0x00, 0xea, 0xe5, 0x3d, 0x9f, 0xd7, 0xd9, 0x28, 0xd4, 0x59, 0xb3, 0x5e, 0x25, 0x6f, 0xbd, 0xdb,
-	0x64, 0x09, 0x75, 0xa0, 0xfd, 0x6b, 0x58, 0xe3, 0x45, 0x57, 0x09, 0x63, 0x68, 0x2a, 0x56, 0xf2,
+	0xfd, 0xfb, 0x05, 0x3c, 0xec, 0xdd, 0x87, 0x7f, 0x73, 0x74, 0xad, 0x2c, 0x47, 0x57, 0xfb, 0x77,
-	0x2a, 0xfe, 0xd1, 0x80, 0xf5, 0xc2, 0xe5, 0x3f, 0xb1, 0x96, 0xff, 0x32, 0xc0, 0xec, 0xb8, 0xf1,
+	0x46, 0x0e, 0x01, 0x59, 0x8e, 0x1a, 0xb4, 0xe6, 0x50, 0x0c, 0x42, 0x44, 0xad, 0xa2, 0x8b, 0x97,
-	0xf0, 0x62, 0x50, 0xe0, 0xf5, 0xdc, 0xb2, 0xc6, 0x8c, 0xcb, 0xce, 0x10, 0x0c, 0x45, 0x29, 0xa0,
+	0x30, 0xc3, 0x6f, 0x0d, 0xd8, 0xce, 0xa3, 0x28, 0x65, 0x88, 0x1f, 0x42, 0x43, 0x59, 0x46, 0x94,
-	0x3a, 0x5b, 0x0a, 0xa8, 0x15, 0x05, 0xce, 0xe7, 0x37, 0x68, 0x51, 0xca, 0x9e, 0x26, 0xcc, 0x0d,
+	0x17, 0x45, 0x96, 0x50, 0x07, 0xda, 0xbf, 0x82, 0x47, 0xbc, 0x7a, 0x2b, 0x61, 0x0c, 0x4d, 0xc5,
-	0xa6, 0xc3, 0x21, 0x26, 0x09, 0x89, 0x93, 0x26, 0x3d, 0x54, 0x79, 0xbd, 0xcf, 0x6a, 0xa1, 0x05,
+	0x4a, 0x5e, 0xc5, 0x3f, 0x18, 0xb0, 0x53, 0xb8, 0xfc, 0x3b, 0xd6, 0xf2, 0x9f, 0x06, 0x98, 0x1d,
-	0x47, 0xb4, 0xec, 0x1e, 0x34, 0x1d, 0x4c, 0xbc, 0x73, 0x9f, 0xaa, 0x47, 0x6d, 0x97, 0x9c, 0xbe,
+	0x37, 0x1e, 0x5d, 0x0c, 0x0b, 0xbc, 0x9e, 0x5b, 0xd6, 0x58, 0x72, 0xd9, 0x25, 0x82, 0xa1, 0x28,
-	0xa3, 0xa4, 0x5c, 0xe4, 0xad, 0x19, 0xa8, 0xd1, 0x81, 0x96, 0xbc, 0x54, 0xa9, 0x5c, 0xf6, 0xf3,
+	0x05, 0x54, 0x97, 0x4b, 0x01, 0xb5, 0xa2, 0xc0, 0x79, 0x7f, 0x81, 0x16, 0xa5, 0xec, 0x69, 0xc2,
-	0xb4, 0xdc, 0xec, 0x5c, 0xf7, 0x46, 0xf7, 0xc3, 0xf3, 0xd1, 0x80, 0x1a, 0x1d, 0x4c, 0x8f, 0xd3,
+	0xea, 0x70, 0x3e, 0x1a, 0x61, 0x92, 0x90, 0x38, 0x69, 0xd2, 0x43, 0x95, 0x5f, 0x1c, 0x58, 0x51,
-	0x7e, 0x14, 0x9c, 0x79, 0x63, 0xdc, 0xbf, 0x08, 0xe2, 0x40, 0x2c, 0xa4, 0xc8, 0xe8, 0xd1, 0x7f,
+	0xb5, 0xee, 0x88, 0x96, 0xdd, 0x87, 0x86, 0x83, 0x89, 0x37, 0xf1, 0xa9, 0x7a, 0xd4, 0x76, 0xc9,
-	0xe4, 0x0d, 0x2f, 0x7d, 0x77, 0x82, 0x93, 0x0a, 0x2d, 0x69, 0x4b, 0x10, 0xaa, 0x0a, 0x84, 0x0d,
+	0xe9, 0x3b, 0x4e, 0xea, 0x4e, 0xde, 0x5a, 0x82, 0x1a, 0x1d, 0x68, 0xca, 0x4b, 0x95, 0xca, 0x65,
-	0x80, 0x6e, 0x84, 0xdd, 0x18, 0xb3, 0x8a, 0x82, 0x7b, 0x57, 0x92, 0x50, 0x6f, 0xf4, 0x48, 0x67,
+	0x3f, 0x4d, 0xeb, 0xd6, 0xce, 0x75, 0x7f, 0x7c, 0x37, 0x3c, 0x5f, 0x1a, 0x50, 0xa3, 0x83, 0xe9,
-	0x1c, 0x0c, 0x2f, 0x59, 0xf6, 0x9f, 0x77, 0x92, 0xa6, 0x3d, 0x4c, 0x8b, 0x5c, 0xae, 0x66, 0xc9,
+	0x71, 0x3a, 0x88, 0x82, 0x73, 0x6f, 0x8a, 0x07, 0x17, 0x41, 0x1c, 0x88, 0x85, 0x14, 0x19, 0x3d,
-	0x7b, 0x11, 0xbb, 0x06, 0x8b, 0x1c, 0x09, 0x7c, 0x2c, 0xb3, 0x3d, 0x93, 0xdb, 0x1f, 0x0c, 0x58,
+	0xfa, 0x8f, 0xbd, 0xd1, 0xa5, 0xef, 0xce, 0x70, 0x52, 0xea, 0x25, 0x6d, 0x09, 0x42, 0x55, 0x81,
-	0x16, 0xbb, 0x90, 0xce, 0xf5, 0x91, 0x3b, 0xc1, 0xe2, 0x46, 0x47, 0x25, 0xb4, 0x99, 0xdc, 0xe8,
+	0xf0, 0x18, 0xa0, 0x1b, 0x61, 0x37, 0xc6, 0xac, 0xa2, 0xe0, 0xde, 0x95, 0x24, 0xd4, 0x1b, 0x7d,
-	0x92, 0x36, 0xda, 0x07, 0xe8, 0xbb, 0xe7, 0x9e, 0x2f, 0xe7, 0xde, 0x2f, 0x0a, 0x2a, 0x5c, 0x07,
+	0xd2, 0x99, 0x06, 0xa3, 0x4b, 0x96, 0xfd, 0xd7, 0x9c, 0xa4, 0x69, 0x8f, 0xd2, 0x6a, 0x99, 0xab,
-	0xbf, 0x99, 0x62, 0x12, 0x67, 0x63, 0x1d, 0x69, 0xde, 0x0c, 0x79, 0xf2, 0xaf, 0xfc, 0xc4, 0x52,
+	0x59, 0xf2, 0x82, 0xc5, 0x2e, 0xde, 0x22, 0x47, 0x02, 0x1f, 0xcb, 0x6c, 0xcf, 0xe4, 0xf6, 0x9f,
-	0x90, 0x91, 0x10, 0x6d, 0x42, 0x9d, 0x02, 0x4f, 0xc2, 0x55, 0xd6, 0x88, 0x77, 0xa0, 0x83, 0x02,
+	0x0d, 0xd8, 0x12, 0xbb, 0x90, 0xce, 0xf5, 0xb1, 0x3b, 0xc3, 0xe2, 0x6a, 0x48, 0x25, 0xb4, 0x99,
-	0x80, 0xdf, 0x2e, 0x04, 0x48, 0xc2, 0xc0, 0x27, 0xf8, 0x06, 0x84, 0x89, 0x0d, 0xa6, 0x13, 0x22,
+	0x5c, 0x0d, 0x93, 0x36, 0x3a, 0x04, 0x18, 0xb8, 0x13, 0xcf, 0x97, 0x73, 0xef, 0x07, 0x05, 0xa5,
-	0x62, 0x37, 0x6d, 0xdb, 0xff, 0x30, 0x60, 0x71, 0x6f, 0x1c, 0xf3, 0x78, 0xbf, 0x17, 0x01, 0xe9,
+	0xb2, 0x83, 0x3f, 0x9f, 0x63, 0x12, 0x67, 0x63, 0x1d, 0x69, 0xde, 0x12, 0x79, 0xf2, 0x2f, 0xfc,
-	0x88, 0xfe, 0x45, 0xe0, 0xe3, 0xa3, 0xe9, 0xe4, 0x35, 0x8e, 0xd8, 0x4e, 0x55, 0x47, 0x16, 0x29,
+	0xc4, 0x52, 0x90, 0x91, 0x10, 0xed, 0xc2, 0x0a, 0x05, 0x9e, 0x84, 0xab, 0xac, 0x11, 0xef, 0x40,
-	0xac, 0xab, 0x69, 0xac, 0x5b, 0x85, 0xfa, 0xc1, 0xc4, 0xf5, 0xc6, 0xa2, 0x72, 0xe0, 0x0d, 0xe9,
+	0x47, 0x05, 0x00, 0xbf, 0x5d, 0x08, 0x90, 0x84, 0x81, 0x4f, 0xf0, 0x02, 0x84, 0x89, 0x0d, 0xe6,
-	0x26, 0x31, 0x12, 0x55, 0x70, 0xda, 0xb6, 0xf7, 0xa0, 0x29, 0x21, 0x2f, 0xc3, 0x29, 0xfb, 0x2f,
+	0x33, 0x22, 0x62, 0x37, 0x6d, 0xdb, 0x7f, 0x37, 0x60, 0xe3, 0x60, 0x1a, 0xf3, 0x78, 0xbf, 0x13,
-	0x06, 0x34, 0x12, 0xcf, 0x24, 0x47, 0x86, 0xa4, 0xa4, 0x91, 0x57, 0xf2, 0x61, 0x38, 0x23, 0xb3,
+	0x01, 0xe9, 0x88, 0xc1, 0x45, 0xe0, 0xe3, 0xe3, 0xf9, 0xec, 0x0c, 0x47, 0x6c, 0xa7, 0xaa, 0x23,
-	0xb2, 0xaa, 0xb2, 0xd2, 0xfe, 0xa7, 0x01, 0x8b, 0x19, 0xa6, 0x7b, 0x86, 0x4a, 0xb5, 0x28, 0x54,
+	0x8b, 0x14, 0xd6, 0xd5, 0x34, 0xd6, 0x6d, 0xc3, 0xca, 0xd1, 0xcc, 0xf5, 0xa6, 0xa2, 0x72, 0xe0,
-	0x34, 0x5e, 0x55, 0x1f, 0x82, 0x57, 0x35, 0x8d, 0x57, 0x1f, 0x0d, 0x80, 0xbd, 0xd1, 0x28, 0x61,
+	0x0d, 0xe9, 0x4a, 0x32, 0x16, 0x55, 0x70, 0xda, 0xb6, 0x0f, 0xa0, 0x21, 0x21, 0x2f, 0xc3, 0x29,
-	0xd5, 0xdd, 0x86, 0xd5, 0xd8, 0x23, 0xf8, 0x25, 0xb3, 0xe7, 0xa6, 0xbc, 0x84, 0xa0, 0x26, 0x31,
+	0xfb, 0x4f, 0x06, 0xd4, 0x13, 0xcf, 0x24, 0x47, 0x86, 0xa4, 0xa4, 0x91, 0x57, 0xf2, 0x7e, 0x38,
-	0x8a, 0xfd, 0x56, 0x78, 0x53, 0xd7, 0x78, 0xf3, 0x0c, 0x1a, 0x29, 0xb2, 0x52, 0xac, 0xf9, 0xb3,
+	0x23, 0xb3, 0xb2, 0xaa, 0xb2, 0xd2, 0xfe, 0x87, 0x01, 0x1b, 0x19, 0xa6, 0x3b, 0x86, 0x4a, 0xb5,
-	0x01, 0x8b, 0x2c, 0xb1, 0xdd, 0x15, 0x33, 0x5f, 0x42, 0xeb, 0xc0, 0x1f, 0xed, 0x7b, 0xc4, 0x7d,
+	0x28, 0x54, 0x34, 0x5e, 0x55, 0xef, 0x83, 0x57, 0x35, 0x8d, 0x57, 0x5f, 0x1a, 0x00, 0x07, 0xe3,
-	0x3d, 0xe6, 0x59, 0x53, 0xd4, 0xe1, 0xaa, 0xf4, 0xee, 0x14, 0xa2, 0xe8, 0x53, 0xcb, 0xc7, 0x81,
+	0x71, 0xc2, 0xaa, 0xdb, 0x0d, 0xab, 0xb1, 0x47, 0xf0, 0x4b, 0x66, 0xcf, 0xa2, 0xbc, 0x84, 0xa0,
-	0x84, 0xa6, 0x94, 0x46, 0x67, 0xd0, 0x3a, 0xf1, 0x67, 0x52, 0xe9, 0xee, 0x34, 0x20, 0x43, 0xad,
+	0x26, 0x31, 0x8a, 0xfd, 0x56, 0x78, 0xb3, 0xa2, 0xf1, 0xe6, 0x53, 0xa8, 0xa7, 0xc8, 0x4a, 0xb1,
-	0x6a, 0x50, 0xbb, 0xb0, 0xa4, 0xec, 0x53, 0x0a, 0xec, 0xdf, 0x0d, 0xf6, 0xce, 0x96, 0x2e, 0xc3,
+	0xe6, 0x8f, 0x06, 0x6c, 0xb0, 0xc4, 0x76, 0x5b, 0xcc, 0x7c, 0x08, 0xcd, 0x23, 0x7f, 0x7c, 0xe8,
-	0x22, 0x57, 0x8d, 0x4b, 0xe3, 0x61, 0x72, 0x79, 0x81, 0x76, 0xb6, 0xe4, 0xfa, 0xa3, 0xe9, 0x44,
+	0x11, 0xf7, 0x6c, 0xca, 0xb3, 0xa6, 0xa8, 0xc3, 0x55, 0xe9, 0xed, 0x29, 0x44, 0xd1, 0xa7, 0x96,
-	0xe4, 0x53, 0x45, 0x66, 0xbf, 0x87, 0x85, 0xb4, 0x4d, 0x63, 0x91, 0xfe, 0x17, 0x90, 0x94, 0x58,
+	0x8f, 0x03, 0x09, 0x4d, 0x29, 0x8d, 0xce, 0xa1, 0xf9, 0xca, 0x5f, 0x4a, 0xa5, 0xdb, 0xd3, 0x80,
-	0x64, 0xfd, 0xdb, 0xd0, 0xee, 0xe0, 0x73, 0xcf, 0xcf, 0xb3, 0x24, 0x27, 0x2f, 0xe0, 0x53, 0xb5,
+	0x0c, 0xb5, 0xaa, 0x41, 0xed, 0xc2, 0xa6, 0xb2, 0x4f, 0x29, 0xb0, 0x7f, 0x33, 0xd8, 0x83, 0x5d,
-	0x88, 0x4f, 0xf6, 0x7f, 0xf8, 0x51, 0x28, 0x5b, 0xa8, 0x54, 0x1e, 0xd9, 0x05, 0xc8, 0xd6, 0x10,
+	0xba, 0x0c, 0x8b, 0x5c, 0x35, 0x2e, 0x8d, 0xfb, 0xc9, 0xe5, 0x05, 0xda, 0xd9, 0x92, 0xeb, 0x8f,
-	0xd9, 0x64, 0x89, 0xcf, 0xc8, 0x9c, 0x28, 0x0d, 0xf9, 0x14, 0x89, 0xa5, 0xcf, 0x6e, 0x3e, 0xe9,
+	0xe7, 0x33, 0x91, 0x4f, 0x15, 0x99, 0xfd, 0x05, 0xac, 0xa7, 0x6d, 0x1a, 0x8b, 0xf4, 0xbf, 0x80,
-	0x9e, 0x49, 0xdd, 0xb4, 0x0e, 0x73, 0xb4, 0x79, 0xea, 0x7d, 0xf5, 0xc2, 0xe9, 0x80, 0xdd, 0x62,
+	0xa4, 0xc4, 0x22, 0xeb, 0x7f, 0x02, 0xad, 0x0e, 0x9e, 0x78, 0x7e, 0x9e, 0x25, 0x39, 0x79, 0x01,
-	0xb4, 0x15, 0x49, 0x88, 0xbe, 0x2b, 0xb9, 0x51, 0x64, 0xfa, 0x9c, 0xf2, 0xd9, 0x08, 0xfb, 0x0c,
+	0x9f, 0xaa, 0x45, 0x7c, 0xb2, 0xff, 0xc3, 0x8f, 0x42, 0xd9, 0x42, 0xa5, 0xf2, 0xc8, 0x3e, 0x40,
-	0x9a, 0xd9, 0xfb, 0xf5, 0xfd, 0x20, 0xdd, 0x1a, 0x43, 0x1d, 0xf9, 0x8d, 0xbe, 0x9c, 0x63, 0x1f,
+	0xb6, 0x86, 0xc8, 0x26, 0x9b, 0x7c, 0x46, 0xe6, 0x44, 0x69, 0xc8, 0xbb, 0x48, 0x2c, 0x03, 0x76,
-	0x7f, 0x68, 0xf0, 0x13, 0x02, 0x3d, 0x4d, 0xcf, 0x3f, 0xf6, 0xa2, 0xb3, 0xca, 0x67, 0xa9, 0x4f,
+	0xf3, 0x49, 0xf7, 0x4c, 0xea, 0xa6, 0x1d, 0x58, 0xa5, 0xcd, 0x53, 0xef, 0xed, 0x0b, 0xa7, 0x23,
-	0xa0, 0xd6, 0x67, 0x05, 0x52, 0x12, 0xa2, 0x2e, 0xb4, 0xd4, 0x77, 0x3a, 0xb4, 0x2e, 0xd8, 0xad,
+	0x76, 0x8b, 0xd1, 0x56, 0x24, 0x21, 0xfa, 0x8e, 0xe4, 0x46, 0x91, 0xe9, 0x73, 0xca, 0x67, 0x23,
-	0xbf, 0x24, 0x5a, 0x66, 0x71, 0x07, 0x09, 0x29, 0x00, 0xe9, 0xd5, 0x3f, 0x01, 0xa0, 0x7e, 0x84,
+	0xec, 0x73, 0x68, 0x64, 0x0f, 0xe1, 0x77, 0x83, 0x74, 0x63, 0x0c, 0x75, 0xe4, 0xc7, 0xfe, 0x72,
-	0x48, 0x00, 0xe8, 0x9f, 0x07, 0x7e, 0xca, 0x0e, 0xca, 0xf4, 0xbd, 0x1d, 0x65, 0x38, 0xe5, 0x47,
+	0x8e, 0x7d, 0xfa, 0xbf, 0x3a, 0x3f, 0x21, 0xd0, 0x27, 0xe9, 0xf9, 0xc7, 0x5e, 0x74, 0xb6, 0xf9,
-	0x7d, 0x6b, 0xad, 0x48, 0xcc, 0xa7, 0xcb, 0xcf, 0xcd, 0xc9, 0x74, 0xed, 0x71, 0x3d, 0x99, 0x9e,
+	0x2c, 0xf5, 0x2d, 0xd5, 0x7a, 0xaf, 0x40, 0x4a, 0x42, 0xd4, 0x85, 0xa6, 0xfa, 0x4e, 0x87, 0x76,
-	0x7b, 0xf7, 0x7e, 0xc1, 0x8a, 0x5a, 0xe5, 0x15, 0xc9, 0x4c, 0x77, 0xd2, 0x5e, 0x27, 0xac, 0xcf,
+	0x04, 0xbb, 0xf5, 0x27, 0x49, 0xcb, 0x2c, 0xee, 0x20, 0x21, 0x05, 0x20, 0x7d, 0x3e, 0x48, 0x00,
-	0x6f, 0xe8, 0x21, 0x21, 0x72, 0x18, 0xa1, 0xf5, 0x1b, 0x26, 0xfa, 0xba, 0x8c, 0x5a, 0xbf, 0xf2,
+	0xa8, 0x5f, 0x33, 0x12, 0x00, 0xfa, 0x77, 0x86, 0x1f, 0xb3, 0x83, 0x32, 0x7d, 0xb8, 0x47, 0x19,
-	0x59, 0xdf, 0xb8, 0xa5, 0x97, 0x84, 0xa8, 0xc7, 0x32, 0xa4, 0xba, 0x60, 0x31, 0x04, 0xb6, 0x9a,
+	0x4e, 0xf9, 0xeb, 0x80, 0xf5, 0xa8, 0x48, 0xcc, 0xa7, 0xcb, 0xef, 0xd6, 0xc9, 0x74, 0xed, 0x95,
-	0x75, 0x53, 0x17, 0x09, 0xd1, 0x2f, 0xe1, 0xb3, 0xc2, 0x2b, 0x1b, 0xda, 0x10, 0xb1, 0x70, 0xc3,
+	0x3e, 0x99, 0x9e, 0x7b, 0x40, 0x7f, 0xce, 0x8a, 0x5a, 0xe5, 0x15, 0xc9, 0x4c, 0x77, 0xd2, 0x5e,
-	0xad, 0xd4, 0xfa, 0xe6, 0xad, 0xfd, 0xdc, 0x80, 0x83, 0x62, 0x03, 0x0e, 0x6e, 0x34, 0x60, 0xd1,
+	0x27, 0xac, 0xf7, 0x17, 0xf4, 0x90, 0x10, 0x39, 0x8c, 0xd0, 0xfa, 0x0d, 0x13, 0x7d, 0x5d, 0x46,
-	0xb3, 0xda, 0x73, 0x68, 0x2a, 0xef, 0x4a, 0x68, 0x2d, 0x1d, 0xab, 0x3c, 0x9c, 0x59, 0xeb, 0x85,
+	0xad, 0x5f, 0xf9, 0xac, 0x6f, 0xdc, 0xd0, 0x4b, 0x42, 0xd4, 0x67, 0x19, 0x52, 0x5d, 0xb0, 0x18,
-	0x72, 0x4e, 0x42, 0xe9, 0x7e, 0xa2, 0x45, 0x81, 0xc8, 0x30, 0x5a, 0x14, 0xa4, 0x59, 0xa2, 0x9b,
+	0x02, 0x5b, 0xcd, 0x5a, 0xd4, 0x45, 0x42, 0xf4, 0x0b, 0x78, 0xaf, 0xf0, 0xca, 0x86, 0x1e, 0x8b,
-	0x5e, 0xe1, 0x44, 0x6d, 0x9f, 0x44, 0x41, 0xee, 0x2e, 0x62, 0x99, 0xc5, 0x1d, 0x24, 0x44, 0x4f,
+	0x58, 0x58, 0x70, 0x2b, 0xb5, 0xbe, 0x79, 0x63, 0x3f, 0x37, 0xe0, 0xb0, 0xd8, 0x80, 0xc3, 0x85,
-	0xd8, 0x17, 0x11, 0x71, 0x97, 0x44, 0x2b, 0x7c, 0x9c, 0x72, 0x51, 0xb5, 0x56, 0xf3, 0x42, 0x12,
+	0x06, 0x2c, 0x7a, 0x56, 0xfb, 0x0c, 0x1a, 0xca, 0xbb, 0x12, 0x7a, 0x94, 0x8e, 0x55, 0x1e, 0xce,
-	0xa2, 0x1f, 0xc2, 0x42, 0x5a, 0x03, 0x23, 0x71, 0xe1, 0x97, 0xcb, 0x79, 0x6b, 0x25, 0x27, 0x23,
+	0xac, 0x9d, 0x42, 0x39, 0x27, 0xa1, 0x74, 0x3f, 0xd1, 0xa2, 0x40, 0x64, 0x18, 0x2d, 0x0a, 0xd2,
-	0x21, 0xfa, 0x3e, 0xcc, 0x27, 0x20, 0xd0, 0xb2, 0x0a, 0x8a, 0xce, 0x41, 0xba, 0x88, 0x84, 0x68,
+	0x2c, 0xd1, 0x4d, 0xaf, 0x70, 0xa2, 0xb6, 0x4f, 0xa2, 0x20, 0x77, 0x17, 0xb1, 0xcc, 0xe2, 0x0e,
-	0x07, 0xe6, 0x44, 0xd1, 0x84, 0x44, 0x6a, 0xc9, 0xaa, 0x3b, 0x6b, 0x59, 0x93, 0x70, 0x60, 0xd9,
+	0x12, 0xa2, 0x67, 0xec, 0xd3, 0x8a, 0xb8, 0x4b, 0xa2, 0x87, 0x7c, 0x9c, 0x72, 0x51, 0xb5, 0xb6,
-	0x19, 0x88, 0xf4, 0xb4, 0x99, 0x01, 0x53, 0x8b, 0x81, 0xa7, 0xd0, 0x90, 0xea, 0x83, 0xc4, 0x11,
+	0xf3, 0x42, 0x12, 0xa2, 0xef, 0xc3, 0x7a, 0x5a, 0x03, 0x23, 0x71, 0xe1, 0x97, 0xcb, 0x79, 0xeb,
-	0x6a, 0x69, 0x92, 0x38, 0x42, 0x2f, 0x24, 0x9e, 0x43, 0x53, 0x39, 0xf3, 0x50, 0x16, 0xf7, 0x4a,
+	0x61, 0x4e, 0x46, 0x42, 0xf4, 0x3d, 0x58, 0x4b, 0x40, 0xa0, 0x2d, 0x15, 0x14, 0x9d, 0x83, 0x74,
-	0xa9, 0x60, 0xad, 0x17, 0xca, 0xd3, 0xa8, 0x51, 0x0e, 0x02, 0x29, 0x6a, 0xf4, 0x23, 0x47, 0x8a,
+	0x11, 0x09, 0x51, 0x1b, 0x56, 0x45, 0xd1, 0x84, 0x44, 0x6a, 0xc9, 0xaa, 0x3b, 0x6b, 0x4b, 0x93,
-	0x9a, 0xfc, 0xd9, 0xf1, 0x04, 0x20, 0xcb, 0x56, 0x89, 0x43, 0x95, 0xe3, 0xc1, 0x5a, 0xcd, 0x0b,
+	0x70, 0x60, 0xd9, 0x19, 0x88, 0xf4, 0xb4, 0x99, 0x01, 0x53, 0x8b, 0x81, 0x4f, 0xa0, 0x2e, 0xd5,
-	0x49, 0xd8, 0x69, 0xfe, 0xaa, 0xb1, 0xc3, 0x3e, 0xfd, 0xfe, 0x84, 0xfe, 0x79, 0xfd, 0x88, 0x7d,
+	0x07, 0x89, 0x23, 0xd4, 0xd2, 0x24, 0x71, 0x84, 0x5e, 0x48, 0x7c, 0x06, 0x0d, 0xe5, 0xcc, 0x43,
-	0xd7, 0xfd, 0xc1, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x34, 0x9a, 0x78, 0xde, 0x13, 0x1e, 0x00,
+	0x59, 0xdc, 0x2b, 0xa5, 0x82, 0xb5, 0x53, 0x28, 0x4f, 0xa3, 0x46, 0x39, 0x08, 0xa4, 0xa8, 0xd1,
-	0x00,
+	0x8f, 0x1c, 0x29, 0x6a, 0xf2, 0x67, 0xc7, 0x33, 0x80, 0x2c, 0x5b, 0x25, 0x0e, 0x55, 0x8e, 0x07,
+	0x6b, 0x3b, 0x2f, 0x64, 0x74, 0xda, 0x96, 0xf2, 0xec, 0xf3, 0x28, 0x98, 0x75, 0xdd, 0xd1, 0x05,
+	0x7e, 0xab, 0xcc, 0xdc, 0x69, 0xfc, 0xb2, 0xde, 0x66, 0x5f, 0xac, 0x7f, 0x44, 0xff, 0x9c, 0x3d,
+	0x60, 0xdf, 0x5d, 0x3e, 0xfe, 0x2a, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xf3, 0x37, 0xab, 0xca, 0x1e,
+	0x00, 0x00,
 }

pkg/proto/user/user.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 import "Open_IM/pkg/proto/sdk_ws/ws.proto";
+import "Open_IM/pkg/proto/sdk_ws/wrappers.proto";
 option go_package = "./user;user";
 package user;
 
@@ -62,6 +63,7 @@ message UpdateUserInfoReq{
   server_api_params.UserInfo UserInfo = 1;
   string OpUserID = 2;
   string  operationID = 3;
+  google.protobuf.Int32Value globalRecvMsgOpt = 4;
 }
 message UpdateUserInfoResp{
   CommonResp  commonResp = 1;