From 61faf3eb185effa340860787232aa2e6e9353ce9 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期五, 05 七月 2019 18:05:55 +0800 Subject: [PATCH] fix idcard to idCard --- es.proto | 2 es.pb.go | 74 +++++++++++++++++-------------------- 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/es.pb.go b/es.pb.go index 8d26799..caca27e 100644 --- a/es.pb.go +++ b/es.pb.go @@ -9,6 +9,7 @@ proto "github.com/gogo/protobuf/proto" io "io" math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -32,7 +33,7 @@ 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"` + 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"` } @@ -133,9 +134,9 @@ return "" } -func (m *Baseinfo) GetIdcard() string { +func (m *Baseinfo) GetIdCard() string { if m != nil { - return m.Idcard + return m.IdCard } return "" } @@ -275,29 +276,29 @@ func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) } var fileDescriptor_718db5c20d0f3738 = []byte{ - // 342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcf, 0x6a, 0xc2, 0x40, - 0x10, 0xc6, 0x4d, 0xa2, 0x31, 0x8e, 0x52, 0xca, 0x1e, 0xca, 0x50, 0x4a, 0x08, 0x39, 0xe5, 0xe4, - 0xc1, 0xbe, 0x81, 0xd0, 0x82, 0x50, 0xa4, 0x58, 0xfa, 0x00, 0x31, 0x19, 0xdb, 0x05, 0x93, 0x95, - 0xdd, 0x58, 0x7c, 0x8c, 0x3e, 0x56, 0x8f, 0x1e, 0x7b, 0x2c, 0x7a, 0xed, 0x43, 0x94, 0x4c, 0x92, - 0xfa, 0xef, 0xb4, 0xf3, 0xfd, 0x66, 0x99, 0x19, 0xbe, 0x0f, 0x3c, 0x32, 0xc3, 0x95, 0x56, 0x85, - 0x12, 0x1e, 0x3f, 0x99, 0x79, 0x0b, 0x7f, 0x6d, 0xf0, 0xc6, 0xb1, 0x21, 0x99, 0x2f, 0x94, 0x08, - 0xa0, 0xbf, 0x88, 0x13, 0x7a, 0xa4, 0xb8, 0x58, 0x6b, 0x42, 0x2b, 0xb0, 0xa2, 0xde, 0xec, 0x18, - 0x89, 0x5b, 0xf0, 0x56, 0xa4, 0x8d, 0xca, 0x27, 0x29, 0xda, 0xdc, 0xfe, 0xd7, 0x02, 0xa1, 0x5b, - 0xc4, 0xf3, 0x25, 0x4d, 0x52, 0x74, 0xb8, 0xd5, 0x48, 0x71, 0x07, 0x3d, 0x2e, 0xa7, 0x71, 0x46, - 0xd8, 0xe6, 0xde, 0x01, 0x88, 0x10, 0x06, 0x89, 0xca, 0x56, 0xb1, 0xa6, 0x97, 0x44, 0x69, 0xc2, - 0x4e, 0x60, 0x45, 0xf6, 0xec, 0x84, 0x09, 0x1f, 0xa0, 0xda, 0xc3, 0x23, 0x5c, 0x1e, 0x71, 0x44, - 0xca, 0x19, 0x95, 0x7a, 0x96, 0xc9, 0xab, 0x5e, 0x62, 0x97, 0x7f, 0x9c, 0x30, 0xbe, 0xfd, 0x5d, - 0xe5, 0x34, 0x5d, 0x67, 0xe8, 0xd5, 0xb7, 0xd7, 0x5a, 0x5c, 0x83, 0x63, 0x68, 0x83, 0x3d, 0xc6, - 0x65, 0x29, 0x6e, 0xc0, 0x95, 0x69, 0x12, 0xeb, 0x14, 0x81, 0x61, 0xad, 0xca, 0x4d, 0x99, 0xca, - 0x65, 0xa1, 0xf4, 0x13, 0x7d, 0xd0, 0x12, 0xfb, 0xd5, 0xa6, 0x63, 0x56, 0x3a, 0x91, 0xa8, 0xbc, - 0xa0, 0xbc, 0xc0, 0x41, 0xe5, 0x44, 0x2d, 0xc3, 0x11, 0xb8, 0xe3, 0xd2, 0x6a, 0x23, 0x22, 0xe8, - 0x70, 0x81, 0x56, 0xe0, 0x44, 0xfd, 0x91, 0x18, 0x36, 0x91, 0x0c, 0x9b, 0x38, 0x66, 0xd5, 0x87, - 0x70, 0x03, 0xee, 0x83, 0xe1, 0x7c, 0xae, 0xc0, 0x96, 0x69, 0x1d, 0x8b, 0x2d, 0x0f, 0x8e, 0xcb, - 0x26, 0x8c, 0x46, 0x9e, 0x27, 0xe9, 0x5c, 0x26, 0x79, 0xee, 0x7a, 0xfb, 0xd2, 0xf5, 0x31, 0x7e, - 0xed, 0x7c, 0x6b, 0xbb, 0xf3, 0xad, 0x9f, 0x9d, 0x6f, 0x7d, 0xee, 0xfd, 0xd6, 0x76, 0xef, 0xb7, - 0xbe, 0xf7, 0x7e, 0x6b, 0xee, 0xf2, 0xb5, 0xf7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xd8, - 0xed, 0xc7, 0x53, 0x02, 0x00, 0x00, + // 344 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcf, 0x6a, 0xf2, 0x50, + 0x10, 0xc5, 0x4d, 0xa2, 0x31, 0x8e, 0xf2, 0xf1, 0x71, 0x17, 0x65, 0x28, 0x25, 0x84, 0xac, 0xb2, + 0x72, 0x61, 0xdf, 0xc0, 0xd2, 0x82, 0x50, 0xa4, 0x58, 0xfa, 0x00, 0x31, 0x19, 0xdb, 0x0b, 0x26, + 0x57, 0xee, 0x8d, 0xc5, 0xc7, 0xe8, 0x63, 0x75, 0xe9, 0xb2, 0xcb, 0xa2, 0xdb, 0x3e, 0x44, 0xc9, + 0x24, 0xa9, 0xff, 0x56, 0x77, 0xce, 0x6f, 0x2e, 0x33, 0xc3, 0x39, 0xe0, 0x91, 0x19, 0xae, 0xb4, + 0x2a, 0x94, 0xf0, 0xf8, 0xc9, 0xcc, 0x6b, 0xf8, 0x63, 0x83, 0x37, 0x8e, 0x0d, 0xc9, 0x7c, 0xa1, + 0x44, 0x00, 0xfd, 0x45, 0x9c, 0xd0, 0x03, 0xc5, 0xc5, 0x5a, 0x13, 0x5a, 0x81, 0x15, 0xf5, 0x66, + 0xc7, 0x48, 0x5c, 0x83, 0xb7, 0x22, 0x6d, 0x54, 0x3e, 0x49, 0xd1, 0xe6, 0xf6, 0x9f, 0x16, 0x08, + 0xdd, 0x22, 0x9e, 0x2f, 0x69, 0x92, 0xa2, 0xc3, 0xad, 0x46, 0x8a, 0x1b, 0xe8, 0x71, 0x39, 0x8d, + 0x33, 0xc2, 0x36, 0xf7, 0x0e, 0x40, 0x84, 0x30, 0x48, 0x54, 0xb6, 0x8a, 0x35, 0x3d, 0x27, 0x4a, + 0x13, 0x76, 0x02, 0x2b, 0xb2, 0x67, 0x27, 0x4c, 0xf8, 0x00, 0xd5, 0x1e, 0x1e, 0xe1, 0xf2, 0x88, + 0x23, 0x52, 0xce, 0xa8, 0xd4, 0x93, 0x4c, 0x5e, 0xf4, 0x12, 0xbb, 0xfc, 0xe3, 0x84, 0xf1, 0xed, + 0x6f, 0x2a, 0xa7, 0xe9, 0x3a, 0x43, 0xaf, 0xbe, 0xbd, 0xd6, 0xe2, 0x3f, 0x38, 0x86, 0x36, 0xd8, + 0x63, 0x5c, 0x96, 0xe2, 0x0a, 0x5c, 0x99, 0xde, 0xc5, 0x3a, 0x45, 0x60, 0x58, 0xab, 0x72, 0x53, + 0xa6, 0x72, 0x59, 0x28, 0xfd, 0x48, 0xef, 0xb4, 0xc4, 0x7e, 0xb5, 0xe9, 0x98, 0x95, 0x4e, 0x24, + 0x2a, 0x2f, 0x28, 0x2f, 0x70, 0x50, 0x39, 0x51, 0xcb, 0x70, 0x04, 0xee, 0xb8, 0xb4, 0xda, 0x88, + 0x08, 0x3a, 0x5c, 0xa0, 0x15, 0x38, 0x51, 0x7f, 0x24, 0x86, 0x4d, 0x24, 0xc3, 0x26, 0x8e, 0x59, + 0xf5, 0x21, 0xdc, 0x80, 0x7b, 0x6f, 0x38, 0x9f, 0x7f, 0x60, 0xcb, 0xb4, 0x8e, 0xc5, 0x96, 0x07, + 0xc7, 0x65, 0x13, 0x46, 0x23, 0xcf, 0x93, 0x74, 0x2e, 0x93, 0x3c, 0x77, 0xbd, 0x7d, 0xe9, 0xfa, + 0x18, 0x3f, 0x77, 0xbe, 0xb5, 0xdd, 0xf9, 0xd6, 0xf7, 0xce, 0xb7, 0x3e, 0xf6, 0x7e, 0x6b, 0xbb, + 0xf7, 0x5b, 0x5f, 0x7b, 0xbf, 0x35, 0x77, 0xf9, 0xda, 0xdb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xa3, 0x0c, 0xe4, 0x85, 0x53, 0x02, 0x00, 0x00, } func (m *Baseinfo) Marshal() (dAtA []byte, err error) { @@ -369,11 +370,11 @@ i = encodeVarintEs(dAtA, i, uint64(len(m.Sex))) i += copy(dAtA[i:], m.Sex) } - if len(m.Idcard) > 0 { + if len(m.IdCard) > 0 { dAtA[i] = 0x52 i++ - i = encodeVarintEs(dAtA, i, uint64(len(m.Idcard))) - i += copy(dAtA[i:], m.Idcard) + i = encodeVarintEs(dAtA, i, uint64(len(m.IdCard))) + i += copy(dAtA[i:], m.IdCard) } if len(m.MonitorLevel) > 0 { dAtA[i] = 0x5a @@ -512,7 +513,7 @@ if l > 0 { n += 1 + l + sovEs(uint64(l)) } - l = len(m.Idcard) + l = len(m.IdCard) if l > 0 { n += 1 + l + sovEs(uint64(l)) } @@ -567,14 +568,7 @@ } func sovEs(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n + return (math_bits.Len64(x|1) + 6) / 7 } func sozEs(x uint64) (n int) { return sovEs(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -877,7 +871,7 @@ iNdEx = postIndex case 10: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Idcard", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field IdCard", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -905,7 +899,7 @@ if postIndex > l { return io.ErrUnexpectedEOF } - m.Idcard = string(dAtA[iNdEx:postIndex]) + m.IdCard = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 11: if wireType != 2 { diff --git a/es.proto b/es.proto index 0022842..1bc1f30 100644 --- a/es.proto +++ b/es.proto @@ -12,7 +12,7 @@ string personPicUrl =7; string phoneNum =8; string sex =9; - string idcard = 10; + string idCard = 10; string monitorLevel = 11; string content = 12; } -- Gitblit v1.8.0