ソースを参照

授权 and chat

wfz 3 年 前
コミット
6b1da0462d

+ 221 - 148
api/common/common.pb.go

@@ -961,12 +961,67 @@ func (x *ListPageRequest) GetOffset() int64 {
 	return 0
 }
 
+type ListPage2Request struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	NextId string `protobuf:"bytes,1,opt,name=nextId,proto3" json:"nextId"`
+	Offset int64  `protobuf:"varint,2,opt,name=offset,proto3" json:"offset"`
+}
+
+func (x *ListPage2Request) Reset() {
+	*x = ListPage2Request{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ListPage2Request) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListPage2Request) ProtoMessage() {}
+
+func (x *ListPage2Request) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[13]
+	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 ListPage2Request.ProtoReflect.Descriptor instead.
+func (*ListPage2Request) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *ListPage2Request) GetNextId() string {
+	if x != nil {
+		return x.NextId
+	}
+	return ""
+}
+
+func (x *ListPage2Request) GetOffset() int64 {
+	if x != nil {
+		return x.Offset
+	}
+	return 0
+}
+
 type ListPageAndPersonRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	NextId     int64  `protobuf:"varint,1,opt,name=nextId,proto3" json:"nextId"`
+	NextId     string `protobuf:"bytes,1,opt,name=nextId,proto3" json:"nextId"`
 	Offset     int64  `protobuf:"varint,2,opt,name=offset,proto3" json:"offset"`
 	PersonID   string `protobuf:"bytes,3,opt,name=personID,proto3" json:"personID"`     // 查询目标的ID
 	PersonType string `protobuf:"bytes,4,opt,name=personType,proto3" json:"personType"` // 类型
@@ -975,7 +1030,7 @@ type ListPageAndPersonRequest struct {
 func (x *ListPageAndPersonRequest) Reset() {
 	*x = ListPageAndPersonRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[13]
+		mi := &file_common_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -988,7 +1043,7 @@ func (x *ListPageAndPersonRequest) String() string {
 func (*ListPageAndPersonRequest) ProtoMessage() {}
 
 func (x *ListPageAndPersonRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[13]
+	mi := &file_common_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1001,14 +1056,14 @@ func (x *ListPageAndPersonRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListPageAndPersonRequest.ProtoReflect.Descriptor instead.
 func (*ListPageAndPersonRequest) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{13}
+	return file_common_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *ListPageAndPersonRequest) GetNextId() int64 {
+func (x *ListPageAndPersonRequest) GetNextId() string {
 	if x != nil {
 		return x.NextId
 	}
-	return 0
+	return ""
 }
 
 func (x *ListPageAndPersonRequest) GetOffset() int64 {
@@ -1043,7 +1098,7 @@ type SendPhoneCodeRequest struct {
 func (x *SendPhoneCodeRequest) Reset() {
 	*x = SendPhoneCodeRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[14]
+		mi := &file_common_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1056,7 +1111,7 @@ func (x *SendPhoneCodeRequest) String() string {
 func (*SendPhoneCodeRequest) ProtoMessage() {}
 
 func (x *SendPhoneCodeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[14]
+	mi := &file_common_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1069,7 +1124,7 @@ func (x *SendPhoneCodeRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SendPhoneCodeRequest.ProtoReflect.Descriptor instead.
 func (*SendPhoneCodeRequest) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{14}
+	return file_common_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *SendPhoneCodeRequest) GetPhone() string {
@@ -1091,7 +1146,7 @@ type CheckPhoneCodeRequest struct {
 func (x *CheckPhoneCodeRequest) Reset() {
 	*x = CheckPhoneCodeRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[15]
+		mi := &file_common_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1104,7 +1159,7 @@ func (x *CheckPhoneCodeRequest) String() string {
 func (*CheckPhoneCodeRequest) ProtoMessage() {}
 
 func (x *CheckPhoneCodeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[15]
+	mi := &file_common_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1117,7 +1172,7 @@ func (x *CheckPhoneCodeRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CheckPhoneCodeRequest.ProtoReflect.Descriptor instead.
 func (*CheckPhoneCodeRequest) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{15}
+	return file_common_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *CheckPhoneCodeRequest) GetPhone() string {
@@ -1145,7 +1200,7 @@ type UploadMaterialResponse struct {
 func (x *UploadMaterialResponse) Reset() {
 	*x = UploadMaterialResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[16]
+		mi := &file_common_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1158,7 +1213,7 @@ func (x *UploadMaterialResponse) String() string {
 func (*UploadMaterialResponse) ProtoMessage() {}
 
 func (x *UploadMaterialResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[16]
+	mi := &file_common_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1171,7 +1226,7 @@ func (x *UploadMaterialResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UploadMaterialResponse.ProtoReflect.Descriptor instead.
 func (*UploadMaterialResponse) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{16}
+	return file_common_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *UploadMaterialResponse) GetLink() string {
@@ -1192,7 +1247,7 @@ type Ids struct {
 func (x *Ids) Reset() {
 	*x = Ids{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[17]
+		mi := &file_common_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1205,7 +1260,7 @@ func (x *Ids) String() string {
 func (*Ids) ProtoMessage() {}
 
 func (x *Ids) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[17]
+	mi := &file_common_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1218,7 +1273,7 @@ func (x *Ids) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Ids.ProtoReflect.Descriptor instead.
 func (*Ids) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{17}
+	return file_common_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *Ids) GetIds() []int64 {
@@ -1239,7 +1294,7 @@ type TagListReply struct {
 func (x *TagListReply) Reset() {
 	*x = TagListReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[18]
+		mi := &file_common_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1252,7 +1307,7 @@ func (x *TagListReply) String() string {
 func (*TagListReply) ProtoMessage() {}
 
 func (x *TagListReply) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[18]
+	mi := &file_common_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1265,7 +1320,7 @@ func (x *TagListReply) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TagListReply.ProtoReflect.Descriptor instead.
 func (*TagListReply) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{18}
+	return file_common_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *TagListReply) GetList() []*TagList {
@@ -1287,7 +1342,7 @@ type TagList struct {
 func (x *TagList) Reset() {
 	*x = TagList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[19]
+		mi := &file_common_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1300,7 +1355,7 @@ func (x *TagList) String() string {
 func (*TagList) ProtoMessage() {}
 
 func (x *TagList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[19]
+	mi := &file_common_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1313,7 +1368,7 @@ func (x *TagList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TagList.ProtoReflect.Descriptor instead.
 func (*TagList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{19}
+	return file_common_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *TagList) GetId() int64 {
@@ -1341,7 +1396,7 @@ type SexReq struct {
 func (x *SexReq) Reset() {
 	*x = SexReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[20]
+		mi := &file_common_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1354,7 +1409,7 @@ func (x *SexReq) String() string {
 func (*SexReq) ProtoMessage() {}
 
 func (x *SexReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[20]
+	mi := &file_common_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1367,7 +1422,7 @@ func (x *SexReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SexReq.ProtoReflect.Descriptor instead.
 func (*SexReq) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{20}
+	return file_common_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *SexReq) GetSex() int64 {
@@ -1388,7 +1443,7 @@ type RandomIntroduceReply struct {
 func (x *RandomIntroduceReply) Reset() {
 	*x = RandomIntroduceReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[21]
+		mi := &file_common_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1401,7 +1456,7 @@ func (x *RandomIntroduceReply) String() string {
 func (*RandomIntroduceReply) ProtoMessage() {}
 
 func (x *RandomIntroduceReply) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[21]
+	mi := &file_common_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1414,7 +1469,7 @@ func (x *RandomIntroduceReply) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RandomIntroduceReply.ProtoReflect.Descriptor instead.
 func (*RandomIntroduceReply) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{21}
+	return file_common_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *RandomIntroduceReply) GetIntroduce() string {
@@ -1445,7 +1500,7 @@ type UpdateInformationRequest struct {
 func (x *UpdateInformationRequest) Reset() {
 	*x = UpdateInformationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[22]
+		mi := &file_common_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1458,7 +1513,7 @@ func (x *UpdateInformationRequest) String() string {
 func (*UpdateInformationRequest) ProtoMessage() {}
 
 func (x *UpdateInformationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[22]
+	mi := &file_common_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1471,7 +1526,7 @@ func (x *UpdateInformationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateInformationRequest.ProtoReflect.Descriptor instead.
 func (*UpdateInformationRequest) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{22}
+	return file_common_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *UpdateInformationRequest) GetNickname() string {
@@ -1563,7 +1618,7 @@ type OnlinePersonListReply struct {
 func (x *OnlinePersonListReply) Reset() {
 	*x = OnlinePersonListReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[23]
+		mi := &file_common_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1576,7 +1631,7 @@ func (x *OnlinePersonListReply) String() string {
 func (*OnlinePersonListReply) ProtoMessage() {}
 
 func (x *OnlinePersonListReply) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[23]
+	mi := &file_common_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1589,7 +1644,7 @@ func (x *OnlinePersonListReply) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OnlinePersonListReply.ProtoReflect.Descriptor instead.
 func (*OnlinePersonListReply) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{23}
+	return file_common_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *OnlinePersonListReply) GetList() []*OnlinePersonInfo {
@@ -1627,7 +1682,7 @@ type OnlinePersonInfo struct {
 func (x *OnlinePersonInfo) Reset() {
 	*x = OnlinePersonInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[24]
+		mi := &file_common_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1640,7 +1695,7 @@ func (x *OnlinePersonInfo) String() string {
 func (*OnlinePersonInfo) ProtoMessage() {}
 
 func (x *OnlinePersonInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[24]
+	mi := &file_common_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1653,7 +1708,7 @@ func (x *OnlinePersonInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OnlinePersonInfo.ProtoReflect.Descriptor instead.
 func (*OnlinePersonInfo) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{24}
+	return file_common_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *OnlinePersonInfo) GetPersonID() string {
@@ -1842,89 +1897,94 @@ var file_common_proto_rawDesc = []byte{
 	0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78,
 	0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49,
 	0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0x86, 0x01, 0x0a, 0x18, 0x4c, 0x69,
-	0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x41, 0x6e, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
-	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e,
-	0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e,
-	0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79,
-	0x70, 0x65, 0x22, 0x2c, 0x0a, 0x14, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x43,
-	0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68,
-	0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65,
-	0x22, 0x41, 0x0a, 0x15, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x43, 0x6f,
-	0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f,
-	0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12,
-	0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63,
-	0x6f, 0x64, 0x65, 0x22, 0x2c, 0x0a, 0x16, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x4d, 0x61, 0x74,
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e,
-	0x6b, 0x22, 0x17, 0x0a, 0x03, 0x49, 0x64, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x03, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x0c, 0x54, 0x61,
-	0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x27, 0x0a, 0x04, 0x6c, 0x69,
-	0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x04, 0x6c,
-	0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x07, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 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, 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, 0x75, 0x63, 0x65, 0x22, 0xc2, 0x02, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0x42, 0x0a, 0x10, 0x4c, 0x69, 0x73,
+	0x74, 0x50, 0x61, 0x67, 0x65, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a,
+	0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e,
+	0x65, 0x78, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22, 0x86, 0x01,
+	0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x41, 0x6e, 0x64, 0x50, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65,
+	0x78, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65,
+	0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65,
+	0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e,
+	0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73,
+	0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x2c, 0x0a, 0x14, 0x53, 0x65, 0x6e, 0x64, 0x50, 0x68,
+	0x6f, 0x6e, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14,
+	0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70,
+	0x68, 0x6f, 0x6e, 0x65, 0x22, 0x41, 0x0a, 0x15, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x68, 0x6f,
+	0x6e, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a,
+	0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68,
+	0x6f, 0x6e, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x2c, 0x0a, 0x16, 0x55, 0x70, 0x6c, 0x6f, 0x61,
+	0x64, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0x17, 0x0a, 0x03, 0x49, 0x64, 0x73, 0x12, 0x10, 0x0a, 0x03,
+	0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x37,
+	0x0a, 0x0c, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x27,
+	0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x07, 0x54, 0x61, 0x67, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
+	0x69, 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, 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, 0x75, 0x63, 0x65, 0x22, 0xc2, 0x02, 0x0a, 0x18, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 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, 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, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x08, 0x62, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x12, 0x18, 0x0a,
+	0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07,
+	0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f,
+	0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f,
+	0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f,
+	0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65,
+	0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x22, 0x61, 0x0a,
+	0x15, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x30, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64,
+	0x22, 0xb4, 0x02, 0x0a, 0x10, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f,
+	0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49,
+	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49,
+	0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 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, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x04, 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, 0x12, 0x1a, 0x0a,
-	0x08, 0x62, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x08, 0x62, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x67,
-	0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x74, 0x61, 0x67, 0x4c,
-	0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65,
-	0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74,
-	0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73,
-	0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63,
-	0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63,
-	0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
-	0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x22, 0x61, 0x0a, 0x15, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x12, 0x30, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
-	0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x22, 0xb4, 0x02, 0x0a,
-	0x10, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x1e, 0x0a,
-	0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a,
-	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 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, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76,
-	0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 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, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
-	0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63,
-	0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12,
-	0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61,
-	0x72, 0x65, 0x61, 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, 0x6f,
-	0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 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, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63,
+	0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 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, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1939,7 +1999,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 26)
 var file_common_proto_goTypes = []interface{}{
 	(*UserAndPartnerIdParam)(nil),    // 0: api.common.UserAndPartnerIdParam
 	(*User1AndUser2IdParam)(nil),     // 1: api.common.User1AndUser2IdParam
@@ -1954,24 +2014,25 @@ var file_common_proto_goTypes = []interface{}{
 	(*PersonDBReply)(nil),            // 10: api.common.PersonDBReply
 	(*PersonDB)(nil),                 // 11: api.common.PersonDB
 	(*ListPageRequest)(nil),          // 12: api.common.ListPageRequest
-	(*ListPageAndPersonRequest)(nil), // 13: api.common.ListPageAndPersonRequest
-	(*SendPhoneCodeRequest)(nil),     // 14: api.common.SendPhoneCodeRequest
-	(*CheckPhoneCodeRequest)(nil),    // 15: api.common.CheckPhoneCodeRequest
-	(*UploadMaterialResponse)(nil),   // 16: api.common.UploadMaterialResponse
-	(*Ids)(nil),                      // 17: api.common.Ids
-	(*TagListReply)(nil),             // 18: api.common.TagListReply
-	(*TagList)(nil),                  // 19: api.common.TagList
-	(*SexReq)(nil),                   // 20: api.common.SexReq
-	(*RandomIntroduceReply)(nil),     // 21: api.common.RandomIntroduceReply
-	(*UpdateInformationRequest)(nil), // 22: api.common.UpdateInformationRequest
-	(*OnlinePersonListReply)(nil),    // 23: api.common.OnlinePersonListReply
-	(*OnlinePersonInfo)(nil),         // 24: api.common.OnlinePersonInfo
+	(*ListPage2Request)(nil),         // 13: api.common.ListPage2Request
+	(*ListPageAndPersonRequest)(nil), // 14: api.common.ListPageAndPersonRequest
+	(*SendPhoneCodeRequest)(nil),     // 15: api.common.SendPhoneCodeRequest
+	(*CheckPhoneCodeRequest)(nil),    // 16: api.common.CheckPhoneCodeRequest
+	(*UploadMaterialResponse)(nil),   // 17: api.common.UploadMaterialResponse
+	(*Ids)(nil),                      // 18: api.common.Ids
+	(*TagListReply)(nil),             // 19: api.common.TagListReply
+	(*TagList)(nil),                  // 20: api.common.TagList
+	(*SexReq)(nil),                   // 21: api.common.SexReq
+	(*RandomIntroduceReply)(nil),     // 22: api.common.RandomIntroduceReply
+	(*UpdateInformationRequest)(nil), // 23: api.common.UpdateInformationRequest
+	(*OnlinePersonListReply)(nil),    // 24: api.common.OnlinePersonListReply
+	(*OnlinePersonInfo)(nil),         // 25: api.common.OnlinePersonInfo
 }
 var file_common_proto_depIdxs = []int32{
-	19, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
+	20, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
 	11, // 1: api.common.PersonDBReply.list:type_name -> api.common.PersonDB
-	19, // 2: api.common.TagListReply.list:type_name -> api.common.TagList
-	24, // 3: api.common.OnlinePersonListReply.list:type_name -> api.common.OnlinePersonInfo
+	20, // 2: api.common.TagListReply.list:type_name -> api.common.TagList
+	25, // 3: api.common.OnlinePersonListReply.list:type_name -> api.common.OnlinePersonInfo
 	4,  // [4:4] is the sub-list for method output_type
 	4,  // [4:4] is the sub-list for method input_type
 	4,  // [4:4] is the sub-list for extension type_name
@@ -2142,7 +2203,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListPageAndPersonRequest); i {
+			switch v := v.(*ListPage2Request); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2154,7 +2215,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SendPhoneCodeRequest); i {
+			switch v := v.(*ListPageAndPersonRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2166,7 +2227,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CheckPhoneCodeRequest); i {
+			switch v := v.(*SendPhoneCodeRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2178,7 +2239,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UploadMaterialResponse); i {
+			switch v := v.(*CheckPhoneCodeRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2190,7 +2251,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Ids); i {
+			switch v := v.(*UploadMaterialResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2202,7 +2263,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TagListReply); i {
+			switch v := v.(*Ids); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2214,7 +2275,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TagList); i {
+			switch v := v.(*TagListReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2226,7 +2287,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SexReq); i {
+			switch v := v.(*TagList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2238,7 +2299,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RandomIntroduceReply); i {
+			switch v := v.(*SexReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2250,7 +2311,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpdateInformationRequest); i {
+			switch v := v.(*RandomIntroduceReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2262,7 +2323,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OnlinePersonListReply); i {
+			switch v := v.(*UpdateInformationRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2274,6 +2335,18 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OnlinePersonListReply); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OnlinePersonInfo); i {
 			case 0:
 				return &v.state
@@ -2292,7 +2365,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   25,
+			NumMessages:   26,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 6 - 1
api/common/common.proto

@@ -105,8 +105,13 @@ message ListPageRequest{
   int64 offset = 2;
 }
 
+message ListPage2Request{
+  string nextId = 1;
+  int64 offset = 2;
+}
+
 message ListPageAndPersonRequest{
-  int64 nextId = 1;
+  string nextId = 1;
   int64 offset = 2;
   string personID = 3; // 查询目标的ID
   string personType = 4; // 类型

+ 32 - 31
api/partner/partner.pb.go

@@ -321,7 +321,7 @@ var file_partner_proto_rawDesc = []byte{
 	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, 0xd2, 0x0a, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12,
+	0x73, 0x65, 0x78, 0x32, 0xd3, 0x0a, 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,
@@ -399,19 +399,19 @@ var file_partner_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22,
 	0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61,
 	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x74, 0x61, 0x67, 0x3a, 0x01,
-	0x2a, 0x12, 0x75, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c,
-	0x69, 0x73, 0x74, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x6f,
-	0x6e, 0x6c, 0x69, 0x6e, 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,
+	0x2a, 0x12, 0x76, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c,
+	0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f,
+	0x6f, 0x6e, 0x6c, 0x69, 0x6e, 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 (
@@ -441,14 +441,15 @@ var file_partner_proto_goTypes = []interface{}{
 	(*common.PersonIDList)(nil),             // 10: api.common.PersonIDList
 	(*common.WxConfReq)(nil),                // 11: api.common.WxConfReq
 	(*common.SexReq)(nil),                   // 12: api.common.SexReq
-	(*statistics.LookMessageReply)(nil),     // 13: api.statistics.LookMessageReply
-	(*common.AddFriendMessageInfo)(nil),     // 14: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                 // 15: api.common.HomeInfo
-	(*statistics.LookAndLikeListReply)(nil), // 16: api.statistics.LookAndLikeListReply
-	(*common.PersonDBReply)(nil),            // 17: api.common.PersonDBReply
-	(*common.WxConfResponse)(nil),           // 18: api.common.WxConfResponse
-	(*common.TagListReply)(nil),             // 19: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),    // 20: api.common.OnlinePersonListReply
+	(*common.ListPage2Request)(nil),         // 13: api.common.ListPage2Request
+	(*statistics.LookMessageReply)(nil),     // 14: api.statistics.LookMessageReply
+	(*common.AddFriendMessageInfo)(nil),     // 15: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                 // 16: api.common.HomeInfo
+	(*statistics.LookAndLikeListReply)(nil), // 17: api.statistics.LookAndLikeListReply
+	(*common.PersonDBReply)(nil),            // 18: api.common.PersonDBReply
+	(*common.WxConfResponse)(nil),           // 19: api.common.WxConfResponse
+	(*common.TagListReply)(nil),             // 20: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),    // 21: api.common.OnlinePersonListReply
 }
 var file_partner_proto_depIdxs = []int32{
 	3,  // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
@@ -463,20 +464,20 @@ var file_partner_proto_depIdxs = []int32{
 	10, // 9: api.partner.Partner.FindPartnerDBList:input_type -> api.common.PersonIDList
 	11, // 10: api.partner.Partner.WxConf:input_type -> api.common.WxConfReq
 	12, // 11: api.partner.Partner.FindTagListBySex:input_type -> api.common.SexReq
-	9,  // 12: api.partner.Partner.FindOnlineList:input_type -> api.common.ListPageRequest
+	13, // 12: api.partner.Partner.FindOnlineList:input_type -> api.common.ListPage2Request
 	0,  // 13: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
-	13, // 14: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
+	14, // 14: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
 	3,  // 15: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
 	3,  // 16: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
-	14, // 17: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	15, // 17: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
 	3,  // 18: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
 	1,  // 19: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
-	15, // 20: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
-	16, // 21: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	17, // 22: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
-	18, // 23: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
-	19, // 24: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
-	20, // 25: api.partner.Partner.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	16, // 20: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
+	17, // 21: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	18, // 22: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
+	19, // 23: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
+	20, // 24: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
+	21, // 25: api.partner.Partner.FindOnlineList:output_type -> api.common.OnlinePersonListReply
 	13, // [13:26] is the sub-list for method output_type
 	0,  // [0:13] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name

+ 1 - 1
api/partner/partner.proto

@@ -82,7 +82,7 @@ service Partner {
     };
   };
   // 获取标签列表
-  rpc FindOnlineList (common.ListPageRequest) returns (common.OnlinePersonListReply){
+  rpc FindOnlineList (common.ListPage2Request) returns (common.OnlinePersonListReply){
     option (google.api.http) = {
       post: "/api/partner/list/online",
       body:"*"

+ 6 - 6
api/partner/partner_grpc.pb.go

@@ -45,7 +45,7 @@ type PartnerClient interface {
 	// 获取标签列表
 	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 	// 获取标签列表
-	FindOnlineList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error)
+	FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error)
 }
 
 type partnerClient struct {
@@ -164,7 +164,7 @@ func (c *partnerClient) FindTagListBySex(ctx context.Context, in *common.SexReq,
 	return out, nil
 }
 
-func (c *partnerClient) FindOnlineList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error) {
+func (c *partnerClient) FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error) {
 	out := new(common.OnlinePersonListReply)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindOnlineList", in, out, opts...)
 	if err != nil {
@@ -201,7 +201,7 @@ type PartnerServer interface {
 	// 获取标签列表
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	// 获取标签列表
-	FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error)
+	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -245,7 +245,7 @@ func (UnimplementedPartnerServer) WxConf(context.Context, *common.WxConfReq) (*c
 func (UnimplementedPartnerServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
 }
-func (UnimplementedPartnerServer) FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error) {
+func (UnimplementedPartnerServer) FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOnlineList not implemented")
 }
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
@@ -478,7 +478,7 @@ func _Partner_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec
 }
 
 func _Partner_FindOnlineList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.ListPageRequest)
+	in := new(common.ListPage2Request)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -490,7 +490,7 @@ func _Partner_FindOnlineList_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/api.partner.Partner/FindOnlineList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PartnerServer).FindOnlineList(ctx, req.(*common.ListPageRequest))
+		return srv.(PartnerServer).FindOnlineList(ctx, req.(*common.ListPage2Request))
 	}
 	return interceptor(ctx, in, info, handler)
 }

+ 5 - 5
api/partner/partner_http.pb.go

@@ -31,7 +31,7 @@ const _ = http.SupportPackageIsVersion1
 type PartnerHTTPServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
-	FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error)
+	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
@@ -300,7 +300,7 @@ func _Partner_FindTagListBySex0_HTTP_Handler(srv PartnerHTTPServer) func(ctx htt
 
 func _Partner_FindOnlineList0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.ListPageRequest
+		var in common.ListPage2Request
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -309,7 +309,7 @@ func _Partner_FindOnlineList0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.
 		}
 		http.SetOperation(ctx, "/api.partner.Partner/FindOnlineList")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindOnlineList(ctx, req.(*common.ListPageRequest))
+			return srv.FindOnlineList(ctx, req.(*common.ListPage2Request))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -328,7 +328,7 @@ func _Partner_FindOnlineList0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
-	FindOnlineList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
+	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
 	GetPartnerInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerInfo, err error)
 	GetPartnerLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
@@ -372,7 +372,7 @@ func (c *PartnerHTTPClientImpl) FindLookList(ctx context.Context, in *common.Lis
 	return &out, err
 }
 
-func (c *PartnerHTTPClientImpl) FindOnlineList(ctx context.Context, in *common.ListPageRequest, opts ...http.CallOption) (*common.OnlinePersonListReply, error) {
+func (c *PartnerHTTPClientImpl) FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...http.CallOption) (*common.OnlinePersonListReply, error) {
 	var out common.OnlinePersonListReply
 	pattern := "/api/partner/list/online"
 	path := binding.EncodeURL(pattern, in, false)

+ 39 - 38
api/user/user.pb.go

@@ -183,7 +183,7 @@ var file_user_proto_rawDesc = []byte{
 	0x72, 0x65, 0x64, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65,
 	0x64, 0x69, 0x74, 0x22, 0x1e, 0x0a, 0x0a, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x32, 0xff, 0x0e, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15,
+	0x6b, 0x65, 0x79, 0x32, 0x80, 0x0f, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15,
 	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
@@ -296,18 +296,18 @@ var file_user_proto_rawDesc = []byte{
 	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70,
 	0x6c, 0x79, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x22, 0x12, 0x2f, 0x61, 0x70, 0x69,
 	0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x74, 0x61, 0x67, 0x3a, 0x01,
-	0x2a, 0x12, 0x72, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c,
-	0x69, 0x73, 0x74, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x6f, 0x6e, 0x6c, 0x69,
-	0x6e, 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,
+	0x2a, 0x12, 0x73, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4c,
+	0x69, 0x73, 0x74, 0x12, 0x1c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61,
+	0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x6f, 0x6e, 0x6c,
+	0x69, 0x6e, 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 (
@@ -336,17 +336,18 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.ListPageRequest)(nil),                    // 9: api.common.ListPageRequest
 	(*common.WxConfReq)(nil),                          // 10: api.common.WxConfReq
 	(*common.SexReq)(nil),                             // 11: api.common.SexReq
-	(*statistics.LookMessageReply)(nil),               // 12: api.statistics.LookMessageReply
-	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 13: api.chat.CheckUserPartnerIsRelationshipReply
-	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 14: api.chat.CreateUserPartnerIsRelationshipReply
-	(*common.AddFriendMessageInfo)(nil),               // 15: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                           // 16: api.common.HomeInfo
-	(*common.PersonDBReply)(nil),                      // 17: api.common.PersonDBReply
-	(*statistics.LookAndLikeListReply)(nil),           // 18: api.statistics.LookAndLikeListReply
-	(*statistics.LookAndLikeMessageReply)(nil),        // 19: api.statistics.LookAndLikeMessageReply
-	(*common.WxConfResponse)(nil),                     // 20: api.common.WxConfResponse
-	(*common.TagListReply)(nil),                       // 21: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),              // 22: api.common.OnlinePersonListReply
+	(*common.ListPage2Request)(nil),                   // 12: api.common.ListPage2Request
+	(*statistics.LookMessageReply)(nil),               // 13: api.statistics.LookMessageReply
+	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 14: api.chat.CheckUserPartnerIsRelationshipReply
+	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 15: api.chat.CreateUserPartnerIsRelationshipReply
+	(*common.AddFriendMessageInfo)(nil),               // 16: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                           // 17: api.common.HomeInfo
+	(*common.PersonDBReply)(nil),                      // 18: api.common.PersonDBReply
+	(*statistics.LookAndLikeListReply)(nil),           // 19: api.statistics.LookAndLikeListReply
+	(*statistics.LookAndLikeMessageReply)(nil),        // 20: api.statistics.LookAndLikeMessageReply
+	(*common.WxConfResponse)(nil),                     // 21: api.common.WxConfResponse
+	(*common.TagListReply)(nil),                       // 22: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),              // 23: api.common.OnlinePersonListReply
 }
 var file_user_proto_depIdxs = []int32{
 	2,  // 0: api.user.User.UpdateUserInformation:input_type -> api.common.UpdateInformationRequest
@@ -365,24 +366,24 @@ var file_user_proto_depIdxs = []int32{
 	7,  // 13: api.user.User.GetLookAndLikeStatisticsMessage:input_type -> api.common.PersonParam
 	10, // 14: api.user.User.WxConf:input_type -> api.common.WxConfReq
 	11, // 15: api.user.User.FindTagListBySex:input_type -> api.common.SexReq
-	9,  // 16: api.user.User.FindOnlineList:input_type -> api.common.ListPageRequest
+	12, // 16: api.user.User.FindOnlineList:input_type -> api.common.ListPage2Request
 	3,  // 17: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
 	0,  // 18: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	12, // 19: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	13, // 19: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
 	3,  // 20: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
 	3,  // 21: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	13, // 22: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	14, // 23: api.user.User.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
-	15, // 24: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	16, // 25: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	17, // 26: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	18, // 27: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	18, // 28: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	18, // 29: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	19, // 30: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	20, // 31: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	21, // 32: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	22, // 33: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	14, // 22: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	15, // 23: api.user.User.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
+	16, // 24: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	17, // 25: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	18, // 26: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	19, // 27: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	19, // 28: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	19, // 29: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	20, // 30: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	21, // 31: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	22, // 32: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	23, // 33: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
 	17, // [17:34] is the sub-list for method output_type
 	0,  // [0:17] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name

+ 1 - 1
api/user/user.proto

@@ -122,7 +122,7 @@ service User {
     };
   };
   // 获取标签列表
-  rpc FindOnlineList (common.ListPageRequest) returns (common.OnlinePersonListReply){
+  rpc FindOnlineList (common.ListPage2Request) returns (common.OnlinePersonListReply){
     option (google.api.http) = {
       post: "/api/user/list/online",
       body:"*"

+ 6 - 6
api/user/user_grpc.pb.go

@@ -55,7 +55,7 @@ type UserClient interface {
 	// 获取标签列表
 	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 	// 获取标签列表
-	FindOnlineList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error)
+	FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error)
 }
 
 type userClient struct {
@@ -210,7 +210,7 @@ func (c *userClient) FindTagListBySex(ctx context.Context, in *common.SexReq, op
 	return out, nil
 }
 
-func (c *userClient) FindOnlineList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error) {
+func (c *userClient) FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error) {
 	out := new(common.OnlinePersonListReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/FindOnlineList", in, out, opts...)
 	if err != nil {
@@ -256,7 +256,7 @@ type UserServer interface {
 	// 获取标签列表
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	// 获取标签列表
-	FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error)
+	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -312,7 +312,7 @@ func (UnimplementedUserServer) WxConf(context.Context, *common.WxConfReq) (*comm
 func (UnimplementedUserServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
 }
-func (UnimplementedUserServer) FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error) {
+func (UnimplementedUserServer) FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOnlineList not implemented")
 }
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
@@ -617,7 +617,7 @@ func _User_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec fu
 }
 
 func _User_FindOnlineList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.ListPageRequest)
+	in := new(common.ListPage2Request)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -629,7 +629,7 @@ func _User_FindOnlineList_Handler(srv interface{}, ctx context.Context, dec func
 		FullMethod: "/api.user.User/FindOnlineList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).FindOnlineList(ctx, req.(*common.ListPageRequest))
+		return srv.(UserServer).FindOnlineList(ctx, req.(*common.ListPage2Request))
 	}
 	return interceptor(ctx, in, info, handler)
 }

+ 5 - 5
api/user/user_http.pb.go

@@ -36,7 +36,7 @@ type UserHTTPServer interface {
 	FindLikeList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLikedList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
-	FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error)
+	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	GetLookAndLikeStatisticsMessage(context.Context, *common.PersonParam) (*statistics.LookAndLikeMessageReply, error)
 	GetPartnerCircleInfo(context.Context, *KeyRequest) (*common.AddFriendMessageInfo, error)
@@ -475,7 +475,7 @@ func _User_FindTagListBySex0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Cont
 
 func _User_FindOnlineList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.ListPageRequest
+		var in common.ListPage2Request
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -484,7 +484,7 @@ func _User_FindOnlineList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Contex
 		}
 		http.SetOperation(ctx, "/api.user.User/FindOnlineList")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindOnlineList(ctx, req.(*common.ListPageRequest))
+			return srv.FindOnlineList(ctx, req.(*common.ListPage2Request))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -507,7 +507,7 @@ type UserHTTPClient interface {
 	FindLikeList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindLikedList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
-	FindOnlineList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
+	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
 	GetLookAndLikeStatisticsMessage(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *statistics.LookAndLikeMessageReply, err error)
 	GetPartnerCircleInfo(ctx context.Context, req *KeyRequest, opts ...http.CallOption) (rsp *common.AddFriendMessageInfo, err error)
@@ -605,7 +605,7 @@ func (c *UserHTTPClientImpl) FindLookList(ctx context.Context, in *common.ListPa
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) FindOnlineList(ctx context.Context, in *common.ListPageRequest, opts ...http.CallOption) (*common.OnlinePersonListReply, error) {
+func (c *UserHTTPClientImpl) FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...http.CallOption) (*common.OnlinePersonListReply, error) {
 	var out common.OnlinePersonListReply
 	pattern := "/api/user/list/online"
 	path := binding.EncodeURL(pattern, in, false)

+ 1 - 0
errors/common.go

@@ -16,4 +16,5 @@ var (
 	ErrorMaterialFilenameEmpty = codes.Error(10008, "文件名不能为空")
 	ErrorWxConfigEmpty         = codes.Error(10009, "cfg空指针")
 	ErrorSystem                = codes.Error(10010, "系统错误")
+	ErrorGZHNotTrue            = codes.Error(10011, "公众号错误")
 )

+ 5 - 1
js/api/common/common_pb.ts

@@ -121,8 +121,12 @@ export interface ListPageRequest{
     nextId?:number;
     offset?:number;
 }
+export interface ListPage2Request{
+    nextId?:string;
+    offset?:number;
+}
 export interface ListPageAndPersonRequest{
-    nextId?:number;
+    nextId?:string;
     offset?:number;
     /**  查询目标的ID */
     personID?:string;

+ 2 - 2
js/api/partner/partner_http_pb.ts

@@ -2,7 +2,7 @@
 import request from '@/libs/request';
 import {PartnerInfo,GetRandomPartnerRequest,RandomPartnerInfo} from "./partner_pb";
 import {LookMessageReply,LookAndLikeListReply} from "../statistics/statistics_pb";
-import {SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,OnlinePersonListReply} from "../common/common_pb";
+import {SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply} from "../common/common_pb";
 
 const PartnerService = {
   /**  获取接待员的个人信息 */
@@ -51,7 +51,7 @@ const PartnerService = {
     return res.data.data;
   },
   /**  获取标签列表 */
-  FindOnlineList: async (req?: ListPageRequest) => {
+  FindOnlineList: async (req?: ListPage2Request) => {
 	const res = await request.post<{ data: OnlinePersonListReply, code: string, message: string }>('/api/partner/list/online', req);
     return res.data.data;
   },

+ 2 - 2
js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UpdateInformationRequest,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,OnlinePersonListReply} from "../common/common_pb";
+import {UpdateInformationRequest,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply} from "../common/common_pb";
 import {UserInfo,KeyRequest} from "./user_pb";
 import {LookMessageReply,LookAndLikeListReply,LookAndLikeMessageReply} from "../statistics/statistics_pb";
 import {CheckUserPartnerIsRelationshipReply,CreateUserPartnerIsRelationshipReply} from "../chat/chat_pb";
@@ -82,7 +82,7 @@ const UserService = {
     return res.data.data;
   },
   /**  获取标签列表 */
-  FindOnlineList: async (req?: ListPageRequest) => {
+  FindOnlineList: async (req?: ListPage2Request) => {
 	const res = await request.post<{ data: OnlinePersonListReply, code: string, message: string }>('/api/user/list/online', req);
     return res.data.data;
   },