From 2f7092d881a84f5f8062fca0aa0694cb3bc2e7c1 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 25 六月 2019 16:48:21 +0800 Subject: [PATCH] update --- es.pb.go | 91 ++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 55 deletions(-) diff --git a/es.pb.go b/es.pb.go index 429ffd7..8ac1d03 100644 --- a/es.pb.go +++ b/es.pb.go @@ -6,7 +6,7 @@ import ( encoding_binary "encoding/binary" fmt "fmt" - proto "github.com/golang/protobuf/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" ) @@ -20,24 +20,21 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package type Baseinfo struct { - FaceFeature string `protobuf:"bytes,1,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"` - PersonId string `protobuf:"bytes,2,opt,name=personId,proto3" json:"personId,omitempty"` - TableId string `protobuf:"bytes,3,opt,name=tableId,proto3" json:"tableId,omitempty"` - TableName string `protobuf:"bytes,4,opt,name=tableName,proto3" json:"tableName,omitempty"` - CompareScore float32 `protobuf:"fixed32,5,opt,name=compareScore,proto3" json:"compareScore,omitempty"` - PersonName string `protobuf:"bytes,6,opt,name=personName,proto3" json:"personName,omitempty"` - PersonPicUrl string `protobuf:"bytes,7,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"` - PhoneNum string `protobuf:"bytes,8,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"` - Sex string `protobuf:"bytes,9,opt,name=sex,proto3" json:"sex,omitempty"` - Idcard string `protobuf:"bytes,10,opt,name=idcard,proto3" json:"idcard,omitempty"` - MonitorLevel string `protobuf:"bytes,11,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"` - Content string `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + FaceFeature string `protobuf:"bytes,1,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"` + PersonId string `protobuf:"bytes,2,opt,name=personId,proto3" json:"personId,omitempty"` + TableId string `protobuf:"bytes,3,opt,name=tableId,proto3" json:"tableId,omitempty"` + TableName string `protobuf:"bytes,4,opt,name=tableName,proto3" json:"tableName,omitempty"` + CompareScore float32 `protobuf:"fixed32,5,opt,name=compareScore,proto3" json:"compareScore,omitempty"` + PersonName string `protobuf:"bytes,6,opt,name=personName,proto3" json:"personName,omitempty"` + PersonPicUrl string `protobuf:"bytes,7,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"` + PhoneNum string `protobuf:"bytes,8,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"` + Sex string `protobuf:"bytes,9,opt,name=sex,proto3" json:"sex,omitempty"` + Idcard string `protobuf:"bytes,10,opt,name=idcard,proto3" json:"idcard,omitempty"` + MonitorLevel string `protobuf:"bytes,11,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"` + Content string `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"` } func (m *Baseinfo) Reset() { *m = Baseinfo{} } @@ -158,10 +155,7 @@ } type Binfos struct { - Infos []*Baseinfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Infos []*Baseinfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"` } func (m *Binfos) Reset() { *m = Binfos{} } @@ -212,26 +206,27 @@ func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) } var fileDescriptor_718db5c20d0f3738 = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x40, 0xdd, 0xd6, 0xa6, 0xe9, 0xb4, 0x87, 0xb2, 0x07, 0x19, 0x44, 0x42, 0xe8, 0x29, 0xa7, - 0x1e, 0xea, 0x1f, 0xf4, 0x20, 0x14, 0xa4, 0x48, 0xc5, 0x0f, 0xd8, 0x6e, 0xa6, 0x1a, 0x68, 0x76, - 0xcb, 0xee, 0x56, 0xfc, 0x14, 0x3f, 0xc9, 0xa3, 0x9f, 0x20, 0xf5, 0xea, 0x47, 0x48, 0x26, 0x89, - 0xa6, 0xa7, 0x9d, 0xf7, 0x66, 0x98, 0x59, 0x66, 0x20, 0x26, 0x3f, 0x3f, 0x38, 0x1b, 0xac, 0x8c, - 0xf9, 0x29, 0xfd, 0xf3, 0xec, 0xa7, 0x07, 0xf1, 0x52, 0x79, 0x2a, 0xcc, 0xce, 0xca, 0x14, 0xc6, - 0x3b, 0xa5, 0xe9, 0x8e, 0x54, 0x38, 0x3a, 0x42, 0x91, 0x8a, 0x6c, 0xb4, 0xe9, 0x2a, 0x79, 0x0d, - 0xf1, 0x81, 0x9c, 0xb7, 0x66, 0x95, 0x63, 0x8f, 0xd3, 0x7f, 0x2c, 0x11, 0x86, 0x41, 0x6d, 0xf7, - 0xb4, 0xca, 0xb1, 0xcf, 0xa9, 0x16, 0xe5, 0x0d, 0x8c, 0x38, 0x5c, 0xab, 0x92, 0xf0, 0x92, 0x73, - 0xff, 0x42, 0xce, 0x60, 0xa2, 0x6d, 0x79, 0x50, 0x8e, 0x1e, 0xb5, 0x75, 0x84, 0x83, 0x54, 0x64, - 0xbd, 0xcd, 0x99, 0x93, 0x09, 0x40, 0x3d, 0x87, 0x5b, 0x44, 0xdc, 0xa2, 0x63, 0xaa, 0x1e, 0x35, - 0x3d, 0x14, 0xfa, 0xc9, 0xed, 0x71, 0xc8, 0x15, 0x67, 0x8e, 0xff, 0xfe, 0x62, 0x0d, 0xad, 0x8f, - 0x25, 0xc6, 0xcd, 0xdf, 0x1b, 0x96, 0x53, 0xe8, 0x7b, 0x7a, 0xc3, 0x11, 0xeb, 0x2a, 0x94, 0x57, - 0x10, 0x15, 0xb9, 0x56, 0x2e, 0x47, 0x60, 0xd9, 0x50, 0x35, 0xa9, 0xb4, 0xa6, 0x08, 0xd6, 0xdd, - 0xd3, 0x2b, 0xed, 0x71, 0x5c, 0x4f, 0xea, 0xba, 0x6a, 0x13, 0xda, 0x9a, 0x40, 0x26, 0xe0, 0xa4, - 0xde, 0x44, 0x83, 0xb3, 0x05, 0x44, 0xcb, 0x6a, 0xd5, 0x5e, 0x66, 0x30, 0xe0, 0x00, 0x45, 0xda, - 0xcf, 0xc6, 0x0b, 0x39, 0x6f, 0x4f, 0x32, 0x6f, 0xcf, 0xb1, 0xa9, 0x0b, 0x96, 0xd3, 0x8f, 0x53, - 0x22, 0x3e, 0x4f, 0x89, 0xf8, 0x3a, 0x25, 0xe2, 0xfd, 0x3b, 0xb9, 0xd8, 0x46, 0x5c, 0x7b, 0xfb, - 0x1b, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x50, 0xf0, 0x3c, 0xd1, 0x01, 0x00, 0x00, + // 311 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x6a, 0xf2, 0x40, + 0x10, 0xc7, 0x5d, 0xfd, 0x8c, 0x71, 0xf4, 0xf0, 0xb1, 0x87, 0x32, 0x94, 0xb2, 0x04, 0x4f, 0x39, + 0x79, 0xb0, 0x6f, 0xe0, 0xa1, 0x20, 0x14, 0x29, 0x96, 0x3e, 0xc0, 0x9a, 0x8c, 0x6d, 0xc0, 0xec, + 0xca, 0xee, 0x5a, 0xfa, 0x18, 0x7d, 0xac, 0x1e, 0x3d, 0xf6, 0x58, 0xf4, 0xda, 0x87, 0x28, 0x99, + 0xc4, 0x36, 0x9e, 0x76, 0xfe, 0xbf, 0x99, 0x9d, 0x19, 0xfe, 0x03, 0x31, 0xf9, 0xe9, 0xce, 0xd9, + 0x60, 0x65, 0xcc, 0x4f, 0xe9, 0x9f, 0x27, 0xdf, 0x5d, 0x88, 0xe7, 0xda, 0x53, 0x61, 0x36, 0x56, + 0x26, 0x30, 0xda, 0xe8, 0x8c, 0xee, 0x48, 0x87, 0xbd, 0x23, 0x14, 0x89, 0x48, 0x87, 0xab, 0x36, + 0x92, 0xd7, 0x10, 0xef, 0xc8, 0x79, 0x6b, 0x16, 0x39, 0x76, 0x39, 0xfd, 0xab, 0x25, 0xc2, 0x20, + 0xe8, 0xf5, 0x96, 0x16, 0x39, 0xf6, 0x38, 0x75, 0x96, 0xf2, 0x06, 0x86, 0x1c, 0x2e, 0x75, 0x49, + 0xf8, 0x8f, 0x73, 0x7f, 0x40, 0x4e, 0x60, 0x9c, 0xd9, 0x72, 0xa7, 0x1d, 0x3d, 0x66, 0xd6, 0x11, + 0xf6, 0x13, 0x91, 0x76, 0x57, 0x17, 0x4c, 0x2a, 0x80, 0x7a, 0x0e, 0xb7, 0x88, 0xb8, 0x45, 0x8b, + 0x54, 0x3d, 0x6a, 0xf5, 0x50, 0x64, 0x4f, 0x6e, 0x8b, 0x03, 0xae, 0xb8, 0x60, 0xbc, 0xfb, 0x8b, + 0x35, 0xb4, 0xdc, 0x97, 0x18, 0x37, 0xbb, 0x37, 0x5a, 0xfe, 0x87, 0x9e, 0xa7, 0x37, 0x1c, 0x32, + 0xae, 0x42, 0x79, 0x05, 0x51, 0x91, 0x67, 0xda, 0xe5, 0x08, 0x0c, 0x1b, 0x55, 0x4d, 0x2a, 0xad, + 0x29, 0x82, 0x75, 0xf7, 0xf4, 0x4a, 0x5b, 0x1c, 0xd5, 0x93, 0xda, 0xac, 0x72, 0x22, 0xb3, 0x26, + 0x90, 0x09, 0x38, 0xae, 0x9d, 0x68, 0xe4, 0x64, 0x06, 0xd1, 0xbc, 0xb2, 0xda, 0xcb, 0x14, 0xfa, + 0x1c, 0xa0, 0x48, 0x7a, 0xe9, 0x68, 0x26, 0xa7, 0xe7, 0x93, 0x4c, 0xcf, 0xe7, 0x58, 0xd5, 0x05, + 0x73, 0xfc, 0x38, 0x2a, 0x71, 0x38, 0x2a, 0xf1, 0x75, 0x54, 0xe2, 0xfd, 0xa4, 0x3a, 0x87, 0x93, + 0xea, 0x7c, 0x9e, 0x54, 0x67, 0x1d, 0xf1, 0x9f, 0xdb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, + 0xfe, 0xfa, 0x51, 0xd9, 0x01, 0x00, 0x00, } func (m *Baseinfo) Marshal() (dAtA []byte, err error) { @@ -321,9 +316,6 @@ i = encodeVarintEs(dAtA, i, uint64(len(m.Content))) i += copy(dAtA[i:], m.Content) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -353,9 +345,6 @@ } i += n } - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } return i, nil } @@ -422,9 +411,6 @@ if l > 0 { n += 1 + l + sovEs(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -439,9 +425,6 @@ l = e.Size() n += 1 + l + sovEs(uint64(l)) } - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) } return n } @@ -866,7 +849,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -954,7 +936,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } -- Gitblit v1.8.0