wfz 3 years ago
parent
commit
0255898d3a

+ 284 - 3
api/common/common.pb.go

@@ -224,6 +224,230 @@ func (x *UserIDParam) GetUserId() string {
 	return ""
 }
 
+// 主页信息
+type HomeInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id             string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`                          // id
+	Nickname       string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`              // 昵称
+	AvatarUrl      string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"`            // 头像链接
+	Sex            int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`                       // 性别
+	Pictures       []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`              // 图片
+	Age            int64    `protobuf:"varint,6,opt,name=age,proto3" json:"age"`                       // 年龄
+	Constellation  string   `protobuf:"bytes,7,opt,name=constellation,proto3" json:"constellation"`    // 星座
+	Area           string   `protobuf:"bytes,8,opt,name=area,proto3" json:"area"`                      // 地区
+	Tag            []string `protobuf:"bytes,9,rep,name=tag,proto3" json:"tag"`                        // 标签
+	Signature      string   `protobuf:"bytes,10,opt,name=signature,proto3" json:"signature"`           // 签名
+	IntroduceVoice string   `protobuf:"bytes,11,opt,name=introduceVoice,proto3" json:"introduceVoice"` // 介绍语音
+	LikedNum       int64    `protobuf:"varint,12,opt,name=likedNum,proto3" json:"likedNum"`            // 喜欢我
+	LookNum        int64    `protobuf:"varint,13,opt,name=lookNum,proto3" json:"lookNum"`              // 看过我
+}
+
+func (x *HomeInfo) Reset() {
+	*x = HomeInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HomeInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HomeInfo) ProtoMessage() {}
+
+func (x *HomeInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[4]
+	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 HomeInfo.ProtoReflect.Descriptor instead.
+func (*HomeInfo) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *HomeInfo) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetNickname() string {
+	if x != nil {
+		return x.Nickname
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetAvatarUrl() string {
+	if x != nil {
+		return x.AvatarUrl
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetSex() int64 {
+	if x != nil {
+		return x.Sex
+	}
+	return 0
+}
+
+func (x *HomeInfo) GetPictures() []string {
+	if x != nil {
+		return x.Pictures
+	}
+	return nil
+}
+
+func (x *HomeInfo) GetAge() int64 {
+	if x != nil {
+		return x.Age
+	}
+	return 0
+}
+
+func (x *HomeInfo) GetConstellation() string {
+	if x != nil {
+		return x.Constellation
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetArea() string {
+	if x != nil {
+		return x.Area
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetTag() []string {
+	if x != nil {
+		return x.Tag
+	}
+	return nil
+}
+
+func (x *HomeInfo) GetSignature() string {
+	if x != nil {
+		return x.Signature
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetIntroduceVoice() string {
+	if x != nil {
+		return x.IntroduceVoice
+	}
+	return ""
+}
+
+func (x *HomeInfo) GetLikedNum() int64 {
+	if x != nil {
+		return x.LikedNum
+	}
+	return 0
+}
+
+func (x *HomeInfo) GetLookNum() int64 {
+	if x != nil {
+		return x.LookNum
+	}
+	return 0
+}
+
+// 添加好友页面信息
+type AddFriendMessageInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`               // id
+	Nickname  string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`   // 昵称
+	AvatarUrl string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像链接
+	Sex       int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`            // 性别
+	Pictures  []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`   // 图片
+}
+
+func (x *AddFriendMessageInfo) Reset() {
+	*x = AddFriendMessageInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AddFriendMessageInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AddFriendMessageInfo) ProtoMessage() {}
+
+func (x *AddFriendMessageInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[5]
+	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 AddFriendMessageInfo.ProtoReflect.Descriptor instead.
+func (*AddFriendMessageInfo) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *AddFriendMessageInfo) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *AddFriendMessageInfo) GetNickname() string {
+	if x != nil {
+		return x.Nickname
+	}
+	return ""
+}
+
+func (x *AddFriendMessageInfo) GetAvatarUrl() string {
+	if x != nil {
+		return x.AvatarUrl
+	}
+	return ""
+}
+
+func (x *AddFriendMessageInfo) GetSex() int64 {
+	if x != nil {
+		return x.Sex
+	}
+	return 0
+}
+
+func (x *AddFriendMessageInfo) GetPictures() []string {
+	if x != nil {
+		return x.Pictures
+	}
+	return nil
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -243,7 +467,38 @@ var file_common_proto_rawDesc = []byte{
 	0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x22, 0x25, 0x0a,
 	0x0b, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06,
 	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73,
-	0x65, 0x72, 0x49, 0x64, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x65, 0x72, 0x49, 0x64, 0x22, 0xdc, 0x02, 0x0a, 0x08, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a,
+	0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73,
+	0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a,
+	0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63,
+	0x6f, 0x6e, 0x73, 0x74, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61,
+	0x74, 0x75, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75,
+	0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69,
+	0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f,
+	0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b,
+	0x4e, 0x75, 0x6d, 0x22, 0x8e, 0x01, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+	0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74,
+	0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61,
+	0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74,
+	0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74,
+	0x75, 0x72, 0x65, 0x73, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e,
 	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
@@ -263,12 +518,14 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_common_proto_goTypes = []interface{}{
 	(*UserAndPartnerIdParam)(nil), // 0: api.common.UserAndPartnerIdParam
 	(*User1AndUser2IdParam)(nil),  // 1: api.common.User1AndUser2IdParam
 	(*PartnerIDParam)(nil),        // 2: api.common.PartnerIDParam
 	(*UserIDParam)(nil),           // 3: api.common.UserIDParam
+	(*HomeInfo)(nil),              // 4: api.common.HomeInfo
+	(*AddFriendMessageInfo)(nil),  // 5: api.common.AddFriendMessageInfo
 }
 var file_common_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
@@ -332,6 +589,30 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HomeInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AddFriendMessageInfo); 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{
@@ -339,7 +620,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 26 - 0
api/common/common.proto

@@ -26,4 +26,30 @@ message PartnerIDParam {
 
 message UserIDParam {
   string userId = 1;
+}
+
+// 主页信息
+message HomeInfo{
+  string id = 1; // id
+  string nickname = 2;// 昵称
+  string avatarUrl =3;// 头像链接
+  int64 sex = 4;// 性别
+  repeated string pictures = 5; // 图片
+  int64 age = 6; // 年龄
+  string constellation = 7; // 星座
+  string area = 8; // 地区
+  repeated string tag = 9; // 标签
+  string signature = 10; // 签名
+  string introduceVoice = 11; // 介绍语音
+  int64 likedNum = 12;// 喜欢我
+  int64 lookNum = 13;// 看过我
+}
+
+// 添加好友页面信息
+message AddFriendMessageInfo{
+  string id = 1; // id
+  string nickname = 2;// 昵称
+  string avatarUrl =3;// 头像链接
+  int64 sex = 4;// 性别
+  repeated string pictures = 5; // 图片
 }

+ 154 - 166
api/partner/partner.pb.go

@@ -28,9 +28,9 @@ type UpdatePartnerInformationRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Nickname  string `protobuf:"bytes,1,opt,name=Nickname,proto3" json:"Nickname"`
-	AvatarUrl string `protobuf:"bytes,2,opt,name=avatarUrl,proto3" json:"avatarUrl"`
-	Sex       int64  `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`
+	Nickname  string `protobuf:"bytes,1,opt,name=Nickname,proto3" json:"Nickname"`   // 昵称
+	AvatarUrl string `protobuf:"bytes,2,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像
+	Sex       int64  `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`            // 性别
 }
 
 func (x *UpdatePartnerInformationRequest) Reset() {
@@ -86,20 +86,28 @@ func (x *UpdatePartnerInformationRequest) GetSex() int64 {
 	return 0
 }
 
-type PartnerCircleInfo struct {
+type PartnerInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id        string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`               // id
-	Nickname  string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`   // 昵称
-	AvatarUrl string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像链接
-	Sex       int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`            // 性别
-	Pictures  []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`   // 图片
+	Id                string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`                                 // id
+	Nickname          string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`                     // 昵称
+	AvatarUrl         string `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"`                   // 头像链接
+	Age               int64  `protobuf:"varint,4,opt,name=age,proto3" json:"age"`                              // 年龄
+	Sex               int64  `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`                              // 性别
+	LikeNum           int64  `protobuf:"varint,7,opt,name=likeNum,proto3" json:"likeNum"`                      // 我喜欢
+	LikedNum          int64  `protobuf:"varint,8,opt,name=likedNum,proto3" json:"likedNum"`                    // 喜欢我
+	LookNum           int64  `protobuf:"varint,9,opt,name=lookNum,proto3" json:"lookNum"`                      // 看过我
+	Level             int64  `protobuf:"varint,10,opt,name=level,proto3" json:"level"`                         // 等级
+	Balance           int64  `protobuf:"varint,11,opt,name=balance,proto3" json:"balance"`                     // 可提现余额
+	TodayProfit       int64  `protobuf:"varint,12,opt,name=todayProfit,proto3" json:"todayProfit"`             // 进入收益
+	TodayReceptionNum int64  `protobuf:"varint,13,opt,name=todayReceptionNum,proto3" json:"todayReceptionNum"` // 今日接待人数
+	ReversionRate     string `protobuf:"bytes,14,opt,name=reversionRate,proto3" json:"reversionRate"`          // 五分钟的回复率
 }
 
-func (x *PartnerCircleInfo) Reset() {
-	*x = PartnerCircleInfo{}
+func (x *PartnerInfo) Reset() {
+	*x = PartnerInfo{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_partner_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -107,13 +115,13 @@ func (x *PartnerCircleInfo) Reset() {
 	}
 }
 
-func (x *PartnerCircleInfo) String() string {
+func (x *PartnerInfo) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*PartnerCircleInfo) ProtoMessage() {}
+func (*PartnerInfo) ProtoMessage() {}
 
-func (x *PartnerCircleInfo) ProtoReflect() protoreflect.Message {
+func (x *PartnerInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_partner_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -125,123 +133,100 @@ func (x *PartnerCircleInfo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use PartnerCircleInfo.ProtoReflect.Descriptor instead.
-func (*PartnerCircleInfo) Descriptor() ([]byte, []int) {
+// Deprecated: Use PartnerInfo.ProtoReflect.Descriptor instead.
+func (*PartnerInfo) Descriptor() ([]byte, []int) {
 	return file_partner_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *PartnerCircleInfo) GetId() string {
+func (x *PartnerInfo) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }
 
-func (x *PartnerCircleInfo) GetNickname() string {
+func (x *PartnerInfo) GetNickname() string {
 	if x != nil {
 		return x.Nickname
 	}
 	return ""
 }
 
-func (x *PartnerCircleInfo) GetAvatarUrl() string {
+func (x *PartnerInfo) GetAvatarUrl() string {
 	if x != nil {
 		return x.AvatarUrl
 	}
 	return ""
 }
 
-func (x *PartnerCircleInfo) GetSex() int64 {
+func (x *PartnerInfo) GetAge() int64 {
 	if x != nil {
-		return x.Sex
+		return x.Age
 	}
 	return 0
 }
 
-func (x *PartnerCircleInfo) GetPictures() []string {
+func (x *PartnerInfo) GetSex() int64 {
 	if x != nil {
-		return x.Pictures
+		return x.Sex
 	}
-	return nil
-}
-
-type PartnerInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id        string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`               // id
-	Nickname  string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`   // 昵称
-	AvatarUrl string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像链接
-	Sex       int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`            // 性别
-	Pictures  []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`   // 图片
+	return 0
 }
 
-func (x *PartnerInfo) Reset() {
-	*x = PartnerInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_partner_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
+func (x *PartnerInfo) GetLikeNum() int64 {
+	if x != nil {
+		return x.LikeNum
 	}
+	return 0
 }
 
-func (x *PartnerInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartnerInfo) ProtoMessage() {}
-
-func (x *PartnerInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_partner_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
+func (x *PartnerInfo) GetLikedNum() int64 {
+	if x != nil {
+		return x.LikedNum
 	}
-	return mi.MessageOf(x)
+	return 0
 }
 
-// Deprecated: Use PartnerInfo.ProtoReflect.Descriptor instead.
-func (*PartnerInfo) Descriptor() ([]byte, []int) {
-	return file_partner_proto_rawDescGZIP(), []int{2}
+func (x *PartnerInfo) GetLookNum() int64 {
+	if x != nil {
+		return x.LookNum
+	}
+	return 0
 }
 
-func (x *PartnerInfo) GetId() string {
+func (x *PartnerInfo) GetLevel() int64 {
 	if x != nil {
-		return x.Id
+		return x.Level
 	}
-	return ""
+	return 0
 }
 
-func (x *PartnerInfo) GetNickname() string {
+func (x *PartnerInfo) GetBalance() int64 {
 	if x != nil {
-		return x.Nickname
+		return x.Balance
 	}
-	return ""
+	return 0
 }
 
-func (x *PartnerInfo) GetAvatarUrl() string {
+func (x *PartnerInfo) GetTodayProfit() int64 {
 	if x != nil {
-		return x.AvatarUrl
+		return x.TodayProfit
 	}
-	return ""
+	return 0
 }
 
-func (x *PartnerInfo) GetSex() int64 {
+func (x *PartnerInfo) GetTodayReceptionNum() int64 {
 	if x != nil {
-		return x.Sex
+		return x.TodayReceptionNum
 	}
 	return 0
 }
 
-func (x *PartnerInfo) GetPictures() []string {
+func (x *PartnerInfo) GetReversionRate() string {
 	if x != nil {
-		return x.Pictures
+		return x.ReversionRate
 	}
-	return nil
+	return ""
 }
 
 type RandomPartnerInfo struct {
@@ -258,7 +243,7 @@ type RandomPartnerInfo struct {
 func (x *RandomPartnerInfo) Reset() {
 	*x = RandomPartnerInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_partner_proto_msgTypes[3]
+		mi := &file_partner_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -271,7 +256,7 @@ func (x *RandomPartnerInfo) String() string {
 func (*RandomPartnerInfo) ProtoMessage() {}
 
 func (x *RandomPartnerInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_partner_proto_msgTypes[3]
+	mi := &file_partner_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -284,7 +269,7 @@ func (x *RandomPartnerInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RandomPartnerInfo.ProtoReflect.Descriptor instead.
 func (*RandomPartnerInfo) Descriptor() ([]byte, []int) {
-	return file_partner_proto_rawDescGZIP(), []int{3}
+	return file_partner_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *RandomPartnerInfo) GetId() string {
@@ -326,7 +311,7 @@ type GetRandomPartnerRequest struct {
 func (x *GetRandomPartnerRequest) Reset() {
 	*x = GetRandomPartnerRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_partner_proto_msgTypes[4]
+		mi := &file_partner_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -339,7 +324,7 @@ func (x *GetRandomPartnerRequest) String() string {
 func (*GetRandomPartnerRequest) ProtoMessage() {}
 
 func (x *GetRandomPartnerRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_partner_proto_msgTypes[4]
+	mi := &file_partner_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -352,7 +337,7 @@ func (x *GetRandomPartnerRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetRandomPartnerRequest.ProtoReflect.Descriptor instead.
 func (*GetRandomPartnerRequest) Descriptor() ([]byte, []int) {
-	return file_partner_proto_rawDescGZIP(), []int{4}
+	return file_partner_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *GetRandomPartnerRequest) GetSex() int64 {
@@ -379,68 +364,80 @@ var file_partner_proto_rawDesc = []byte{
 	0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a,
 	0x03, 0x73, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22,
-	0x8b, 0x01, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c,
-	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12,
-	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65,
-	0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x85, 0x01,
-	0x0a, 0x0b, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a,
-	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61,
-	0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76,
-	0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63,
-	0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63,
-	0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x11, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50,
-	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69,
-	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69,
-	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
-	0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
-	0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e,
-	0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
-	0x73, 0x65, 0x78, 0x32, 0xce, 0x03, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12,
-	0x60, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49,
-	0x6e, 0x66, 0x6f, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01,
-	0x2a, 0x12, 0x77, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43,
-	0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74,
-	0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c,
+	0xf1, 0x02, 0x0a, 0x0b, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
+	0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61,
+	0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73,
+	0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x18, 0x0a,
+	0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
+	0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64,
+	0x4e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64,
+	0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a,
+	0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x65,
+	0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x74, 0x6f, 0x64, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0b, 0x74, 0x6f, 0x64, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x12,
+	0x2c, 0x0a, 0x11, 0x74, 0x6f, 0x64, 0x61, 0x79, 0x52, 0x65, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x74, 0x6f, 0x64, 0x61,
+	0x79, 0x52, 0x65, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a,
+	0x0d, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x61, 0x74, 0x65, 0x18, 0x0e,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52,
+	0x61, 0x74, 0x65, 0x22, 0x6f, 0x0a, 0x11, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72,
+	0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72,
+	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55,
+	0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x03, 0x73, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x6f,
+	0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65,
+	0x78, 0x32, 0xb9, 0x04, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12, 0x60, 0x0a,
+	0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66,
+	0x6f, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12,
+	0x79, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x1a, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
 	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f,
 	0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63, 0x69, 0x72, 0x63,
-	0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x89, 0x01, 0x0a, 0x18, 0x55,
+	0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x8c, 0x01, 0x0a, 0x18, 0x55,
 	0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
 	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61,
 	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74,
 	0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x27, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
-	0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x5c, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e,
-	0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74,
-	0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e,
-	0x65, 0x72, 0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
-	0x49, 0x6e, 0x66, 0x6f, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74,
-	0x6e, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61,
-	0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72,
-	0x74, 0x6e, 0x65, 0x72, 0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2a, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x24, 0x22, 0x1f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74,
+	0x6e, 0x65, 0x72, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x5c, 0x0a, 0x14, 0x47, 0x65, 0x74,
+	0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66,
+	0x6f, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e,
+	0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74,
+	0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x64, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x50, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e,
+	0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22,
+	0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a,
+	0x0b, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35,
+	0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x3b, 0x70, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -455,27 +452,30 @@ func file_partner_proto_rawDescGZIP() []byte {
 	return file_partner_proto_rawDescData
 }
 
-var file_partner_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_partner_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_partner_proto_goTypes = []interface{}{
 	(*UpdatePartnerInformationRequest)(nil), // 0: api.partner.UpdatePartnerInformationRequest
-	(*PartnerCircleInfo)(nil),               // 1: api.partner.PartnerCircleInfo
-	(*PartnerInfo)(nil),                     // 2: api.partner.PartnerInfo
-	(*RandomPartnerInfo)(nil),               // 3: api.partner.RandomPartnerInfo
-	(*GetRandomPartnerRequest)(nil),         // 4: api.partner.GetRandomPartnerRequest
-	(*emptypb.Empty)(nil),                   // 5: google.protobuf.Empty
-	(*common.PartnerIDParam)(nil),           // 6: api.common.PartnerIDParam
+	(*PartnerInfo)(nil),                     // 1: api.partner.PartnerInfo
+	(*RandomPartnerInfo)(nil),               // 2: api.partner.RandomPartnerInfo
+	(*GetRandomPartnerRequest)(nil),         // 3: api.partner.GetRandomPartnerRequest
+	(*emptypb.Empty)(nil),                   // 4: google.protobuf.Empty
+	(*common.PartnerIDParam)(nil),           // 5: api.common.PartnerIDParam
+	(*common.AddFriendMessageInfo)(nil),     // 6: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                 // 7: api.common.HomeInfo
 }
 var file_partner_proto_depIdxs = []int32{
-	5, // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
-	6, // 1: api.partner.Partner.GetPartnerCircleInfo:input_type -> api.common.PartnerIDParam
+	4, // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
+	5, // 1: api.partner.Partner.GetPartnerCircleInfo:input_type -> api.common.PartnerIDParam
 	0, // 2: api.partner.Partner.UpdatePartnerInformation:input_type -> api.partner.UpdatePartnerInformationRequest
-	4, // 3: api.partner.Partner.GetRandomPartnerInfo:input_type -> api.partner.GetRandomPartnerRequest
-	2, // 4: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
-	1, // 5: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.partner.PartnerCircleInfo
-	5, // 6: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
-	3, // 7: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
-	4, // [4:8] is the sub-list for method output_type
-	0, // [0:4] is the sub-list for method input_type
+	3, // 3: api.partner.Partner.GetRandomPartnerInfo:input_type -> api.partner.GetRandomPartnerRequest
+	5, // 4: api.partner.Partner.GetPartnerHomeInfo:input_type -> api.common.PartnerIDParam
+	1, // 5: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
+	6, // 6: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	4, // 7: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
+	2, // 8: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
+	7, // 9: api.partner.Partner.GetPartnerHomeInfo:output_type -> api.common.HomeInfo
+	5, // [5:10] is the sub-list for method output_type
+	0, // [0:5] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name
@@ -500,18 +500,6 @@ func file_partner_proto_init() {
 			}
 		}
 		file_partner_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PartnerCircleInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_partner_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PartnerInfo); i {
 			case 0:
 				return &v.state
@@ -523,7 +511,7 @@ func file_partner_proto_init() {
 				return nil
 			}
 		}
-		file_partner_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_partner_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RandomPartnerInfo); i {
 			case 0:
 				return &v.state
@@ -535,7 +523,7 @@ func file_partner_proto_init() {
 				return nil
 			}
 		}
-		file_partner_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_partner_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetRandomPartnerRequest); i {
 			case 0:
 				return &v.state
@@ -554,7 +542,7 @@ func file_partner_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_partner_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   5,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 25 - 16
api/partner/partner.proto

@@ -12,48 +12,57 @@ option java_multiple_files = true;
 option java_package = "api.partner";
 
 service Partner {
+  // 获取陪聊的个人信息
   rpc GetPartnerInfo (google.protobuf.Empty) returns (PartnerInfo){
     option (google.api.http) = {
       post: "/api/partner/info",
       body:"*"
     };
   };
-  rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (PartnerCircleInfo){
+  // 获取陪聊的确认通过页面信息
+  rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (common.AddFriendMessageInfo){
     option (google.api.http) = {
       post: "/api/partner/circle/info",
       body:"*"
     };
   };
+  // 更新陪聊的信息
   rpc UpdatePartnerInformation (UpdatePartnerInformationRequest) returns (google.protobuf.Empty){
     option (google.api.http) = {
-      post: "/api/user/update/information",
+      post: "/api/partner/update/information",
       body:"*"
     };
   };
   rpc GetRandomPartnerInfo (GetRandomPartnerRequest) returns (RandomPartnerInfo);
+  // 获取陪聊的主页
+  rpc GetPartnerHomeInfo (common.PartnerIDParam) returns (common.HomeInfo){
+    option (google.api.http) = {
+      post: "/api/partner/home",
+      body:"*"
+    };
+  };
 }
 
 message UpdatePartnerInformationRequest {
-  string Nickname = 1;
-  string avatarUrl = 2;
-  int64 sex = 3;
-}
-
-
-message PartnerCircleInfo{
-  string id = 1; // id
-  string nickname = 2;// 昵称
-  string avatarUrl =3;// 头像链接
-  int64 sex = 4;// 性别
-  repeated string pictures = 5; // 图片
+  string Nickname = 1; // 昵称
+  string avatarUrl = 2;// 头像
+  int64 sex = 3; // 性别
 }
 
 message PartnerInfo{
   string id = 1; // id
   string nickname = 2;// 昵称
   string avatarUrl =3;// 头像链接
-  int64 sex = 4;// 性别
-  repeated string pictures = 5; // 图片
+  int64 age = 4;// 年龄
+  int64 sex = 5;// 性别
+  int64 likeNum = 7;// 我喜欢
+  int64 likedNum = 8;// 喜欢我
+  int64 lookNum = 9;// 看过我
+  int64 level = 10;// 等级
+  int64 balance = 11;// 可提现余额
+  int64 todayProfit = 12;// 进入收益
+  int64 todayReceptionNum = 13;// 今日接待人数
+  string reversionRate = 14;// 五分钟的回复率
 }
 
 message RandomPartnerInfo{

+ 49 - 5
api/partner/partner_grpc.pb.go

@@ -20,10 +20,15 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type PartnerClient interface {
+	// 获取陪聊的个人信息
 	GetPartnerInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerInfo, error)
-	GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*PartnerCircleInfo, error)
+	// 获取陪聊的确认通过页面信息
+	GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*common.AddFriendMessageInfo, error)
+	// 更新陪聊的信息
 	UpdatePartnerInformation(ctx context.Context, in *UpdatePartnerInformationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	GetRandomPartnerInfo(ctx context.Context, in *GetRandomPartnerRequest, opts ...grpc.CallOption) (*RandomPartnerInfo, error)
+	// 获取陪聊的主页
+	GetPartnerHomeInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*common.HomeInfo, error)
 }
 
 type partnerClient struct {
@@ -43,8 +48,8 @@ func (c *partnerClient) GetPartnerInfo(ctx context.Context, in *emptypb.Empty, o
 	return out, nil
 }
 
-func (c *partnerClient) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*PartnerCircleInfo, error) {
-	out := new(PartnerCircleInfo)
+func (c *partnerClient) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*common.AddFriendMessageInfo, error) {
+	out := new(common.AddFriendMessageInfo)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerCircleInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -70,14 +75,28 @@ func (c *partnerClient) GetRandomPartnerInfo(ctx context.Context, in *GetRandomP
 	return out, nil
 }
 
+func (c *partnerClient) GetPartnerHomeInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*common.HomeInfo, error) {
+	out := new(common.HomeInfo)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerHomeInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // PartnerServer is the server API for Partner service.
 // All implementations must embed UnimplementedPartnerServer
 // for forward compatibility
 type PartnerServer interface {
+	// 获取陪聊的个人信息
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
-	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*PartnerCircleInfo, error)
+	// 获取陪聊的确认通过页面信息
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*common.AddFriendMessageInfo, error)
+	// 更新陪聊的信息
 	UpdatePartnerInformation(context.Context, *UpdatePartnerInformationRequest) (*emptypb.Empty, error)
 	GetRandomPartnerInfo(context.Context, *GetRandomPartnerRequest) (*RandomPartnerInfo, error)
+	// 获取陪聊的主页
+	GetPartnerHomeInfo(context.Context, *common.PartnerIDParam) (*common.HomeInfo, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -88,7 +107,7 @@ type UnimplementedPartnerServer struct {
 func (UnimplementedPartnerServer) GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerInfo not implemented")
 }
-func (UnimplementedPartnerServer) GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*PartnerCircleInfo, error) {
+func (UnimplementedPartnerServer) GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*common.AddFriendMessageInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerCircleInfo not implemented")
 }
 func (UnimplementedPartnerServer) UpdatePartnerInformation(context.Context, *UpdatePartnerInformationRequest) (*emptypb.Empty, error) {
@@ -97,6 +116,9 @@ func (UnimplementedPartnerServer) UpdatePartnerInformation(context.Context, *Upd
 func (UnimplementedPartnerServer) GetRandomPartnerInfo(context.Context, *GetRandomPartnerRequest) (*RandomPartnerInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRandomPartnerInfo not implemented")
 }
+func (UnimplementedPartnerServer) GetPartnerHomeInfo(context.Context, *common.PartnerIDParam) (*common.HomeInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerHomeInfo not implemented")
+}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 // UnsafePartnerServer may be embedded to opt out of forward compatibility for this service.
@@ -182,6 +204,24 @@ func _Partner_GetRandomPartnerInfo_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_GetPartnerHomeInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.PartnerIDParam)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).GetPartnerHomeInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/GetPartnerHomeInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).GetPartnerHomeInfo(ctx, req.(*common.PartnerIDParam))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Partner_ServiceDesc is the grpc.ServiceDesc for Partner service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -205,6 +245,10 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetRandomPartnerInfo",
 			Handler:    _Partner_GetRandomPartnerInfo_Handler,
 		},
+		{
+			MethodName: "GetPartnerHomeInfo",
+			Handler:    _Partner_GetPartnerHomeInfo_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "partner.proto",

+ 49 - 6
api/partner/partner_http.pb.go

@@ -28,7 +28,8 @@ var _ = new(base.Html)
 const _ = http.SupportPackageIsVersion1
 
 type PartnerHTTPServer interface {
-	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*PartnerCircleInfo, error)
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*common.AddFriendMessageInfo, error)
+	GetPartnerHomeInfo(context.Context, *common.PartnerIDParam) (*common.HomeInfo, error)
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
 	UpdatePartnerInformation(context.Context, *UpdatePartnerInformationRequest) (*emptypb.Empty, error)
 }
@@ -37,7 +38,8 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r := s.Route("/")
 	r.POST("/api/partner/info", _Partner_GetPartnerInfo0_HTTP_Handler(srv))
 	r.POST("/api/partner/circle/info", _Partner_GetPartnerCircleInfo0_HTTP_Handler(srv))
-	r.POST("/api/user/update/information", _Partner_UpdatePartnerInformation0_HTTP_Handler(srv))
+	r.POST("/api/partner/update/information", _Partner_UpdatePartnerInformation0_HTTP_Handler(srv))
+	r.POST("/api/partner/home", _Partner_GetPartnerHomeInfo0_HTTP_Handler(srv))
 }
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -121,8 +123,36 @@ func _Partner_UpdatePartnerInformation0_HTTP_Handler(srv PartnerHTTPServer) func
 	}
 }
 
+func _Partner_GetPartnerHomeInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.PartnerIDParam
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/GetPartnerHomeInfo")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.GetPartnerHomeInfo(ctx, req.(*common.PartnerIDParam))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type PartnerHTTPClient interface {
-	GetPartnerCircleInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *PartnerCircleInfo, err error)
+	GetPartnerCircleInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *common.AddFriendMessageInfo, err error)
+	GetPartnerHomeInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *common.HomeInfo, err error)
 	GetPartnerInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerInfo, err error)
 	UpdatePartnerInformation(ctx context.Context, req *UpdatePartnerInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 }
@@ -135,8 +165,8 @@ func NewPartnerHTTPClient(client *http.Client) PartnerHTTPClient {
 	return &PartnerHTTPClientImpl{client}
 }
 
-func (c *PartnerHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*PartnerCircleInfo, error) {
-	var out PartnerCircleInfo
+func (c *PartnerHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*common.AddFriendMessageInfo, error) {
+	var out common.AddFriendMessageInfo
 	pattern := "/api/partner/circle/info"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.partner.Partner/GetPartnerCircleInfo"))
@@ -148,6 +178,19 @@ func (c *PartnerHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *co
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) GetPartnerHomeInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*common.HomeInfo, error) {
+	var out common.HomeInfo
+	pattern := "/api/partner/home"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/GetPartnerHomeInfo"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *PartnerHTTPClientImpl) GetPartnerInfo(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*PartnerInfo, error) {
 	var out PartnerInfo
 	pattern := "/api/partner/info"
@@ -163,7 +206,7 @@ func (c *PartnerHTTPClientImpl) GetPartnerInfo(ctx context.Context, in *emptypb.
 
 func (c *PartnerHTTPClientImpl) UpdatePartnerInformation(ctx context.Context, in *UpdatePartnerInformationRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
-	pattern := "/api/user/update/information"
+	pattern := "/api/partner/update/information"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.partner.Partner/UpdatePartnerInformation"))
 	opts = append(opts, http.PathTemplate(pattern))

+ 105 - 286
api/user/user.pb.go

@@ -9,7 +9,6 @@ package user
 import (
 	chat "git.ikuban.com/server/pw-protobuf/api/chat"
 	common "git.ikuban.com/server/pw-protobuf/api/common"
-	partner "git.ikuban.com/server/pw-protobuf/api/partner"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -25,149 +24,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type UserHomeInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id             string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`                          // id
-	Nickname       string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`              // 昵称
-	AvatarUrl      string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"`            // 头像链接
-	Sex            int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`                       // 性别
-	Pictures       []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`              // 图片
-	Age            int64    `protobuf:"varint,6,opt,name=age,proto3" json:"age"`                       // 年龄
-	Constellation  string   `protobuf:"bytes,7,opt,name=constellation,proto3" json:"constellation"`    // 星座
-	Area           string   `protobuf:"bytes,8,opt,name=area,proto3" json:"area"`                      // 地区
-	Tag            []string `protobuf:"bytes,9,rep,name=tag,proto3" json:"tag"`                        // 标签
-	Signature      string   `protobuf:"bytes,10,opt,name=signature,proto3" json:"signature"`           // 签名
-	IntroduceVoice string   `protobuf:"bytes,11,opt,name=introduceVoice,proto3" json:"introduceVoice"` // 介绍语音
-	LikedNum       int64    `protobuf:"varint,12,opt,name=likedNum,proto3" json:"likedNum"`            // 喜欢我
-	LookNum        int64    `protobuf:"varint,13,opt,name=lookNum,proto3" json:"lookNum"`              // 看过我
-}
-
-func (x *UserHomeInfo) Reset() {
-	*x = UserHomeInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_user_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UserHomeInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UserHomeInfo) ProtoMessage() {}
-
-func (x *UserHomeInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_user_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UserHomeInfo.ProtoReflect.Descriptor instead.
-func (*UserHomeInfo) Descriptor() ([]byte, []int) {
-	return file_user_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *UserHomeInfo) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetNickname() string {
-	if x != nil {
-		return x.Nickname
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetAvatarUrl() string {
-	if x != nil {
-		return x.AvatarUrl
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetSex() int64 {
-	if x != nil {
-		return x.Sex
-	}
-	return 0
-}
-
-func (x *UserHomeInfo) GetPictures() []string {
-	if x != nil {
-		return x.Pictures
-	}
-	return nil
-}
-
-func (x *UserHomeInfo) GetAge() int64 {
-	if x != nil {
-		return x.Age
-	}
-	return 0
-}
-
-func (x *UserHomeInfo) GetConstellation() string {
-	if x != nil {
-		return x.Constellation
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetArea() string {
-	if x != nil {
-		return x.Area
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetTag() []string {
-	if x != nil {
-		return x.Tag
-	}
-	return nil
-}
-
-func (x *UserHomeInfo) GetSignature() string {
-	if x != nil {
-		return x.Signature
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetIntroduceVoice() string {
-	if x != nil {
-		return x.IntroduceVoice
-	}
-	return ""
-}
-
-func (x *UserHomeInfo) GetLikedNum() int64 {
-	if x != nil {
-		return x.LikedNum
-	}
-	return 0
-}
-
-func (x *UserHomeInfo) GetLookNum() int64 {
-	if x != nil {
-		return x.LookNum
-	}
-	return 0
-}
-
 type UserInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -187,7 +43,7 @@ type UserInfo struct {
 func (x *UserInfo) Reset() {
 	*x = UserInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_proto_msgTypes[1]
+		mi := &file_user_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -200,7 +56,7 @@ func (x *UserInfo) String() string {
 func (*UserInfo) ProtoMessage() {}
 
 func (x *UserInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_user_proto_msgTypes[1]
+	mi := &file_user_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -213,7 +69,7 @@ func (x *UserInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UserInfo.ProtoReflect.Descriptor instead.
 func (*UserInfo) Descriptor() ([]byte, []int) {
-	return file_user_proto_rawDescGZIP(), []int{1}
+	return file_user_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *UserInfo) GetId() string {
@@ -284,15 +140,15 @@ type UpdateUserInformationRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Nickname  string `protobuf:"bytes,1,opt,name=Nickname,proto3" json:"Nickname"`
-	AvatarUrl string `protobuf:"bytes,2,opt,name=avatarUrl,proto3" json:"avatarUrl"`
-	Sex       int64  `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`
+	Nickname  string `protobuf:"bytes,1,opt,name=Nickname,proto3" json:"Nickname"`   // 昵称
+	AvatarUrl string `protobuf:"bytes,2,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像
+	Sex       int64  `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`            // 性别
 }
 
 func (x *UpdateUserInformationRequest) Reset() {
 	*x = UpdateUserInformationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_user_proto_msgTypes[2]
+		mi := &file_user_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -305,7 +161,7 @@ func (x *UpdateUserInformationRequest) String() string {
 func (*UpdateUserInformationRequest) ProtoMessage() {}
 
 func (x *UpdateUserInformationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_user_proto_msgTypes[2]
+	mi := &file_user_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -318,7 +174,7 @@ func (x *UpdateUserInformationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateUserInformationRequest.ProtoReflect.Descriptor instead.
 func (*UpdateUserInformationRequest) Descriptor() ([]byte, []int) {
-	return file_user_proto_rawDescGZIP(), []int{2}
+	return file_user_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *UpdateUserInformationRequest) GetNickname() string {
@@ -351,105 +207,80 @@ var file_user_proto_rawDesc = []byte{
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74,
-	0x6e, 0x65, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x17, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x55,
-	0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e,
-	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e,
-	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
-	0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75,
-	0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75,
-	0x72, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x6c,
-	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f,
-	0x6e, 0x73, 0x74, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x61,
-	0x72, 0x65, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12,
-	0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61,
-	0x67, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
-	0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63,
-	0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75,
-	0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64,
-	0x4e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64,
-	0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0xe0, 0x01,
-	0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69,
-	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69,
-	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
-	0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
-	0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x64,
-	0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74,
-	0x12, 0x18, 0x0a, 0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69,
-	0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69,
-	0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75,
-	0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d,
-	0x22, 0x6a, 0x0a, 0x1c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
-	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
-	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65,
-	0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xef, 0x05, 0x0a,
-	0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x80, 0x01, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22,
-	0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73,
-	0x65, 0x72, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x54, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55,
-	0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a,
-	0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49,
-	0x6e, 0x66, 0x6f, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x0e, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x94,
-	0x01, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74,
-	0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69,
-	0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50,
-	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73,
-	0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x27, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f,
-	0x63, 0x68, 0x65, 0x63, 0x6b, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68,
-	0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12, 0x97, 0x01, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
+	0xe0, 0x01, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+	0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74,
+	0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61,
+	0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72,
+	0x65, 0x64, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x64,
+	0x69, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08,
+	0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
+	0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b,
+	0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e,
+	0x75, 0x6d, 0x22, 0x6a, 0x0a, 0x1c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72,
+	0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c,
+	0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03,
+	0x73, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xe8,
+	0x05, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x80, 0x01, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f,
+	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x54, 0x0a, 0x0b, 0x47, 0x65,
+	0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x1a, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x0e, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a,
+	0x12, 0x94, 0x01, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x68, 0x69, 0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a,
+	0x2d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b,
 	0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x27,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65,
+	0x72, 0x2f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x68, 0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12, 0x97, 0x01, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52,
+	0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68,
+	0x61, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72,
+	0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68,
+	0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x22,
+	0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x3a, 0x01,
+	0x2a, 0x12, 0x79, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43,
+	0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74,
-	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e,
-	0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x22, 0x1d, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x2f,
-	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12,
-	0x77, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72,
-	0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61,
-	0x72, 0x61, 0x6d, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65,
-	0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65,
-	0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x64, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55,
-	0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x17, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x20, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f,
-	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x42, 0x3d,
-	0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69,
-	0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22,
+	0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63, 0x69,
+	0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x5b, 0x0a, 0x0f,
+	0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x19,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x0e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65,
+	0x72, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69,
+	0x2e, 0x75, 0x73, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75,
+	0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70,
+	0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75,
+	0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -464,31 +295,31 @@ func file_user_proto_rawDescGZIP() []byte {
 	return file_user_proto_rawDescData
 }
 
-var file_user_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_user_proto_goTypes = []interface{}{
-	(*UserHomeInfo)(nil),                              // 0: api.user.UserHomeInfo
-	(*UserInfo)(nil),                                  // 1: api.user.UserInfo
-	(*UpdateUserInformationRequest)(nil),              // 2: api.user.UpdateUserInformationRequest
-	(*emptypb.Empty)(nil),                             // 3: google.protobuf.Empty
-	(*common.PartnerIDParam)(nil),                     // 4: api.common.PartnerIDParam
-	(*common.UserIDParam)(nil),                        // 5: api.common.UserIDParam
-	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 6: api.chat.CheckUserPartnerIsRelationshipReply
-	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 7: api.chat.CreateUserPartnerIsRelationshipReply
-	(*partner.PartnerCircleInfo)(nil),                 // 8: api.partner.PartnerCircleInfo
+	(*UserInfo)(nil),                                  // 0: api.user.UserInfo
+	(*UpdateUserInformationRequest)(nil),              // 1: api.user.UpdateUserInformationRequest
+	(*emptypb.Empty)(nil),                             // 2: google.protobuf.Empty
+	(*common.PartnerIDParam)(nil),                     // 3: api.common.PartnerIDParam
+	(*common.UserIDParam)(nil),                        // 4: api.common.UserIDParam
+	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 5: api.chat.CheckUserPartnerIsRelationshipReply
+	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 6: api.chat.CreateUserPartnerIsRelationshipReply
+	(*common.AddFriendMessageInfo)(nil),               // 7: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                           // 8: api.common.HomeInfo
 }
 var file_user_proto_depIdxs = []int32{
-	2, // 0: api.user.User.UpdateUserInformation:input_type -> api.user.UpdateUserInformationRequest
-	3, // 1: api.user.User.GetUserInfo:input_type -> google.protobuf.Empty
-	4, // 2: api.user.User.CheckUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
-	4, // 3: api.user.User.CreateUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
-	4, // 4: api.user.User.GetPartnerCircleInfo:input_type -> api.common.PartnerIDParam
-	5, // 5: api.user.User.GetUserHomeInfo:input_type -> api.common.UserIDParam
-	3, // 6: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	1, // 7: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	6, // 8: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	7, // 9: api.user.User.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
-	8, // 10: api.user.User.GetPartnerCircleInfo:output_type -> api.partner.PartnerCircleInfo
-	0, // 11: api.user.User.GetUserHomeInfo:output_type -> api.user.UserHomeInfo
+	1, // 0: api.user.User.UpdateUserInformation:input_type -> api.user.UpdateUserInformationRequest
+	2, // 1: api.user.User.GetUserInfo:input_type -> google.protobuf.Empty
+	3, // 2: api.user.User.CheckUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
+	3, // 3: api.user.User.CreateUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
+	3, // 4: api.user.User.GetPartnerCircleInfo:input_type -> api.common.PartnerIDParam
+	4, // 5: api.user.User.GetUserHomeInfo:input_type -> api.common.UserIDParam
+	2, // 6: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	0, // 7: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	5, // 8: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	6, // 9: api.user.User.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
+	7, // 10: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	8, // 11: api.user.User.GetUserHomeInfo:output_type -> api.common.HomeInfo
 	6, // [6:12] is the sub-list for method output_type
 	0, // [0:6] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -503,18 +334,6 @@ func file_user_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_user_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserHomeInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_user_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UserInfo); i {
 			case 0:
 				return &v.state
@@ -526,7 +345,7 @@ func file_user_proto_init() {
 				return nil
 			}
 		}
-		file_user_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_user_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateUserInformationRequest); i {
 			case 0:
 				return &v.state
@@ -545,7 +364,7 @@ func file_user_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_user_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 8 - 23
api/user/user.proto

@@ -6,7 +6,6 @@ import "google/api/annotations.proto";
 //import "google/protobuf/struct.proto";
 import "google/protobuf/empty.proto";
 import "api/chat/chat.proto";
-import "api/partner/partner.proto";
 import "api/common/common.proto";
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/user;user";
@@ -42,36 +41,22 @@ service User {
       body:"*"
     };
   };
-  rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (partner.PartnerCircleInfo){
+  // 获取陪聊的确认通过页面信息
+  rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (common.AddFriendMessageInfo){
     option (google.api.http) = {
       post: "/api/partner/circle/info",
       body:"*"
     };
   };
-  rpc GetUserHomeInfo (common.UserIDParam) returns (UserHomeInfo){
+  // 获取用户主页信息
+  rpc GetUserHomeInfo (common.UserIDParam) returns (common.HomeInfo){
     option (google.api.http) = {
-      post: "/api/user/circle/info",
+      post: "/api/user/home",
       body:"*"
     };
   };
 }
 
-message UserHomeInfo{
-  string id = 1; // id
-  string nickname = 2;// 昵称
-  string avatarUrl =3;// 头像链接
-  int64 sex = 4;// 性别
-  repeated string pictures = 5; // 图片
-  int64 age = 6; // 年龄
-  string constellation = 7; // 星座
-  string area = 8; // 地区
-  repeated string tag = 9; // 标签
-  string signature = 10; // 签名
-  string introduceVoice = 11; // 介绍语音
-  int64 likedNum = 12;// 喜欢我
-  int64 lookNum = 13;// 看过我
-}
-
 message UserInfo{
   string id = 1; // id
   string nickname = 2;// 昵称
@@ -85,7 +70,7 @@ message UserInfo{
 }
 
 message UpdateUserInformationRequest {
-  string Nickname = 1;
-  string avatarUrl = 2;
-  int64 sex = 3;
+  string Nickname = 1; // 昵称
+  string avatarUrl = 2;// 头像
+  int64 sex = 3; // 性别
 }

+ 14 - 11
api/user/user_grpc.pb.go

@@ -6,7 +6,6 @@ import (
 	context "context"
 	chat "git.ikuban.com/server/pw-protobuf/api/chat"
 	common "git.ikuban.com/server/pw-protobuf/api/common"
-	partner "git.ikuban.com/server/pw-protobuf/api/partner"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -30,8 +29,10 @@ type UserClient interface {
 	CheckUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error)
 	// 创建用户与陪聊的关联
 	CreateUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error)
-	GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*partner.PartnerCircleInfo, error)
-	GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...grpc.CallOption) (*UserHomeInfo, error)
+	// 获取陪聊的确认通过页面信息
+	GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*common.AddFriendMessageInfo, error)
+	// 获取用户主页信息
+	GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...grpc.CallOption) (*common.HomeInfo, error)
 }
 
 type userClient struct {
@@ -78,8 +79,8 @@ func (c *userClient) CreateUserPartnerIsRelationship(ctx context.Context, in *co
 	return out, nil
 }
 
-func (c *userClient) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*partner.PartnerCircleInfo, error) {
-	out := new(partner.PartnerCircleInfo)
+func (c *userClient) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*common.AddFriendMessageInfo, error) {
+	out := new(common.AddFriendMessageInfo)
 	err := c.cc.Invoke(ctx, "/api.user.User/GetPartnerCircleInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -87,8 +88,8 @@ func (c *userClient) GetPartnerCircleInfo(ctx context.Context, in *common.Partne
 	return out, nil
 }
 
-func (c *userClient) GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...grpc.CallOption) (*UserHomeInfo, error) {
-	out := new(UserHomeInfo)
+func (c *userClient) GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...grpc.CallOption) (*common.HomeInfo, error) {
+	out := new(common.HomeInfo)
 	err := c.cc.Invoke(ctx, "/api.user.User/GetUserHomeInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -108,8 +109,10 @@ type UserServer interface {
 	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
 	// 创建用户与陪聊的关联
 	CreateUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error)
-	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*partner.PartnerCircleInfo, error)
-	GetUserHomeInfo(context.Context, *common.UserIDParam) (*UserHomeInfo, error)
+	// 获取陪聊的确认通过页面信息
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*common.AddFriendMessageInfo, error)
+	// 获取用户主页信息
+	GetUserHomeInfo(context.Context, *common.UserIDParam) (*common.HomeInfo, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -129,10 +132,10 @@ func (UnimplementedUserServer) CheckUserPartnerIsRelationship(context.Context, *
 func (UnimplementedUserServer) CreateUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUserPartnerIsRelationship not implemented")
 }
-func (UnimplementedUserServer) GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*partner.PartnerCircleInfo, error) {
+func (UnimplementedUserServer) GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*common.AddFriendMessageInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerCircleInfo not implemented")
 }
-func (UnimplementedUserServer) GetUserHomeInfo(context.Context, *common.UserIDParam) (*UserHomeInfo, error) {
+func (UnimplementedUserServer) GetUserHomeInfo(context.Context, *common.UserIDParam) (*common.HomeInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserHomeInfo not implemented")
 }
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}

+ 10 - 11
api/user/user_http.pb.go

@@ -10,7 +10,6 @@ import (
 	reply "git.ikuban.com/server/kratos-utils/http/reply"
 	chat "git.ikuban.com/server/pw-protobuf/api/chat"
 	common "git.ikuban.com/server/pw-protobuf/api/common"
-	partner "git.ikuban.com/server/pw-protobuf/api/partner"
 	http "github.com/go-kratos/kratos/v2/transport/http"
 	binding "github.com/go-kratos/kratos/v2/transport/http/binding"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
@@ -32,8 +31,8 @@ const _ = http.SupportPackageIsVersion1
 type UserHTTPServer interface {
 	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
 	CreateUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error)
-	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*partner.PartnerCircleInfo, error)
-	GetUserHomeInfo(context.Context, *common.UserIDParam) (*UserHomeInfo, error)
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*common.AddFriendMessageInfo, error)
+	GetUserHomeInfo(context.Context, *common.UserIDParam) (*common.HomeInfo, error)
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
 	UpdateUserInformation(context.Context, *UpdateUserInformationRequest) (*emptypb.Empty, error)
 }
@@ -45,7 +44,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/check/relationship", _User_CheckUserPartnerIsRelationship0_HTTP_Handler(srv))
 	r.POST("/api/user/create/relationship", _User_CreateUserPartnerIsRelationship0_HTTP_Handler(srv))
 	r.POST("/api/partner/circle/info", _User_GetPartnerCircleInfo0_HTTP_Handler(srv))
-	r.POST("/api/user/circle/info", _User_GetUserHomeInfo0_HTTP_Handler(srv))
+	r.POST("/api/user/home", _User_GetUserHomeInfo0_HTTP_Handler(srv))
 }
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -213,8 +212,8 @@ func _User_GetUserHomeInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Conte
 type UserHTTPClient interface {
 	CheckUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
 	CreateUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CreateUserPartnerIsRelationshipReply, err error)
-	GetPartnerCircleInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *partner.PartnerCircleInfo, err error)
-	GetUserHomeInfo(ctx context.Context, req *common.UserIDParam, opts ...http.CallOption) (rsp *UserHomeInfo, err error)
+	GetPartnerCircleInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *common.AddFriendMessageInfo, err error)
+	GetUserHomeInfo(ctx context.Context, req *common.UserIDParam, opts ...http.CallOption) (rsp *common.HomeInfo, err error)
 	GetUserInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserInfo, err error)
 	UpdateUserInformation(ctx context.Context, req *UpdateUserInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 }
@@ -253,8 +252,8 @@ func (c *UserHTTPClientImpl) CreateUserPartnerIsRelationship(ctx context.Context
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*partner.PartnerCircleInfo, error) {
-	var out partner.PartnerCircleInfo
+func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*common.AddFriendMessageInfo, error) {
+	var out common.AddFriendMessageInfo
 	pattern := "/api/partner/circle/info"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.user.User/GetPartnerCircleInfo"))
@@ -266,9 +265,9 @@ func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *commo
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...http.CallOption) (*UserHomeInfo, error) {
-	var out UserHomeInfo
-	pattern := "/api/user/circle/info"
+func (c *UserHTTPClientImpl) GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...http.CallOption) (*common.HomeInfo, error) {
+	var out common.HomeInfo
+	pattern := "/api/user/home"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.user.User/GetUserHomeInfo"))
 	opts = append(opts, http.PathTemplate(pattern))

+ 40 - 0
js/api/common/common_pb.ts

@@ -12,4 +12,44 @@ export interface PartnerIDParam{
 export interface UserIDParam{
     userId?:string;
 }
+export interface HomeInfo{
+    /**  id */
+    id?:string;
+    /**  昵称 */
+    nickname?:string;
+    /**  头像链接 */
+    avatarUrl?:string;
+    /**  性别 */
+    sex?:number;
+    /**  图片 */
+    pictures?:Array<string>;
+    /**  年龄 */
+    age?:number;
+    /**  星座 */
+    constellation?:string;
+    /**  地区 */
+    area?:string;
+    /**  标签 */
+    tag?:Array<string>;
+    /**  签名 */
+    signature?:string;
+    /**  介绍语音 */
+    introduceVoice?:string;
+    /**  喜欢我 */
+    likedNum?:number;
+    /**  看过我 */
+    lookNum?:number;
+}
+export interface AddFriendMessageInfo{
+    /**  id */
+    id?:string;
+    /**  昵称 */
+    nickname?:string;
+    /**  头像链接 */
+    avatarUrl?:string;
+    /**  性别 */
+    sex?:number;
+    /**  图片 */
+    pictures?:Array<string>;
+}
 

+ 12 - 4
js/api/partner/partner_http_pb.ts

@@ -1,19 +1,27 @@
 // @ts-ignore
 import { request } from 'ice';
-import {PartnerInfo,PartnerCircleInfo,UpdatePartnerInformationRequest,GetRandomPartnerRequest,RandomPartnerInfo} from "./partner_pb";
-import {PartnerIDParam} from "../common/common_pb";
+import {PartnerInfo,UpdatePartnerInformationRequest,GetRandomPartnerRequest,RandomPartnerInfo} from "./partner_pb";
+import {PartnerIDParam,AddFriendMessageInfo,HomeInfo} from "../common/common_pb";
 
 const PartnerService = {
+  /**  获取陪聊的个人信息 */
   GetPartnerInfo: async (req?: undefined) => {
 	const res = await request.post<{ data: PartnerInfo, code: string, message: string }>('/api/partner/info', req);
     return res.data;
   },
+  /**  获取陪聊的确认通过页面信息 */
   GetPartnerCircleInfo: async (req?: PartnerIDParam) => {
-	const res = await request.post<{ data: PartnerCircleInfo, code: string, message: string }>('/api/partner/circle/info', req);
+	const res = await request.post<{ data: AddFriendMessageInfo, code: string, message: string }>('/api/partner/circle/info', req);
     return res.data;
   },
+  /**  更新陪聊的信息 */
   UpdatePartnerInformation: async (req?: UpdatePartnerInformationRequest) => {
-	const res = await request.post('/api/user/update/information', req);
+	const res = await request.post('/api/partner/update/information', req);
+    return res.data;
+  },
+  /**  获取陪聊的主页 */
+  GetPartnerHomeInfo: async (req?: PartnerIDParam) => {
+	const res = await request.post<{ data: HomeInfo, code: string, message: string }>('/api/partner/home', req);
     return res.data;
   },
 

+ 20 - 13
js/api/partner/partner_pb.ts

@@ -1,19 +1,10 @@
 export interface UpdatePartnerInformationRequest{
-    Nickname?:string;
-    avatarUrl?:string;
-    sex?:number;
-}
-export interface PartnerCircleInfo{
-    /**  id */
-    id?:string;
     /**  昵称 */
-    nickname?:string;
-    /**  头像链接 */
+    Nickname?:string;
+    /**  头像 */
     avatarUrl?:string;
     /**  性别 */
     sex?:number;
-    /**  图片 */
-    pictures?:Array<string>;
 }
 export interface PartnerInfo{
     /**  id */
@@ -22,10 +13,26 @@ export interface PartnerInfo{
     nickname?:string;
     /**  头像链接 */
     avatarUrl?:string;
+    /**  年龄 */
+    age?:number;
     /**  性别 */
     sex?:number;
-    /**  图片 */
-    pictures?:Array<string>;
+    /**  我喜欢 */
+    likeNum?:number;
+    /**  喜欢我 */
+    likedNum?:number;
+    /**  看过我 */
+    lookNum?:number;
+    /**  等级 */
+    level?:number;
+    /**  可提现余额 */
+    balance?:number;
+    /**  进入收益 */
+    todayProfit?:number;
+    /**  今日接待人数 */
+    todayReceptionNum?:number;
+    /**  五分钟的回复率 */
+    reversionRate?:string;
 }
 export interface RandomPartnerInfo{
     /**  id */

+ 6 - 5
js/api/user/user_http_pb.ts

@@ -1,9 +1,8 @@
 // @ts-ignore
 import { request } from 'ice';
-import {UpdateUserInformationRequest,UserInfo,UserHomeInfo} from "./user_pb";
-import {PartnerIDParam,UserIDParam} from "../common/common_pb";
+import {UpdateUserInformationRequest,UserInfo} from "./user_pb";
+import {PartnerIDParam,AddFriendMessageInfo,UserIDParam,HomeInfo} from "../common/common_pb";
 import {CheckUserPartnerIsRelationshipReply,CreateUserPartnerIsRelationshipReply} from "../chat/chat_pb";
-import {PartnerCircleInfo} from "../partner/partner_pb";
 
 const UserService = {
   /**  更新用户信息 */
@@ -26,12 +25,14 @@ const UserService = {
 	const res = await request.post<{ data: CreateUserPartnerIsRelationshipReply, code: string, message: string }>('/api/user/create/relationship', req);
     return res.data;
   },
+  /**  获取陪聊的确认通过页面信息 */
   GetPartnerCircleInfo: async (req?: PartnerIDParam) => {
-	const res = await request.post<{ data: PartnerCircleInfo, code: string, message: string }>('/api/partner/circle/info', req);
+	const res = await request.post<{ data: AddFriendMessageInfo, code: string, message: string }>('/api/partner/circle/info', req);
     return res.data;
   },
+  /**  获取用户主页信息 */
   GetUserHomeInfo: async (req?: UserIDParam) => {
-	const res = await request.post<{ data: UserHomeInfo, code: string, message: string }>('/api/user/circle/info', req);
+	const res = await request.post<{ data: HomeInfo, code: string, message: string }>('/api/user/home', req);
     return res.data;
   },
 

+ 3 - 28
js/api/user/user_pb.ts

@@ -1,31 +1,3 @@
-export interface UserHomeInfo{
-    /**  id */
-    id?:string;
-    /**  昵称 */
-    nickname?:string;
-    /**  头像链接 */
-    avatarUrl?:string;
-    /**  性别 */
-    sex?:number;
-    /**  图片 */
-    pictures?:Array<string>;
-    /**  年龄 */
-    age?:number;
-    /**  星座 */
-    constellation?:string;
-    /**  地区 */
-    area?:string;
-    /**  标签 */
-    tag?:Array<string>;
-    /**  签名 */
-    signature?:string;
-    /**  介绍语音 */
-    introduceVoice?:string;
-    /**  喜欢我 */
-    likedNum?:number;
-    /**  看过我 */
-    lookNum?:number;
-}
 export interface UserInfo{
     /**  id */
     id?:string;
@@ -47,8 +19,11 @@ export interface UserInfo{
     lookNum?:number;
 }
 export interface UpdateUserInformationRequest{
+    /**  昵称 */
     Nickname?:string;
+    /**  头像 */
     avatarUrl?:string;
+    /**  性别 */
     sex?:number;
 }