cms

pkg/cms_api_struct/common.go

@@ -4,3 +4,8 @@ type RequestPagination struct {
 	PageNumber int `form:"page_number" binding:"required"`
 	ShowNumber int `form:"show_number" binding:"required"`
 }
+
+type ResponsePagination struct {
+	CurrentPage int `json:"current_number" binding:"required"`
+	ShowNumber int `json:"show_number" binding:"required"`
+}

pkg/cms_api_struct/group.go

@@ -1,20 +1,90 @@
 package cms_api_struct
 
-type SearchGroupsResponse struct {
-	GroupList []struct {
-		GroupNickName string `json:"group_nick_name"`
-		GroupID       int    `json:"group_id"`
-		MasterName    string `json:"master_name"`
-		MasterId      int    `json:"master_id"`
-		CreatTime     string `json:"creat_time"`
-	} `json:"group_list"`
+type GroupResponse struct {
+	GroupName string `json:"group_name"`
+	GroupID string `json:"group_id"`
+	GroupMasterName string `json:"group_master_name"`
+	GroupMasterId string `json:"group_master_id"`
+	CreateTime string `json:"create_time"`
+	isBanChat bool `json:"is_ban_chat"`
+	isBanPrivateChat bool `json:"is_ban_private_chat"`
 }
 
-type SearchGroupMemberResponse struct {
-	GroupMemberList []struct {
-		MemberPosition int    `json:"member_position"`
-		MemberNickName string `json:"member_nick_name"`
-		MemberId       int    `json:"member_id"`
-		JoinTime       string `json:"join_time"`
-	} `json:"group_member_list"`
+type GetGroupRequest struct {
+	GroupName string `form:"group_name"`
+}
+
+type GetGroupResponse struct {
+	GroupResponse
+}
+
+type GetGroupsRequest struct {
+	RequestPagination
+}
+
+type GetGroupsResponse struct {
+	Groups []GroupResponse `json:"groups"`
+	GroupNums int `json:"group_nums"`
+	ResponsePagination
+}
+
+type CreateGroupRequest struct {
+	GroupName string `json:"group_name"`
+	GroupMasterId string `json:"group_master_id"`
+	GroupMembers []string `json:"group_members"`
+}
+
+type CreateGroupResponse struct {
+
+}
+
+type SetGroupMasterRequest struct {
+	GroupId string `json:"group_id"`
+	UserId string `json:"user_id"`
+}
+
+type SetGroupMasterResponse struct {
+
+}
+
+type BanGroupChatRequest struct {
+	GroupId string `json:"group_id"`
+}
+
+type BanGroupChatResponse struct {
+
+}
+
+type BanPrivateChatRequest struct {
+	GroupId string `json:"group_id"`
+
+}
+
+type BanPrivateChatResponse struct {
+
+}
+
+type DeleteGroupRequest struct {
+	GroupId string `json:"group_id"`
+} 
+
+type DeleteGroupResponse struct {
+
+}
+
+type GetGroupMemberRequest struct {
+	GroupId string `json:"group_id"`
+}
+
+type GroupMemberResponse struct {
+	MemberPosition int    `json:"member_position"`
+	MemberNickName string `json:"member_nick_name"`
+	MemberId       int    `json:"member_id"`
+	JoinTime       string `json:"join_time"`
+}
+
+type GetGroupMemberResponse struct {
+	GroupMemberList []GroupMemberResponse `json:"group_member_list"`
+	GroupMemberNums int `json:"group_member_nums"`
+	ResponsePagination
 }

pkg/cms_api_struct/message.go

@@ -1,27 +1,26 @@
 package cms_api_struct
 
+type CommonMessage struct {
+	ChatType       int    `json:"chat_type"`
+	MessageType    int    `json:"message_type"`
+	SenderNickName string `json:"sender_nick_name"`
+	SenderId       int    `json:"sender_id"`
+	SearchContent  string `json:"search_content"`
+	WholeContent   string `json:"whole_content"`
+}
+
 type SearchMessageByUserResponse struct {
 	MessageList []struct {
-		ChatType         int    `json:"chat_type"`
-		MessageType      int    `json:"message_type"`
-		SenderNickName   string `json:"sender_nick_name"`
-		SenderId         int    `json:"sender_id"`
+		CommonMessage
 		ReceiverNickName string `json:"receiver_nick_name"`
 		ReceiverID       int    `json:"receiver_id"`
-		SearchContent    string `json:"search_content"`
-		WholeContent     string `json:"whole_content"`
 		Date             string `json:"date"`
 	} `json:"massage_list"`
 }
 
 type SearchMessageByGroupResponse struct {
 	MessageList []struct {
-		ChatType       int    `json:"chat_type"`
-		MessageType    int    `json:"message_type"`
-		SenderNickName string `json:"sender_nick_name"`
-		SenderId       int    `json:"sender_id"`
-		SearchContent  string `json:"search_content"`
-		WholeContent   string `json:"whole_content"`
+		CommonMessage
 		Date           string `json:"date"`
 	} `json:"massage_list"`
 }

pkg/cms_api_struct/user.go

@@ -5,10 +5,11 @@ type UserResponse struct {
 	Nickname     string `json:"nick_name"`
 	UserId       string `json:"user_id"`
 	CreateTime   string `json:"create_time"`
+	IsBlock bool `json:"is_block"`
 }
 
 type GetUserRequest struct {
-	UserId string `form:"user_id"`
+	UserId string `form:"user_id" binding:"required"`
 }
 
 type GetUserResponse struct {
@@ -21,6 +22,8 @@ type GetUsersRequest struct {
 
 type GetUsersResponse struct {
 	Users []*UserResponse `json:"users"`
+	UserNum int `json:"user_num"`
+	ResponsePagination
 }
 
 type ResignUserRequest struct {
@@ -38,20 +41,24 @@ type AlterUserResponse struct {
 }
 
 type AddUserRequest struct {
+	PhoneNumber string `json:"phone_number" binding:"required"`
+	UserId string `json:"user_id" binding:"required"`
+	Name string `json:"name" binding:"required"`
 }
 
 type AddUserResponse struct {
 }
 
 type BlockUserRequest struct {
-	UserId string `json:"user_id"`
+	UserId string `json:"user_id" binding:"required"`
+	EndDisableTime string `json:"end_disable_time" binding:"required"`
 }
 
 type BlockUserResponse struct {
 }
 
 type UnblockUserRequest struct {
-	UserId string `json:"user_id"`
+	UserId string `json:"user_id" binding:"required"`
 }
 
 type UnBlockUserResponse struct {
@@ -62,4 +69,7 @@ type GetBlockUsersRequest struct {
 }
 
 type GetBlockUsersResponse struct {
+	BlockUsers []UserResponse `json:"block_users"`
+	BlockUserNum int `json:"block_user_num"`
+	ResponsePagination
 }

pkg/common/constant/error.go

@@ -10,6 +10,7 @@ type ErrInfo struct {
 
 var (
 	OK = ErrInfo{0, ""}
+	ErrServer = ErrInfo{500, "server error"}
 
 	//	ErrMysql             = ErrInfo{100, ""}
 	//	ErrMongo             = ErrInfo{110, ""}

pkg/common/db/model_struct.go

@@ -135,7 +135,7 @@ type GroupRequest struct {
 //int64 CreateTime = 9;
 //int32 AppMangerLevel = 10;
 //open_im_sdk.User == imdb.User
-type User struct {
+type Users struct {
 	UserID         string    `gorm:"column:user_id;primary_key;size:64"`
 	Nickname       string    `gorm:"column:name;size:255"`
 	FaceURL        string    `gorm:"column:face_url;size:255"`
@@ -184,3 +184,9 @@ type ChatLog struct {
 	CreateTime       time.Time `gorm:"column:create_time" json:"createTime"`
 	Ex               string    `gorm:"column:ex;type:varchar(1024)" json:"ex"`
 }
+
+type BlackList struct {
+	UserId string `gorm:"column:uid"`
+	BeginDisableTime time.Time `gorm:"column:begin_disable_time"`
+	EndDisableTime time.Time `gorm:"column:end_disable_time"`
+}

pkg/common/db/mysql.go

@@ -57,7 +57,7 @@ func initMysqlDB() {
 		&Group{},
 		&GroupMember{},
 		&GroupRequest{},
-		&User{},
+		&Users{},
 		&Black{}, &ChatLog{})
 	db.Set("gorm:table_options", "CHARSET=utf8")
 

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

@@ -56,3 +56,27 @@ func SetGroupInfo(groupInfo db.Group) error {
 	err = dbConn.Table("groups").Where("group_id=?", groupInfo.GroupID).Update(&groupInfo).Error
 	return err
 }
+
+func GetGroupByName(groupName string) (db.Group, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var group db.Group
+	if err != nil {
+		return group, err
+	}
+	dbConn.LogMode(true)
+	err = dbConn.Table("groups").Where("group_id=?", groupName).Find(&group).Error
+	return group, err
+}
+
+func GetGroups(pageNumber, showNumber int) ([]db.Group, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var groups []db.Group
+	if err != nil {
+		return groups, err
+	}
+	dbConn.LogMode(true)
+	err = dbConn.Table("groups").Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&groups).Error
+	if err != nil {
+		return groups, err
+	}
+}

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

@@ -20,7 +20,7 @@ func init() {
 		} else {
 			continue
 		}
-		var appMgr db.User
+		var appMgr db.Users
 		appMgr.UserID = v
 		appMgr.Nickname = "AppManager" + utils.IntToString(k+1)
 		appMgr.AppMangerLevel = constant.AppAdmin
@@ -32,7 +32,7 @@ func init() {
 	}
 }
 
-func UserRegister(user db.User) error {
+func UserRegister(user db.Users) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
@@ -68,16 +68,16 @@ func DeleteUser(userID string) (i int64) {
 	if err != nil {
 		return 0
 	}
-	i = dbConn.Table("users").Where("user_id=?", userID).Delete(db.User{}).RowsAffected
+	i = dbConn.Table("users").Where("user_id=?", userID).Delete(db.Users{}).RowsAffected
 	return i
 }
 
-func GetUserByUserID(userID string) (*db.User, error) {
+func GetUserByUserID(userID string) (*db.Users, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return nil, err
 	}
-	var user db.User
+	var user db.Users
 	err = dbConn.Table("users").Where("user_id=?", userID).First(&user).Error
 	if err != nil {
 		return nil, err
@@ -85,7 +85,7 @@ func GetUserByUserID(userID string) (*db.User, error) {
 	return &user, nil
 }
 
-func UpdateUserInfo(user db.User) error {
+func UpdateUserInfo(user db.Users) error {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {
 		return err
@@ -123,16 +123,138 @@ func SelectSomeUserID(userIDList []string) ([]string, error) {
 	return resultArr, nil
 }
 
-func GetUsers(showNumber, pageNumber int32) ([]User, error) {
+func GetUsers(showNumber, pageNumber int32) ([]db.Users, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var users []db.Users
+	if err != nil {
+		return users, err
+	}
 	dbConn.LogMode(true)
-	var users []User
+	err = dbConn.Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&users).Error
 	if err != nil {
 		return users, err
 	}
-	err = dbConn.Limit(showNumber).Offset(pageNumber).Find(&users).Error
-	if err != nil {
-		return users, err
-	}
-	return users, nil
+	return users, err
 }
+
+func GetUsersNumCount() (int, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return 0, err
+	}
+	dbConn.LogMode(true)
+	var count int
+	if err := dbConn.Model(&db.Users{}).Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func AddUser(userId, phoneNumber, name string) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	user := db.Users{
+		PhoneNumber:phoneNumber,
+		Birth:time.Now(),
+		CreateTime:time.Now(),
+		UserID: userId,
+		Nickname:name,
+	}
+	result := dbConn.Create(&user)
+	return  result.Error
+}
+
+func UserIsBlock(userId string) (bool, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return false, err
+	}
+	var user db.BlackList
+	rows := dbConn.Table("black_list").Where("uid=?", userId).First(&user).RowsAffected
+	if rows >= 1 {
+		return true, nil
+	}
+	return false, nil
+}
+
+func BlockUser(userId, endDisableTime string) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	end, err := time.Parse("2006-01-02 15:04:05", endDisableTime)
+	if err != nil {
+		return err
+	}
+	if end.Before(time.Now()) {
+		return constant.ErrDB
+	}
+	var user db.BlackList
+	dbConn.Table("black_list").Where("uid=?", userId).First(&user)
+	if user.UserId != "" {
+		dbConn.Model(&user).Where("uid=?", user.UserId).Update("end_disable_time", end)
+		return nil
+	}
+ 	user = db.BlackList{
+		UserId: userId,
+		BeginDisableTime: time.Now(),
+		EndDisableTime: end,
+	}
+	result := dbConn.Create(&user)
+	return result.Error
+}
+
+func UnBlockUser(userId string) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	dbConn.LogMode(true)
+	fmt.Println(userId)
+	result := dbConn.Where("uid=?", userId).Delete(&db.BlackList{})
+	return result.Error
+}
+
+func GetBlockUsersID(showNumber, pageNumber int32) ([]string, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var blockUsers []db.BlackList
+	var blockUserIds []string
+	if err != nil {
+		return blockUserIds, err
+	}
+	dbConn.LogMode(true)
+	err = dbConn.Limit(showNumber).Offset(showNumber*(pageNumber-1)).Find(&blockUsers).Error
+	if err != nil {
+		return blockUserIds, err
+	}
+	for _, v := range blockUsers {
+		blockUserIds = append(blockUserIds, v.UserId)
+	}
+	return blockUserIds, err
+}
+
+func GetBlockUsers(userIds []string) ([]db.Users, error){
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	var blockUsers []db.Users
+	if err != nil {
+		return blockUsers, err
+	}
+	dbConn.LogMode(true)
+	dbConn.Find(&blockUsers,userIds)
+	return blockUsers, err
+}
+
+func GetBlockUsersNumCount() (int, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return 0, err
+	}
+	dbConn.LogMode(true)
+	var count int
+	if err := dbConn.Model(&db.BlackList{}).Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}

pkg/common/http/http_resp.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"Open_IM/pkg/common/constant"
+	//"Open_IM/pkg/cms_api_struct"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -13,11 +14,20 @@ type BaseResp struct {
 	Data   interface{} `json:"data"`
 }
 
-func RespHttp200(ctx *gin.Context, err constant.ErrInfo, data interface{}) {
-	resp := BaseResp{
-		Code:   err.Code(),
-		ErrMsg: err.Error(),
-		Data:   data,
+func RespHttp200(ctx *gin.Context, err error, data interface{}) {
+	var resp BaseResp
+	if v, ok := err.(constant.ErrInfo); ok {
+		resp.Code = v.Code()
+		resp.ErrMsg = v.Error()
+	} else {
+		resp.Code = constant.ErrServer.Code()
+		resp.ErrMsg = constant.ErrServer.Error()
 	}
+	resp.Data=data
 	ctx.JSON(http.StatusOK, resp)
 }
+
+
+//func CheckErr(pb interface{}) constant.ErrInfo{
+//
+//}

pkg/common/utils/utils.go

@@ -128,19 +128,19 @@ func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src *db.GroupReques
 	dst.HandleTime = uint32(src.HandledTime.Unix())
 }
 
-func UserOpenIMCopyDB(dst *db.User, src *open_im_sdk.UserInfo) {
+func UserOpenIMCopyDB(dst *db.Users, src *open_im_sdk.UserInfo) {
 	utils.CopyStructFields(dst, src)
 	dst.Birth = utils.UnixSecondToTime(int64(src.Birth))
 	dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime))
 }
 
-func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *db.User) {
+func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *db.Users) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = uint32(src.CreateTime.Unix())
 	dst.Birth = uint32(src.Birth.Unix())
 }
 
-func UserDBCopyOpenIMPublicUser(dst *open_im_sdk.PublicUserInfo, src *db.User) {
+func UserDBCopyOpenIMPublicUser(dst *open_im_sdk.PublicUserInfo, src *db.Users) {
 	utils.CopyStructFields(dst, src)
 }
 

pkg/proto/group/group.proto

@@ -195,6 +195,28 @@ message GetGroupAllMemberResp {
   repeated server_api_params.GroupMemberFullInfo memberList = 3;
 }
 
+message GetGroupReq {
+    string GroupName = 1;
+    string OperationID = 2;
+}
+
+message GetGroupResp {
+    server_api_params.GroupInfo GroupInfo = 1;
+}
+
+message GetGroupsReq {
+    server_api_params.RequestPagination Pagination =1;
+    string OperationID = 2;
+}
+
+message GetGroupsResp {
+    repeated server_api_params.GroupInfo GroupInfo = 1;
+}
+
+message GetGroupMemberReq {
+    string GroupId = 1;
+    string OperationID = 2;
+}
 
 
 service group{
@@ -212,6 +234,10 @@ service group{
   rpc getJoinedGroupList(GetJoinedGroupListReq) returns (GetJoinedGroupListResp);
   rpc inviteUserToGroup(InviteUserToGroupReq) returns (InviteUserToGroupResp);
   rpc getGroupAllMember(GetGroupAllMemberReq) returns(GetGroupAllMemberResp);
+
+
+  rpc GetGroup(GetGroupReq) returns(GetGroupsResp);
+  rpc GetGroups(GetGroupsReq) returns(GetGroupsResp);
 }
 
 

pkg/proto/proto_dir.cfg

@@ -2,8 +2,8 @@
 all_proto=(
             # auth/auth.proto
             # friend/friend.proto
-            # group/group.proto
-            user/user.proto
+            group/group.proto
+            # user/user.proto
             # chat/chat.proto
             # push/push.proto
             # relay/relay.proto

pkg/proto/sdk_ws/ws.pb.go

@@ -2839,6 +2839,61 @@ func (x *RequestPagination) GetShowNumber() int32 {
 	return 0
 }
 
+type ResponsePagination struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	CurrentPage int32 `protobuf:"varint,5,opt,name=CurrentPage,proto3" json:"CurrentPage,omitempty"`
+	ShowNumber  int32 `protobuf:"varint,6,opt,name=showNumber,proto3" json:"showNumber,omitempty"`
+}
+
+func (x *ResponsePagination) Reset() {
+	*x = ResponsePagination{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sdk_ws_ws_proto_msgTypes[38]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ResponsePagination) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ResponsePagination) ProtoMessage() {}
+
+func (x *ResponsePagination) ProtoReflect() protoreflect.Message {
+	mi := &file_sdk_ws_ws_proto_msgTypes[38]
+	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 ResponsePagination.ProtoReflect.Descriptor instead.
+func (*ResponsePagination) Descriptor() ([]byte, []int) {
+	return file_sdk_ws_ws_proto_rawDescGZIP(), []int{38}
+}
+
+func (x *ResponsePagination) GetCurrentPage() int32 {
+	if x != nil {
+		return x.CurrentPage
+	}
+	return 0
+}
+
+func (x *ResponsePagination) GetShowNumber() int32 {
+	if x != nil {
+		return x.ShowNumber
+	}
+	return 0
+}
+
 var File_sdk_ws_ws_proto protoreflect.FileDescriptor
 
 var file_sdk_ws_ws_proto_rawDesc = []byte{
@@ -3292,10 +3347,15 @@ var file_sdk_ws_ws_proto_rawDesc = []byte{
 	0x70, 0x61, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x0a, 0x70, 0x61, 0x67, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a,
 	0x73, 0x68, 0x6f, 0x77, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x1c, 0x5a, 0x1a,
-	0x2e, 0x2f, 0x73, 0x64, 0x6b, 0x5f, 0x77, 0x73, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
-	0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x56, 0x0a, 0x12,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x67,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
+	0x50, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x4e, 0x75, 0x6d, 0x62,
+	0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x4e, 0x75,
+	0x6d, 0x62, 0x65, 0x72, 0x42, 0x1c, 0x5a, 0x1a, 0x2e, 0x2f, 0x73, 0x64, 0x6b, 0x5f, 0x77, 0x73,
+	0x3b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72, 0x61,
+	0x6d, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3310,7 +3370,7 @@ func file_sdk_ws_ws_proto_rawDescGZIP() []byte {
 	return file_sdk_ws_ws_proto_rawDescData
 }
 
-var file_sdk_ws_ws_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
+var file_sdk_ws_ws_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
 var file_sdk_ws_ws_proto_goTypes = []interface{}{
 	(*GroupInfo)(nil),                     // 0: server_api_params.GroupInfo
 	(*GroupMemberFullInfo)(nil),           // 1: server_api_params.GroupMemberFullInfo
@@ -3350,7 +3410,8 @@ var file_sdk_ws_ws_proto_goTypes = []interface{}{
 	(*FriendInfoChangedTips)(nil),         // 35: server_api_params.FriendInfoChangedTips
 	(*UserInfoUpdatedTips)(nil),           // 36: server_api_params.UserInfoUpdatedTips
 	(*RequestPagination)(nil),             // 37: server_api_params.RequestPagination
-	nil,                                   // 38: server_api_params.MsgData.OptionsEntry
+	(*ResponsePagination)(nil),            // 38: server_api_params.ResponsePagination
+	nil,                                   // 39: server_api_params.MsgData.OptionsEntry
 }
 var file_sdk_ws_ws_proto_depIdxs = []int32{
 	3,  // 0: server_api_params.FriendInfo.friendUser:type_name -> server_api_params.UserInfo
@@ -3358,7 +3419,7 @@ var file_sdk_ws_ws_proto_depIdxs = []int32{
 	2,  // 2: server_api_params.GroupRequest.userInfo:type_name -> server_api_params.PublicUserInfo
 	0,  // 3: server_api_params.GroupRequest.groupInfo:type_name -> server_api_params.GroupInfo
 	13, // 4: server_api_params.PullMessageBySeqListResp.list:type_name -> server_api_params.MsgData
-	38, // 5: server_api_params.MsgData.options:type_name -> server_api_params.MsgData.OptionsEntry
+	39, // 5: server_api_params.MsgData.options:type_name -> server_api_params.MsgData.OptionsEntry
 	14, // 6: server_api_params.MsgData.offlinePushInfo:type_name -> server_api_params.OfflinePushInfo
 	0,  // 7: server_api_params.GroupCreatedTips.group:type_name -> server_api_params.GroupInfo
 	1,  // 8: server_api_params.GroupCreatedTips.opUser:type_name -> server_api_params.GroupMemberFullInfo
@@ -3863,6 +3924,18 @@ func file_sdk_ws_ws_proto_init() {
 				return nil
 			}
 		}
+		file_sdk_ws_ws_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ResponsePagination); 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{
@@ -3870,7 +3943,7 @@ func file_sdk_ws_ws_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_sdk_ws_ws_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   39,
+			NumMessages:   40,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pkg/proto/sdk_ws/ws.proto

@@ -336,4 +336,9 @@ message UserInfoUpdatedTips{
 message RequestPagination {
   int32 pageNumber = 1;
   int32 showNumber = 2;
+}
+
+message ResponsePagination {
+  int32 CurrentPage = 5;
+  int32 showNumber = 6;
 }

pkg/proto/user/user.pb.go

@@ -1253,6 +1253,7 @@ type User struct {
 	Nickname     string `protobuf:"bytes,2,opt,name=Nickname,proto3" json:"Nickname,omitempty"`
 	UserId       string `protobuf:"bytes,3,opt,name=UserId,proto3" json:"UserId,omitempty"`
 	CreateTime   string `protobuf:"bytes,4,opt,name=CreateTime,proto3" json:"CreateTime,omitempty"`
+	IsBlock      bool   `protobuf:"varint,5,opt,name=IsBlock,proto3" json:"IsBlock,omitempty"`
 }
 
 func (x *User) Reset() {
@@ -1315,6 +1316,13 @@ func (x *User) GetCreateTime() string {
 	return ""
 }
 
+func (x *User) GetIsBlock() bool {
+	if x != nil {
+		return x.IsBlock
+	}
+	return false
+}
+
 type GetUserResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1532,9 +1540,11 @@ type GetUsersResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	CommonResp  *CommonResp `protobuf:"bytes,1,opt,name=CommonResp,proto3" json:"CommonResp,omitempty"`
-	OperationID string      `protobuf:"bytes,2,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
-	User        []*User     `protobuf:"bytes,3,rep,name=user,proto3" json:"user,omitempty"`
+	CommonResp  *CommonResp                `protobuf:"bytes,1,opt,name=CommonResp,proto3" json:"CommonResp,omitempty"`
+	OperationID string                     `protobuf:"bytes,2,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
+	User        []*User                    `protobuf:"bytes,3,rep,name=user,proto3" json:"user,omitempty"`
+	UserNum     int32                      `protobuf:"varint,4,opt,name=UserNum,proto3" json:"UserNum,omitempty"`
+	Pagination  *sdk_ws.ResponsePagination `protobuf:"bytes,5,opt,name=Pagination,proto3" json:"Pagination,omitempty"`
 }
 
 func (x *GetUsersResp) Reset() {
@@ -1590,6 +1600,20 @@ func (x *GetUsersResp) GetUser() []*User {
 	return nil
 }
 
+func (x *GetUsersResp) GetUserNum() int32 {
+	if x != nil {
+		return x.UserNum
+	}
+	return 0
+}
+
+func (x *GetUsersResp) GetPagination() *sdk_ws.ResponsePagination {
+	if x != nil {
+		return x.Pagination
+	}
+	return nil
+}
+
 type AddUserReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1598,6 +1622,7 @@ type AddUserReq struct {
 	OperationID string `protobuf:"bytes,1,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
 	PhoneNumber string `protobuf:"bytes,2,opt,name=PhoneNumber,proto3" json:"PhoneNumber,omitempty"`
 	UserId      string `protobuf:"bytes,3,opt,name=UserId,proto3" json:"UserId,omitempty"`
+	Name        string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 }
 
 func (x *AddUserReq) Reset() {
@@ -1653,6 +1678,13 @@ func (x *AddUserReq) GetUserId() string {
 	return ""
 }
 
+func (x *AddUserReq) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
 type AddUserResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1705,7 +1737,7 @@ type BlockUserReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID         string `protobuf:"bytes,1,opt,name=UserID,proto3" json:"UserID,omitempty"`
+	UserId         string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty"`
 	EndDisableTime string `protobuf:"bytes,2,opt,name=EndDisableTime,proto3" json:"EndDisableTime,omitempty"`
 	OperationID    string `protobuf:"bytes,3,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
 }
@@ -1742,9 +1774,9 @@ func (*BlockUserReq) Descriptor() ([]byte, []int) {
 	return file_user_user_proto_rawDescGZIP(), []int{29}
 }
 
-func (x *BlockUserReq) GetUserID() string {
+func (x *BlockUserReq) GetUserId() string {
 	if x != nil {
-		return x.UserID
+		return x.UserId
 	}
 	return ""
 }
@@ -1815,7 +1847,7 @@ type UnBlockUserReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserID      string `protobuf:"bytes,1,opt,name=UserID,proto3" json:"UserID,omitempty"`
+	UserId      string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty"`
 	OperationID string `protobuf:"bytes,2,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
 }
 
@@ -1851,9 +1883,9 @@ func (*UnBlockUserReq) Descriptor() ([]byte, []int) {
 	return file_user_user_proto_rawDescGZIP(), []int{31}
 }
 
-func (x *UnBlockUserReq) GetUserID() string {
+func (x *UnBlockUserReq) GetUserId() string {
 	if x != nil {
-		return x.UserID
+		return x.UserId
 	}
 	return ""
 }
@@ -1917,8 +1949,9 @@ type GetBlockUsersReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Pagination  *sdk_ws.RequestPagination `protobuf:"bytes,1,opt,name=Pagination,proto3" json:"Pagination,omitempty"`
-	OperationID string                    `protobuf:"bytes,2,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
+	Pagination   *sdk_ws.RequestPagination `protobuf:"bytes,1,opt,name=Pagination,proto3" json:"Pagination,omitempty"`
+	OperationID  string                    `protobuf:"bytes,2,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
+	BlockUserNum int32                     `protobuf:"varint,4,opt,name=BlockUserNum,proto3" json:"BlockUserNum,omitempty"`
 }
 
 func (x *GetBlockUsersReq) Reset() {
@@ -1967,13 +2000,22 @@ func (x *GetBlockUsersReq) GetOperationID() string {
 	return ""
 }
 
+func (x *GetBlockUsersReq) GetBlockUserNum() int32 {
+	if x != nil {
+		return x.BlockUserNum
+	}
+	return 0
+}
+
 type GetBlockUsersResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	CommonResp *CommonResp `protobuf:"bytes,1,opt,name=CommonResp,proto3" json:"CommonResp,omitempty"`
-	User       []*User     `protobuf:"bytes,2,rep,name=user,proto3" json:"user,omitempty"`
+	CommonResp   *CommonResp                `protobuf:"bytes,1,opt,name=CommonResp,proto3" json:"CommonResp,omitempty"`
+	User         []*User                    `protobuf:"bytes,2,rep,name=user,proto3" json:"user,omitempty"`
+	Pagination   *sdk_ws.ResponsePagination `protobuf:"bytes,3,opt,name=Pagination,proto3" json:"Pagination,omitempty"`
+	BlockUserNum int32                      `protobuf:"varint,4,opt,name=BlockUserNum,proto3" json:"BlockUserNum,omitempty"`
 }
 
 func (x *GetBlockUsersResp) Reset() {
@@ -2022,6 +2064,20 @@ func (x *GetBlockUsersResp) GetUser() []*User {
 	return nil
 }
 
+func (x *GetBlockUsersResp) GetPagination() *sdk_ws.ResponsePagination {
+	if x != nil {
+		return x.Pagination
+	}
+	return nil
+}
+
+func (x *GetBlockUsersResp) GetBlockUserNum() int32 {
+	if x != nil {
+		return x.BlockUserNum
+	}
+	return 0
+}
+
 type AccountCheckResp_SingleUserStatus struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2242,59 +2298,68 @@ var file_user_user_proto_rawDesc = []byte{
 	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 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, 0x7e, 0x0a, 0x04,
-	0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x50,
-	0x68, 0x6f, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x72, 0x6f, 0x66,
-	0x69, 0x6c, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5f, 0x0a, 0x0b,
-	0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x10, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a,
-	0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x75, 0x73,
-	0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x48, 0x0a,
-	0x0c, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
-	0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55,
-	0x73, 0x65, 0x72, 0x49, 0x64, 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, 0x41, 0x0a, 0x0d, 0x41, 0x6c, 0x74, 0x65, 0x72,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x75, 0x0a, 0x0b, 0x47, 0x65,
-	0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x44, 0x0a, 0x0a, 0x50,
-	0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72,
-	0x61, 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0x82, 0x01, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x1e, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x68, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65,
-	0x72, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x98, 0x01, 0x0a,
+	0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65,
+	0x50, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x72, 0x6f,
+	0x66, 0x69, 0x6c, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63,
+	0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63,
+	0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a,
+	0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a,
+	0x07, 0x49, 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
+	0x49, 0x73, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x5f, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73,
+	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65,
+	0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x48, 0x0a, 0x0c, 0x41, 0x6c, 0x74, 0x65,
+	0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
+	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, 0x41, 0x0a, 0x0d, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x75, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72,
+	0x73, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x4e,
-	0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x50, 0x68, 0x6f,
-	0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72,
-	0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x44, 0x0a, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xe3, 0x01, 0x0a,
+	0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a,
+	0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x1e, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0a, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65,
+	0x72, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x07, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x45, 0x0a, 0x0a, 0x50,
+	0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x25, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x50, 0x61, 0x67, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x22, 0x7c, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71,
+	0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x4e, 0x75,
+	0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
 	0x22, 0x3f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
 	0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f,
 	0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73,
 	0x70, 0x22, 0x70, 0x0a, 0x0c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65,
-	0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x45, 0x6e, 0x64,
+	0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x45, 0x6e, 0x64,
 	0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0e, 0x45, 0x6e, 0x64, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x69, 0x6d,
 	0x65, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44,
@@ -2305,94 +2370,103 @@ var file_user_user_proto_rawDesc = []byte{
 	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4a, 0x0a, 0x0e, 0x55, 0x6e, 0x42, 0x6c, 0x6f, 0x63,
 	0x6b, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72,
-	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
 	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, 0x43, 0x0a, 0x0f, 0x55, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65,
 	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52,
 	0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65, 0x72,
 	0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x7a, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x42, 0x6c,
-	0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x12, 0x44, 0x0a, 0x0a, 0x50,
-	0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72,
-	0x61, 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x50, 0x61, 0x67, 0x69, 0x6e,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 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, 0x65, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55,
-	0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x75, 0x73,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x32, 0x88, 0x08, 0x0a, 0x04, 0x75,
-	0x73, 0x65, 0x72, 0x12, 0x3a, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
-	0x66, 0x6f, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
-	0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x43, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x17, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55,
-	0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73,
-	0x65, 0x72, 0x73, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72,
-	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x3d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44,
-	0x12, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73,
-	0x65, 0x72, 0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47,
-	0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x55, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x12, 0x1d, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x53,
+	0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x9e, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x42,
+	0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x12, 0x44, 0x0a, 0x0a,
+	0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x24, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x50, 0x61, 0x67, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 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, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65,
+	0x72, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x6c, 0x6f, 0x63,
+	0x6b, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x22, 0xd0, 0x01, 0x0a, 0x11, 0x47, 0x65, 0x74,
+	0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30,
+	0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x1e, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a,
+	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72,
+	0x12, 0x45, 0x0a, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70,
+	0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67,
+	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+	0x55, 0x73, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42,
+	0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x32, 0x88, 0x08, 0x0a, 0x04,
+	0x75, 0x73, 0x65, 0x72, 0x12, 0x3a, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73,
+	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72,
+	0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x43, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x17, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x75, 0x73,
+	0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55,
+	0x73, 0x65, 0x72, 0x73, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65,
+	0x72, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x3d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49,
+	0x44, 0x12, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55,
+	0x73, 0x65, 0x72, 0x49, 0x44, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
+	0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x55, 0x0a, 0x14, 0x53, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x12, 0x1d, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
+	0x53, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1e, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x53,
 	0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1e, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x53, 0x65,
-	0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f,
-	0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x52, 0x65, 0x63,
-	0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x12, 0x1d,
+	0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x55, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x52, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x12,
+	0x1d, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
+	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1e,
 	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1e, 0x2e,
-	0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x61, 0x0a,
-	0x18, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x12, 0x21, 0x2e, 0x75, 0x73, 0x65, 0x72,
-	0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72,
-	0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x3d, 0x0a, 0x0c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63, 0x6b,
-	0x12, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x2e, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x37, 0x0a, 0x0a, 0x52, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x12, 0x13, 0x2e,
-	0x75, 0x73, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x52,
-	0x65, 0x71, 0x1a, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x69, 0x67, 0x6e,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x09, 0x41, 0x6c, 0x74, 0x65,
-	0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x12, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x6c, 0x74,
-	0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x75, 0x73, 0x65, 0x72,
-	0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x31,
-	0x0a, 0x08, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x11, 0x2e, 0x75, 0x73, 0x65,
-	0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e,
-	0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x2e, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x11,
-	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x34, 0x0a, 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x12, 0x12,
-	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x52,
-	0x65, 0x71, 0x1a, 0x13, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55,
-	0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x0b, 0x55, 0x6e, 0x42, 0x6c, 0x6f,
-	0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x6e,
-	0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x55, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x40, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55,
-	0x73, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x42,
-	0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72,
-	0x73, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x3b,
-	0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x61,
+	0x0a, 0x18, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x12, 0x21, 0x2e, 0x75, 0x73, 0x65,
+	0x72, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e,
+	0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x76, 0x65,
+	0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x4f, 0x70, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x3d, 0x0a, 0x0c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x12, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
+	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x2e, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x2e, 0x75, 0x73,
+	0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e,
+	0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x37, 0x0a, 0x0a, 0x52, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x12, 0x13,
+	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x69, 0x67, 0x6e, 0x55, 0x73, 0x65, 0x72,
+	0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x69, 0x67,
+	0x6e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x09, 0x41, 0x6c, 0x74,
+	0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x12, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x6c,
+	0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x75, 0x73, 0x65,
+	0x72, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x31, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x11, 0x2e, 0x75, 0x73,
+	0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x12,
+	0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x2e, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x2e,
+	0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a,
+	0x11, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x34, 0x0a, 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x12,
+	0x12, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72,
+	0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x0b, 0x55, 0x6e, 0x42, 0x6c,
+	0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55,
+	0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e,
+	0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x6e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x40, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+	0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74,
+	0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e,
+	0x75, 0x73, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x55, 0x73, 0x65,
+	0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x75, 0x73, 0x65, 0x72,
+	0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2447,6 +2521,7 @@ var file_user_user_proto_goTypes = []interface{}{
 	(*AccountCheckResp_SingleUserStatus)(nil), // 35: user.AccountCheckResp.SingleUserStatus
 	(*sdk_ws.UserInfo)(nil),                   // 36: server_api_params.UserInfo
 	(*sdk_ws.RequestPagination)(nil),          // 37: server_api_params.RequestPagination
+	(*sdk_ws.ResponsePagination)(nil),         // 38: server_api_params.ResponsePagination
 }
 var file_user_user_proto_depIdxs = []int32{
 	0,  // 0: user.DeleteUsersResp.CommonResp:type_name -> user.CommonResp
@@ -2470,49 +2545,51 @@ var file_user_user_proto_depIdxs = []int32{
 	37, // 18: user.GetUsersReq.Pagination:type_name -> server_api_params.RequestPagination
 	0,  // 19: user.GetUsersResp.CommonResp:type_name -> user.CommonResp
 	21, // 20: user.GetUsersResp.user:type_name -> user.User
-	0,  // 21: user.AddUserResp.CommonResp:type_name -> user.CommonResp
-	0,  // 22: user.BlockUserResp.CommonResp:type_name -> user.CommonResp
-	0,  // 23: user.UnBlockUserResp.CommonResp:type_name -> user.CommonResp
-	37, // 24: user.GetBlockUsersReq.Pagination:type_name -> server_api_params.RequestPagination
-	0,  // 25: user.GetBlockUsersResp.CommonResp:type_name -> user.CommonResp
-	21, // 26: user.GetBlockUsersResp.user:type_name -> user.User
-	7,  // 27: user.user.GetUserInfo:input_type -> user.GetUserInfoReq
-	9,  // 28: user.user.UpdateUserInfo:input_type -> user.UpdateUserInfoReq
-	1,  // 29: user.user.DeleteUsers:input_type -> user.DeleteUsersReq
-	3,  // 30: user.user.GetAllUserID:input_type -> user.GetAllUserIDReq
-	11, // 31: user.user.SetReceiveMessageOpt:input_type -> user.SetReceiveMessageOptReq
-	14, // 32: user.user.GetReceiveMessageOpt:input_type -> user.GetReceiveMessageOptReq
-	16, // 33: user.user.GetAllConversationMsgOpt:input_type -> user.GetAllConversationMsgOptReq
-	5,  // 34: user.user.AccountCheck:input_type -> user.AccountCheckReq
-	20, // 35: user.user.GetUser:input_type -> user.GetUserReq
-	18, // 36: user.user.ResignUser:input_type -> user.ResignUserReq
-	23, // 37: user.user.AlterUser:input_type -> user.AlterUserReq
-	25, // 38: user.user.GetUsers:input_type -> user.GetUsersReq
-	27, // 39: user.user.AddUser:input_type -> user.AddUserReq
-	29, // 40: user.user.BlockUser:input_type -> user.BlockUserReq
-	31, // 41: user.user.UnBlockUser:input_type -> user.UnBlockUserReq
-	33, // 42: user.user.GetBlockUsers:input_type -> user.GetBlockUsersReq
-	8,  // 43: user.user.GetUserInfo:output_type -> user.GetUserInfoResp
-	10, // 44: user.user.UpdateUserInfo:output_type -> user.UpdateUserInfoResp
-	2,  // 45: user.user.DeleteUsers:output_type -> user.DeleteUsersResp
-	4,  // 46: user.user.GetAllUserID:output_type -> user.GetAllUserIDResp
-	13, // 47: user.user.SetReceiveMessageOpt:output_type -> user.SetReceiveMessageOptResp
-	15, // 48: user.user.GetReceiveMessageOpt:output_type -> user.GetReceiveMessageOptResp
-	17, // 49: user.user.GetAllConversationMsgOpt:output_type -> user.GetAllConversationMsgOptResp
-	6,  // 50: user.user.AccountCheck:output_type -> user.AccountCheckResp
-	22, // 51: user.user.GetUser:output_type -> user.GetUserResp
-	19, // 52: user.user.ResignUser:output_type -> user.ResignUserResp
-	24, // 53: user.user.AlterUser:output_type -> user.AlterUserResp
-	26, // 54: user.user.GetUsers:output_type -> user.GetUsersResp
-	28, // 55: user.user.AddUser:output_type -> user.AddUserResp
-	30, // 56: user.user.BlockUser:output_type -> user.BlockUserResp
-	32, // 57: user.user.UnBlockUser:output_type -> user.UnBlockUserResp
-	34, // 58: user.user.GetBlockUsers:output_type -> user.GetBlockUsersResp
-	43, // [43:59] is the sub-list for method output_type
-	27, // [27:43] is the sub-list for method input_type
-	27, // [27:27] is the sub-list for extension type_name
-	27, // [27:27] is the sub-list for extension extendee
-	0,  // [0:27] is the sub-list for field type_name
+	38, // 21: user.GetUsersResp.Pagination:type_name -> server_api_params.ResponsePagination
+	0,  // 22: user.AddUserResp.CommonResp:type_name -> user.CommonResp
+	0,  // 23: user.BlockUserResp.CommonResp:type_name -> user.CommonResp
+	0,  // 24: user.UnBlockUserResp.CommonResp:type_name -> user.CommonResp
+	37, // 25: user.GetBlockUsersReq.Pagination:type_name -> server_api_params.RequestPagination
+	0,  // 26: user.GetBlockUsersResp.CommonResp:type_name -> user.CommonResp
+	21, // 27: user.GetBlockUsersResp.user:type_name -> user.User
+	38, // 28: user.GetBlockUsersResp.Pagination:type_name -> server_api_params.ResponsePagination
+	7,  // 29: user.user.GetUserInfo:input_type -> user.GetUserInfoReq
+	9,  // 30: user.user.UpdateUserInfo:input_type -> user.UpdateUserInfoReq
+	1,  // 31: user.user.DeleteUsers:input_type -> user.DeleteUsersReq
+	3,  // 32: user.user.GetAllUserID:input_type -> user.GetAllUserIDReq
+	11, // 33: user.user.SetReceiveMessageOpt:input_type -> user.SetReceiveMessageOptReq
+	14, // 34: user.user.GetReceiveMessageOpt:input_type -> user.GetReceiveMessageOptReq
+	16, // 35: user.user.GetAllConversationMsgOpt:input_type -> user.GetAllConversationMsgOptReq
+	5,  // 36: user.user.AccountCheck:input_type -> user.AccountCheckReq
+	20, // 37: user.user.GetUser:input_type -> user.GetUserReq
+	18, // 38: user.user.ResignUser:input_type -> user.ResignUserReq
+	23, // 39: user.user.AlterUser:input_type -> user.AlterUserReq
+	25, // 40: user.user.GetUsers:input_type -> user.GetUsersReq
+	27, // 41: user.user.AddUser:input_type -> user.AddUserReq
+	29, // 42: user.user.BlockUser:input_type -> user.BlockUserReq
+	31, // 43: user.user.UnBlockUser:input_type -> user.UnBlockUserReq
+	33, // 44: user.user.GetBlockUsers:input_type -> user.GetBlockUsersReq
+	8,  // 45: user.user.GetUserInfo:output_type -> user.GetUserInfoResp
+	10, // 46: user.user.UpdateUserInfo:output_type -> user.UpdateUserInfoResp
+	2,  // 47: user.user.DeleteUsers:output_type -> user.DeleteUsersResp
+	4,  // 48: user.user.GetAllUserID:output_type -> user.GetAllUserIDResp
+	13, // 49: user.user.SetReceiveMessageOpt:output_type -> user.SetReceiveMessageOptResp
+	15, // 50: user.user.GetReceiveMessageOpt:output_type -> user.GetReceiveMessageOptResp
+	17, // 51: user.user.GetAllConversationMsgOpt:output_type -> user.GetAllConversationMsgOptResp
+	6,  // 52: user.user.AccountCheck:output_type -> user.AccountCheckResp
+	22, // 53: user.user.GetUser:output_type -> user.GetUserResp
+	19, // 54: user.user.ResignUser:output_type -> user.ResignUserResp
+	24, // 55: user.user.AlterUser:output_type -> user.AlterUserResp
+	26, // 56: user.user.GetUsers:output_type -> user.GetUsersResp
+	28, // 57: user.user.AddUser:output_type -> user.AddUserResp
+	30, // 58: user.user.BlockUser:output_type -> user.BlockUserResp
+	32, // 59: user.user.UnBlockUser:output_type -> user.UnBlockUserResp
+	34, // 60: user.user.GetBlockUsers:output_type -> user.GetBlockUsersResp
+	45, // [45:61] is the sub-list for method output_type
+	29, // [29:45] is the sub-list for method input_type
+	29, // [29:29] is the sub-list for extension type_name
+	29, // [29:29] is the sub-list for extension extendee
+	0,  // [0:29] is the sub-list for field type_name
 }
 
 func init() { file_user_user_proto_init() }

pkg/proto/user/user.proto

@@ -125,7 +125,8 @@ message User{
   string ProfilePhoto = 1;
   string Nickname = 2;
   string UserId = 3;
-  string CreateTime = 4; 
+  string CreateTime = 4;
+  bool IsBlock = 5;
 }
 
 message GetUserResp{
@@ -151,12 +152,15 @@ message GetUsersResp{
   CommonResp  CommonResp = 1;
   string OperationID = 2;
   repeated User user = 3;
+  int32 UserNum = 4;
+  server_api_params.ResponsePagination Pagination = 5;
 }
 
 message AddUserReq{
   string OperationID = 1;
   string PhoneNumber = 2;
   string UserId = 3;
+  string name = 4;
 }
 
 message AddUserResp{
@@ -165,7 +169,7 @@ message AddUserResp{
 
 
 message BlockUserReq{
-  string UserID = 1;
+  string UserId = 1;
   string EndDisableTime = 2;
   string OperationID = 3;
 }
@@ -175,7 +179,7 @@ message BlockUserResp{
 }
 
 message UnBlockUserReq{
-  string UserID = 1;
+  string UserId = 1;
   string OperationID = 2;
 }
 
@@ -186,11 +190,14 @@ message UnBlockUserResp{
 message GetBlockUsersReq{
   server_api_params.RequestPagination Pagination =1;
   string OperationID = 2;
+  int32 BlockUserNum = 4;
 }
 
 message GetBlockUsersResp{
   CommonResp  CommonResp = 1;
   repeated User user = 2;
+  server_api_params.ResponsePagination Pagination = 3;
+  int32 BlockUserNum = 4;
 }