Browse Source

标签去除分组,更新加入签名

wfz 3 years ago
parent
commit
1078a744f1

+ 42 - 45
api/account/account.pb.go

@@ -785,7 +785,7 @@ var file_account_proto_rawDesc = []byte{
 	0x63, 0x6f, 0x64, 0x65, 0x22, 0x32, 0x0a, 0x0a, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x6f, 0x6b,
 	0x63, 0x6f, 0x64, 0x65, 0x22, 0x32, 0x0a, 0x0a, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x6f, 0x6b,
 	0x65, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x65, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x03, 0x70, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
 	0x03, 0x70, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x32, 0x90, 0x07, 0x0a, 0x07, 0x41, 0x63, 0x63,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x32, 0xee, 0x06, 0x0a, 0x07, 0x41, 0x63, 0x63,
 	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x62, 0x0a, 0x0a, 0x44, 0x65, 0x62, 0x75, 0x67, 0x4c, 0x6f, 0x67,
 	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x62, 0x0a, 0x0a, 0x44, 0x65, 0x62, 0x75, 0x67, 0x4c, 0x6f, 0x67,
 	0x69, 0x6e, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x69, 0x6e, 0x12, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x2e, 0x44, 0x65, 0x62, 0x75, 0x67, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x2e, 0x44, 0x65, 0x62, 0x75, 0x67, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
@@ -826,28 +826,26 @@ var file_account_proto_rawDesc = []byte{
 	0x75, 0x6e, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x44, 0x41, 0x6e, 0x64, 0x41, 0x70, 0x70,
 	0x75, 0x6e, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x44, 0x41, 0x6e, 0x64, 0x41, 0x70, 0x70,
 	0x49, 0x44, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x49, 0x44, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
 	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x62, 0x0a, 0x1c, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c,
-	0x69, 0x73, 0x74, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x41, 0x6e,
-	0x64, 0x53, 0x65, 0x78, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x1a, 0x18,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x09, 0x46, 0x69, 0x6e, 0x64,
-	0x42, 0x79, 0x49, 0x44, 0x73, 0x12, 0x0f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x49, 0x64, 0x73, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x69, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64,
-	0x75, 0x63, 0x65, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f,
-	0x64, 0x75, 0x63, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x2f, 0x69,
-	0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61,
-	0x70, 0x69, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x3b, 0x61, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x40, 0x0a, 0x10, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c,
+	0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x78, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x09, 0x46, 0x69, 0x6e, 0x64, 0x42, 0x79,
+	0x49, 0x44, 0x73, 0x12, 0x0f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x49, 0x64, 0x73, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x69,
+	0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63,
+	0x65, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53,
+	0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75,
+	0x63, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22,
+	0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x2f, 0x69, 0x6e, 0x74,
+	0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69,
+	0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x3b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 }
 
 
 var (
 var (
@@ -864,23 +862,22 @@ func file_account_proto_rawDescGZIP() []byte {
 
 
 var file_account_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_account_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_account_proto_goTypes = []interface{}{
 var file_account_proto_goTypes = []interface{}{
-	(*RandomNicknameRequest)(nil),               // 0: api.account.RandomNicknameRequest
-	(*RandomNicknameReply)(nil),                 // 1: api.account.RandomNicknameReply
-	(*RandomAvatarRequest)(nil),                 // 2: api.account.RandomAvatarRequest
-	(*RandomAvatarReply)(nil),                   // 3: api.account.RandomAvatarReply
-	(*OpenIDAndAppIDRequest)(nil),               // 4: api.account.OpenIDAndAppIDRequest
-	(*IdentityInfo)(nil),                        // 5: api.account.IdentityInfo
-	(*UserInfoDB)(nil),                          // 6: api.account.UserInfoDB
-	(*PartnerInfoDB)(nil),                       // 7: api.account.PartnerInfoDB
-	(*AuthorizationRequest)(nil),                // 8: api.account.AuthorizationRequest
-	(*TokenReply)(nil),                          // 9: api.account.TokenReply
-	(*DebugLoginRequest)(nil),                   // 10: api.account.DebugLoginRequest
-	(*LoginToken)(nil),                          // 11: api.account.LoginToken
-	(*common.FindTagListByGroupNameAndSex)(nil), // 12: api.common.FindTagListByGroupNameAndSex
-	(*common.Ids)(nil),                          // 13: api.common.Ids
-	(*common.SexReq)(nil),                       // 14: api.common.SexReq
-	(*common.TagListReply)(nil),                 // 15: api.common.TagListReply
-	(*common.RandomIntroduceReply)(nil),         // 16: api.common.RandomIntroduceReply
+	(*RandomNicknameRequest)(nil),       // 0: api.account.RandomNicknameRequest
+	(*RandomNicknameReply)(nil),         // 1: api.account.RandomNicknameReply
+	(*RandomAvatarRequest)(nil),         // 2: api.account.RandomAvatarRequest
+	(*RandomAvatarReply)(nil),           // 3: api.account.RandomAvatarReply
+	(*OpenIDAndAppIDRequest)(nil),       // 4: api.account.OpenIDAndAppIDRequest
+	(*IdentityInfo)(nil),                // 5: api.account.IdentityInfo
+	(*UserInfoDB)(nil),                  // 6: api.account.UserInfoDB
+	(*PartnerInfoDB)(nil),               // 7: api.account.PartnerInfoDB
+	(*AuthorizationRequest)(nil),        // 8: api.account.AuthorizationRequest
+	(*TokenReply)(nil),                  // 9: api.account.TokenReply
+	(*DebugLoginRequest)(nil),           // 10: api.account.DebugLoginRequest
+	(*LoginToken)(nil),                  // 11: api.account.LoginToken
+	(*common.SexReq)(nil),               // 12: api.common.SexReq
+	(*common.Ids)(nil),                  // 13: api.common.Ids
+	(*common.TagListReply)(nil),         // 14: api.common.TagListReply
+	(*common.RandomIntroduceReply)(nil), // 15: api.common.RandomIntroduceReply
 }
 }
 var file_account_proto_depIdxs = []int32{
 var file_account_proto_depIdxs = []int32{
 	10, // 0: api.account.Account.DebugLogin:input_type -> api.account.DebugLoginRequest
 	10, // 0: api.account.Account.DebugLogin:input_type -> api.account.DebugLoginRequest
@@ -889,18 +886,18 @@ var file_account_proto_depIdxs = []int32{
 	2,  // 3: api.account.Account.RandomAvatar:input_type -> api.account.RandomAvatarRequest
 	2,  // 3: api.account.Account.RandomAvatar:input_type -> api.account.RandomAvatarRequest
 	4,  // 4: api.account.Account.GetIdentityByOpenIDAndAppID:input_type -> api.account.OpenIDAndAppIDRequest
 	4,  // 4: api.account.Account.GetIdentityByOpenIDAndAppID:input_type -> api.account.OpenIDAndAppIDRequest
 	4,  // 5: api.account.Account.GetIdentityByFromOpenIDAndAppID:input_type -> api.account.OpenIDAndAppIDRequest
 	4,  // 5: api.account.Account.GetIdentityByFromOpenIDAndAppID:input_type -> api.account.OpenIDAndAppIDRequest
-	12, // 6: api.account.Account.FindTagListByGroupNameAndSex:input_type -> api.common.FindTagListByGroupNameAndSex
+	12, // 6: api.account.Account.FindTagListBySex:input_type -> api.common.SexReq
 	13, // 7: api.account.Account.FindByIDs:input_type -> api.common.Ids
 	13, // 7: api.account.Account.FindByIDs:input_type -> api.common.Ids
-	14, // 8: api.account.Account.RandomIntroduce:input_type -> api.common.SexReq
+	12, // 8: api.account.Account.RandomIntroduce:input_type -> api.common.SexReq
 	9,  // 9: api.account.Account.DebugLogin:output_type -> api.account.TokenReply
 	9,  // 9: api.account.Account.DebugLogin:output_type -> api.account.TokenReply
 	9,  // 10: api.account.Account.Authorization:output_type -> api.account.TokenReply
 	9,  // 10: api.account.Account.Authorization:output_type -> api.account.TokenReply
 	1,  // 11: api.account.Account.RandomNickname:output_type -> api.account.RandomNicknameReply
 	1,  // 11: api.account.Account.RandomNickname:output_type -> api.account.RandomNicknameReply
 	3,  // 12: api.account.Account.RandomAvatar:output_type -> api.account.RandomAvatarReply
 	3,  // 12: api.account.Account.RandomAvatar:output_type -> api.account.RandomAvatarReply
 	5,  // 13: api.account.Account.GetIdentityByOpenIDAndAppID:output_type -> api.account.IdentityInfo
 	5,  // 13: api.account.Account.GetIdentityByOpenIDAndAppID:output_type -> api.account.IdentityInfo
 	5,  // 14: api.account.Account.GetIdentityByFromOpenIDAndAppID:output_type -> api.account.IdentityInfo
 	5,  // 14: api.account.Account.GetIdentityByFromOpenIDAndAppID:output_type -> api.account.IdentityInfo
-	15, // 15: api.account.Account.FindTagListByGroupNameAndSex:output_type -> api.common.TagListReply
-	15, // 16: api.account.Account.FindByIDs:output_type -> api.common.TagListReply
-	16, // 17: api.account.Account.RandomIntroduce:output_type -> api.common.RandomIntroduceReply
+	14, // 15: api.account.Account.FindTagListBySex:output_type -> api.common.TagListReply
+	14, // 16: api.account.Account.FindByIDs:output_type -> api.common.TagListReply
+	15, // 17: api.account.Account.RandomIntroduce:output_type -> api.common.RandomIntroduceReply
 	9,  // [9:18] is the sub-list for method output_type
 	9,  // [9:18] is the sub-list for method output_type
 	0,  // [0:9] is the sub-list for method input_type
 	0,  // [0:9] 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 type_name

+ 1 - 1
api/account/account.proto

@@ -42,7 +42,7 @@ service Account {
   // 通过原公众号openID和appID查询
   // 通过原公众号openID和appID查询
   rpc GetIdentityByFromOpenIDAndAppID (OpenIDAndAppIDRequest) returns (IdentityInfo);
   rpc GetIdentityByFromOpenIDAndAppID (OpenIDAndAppIDRequest) returns (IdentityInfo);
   // 通过分组名和性别查询标签
   // 通过分组名和性别查询标签
-  rpc FindTagListByGroupNameAndSex (common.FindTagListByGroupNameAndSex) returns (common.TagListReply);
+  rpc FindTagListBySex (common.SexReq) returns (common.TagListReply);
   // 通过标签IDs查询标签
   // 通过标签IDs查询标签
   rpc FindByIDs (common.Ids) returns (common.TagListReply);
   rpc FindByIDs (common.Ids) returns (common.TagListReply);
   // 随机介绍接口
   // 随机介绍接口

+ 13 - 13
api/account/account_grpc.pb.go

@@ -28,7 +28,7 @@ type AccountClient interface {
 	// 通过原公众号openID和appID查询
 	// 通过原公众号openID和appID查询
 	GetIdentityByFromOpenIDAndAppID(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error)
 	GetIdentityByFromOpenIDAndAppID(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error)
 	// 通过分组名和性别查询标签
 	// 通过分组名和性别查询标签
-	FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...grpc.CallOption) (*common.TagListReply, error)
+	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 	// 通过标签IDs查询标签
 	// 通过标签IDs查询标签
 	FindByIDs(ctx context.Context, in *common.Ids, opts ...grpc.CallOption) (*common.TagListReply, error)
 	FindByIDs(ctx context.Context, in *common.Ids, opts ...grpc.CallOption) (*common.TagListReply, error)
 	// 随机介绍接口
 	// 随机介绍接口
@@ -97,9 +97,9 @@ func (c *accountClient) GetIdentityByFromOpenIDAndAppID(ctx context.Context, in
 	return out, nil
 	return out, nil
 }
 }
 
 
-func (c *accountClient) FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...grpc.CallOption) (*common.TagListReply, error) {
+func (c *accountClient) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error) {
 	out := new(common.TagListReply)
 	out := new(common.TagListReply)
-	err := c.cc.Invoke(ctx, "/api.account.Account/FindTagListByGroupNameAndSex", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.account.Account/FindTagListBySex", in, out, opts...)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -137,7 +137,7 @@ type AccountServer interface {
 	// 通过原公众号openID和appID查询
 	// 通过原公众号openID和appID查询
 	GetIdentityByFromOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error)
 	GetIdentityByFromOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error)
 	// 通过分组名和性别查询标签
 	// 通过分组名和性别查询标签
-	FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error)
+	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	// 通过标签IDs查询标签
 	// 通过标签IDs查询标签
 	FindByIDs(context.Context, *common.Ids) (*common.TagListReply, error)
 	FindByIDs(context.Context, *common.Ids) (*common.TagListReply, error)
 	// 随机介绍接口
 	// 随机介绍接口
@@ -167,8 +167,8 @@ func (UnimplementedAccountServer) GetIdentityByOpenIDAndAppID(context.Context, *
 func (UnimplementedAccountServer) GetIdentityByFromOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error) {
 func (UnimplementedAccountServer) GetIdentityByFromOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityByFromOpenIDAndAppID not implemented")
 	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityByFromOpenIDAndAppID not implemented")
 }
 }
-func (UnimplementedAccountServer) FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindTagListByGroupNameAndSex not implemented")
+func (UnimplementedAccountServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
 }
 }
 func (UnimplementedAccountServer) FindByIDs(context.Context, *common.Ids) (*common.TagListReply, error) {
 func (UnimplementedAccountServer) FindByIDs(context.Context, *common.Ids) (*common.TagListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindByIDs not implemented")
 	return nil, status.Errorf(codes.Unimplemented, "method FindByIDs not implemented")
@@ -297,20 +297,20 @@ func _Account_GetIdentityByFromOpenIDAndAppID_Handler(srv interface{}, ctx conte
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
 
 
-func _Account_FindTagListByGroupNameAndSex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.FindTagListByGroupNameAndSex)
+func _Account_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.SexReq)
 	if err := dec(in); err != nil {
 	if err := dec(in); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 	if interceptor == nil {
 	if interceptor == nil {
-		return srv.(AccountServer).FindTagListByGroupNameAndSex(ctx, in)
+		return srv.(AccountServer).FindTagListBySex(ctx, in)
 	}
 	}
 	info := &grpc.UnaryServerInfo{
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
 		Server:     srv,
-		FullMethod: "/api.account.Account/FindTagListByGroupNameAndSex",
+		FullMethod: "/api.account.Account/FindTagListBySex",
 	}
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AccountServer).FindTagListByGroupNameAndSex(ctx, req.(*common.FindTagListByGroupNameAndSex))
+		return srv.(AccountServer).FindTagListBySex(ctx, req.(*common.SexReq))
 	}
 	}
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
@@ -383,8 +383,8 @@ var Account_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _Account_GetIdentityByFromOpenIDAndAppID_Handler,
 			Handler:    _Account_GetIdentityByFromOpenIDAndAppID_Handler,
 		},
 		},
 		{
 		{
-			MethodName: "FindTagListByGroupNameAndSex",
-			Handler:    _Account_FindTagListByGroupNameAndSex_Handler,
+			MethodName: "FindTagListBySex",
+			Handler:    _Account_FindTagListBySex_Handler,
 		},
 		},
 		{
 		{
 			MethodName: "FindByIDs",
 			MethodName: "FindByIDs",

+ 96 - 169
api/common/common.pb.go

@@ -1109,74 +1109,18 @@ func (x *Ids) GetIds() []int64 {
 	return nil
 	return nil
 }
 }
 
 
-type FindTagListByGroupNameAndSex struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	GroupName string `protobuf:"bytes,1,opt,name=groupName,proto3" json:"groupName"` // 分组名
-	Sex       int64  `protobuf:"varint,2,opt,name=sex,proto3" json:"sex"`            // 性别
-}
-
-func (x *FindTagListByGroupNameAndSex) Reset() {
-	*x = FindTagListByGroupNameAndSex{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FindTagListByGroupNameAndSex) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FindTagListByGroupNameAndSex) ProtoMessage() {}
-
-func (x *FindTagListByGroupNameAndSex) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[17]
-	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 FindTagListByGroupNameAndSex.ProtoReflect.Descriptor instead.
-func (*FindTagListByGroupNameAndSex) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{17}
-}
-
-func (x *FindTagListByGroupNameAndSex) GetGroupName() string {
-	if x != nil {
-		return x.GroupName
-	}
-	return ""
-}
-
-func (x *FindTagListByGroupNameAndSex) GetSex() int64 {
-	if x != nil {
-		return x.Sex
-	}
-	return 0
-}
-
 type TagListReply struct {
 type TagListReply struct {
 	state         protoimpl.MessageState
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 	unknownFields protoimpl.UnknownFields
 
 
-	Name string     `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` // 分组名
-	List []*TagList `protobuf:"bytes,2,rep,name=list,proto3" json:"list"` // 标签列表
+	List []*TagList `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` // 标签列表
 }
 }
 
 
 func (x *TagListReply) Reset() {
 func (x *TagListReply) Reset() {
 	*x = TagListReply{}
 	*x = TagListReply{}
 	if protoimpl.UnsafeEnabled {
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[18]
+		mi := &file_common_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 		ms.StoreMessageInfo(mi)
 	}
 	}
@@ -1189,7 +1133,7 @@ func (x *TagListReply) String() string {
 func (*TagListReply) ProtoMessage() {}
 func (*TagListReply) ProtoMessage() {}
 
 
 func (x *TagListReply) ProtoReflect() protoreflect.Message {
 func (x *TagListReply) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[18]
+	mi := &file_common_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 		if ms.LoadMessageInfo() == nil {
@@ -1202,14 +1146,7 @@ func (x *TagListReply) ProtoReflect() protoreflect.Message {
 
 
 // Deprecated: Use TagListReply.ProtoReflect.Descriptor instead.
 // Deprecated: Use TagListReply.ProtoReflect.Descriptor instead.
 func (*TagListReply) Descriptor() ([]byte, []int) {
 func (*TagListReply) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{18}
-}
-
-func (x *TagListReply) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
+	return file_common_proto_rawDescGZIP(), []int{17}
 }
 }
 
 
 func (x *TagListReply) GetList() []*TagList {
 func (x *TagListReply) GetList() []*TagList {
@@ -1231,7 +1168,7 @@ type TagList struct {
 func (x *TagList) Reset() {
 func (x *TagList) Reset() {
 	*x = TagList{}
 	*x = TagList{}
 	if protoimpl.UnsafeEnabled {
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[19]
+		mi := &file_common_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 		ms.StoreMessageInfo(mi)
 	}
 	}
@@ -1244,7 +1181,7 @@ func (x *TagList) String() string {
 func (*TagList) ProtoMessage() {}
 func (*TagList) ProtoMessage() {}
 
 
 func (x *TagList) ProtoReflect() protoreflect.Message {
 func (x *TagList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[19]
+	mi := &file_common_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 		if ms.LoadMessageInfo() == nil {
@@ -1257,7 +1194,7 @@ func (x *TagList) ProtoReflect() protoreflect.Message {
 
 
 // Deprecated: Use TagList.ProtoReflect.Descriptor instead.
 // Deprecated: Use TagList.ProtoReflect.Descriptor instead.
 func (*TagList) Descriptor() ([]byte, []int) {
 func (*TagList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{19}
+	return file_common_proto_rawDescGZIP(), []int{18}
 }
 }
 
 
 func (x *TagList) GetId() int64 {
 func (x *TagList) GetId() int64 {
@@ -1285,7 +1222,7 @@ type SexReq struct {
 func (x *SexReq) Reset() {
 func (x *SexReq) Reset() {
 	*x = SexReq{}
 	*x = SexReq{}
 	if protoimpl.UnsafeEnabled {
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[20]
+		mi := &file_common_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 		ms.StoreMessageInfo(mi)
 	}
 	}
@@ -1298,7 +1235,7 @@ func (x *SexReq) String() string {
 func (*SexReq) ProtoMessage() {}
 func (*SexReq) ProtoMessage() {}
 
 
 func (x *SexReq) ProtoReflect() protoreflect.Message {
 func (x *SexReq) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[20]
+	mi := &file_common_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 		if ms.LoadMessageInfo() == nil {
@@ -1311,7 +1248,7 @@ func (x *SexReq) ProtoReflect() protoreflect.Message {
 
 
 // Deprecated: Use SexReq.ProtoReflect.Descriptor instead.
 // Deprecated: Use SexReq.ProtoReflect.Descriptor instead.
 func (*SexReq) Descriptor() ([]byte, []int) {
 func (*SexReq) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{20}
+	return file_common_proto_rawDescGZIP(), []int{19}
 }
 }
 
 
 func (x *SexReq) GetSex() int64 {
 func (x *SexReq) GetSex() int64 {
@@ -1332,7 +1269,7 @@ type RandomIntroduceReply struct {
 func (x *RandomIntroduceReply) Reset() {
 func (x *RandomIntroduceReply) Reset() {
 	*x = RandomIntroduceReply{}
 	*x = RandomIntroduceReply{}
 	if protoimpl.UnsafeEnabled {
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[21]
+		mi := &file_common_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 		ms.StoreMessageInfo(mi)
 	}
 	}
@@ -1345,7 +1282,7 @@ func (x *RandomIntroduceReply) String() string {
 func (*RandomIntroduceReply) ProtoMessage() {}
 func (*RandomIntroduceReply) ProtoMessage() {}
 
 
 func (x *RandomIntroduceReply) ProtoReflect() protoreflect.Message {
 func (x *RandomIntroduceReply) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[21]
+	mi := &file_common_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 		if ms.LoadMessageInfo() == nil {
@@ -1358,7 +1295,7 @@ func (x *RandomIntroduceReply) ProtoReflect() protoreflect.Message {
 
 
 // Deprecated: Use RandomIntroduceReply.ProtoReflect.Descriptor instead.
 // Deprecated: Use RandomIntroduceReply.ProtoReflect.Descriptor instead.
 func (*RandomIntroduceReply) Descriptor() ([]byte, []int) {
 func (*RandomIntroduceReply) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{21}
+	return file_common_proto_rawDescGZIP(), []int{20}
 }
 }
 
 
 func (x *RandomIntroduceReply) GetIntroduce() string {
 func (x *RandomIntroduceReply) GetIntroduce() string {
@@ -1373,22 +1310,23 @@ type UpdateInformationRequest struct {
 	sizeCache     protoimpl.SizeCache
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 	unknownFields protoimpl.UnknownFields
 
 
-	Nickname       string   `protobuf:"bytes,1,opt,name=Nickname,proto3" json:"Nickname"`             // 昵称
+	Nickname       string   `protobuf:"bytes,1,opt,name=nickname,proto3" json:"nickname"`             // 昵称
 	AvatarUrl      string   `protobuf:"bytes,2,opt,name=avatarUrl,proto3" json:"avatarUrl"`           // 头像
 	AvatarUrl      string   `protobuf:"bytes,2,opt,name=avatarUrl,proto3" json:"avatarUrl"`           // 头像
 	Sex            int64    `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`                      // 性别
 	Sex            int64    `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`                      // 性别
 	Birthday       int64    `protobuf:"varint,4,opt,name=birthday,proto3" json:"birthday"`            // 出生日期(毫秒级时间戳)
 	Birthday       int64    `protobuf:"varint,4,opt,name=birthday,proto3" json:"birthday"`            // 出生日期(毫秒级时间戳)
 	TagList        []int64  `protobuf:"varint,5,rep,packed,name=tagList,proto3" json:"tagList"`       // 标签id列表
 	TagList        []int64  `protobuf:"varint,5,rep,packed,name=tagList,proto3" json:"tagList"`       // 标签id列表
 	IntroduceVoice string   `protobuf:"bytes,6,opt,name=introduceVoice,proto3" json:"introduceVoice"` // 介绍语音的链接
 	IntroduceVoice string   `protobuf:"bytes,6,opt,name=introduceVoice,proto3" json:"introduceVoice"` // 介绍语音的链接
-	Pictures       []string `protobuf:"bytes,7,rep,name=pictures,proto3" json:"pictures"`             // 相册(主页图片)
-	Province       string   `protobuf:"bytes,8,opt,name=province,proto3" json:"province"`             // 省
-	City           string   `protobuf:"bytes,9,opt,name=city,proto3" json:"city"`                     // 市
-	Area           string   `protobuf:"bytes,10,opt,name=area,proto3" json:"area"`                    // 区
+	Signature      string   `protobuf:"bytes,7,opt,name=signature,proto3" json:"signature"`           // 介绍(签名)
+	Pictures       []string `protobuf:"bytes,8,rep,name=pictures,proto3" json:"pictures"`             // 相册(主页图片)
+	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 *UpdateInformationRequest) Reset() {
 func (x *UpdateInformationRequest) Reset() {
 	*x = UpdateInformationRequest{}
 	*x = UpdateInformationRequest{}
 	if protoimpl.UnsafeEnabled {
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[22]
+		mi := &file_common_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 		ms.StoreMessageInfo(mi)
 	}
 	}
@@ -1401,7 +1339,7 @@ func (x *UpdateInformationRequest) String() string {
 func (*UpdateInformationRequest) ProtoMessage() {}
 func (*UpdateInformationRequest) ProtoMessage() {}
 
 
 func (x *UpdateInformationRequest) ProtoReflect() protoreflect.Message {
 func (x *UpdateInformationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[22]
+	mi := &file_common_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 		if ms.LoadMessageInfo() == nil {
@@ -1414,7 +1352,7 @@ func (x *UpdateInformationRequest) ProtoReflect() protoreflect.Message {
 
 
 // Deprecated: Use UpdateInformationRequest.ProtoReflect.Descriptor instead.
 // Deprecated: Use UpdateInformationRequest.ProtoReflect.Descriptor instead.
 func (*UpdateInformationRequest) Descriptor() ([]byte, []int) {
 func (*UpdateInformationRequest) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{22}
+	return file_common_proto_rawDescGZIP(), []int{21}
 }
 }
 
 
 func (x *UpdateInformationRequest) GetNickname() string {
 func (x *UpdateInformationRequest) GetNickname() string {
@@ -1459,6 +1397,13 @@ func (x *UpdateInformationRequest) GetIntroduceVoice() string {
 	return ""
 	return ""
 }
 }
 
 
+func (x *UpdateInformationRequest) GetSignature() string {
+	if x != nil {
+		return x.Signature
+	}
+	return ""
+}
+
 func (x *UpdateInformationRequest) GetPictures() []string {
 func (x *UpdateInformationRequest) GetPictures() []string {
 	if x != nil {
 	if x != nil {
 		return x.Pictures
 		return x.Pictures
@@ -1599,48 +1544,43 @@ var file_common_proto_rawDesc = []byte{
 	0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0x17, 0x0a, 0x03, 0x49, 0x64, 0x73, 0x12, 0x10,
 	0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0x17, 0x0a, 0x03, 0x49, 0x64, 0x73, 0x12, 0x10,
 	0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, 0x52, 0x03, 0x69, 0x64, 0x73,
 	0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, 0x52, 0x03, 0x69, 0x64, 0x73,
-	0x22, 0x4e, 0x0a, 0x1c, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42,
-	0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78,
-	0x12, 0x1c, 0x0a, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10,
-	0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78,
-	0x22, 0x4b, 0x0a, 0x0c, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a,
-	0x07, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x06,
-	0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22, 0x34, 0x0a, 0x14, 0x52, 0x61, 0x6e, 0x64,
-	0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x22, 0xa4,
-	0x02, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4e,
-	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e,
-	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
-	0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x69, 0x72, 0x74, 0x68,
-	0x64, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x62, 0x69, 0x72, 0x74, 0x68,
-	0x64, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05,
-	0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a,
-	0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65,
-	0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74,
-	0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x61, 0x72, 0x65, 0x61, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61,
-	0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x22, 0x37, 0x0a, 0x0c, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
+	0x12, 0x27, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x07, 0x54, 0x61, 0x67,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x06, 0x53, 0x65, 0x78, 0x52,
+	0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x03, 0x73, 0x65, 0x78, 0x22, 0x34, 0x0a, 0x14, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x49, 0x6e,
+	0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1c, 0x0a, 0x09,
+	0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x22, 0xc2, 0x02, 0x0a, 0x18, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72,
+	0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
+	0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x62, 0x69, 0x72, 0x74, 0x68, 0x64, 0x61, 0x79, 0x12,
+	0x18, 0x0a, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x03,
+	0x52, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74,
+	0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63,
+	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
+	0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70,
+	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70,
+	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x61,
+	0x72, 0x65, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 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 (
 var (
@@ -1655,36 +1595,35 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 	return file_common_proto_rawDescData
 }
 }
 
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
 var file_common_proto_goTypes = []interface{}{
 var file_common_proto_goTypes = []interface{}{
-	(*UserAndPartnerIdParam)(nil),        // 0: api.common.UserAndPartnerIdParam
-	(*User1AndUser2IdParam)(nil),         // 1: api.common.User1AndUser2IdParam
-	(*PartnerIDParam)(nil),               // 2: api.common.PartnerIDParam
-	(*PersonParam)(nil),                  // 3: api.common.PersonParam
-	(*UserIDParam)(nil),                  // 4: api.common.UserIDParam
-	(*WxConfReq)(nil),                    // 5: api.common.WxConfReq
-	(*WxConfResponse)(nil),               // 6: api.common.WxConfResponse
-	(*HomeInfo)(nil),                     // 7: api.common.HomeInfo
-	(*AddFriendMessageInfo)(nil),         // 8: api.common.AddFriendMessageInfo
-	(*PersonIDList)(nil),                 // 9: api.common.PersonIDList
-	(*PersonDBReply)(nil),                // 10: api.common.PersonDBReply
-	(*PersonDB)(nil),                     // 11: api.common.PersonDB
-	(*ListPageRequest)(nil),              // 12: api.common.ListPageRequest
-	(*SendPhoneCodeRequest)(nil),         // 13: api.common.SendPhoneCodeRequest
-	(*CheckPhoneCodeRequest)(nil),        // 14: api.common.CheckPhoneCodeRequest
-	(*UploadMaterialResponse)(nil),       // 15: api.common.UploadMaterialResponse
-	(*Ids)(nil),                          // 16: api.common.Ids
-	(*FindTagListByGroupNameAndSex)(nil), // 17: api.common.FindTagListByGroupNameAndSex
-	(*TagListReply)(nil),                 // 18: api.common.TagListReply
-	(*TagList)(nil),                      // 19: api.common.TagList
-	(*SexReq)(nil),                       // 20: api.common.SexReq
-	(*RandomIntroduceReply)(nil),         // 21: api.common.RandomIntroduceReply
-	(*UpdateInformationRequest)(nil),     // 22: api.common.UpdateInformationRequest
+	(*UserAndPartnerIdParam)(nil),    // 0: api.common.UserAndPartnerIdParam
+	(*User1AndUser2IdParam)(nil),     // 1: api.common.User1AndUser2IdParam
+	(*PartnerIDParam)(nil),           // 2: api.common.PartnerIDParam
+	(*PersonParam)(nil),              // 3: api.common.PersonParam
+	(*UserIDParam)(nil),              // 4: api.common.UserIDParam
+	(*WxConfReq)(nil),                // 5: api.common.WxConfReq
+	(*WxConfResponse)(nil),           // 6: api.common.WxConfResponse
+	(*HomeInfo)(nil),                 // 7: api.common.HomeInfo
+	(*AddFriendMessageInfo)(nil),     // 8: api.common.AddFriendMessageInfo
+	(*PersonIDList)(nil),             // 9: api.common.PersonIDList
+	(*PersonDBReply)(nil),            // 10: api.common.PersonDBReply
+	(*PersonDB)(nil),                 // 11: api.common.PersonDB
+	(*ListPageRequest)(nil),          // 12: api.common.ListPageRequest
+	(*SendPhoneCodeRequest)(nil),     // 13: api.common.SendPhoneCodeRequest
+	(*CheckPhoneCodeRequest)(nil),    // 14: api.common.CheckPhoneCodeRequest
+	(*UploadMaterialResponse)(nil),   // 15: api.common.UploadMaterialResponse
+	(*Ids)(nil),                      // 16: api.common.Ids
+	(*TagListReply)(nil),             // 17: api.common.TagListReply
+	(*TagList)(nil),                  // 18: api.common.TagList
+	(*SexReq)(nil),                   // 19: api.common.SexReq
+	(*RandomIntroduceReply)(nil),     // 20: api.common.RandomIntroduceReply
+	(*UpdateInformationRequest)(nil), // 21: api.common.UpdateInformationRequest
 }
 }
 var file_common_proto_depIdxs = []int32{
 var file_common_proto_depIdxs = []int32{
-	19, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
+	18, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
 	11, // 1: api.common.PersonDBReply.list:type_name -> api.common.PersonDB
 	11, // 1: api.common.PersonDBReply.list:type_name -> api.common.PersonDB
-	19, // 2: api.common.TagListReply.list:type_name -> api.common.TagList
+	18, // 2: api.common.TagListReply.list:type_name -> api.common.TagList
 	3,  // [3:3] is the sub-list for method output_type
 	3,  // [3:3] is the sub-list for method output_type
 	3,  // [3:3] is the sub-list for method input_type
 	3,  // [3:3] is the sub-list for method input_type
 	3,  // [3:3] is the sub-list for extension type_name
 	3,  // [3:3] is the sub-list for extension type_name
@@ -1903,18 +1842,6 @@ func file_common_proto_init() {
 			}
 			}
 		}
 		}
 		file_common_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 		file_common_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FindTagListByGroupNameAndSex); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_common_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TagListReply); i {
 			switch v := v.(*TagListReply); i {
 			case 0:
 			case 0:
 				return &v.state
 				return &v.state
@@ -1926,7 +1853,7 @@ func file_common_proto_init() {
 				return nil
 				return nil
 			}
 			}
 		}
 		}
-		file_common_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_common_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TagList); i {
 			switch v := v.(*TagList); i {
 			case 0:
 			case 0:
 				return &v.state
 				return &v.state
@@ -1938,7 +1865,7 @@ func file_common_proto_init() {
 				return nil
 				return nil
 			}
 			}
 		}
 		}
-		file_common_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_common_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SexReq); i {
 			switch v := v.(*SexReq); i {
 			case 0:
 			case 0:
 				return &v.state
 				return &v.state
@@ -1950,7 +1877,7 @@ func file_common_proto_init() {
 				return nil
 				return nil
 			}
 			}
 		}
 		}
-		file_common_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_common_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RandomIntroduceReply); i {
 			switch v := v.(*RandomIntroduceReply); i {
 			case 0:
 			case 0:
 				return &v.state
 				return &v.state
@@ -1962,7 +1889,7 @@ func file_common_proto_init() {
 				return nil
 				return nil
 			}
 			}
 		}
 		}
-		file_common_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_common_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateInformationRequest); i {
 			switch v := v.(*UpdateInformationRequest); i {
 			case 0:
 			case 0:
 				return &v.state
 				return &v.state
@@ -1981,7 +1908,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
 			NumEnums:      0,
-			NumMessages:   23,
+			NumMessages:   22,
 			NumExtensions: 0,
 			NumExtensions: 0,
 			NumServices:   0,
 			NumServices:   0,
 		},
 		},

+ 7 - 12
api/common/common.proto

@@ -116,14 +116,8 @@ message Ids {
   repeated int64  ids = 1;// 标签ID
   repeated int64  ids = 1;// 标签ID
 }
 }
 
 
-message FindTagListByGroupNameAndSex {
-  string groupName = 1;// 分组名
-  int64 sex = 2;// 性别
-}
-
 message TagListReply{
 message TagListReply{
-  string name = 1;// 分组名
-  repeated TagList list = 2;// 标签列表
+  repeated TagList list = 1;// 标签列表
 }
 }
 
 
 message TagList{
 message TagList{
@@ -140,14 +134,15 @@ message RandomIntroduceReply{
 }
 }
 
 
 message UpdateInformationRequest {
 message UpdateInformationRequest {
-  string Nickname = 1; // 昵称
+  string nickname = 1; // 昵称
   string avatarUrl = 2;// 头像
   string avatarUrl = 2;// 头像
   int64 sex = 3; // 性别
   int64 sex = 3; // 性别
   int64 birthday = 4;// 出生日期(毫秒级时间戳)
   int64 birthday = 4;// 出生日期(毫秒级时间戳)
   repeated int64 tagList = 5;// 标签id列表
   repeated int64 tagList = 5;// 标签id列表
   string introduceVoice = 6;// 介绍语音的链接
   string introduceVoice = 6;// 介绍语音的链接
-  repeated string pictures = 7;// 相册(主页图片)
-  string province = 8;// 省
-  string city = 9;// 市
-  string area = 10;// 区
+  string signature = 7;// 介绍(签名)
+  repeated string pictures = 8;// 相册(主页图片)
+  string province = 9;// 省
+  string city = 10;// 市
+  string area = 11;// 区
 }
 }

+ 36 - 38
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,
 	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,
 	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,
 	0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
-	0x73, 0x65, 0x78, 0x32, 0xfe, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12,
+	0x73, 0x65, 0x78, 0x32, 0xdb, 0x09, 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,
 	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,
 	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,
 	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e,
@@ -392,21 +392,19 @@ var file_partner_proto_rawDesc = []byte{
 	0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x57, 0x78,
 	0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x57, 0x78,
 	0x43, 0x6f, 0x6e, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3,
 	0x43, 0x6f, 0x6e, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3,
 	0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x77, 0x78, 0x2f, 0x6a, 0x73,
 	0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x77, 0x78, 0x2f, 0x6a, 0x73,
-	0x73, 0x64, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x01, 0x2a, 0x12, 0x84, 0x01,
-	0x0a, 0x1c, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x12, 0x28,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64,
-	0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61,
-	0x6d, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 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,
+	0x73, 0x64, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x01, 0x2a, 0x12, 0x62, 0x0a,
+	0x10, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65,
+	0x78, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53,
+	0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	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,
 }
 }
 
 
 var (
 var (
@@ -423,26 +421,26 @@ func file_partner_proto_rawDescGZIP() []byte {
 
 
 var file_partner_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_partner_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_partner_proto_goTypes = []interface{}{
 var file_partner_proto_goTypes = []interface{}{
-	(*PartnerInfo)(nil),                         // 0: api.partner.PartnerInfo
-	(*RandomPartnerInfo)(nil),                   // 1: api.partner.RandomPartnerInfo
-	(*GetRandomPartnerRequest)(nil),             // 2: api.partner.GetRandomPartnerRequest
-	(*emptypb.Empty)(nil),                       // 3: google.protobuf.Empty
-	(*common.SendPhoneCodeRequest)(nil),         // 4: api.common.SendPhoneCodeRequest
-	(*common.CheckPhoneCodeRequest)(nil),        // 5: api.common.CheckPhoneCodeRequest
-	(*common.PartnerIDParam)(nil),               // 6: api.common.PartnerIDParam
-	(*common.UpdateInformationRequest)(nil),     // 7: api.common.UpdateInformationRequest
-	(*common.PersonParam)(nil),                  // 8: api.common.PersonParam
-	(*common.ListPageRequest)(nil),              // 9: api.common.ListPageRequest
-	(*common.PersonIDList)(nil),                 // 10: api.common.PersonIDList
-	(*common.WxConfReq)(nil),                    // 11: api.common.WxConfReq
-	(*common.FindTagListByGroupNameAndSex)(nil), // 12: api.common.FindTagListByGroupNameAndSex
-	(*statistics.LookMessageReply)(nil),         // 13: api.statistics.LookMessageReply
-	(*common.AddFriendMessageInfo)(nil),         // 14: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                     // 15: api.common.HomeInfo
-	(*statistics.LookAndLikeListReply)(nil),     // 16: api.statistics.LookAndLikeListReply
-	(*common.PersonDBReply)(nil),                // 17: api.common.PersonDBReply
-	(*common.WxConfResponse)(nil),               // 18: api.common.WxConfResponse
-	(*common.TagListReply)(nil),                 // 19: api.common.TagListReply
+	(*PartnerInfo)(nil),                     // 0: api.partner.PartnerInfo
+	(*RandomPartnerInfo)(nil),               // 1: api.partner.RandomPartnerInfo
+	(*GetRandomPartnerRequest)(nil),         // 2: api.partner.GetRandomPartnerRequest
+	(*emptypb.Empty)(nil),                   // 3: google.protobuf.Empty
+	(*common.SendPhoneCodeRequest)(nil),     // 4: api.common.SendPhoneCodeRequest
+	(*common.CheckPhoneCodeRequest)(nil),    // 5: api.common.CheckPhoneCodeRequest
+	(*common.PartnerIDParam)(nil),           // 6: api.common.PartnerIDParam
+	(*common.UpdateInformationRequest)(nil), // 7: api.common.UpdateInformationRequest
+	(*common.PersonParam)(nil),              // 8: api.common.PersonParam
+	(*common.ListPageRequest)(nil),          // 9: api.common.ListPageRequest
+	(*common.PersonIDList)(nil),             // 10: api.common.PersonIDList
+	(*common.WxConfReq)(nil),                // 11: api.common.WxConfReq
+	(*common.SexReq)(nil),                   // 12: api.common.SexReq
+	(*statistics.LookMessageReply)(nil),     // 13: api.statistics.LookMessageReply
+	(*common.AddFriendMessageInfo)(nil),     // 14: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                 // 15: api.common.HomeInfo
+	(*statistics.LookAndLikeListReply)(nil), // 16: api.statistics.LookAndLikeListReply
+	(*common.PersonDBReply)(nil),            // 17: api.common.PersonDBReply
+	(*common.WxConfResponse)(nil),           // 18: api.common.WxConfResponse
+	(*common.TagListReply)(nil),             // 19: api.common.TagListReply
 }
 }
 var file_partner_proto_depIdxs = []int32{
 var file_partner_proto_depIdxs = []int32{
 	3,  // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
 	3,  // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
@@ -456,7 +454,7 @@ var file_partner_proto_depIdxs = []int32{
 	9,  // 8: api.partner.Partner.FindLookList:input_type -> api.common.ListPageRequest
 	9,  // 8: api.partner.Partner.FindLookList:input_type -> api.common.ListPageRequest
 	10, // 9: api.partner.Partner.FindPartnerDBList:input_type -> api.common.PersonIDList
 	10, // 9: api.partner.Partner.FindPartnerDBList:input_type -> api.common.PersonIDList
 	11, // 10: api.partner.Partner.WxConf:input_type -> api.common.WxConfReq
 	11, // 10: api.partner.Partner.WxConf:input_type -> api.common.WxConfReq
-	12, // 11: api.partner.Partner.FindTagListByGroupNameAndSex:input_type -> api.common.FindTagListByGroupNameAndSex
+	12, // 11: api.partner.Partner.FindTagListBySex:input_type -> api.common.SexReq
 	0,  // 12: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
 	0,  // 12: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
 	13, // 13: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
 	13, // 13: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
 	3,  // 14: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
 	3,  // 14: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
@@ -468,7 +466,7 @@ var file_partner_proto_depIdxs = []int32{
 	16, // 20: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
 	16, // 20: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
 	17, // 21: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
 	17, // 21: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
 	18, // 22: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
 	18, // 22: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
-	19, // 23: api.partner.Partner.FindTagListByGroupNameAndSex:output_type -> api.common.TagListReply
+	19, // 23: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
 	12, // [12:24] is the sub-list for method output_type
 	12, // [12:24] is the sub-list for method output_type
 	0,  // [0:12] is the sub-list for method input_type
 	0,  // [0:12] 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 type_name

+ 1 - 1
api/partner/partner.proto

@@ -75,7 +75,7 @@ service Partner {
     };
     };
   };
   };
   // 获取标签列表
   // 获取标签列表
-  rpc FindTagListByGroupNameAndSex (common.FindTagListByGroupNameAndSex) returns (common.TagListReply){
+  rpc FindTagListBySex (common.SexReq) returns (common.TagListReply){
     option (google.api.http) = {
     option (google.api.http) = {
       post: "/api/partner/list/tag",
       post: "/api/partner/list/tag",
       body:"*"
       body:"*"

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

@@ -43,7 +43,7 @@ type PartnerClient interface {
 	// 微信SDK初始化
 	// 微信SDK初始化
 	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	// 获取标签列表
 	// 获取标签列表
-	FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...grpc.CallOption) (*common.TagListReply, error)
+	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 }
 }
 
 
 type partnerClient struct {
 type partnerClient struct {
@@ -153,9 +153,9 @@ func (c *partnerClient) WxConf(ctx context.Context, in *common.WxConfReq, opts .
 	return out, nil
 	return out, nil
 }
 }
 
 
-func (c *partnerClient) FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...grpc.CallOption) (*common.TagListReply, error) {
+func (c *partnerClient) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error) {
 	out := new(common.TagListReply)
 	out := new(common.TagListReply)
-	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindTagListByGroupNameAndSex", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindTagListBySex", in, out, opts...)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -188,7 +188,7 @@ type PartnerServer interface {
 	// 微信SDK初始化
 	// 微信SDK初始化
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	// 获取标签列表
 	// 获取标签列表
-	FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error)
+	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	mustEmbedUnimplementedPartnerServer()
 	mustEmbedUnimplementedPartnerServer()
 }
 }
 
 
@@ -229,8 +229,8 @@ func (UnimplementedPartnerServer) FindPartnerDBList(context.Context, *common.Per
 func (UnimplementedPartnerServer) WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error) {
 func (UnimplementedPartnerServer) WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method WxConf not implemented")
 	return nil, status.Errorf(codes.Unimplemented, "method WxConf not implemented")
 }
 }
-func (UnimplementedPartnerServer) FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindTagListByGroupNameAndSex not implemented")
+func (UnimplementedPartnerServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
 }
 }
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 
@@ -443,20 +443,20 @@ func _Partner_WxConf_Handler(srv interface{}, ctx context.Context, dec func(inte
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
 
 
-func _Partner_FindTagListByGroupNameAndSex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.FindTagListByGroupNameAndSex)
+func _Partner_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.SexReq)
 	if err := dec(in); err != nil {
 	if err := dec(in); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 	if interceptor == nil {
 	if interceptor == nil {
-		return srv.(PartnerServer).FindTagListByGroupNameAndSex(ctx, in)
+		return srv.(PartnerServer).FindTagListBySex(ctx, in)
 	}
 	}
 	info := &grpc.UnaryServerInfo{
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
 		Server:     srv,
-		FullMethod: "/api.partner.Partner/FindTagListByGroupNameAndSex",
+		FullMethod: "/api.partner.Partner/FindTagListBySex",
 	}
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PartnerServer).FindTagListByGroupNameAndSex(ctx, req.(*common.FindTagListByGroupNameAndSex))
+		return srv.(PartnerServer).FindTagListBySex(ctx, req.(*common.SexReq))
 	}
 	}
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
@@ -513,8 +513,8 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _Partner_WxConf_Handler,
 			Handler:    _Partner_WxConf_Handler,
 		},
 		},
 		{
 		{
-			MethodName: "FindTagListByGroupNameAndSex",
-			Handler:    _Partner_FindTagListByGroupNameAndSex_Handler,
+			MethodName: "FindTagListBySex",
+			Handler:    _Partner_FindTagListBySex_Handler,
 		},
 		},
 	},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Streams:  []grpc.StreamDesc{},

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

@@ -31,7 +31,7 @@ const _ = http.SupportPackageIsVersion1
 type PartnerHTTPServer interface {
 type PartnerHTTPServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
-	FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error)
+	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	PartnerGetHomeInfo(context.Context, *common.PersonParam) (*common.HomeInfo, error)
 	PartnerGetHomeInfo(context.Context, *common.PersonParam) (*common.HomeInfo, error)
@@ -50,7 +50,7 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/home", _Partner_PartnerGetHomeInfo0_HTTP_Handler(srv))
 	r.POST("/api/partner/home", _Partner_PartnerGetHomeInfo0_HTTP_Handler(srv))
 	r.POST("/api/partner/list/look", _Partner_FindLookList0_HTTP_Handler(srv))
 	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/wx/jssdk/config", _Partner_WxConf0_HTTP_Handler(srv))
-	r.POST("/api/partner/list/tag", _Partner_FindTagListByGroupNameAndSex0_HTTP_Handler(srv))
+	r.POST("/api/partner/list/tag", _Partner_FindTagListBySex0_HTTP_Handler(srv))
 }
 }
 
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -269,18 +269,18 @@ func _Partner_WxConf0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context)
 	}
 	}
 }
 }
 
 
-func _Partner_FindTagListByGroupNameAndSex0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+func _Partner_FindTagListBySex0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.FindTagListByGroupNameAndSex
+		var in common.SexReq
 		if err := ctx.Bind(&in); err != nil {
 		if err := ctx.Bind(&in); err != nil {
 			return err
 			return err
 		}
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 			return err
 		}
 		}
-		http.SetOperation(ctx, "/api.partner.Partner/FindTagListByGroupNameAndSex")
+		http.SetOperation(ctx, "/api.partner.Partner/FindTagListBySex")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindTagListByGroupNameAndSex(ctx, req.(*common.FindTagListByGroupNameAndSex))
+			return srv.FindTagListBySex(ctx, req.(*common.SexReq))
 		})
 		})
 		out, err := h(ctx, &in)
 		out, err := h(ctx, &in)
 		if err != nil {
 		if err != nil {
@@ -299,7 +299,7 @@ func _Partner_FindTagListByGroupNameAndSex0_HTTP_Handler(srv PartnerHTTPServer)
 type PartnerHTTPClient interface {
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	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)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
-	FindTagListByGroupNameAndSex(ctx context.Context, req *common.FindTagListByGroupNameAndSex, opts ...http.CallOption) (rsp *common.TagListReply, 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)
 	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)
 	GetPartnerLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
 	PartnerGetHomeInfo(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.HomeInfo, err error)
 	PartnerGetHomeInfo(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.HomeInfo, err error)
@@ -342,11 +342,11 @@ func (c *PartnerHTTPClientImpl) FindLookList(ctx context.Context, in *common.Lis
 	return &out, err
 	return &out, err
 }
 }
 
 
-func (c *PartnerHTTPClientImpl) FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...http.CallOption) (*common.TagListReply, error) {
+func (c *PartnerHTTPClientImpl) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*common.TagListReply, error) {
 	var out common.TagListReply
 	var out common.TagListReply
 	pattern := "/api/partner/list/tag"
 	pattern := "/api/partner/list/tag"
 	path := binding.EncodeURL(pattern, in, false)
 	path := binding.EncodeURL(pattern, in, false)
-	opts = append(opts, http.Operation("/api.partner.Partner/FindTagListByGroupNameAndSex"))
+	opts = append(opts, http.Operation("/api.partner.Partner/FindTagListBySex"))
 	opts = append(opts, http.PathTemplate(pattern))
 	opts = append(opts, http.PathTemplate(pattern))
 	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
 	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
 	if err != nil {
 	if err != nil {

+ 15 - 17
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,
 	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,
 	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,
 	0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x32, 0xae, 0x0e, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15,
+	0x6b, 0x65, 0x79, 0x32, 0x8b, 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,
 	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,
 	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,
 	0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
@@ -290,19 +290,17 @@ var file_user_proto_rawDesc = []byte{
 	0x2e, 0x57, 0x78, 0x43, 0x6f, 0x6e, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
 	0x2e, 0x57, 0x78, 0x43, 0x6f, 0x6e, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
 	0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x77, 0x78,
 	0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x77, 0x78,
 	0x2f, 0x6a, 0x73, 0x73, 0x64, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x01, 0x2a,
 	0x2f, 0x6a, 0x73, 0x73, 0x64, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x01, 0x2a,
-	0x12, 0x81, 0x01, 0x0a, 0x1c, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74,
-	0x42, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65,
-	0x78, 0x12, 0x28, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46,
-	0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x4e, 0x61, 0x6d, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x1a, 0x18, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 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,
+	0x12, 0x5f, 0x0a, 0x10, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x42,
+	0x79, 0x53, 0x65, 0x78, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	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,
 }
 }
 
 
 var (
 var (
@@ -330,7 +328,7 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.PersonIDList)(nil),                       // 8: api.common.PersonIDList
 	(*common.PersonIDList)(nil),                       // 8: api.common.PersonIDList
 	(*common.ListPageRequest)(nil),                    // 9: api.common.ListPageRequest
 	(*common.ListPageRequest)(nil),                    // 9: api.common.ListPageRequest
 	(*common.WxConfReq)(nil),                          // 10: api.common.WxConfReq
 	(*common.WxConfReq)(nil),                          // 10: api.common.WxConfReq
-	(*common.FindTagListByGroupNameAndSex)(nil),       // 11: api.common.FindTagListByGroupNameAndSex
+	(*common.SexReq)(nil),                             // 11: api.common.SexReq
 	(*statistics.LookMessageReply)(nil),               // 12: api.statistics.LookMessageReply
 	(*statistics.LookMessageReply)(nil),               // 12: api.statistics.LookMessageReply
 	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 13: api.chat.CheckUserPartnerIsRelationshipReply
 	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 13: api.chat.CheckUserPartnerIsRelationshipReply
 	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 14: api.chat.CreateUserPartnerIsRelationshipReply
 	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 14: api.chat.CreateUserPartnerIsRelationshipReply
@@ -358,7 +356,7 @@ var file_user_proto_depIdxs = []int32{
 	9,  // 12: api.user.User.FindLikedList:input_type -> api.common.ListPageRequest
 	9,  // 12: api.user.User.FindLikedList:input_type -> api.common.ListPageRequest
 	7,  // 13: api.user.User.GetLookAndLikeStatisticsMessage:input_type -> api.common.PersonParam
 	7,  // 13: api.user.User.GetLookAndLikeStatisticsMessage:input_type -> api.common.PersonParam
 	10, // 14: api.user.User.WxConf:input_type -> api.common.WxConfReq
 	10, // 14: api.user.User.WxConf:input_type -> api.common.WxConfReq
-	11, // 15: api.user.User.FindTagListByGroupNameAndSex:input_type -> api.common.FindTagListByGroupNameAndSex
+	11, // 15: api.user.User.FindTagListBySex:input_type -> api.common.SexReq
 	3,  // 16: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
 	3,  // 16: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
 	0,  // 17: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
 	0,  // 17: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
 	12, // 18: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
 	12, // 18: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
@@ -374,7 +372,7 @@ var file_user_proto_depIdxs = []int32{
 	18, // 28: api.user.User.FindLikedList: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
 	19, // 29: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
 	20, // 30: api.user.User.WxConf:output_type -> api.common.WxConfResponse
 	20, // 30: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	21, // 31: api.user.User.FindTagListByGroupNameAndSex:output_type -> api.common.TagListReply
+	21, // 31: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
 	16, // [16:32] is the sub-list for method output_type
 	16, // [16:32] is the sub-list for method output_type
 	0,  // [0:16] is the sub-list for method input_type
 	0,  // [0:16] 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 type_name

+ 1 - 1
api/user/user.proto

@@ -115,7 +115,7 @@ service User {
     };
     };
   };
   };
   // 获取标签列表
   // 获取标签列表
-  rpc FindTagListByGroupNameAndSex (common.FindTagListByGroupNameAndSex) returns (common.TagListReply){
+  rpc FindTagListBySex (common.SexReq) returns (common.TagListReply){
     option (google.api.http) = {
     option (google.api.http) = {
       post: "/api/user/list/tag",
       post: "/api/user/list/tag",
       body:"*"
       body:"*"

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

@@ -53,7 +53,7 @@ type UserClient interface {
 	// 微信SDK初始化
 	// 微信SDK初始化
 	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	WxConf(ctx context.Context, in *common.WxConfReq, opts ...grpc.CallOption) (*common.WxConfResponse, error)
 	// 获取标签列表
 	// 获取标签列表
-	FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...grpc.CallOption) (*common.TagListReply, error)
+	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 }
 }
 
 
 type userClient struct {
 type userClient struct {
@@ -199,9 +199,9 @@ func (c *userClient) WxConf(ctx context.Context, in *common.WxConfReq, opts ...g
 	return out, nil
 	return out, nil
 }
 }
 
 
-func (c *userClient) FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...grpc.CallOption) (*common.TagListReply, error) {
+func (c *userClient) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error) {
 	out := new(common.TagListReply)
 	out := new(common.TagListReply)
-	err := c.cc.Invoke(ctx, "/api.user.User/FindTagListByGroupNameAndSex", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindTagListBySex", in, out, opts...)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -243,7 +243,7 @@ type UserServer interface {
 	// 微信SDK初始化
 	// 微信SDK初始化
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 	// 获取标签列表
 	// 获取标签列表
-	FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error)
+	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	mustEmbedUnimplementedUserServer()
 	mustEmbedUnimplementedUserServer()
 }
 }
 
 
@@ -296,8 +296,8 @@ func (UnimplementedUserServer) GetLookAndLikeStatisticsMessage(context.Context,
 func (UnimplementedUserServer) WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error) {
 func (UnimplementedUserServer) WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method WxConf not implemented")
 	return nil, status.Errorf(codes.Unimplemented, "method WxConf not implemented")
 }
 }
-func (UnimplementedUserServer) FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindTagListByGroupNameAndSex not implemented")
+func (UnimplementedUserServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
 }
 }
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 
@@ -582,20 +582,20 @@ func _User_WxConf_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
 
 
-func _User_FindTagListByGroupNameAndSex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.FindTagListByGroupNameAndSex)
+func _User_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.SexReq)
 	if err := dec(in); err != nil {
 	if err := dec(in); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 	if interceptor == nil {
 	if interceptor == nil {
-		return srv.(UserServer).FindTagListByGroupNameAndSex(ctx, in)
+		return srv.(UserServer).FindTagListBySex(ctx, in)
 	}
 	}
 	info := &grpc.UnaryServerInfo{
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
 		Server:     srv,
-		FullMethod: "/api.user.User/FindTagListByGroupNameAndSex",
+		FullMethod: "/api.user.User/FindTagListBySex",
 	}
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).FindTagListByGroupNameAndSex(ctx, req.(*common.FindTagListByGroupNameAndSex))
+		return srv.(UserServer).FindTagListBySex(ctx, req.(*common.SexReq))
 	}
 	}
 	return interceptor(ctx, in, info, handler)
 	return interceptor(ctx, in, info, handler)
 }
 }
@@ -668,8 +668,8 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _User_WxConf_Handler,
 			Handler:    _User_WxConf_Handler,
 		},
 		},
 		{
 		{
-			MethodName: "FindTagListByGroupNameAndSex",
-			Handler:    _User_FindTagListByGroupNameAndSex_Handler,
+			MethodName: "FindTagListBySex",
+			Handler:    _User_FindTagListBySex_Handler,
 		},
 		},
 	},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Streams:  []grpc.StreamDesc{},

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

@@ -36,7 +36,7 @@ type UserHTTPServer interface {
 	FindLikeList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLikeList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLikedList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLikedList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
-	FindTagListByGroupNameAndSex(context.Context, *common.FindTagListByGroupNameAndSex) (*common.TagListReply, error)
+	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	GetLookAndLikeStatisticsMessage(context.Context, *common.PersonParam) (*statistics.LookAndLikeMessageReply, error)
 	GetLookAndLikeStatisticsMessage(context.Context, *common.PersonParam) (*statistics.LookAndLikeMessageReply, error)
 	GetPartnerCircleInfo(context.Context, *KeyRequest) (*common.AddFriendMessageInfo, error)
 	GetPartnerCircleInfo(context.Context, *KeyRequest) (*common.AddFriendMessageInfo, error)
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
@@ -63,7 +63,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/list/liked", _User_FindLikedList0_HTTP_Handler(srv))
 	r.POST("/api/user/list/liked", _User_FindLikedList0_HTTP_Handler(srv))
 	r.POST("/api/user/num/like_look", _User_GetLookAndLikeStatisticsMessage0_HTTP_Handler(srv))
 	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/wx/jssdk/config", _User_WxConf0_HTTP_Handler(srv))
-	r.POST("/api/user/list/tag", _User_FindTagListByGroupNameAndSex0_HTTP_Handler(srv))
+	r.POST("/api/user/list/tag", _User_FindTagListBySex0_HTTP_Handler(srv))
 }
 }
 
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -444,18 +444,18 @@ func _User_WxConf0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error
 	}
 	}
 }
 }
 
 
-func _User_FindTagListByGroupNameAndSex0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+func _User_FindTagListBySex0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.FindTagListByGroupNameAndSex
+		var in common.SexReq
 		if err := ctx.Bind(&in); err != nil {
 		if err := ctx.Bind(&in); err != nil {
 			return err
 			return err
 		}
 		}
 		if err := ctx.BindQuery(&in); err != nil {
 		if err := ctx.BindQuery(&in); err != nil {
 			return err
 			return err
 		}
 		}
-		http.SetOperation(ctx, "/api.user.User/FindTagListByGroupNameAndSex")
+		http.SetOperation(ctx, "/api.user.User/FindTagListBySex")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.FindTagListByGroupNameAndSex(ctx, req.(*common.FindTagListByGroupNameAndSex))
+			return srv.FindTagListBySex(ctx, req.(*common.SexReq))
 		})
 		})
 		out, err := h(ctx, &in)
 		out, err := h(ctx, &in)
 		if err != nil {
 		if err != nil {
@@ -478,7 +478,7 @@ type UserHTTPClient interface {
 	FindLikeList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	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)
 	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)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
-	FindTagListByGroupNameAndSex(ctx context.Context, req *common.FindTagListByGroupNameAndSex, opts ...http.CallOption) (rsp *common.TagListReply, 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)
 	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)
 	GetPartnerCircleInfo(ctx context.Context, req *KeyRequest, opts ...http.CallOption) (rsp *common.AddFriendMessageInfo, err error)
 	GetUserInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserInfo, err error)
 	GetUserInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserInfo, err error)
@@ -575,11 +575,11 @@ func (c *UserHTTPClientImpl) FindLookList(ctx context.Context, in *common.ListPa
 	return &out, err
 	return &out, err
 }
 }
 
 
-func (c *UserHTTPClientImpl) FindTagListByGroupNameAndSex(ctx context.Context, in *common.FindTagListByGroupNameAndSex, opts ...http.CallOption) (*common.TagListReply, error) {
+func (c *UserHTTPClientImpl) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*common.TagListReply, error) {
 	var out common.TagListReply
 	var out common.TagListReply
 	pattern := "/api/user/list/tag"
 	pattern := "/api/user/list/tag"
 	path := binding.EncodeURL(pattern, in, false)
 	path := binding.EncodeURL(pattern, in, false)
-	opts = append(opts, http.Operation("/api.user.User/FindTagListByGroupNameAndSex"))
+	opts = append(opts, http.Operation("/api.user.User/FindTagListBySex"))
 	opts = append(opts, http.PathTemplate(pattern))
 	opts = append(opts, http.PathTemplate(pattern))
 	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
 	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
 	if err != nil {
 	if err != nil {

+ 1 - 1
js/api/account/account_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 // @ts-ignore
 import request from '@/libs/request';
 import request from '@/libs/request';
 import {DebugLoginRequest,TokenReply,AuthorizationRequest,RandomNicknameRequest,RandomNicknameReply,RandomAvatarRequest,RandomAvatarReply,OpenIDAndAppIDRequest,IdentityInfo} from "./account_pb";
 import {DebugLoginRequest,TokenReply,AuthorizationRequest,RandomNicknameRequest,RandomNicknameReply,RandomAvatarRequest,RandomAvatarReply,OpenIDAndAppIDRequest,IdentityInfo} from "./account_pb";
-import {FindTagListByGroupNameAndSex,TagListReply,Ids,SexReq,RandomIntroduceReply} from "../common/common_pb";
+import {SexReq,TagListReply,Ids,RandomIntroduceReply} from "../common/common_pb";
 
 
 const AccountService = {
 const AccountService = {
   DebugLogin: async (req?: DebugLoginRequest) => {
   DebugLogin: async (req?: DebugLoginRequest) => {

+ 3 - 9
js/api/common/common_pb.ts

@@ -123,15 +123,7 @@ export interface Ids{
     /**  标签ID */
     /**  标签ID */
     ids?:Array<number>;
     ids?:Array<number>;
 }
 }
-export interface FindTagListByGroupNameAndSex{
-    /**  分组名 */
-    groupName?:string;
-    /**  性别 */
-    sex?:number;
-}
 export interface TagListReply{
 export interface TagListReply{
-    /**  分组名 */
-    name?:string;
     /**  标签列表 */
     /**  标签列表 */
     list?:Array<TagList>;
     list?:Array<TagList>;
 }
 }
@@ -149,7 +141,7 @@ export interface RandomIntroduceReply{
 }
 }
 export interface UpdateInformationRequest{
 export interface UpdateInformationRequest{
     /**  昵称 */
     /**  昵称 */
-    Nickname?:string;
+    nickname?:string;
     /**  头像 */
     /**  头像 */
     avatarUrl?:string;
     avatarUrl?:string;
     /**  性别 */
     /**  性别 */
@@ -160,6 +152,8 @@ export interface UpdateInformationRequest{
     tagList?:Array<number>;
     tagList?:Array<number>;
     /**  介绍语音的链接 */
     /**  介绍语音的链接 */
     introduceVoice?:string;
     introduceVoice?:string;
+    /**  介绍(签名) */
+    signature?:string;
     /**  相册(主页图片) */
     /**  相册(主页图片) */
     pictures?:Array<string>;
     pictures?:Array<string>;
     /**  省 */
     /**  省 */

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

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

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

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