瀏覽代碼

wxConf and chat

wfz 3 年之前
父節點
當前提交
bbe164e330

+ 63 - 289
api/chat/chat.pb.go

@@ -10,7 +10,6 @@ import (
 	common "git.ikuban.com/server/pw-protobuf/api/common"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	_ "google.golang.org/protobuf/types/known/emptypb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -22,180 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type OnlinePersonListReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	List []*OnlinePersonInfo `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
-}
-
-func (x *OnlinePersonListReply) Reset() {
-	*x = OnlinePersonListReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OnlinePersonListReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OnlinePersonListReply) ProtoMessage() {}
-
-func (x *OnlinePersonListReply) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_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 OnlinePersonListReply.ProtoReflect.Descriptor instead.
-func (*OnlinePersonListReply) Descriptor() ([]byte, []int) {
-	return file_chat_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *OnlinePersonListReply) GetList() []*OnlinePersonInfo {
-	if x != nil {
-		return x.List
-	}
-	return nil
-}
-
-type OnlinePersonInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PersonID      string `protobuf:"bytes,1,opt,name=personID,proto3" json:"personID"`           // 查询目标的ID
-	PersonType    string `protobuf:"bytes,2,opt,name=personType,proto3" json:"personType"`       // 类型
-	Nickname      string `protobuf:"bytes,3,opt,name=nickname,proto3" json:"nickname"`           // 昵称
-	AvatarUrl     string `protobuf:"bytes,4,opt,name=avatarUrl,proto3" json:"avatarUrl"`         // 头像链接
-	Sex           int64  `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`                    // 性别
-	Age           int64  `protobuf:"varint,6,opt,name=age,proto3" json:"age"`                    // 年龄
-	Constellation string `protobuf:"bytes,7,opt,name=constellation,proto3" json:"constellation"` // 星座
-	Signature     string `protobuf:"bytes,8,opt,name=signature,proto3" json:"signature"`         // 签名
-	Province      string `protobuf:"bytes,9,opt,name=province,proto3" json:"province"`           // 省
-	City          string `protobuf:"bytes,10,opt,name=city,proto3" json:"city"`                  // 市
-	Area          string `protobuf:"bytes,11,opt,name=area,proto3" json:"area"`                  // 区
-}
-
-func (x *OnlinePersonInfo) Reset() {
-	*x = OnlinePersonInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OnlinePersonInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OnlinePersonInfo) ProtoMessage() {}
-
-func (x *OnlinePersonInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_proto_msgTypes[1]
-	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 OnlinePersonInfo.ProtoReflect.Descriptor instead.
-func (*OnlinePersonInfo) Descriptor() ([]byte, []int) {
-	return file_chat_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *OnlinePersonInfo) GetPersonID() string {
-	if x != nil {
-		return x.PersonID
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetPersonType() string {
-	if x != nil {
-		return x.PersonType
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetNickname() string {
-	if x != nil {
-		return x.Nickname
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetAvatarUrl() string {
-	if x != nil {
-		return x.AvatarUrl
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetSex() int64 {
-	if x != nil {
-		return x.Sex
-	}
-	return 0
-}
-
-func (x *OnlinePersonInfo) GetAge() int64 {
-	if x != nil {
-		return x.Age
-	}
-	return 0
-}
-
-func (x *OnlinePersonInfo) GetConstellation() string {
-	if x != nil {
-		return x.Constellation
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetSignature() string {
-	if x != nil {
-		return x.Signature
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetProvince() string {
-	if x != nil {
-		return x.Province
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetCity() string {
-	if x != nil {
-		return x.City
-	}
-	return ""
-}
-
-func (x *OnlinePersonInfo) GetArea() string {
-	if x != nil {
-		return x.Area
-	}
-	return ""
-}
-
 type CheckUserPartnerIsRelationshipReply struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -208,7 +33,7 @@ type CheckUserPartnerIsRelationshipReply struct {
 func (x *CheckUserPartnerIsRelationshipReply) Reset() {
 	*x = CheckUserPartnerIsRelationshipReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_proto_msgTypes[2]
+		mi := &file_chat_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -221,7 +46,7 @@ func (x *CheckUserPartnerIsRelationshipReply) String() string {
 func (*CheckUserPartnerIsRelationshipReply) ProtoMessage() {}
 
 func (x *CheckUserPartnerIsRelationshipReply) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_proto_msgTypes[2]
+	mi := &file_chat_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -234,7 +59,7 @@ func (x *CheckUserPartnerIsRelationshipReply) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use CheckUserPartnerIsRelationshipReply.ProtoReflect.Descriptor instead.
 func (*CheckUserPartnerIsRelationshipReply) Descriptor() ([]byte, []int) {
-	return file_chat_proto_rawDescGZIP(), []int{2}
+	return file_chat_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *CheckUserPartnerIsRelationshipReply) GetIsBuildRelationship() bool {
@@ -262,7 +87,7 @@ type CreateUserPartnerIsRelationshipReply struct {
 func (x *CreateUserPartnerIsRelationshipReply) Reset() {
 	*x = CreateUserPartnerIsRelationshipReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_proto_msgTypes[3]
+		mi := &file_chat_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -275,7 +100,7 @@ func (x *CreateUserPartnerIsRelationshipReply) String() string {
 func (*CreateUserPartnerIsRelationshipReply) ProtoMessage() {}
 
 func (x *CreateUserPartnerIsRelationshipReply) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_proto_msgTypes[3]
+	mi := &file_chat_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -288,7 +113,7 @@ func (x *CreateUserPartnerIsRelationshipReply) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use CreateUserPartnerIsRelationshipReply.ProtoReflect.Descriptor instead.
 func (*CreateUserPartnerIsRelationshipReply) Descriptor() ([]byte, []int) {
-	return file_chat_proto_rawDescGZIP(), []int{3}
+	return file_chat_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *CreateUserPartnerIsRelationshipReply) GetRoomId() int64 {
@@ -302,70 +127,45 @@ var File_chat_proto protoreflect.FileDescriptor
 
 var file_chat_proto_rawDesc = []byte{
 	0x0a, 0x0a, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 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, 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, 0x47, 0x0a, 0x15,
-	0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x4f,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x04, 0x6c, 0x69, 0x73, 0x74, 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, 0x22, 0x6f, 0x0a, 0x23,
-	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, 0x12, 0x30, 0x0a, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65,
-	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22, 0x3e, 0x0a,
-	0x24, 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, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x32, 0xc2, 0x02,
-	0x0a, 0x04, 0x43, 0x68, 0x61, 0x74, 0x12, 0x72, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55,
+	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 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,
+	0x6f, 0x0a, 0x23, 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, 0x12, 0x30, 0x0a, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c,
+	0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64,
+	0x22, 0x3e, 0x0a, 0x24, 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, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64,
+	0x32, 0xd1, 0x02, 0x0a, 0x04, 0x43, 0x68, 0x61, 0x74, 0x12, 0x72, 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, 0x21, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64,
+	0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 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, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61, 0x72,
-	0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 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, 0x12, 0x74, 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, 0x21, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
-	0x6e, 0x64, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 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,
-	0x12, 0x50, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65,
-	0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 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, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68, 0x61,
-	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x74, 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, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 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, 0x12, 0x5f, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e,
+	0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67,
+	0x65, 0x41, 0x6e, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 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, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74,
+	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, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63,
+	0x68, 0x61, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -380,28 +180,26 @@ func file_chat_proto_rawDescGZIP() []byte {
 	return file_chat_proto_rawDescData
 }
 
-var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_chat_proto_goTypes = []interface{}{
-	(*OnlinePersonListReply)(nil),                // 0: api.chat.OnlinePersonListReply
-	(*OnlinePersonInfo)(nil),                     // 1: api.chat.OnlinePersonInfo
-	(*CheckUserPartnerIsRelationshipReply)(nil),  // 2: api.chat.CheckUserPartnerIsRelationshipReply
-	(*CreateUserPartnerIsRelationshipReply)(nil), // 3: api.chat.CreateUserPartnerIsRelationshipReply
-	(*common.UserAndPartnerIdParam)(nil),         // 4: api.common.UserAndPartnerIdParam
-	(*common.PersonParam)(nil),                   // 5: api.common.PersonParam
+	(*CheckUserPartnerIsRelationshipReply)(nil),  // 0: api.chat.CheckUserPartnerIsRelationshipReply
+	(*CreateUserPartnerIsRelationshipReply)(nil), // 1: api.chat.CreateUserPartnerIsRelationshipReply
+	(*common.UserAndPartnerIdParam)(nil),         // 2: api.common.UserAndPartnerIdParam
+	(*common.ListPageAndPersonRequest)(nil),      // 3: api.common.ListPageAndPersonRequest
+	(*common.OnlinePersonListReply)(nil),         // 4: api.common.OnlinePersonListReply
 }
 var file_chat_proto_depIdxs = []int32{
-	1, // 0: api.chat.OnlinePersonListReply.list:type_name -> api.chat.OnlinePersonInfo
-	4, // 1: api.chat.Chat.CheckUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
-	4, // 2: api.chat.Chat.CreateUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
-	5, // 3: api.chat.Chat.FindOnlinePersonList:input_type -> api.common.PersonParam
-	2, // 4: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	3, // 5: api.chat.Chat.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
-	0, // 6: api.chat.Chat.FindOnlinePersonList:output_type -> api.chat.OnlinePersonListReply
-	4, // [4:7] is the sub-list for method output_type
-	1, // [1:4] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	2, // 0: api.chat.Chat.CheckUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
+	2, // 1: api.chat.Chat.CreateUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
+	3, // 2: api.chat.Chat.FindOnlinePersonList:input_type -> api.common.ListPageAndPersonRequest
+	0, // 3: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	1, // 4: api.chat.Chat.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
+	4, // 5: api.chat.Chat.FindOnlinePersonList:output_type -> api.common.OnlinePersonListReply
+	3, // [3:6] is the sub-list for method output_type
+	0, // [0:3] 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
 }
 
 func init() { file_chat_proto_init() }
@@ -411,30 +209,6 @@ func file_chat_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_chat_proto_msgTypes[0].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_chat_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OnlinePersonInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_chat_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CheckUserPartnerIsRelationshipReply); i {
 			case 0:
 				return &v.state
@@ -446,7 +220,7 @@ func file_chat_proto_init() {
 				return nil
 			}
 		}
-		file_chat_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_chat_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateUserPartnerIsRelationshipReply); i {
 			case 0:
 				return &v.state
@@ -465,7 +239,7 @@ func file_chat_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_chat_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 2 - 20
api/chat/chat.proto

@@ -4,7 +4,7 @@ package api.chat;
 
 //import "google/api/annotations.proto";
 //import "google/protobuf/struct.proto";
-import "google/protobuf/empty.proto";
+//import "google/protobuf/empty.proto";
 import "api/common/common.proto";
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/chat;chat";
@@ -17,25 +17,7 @@ service Chat {
   // 创建用户与接待员的聊天
   rpc CreateUserPartnerIsRelationship (common.UserAndPartnerIdParam) returns (CreateUserPartnerIsRelationshipReply);
   // 查询在线人的列表
-  rpc FindOnlinePersonList (common.PersonParam) returns (OnlinePersonListReply);
-}
-
-message OnlinePersonListReply{
-  repeated OnlinePersonInfo list = 1;
-}
-
-message OnlinePersonInfo{
-  string personID = 1; // 查询目标的ID
-  string personType = 2; // 类型
-  string nickname = 3;// 昵称
-  string avatarUrl =4;// 头像链接
-  int64 sex = 5;// 性别
-  int64 age = 6; // 年龄
-  string constellation = 7; // 星座
-  string signature = 8; // 签名
-  string province = 9;// 省
-  string city = 10;// 市
-  string area = 11;// 区
+  rpc FindOnlinePersonList (common.ListPageAndPersonRequest) returns (common.OnlinePersonListReply);
 }
 
 message CheckUserPartnerIsRelationshipReply{

+ 7 - 7
api/chat/chat_grpc.pb.go

@@ -24,7 +24,7 @@ type ChatClient interface {
 	// 创建用户与接待员的聊天
 	CreateUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CreateUserPartnerIsRelationshipReply, error)
 	// 查询在线人的列表
-	FindOnlinePersonList(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*OnlinePersonListReply, error)
+	FindOnlinePersonList(ctx context.Context, in *common.ListPageAndPersonRequest, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error)
 }
 
 type chatClient struct {
@@ -53,8 +53,8 @@ func (c *chatClient) CreateUserPartnerIsRelationship(ctx context.Context, in *co
 	return out, nil
 }
 
-func (c *chatClient) FindOnlinePersonList(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*OnlinePersonListReply, error) {
-	out := new(OnlinePersonListReply)
+func (c *chatClient) FindOnlinePersonList(ctx context.Context, in *common.ListPageAndPersonRequest, opts ...grpc.CallOption) (*common.OnlinePersonListReply, error) {
+	out := new(common.OnlinePersonListReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/FindOnlinePersonList", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -71,7 +71,7 @@ type ChatServer interface {
 	// 创建用户与接待员的聊天
 	CreateUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdParam) (*CreateUserPartnerIsRelationshipReply, error)
 	// 查询在线人的列表
-	FindOnlinePersonList(context.Context, *common.PersonParam) (*OnlinePersonListReply, error)
+	FindOnlinePersonList(context.Context, *common.ListPageAndPersonRequest) (*common.OnlinePersonListReply, error)
 	mustEmbedUnimplementedChatServer()
 }
 
@@ -85,7 +85,7 @@ func (UnimplementedChatServer) CheckUserPartnerIsRelationship(context.Context, *
 func (UnimplementedChatServer) CreateUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdParam) (*CreateUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUserPartnerIsRelationship not implemented")
 }
-func (UnimplementedChatServer) FindOnlinePersonList(context.Context, *common.PersonParam) (*OnlinePersonListReply, error) {
+func (UnimplementedChatServer) FindOnlinePersonList(context.Context, *common.ListPageAndPersonRequest) (*common.OnlinePersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOnlinePersonList not implemented")
 }
 func (UnimplementedChatServer) mustEmbedUnimplementedChatServer() {}
@@ -138,7 +138,7 @@ func _Chat_CreateUserPartnerIsRelationship_Handler(srv interface{}, ctx context.
 }
 
 func _Chat_FindOnlinePersonList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.PersonParam)
+	in := new(common.ListPageAndPersonRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -150,7 +150,7 @@ func _Chat_FindOnlinePersonList_Handler(srv interface{}, ctx context.Context, de
 		FullMethod: "/api.chat.Chat/FindOnlinePersonList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).FindOnlinePersonList(ctx, req.(*common.PersonParam))
+		return srv.(ChatServer).FindOnlinePersonList(ctx, req.(*common.ListPageAndPersonRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

文件差異過大導致無法顯示
+ 502 - 180
api/common/common.pb.go


+ 28 - 0
api/common/common.proto

@@ -42,6 +42,7 @@ message WxConfResponse{
   int64 timestamp = 2; // 必填,生成签名的时间戳
   string nonceStr = 3;// 必填,生成签名的随机串
   string signature = 4;// 必填,签名
+  string url = 5;// 传入的url
 }
 
 // 主页信息
@@ -96,6 +97,7 @@ message PersonDB{
   string province = 9;// 省
   string city = 10;// 市
   string area = 11;// 区
+  string signature = 12;//介绍
 }
 
 message ListPageRequest{
@@ -103,6 +105,13 @@ message ListPageRequest{
   int64 offset = 2;
 }
 
+message ListPageAndPersonRequest{
+  int64 nextId = 1;
+  int64 offset = 2;
+  string personID = 3; // 查询目标的ID
+  string personType = 4; // 类型
+}
+
 message SendPhoneCodeRequest {
   string phone = 1;
 }
@@ -149,4 +158,23 @@ message UpdateInformationRequest {
   string province = 9;// 省
   string city = 10;// 市
   string area = 11;// 区
+}
+
+message OnlinePersonListReply{
+  repeated OnlinePersonInfo list = 1;
+  string nextId = 2;
+}
+
+message OnlinePersonInfo{
+  string personID = 1; // 查询目标的ID
+  string personType = 2; // 类型
+  string nickname = 3;// 昵称
+  string avatarUrl =4;// 头像链接
+  int64 sex = 5;// 性别
+  int64 age = 6; // 年龄
+  string constellation = 7; // 星座
+  string signature = 8; // 签名
+  string province = 9;// 省
+  string city = 10;// 市
+  string area = 11;// 区
 }

+ 31 - 21
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, 0xdb, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12,
+	0x73, 0x65, 0x78, 0x32, 0xd2, 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,12 +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, 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, 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,
 }
 
 var (
@@ -441,6 +448,7 @@ var file_partner_proto_goTypes = []interface{}{
 	(*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
 }
 var file_partner_proto_depIdxs = []int32{
 	3,  // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
@@ -455,20 +463,22 @@ 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
-	0,  // 12: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
-	13, // 13: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
-	3,  // 14: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
-	3,  // 15: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
-	14, // 16: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	3,  // 17: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
-	1,  // 18: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
-	15, // 19: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
-	16, // 20: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	17, // 21: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
-	18, // 22: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
-	19, // 23: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
-	12, // [12:24] is the sub-list for method output_type
-	0,  // [0:12] is the sub-list for method input_type
+	9,  // 12: api.partner.Partner.FindOnlineList:input_type -> api.common.ListPageRequest
+	0,  // 13: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
+	13, // 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
+	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
+	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
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name

+ 7 - 0
api/partner/partner.proto

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

+ 38 - 0
api/partner/partner_grpc.pb.go

@@ -44,6 +44,8 @@ type PartnerClient interface {
 	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	// 获取标签列表
 	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)
 }
 
 type partnerClient struct {
@@ -162,6 +164,15 @@ 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) {
+	out := new(common.OnlinePersonListReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindOnlineList", 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
@@ -189,6 +200,8 @@ type PartnerServer interface {
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	// 获取标签列表
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
+	// 获取标签列表
+	FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -232,6 +245,9 @@ 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) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindOnlineList not implemented")
+}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 // UnsafePartnerServer may be embedded to opt out of forward compatibility for this service.
@@ -461,6 +477,24 @@ func _Partner_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_FindOnlineList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ListPageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindOnlineList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindOnlineList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindOnlineList(ctx, req.(*common.ListPageRequest))
+	}
+	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)
@@ -516,6 +550,10 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindTagListBySex",
 			Handler:    _Partner_FindTagListBySex_Handler,
 		},
+		{
+			MethodName: "FindOnlineList",
+			Handler:    _Partner_FindOnlineList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "partner.proto",

+ 43 - 0
api/partner/partner_http.pb.go

@@ -31,6 +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)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
@@ -51,6 +52,7 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/list/look", _Partner_FindLookList0_HTTP_Handler(srv))
 	r.POST("/api/wx/jssdk/config", _Partner_WxConf0_HTTP_Handler(srv))
 	r.POST("/api/partner/list/tag", _Partner_FindTagListBySex0_HTTP_Handler(srv))
+	r.POST("/api/partner/list/online", _Partner_FindOnlineList0_HTTP_Handler(srv))
 }
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -296,9 +298,37 @@ 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
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		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))
+		})
+		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 {
 	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)
 	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)
@@ -342,6 +372,19 @@ 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) {
+	var out common.OnlinePersonListReply
+	pattern := "/api/partner/list/online"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/FindOnlineList"))
+	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) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*common.TagListReply, error) {
 	var out common.TagListReply
 	pattern := "/api/partner/list/tag"

+ 34 - 24
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, 0x8b, 0x0e, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15,
+	0x6b, 0x65, 0x79, 0x32, 0xff, 0x0e, 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,11 +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, 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, 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,
 }
 
 var (
@@ -339,6 +346,7 @@ var file_user_proto_goTypes = []interface{}{
 	(*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
 }
 var file_user_proto_depIdxs = []int32{
 	2,  // 0: api.user.User.UpdateUserInformation:input_type -> api.common.UpdateInformationRequest
@@ -357,24 +365,26 @@ 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
-	3,  // 16: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	0,  // 17: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	12, // 18: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	3,  // 19: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	3,  // 20: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	13, // 21: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	14, // 22: api.user.User.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
-	15, // 23: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	16, // 24: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	17, // 25: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	18, // 26: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	18, // 27: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	18, // 28: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	19, // 29: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	20, // 30: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	21, // 31: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	16, // [16:32] is the sub-list for method output_type
-	0,  // [0:16] is the sub-list for method input_type
+	9,  // 16: api.user.User.FindOnlineList:input_type -> api.common.ListPageRequest
+	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
+	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
+	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
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name

+ 7 - 0
api/user/user.proto

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

+ 38 - 0
api/user/user_grpc.pb.go

@@ -54,6 +54,8 @@ type UserClient interface {
 	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	// 获取标签列表
 	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)
 }
 
 type userClient struct {
@@ -208,6 +210,15 @@ 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) {
+	out := new(common.OnlinePersonListReply)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindOnlineList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // UserServer is the server API for User service.
 // All implementations must embed UnimplementedUserServer
 // for forward compatibility
@@ -244,6 +255,8 @@ type UserServer interface {
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	// 获取标签列表
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
+	// 获取标签列表
+	FindOnlineList(context.Context, *common.ListPageRequest) (*common.OnlinePersonListReply, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -299,6 +312,9 @@ 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) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindOnlineList not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -600,6 +616,24 @@ func _User_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_FindOnlineList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ListPageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).FindOnlineList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/FindOnlineList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).FindOnlineList(ctx, req.(*common.ListPageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // User_ServiceDesc is the grpc.ServiceDesc for User service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -671,6 +705,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindTagListBySex",
 			Handler:    _User_FindTagListBySex_Handler,
 		},
+		{
+			MethodName: "FindOnlineList",
+			Handler:    _User_FindOnlineList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

+ 43 - 0
api/user/user_http.pb.go

@@ -36,6 +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)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	GetLookAndLikeStatisticsMessage(context.Context, *common.PersonParam) (*statistics.LookAndLikeMessageReply, error)
 	GetPartnerCircleInfo(context.Context, *KeyRequest) (*common.AddFriendMessageInfo, error)
@@ -64,6 +65,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/num/like_look", _User_GetLookAndLikeStatisticsMessage0_HTTP_Handler(srv))
 	r.POST("/api/wx/jssdk/config", _User_WxConf0_HTTP_Handler(srv))
 	r.POST("/api/user/list/tag", _User_FindTagListBySex0_HTTP_Handler(srv))
+	r.POST("/api/user/list/online", _User_FindOnlineList0_HTTP_Handler(srv))
 }
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -471,6 +473,33 @@ 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
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		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))
+		})
+		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 UserHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CheckUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
@@ -478,6 +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)
 	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)
@@ -575,6 +605,19 @@ 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) {
+	var out common.OnlinePersonListReply
+	pattern := "/api/user/list/online"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/FindOnlineList"))
+	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 *UserHTTPClientImpl) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*common.TagListReply, error) {
 	var out common.TagListReply
 	pattern := "/api/user/list/tag"

+ 0 - 27
js/api/chat/chat_pb.ts

@@ -1,30 +1,3 @@
-export interface OnlinePersonListReply{
-    list?:Array<OnlinePersonInfo>;
-}
-export interface OnlinePersonInfo{
-    /**  查询目标的ID */
-    personID?:string;
-    /**  类型 */
-    personType?:string;
-    /**  昵称 */
-    nickname?:string;
-    /**  头像链接 */
-    avatarUrl?:string;
-    /**  性别 */
-    sex?:number;
-    /**  年龄 */
-    age?:number;
-    /**  星座 */
-    constellation?:string;
-    /**  签名 */
-    signature?:string;
-    /**  省 */
-    province?:string;
-    /**  市 */
-    city?:string;
-    /**  区 */
-    area?:string;
-}
 export interface CheckUserPartnerIsRelationshipReply{
     isBuildRelationship?:boolean;
     roomId?:number;

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

@@ -30,6 +30,8 @@ export interface WxConfResponse{
     nonceStr?:string;
     /**  必填,签名 */
     signature?:string;
+    /**  传入的url */
+    url?:string;
 }
 export interface HomeInfo{
     /**  id */
@@ -112,11 +114,21 @@ export interface PersonDB{
     city?:string;
     /**  区 */
     area?:string;
+    /** 介绍 */
+    signature?:string;
 }
 export interface ListPageRequest{
     nextId?:number;
     offset?:number;
 }
+export interface ListPageAndPersonRequest{
+    nextId?:number;
+    offset?:number;
+    /**  查询目标的ID */
+    personID?:string;
+    /**  类型 */
+    personType?:string;
+}
 export interface SendPhoneCodeRequest{
     phone?:string;
 }
@@ -171,4 +183,32 @@ export interface UpdateInformationRequest{
     /**  区 */
     area?:string;
 }
+export interface OnlinePersonListReply{
+    list?:Array<OnlinePersonInfo>;
+    nextId?:string;
+}
+export interface OnlinePersonInfo{
+    /**  查询目标的ID */
+    personID?:string;
+    /**  类型 */
+    personType?:string;
+    /**  昵称 */
+    nickname?:string;
+    /**  头像链接 */
+    avatarUrl?:string;
+    /**  性别 */
+    sex?:number;
+    /**  年龄 */
+    age?:number;
+    /**  星座 */
+    constellation?:string;
+    /**  签名 */
+    signature?:string;
+    /**  省 */
+    province?:string;
+    /**  市 */
+    city?:string;
+    /**  区 */
+    area?:string;
+}
 

+ 6 - 1
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} from "../common/common_pb";
+import {SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,OnlinePersonListReply} from "../common/common_pb";
 
 const PartnerService = {
   /**  获取接待员的个人信息 */
@@ -50,6 +50,11 @@ const PartnerService = {
 	const res = await request.post<{ data: TagListReply, code: string, message: string }>('/api/partner/list/tag', req);
     return res.data.data;
   },
+  /**  获取标签列表 */
+  FindOnlineList: async (req?: ListPageRequest) => {
+	const res = await request.post<{ data: OnlinePersonListReply, code: string, message: string }>('/api/partner/list/online', req);
+    return res.data.data;
+  },
 
 };
 

+ 6 - 1
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} from "../common/common_pb";
+import {UpdateInformationRequest,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,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";
@@ -81,6 +81,11 @@ const UserService = {
 	const res = await request.post<{ data: TagListReply, code: string, message: string }>('/api/user/list/tag', req);
     return res.data.data;
   },
+  /**  获取标签列表 */
+  FindOnlineList: async (req?: ListPageRequest) => {
+	const res = await request.post<{ data: OnlinePersonListReply, code: string, message: string }>('/api/user/list/online', req);
+    return res.data.data;
+  },
 
 };
 

部分文件因文件數量過多而無法顯示