From b773b31a4468c9d6d8fde6809e3661283c167a95 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 19 八月 2019 19:32:16 +0800
Subject: [PATCH] fix enable to int32
---
.idea/workspace.xml | 14 +++---
protomsg.proto | 2
protomsg.pb.go | 54 ++++++++++++---------------
3 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index affe49f..45eb425 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,12 +24,12 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
- <entry key="proto" value="270" />
+ <entry key="proto" value="275" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
- <entry key="PROTO" value="270" />
+ <entry key="PROTO" value="275" />
</counts>
</usages-collector>
<usages-collector id="statistics.lifecycle.project">
@@ -50,7 +50,7 @@
<entry file="file://$PROJECT_DIR$/protomsg.proto">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
- <caret line="318" column="18" selection-start-line="318" selection-start-column="18" selection-end-line="318" selection-end-column="18" />
+ <caret line="318" column="9" selection-start-line="318" selection-start-column="9" selection-end-line="318" selection-end-column="9" />
</state>
</provider>
</entry>
@@ -237,12 +237,12 @@
<workItem from="1564968876353" duration="2244000" />
<workItem from="1565313761365" duration="597000" />
<workItem from="1565337974976" duration="1231000" />
- <workItem from="1565955759598" duration="4308000" />
+ <workItem from="1565955759598" duration="4970000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="33464000" />
+ <option name="totallyTimeSpent" value="34126000" />
</component>
<component name="ToolWindowManager">
<frame x="46" y="78" width="1678" height="1052" extended-state="0" />
@@ -263,7 +263,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
- <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.25195968" />
+ <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.343785" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -352,7 +352,7 @@
<entry file="file://$PROJECT_DIR$/protomsg.proto">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
- <caret line="318" column="18" selection-start-line="318" selection-start-column="18" selection-end-line="318" selection-end-column="18" />
+ <caret line="318" column="9" selection-start-line="318" selection-start-column="9" selection-end-line="318" selection-end-column="9" />
</state>
</provider>
</entry>
diff --git a/protomsg.pb.go b/protomsg.pb.go
index c51eac9..1ecc060 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -2639,7 +2639,7 @@
PersonId string `protobuf:"bytes,3,opt,name=person_id,json=personId,proto3" json:"person_id,omitempty"`
Feature string `protobuf:"bytes,4,opt,name=feature,proto3" json:"feature,omitempty"`
Action DbAction `protobuf:"varint,5,opt,name=action,proto3,enum=protomsg.DbAction" json:"action,omitempty"`
- Enable bool `protobuf:"varint,6,opt,name=enable,proto3" json:"enable,omitempty"`
+ Enable int32 `protobuf:"varint,6,opt,name=enable,proto3" json:"enable,omitempty"`
}
func (m *EsPersonCacheChange) Reset() { *m = EsPersonCacheChange{} }
@@ -2710,11 +2710,11 @@
return DbAction_Insert
}
-func (m *EsPersonCacheChange) GetEnable() bool {
+func (m *EsPersonCacheChange) GetEnable() int32 {
if m != nil {
return m.Enable
}
- return false
+ return 0
}
func init() {
@@ -2758,7 +2758,7 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 2373 bytes of a gzipped FileDescriptorProto
+ // 2376 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x4b, 0x6f, 0x1c, 0xc7,
0xf1, 0xe7, 0xec, 0x7b, 0x6a, 0x1f, 0x5a, 0xb5, 0xf4, 0xb7, 0xc7, 0xf2, 0x5f, 0x34, 0x35, 0x91,
0x61, 0x42, 0xb0, 0x95, 0x80, 0xd2, 0x29, 0x87, 0x00, 0x34, 0x49, 0x05, 0x0b, 0x38, 0x02, 0x33,
@@ -2894,20 +2894,20 @@
0x03, 0xf7, 0x8e, 0xf4, 0xb1, 0x50, 0x3a, 0x4d, 0x0e, 0xf8, 0xea, 0xdc, 0x76, 0x4c, 0xf6, 0xb9,
0xad, 0xac, 0xa6, 0xad, 0x36, 0x12, 0xe9, 0x48, 0x37, 0xc4, 0x22, 0xdb, 0x3c, 0x3e, 0xb2, 0x35,
0xd6, 0x34, 0xb9, 0x6e, 0x95, 0xd2, 0xe6, 0xa1, 0x90, 0xd1, 0xee, 0x8d, 0x87, 0x82, 0x01, 0x16,
- 0x54, 0x09, 0xce, 0x6c, 0x3d, 0xb5, 0x59, 0x62, 0xc9, 0x46, 0x67, 0xee, 0xff, 0x60, 0x67, 0x7e,
- 0xc7, 0x77, 0xa4, 0x27, 0x7f, 0x76, 0x60, 0xd2, 0x9c, 0x02, 0xd8, 0x04, 0x46, 0xa7, 0xa1, 0xe9,
- 0xd7, 0xf3, 0x2d, 0x36, 0x87, 0x49, 0x49, 0xe1, 0x60, 0x39, 0x77, 0xd8, 0x7d, 0x98, 0x37, 0x11,
- 0x6c, 0x1f, 0xf3, 0x0e, 0x03, 0x18, 0x9c, 0x86, 0x24, 0xd1, 0x65, 0x53, 0x70, 0xcd, 0xfa, 0x24,
- 0xba, 0x98, 0xf7, 0xd8, 0x5d, 0x98, 0x56, 0x24, 0x86, 0xea, 0xbc, 0xcf, 0x5c, 0xe8, 0x9f, 0x86,
- 0xc8, 0x1d, 0xb0, 0x7b, 0x70, 0xa7, 0xdc, 0xce, 0x8e, 0x07, 0xf3, 0x21, 0x9b, 0x01, 0x9c, 0x86,
- 0xa7, 0xf6, 0x73, 0xc0, 0x7c, 0x64, 0x74, 0x32, 0xc5, 0x73, 0xee, 0x1a, 0x9d, 0x8e, 0x53, 0x29,
- 0x0f, 0xd2, 0xe4, 0x2c, 0x5e, 0xcf, 0xe1, 0xc9, 0x53, 0x18, 0x95, 0x17, 0x46, 0x4d, 0x16, 0x89,
- 0x16, 0x2a, 0x9f, 0x6f, 0xe1, 0xfa, 0x15, 0x0d, 0xdb, 0x73, 0x07, 0xd7, 0x87, 0x42, 0x8a, 0x5c,
- 0xcc, 0x3b, 0x4f, 0x9e, 0xc3, 0xac, 0xed, 0x22, 0xa3, 0xf3, 0xe1, 0x92, 0x2c, 0x31, 0xdf, 0x32,
- 0x5a, 0x59, 0xd2, 0xf8, 0x7d, 0xee, 0x7c, 0xe9, 0xfd, 0xe5, 0xcd, 0xb6, 0xf3, 0xed, 0x9b, 0x6d,
- 0xe7, 0x1f, 0x6f, 0xb6, 0x9d, 0xdf, 0xbf, 0xdd, 0xde, 0xfa, 0xf6, 0xed, 0xf6, 0xd6, 0xdf, 0xde,
- 0x6e, 0x6f, 0x2d, 0x07, 0x64, 0xf7, 0x67, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x47, 0x49,
- 0xe9, 0x15, 0x17, 0x00, 0x00,
+ 0x54, 0x09, 0xce, 0x6c, 0x3d, 0xb5, 0x59, 0x62, 0xc9, 0x46, 0x67, 0xee, 0xff, 0x60, 0x67, 0x6e,
+ 0x7f, 0x47, 0xea, 0x97, 0x77, 0x7b, 0xf2, 0x67, 0x07, 0x26, 0xcd, 0x29, 0x80, 0x4d, 0x60, 0x74,
+ 0x1a, 0x9a, 0x7e, 0x3d, 0xdf, 0x62, 0x73, 0x98, 0x94, 0x14, 0x0e, 0x96, 0x73, 0x87, 0xdd, 0x87,
+ 0x79, 0x13, 0xc1, 0xf6, 0x31, 0xef, 0x30, 0x80, 0xc1, 0x69, 0x48, 0x12, 0x5d, 0x36, 0x05, 0xd7,
+ 0xac, 0x4f, 0xa2, 0x8b, 0x79, 0x8f, 0xdd, 0x85, 0x69, 0x45, 0x62, 0xa8, 0xce, 0xfb, 0xcc, 0x85,
+ 0xfe, 0x69, 0x88, 0xdc, 0x01, 0xbb, 0x07, 0x77, 0xca, 0xed, 0xec, 0x78, 0x30, 0x1f, 0xb2, 0x19,
+ 0xc0, 0x69, 0x78, 0x6a, 0x3f, 0x07, 0xcc, 0x47, 0x46, 0x27, 0x53, 0x3c, 0xe7, 0xae, 0xd1, 0xe9,
+ 0x38, 0x95, 0xf2, 0x20, 0x4d, 0xce, 0xe2, 0xf5, 0x1c, 0x9e, 0x3c, 0x85, 0x51, 0x79, 0x61, 0xd4,
+ 0x64, 0x91, 0x68, 0xa1, 0xf2, 0xf9, 0x16, 0xae, 0x5f, 0xd1, 0xb0, 0x3d, 0x77, 0x70, 0x7d, 0x28,
+ 0xa4, 0xc8, 0xc5, 0xbc, 0xf3, 0xe4, 0x39, 0xcc, 0xda, 0x2e, 0x32, 0x3a, 0x1f, 0x2e, 0xc9, 0x12,
+ 0xf3, 0x2d, 0xa3, 0x95, 0x25, 0x8d, 0xdf, 0xe7, 0xce, 0x97, 0xde, 0x5f, 0xde, 0x6c, 0x3b, 0xdf,
+ 0xbe, 0xd9, 0x76, 0xfe, 0xf1, 0x66, 0xdb, 0xf9, 0xfd, 0xdb, 0xed, 0xad, 0x6f, 0xdf, 0x6e, 0x6f,
+ 0xfd, 0xed, 0xed, 0xf6, 0xd6, 0x72, 0x40, 0x76, 0x7f, 0xf6, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff,
+ 0xeb, 0xcd, 0x93, 0x4a, 0x15, 0x17, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -4790,15 +4790,10 @@
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Action))
}
- if m.Enable {
+ if m.Enable != 0 {
dAtA[i] = 0x30
i++
- if m.Enable {
- dAtA[i] = 1
- } else {
- dAtA[i] = 0
- }
- i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(m.Enable))
}
return i, nil
}
@@ -5809,8 +5804,8 @@
if m.Action != 0 {
n += 1 + sovProtomsg(uint64(m.Action))
}
- if m.Enable {
- n += 2
+ if m.Enable != 0 {
+ n += 1 + sovProtomsg(uint64(m.Enable))
}
return n
}
@@ -12622,7 +12617,7 @@
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType)
}
- var v int
+ m.Enable = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowProtomsg
@@ -12632,12 +12627,11 @@
}
b := dAtA[iNdEx]
iNdEx++
- v |= int(b&0x7F) << shift
+ m.Enable |= int32(b&0x7F) << shift
if b < 0x80 {
break
}
}
- m.Enable = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipProtomsg(dAtA[iNdEx:])
diff --git a/protomsg.proto b/protomsg.proto
index aba81c8..cc5acd6 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -317,5 +317,5 @@
string person_id = 3;//浜哄憳id
string feature = 4;//鐗瑰緛鍊糱ase64
DbAction action = 5;
- bool enable = 6;
+ int32 enable = 6;
}
--
Gitblit v1.8.0