wfz 3 年之前
父節點
當前提交
00fb681e63
共有 3 個文件被更改,包括 30 次插入42 次删除
  1. 24 33
      api/partner/partner.pb.go
  2. 3 4
      api/partner/partner.proto
  3. 3 5
      js/api/partner/partner_pb.ts

+ 24 - 33
api/partner/partner.pb.go

@@ -32,7 +32,7 @@ type PartnerCircleInfo struct {
 	Nickname  string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`   // 昵称
 	AvatarUrl string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像链接
 	Sex       int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`            // 性别
-	Picture   []string `protobuf:"bytes,5,rep,name=picture,proto3" json:"picture"`     // 图片
+	Pictures  []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`   // 图片
 }
 
 func (x *PartnerCircleInfo) Reset() {
@@ -95,9 +95,9 @@ func (x *PartnerCircleInfo) GetSex() int64 {
 	return 0
 }
 
-func (x *PartnerCircleInfo) GetPicture() []string {
+func (x *PartnerCircleInfo) GetPictures() []string {
 	if x != nil {
-		return x.Picture
+		return x.Pictures
 	}
 	return nil
 }
@@ -107,12 +107,11 @@ type PartnerInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id        string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`               // id
-	Nickname  string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`   // 昵称
-	AvatarUrl string `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像链接
-	Phone     string `protobuf:"bytes,4,opt,name=phone,proto3" json:"phone"`         // 手机号
-	Sex       int64  `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"`            // 性别
-	Credit    int64  `protobuf:"varint,6,opt,name=credit,proto3" json:"credit"`      // 积分
+	Id        string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id"`               // id
+	Nickname  string   `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname"`   // 昵称
+	AvatarUrl string   `protobuf:"bytes,3,opt,name=avatarUrl,proto3" json:"avatarUrl"` // 头像链接
+	Sex       int64    `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"`            // 性别
+	Pictures  []string `protobuf:"bytes,5,rep,name=pictures,proto3" json:"pictures"`   // 图片
 }
 
 func (x *PartnerInfo) Reset() {
@@ -168,13 +167,6 @@ func (x *PartnerInfo) GetAvatarUrl() string {
 	return ""
 }
 
-func (x *PartnerInfo) GetPhone() string {
-	if x != nil {
-		return x.Phone
-	}
-	return ""
-}
-
 func (x *PartnerInfo) GetSex() int64 {
 	if x != nil {
 		return x.Sex
@@ -182,11 +174,11 @@ func (x *PartnerInfo) GetSex() int64 {
 	return 0
 }
 
-func (x *PartnerInfo) GetCredit() int64 {
+func (x *PartnerInfo) GetPictures() []string {
 	if x != nil {
-		return x.Credit
+		return x.Pictures
 	}
-	return 0
+	return nil
 }
 
 var File_partner_proto protoreflect.FileDescriptor
@@ -198,26 +190,25 @@ var file_partner_proto_rawDesc = []byte{
 	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74,
 	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x62, 0x61, 0x73,
-	0x65, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89, 0x01, 0x0a,
+	0x65, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8b, 0x01, 0x0a,
 	0x11, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e,
 	0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
 	0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c,
 	0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03,
-	0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x18,
-	0x0a, 0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x07, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x22, 0x97, 0x01, 0x0a, 0x0b, 0x50, 0x61, 0x72,
-	0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72,
-	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55,
-	0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72,
-	0x65, 0x64, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x64,
-	0x69, 0x74, 0x32, 0xe2, 0x01, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12, 0x60,
+	0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a,
+	0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x85, 0x01, 0x0a, 0x0b, 0x50,
+	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69,
+	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69,
+	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
+	0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
+	0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72,
+	0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72,
+	0x65, 0x73, 0x32, 0xe2, 0x01, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12, 0x60,
 	0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
 	0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
 	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70,

+ 3 - 4
api/partner/partner.proto

@@ -31,14 +31,13 @@ message PartnerCircleInfo{
   string nickname = 2;// 昵称
   string avatarUrl =3;// 头像链接
   int64 sex = 4;// 性别
-  repeated string picture = 5; // 图片
+  repeated string pictures = 5; // 图片
 }
 
 message PartnerInfo{
   string id = 1; // id
   string nickname = 2;// 昵称
   string avatarUrl =3;// 头像链接
-  string phone = 4;// 手机号
-  int64 sex = 5;// 性别
-  int64 credit = 6;// 积分
+  int64 sex = 4;// 性别
+  repeated string pictures = 5; // 图片
 }

+ 3 - 5
js/api/partner/partner_pb.ts

@@ -8,7 +8,7 @@ export interface PartnerCircleInfo{
     /**  性别 */
     sex?:number;
     /**  图片 */
-    picture?:Array<string>;
+    pictures?:Array<string>;
 }
 export interface PartnerInfo{
     /**  id */
@@ -17,11 +17,9 @@ export interface PartnerInfo{
     nickname?:string;
     /**  头像链接 */
     avatarUrl?:string;
-    /**  手机号 */
-    phone?:string;
     /**  性别 */
     sex?:number;
-    /**  积分 */
-    credit?:number;
+    /**  图片 */
+    pictures?:Array<string>;
 }