Ver Fonte

表情包分类名列表

wfz há 3 anos atrás
pai
commit
422e2a7a3b

+ 165 - 29
api/common/common.pb.go

@@ -3097,6 +3097,108 @@ func (x *CommonTextList) GetList() []string {
 	return nil
 }
 
+type MemeTitleList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List []*MemeTitle `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` // 需要的数据集合(随机表情包、随机打招呼)
+}
+
+func (x *MemeTitleList) Reset() {
+	*x = MemeTitleList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[45]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MemeTitleList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MemeTitleList) ProtoMessage() {}
+
+func (x *MemeTitleList) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[45]
+	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 MemeTitleList.ProtoReflect.Descriptor instead.
+func (*MemeTitleList) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{45}
+}
+
+func (x *MemeTitleList) GetList() []*MemeTitle {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
+type MemeTitle struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` // 名称
+	Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type"` // 类型
+}
+
+func (x *MemeTitle) Reset() {
+	*x = MemeTitle{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[46]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MemeTitle) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MemeTitle) ProtoMessage() {}
+
+func (x *MemeTitle) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[46]
+	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 MemeTitle.ProtoReflect.Descriptor instead.
+func (*MemeTitle) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{46}
+}
+
+func (x *MemeTitle) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *MemeTitle) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
 type MemeList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3109,7 +3211,7 @@ type MemeList struct {
 func (x *MemeList) Reset() {
 	*x = MemeList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[45]
+		mi := &file_common_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3122,7 +3224,7 @@ func (x *MemeList) String() string {
 func (*MemeList) ProtoMessage() {}
 
 func (x *MemeList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[45]
+	mi := &file_common_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3135,7 +3237,7 @@ func (x *MemeList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MemeList.ProtoReflect.Descriptor instead.
 func (*MemeList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{45}
+	return file_common_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *MemeList) GetList() []string {
@@ -3164,7 +3266,7 @@ type ChatTopicList struct {
 func (x *ChatTopicList) Reset() {
 	*x = ChatTopicList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[46]
+		mi := &file_common_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3177,7 +3279,7 @@ func (x *ChatTopicList) String() string {
 func (*ChatTopicList) ProtoMessage() {}
 
 func (x *ChatTopicList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[46]
+	mi := &file_common_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3190,7 +3292,7 @@ func (x *ChatTopicList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatTopicList.ProtoReflect.Descriptor instead.
 func (*ChatTopicList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{46}
+	return file_common_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *ChatTopicList) GetList() []string {
@@ -3545,19 +3647,26 @@ var file_common_proto_rawDesc = []byte{
 	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70,
 	0x65, 0x22, 0x24, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x4c,
 	0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x36, 0x0a, 0x08, 0x4d, 0x65, 0x6d, 0x65, 0x4c,
-	0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x22,
-	0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x4c, 0x69, 0x73, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04,
-	0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 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,
+	0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3a, 0x0a, 0x0d, 0x4d, 0x65, 0x6d, 0x65, 0x54,
+	0x69, 0x74, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x52, 0x04, 0x6c,
+	0x69, 0x73, 0x74, 0x22, 0x33, 0x0a, 0x09, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x08, 0x4d, 0x65, 0x6d, 0x65,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64,
+	0x22, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 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 (
@@ -3572,7 +3681,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 47)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 49)
 var file_common_proto_goTypes = []interface{}{
 	(*UserAndPartnerIdentifyIdParam)(nil), // 0: api.common.UserAndPartnerIdentifyIdParam
 	(*UserAndPartnerParam)(nil),           // 1: api.common.UserAndPartnerParam
@@ -3619,8 +3728,10 @@ var file_common_proto_goTypes = []interface{}{
 	(*RandomNumAndSex)(nil),               // 42: api.common.RandomNumAndSex
 	(*MemeRequest)(nil),                   // 43: api.common.MemeRequest
 	(*CommonTextList)(nil),                // 44: api.common.CommonTextList
-	(*MemeList)(nil),                      // 45: api.common.MemeList
-	(*ChatTopicList)(nil),                 // 46: api.common.ChatTopicList
+	(*MemeTitleList)(nil),                 // 45: api.common.MemeTitleList
+	(*MemeTitle)(nil),                     // 46: api.common.MemeTitle
+	(*MemeList)(nil),                      // 47: api.common.MemeList
+	(*ChatTopicList)(nil),                 // 48: api.common.ChatTopicList
 }
 var file_common_proto_depIdxs = []int32{
 	25, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
@@ -3631,11 +3742,12 @@ var file_common_proto_depIdxs = []int32{
 	33, // 5: api.common.ChatRoomMsg.self:type_name -> api.common.ChatPersonMsg
 	33, // 6: api.common.ChatRoomMsg.other:type_name -> api.common.ChatPersonMsg
 	36, // 7: api.common.ChatRecordInfo.message:type_name -> api.common.Message
-	8,  // [8:8] is the sub-list for method output_type
-	8,  // [8:8] is the sub-list for method input_type
-	8,  // [8:8] is the sub-list for extension type_name
-	8,  // [8:8] is the sub-list for extension extendee
-	0,  // [0:8] is the sub-list for field type_name
+	46, // 8: api.common.MemeTitleList.list:type_name -> api.common.MemeTitle
+	9,  // [9:9] is the sub-list for method output_type
+	9,  // [9:9] is the sub-list for method input_type
+	9,  // [9:9] is the sub-list for extension type_name
+	9,  // [9:9] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_common_proto_init() }
@@ -4185,7 +4297,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MemeList); i {
+			switch v := v.(*MemeTitleList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4197,6 +4309,30 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MemeTitle); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MemeList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChatTopicList); i {
 			case 0:
 				return &v.state
@@ -4215,7 +4351,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   47,
+			NumMessages:   49,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 10 - 0
api/common/common.proto

@@ -314,6 +314,16 @@ message CommonTextList {
   repeated string list = 1;// 需要的数据集合(随机表情包、随机打招呼)
 }
 
+message MemeTitleList {
+  repeated MemeTitle list = 1;// 需要的数据集合(随机表情包、随机打招呼)
+}
+
+message MemeTitle{
+  string name = 1;// 名称
+  string type = 2;// 类型
+}
+
+
 message MemeList {
   repeated string list = 1;// 表情包列表
   int64 nextId = 2;

+ 14 - 13
api/partner/partner.pb.go

@@ -778,7 +778,7 @@ var file_partner_proto_rawDesc = []byte{
 	0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78,
 	0x22, 0x2b, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72,
 	0x74, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73,
-	0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0x8a, 0x1b,
+	0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0x89, 0x1b,
 	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,
@@ -988,19 +988,19 @@ var file_partner_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73,
 	0x74, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f,
 	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x74, 0x6f, 0x70,
-	0x69, 0x63, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x3a, 0x01, 0x2a, 0x12, 0x6c, 0x0a, 0x0d,
+	0x69, 0x63, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x3a, 0x01, 0x2a, 0x12, 0x6b, 0x0a, 0x0d,
 	0x46, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 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, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73,
-	0x74, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6d, 0x65, 0x6d,
-	0x65, 0x2f, 0x74, 0x69, 0x74, 0x6c, 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,
+	0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74,
+	0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70,
+	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6d, 0x65, 0x6d, 0x65,
+	0x2f, 0x74, 0x69, 0x74, 0x6c, 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 (
@@ -1062,6 +1062,7 @@ var file_partner_proto_goTypes = []interface{}{
 	(*common.MemeList)(nil),                  // 42: api.common.MemeList
 	(*common.ChatTopicList)(nil),             // 43: api.common.ChatTopicList
 	(*common.CommonTextList)(nil),            // 44: api.common.CommonTextList
+	(*common.MemeTitleList)(nil),             // 45: api.common.MemeTitleList
 }
 var file_partner_proto_depIdxs = []int32{
 	1,  // 0: api.partner.LevelTable.list:type_name -> api.partner.LevelInfo
@@ -1128,7 +1129,7 @@ var file_partner_proto_depIdxs = []int32{
 	43, // 61: api.partner.Partner.FindChatTopic:output_type -> api.common.ChatTopicList
 	44, // 62: api.partner.Partner.RandomMeme:output_type -> api.common.CommonTextList
 	44, // 63: api.partner.Partner.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	44, // 64: api.partner.Partner.FindMemeTitle:output_type -> api.common.CommonTextList
+	45, // 64: api.partner.Partner.FindMemeTitle:output_type -> api.common.MemeTitleList
 	33, // [33:65] is the sub-list for method output_type
 	1,  // [1:33] is the sub-list for method input_type
 	1,  // [1:1] is the sub-list for extension type_name

+ 1 - 1
api/partner/partner.proto

@@ -199,7 +199,7 @@ service Partner {
     };
   };
   // 表情包分类名
-  rpc FindMemeTitle (google.protobuf.Empty) returns (common.CommonTextList){
+  rpc FindMemeTitle (google.protobuf.Empty) returns (common.MemeTitleList){
     option (google.api.http) = {
       post: "/api/partner/find/meme/title",
       body:"*"

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

@@ -82,7 +82,7 @@ type PartnerClient interface {
 	// 随机打招呼
 	RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error)
 	// 表情包分类名
-	FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.CommonTextList, error)
+	FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.MemeTitleList, error)
 }
 
 type partnerClient struct {
@@ -372,8 +372,8 @@ func (c *partnerClient) RandomSwiftMessage(ctx context.Context, in *common.Rando
 	return out, nil
 }
 
-func (c *partnerClient) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.CommonTextList, error) {
-	out := new(common.CommonTextList)
+func (c *partnerClient) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.MemeTitleList, error) {
+	out := new(common.MemeTitleList)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindMemeTitle", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -445,7 +445,7 @@ type PartnerServer interface {
 	// 随机打招呼
 	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	// 表情包分类名
-	FindMemeTitle(context.Context, *emptypb.Empty) (*common.CommonTextList, error)
+	FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -546,7 +546,7 @@ func (UnimplementedPartnerServer) RandomMeme(context.Context, *common.RandomNum)
 func (UnimplementedPartnerServer) RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RandomSwiftMessage not implemented")
 }
-func (UnimplementedPartnerServer) FindMemeTitle(context.Context, *emptypb.Empty) (*common.CommonTextList, error) {
+func (UnimplementedPartnerServer) FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMemeTitle not implemented")
 }
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}

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

@@ -37,7 +37,7 @@ type PartnerHTTPServer interface {
 	FindChatTopic(context.Context, *common.ListPageAndSexRequest) (*common.ChatTopicList, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
-	FindMemeTitle(context.Context, *emptypb.Empty) (*common.CommonTextList, error)
+	FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error)
 	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
@@ -798,7 +798,7 @@ type PartnerHTTPClient interface {
 	FindChatTopic(ctx context.Context, req *common.ListPageAndSexRequest, opts ...http.CallOption) (rsp *common.ChatTopicList, err error)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindMemeByType(ctx context.Context, req *common.MemeRequest, opts ...http.CallOption) (rsp *common.MemeList, err error)
-	FindMemeTitle(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
+	FindMemeTitle(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.MemeTitleList, err error)
 	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
 	FindOverSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *chat.PartnerFindRoomListReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
@@ -918,8 +918,8 @@ func (c *PartnerHTTPClientImpl) FindMemeByType(ctx context.Context, in *common.M
 	return &out, err
 }
 
-func (c *PartnerHTTPClientImpl) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*common.CommonTextList, error) {
-	var out common.CommonTextList
+func (c *PartnerHTTPClientImpl) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*common.MemeTitleList, error) {
+	var out common.MemeTitleList
 	pattern := "/api/partner/find/meme/title"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.partner.Partner/FindMemeTitle"))

+ 13 - 13
api/user/user.pb.go

@@ -737,7 +737,7 @@ var file_user_proto_rawDesc = []byte{
 	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65,
 	0x72, 0x49, 0x64, 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, 0xf4, 0x1f, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15,
+	0x6b, 0x65, 0x79, 0x32, 0xf3, 0x1f, 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,
@@ -986,18 +986,17 @@ var file_user_proto_rawDesc = []byte{
 	0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x22,
 	0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f,
 	0x74, 0x6f, 0x70, 0x69, 0x63, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x3a, 0x01, 0x2a, 0x12,
-	0x69, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65,
+	0x68, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65,
 	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, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x65, 0x78, 0x74,
-	0x4c, 0x69, 0x73, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61,
-	0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6d, 0x65, 0x6d,
-	0x65, 0x2f, 0x74, 0x69, 0x74, 0x6c, 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,
+	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x4c,
+	0x69, 0x73, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6d, 0x65, 0x6d, 0x65,
+	0x2f, 0x74, 0x69, 0x74, 0x6c, 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 (
@@ -1059,6 +1058,7 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.MemeList)(nil),                          // 42: api.common.MemeList
 	(*common.ChatTopicList)(nil),                     // 43: api.common.ChatTopicList
 	(*common.CommonTextList)(nil),                    // 44: api.common.CommonTextList
+	(*common.MemeTitleList)(nil),                     // 45: api.common.MemeTitleList
 }
 var file_user_proto_depIdxs = []int32{
 	7,  // 0: api.user.ChatCardInfo.tagList:type_name -> api.common.TagList
@@ -1138,7 +1138,7 @@ var file_user_proto_depIdxs = []int32{
 	43, // 74: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
 	44, // 75: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
 	44, // 76: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	44, // 77: api.user.User.FindMemeTitle:output_type -> api.common.CommonTextList
+	45, // 77: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
 	40, // [40:78] is the sub-list for method output_type
 	2,  // [2:40] is the sub-list for method input_type
 	2,  // [2:2] is the sub-list for extension type_name

+ 1 - 1
api/user/user.proto

@@ -259,7 +259,7 @@ service User {
     };
   };
   // 表情包分类名
-  rpc FindMemeTitle (google.protobuf.Empty) returns (common.CommonTextList){
+  rpc FindMemeTitle (google.protobuf.Empty) returns (common.MemeTitleList){
     option (google.api.http) = {
       post: "/api/user/find/meme/title",
       body:"*"

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

@@ -96,7 +96,7 @@ type UserClient interface {
 	// 随机打招呼
 	RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error)
 	// 表情包分类名
-	FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.CommonTextList, error)
+	FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.MemeTitleList, error)
 }
 
 type userClient struct {
@@ -440,8 +440,8 @@ func (c *userClient) RandomSwiftMessage(ctx context.Context, in *common.RandomNu
 	return out, nil
 }
 
-func (c *userClient) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.CommonTextList, error) {
-	out := new(common.CommonTextList)
+func (c *userClient) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.MemeTitleList, error) {
+	out := new(common.MemeTitleList)
 	err := c.cc.Invoke(ctx, "/api.user.User/FindMemeTitle", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -527,7 +527,7 @@ type UserServer interface {
 	// 随机打招呼
 	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	// 表情包分类名
-	FindMemeTitle(context.Context, *emptypb.Empty) (*common.CommonTextList, error)
+	FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -646,7 +646,7 @@ func (UnimplementedUserServer) RandomMeme(context.Context, *common.RandomNum) (*
 func (UnimplementedUserServer) RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RandomSwiftMessage not implemented")
 }
-func (UnimplementedUserServer) FindMemeTitle(context.Context, *emptypb.Empty) (*common.CommonTextList, error) {
+func (UnimplementedUserServer) FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMemeTitle not implemented")
 }
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}

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

@@ -40,7 +40,7 @@ type UserHTTPServer interface {
 	FindLikedList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
-	FindMemeTitle(context.Context, *emptypb.Empty) (*common.CommonTextList, error)
+	FindMemeTitle(context.Context, *emptypb.Empty) (*common.MemeTitleList, error)
 	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*UserFindChatListReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
@@ -1062,7 +1062,7 @@ type UserHTTPClient interface {
 	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)
 	FindMemeByType(ctx context.Context, req *common.MemeRequest, opts ...http.CallOption) (rsp *common.MemeList, err error)
-	FindMemeTitle(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
+	FindMemeTitle(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *common.MemeTitleList, err error)
 	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
 	FindOverSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *UserFindChatListReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
@@ -1227,8 +1227,8 @@ func (c *UserHTTPClientImpl) FindMemeByType(ctx context.Context, in *common.Meme
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*common.CommonTextList, error) {
-	var out common.CommonTextList
+func (c *UserHTTPClientImpl) FindMemeTitle(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*common.MemeTitleList, error) {
+	var out common.MemeTitleList
 	pattern := "/api/user/find/meme/title"
 	path := binding.EncodeURL(pattern, in, false)
 	opts = append(opts, http.Operation("/api.user.User/FindMemeTitle"))

+ 22 - 1
define/chat.go

@@ -1,5 +1,7 @@
 package define
 
+import "git.ikuban.com/server/pw-protobuf/api/common"
+
 var (
 	TypeUserNew = "new" // 新客
 	TypeUserPay = "pay" // 付费
@@ -18,9 +20,28 @@ var (
 )
 
 var (
-	Disapprove = "disapprove" // 怼人
+	Disapprove = "disapprove" // 斗图
 	Pet        = "pet"        // 萌宠
 	DayChat    = "dayChat"    // 日常聊天
 	ShowLove   = "showLove"   // 示爱
 	Hot        = "hot"        // 最火
 )
+
+var MemeTitleList = []*common.MemeTitle{
+	{
+		Name: "斗图",
+		Type: Disapprove,
+	}, {
+		Name: "萌宠",
+		Type: Pet,
+	}, {
+		Name: "日常聊天",
+		Type: DayChat,
+	}, {
+		Name: "示爱",
+		Type: ShowLove,
+	}, {
+		Name: "最火",
+		Type: Hot,
+	},
+}

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

@@ -381,6 +381,16 @@ export interface CommonTextList{
     /**  需要的数据集合(随机表情包、随机打招呼) */
     list?:Array<string>;
 }
+export interface MemeTitleList{
+    /**  需要的数据集合(随机表情包、随机打招呼) */
+    list?:Array<MemeTitle>;
+}
+export interface MemeTitle{
+    /**  名称 */
+    name?:string;
+    /**  类型 */
+    type?:string;
+}
 export interface MemeList{
     /**  表情包列表 */
     list?:Array<string>;

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

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {PartnerInfo,PartnerBalance,PartnerDBBalance,PartnerMessage,GetRandomPartnerRequest,RandomPartnerInfo,AddPartnerBalanceRequest,LevelTable} from "./partner_pb";
-import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,ListPageAndSexRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex} from "../common/common_pb";
+import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,ListPageAndSexRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList} from "../common/common_pb";
 import {LookMessageReply,LookAndLikeListReply} from "../statistics/statistics_pb";
 import {RoomReply,PartnerFindRoomListReply} from "../chat/chat_pb";
 
@@ -133,7 +133,7 @@ const PartnerService = {
   },
   /**  表情包分类名 */
   FindMemeTitle: async (req?: undefined) => {
-	const res = await request.post<{ data: CommonTextList, code: string, message: string }>('/api/partner/find/meme/title', req);
+	const res = await request.post<{ data: MemeTitleList, code: string, message: string }>('/api/partner/find/meme/title', 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,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,PersonParam,AddFriendMessageInfo,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,ListPageAndSexRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex} from "../common/common_pb";
+import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,PersonParam,AddFriendMessageInfo,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,ListPageAndSexRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList} from "../common/common_pb";
 import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,ChatCardInfo} from "./user_pb";
 import {CheckUserPartnerIsRelationshipReply,RoomReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -178,7 +178,7 @@ const UserService = {
   },
   /**  表情包分类名 */
   FindMemeTitle: async (req?: undefined) => {
-	const res = await request.post<{ data: CommonTextList, code: string, message: string }>('/api/user/find/meme/title', req);
+	const res = await request.post<{ data: MemeTitleList, code: string, message: string }>('/api/user/find/meme/title', req);
     return res.data.data;
   },