From c2ac1d475f53183fe846c582f52419d3a2042bd4 Mon Sep 17 00:00:00 2001 From: 554325746@qq.com <554325746@qq.com> Date: 星期四, 11 七月 2019 17:54:27 +0800 Subject: [PATCH] fix es --- es.pb.go | 1148 ++++----------------------------------------------------- 1 files changed, 80 insertions(+), 1,068 deletions(-) diff --git a/es.pb.go b/es.pb.go index cae496d..32bf8f8 100644 --- a/es.pb.go +++ b/es.pb.go @@ -22,190 +22,6 @@ // proto package needs to be updated. 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"` - 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"` - PicDesc string `protobuf:"bytes,13,opt,name=picDesc,proto3" json:"picDesc,omitempty"` - CompareScore float32 `protobuf:"fixed32,14,opt,name=compareScore,proto3" json:"compareScore,omitempty"` -} - -func (m *Baseinfo) Reset() { *m = Baseinfo{} } -func (m *Baseinfo) String() string { return proto.CompactTextString(m) } -func (*Baseinfo) ProtoMessage() {} -func (*Baseinfo) Descriptor() ([]byte, []int) { - return fileDescriptor_718db5c20d0f3738, []int{0} -} -func (m *Baseinfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Baseinfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Baseinfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalTo(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Baseinfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_Baseinfo.Merge(m, src) -} -func (m *Baseinfo) XXX_Size() int { - return m.Size() -} -func (m *Baseinfo) XXX_DiscardUnknown() { - xxx_messageInfo_Baseinfo.DiscardUnknown(m) -} - -var xxx_messageInfo_Baseinfo proto.InternalMessageInfo - -func (m *Baseinfo) GetFaceFeature() string { - if m != nil { - return m.FaceFeature - } - return "" -} - -func (m *Baseinfo) GetPersonId() string { - if m != nil { - return m.PersonId - } - return "" -} - -func (m *Baseinfo) GetTableId() string { - if m != nil { - return m.TableId - } - return "" -} - -func (m *Baseinfo) GetTableName() string { - if m != nil { - return m.TableName - } - return "" -} - -func (m *Baseinfo) GetPersonName() string { - if m != nil { - return m.PersonName - } - return "" -} - -func (m *Baseinfo) GetPersonPicUrl() string { - if m != nil { - return m.PersonPicUrl - } - return "" -} - -func (m *Baseinfo) GetPhoneNum() 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 "" -} - -func (m *Baseinfo) GetMonitorLevel() string { - if m != nil { - return m.MonitorLevel - } - return "" -} - -func (m *Baseinfo) GetContent() string { - if m != nil { - return m.Content - } - return "" -} - -func (m *Baseinfo) GetPicDesc() string { - if m != nil { - return m.PicDesc - } - return "" -} - -func (m *Baseinfo) GetCompareScore() float32 { - if m != nil { - return m.CompareScore - } - return 0 -} - -type Binfos struct { - Infos []*Baseinfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"` -} - -func (m *Binfos) Reset() { *m = Binfos{} } -func (m *Binfos) String() string { return proto.CompactTextString(m) } -func (*Binfos) ProtoMessage() {} -func (*Binfos) Descriptor() ([]byte, []int) { - return fileDescriptor_718db5c20d0f3738, []int{1} -} -func (m *Binfos) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Binfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Binfos.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalTo(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Binfos) XXX_Merge(src proto.Message) { - xxx_messageInfo_Binfos.Merge(m, src) -} -func (m *Binfos) XXX_Size() int { - return m.Size() -} -func (m *Binfos) XXX_DiscardUnknown() { - xxx_messageInfo_Binfos.DiscardUnknown(m) -} - -var xxx_messageInfo_Binfos proto.InternalMessageInfo - -func (m *Binfos) GetInfos() []*Baseinfo { - if m != nil { - return m.Infos - } - return nil -} - type Esinfo struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Tableid string `protobuf:"bytes,2,opt,name=tableid,proto3" json:"tableid,omitempty"` @@ -217,7 +33,7 @@ func (m *Esinfo) String() string { return proto.CompactTextString(m) } func (*Esinfo) ProtoMessage() {} func (*Esinfo) Descriptor() ([]byte, []int) { - return fileDescriptor_718db5c20d0f3738, []int{2} + return fileDescriptor_718db5c20d0f3738, []int{0} } func (m *Esinfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -288,9 +104,9 @@ CreateTime string `protobuf:"bytes,11,opt,name=createTime,proto3" json:"createTime,omitempty"` UpdateTime string `protobuf:"bytes,12,opt,name=updateTime,proto3" json:"updateTime,omitempty"` CreateBy string `protobuf:"bytes,13,opt,name=createBy,proto3" json:"createBy,omitempty"` - IsDelete string `protobuf:"bytes,14,opt,name=isDelete,proto3" json:"isDelete,omitempty"` + IsDelete int32 `protobuf:"varint,14,opt,name=isDelete,proto3" json:"isDelete,omitempty"` MonitorLevel string `protobuf:"bytes,15,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"` - Enable string `protobuf:"bytes,16,opt,name=enable,proto3" json:"enable,omitempty"` + Enable int32 `protobuf:"varint,16,opt,name=enable,proto3" json:"enable,omitempty"` Reserved string `protobuf:"bytes,17,opt,name=reserved,proto3" json:"reserved,omitempty"` } @@ -298,7 +114,7 @@ func (m *Dbperson) String() string { return proto.CompactTextString(m) } func (*Dbperson) ProtoMessage() {} func (*Dbperson) Descriptor() ([]byte, []int) { - return fileDescriptor_718db5c20d0f3738, []int{3} + return fileDescriptor_718db5c20d0f3738, []int{1} } func (m *Dbperson) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -418,11 +234,11 @@ return "" } -func (m *Dbperson) GetIsDelete() string { +func (m *Dbperson) GetIsDelete() int32 { if m != nil { return m.IsDelete } - return "" + return 0 } func (m *Dbperson) GetMonitorLevel() string { @@ -432,11 +248,11 @@ return "" } -func (m *Dbperson) GetEnable() string { +func (m *Dbperson) GetEnable() int32 { if m != nil { return m.Enable } - return "" + return 0 } func (m *Dbperson) GetReserved() string { @@ -457,9 +273,9 @@ CreateTime string `protobuf:"bytes,8,opt,name=createTime,proto3" json:"createTime,omitempty"` UpdateTime string `protobuf:"bytes,9,opt,name=updateTime,proto3" json:"updateTime,omitempty"` CreateBy string `protobuf:"bytes,10,opt,name=createBy,proto3" json:"createBy,omitempty"` - IsDelete string `protobuf:"bytes,11,opt,name=isDelete,proto3" json:"isDelete,omitempty"` + IsDelete int32 `protobuf:"varint,11,opt,name=isDelete,proto3" json:"isDelete,omitempty"` IsForever string `protobuf:"bytes,12,opt,name=isForever,proto3" json:"isForever,omitempty"` - Enable string `protobuf:"bytes,13,opt,name=enable,proto3" json:"enable,omitempty"` + Enable int32 `protobuf:"varint,13,opt,name=enable,proto3" json:"enable,omitempty"` IsSync string `protobuf:"bytes,14,opt,name=isSync,proto3" json:"isSync,omitempty"` AnalyServerId string `protobuf:"bytes,15,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"` } @@ -468,7 +284,7 @@ func (m *Dbtable) String() string { return proto.CompactTextString(m) } func (*Dbtable) ProtoMessage() {} func (*Dbtable) Descriptor() ([]byte, []int) { - return fileDescriptor_718db5c20d0f3738, []int{4} + return fileDescriptor_718db5c20d0f3738, []int{2} } func (m *Dbtable) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -567,11 +383,11 @@ return "" } -func (m *Dbtable) GetIsDelete() string { +func (m *Dbtable) GetIsDelete() int32 { if m != nil { return m.IsDelete } - return "" + return 0 } func (m *Dbtable) GetIsForever() string { @@ -581,11 +397,11 @@ return "" } -func (m *Dbtable) GetEnable() string { +func (m *Dbtable) GetEnable() int32 { if m != nil { return m.Enable } - return "" + return 0 } func (m *Dbtable) GetIsSync() string { @@ -603,8 +419,6 @@ } func init() { - proto.RegisterType((*Baseinfo)(nil), "protomsg.Baseinfo") - proto.RegisterType((*Binfos)(nil), "protomsg.Binfos") proto.RegisterType((*Esinfo)(nil), "protomsg.Esinfo") proto.RegisterType((*Dbperson)(nil), "protomsg.Dbperson") proto.RegisterType((*Dbtable)(nil), "protomsg.Dbtable") @@ -613,171 +427,39 @@ func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) } var fileDescriptor_718db5c20d0f3738 = []byte{ - // 607 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcb, 0x6e, 0xda, 0x4c, - 0x1c, 0xc5, 0x63, 0x9c, 0x18, 0xfb, 0x4f, 0x92, 0x8f, 0x6f, 0x16, 0xd1, 0xa8, 0x8a, 0x2c, 0x84, - 0xba, 0x60, 0xc5, 0x22, 0x7d, 0x03, 0x4a, 0x23, 0x21, 0x55, 0x51, 0x05, 0xe9, 0x03, 0x0c, 0xf6, - 0x3f, 0xa9, 0x25, 0x7c, 0xd1, 0x8c, 0xa1, 0xe1, 0x05, 0xba, 0xee, 0x9b, 0xf4, 0x35, 0xba, 0xcc, - 0xb2, 0x8b, 0x2e, 0x2a, 0x78, 0x91, 0x6a, 0x6e, 0x60, 0x1b, 0x9a, 0x76, 0xc5, 0x9c, 0x73, 0xcc, - 0xdc, 0x7e, 0xc7, 0x06, 0x1f, 0xc5, 0xb0, 0xe0, 0x79, 0x99, 0x13, 0x5f, 0xfd, 0xa4, 0xe2, 0xb1, - 0xff, 0xc5, 0x05, 0x7f, 0xc4, 0x04, 0x26, 0xd9, 0x43, 0x4e, 0x7a, 0xd0, 0x79, 0x60, 0x11, 0xde, - 0x22, 0x2b, 0x97, 0x1c, 0xa9, 0xd3, 0x73, 0x06, 0xc1, 0xb4, 0x6a, 0x91, 0x57, 0xe0, 0x17, 0xc8, - 0x45, 0x9e, 0x4d, 0x62, 0xda, 0x52, 0xf1, 0x4e, 0x13, 0x0a, 0xed, 0x92, 0xcd, 0x17, 0x38, 0x89, - 0xa9, 0xab, 0x22, 0x2b, 0xc9, 0x35, 0x04, 0x6a, 0x78, 0xc7, 0x52, 0xa4, 0xa7, 0x2a, 0xdb, 0x1b, - 0x24, 0x04, 0xd0, 0x73, 0xa8, 0xd8, 0x53, 0x71, 0xc5, 0x21, 0x7d, 0x38, 0xd7, 0xea, 0x43, 0x12, - 0x7d, 0xe4, 0x0b, 0xda, 0x56, 0x4f, 0xd4, 0x3c, 0xb5, 0xaf, 0x4f, 0x79, 0x86, 0x77, 0xcb, 0x94, - 0xfa, 0x66, 0x5f, 0x46, 0x93, 0x2e, 0xb8, 0x02, 0x9f, 0x68, 0xa0, 0x6c, 0x39, 0x24, 0x57, 0xe0, - 0x25, 0xf1, 0x5b, 0xc6, 0x63, 0x0a, 0xca, 0x34, 0x4a, 0xae, 0x94, 0xe6, 0x59, 0x52, 0xe6, 0xfc, - 0x3d, 0xae, 0x70, 0x41, 0x3b, 0x7a, 0xa5, 0xaa, 0x27, 0x4f, 0x19, 0xe5, 0x59, 0x89, 0x59, 0x49, - 0xcf, 0xf5, 0x29, 0x8d, 0x94, 0x49, 0x91, 0x44, 0x63, 0x14, 0x11, 0xbd, 0xd0, 0x89, 0x91, 0x72, - 0xde, 0x28, 0x4f, 0x0b, 0xc6, 0x71, 0x16, 0xe5, 0x1c, 0xe9, 0x65, 0xcf, 0x19, 0xb4, 0xa6, 0x35, - 0xaf, 0x7f, 0x03, 0xde, 0x48, 0x42, 0x10, 0x64, 0x00, 0x67, 0x6a, 0x40, 0x9d, 0x9e, 0x3b, 0xe8, - 0xdc, 0x90, 0xa1, 0x85, 0x35, 0xb4, 0xa0, 0xa6, 0xfa, 0x81, 0xfe, 0x13, 0x78, 0xef, 0x84, 0x22, - 0x77, 0x09, 0xad, 0x24, 0x36, 0xc0, 0x5a, 0xc9, 0x9e, 0x45, 0x62, 0x31, 0x59, 0xd9, 0x64, 0xec, - 0x1e, 0x32, 0x6e, 0xee, 0xf6, 0xf4, 0xc8, 0x6e, 0x7f, 0xba, 0xe0, 0x8f, 0xe7, 0x1a, 0xc1, 0x1f, - 0x17, 0x9f, 0xd4, 0x17, 0x9f, 0xfc, 0xe3, 0xe2, 0x35, 0xd8, 0xa7, 0x47, 0x60, 0xd7, 0x0b, 0x73, - 0x76, 0x50, 0x98, 0x2e, 0xb8, 0xec, 0xd1, 0x36, 0x49, 0x0e, 0x6d, 0x05, 0xda, 0xc7, 0x2a, 0xe0, - 0xd7, 0x2a, 0x50, 0x81, 0x18, 0xd4, 0x21, 0x56, 0x2b, 0x06, 0x8d, 0x8a, 0x85, 0x00, 0x11, 0x47, - 0x56, 0xe2, 0x7d, 0x92, 0xa2, 0xa9, 0x4d, 0xc5, 0x91, 0xf9, 0xb2, 0x88, 0x6d, 0xae, 0x7b, 0x53, - 0x71, 0xe4, 0xdc, 0xfa, 0xe9, 0xd1, 0xda, 0x74, 0x67, 0xa7, 0x65, 0x96, 0x88, 0x31, 0x2e, 0xb0, - 0xd4, 0xc5, 0x09, 0xa6, 0x3b, 0x7d, 0x50, 0xd8, 0xff, 0x8e, 0x14, 0xf6, 0x0a, 0x3c, 0xcc, 0xe4, - 0xfd, 0xd3, 0xae, 0x3e, 0xa9, 0x56, 0x72, 0x5e, 0x8e, 0x02, 0xf9, 0x0a, 0x63, 0xfa, 0xbf, 0x9e, - 0xd7, 0xea, 0xfe, 0x37, 0x17, 0xda, 0xe3, 0xb9, 0xa2, 0x76, 0x40, 0xb7, 0xf6, 0x32, 0xb7, 0x9a, - 0x2f, 0xb3, 0x4d, 0xd5, 0x0d, 0xba, 0x95, 0x54, 0xdd, 0xa1, 0x4d, 0xef, 0xd7, 0x45, 0xfd, 0x43, - 0x20, 0x0d, 0xb9, 0xd3, 0xf9, 0x67, 0x15, 0x69, 0xa6, 0x46, 0xc9, 0x7f, 0x89, 0x92, 0xf1, 0x52, - 0x5d, 0x9e, 0xa6, 0xba, 0x37, 0x24, 0x31, 0xcc, 0x62, 0x95, 0x69, 0xbe, 0x56, 0x36, 0xa8, 0xf8, - 0x7f, 0xa1, 0x12, 0xbc, 0x48, 0x05, 0x5e, 0xa0, 0xd2, 0x69, 0x50, 0xb9, 0x86, 0x20, 0x11, 0xb7, - 0x39, 0xc7, 0x15, 0x72, 0x03, 0x7b, 0x6f, 0x54, 0x78, 0x5c, 0xd4, 0x78, 0xc8, 0x46, 0x8a, 0xd9, - 0x3a, 0x8b, 0x0c, 0x65, 0xa3, 0xc8, 0x6b, 0xb8, 0x60, 0x19, 0x5b, 0xac, 0x67, 0x12, 0x0d, 0x9f, - 0xc4, 0x06, 0x72, 0xdd, 0x1c, 0xd1, 0xef, 0x9b, 0xd0, 0x79, 0xde, 0x84, 0xce, 0xaf, 0x4d, 0xe8, - 0x7c, 0xdd, 0x86, 0x27, 0xcf, 0xdb, 0xf0, 0xe4, 0xc7, 0x36, 0x3c, 0x99, 0x7b, 0xea, 0xf3, 0xf1, - 0xe6, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xab, 0x92, 0x03, 0xc1, 0xfe, 0x05, 0x00, 0x00, -} - -func (m *Baseinfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Baseinfo) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.FaceFeature) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.FaceFeature))) - i += copy(dAtA[i:], m.FaceFeature) - } - if len(m.PersonId) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.PersonId))) - i += copy(dAtA[i:], m.PersonId) - } - if len(m.TableId) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.TableId))) - i += copy(dAtA[i:], m.TableId) - } - if len(m.TableName) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.TableName))) - i += copy(dAtA[i:], m.TableName) - } - if len(m.PersonName) > 0 { - dAtA[i] = 0x32 - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.PersonName))) - i += copy(dAtA[i:], m.PersonName) - } - if len(m.PersonPicUrl) > 0 { - dAtA[i] = 0x3a - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.PersonPicUrl))) - i += copy(dAtA[i:], m.PersonPicUrl) - } - if len(m.PhoneNum) > 0 { - dAtA[i] = 0x42 - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.PhoneNum))) - i += copy(dAtA[i:], m.PhoneNum) - } - if len(m.Sex) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.Sex))) - i += copy(dAtA[i:], m.Sex) - } - if len(m.IdCard) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.IdCard))) - i += copy(dAtA[i:], m.IdCard) - } - if len(m.MonitorLevel) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.MonitorLevel))) - i += copy(dAtA[i:], m.MonitorLevel) - } - if len(m.Content) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.Content))) - i += copy(dAtA[i:], m.Content) - } - if len(m.PicDesc) > 0 { - dAtA[i] = 0x6a - i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.PicDesc))) - i += copy(dAtA[i:], m.PicDesc) - } - if m.CompareScore != 0 { - dAtA[i] = 0x75 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore)))) - i += 4 - } - return i, nil -} - -func (m *Binfos) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Binfos) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Infos) > 0 { - for _, msg := range m.Infos { - dAtA[i] = 0xa - i++ - i = encodeVarintEs(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } - return i, nil + // 500 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x41, 0x8e, 0xd3, 0x30, + 0x14, 0x86, 0x9b, 0x86, 0x69, 0x13, 0x77, 0x3a, 0x0c, 0x5e, 0x20, 0x0b, 0x8d, 0xa2, 0xaa, 0x62, + 0xd1, 0x15, 0x1b, 0x6e, 0x30, 0x94, 0x91, 0x2a, 0xa1, 0x11, 0x6a, 0x87, 0x03, 0x38, 0xf1, 0x9b, + 0xc1, 0x52, 0x12, 0x47, 0x76, 0x5a, 0xda, 0x5b, 0x70, 0x13, 0xae, 0xc1, 0x72, 0x96, 0x2c, 0x58, + 0xa0, 0xf6, 0x22, 0xc8, 0xcf, 0x49, 0x93, 0x0c, 0xa2, 0xb0, 0x6a, 0xff, 0xff, 0xb7, 0xdf, 0x7b, + 0x7d, 0x9f, 0x55, 0x12, 0x80, 0x79, 0x53, 0x68, 0x55, 0x2a, 0x1a, 0xe0, 0x47, 0x66, 0x1e, 0xa6, + 0x5b, 0x32, 0x78, 0x6f, 0x64, 0x7e, 0xaf, 0xe8, 0x05, 0xe9, 0x4b, 0xc1, 0xbc, 0x89, 0x37, 0x0b, + 0x97, 0x7d, 0x29, 0x28, 0x23, 0xc3, 0x92, 0xc7, 0x29, 0x48, 0xc1, 0xfa, 0x68, 0xd6, 0x92, 0x4e, + 0xc8, 0xe8, 0x9e, 0x27, 0x70, 0x03, 0xbc, 0x5c, 0x6b, 0x60, 0x3e, 0xa6, 0x6d, 0x8b, 0x4e, 0xc9, + 0x79, 0xa2, 0xb2, 0x82, 0x6b, 0x58, 0x25, 0x4a, 0x03, 0x7b, 0x36, 0xf1, 0x66, 0xfd, 0x65, 0xc7, + 0x9b, 0xfe, 0xf4, 0x49, 0x30, 0x8f, 0x0b, 0xd0, 0x46, 0xe5, 0x7f, 0x6d, 0xbe, 0xe8, 0x36, 0x5f, + 0xfc, 0x67, 0x73, 0x57, 0xf5, 0xa3, 0x4c, 0x3e, 0xe9, 0x14, 0x9b, 0x87, 0xcb, 0x8e, 0x47, 0x23, + 0x42, 0x9c, 0xbe, 0xe5, 0x19, 0xb0, 0x33, 0x3c, 0xd1, 0x72, 0xe8, 0x25, 0xf1, 0xf9, 0x03, 0xb0, + 0x01, 0x06, 0xf6, 0xab, 0x75, 0x0c, 0x6c, 0xd9, 0xd0, 0x39, 0x06, 0xb6, 0xf4, 0x25, 0x19, 0x48, + 0xf1, 0x8e, 0x6b, 0xc1, 0x02, 0x34, 0x2b, 0x65, 0x67, 0x2f, 0x64, 0x32, 0x07, 0x93, 0xb0, 0xd0, + 0xcd, 0x5e, 0x49, 0xfa, 0x8a, 0x04, 0xc5, 0x67, 0x95, 0xc3, 0xed, 0x3a, 0x63, 0x04, 0xa3, 0xa3, + 0xb6, 0x13, 0x25, 0x1a, 0x78, 0x09, 0x77, 0x32, 0x03, 0x36, 0x72, 0x13, 0x35, 0x8e, 0xcd, 0xd7, + 0x85, 0xa8, 0xf3, 0x73, 0x97, 0x37, 0x8e, 0xad, 0xed, 0x4e, 0x5f, 0xef, 0xd8, 0xd8, 0xd5, 0xae, + 0xb5, 0xcd, 0xa4, 0x99, 0x43, 0x0a, 0x25, 0xb0, 0x8b, 0x89, 0x37, 0x3b, 0x5b, 0x1e, 0xb5, 0xdd, + 0x56, 0xa6, 0x72, 0x59, 0x2a, 0xfd, 0x01, 0x36, 0x90, 0xb2, 0xe7, 0x6e, 0x5b, 0x6d, 0xcf, 0xfe, + 0x52, 0xc8, 0xed, 0xfe, 0xd9, 0x25, 0xde, 0xae, 0x94, 0xad, 0xab, 0xc1, 0x80, 0xde, 0x80, 0x60, + 0x2f, 0x5c, 0xcf, 0x5a, 0x4f, 0xbf, 0xf9, 0x64, 0x38, 0x8f, 0x91, 0xda, 0x1f, 0x74, 0xaf, 0x48, + 0x88, 0x01, 0x2e, 0xdf, 0xf1, 0x6d, 0x8c, 0x63, 0x8a, 0x1b, 0xf4, 0x5b, 0x29, 0xee, 0xb0, 0x4e, + 0xef, 0x76, 0x05, 0x54, 0x68, 0x1b, 0xc3, 0x4e, 0x1a, 0x7f, 0xc1, 0xc8, 0x31, 0xad, 0x94, 0xbd, + 0x65, 0x4a, 0xae, 0x4b, 0x5c, 0x9e, 0xa3, 0xda, 0x18, 0x96, 0x18, 0xe4, 0x02, 0x33, 0xc7, 0xb7, + 0x96, 0x4f, 0xa8, 0x04, 0xff, 0xa0, 0x12, 0x9e, 0xa4, 0x42, 0x4e, 0x50, 0x19, 0x3d, 0xa1, 0x72, + 0x45, 0x42, 0x69, 0x6e, 0x94, 0x86, 0x0d, 0xe8, 0x0a, 0x76, 0x63, 0xb4, 0x78, 0x8c, 0x3b, 0x3c, + 0xec, 0x8b, 0x34, 0xab, 0x5d, 0x9e, 0x20, 0x65, 0xfb, 0x22, 0x51, 0xd1, 0xd7, 0x64, 0xcc, 0x73, + 0x9e, 0xee, 0x56, 0x16, 0x8d, 0x5e, 0x88, 0x0a, 0x72, 0xd7, 0xbc, 0x66, 0xdf, 0xf7, 0x91, 0xf7, + 0xb8, 0x8f, 0xbc, 0x5f, 0xfb, 0xc8, 0xfb, 0x7a, 0x88, 0x7a, 0x8f, 0x87, 0xa8, 0xf7, 0xe3, 0x10, + 0xf5, 0xe2, 0x01, 0xfe, 0x5d, 0xbc, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x22, 0xde, 0x39, 0x6b, + 0x41, 0x04, 0x00, 0x00, } func (m *Esinfo) Marshal() (dAtA []byte, err error) { @@ -915,11 +597,10 @@ i = encodeVarintEs(dAtA, i, uint64(len(m.CreateBy))) i += copy(dAtA[i:], m.CreateBy) } - if len(m.IsDelete) > 0 { - dAtA[i] = 0x72 + if m.IsDelete != 0 { + dAtA[i] = 0x70 i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.IsDelete))) - i += copy(dAtA[i:], m.IsDelete) + i = encodeVarintEs(dAtA, i, uint64(m.IsDelete)) } if len(m.MonitorLevel) > 0 { dAtA[i] = 0x7a @@ -927,13 +608,12 @@ i = encodeVarintEs(dAtA, i, uint64(len(m.MonitorLevel))) i += copy(dAtA[i:], m.MonitorLevel) } - if len(m.Enable) > 0 { - dAtA[i] = 0x82 + if m.Enable != 0 { + dAtA[i] = 0x80 i++ dAtA[i] = 0x1 i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.Enable))) - i += copy(dAtA[i:], m.Enable) + i = encodeVarintEs(dAtA, i, uint64(m.Enable)) } if len(m.Reserved) > 0 { dAtA[i] = 0x8a @@ -1021,11 +701,10 @@ i = encodeVarintEs(dAtA, i, uint64(len(m.CreateBy))) i += copy(dAtA[i:], m.CreateBy) } - if len(m.IsDelete) > 0 { - dAtA[i] = 0x5a + if m.IsDelete != 0 { + dAtA[i] = 0x58 i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.IsDelete))) - i += copy(dAtA[i:], m.IsDelete) + i = encodeVarintEs(dAtA, i, uint64(m.IsDelete)) } if len(m.IsForever) > 0 { dAtA[i] = 0x62 @@ -1033,11 +712,10 @@ i = encodeVarintEs(dAtA, i, uint64(len(m.IsForever))) i += copy(dAtA[i:], m.IsForever) } - if len(m.Enable) > 0 { - dAtA[i] = 0x6a + if m.Enable != 0 { + dAtA[i] = 0x68 i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.Enable))) - i += copy(dAtA[i:], m.Enable) + i = encodeVarintEs(dAtA, i, uint64(m.Enable)) } if len(m.IsSync) > 0 { dAtA[i] = 0x72 @@ -1063,81 +741,6 @@ dAtA[offset] = uint8(v) return offset + 1 } -func (m *Baseinfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.FaceFeature) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.PersonId) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.TableId) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.TableName) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.PersonName) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.PersonPicUrl) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.PhoneNum) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.Sex) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.IdCard) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.MonitorLevel) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.Content) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - l = len(m.PicDesc) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) - } - if m.CompareScore != 0 { - n += 5 - } - return n -} - -func (m *Binfos) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Infos) > 0 { - for _, e := range m.Infos { - l = e.Size() - n += 1 + l + sovEs(uint64(l)) - } - } - return n -} - func (m *Esinfo) Size() (n int) { if m == nil { return 0 @@ -1220,17 +823,15 @@ if l > 0 { n += 1 + l + sovEs(uint64(l)) } - l = len(m.IsDelete) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) + if m.IsDelete != 0 { + n += 1 + sovEs(uint64(m.IsDelete)) } l = len(m.MonitorLevel) if l > 0 { n += 1 + l + sovEs(uint64(l)) } - l = len(m.Enable) - if l > 0 { - n += 2 + l + sovEs(uint64(l)) + if m.Enable != 0 { + n += 2 + sovEs(uint64(m.Enable)) } l = len(m.Reserved) if l > 0 { @@ -1285,17 +886,15 @@ if l > 0 { n += 1 + l + sovEs(uint64(l)) } - l = len(m.IsDelete) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) + if m.IsDelete != 0 { + n += 1 + sovEs(uint64(m.IsDelete)) } l = len(m.IsForever) if l > 0 { n += 1 + l + sovEs(uint64(l)) } - l = len(m.Enable) - if l > 0 { - n += 1 + l + sovEs(uint64(l)) + if m.Enable != 0 { + n += 1 + sovEs(uint64(m.Enable)) } l = len(m.IsSync) if l > 0 { @@ -1320,541 +919,6 @@ } func sozEs(x uint64) (n int) { return sovEs(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Baseinfo) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Baseinfo: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Baseinfo: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FaceFeature", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FaceFeature = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PersonId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PersonId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TableId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TableId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TableName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TableName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PersonName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PersonName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PersonPicUrl", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PersonPicUrl = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PhoneNum", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PhoneNum = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 9: - 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 ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sex = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 10: - 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 ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IdCard = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MonitorLevel", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MonitorLevel = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 12: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Content", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Content = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 13: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PicDesc", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - 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 ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PicDesc = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 14: - if wireType != 5 { - return fmt.Errorf("proto: wrong wireType = %d for field CompareScore", wireType) - } - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.CompareScore = float32(math.Float32frombits(v)) - default: - iNdEx = preIndex - skippy, err := skipEs(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthEs - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthEs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Binfos) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Binfos: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Binfos: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Infos", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Infos = append(m.Infos, &Baseinfo{}) - if err := m.Infos[len(m.Infos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEs(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthEs - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthEs - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil } func (m *Esinfo) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -2462,10 +1526,10 @@ m.CreateBy = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 14: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field IsDelete", wireType) } - var stringLen uint64 + m.IsDelete = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEs @@ -2475,24 +1539,11 @@ } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.IsDelete |= int32(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IsDelete = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 15: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MonitorLevel", wireType) @@ -2526,10 +1577,10 @@ m.MonitorLevel = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 16: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType) } - var stringLen uint64 + m.Enable = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEs @@ -2539,24 +1590,11 @@ } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Enable |= int32(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Enable = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 17: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Reserved", wireType) @@ -2963,10 +2001,10 @@ m.CreateBy = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 11: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field IsDelete", wireType) } - var stringLen uint64 + m.IsDelete = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEs @@ -2976,24 +2014,11 @@ } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.IsDelete |= int32(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.IsDelete = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field IsForever", wireType) @@ -3027,10 +2052,10 @@ m.IsForever = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 13: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType) } - var stringLen uint64 + m.Enable = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowEs @@ -3040,24 +2065,11 @@ } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Enable |= int32(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthEs - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthEs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Enable = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field IsSync", wireType) -- Gitblit v1.8.0