From 4922436eb78c6e6735c7fb6ce4920c67a449cbf0 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期一, 13 七月 2020 18:19:18 +0800 Subject: [PATCH] add operator_type --- aiocean.pb.go | 611 ++++++++++++++++++++++++++----------------------------- 1 files changed, 291 insertions(+), 320 deletions(-) diff --git a/aiocean.pb.go b/aiocean.pb.go index a5af9b3..c252110 100644 --- a/aiocean.pb.go +++ b/aiocean.pb.go @@ -35,7 +35,7 @@ TaskId string `protobuf:"bytes,9,opt,name=taskId,proto3" json:"taskId,omitempty"` TaskName string `protobuf:"bytes,10,opt,name=taskName,proto3" json:"taskName,omitempty"` SdkName string `protobuf:"bytes,11,opt,name=sdkName,proto3" json:"sdkName,omitempty"` - PicMaxUrl string `protobuf:"bytes,12,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"` + PicMaxUrl []string `protobuf:"bytes,12,rep,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"` VideoUrl string `protobuf:"bytes,13,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"` PicDate string `protobuf:"bytes,14,opt,name=picDate,proto3" json:"picDate,omitempty"` TargetInfo []*TargetInfo `protobuf:"bytes,15,rep,name=targetInfo,proto3" json:"targetInfo,omitempty"` @@ -161,11 +161,11 @@ return "" } -func (m *EsDataBase) GetPicMaxUrl() string { +func (m *EsDataBase) GetPicMaxUrl() []string { if m != nil { return m.PicMaxUrl } - return "" + return nil } func (m *EsDataBase) GetVideoUrl() string { @@ -271,7 +271,7 @@ TaskId string `protobuf:"bytes,9,opt,name=taskId,proto3" json:"taskId,omitempty"` TaskName string `protobuf:"bytes,10,opt,name=taskName,proto3" json:"taskName,omitempty"` SdkName string `protobuf:"bytes,11,opt,name=sdkName,proto3" json:"sdkName,omitempty"` - PicMaxUrl string `protobuf:"bytes,12,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"` + PicMaxUrl []string `protobuf:"bytes,12,rep,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"` VideoUrl string `protobuf:"bytes,13,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"` PicDate string `protobuf:"bytes,14,opt,name=picDate,proto3" json:"picDate,omitempty"` TargetInfo []*TargetInfo `protobuf:"bytes,15,rep,name=targetInfo,proto3" json:"targetInfo,omitempty"` @@ -399,11 +399,11 @@ return "" } -func (m *AIOcean) GetPicMaxUrl() string { +func (m *AIOcean) GetPicMaxUrl() []string { if m != nil { return m.PicMaxUrl } - return "" + return nil } func (m *AIOcean) GetVideoUrl() string { @@ -513,10 +513,11 @@ type TargetInfo struct { TargetId string `protobuf:"bytes,1,opt,name=targetId,proto3" json:"targetId,omitempty"` - TargetScore float32 `protobuf:"fixed32,2,opt,name=targetScore,proto3" json:"targetScore,omitempty"` - Feature string `protobuf:"bytes,3,opt,name=feature,proto3" json:"feature,omitempty"` - PicSmUrl string `protobuf:"bytes,4,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"` - TargetLocation *TargetLocation `protobuf:"bytes,5,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"` + TargetType string `protobuf:"bytes,2,opt,name=targetType,proto3" json:"targetType,omitempty"` + TargetScore float64 `protobuf:"fixed64,3,opt,name=targetScore,proto3" json:"targetScore,omitempty"` + Feature string `protobuf:"bytes,4,opt,name=feature,proto3" json:"feature,omitempty"` + PicSmUrl string `protobuf:"bytes,5,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"` + TargetLocation *TargetLocation `protobuf:"bytes,6,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"` } func (m *TargetInfo) Reset() { *m = TargetInfo{} } @@ -559,7 +560,14 @@ return "" } -func (m *TargetInfo) GetTargetScore() float32 { +func (m *TargetInfo) GetTargetType() string { + if m != nil { + return m.TargetType + } + return "" +} + +func (m *TargetInfo) GetTargetScore() float64 { if m != nil { return m.TargetScore } @@ -640,8 +648,8 @@ } type Location struct { - X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"` - Y float32 `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"` + X float64 `protobuf:"fixed64,1,opt,name=x,proto3" json:"x,omitempty"` + Y float64 `protobuf:"fixed64,2,opt,name=y,proto3" json:"y,omitempty"` } func (m *Location) Reset() { *m = Location{} } @@ -677,14 +685,14 @@ var xxx_messageInfo_Location proto.InternalMessageInfo -func (m *Location) GetX() float32 { +func (m *Location) GetX() float64 { if m != nil { return m.X } return 0 } -func (m *Location) GetY() float32 { +func (m *Location) GetY() float64 { if m != nil { return m.Y } @@ -778,16 +786,14 @@ type BaseInfo struct { TableId string `protobuf:"bytes,1,opt,name=tableId,proto3" json:"tableId,omitempty"` TableName string `protobuf:"bytes,2,opt,name=tableName,proto3" json:"tableName,omitempty"` - CompareScore float32 `protobuf:"fixed32,3,opt,name=compareScore,proto3" json:"compareScore,omitempty"` - PersonId string `protobuf:"bytes,4,opt,name=personId,proto3" json:"personId,omitempty"` - PersonName string `protobuf:"bytes,5,opt,name=personName,proto3" json:"personName,omitempty"` - PersonPicUrl string `protobuf:"bytes,6,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"` - PhoneNum string `protobuf:"bytes,7,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"` - Sex string `protobuf:"bytes,8,opt,name=sex,proto3" json:"sex,omitempty"` - IdCard string `protobuf:"bytes,9,opt,name=idCard,proto3" json:"idCard,omitempty"` - MonitorLevel string `protobuf:"bytes,10,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"` - Content string `protobuf:"bytes,11,opt,name=content,proto3" json:"content,omitempty"` - BwType string `protobuf:"bytes,12,opt,name=bwType,proto3" json:"bwType,omitempty"` + CompareScore float64 `protobuf:"fixed64,3,opt,name=compareScore,proto3" json:"compareScore,omitempty"` + BwType string `protobuf:"bytes,4,opt,name=bwType,proto3" json:"bwType,omitempty"` + TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId,omitempty"` + TargetName string `protobuf:"bytes,6,opt,name=targetName,proto3" json:"targetName,omitempty"` + TargetPicUrl string `protobuf:"bytes,7,opt,name=targetPicUrl,proto3" json:"targetPicUrl,omitempty"` + MonitorLevel string `protobuf:"bytes,8,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"` + Labels string `protobuf:"bytes,9,opt,name=labels,proto3" json:"labels,omitempty"` + Content string `protobuf:"bytes,10,opt,name=content,proto3" json:"content,omitempty"` } func (m *BaseInfo) Reset() { *m = BaseInfo{} } @@ -837,51 +843,37 @@ return "" } -func (m *BaseInfo) GetCompareScore() float32 { +func (m *BaseInfo) GetCompareScore() float64 { if m != nil { return m.CompareScore } return 0 } -func (m *BaseInfo) GetPersonId() string { +func (m *BaseInfo) GetBwType() string { if m != nil { - return m.PersonId + return m.BwType } return "" } -func (m *BaseInfo) GetPersonName() string { +func (m *BaseInfo) GetTargetId() string { if m != nil { - return m.PersonName + return m.TargetId } return "" } -func (m *BaseInfo) GetPersonPicUrl() string { +func (m *BaseInfo) GetTargetName() string { if m != nil { - return m.PersonPicUrl + return m.TargetName } return "" } -func (m *BaseInfo) GetPhoneNum() string { +func (m *BaseInfo) GetTargetPicUrl() string { if m != nil { - return m.PhoneNum - } - return "" -} - -func (m *BaseInfo) GetSex() string { - if m != nil { - return m.Sex - } - return "" -} - -func (m *BaseInfo) GetIdCard() string { - if m != nil { - return m.IdCard + return m.TargetPicUrl } return "" } @@ -893,16 +885,16 @@ return "" } -func (m *BaseInfo) GetContent() string { +func (m *BaseInfo) GetLabels() string { if m != nil { - return m.Content + return m.Labels } return "" } -func (m *BaseInfo) GetBwType() string { +func (m *BaseInfo) GetContent() string { if m != nil { - return m.BwType + return m.Content } return "" } @@ -920,61 +912,60 @@ func init() { proto.RegisterFile("aiocean.proto", fileDescriptor_e7fb370e860fe148) } var fileDescriptor_e7fb370e860fe148 = []byte{ - // 856 bytes of a gzipped FileDescriptorProto + // 835 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0xce, 0x38, 0x8b, 0xed, 0xb4, 0x93, 0xec, 0xd2, 0x2c, 0xa1, 0x59, 0x90, 0x15, 0x59, 0x08, - 0xe5, 0x80, 0x72, 0x58, 0x56, 0x9c, 0x71, 0x36, 0x1c, 0x2c, 0x99, 0x05, 0x4d, 0xc2, 0x03, 0xb4, - 0x67, 0x2a, 0x4e, 0xcb, 0x33, 0xd3, 0xa3, 0xee, 0x76, 0xd6, 0x79, 0x00, 0xee, 0x3c, 0x0d, 0x07, - 0x8e, 0x9c, 0x38, 0xe6, 0xc8, 0x11, 0x39, 0x2f, 0x82, 0xaa, 0xba, 0xe7, 0xcf, 0x70, 0xd8, 0x07, - 0xc8, 0xc9, 0xfd, 0x7d, 0x55, 0xae, 0xae, 0xae, 0xaa, 0xaf, 0x86, 0x1d, 0x49, 0xa5, 0x13, 0x90, - 0xc5, 0x79, 0x69, 0xb4, 0xd3, 0x7c, 0x48, 0x3f, 0xb9, 0x5d, 0x4e, 0x7e, 0xef, 0x33, 0xf6, 0x83, - 0xbd, 0x94, 0x4e, 0x5e, 0x48, 0x0b, 0xfc, 0x98, 0xf5, 0x54, 0x2a, 0xa2, 0xd3, 0xe8, 0xec, 0x20, - 0xee, 0xa9, 0x94, 0xbf, 0x62, 0xc3, 0x44, 0xe6, 0x60, 0xe4, 0x2c, 0x15, 0x3d, 0x62, 0x6b, 0xcc, - 0xc7, 0x8c, 0xf9, 0xf3, 0x3b, 0x99, 0x83, 0xd8, 0x27, 0x6b, 0x8b, 0x69, 0xec, 0xd3, 0x34, 0x35, - 0xe2, 0x59, 0xdb, 0x8e, 0x0c, 0xff, 0x8a, 0x1d, 0xc9, 0x42, 0x66, 0xf7, 0x57, 0x60, 0xee, 0xc0, - 0xcc, 0x52, 0xf1, 0x11, 0xb9, 0x74, 0x49, 0x7e, 0xc6, 0x9e, 0xb7, 0x08, 0xba, 0xaa, 0x4f, 0x7e, - 0xbb, 0xf4, 0x6e, 0xbc, 0x52, 0x0c, 0xfe, 0x1b, 0xaf, 0xe4, 0x5f, 0xb2, 0x83, 0x24, 0x5b, 0x5b, - 0x47, 0x37, 0x0e, 0xc9, 0xa3, 0x21, 0xf8, 0x09, 0xeb, 0x3b, 0x69, 0x57, 0xb3, 0x54, 0x1c, 0x90, - 0x29, 0x20, 0xac, 0x03, 0x9e, 0xe8, 0x7a, 0xe6, 0xeb, 0x50, 0x61, 0x2e, 0xd8, 0xc0, 0xa6, 0xde, - 0x34, 0x22, 0x53, 0x05, 0xf1, 0xae, 0x52, 0x25, 0x3f, 0xca, 0xcd, 0x2f, 0x26, 0x13, 0x87, 0xfe, - 0xae, 0x9a, 0xc0, 0x98, 0x77, 0x2a, 0x05, 0x8d, 0xc6, 0x23, 0x1f, 0xb3, 0xc2, 0x18, 0xb3, 0x54, - 0xc9, 0xa5, 0x74, 0x20, 0x8e, 0x7d, 0xcc, 0x00, 0xf9, 0x1b, 0xc6, 0x9c, 0x34, 0x4b, 0x70, 0xb3, - 0xe2, 0x46, 0x8b, 0xe7, 0xa7, 0xfb, 0x67, 0xa3, 0xd7, 0x2f, 0xcf, 0xab, 0x7e, 0x9e, 0x5f, 0xd7, - 0xb6, 0xb8, 0xe5, 0xc7, 0x4f, 0xd9, 0x48, 0xbb, 0x5b, 0x30, 0x73, 0xb9, 0x80, 0xcc, 0x8a, 0x17, - 0x14, 0xb3, 0x4d, 0x61, 0xb7, 0xec, 0xad, 0x7e, 0x1f, 0x1c, 0x3e, 0xf6, 0xdd, 0x6a, 0x18, 0xcc, - 0x36, 0x53, 0x2b, 0xa0, 0x94, 0xb8, 0xcf, 0xb6, 0xc2, 0xfc, 0x9c, 0x0d, 0x17, 0xd2, 0x02, 0x65, - 0xf4, 0x09, 0x65, 0xc4, 0x9b, 0x8c, 0x2e, 0x82, 0x25, 0xae, 0x7d, 0xf0, 0x75, 0xca, 0x4e, 0x33, - 0x69, 0x72, 0xf1, 0xf2, 0x34, 0x3a, 0x1b, 0xc6, 0x15, 0xc4, 0x2c, 0x94, 0x9d, 0x26, 0x2b, 0x6f, - 0xfc, 0x94, 0x8c, 0x2d, 0x06, 0x5f, 0x2f, 0xf1, 0x10, 0xaf, 0x33, 0xb0, 0xe2, 0x64, 0xf7, 0xf5, - 0xd3, 0xda, 0x16, 0xb7, 0xfc, 0xb0, 0x0f, 0xca, 0xbe, 0xd5, 0x59, 0x06, 0x89, 0x13, 0x9f, 0x51, - 0xd0, 0x86, 0xc0, 0x97, 0x29, 0x7b, 0x09, 0x19, 0x38, 0x10, 0x82, 0x8c, 0x35, 0xc6, 0x4c, 0x13, - 0x5d, 0x38, 0x28, 0x9c, 0xf8, 0xdc, 0xf7, 0x21, 0xc0, 0xc9, 0xaf, 0x03, 0x36, 0x98, 0xce, 0x7e, - 0x42, 0x51, 0x3d, 0xa9, 0xe6, 0x49, 0x35, 0x4f, 0xaa, 0xf9, 0x10, 0xd5, 0xa0, 0x25, 0x53, 0xc5, - 0xea, 0x5a, 0x2e, 0xc5, 0x2b, 0x6f, 0x09, 0x90, 0x7f, 0xc7, 0x46, 0xe1, 0x48, 0x05, 0xf9, 0x62, - 0x37, 0xc9, 0xe6, 0x23, 0x15, 0xb7, 0x1d, 0x27, 0x7f, 0x46, 0x8c, 0x35, 0xed, 0xf3, 0x23, 0x47, - 0xa8, 0x12, 0x64, 0x8d, 0xb1, 0x9d, 0xfe, 0x7c, 0x95, 0x68, 0x03, 0xa4, 0xcc, 0x5e, 0xdc, 0xa6, - 0x30, 0xbd, 0x1b, 0x90, 0x6e, 0x6d, 0x2a, 0x65, 0x56, 0x10, 0xe3, 0x96, 0x2a, 0xb9, 0xca, 0x71, - 0xec, 0xbc, 0x28, 0x6b, 0xcc, 0xbf, 0x67, 0xc7, 0x3e, 0xc8, 0x5c, 0x27, 0xd2, 0x29, 0x5d, 0x90, - 0x26, 0x47, 0xaf, 0xc5, 0xee, 0x80, 0x55, 0xf6, 0x78, 0xc7, 0x7f, 0xe2, 0xd8, 0x71, 0xd7, 0x83, - 0x7f, 0xc3, 0x06, 0x4e, 0x97, 0x73, 0xb8, 0x71, 0xf4, 0x8c, 0xce, 0x6c, 0xd4, 0x61, 0x2a, 0x17, - 0xfe, 0x86, 0x8d, 0x16, 0xda, 0x39, 0x9d, 0xc7, 0x6a, 0x79, 0xeb, 0xe8, 0x65, 0xff, 0xff, 0x8f, - 0xb6, 0xdb, 0xe4, 0x6b, 0x36, 0xac, 0xef, 0x3b, 0x64, 0xd1, 0x86, 0x6e, 0xea, 0xc5, 0xd1, 0x06, - 0xd1, 0x7d, 0xa8, 0x4f, 0x74, 0x3f, 0xf9, 0x23, 0x62, 0xac, 0x99, 0x11, 0x2c, 0xd2, 0xd2, 0xe8, - 0x75, 0x59, 0x57, 0xb8, 0x82, 0x38, 0x87, 0x34, 0x3f, 0x73, 0xb8, 0x83, 0x2c, 0x6c, 0xbe, 0x16, - 0x83, 0x45, 0x34, 0xeb, 0x0c, 0xae, 0x61, 0xe3, 0x42, 0x7d, 0x6b, 0xcc, 0x27, 0xec, 0x30, 0x85, - 0x1b, 0x28, 0x12, 0xb8, 0x72, 0xa8, 0x96, 0x67, 0x34, 0x53, 0x1d, 0x0e, 0xf7, 0x8c, 0xb2, 0x73, - 0x55, 0xac, 0xa8, 0xc0, 0xc3, 0x38, 0x20, 0xaf, 0xb2, 0x62, 0x45, 0x83, 0xd3, 0xaf, 0x54, 0xe6, - 0xf1, 0x64, 0xdb, 0x63, 0xc3, 0x8b, 0x96, 0x84, 0x9c, 0x5c, 0x64, 0xd0, 0xa4, 0x1e, 0x20, 0x0e, - 0x3b, 0x1d, 0x69, 0x21, 0xf9, 0xcc, 0x1b, 0x02, 0x93, 0x4b, 0x74, 0x5e, 0x4a, 0x03, 0x7e, 0x74, - 0xf6, 0xa9, 0x34, 0x1d, 0x8e, 0x26, 0x04, 0x8c, 0xd5, 0xc5, 0x2c, 0xad, 0x27, 0x24, 0x60, 0x2c, - 0x8c, 0x3f, 0x53, 0x78, 0xbf, 0xb1, 0x5b, 0x0c, 0xc6, 0xf7, 0xe8, 0x67, 0x95, 0xe0, 0x84, 0xf9, - 0x47, 0x74, 0x38, 0x8a, 0x7f, 0xab, 0x0b, 0x78, 0xb7, 0xce, 0xc3, 0x8e, 0xae, 0x31, 0x7f, 0xc1, - 0xf6, 0x2d, 0x6c, 0xc2, 0x62, 0xc6, 0x23, 0x95, 0x2a, 0x7d, 0x2b, 0x4d, 0xbd, 0x92, 0x3d, 0xc2, - 0x9b, 0x72, 0x5d, 0x28, 0xa7, 0x8d, 0x6f, 0x92, 0x5f, 0xcb, 0x1d, 0xae, 0x2d, 0xdf, 0x51, 0x57, - 0xbe, 0x27, 0xac, 0xbf, 0x78, 0x7f, 0x7d, 0x5f, 0x42, 0xd8, 0xcb, 0x01, 0x5d, 0x88, 0xbf, 0xb6, - 0xe3, 0xe8, 0x61, 0x3b, 0x8e, 0xfe, 0xd9, 0x8e, 0xa3, 0xdf, 0x1e, 0xc7, 0x7b, 0x0f, 0x8f, 0xe3, - 0xbd, 0xbf, 0x1f, 0xc7, 0x7b, 0x8b, 0x3e, 0xcd, 0xe0, 0xb7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, - 0x71, 0x1f, 0x4d, 0x70, 0x81, 0x0a, 0x00, 0x00, + 0x10, 0xce, 0x24, 0xbb, 0xb6, 0x53, 0x4e, 0xb2, 0xd0, 0x2c, 0x4b, 0xb3, 0x20, 0xcb, 0x1a, 0x21, + 0x94, 0x03, 0xca, 0x61, 0x59, 0x71, 0xc6, 0x21, 0x1c, 0x2c, 0x99, 0x1f, 0x4d, 0xc2, 0x03, 0xb4, + 0x67, 0x2a, 0x4e, 0xcb, 0x33, 0xd3, 0xa3, 0x99, 0x76, 0x36, 0x79, 0x00, 0xee, 0x3c, 0x0c, 0xe2, + 0xc0, 0x13, 0x70, 0xcc, 0x91, 0x23, 0x72, 0x5e, 0x04, 0x55, 0xf5, 0xfc, 0xf4, 0x18, 0x90, 0x78, + 0x80, 0x9c, 0xdc, 0xdf, 0x57, 0xe5, 0xaa, 0xea, 0xae, 0xfa, 0x6a, 0xe0, 0x58, 0x69, 0x13, 0xa3, + 0xca, 0xcf, 0x8a, 0xd2, 0x58, 0x23, 0x46, 0xfc, 0x93, 0x55, 0xab, 0xf0, 0xb7, 0x01, 0xc0, 0xb7, + 0xd5, 0x85, 0xb2, 0xea, 0x5c, 0x55, 0x28, 0x4e, 0x60, 0x5f, 0x27, 0x32, 0x98, 0x06, 0xa7, 0x87, + 0xd1, 0xbe, 0x4e, 0xc4, 0x6b, 0x18, 0xc5, 0x2a, 0xc3, 0x52, 0xcd, 0x13, 0xb9, 0xcf, 0x6c, 0x8b, + 0xc5, 0x04, 0xc0, 0x9d, 0xbf, 0x57, 0x19, 0xca, 0x03, 0xb6, 0x7a, 0x4c, 0x67, 0x9f, 0x25, 0x49, + 0x29, 0x9f, 0xf9, 0x76, 0x62, 0xc4, 0x67, 0x70, 0xac, 0x72, 0x95, 0xde, 0x5f, 0x62, 0x79, 0x8b, + 0xe5, 0x3c, 0x91, 0xcf, 0xd9, 0xa5, 0x4f, 0x8a, 0x53, 0x78, 0xe1, 0x11, 0x9c, 0x6a, 0xc0, 0x7e, + 0xbb, 0xf4, 0x6e, 0xbc, 0x42, 0x0e, 0xff, 0x19, 0xaf, 0x10, 0x9f, 0xc2, 0x61, 0x9c, 0x6e, 0x2a, + 0xcb, 0x19, 0x47, 0xec, 0xd1, 0x11, 0xe2, 0x15, 0x0c, 0xac, 0xaa, 0xd6, 0xf3, 0x44, 0x1e, 0xb2, + 0xa9, 0x46, 0xf4, 0x0e, 0x74, 0xe2, 0xf4, 0xe0, 0xde, 0xa1, 0xc1, 0x42, 0xc2, 0xb0, 0x4a, 0x9c, + 0x69, 0xcc, 0xa6, 0x06, 0x52, 0xae, 0x42, 0xc7, 0xdf, 0xa9, 0xbb, 0x9f, 0xca, 0x54, 0x1e, 0x4d, + 0x0f, 0x28, 0x57, 0x4b, 0x50, 0xcc, 0x5b, 0x9d, 0xa0, 0x21, 0xe3, 0xb1, 0x8b, 0xd9, 0x60, 0x8a, + 0x59, 0xe8, 0xf8, 0x42, 0x59, 0x94, 0x27, 0x2e, 0x66, 0x0d, 0xc5, 0x5b, 0x00, 0xab, 0xca, 0x15, + 0xda, 0x79, 0x7e, 0x6d, 0xe4, 0x8b, 0xe9, 0xc1, 0xe9, 0xf8, 0xcd, 0xcb, 0xb3, 0xa6, 0x9f, 0x67, + 0x57, 0xad, 0x2d, 0xf2, 0xfc, 0xc4, 0x14, 0xc6, 0xc6, 0xde, 0x60, 0xb9, 0x50, 0x4b, 0x4c, 0x2b, + 0xf9, 0x1e, 0xc7, 0xf4, 0x29, 0xea, 0x56, 0x75, 0x63, 0xde, 0xd5, 0x0e, 0xef, 0xbb, 0x6e, 0x75, + 0x0c, 0x55, 0x9b, 0xea, 0x35, 0x72, 0x49, 0xc2, 0x55, 0xdb, 0x60, 0x71, 0x06, 0xa3, 0xa5, 0xaa, + 0x90, 0x2b, 0xfa, 0x80, 0x2b, 0x12, 0x5d, 0x45, 0xe7, 0xb5, 0x25, 0x6a, 0x7d, 0xe8, 0x76, 0xba, + 0x9a, 0xa5, 0xaa, 0xcc, 0xe4, 0xcb, 0x69, 0x70, 0x3a, 0x8a, 0x1a, 0x48, 0x55, 0xe8, 0x6a, 0x16, + 0xaf, 0x9d, 0xf1, 0x43, 0x36, 0x7a, 0x0c, 0xdd, 0x5e, 0xd1, 0x21, 0xda, 0xa4, 0x58, 0xc9, 0x57, + 0xbb, 0xb7, 0x9f, 0xb5, 0xb6, 0xc8, 0xf3, 0xa3, 0x3e, 0xe8, 0xea, 0x1b, 0x93, 0xa6, 0x18, 0x5b, + 0xf9, 0x11, 0x07, 0xed, 0x08, 0xba, 0x99, 0xae, 0x2e, 0x30, 0x45, 0x8b, 0x52, 0xb2, 0xb1, 0xc5, + 0x54, 0x69, 0x6c, 0x72, 0x8b, 0xb9, 0x95, 0x1f, 0xbb, 0x3e, 0xd4, 0x30, 0xfc, 0x79, 0x08, 0xc3, + 0xd9, 0xfc, 0x07, 0x12, 0xd5, 0x93, 0x6a, 0x9e, 0x54, 0xf3, 0xa4, 0x9a, 0xff, 0xa3, 0x1a, 0xb2, + 0xa4, 0x3a, 0x5f, 0x5f, 0xa9, 0x95, 0x7c, 0xed, 0x2c, 0x35, 0x14, 0x5f, 0xc1, 0xb8, 0x3e, 0xf2, + 0x83, 0x7c, 0xb2, 0x5b, 0x64, 0xf7, 0x91, 0x8a, 0x7c, 0xc7, 0x70, 0x1b, 0x00, 0x74, 0xed, 0x73, + 0x23, 0xc7, 0xa8, 0x11, 0x64, 0x8b, 0xe9, 0x99, 0xdc, 0xf9, 0xea, 0xbe, 0xc0, 0x5a, 0x98, 0x1e, + 0x43, 0xed, 0x76, 0xe8, 0x32, 0x36, 0xa5, 0xd3, 0x66, 0x10, 0xf9, 0x14, 0x95, 0x7f, 0x8d, 0xca, + 0x6e, 0x4a, 0xac, 0x95, 0xd9, 0x40, 0xca, 0x5b, 0xe8, 0xf8, 0x32, 0xa3, 0xb1, 0x74, 0x8a, 0x6c, + 0xb1, 0xf8, 0x1a, 0x4e, 0x5c, 0x90, 0x85, 0x89, 0x95, 0xd5, 0x26, 0x67, 0x2d, 0x8e, 0xdf, 0xc8, + 0xdd, 0x01, 0x6c, 0xec, 0xd1, 0x8e, 0x7f, 0x68, 0xe1, 0xa4, 0xef, 0x21, 0xbe, 0x80, 0xa1, 0x35, + 0xc5, 0x02, 0xaf, 0x2d, 0x5f, 0xb3, 0x37, 0x3b, 0x6d, 0x98, 0xc6, 0x45, 0xbc, 0x85, 0xf1, 0xd2, + 0x58, 0x6b, 0xb2, 0x48, 0xaf, 0x6e, 0x2c, 0x5f, 0xfd, 0xdf, 0xff, 0xe1, 0xbb, 0x85, 0x9f, 0xc3, + 0xa8, 0xcd, 0x77, 0x04, 0xc1, 0x1d, 0x67, 0x0a, 0xa2, 0xe0, 0x8e, 0xd0, 0x3d, 0x47, 0x09, 0xa2, + 0xe0, 0x3e, 0xfc, 0x3d, 0x00, 0xe8, 0x66, 0x88, 0x1e, 0x69, 0x55, 0x9a, 0x4d, 0xd1, 0x76, 0xa0, + 0x81, 0xd4, 0x00, 0x9e, 0xaf, 0x05, 0xde, 0x62, 0xda, 0x34, 0xa0, 0x63, 0xe8, 0x11, 0xcb, 0x4d, + 0x8a, 0x57, 0x78, 0x67, 0xeb, 0xcd, 0xd8, 0x62, 0x11, 0xc2, 0x51, 0x82, 0xd7, 0x98, 0xc7, 0x78, + 0x69, 0x49, 0x4d, 0xcf, 0x78, 0xe6, 0x7a, 0x1c, 0xed, 0x21, 0x5d, 0x2d, 0x74, 0xbe, 0xe6, 0x16, + 0x8c, 0xa2, 0x1a, 0x39, 0x15, 0xe6, 0x6b, 0x1e, 0xac, 0x41, 0xa3, 0x42, 0x87, 0xc3, 0x5f, 0xf7, + 0x61, 0x74, 0xee, 0x49, 0xcc, 0xaa, 0x65, 0x8a, 0x5d, 0xe9, 0x35, 0x24, 0x31, 0xf0, 0x91, 0x17, + 0x96, 0xab, 0xbc, 0x23, 0xa8, 0xb8, 0xd8, 0x64, 0x85, 0x2a, 0xd1, 0x1f, 0x9d, 0x1e, 0x47, 0xc5, + 0x2d, 0xdf, 0xf1, 0xe4, 0xb9, 0xd1, 0xa9, 0x51, 0x6f, 0x62, 0x9f, 0xff, 0xd7, 0xc4, 0x7a, 0x1b, + 0xdc, 0x63, 0x28, 0xaf, 0x43, 0x3f, 0xea, 0x98, 0x26, 0xcf, 0xed, 0xee, 0x1e, 0x47, 0x3e, 0x99, + 0xc9, 0xb5, 0x35, 0xa5, 0x7b, 0x76, 0xb7, 0xbd, 0x7b, 0x1c, 0xd5, 0x96, 0xba, 0x15, 0x56, 0x2f, + 0x70, 0x87, 0x7c, 0x21, 0x43, 0x4f, 0xc8, 0xe7, 0xf2, 0x8f, 0xed, 0x24, 0x78, 0xd8, 0x4e, 0x82, + 0xbf, 0xb6, 0x93, 0xe0, 0x97, 0xc7, 0xc9, 0xde, 0xc3, 0xe3, 0x64, 0xef, 0xcf, 0xc7, 0xc9, 0xde, + 0x72, 0xc0, 0x53, 0xf5, 0xe5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x91, 0xae, 0xe0, 0x73, + 0x0a, 0x00, 0x00, } func (m *EsDataBase) Marshal() (dAtA []byte, err error) { @@ -1059,10 +1050,19 @@ i += copy(dAtA[i:], m.SdkName) } if len(m.PicMaxUrl) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicMaxUrl))) - i += copy(dAtA[i:], m.PicMaxUrl) + for _, s := range m.PicMaxUrl { + dAtA[i] = 0x62 + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } } if len(m.VideoUrl) > 0 { dAtA[i] = 0x6a @@ -1281,10 +1281,19 @@ i += copy(dAtA[i:], m.SdkName) } if len(m.PicMaxUrl) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicMaxUrl))) - i += copy(dAtA[i:], m.PicMaxUrl) + for _, s := range m.PicMaxUrl { + dAtA[i] = 0x62 + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } } if len(m.VideoUrl) > 0 { dAtA[i] = 0x6a @@ -1464,26 +1473,32 @@ i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetId))) i += copy(dAtA[i:], m.TargetId) } - if m.TargetScore != 0 { - dAtA[i] = 0x15 + if len(m.TargetType) > 0 { + dAtA[i] = 0x12 i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.TargetScore)))) - i += 4 + i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetType))) + i += copy(dAtA[i:], m.TargetType) + } + if m.TargetScore != 0 { + dAtA[i] = 0x19 + i++ + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.TargetScore)))) + i += 8 } if len(m.Feature) > 0 { - dAtA[i] = 0x1a + dAtA[i] = 0x22 i++ i = encodeVarintAiocean(dAtA, i, uint64(len(m.Feature))) i += copy(dAtA[i:], m.Feature) } if len(m.PicSmUrl) > 0 { - dAtA[i] = 0x22 + dAtA[i] = 0x2a i++ i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicSmUrl))) i += copy(dAtA[i:], m.PicSmUrl) } if m.TargetLocation != nil { - dAtA[i] = 0x2a + dAtA[i] = 0x32 i++ i = encodeVarintAiocean(dAtA, i, uint64(m.TargetLocation.Size())) n1, err1 := m.TargetLocation.MarshalTo(dAtA[i:]) @@ -1549,16 +1564,16 @@ var l int _ = l if m.X != 0 { - dAtA[i] = 0xd + dAtA[i] = 0x9 i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.X)))) - i += 4 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.X)))) + i += 8 } if m.Y != 0 { - dAtA[i] = 0x15 + dAtA[i] = 0x11 i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Y)))) - i += 4 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Y)))) + i += 8 } return i, nil } @@ -1653,64 +1668,52 @@ i += copy(dAtA[i:], m.TableName) } if m.CompareScore != 0 { - dAtA[i] = 0x1d + dAtA[i] = 0x19 i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore)))) - i += 4 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CompareScore)))) + i += 8 } - if len(m.PersonId) > 0 { + if len(m.BwType) > 0 { dAtA[i] = 0x22 i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.PersonId))) - i += copy(dAtA[i:], m.PersonId) + i = encodeVarintAiocean(dAtA, i, uint64(len(m.BwType))) + i += copy(dAtA[i:], m.BwType) } - if len(m.PersonName) > 0 { + if len(m.TargetId) > 0 { dAtA[i] = 0x2a i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.PersonName))) - i += copy(dAtA[i:], m.PersonName) + i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetId))) + i += copy(dAtA[i:], m.TargetId) } - if len(m.PersonPicUrl) > 0 { + if len(m.TargetName) > 0 { dAtA[i] = 0x32 i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.PersonPicUrl))) - i += copy(dAtA[i:], m.PersonPicUrl) + i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetName))) + i += copy(dAtA[i:], m.TargetName) } - if len(m.PhoneNum) > 0 { + if len(m.TargetPicUrl) > 0 { dAtA[i] = 0x3a i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.PhoneNum))) - i += copy(dAtA[i:], m.PhoneNum) - } - if len(m.Sex) > 0 { - dAtA[i] = 0x42 - i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.Sex))) - i += copy(dAtA[i:], m.Sex) - } - if len(m.IdCard) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.IdCard))) - i += copy(dAtA[i:], m.IdCard) + i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetPicUrl))) + i += copy(dAtA[i:], m.TargetPicUrl) } if len(m.MonitorLevel) > 0 { - dAtA[i] = 0x52 + dAtA[i] = 0x42 i++ i = encodeVarintAiocean(dAtA, i, uint64(len(m.MonitorLevel))) i += copy(dAtA[i:], m.MonitorLevel) } + if len(m.Labels) > 0 { + dAtA[i] = 0x4a + i++ + i = encodeVarintAiocean(dAtA, i, uint64(len(m.Labels))) + i += copy(dAtA[i:], m.Labels) + } if len(m.Content) > 0 { - dAtA[i] = 0x5a + dAtA[i] = 0x52 i++ i = encodeVarintAiocean(dAtA, i, uint64(len(m.Content))) i += copy(dAtA[i:], m.Content) - } - if len(m.BwType) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintAiocean(dAtA, i, uint64(len(m.BwType))) - i += copy(dAtA[i:], m.BwType) } return i, nil } @@ -1774,9 +1777,11 @@ if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.PicMaxUrl) - if l > 0 { - n += 1 + l + sovAiocean(uint64(l)) + if len(m.PicMaxUrl) > 0 { + for _, s := range m.PicMaxUrl { + l = len(s) + n += 1 + l + sovAiocean(uint64(l)) + } } l = len(m.VideoUrl) if l > 0 { @@ -1885,9 +1890,11 @@ if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.PicMaxUrl) - if l > 0 { - n += 1 + l + sovAiocean(uint64(l)) + if len(m.PicMaxUrl) > 0 { + for _, s := range m.PicMaxUrl { + l = len(s) + n += 1 + l + sovAiocean(uint64(l)) + } } l = len(m.VideoUrl) if l > 0 { @@ -1966,8 +1973,12 @@ if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } + l = len(m.TargetType) + if l > 0 { + n += 1 + l + sovAiocean(uint64(l)) + } if m.TargetScore != 0 { - n += 5 + n += 9 } l = len(m.Feature) if l > 0 { @@ -2008,10 +2019,10 @@ var l int _ = l if m.X != 0 { - n += 5 + n += 9 } if m.Y != 0 { - n += 5 + n += 9 } return n } @@ -2062,29 +2073,21 @@ n += 1 + l + sovAiocean(uint64(l)) } if m.CompareScore != 0 { - n += 5 + n += 9 } - l = len(m.PersonId) + l = len(m.BwType) if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.PersonName) + l = len(m.TargetId) if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.PersonPicUrl) + l = len(m.TargetName) if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.PhoneNum) - if l > 0 { - n += 1 + l + sovAiocean(uint64(l)) - } - l = len(m.Sex) - if l > 0 { - n += 1 + l + sovAiocean(uint64(l)) - } - l = len(m.IdCard) + l = len(m.TargetPicUrl) if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } @@ -2092,11 +2095,11 @@ if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.Content) + l = len(m.Labels) if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } - l = len(m.BwType) + l = len(m.Content) if l > 0 { n += 1 + l + sovAiocean(uint64(l)) } @@ -2520,7 +2523,7 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.PicMaxUrl = string(dAtA[iNdEx:postIndex]) + m.PicMaxUrl = append(m.PicMaxUrl, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 13: if wireType != 2 { @@ -3331,7 +3334,7 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.PicMaxUrl = string(dAtA[iNdEx:postIndex]) + m.PicMaxUrl = append(m.PicMaxUrl, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 13: if wireType != 2 { @@ -3859,17 +3862,49 @@ m.TargetId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 5 { - return fmt.Errorf("proto: wrong wireType = %d for field TargetScore", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TargetType", wireType) } - var v uint32 - if (iNdEx + 4) > l { + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAiocean + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAiocean + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAiocean + } + if postIndex > l { return io.ErrUnexpectedEOF } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.TargetScore = float32(math.Float32frombits(v)) + m.TargetType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex case 3: + if wireType != 1 { + return fmt.Errorf("proto: wrong wireType = %d for field TargetScore", wireType) + } + var v uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF + } + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.TargetScore = float64(math.Float64frombits(v)) + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Feature", wireType) } @@ -3901,7 +3936,7 @@ } m.Feature = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PicSmUrl", wireType) } @@ -3933,7 +3968,7 @@ } m.PicSmUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TargetLocation", wireType) } @@ -4148,27 +4183,27 @@ } switch fieldNum { case 1: - if wireType != 5 { + if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field X", wireType) } - var v uint32 - if (iNdEx + 4) > l { + var v uint64 + if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.X = float32(math.Float32frombits(v)) + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.X = float64(math.Float64frombits(v)) case 2: - if wireType != 5 { + if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field Y", wireType) } - var v uint32 - if (iNdEx + 4) > l { + var v uint64 + if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.Y = float32(math.Float32frombits(v)) + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.Y = float64(math.Float64frombits(v)) default: iNdEx = preIndex skippy, err := skipAiocean(dAtA[iNdEx:]) @@ -4508,19 +4543,19 @@ m.TableName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: - if wireType != 5 { + if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field CompareScore", wireType) } - var v uint32 - if (iNdEx + 4) > l { + var v uint64 + if (iNdEx + 8) > l { return io.ErrUnexpectedEOF } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.CompareScore = float32(math.Float32frombits(v)) + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.CompareScore = float64(math.Float64frombits(v)) case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PersonId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BwType", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4548,11 +4583,11 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.PersonId = string(dAtA[iNdEx:postIndex]) + m.BwType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PersonName", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TargetId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4580,11 +4615,11 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.PersonName = string(dAtA[iNdEx:postIndex]) + m.TargetId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PersonPicUrl", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TargetName", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4612,11 +4647,11 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.PersonPicUrl = string(dAtA[iNdEx:postIndex]) + m.TargetName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PhoneNum", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TargetPicUrl", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4644,73 +4679,9 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.PhoneNum = string(dAtA[iNdEx:postIndex]) + m.TargetPicUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sex", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAiocean - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAiocean - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAiocean - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sex = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IdCard", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAiocean - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAiocean - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAiocean - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IdCard = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MonitorLevel", wireType) } @@ -4742,7 +4713,39 @@ } m.MonitorLevel = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 11: + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Labels", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAiocean + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthAiocean + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAiocean + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Labels = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Content", wireType) } @@ -4773,38 +4776,6 @@ return io.ErrUnexpectedEOF } m.Content = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BwType", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAiocean - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAiocean - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAiocean - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.BwType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex -- Gitblit v1.8.0