wfz 3 жил өмнө
parent
commit
d82b2ae168

+ 24 - 4
api/common/common.pb.go

@@ -1364,6 +1364,7 @@ type AddFriendMessageInfo struct {
 	City          string   `protobuf:"bytes,15,opt,name=city,proto3" json:"city"`                   // 市
 	Area          string   `protobuf:"bytes,16,opt,name=area,proto3" json:"area"`                   // 区
 	RoomId        int64    `protobuf:"varint,17,opt,name=roomId,proto3" json:"roomId"`              // 聊过天的话返回房间ID
+	PersonType    string   `protobuf:"bytes,18,opt,name=personType,proto3" json:"personType"`       // 用户类型
 }
 
 func (x *AddFriendMessageInfo) Reset() {
@@ -1517,6 +1518,13 @@ func (x *AddFriendMessageInfo) GetRoomId() int64 {
 	return 0
 }
 
+func (x *AddFriendMessageInfo) GetPersonType() string {
+	if x != nil {
+		return x.PersonType
+	}
+	return ""
+}
+
 type PersonIDList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2573,6 +2581,7 @@ type GetMatchingPartnerInfoReply struct {
 	AvatarUrl  string `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"`   // 头像链接
 	Sex        int64  `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`              // 性别
 	IdentifyId string `protobuf:"bytes,5,opt,name=identifyId,proto3" json:"identifyId"` // 身份ID
+	PersonType string `protobuf:"bytes,6,opt,name=personType,proto3" json:"personType"` // 身份类型
 }
 
 func (x *GetMatchingPartnerInfoReply) Reset() {
@@ -2642,6 +2651,13 @@ func (x *GetMatchingPartnerInfoReply) GetIdentifyId() string {
 	return ""
 }
 
+func (x *GetMatchingPartnerInfoReply) GetPersonType() string {
+	if x != nil {
+		return x.PersonType
+	}
+	return ""
+}
+
 type RandomIntroduceReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7777,7 +7793,7 @@ var file_common_proto_rawDesc = []byte{
 	0x6f, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6c,
 	0x6f, 0x6f, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65,
 	0x64, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65,
-	0x64, 0x4e, 0x75, 0x6d, 0x22, 0xdc, 0x03, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65,
+	0x64, 0x4e, 0x75, 0x6d, 0x22, 0xfc, 0x03, 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,
@@ -7807,7 +7823,9 @@ var file_common_proto_rawDesc = []byte{
 	0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18,
 	0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72,
 	0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0c, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x4c,
+	0x6d, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54,
+	0x79, 0x70, 0x65, 0x22, 0x2c, 0x0a, 0x0c, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x4c,
 	0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x73,
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64,
 	0x73, 0x22, 0x39, 0x0a, 0x0d, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x44, 0x42, 0x52, 0x65, 0x70,
@@ -7897,7 +7915,7 @@ var file_common_proto_rawDesc = []byte{
 	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x06, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x12,
 	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65,
-	0x78, 0x22, 0x99, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e,
+	0x78, 0x22, 0xb9, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e,
 	0x67, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c,
 	0x79, 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,
@@ -7906,7 +7924,9 @@ var file_common_proto_rawDesc = []byte{
 	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, 0x1e, 0x0a,
 	0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a,
+	0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a,
+	0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x34, 0x0a,
 	0x14, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65,
 	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75,
 	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64,

+ 2 - 0
api/common/common.proto

@@ -165,6 +165,7 @@ message AddFriendMessageInfo{
   string city = 15;// 市
   string area = 16;// 区
   int64 roomId = 17;// 聊过天的话返回房间ID
+  string personType = 18;// 用户类型
 }
 
 message PersonIDList{
@@ -270,6 +271,7 @@ message GetMatchingPartnerInfoReply{
   string avatarUrl =3;// 头像链接
   int64 sex = 4;// 性别
   string identifyId = 5;// 身份ID
+  string personType = 6;// 身份类型
 }
 
 message RandomIntroduceReply{

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

@@ -228,6 +228,8 @@ export interface AddFriendMessageInfo{
     area?:string;
     /**  聊过天的话返回房间ID */
     roomId?:number;
+    /**  用户类型 */
+    personType?:string;
 }
 export interface PersonIDList{
     personIds?:Array<string>;
@@ -346,6 +348,8 @@ export interface GetMatchingPartnerInfoReply{
     sex?:number;
     /**  身份ID */
     identifyId?:string;
+    /**  身份类型 */
+    personType?:string;
 }
 export interface RandomIntroduceReply{
     introduce?:string;