From 2d44243bfce4a7561ca0056bd9e00d54764a257e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 29 六月 2019 10:33:17 +0800
Subject: [PATCH] new pb.go
---
protomsg.pb.go | 249 +++++++++++++++++++++++++++++--------------------
1 files changed, 147 insertions(+), 102 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 20c3633..91dcbb6 100644
--- a/protomsg.pb.go
+++ b/protomsg.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.
@@ -1015,6 +1016,7 @@
GroupText string `protobuf:"bytes,2,opt,name=group_text,json=groupText,proto3" json:"group_text,omitempty"`
AlarmLevel int32 `protobuf:"varint,3,opt,name=alarm_level,json=alarmLevel,proto3" json:"alarm_level,omitempty"`
Rules []*Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"`
+ SetType string `protobuf:"bytes,5,opt,name=set_type,json=setType,proto3" json:"set_type,omitempty"`
}
func (m *GroupRule) Reset() { *m = GroupRule{} }
@@ -1076,6 +1078,13 @@
return m.Rules
}
return nil
+}
+
+func (m *GroupRule) GetSetType() string {
+ if m != nil {
+ return m.SetType
+ }
+ return ""
}
type Rule struct {
@@ -1623,101 +1632,102 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1501 bytes of a gzipped FileDescriptorProto
+ // 1513 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x8e, 0x14, 0x47,
- 0x12, 0x9e, 0xea, 0xff, 0x8a, 0xfe, 0x99, 0x26, 0x61, 0xa1, 0x80, 0x65, 0x76, 0x28, 0x58, 0xed,
- 0x08, 0xed, 0x72, 0x18, 0x78, 0x81, 0x86, 0x59, 0xac, 0x96, 0x30, 0xc2, 0x35, 0x6d, 0x7c, 0x73,
- 0x29, 0xbb, 0x33, 0xa7, 0x29, 0x4d, 0x4d, 0x55, 0x2b, 0x33, 0x6b, 0x60, 0xde, 0xc1, 0x92, 0x7d,
- 0xf4, 0xd9, 0x37, 0x3f, 0x88, 0x25, 0x1f, 0x39, 0xfa, 0x66, 0x0b, 0x24, 0x5f, 0x2c, 0xbf, 0x83,
- 0x15, 0x91, 0x59, 0xd5, 0xd5, 0x0d, 0xb6, 0xb9, 0x45, 0x7c, 0x11, 0x95, 0x19, 0xf9, 0xc5, 0x97,
- 0x91, 0x05, 0xa3, 0x95, 0xca, 0x4d, 0x7e, 0xa6, 0x97, 0xf7, 0xc9, 0x60, 0xbd, 0xd2, 0xbf, 0x01,
- 0x73, 0xae, 0xa5, 0x45, 0xc3, 0x27, 0xd0, 0x9a, 0x28, 0xc9, 0xd9, 0x08, 0x1a, 0x89, 0x08, 0xbc,
- 0x7d, 0xef, 0xa0, 0x1d, 0x35, 0x12, 0xc1, 0x6e, 0x40, 0x6f, 0xc5, 0x95, 0xcc, 0x4c, 0x22, 0x82,
- 0x06, 0xa1, 0x95, 0xcf, 0x18, 0xb4, 0x32, 0x7e, 0x26, 0x83, 0xe6, 0xbe, 0x77, 0xe0, 0x47, 0x64,
- 0x87, 0x3f, 0x34, 0xa1, 0xf3, 0x98, 0x9f, 0x49, 0x55, 0x5f, 0xca, 0xa7, 0xa5, 0xca, 0xf4, 0xc6,
- 0x3a, 0x1d, 0x31, 0x73, 0xb1, 0xb2, 0x4b, 0xb4, 0x23, 0xb2, 0x11, 0xe3, 0x42, 0xa8, 0xa0, 0x65,
- 0xf3, 0xd0, 0x66, 0x57, 0xa1, 0xc3, 0x95, 0xe4, 0x89, 0x08, 0xda, 0x94, 0xe9, 0x3c, 0xf6, 0x4f,
- 0xf0, 0xd3, 0x3c, 0x5b, 0x26, 0xa6, 0x10, 0x32, 0xe8, 0xec, 0x7b, 0x07, 0x8d, 0x68, 0x0d, 0x60,
- 0xf1, 0x29, 0x37, 0x36, 0xd8, 0xa5, 0x60, 0xe5, 0xe3, 0x2e, 0xca, 0xe8, 0x55, 0xd0, 0xb3, 0xbb,
- 0xa0, 0x4d, 0x15, 0xaf, 0x02, 0xdf, 0x55, 0xbc, 0xc2, 0x9c, 0x55, 0xae, 0x4c, 0x00, 0xb6, 0x3a,
- 0xb4, 0x71, 0xcd, 0x42, 0x4b, 0x45, 0x27, 0xe9, 0x53, 0x66, 0xe5, 0x5b, 0xb2, 0xb4, 0x7e, 0x95,
- 0x2b, 0x11, 0x0c, 0x6c, 0xac, 0xf4, 0xd9, 0x15, 0x68, 0xcf, 0x15, 0xcf, 0x44, 0x30, 0xa4, 0x80,
- 0x75, 0xf0, 0x0b, 0x25, 0xb5, 0x54, 0xe7, 0x52, 0x04, 0x23, 0xfb, 0x45, 0xe9, 0xb3, 0x5b, 0x00,
- 0x89, 0x8e, 0x55, 0x91, 0x65, 0x49, 0xb6, 0x0c, 0x76, 0xf7, 0xbd, 0x83, 0x5e, 0xe4, 0x27, 0x3a,
- 0xb2, 0x00, 0x86, 0x55, 0x91, 0xc5, 0x32, 0xe3, 0xf3, 0x54, 0x06, 0x63, 0x1b, 0x56, 0x45, 0xf6,
- 0x7f, 0x02, 0xd8, 0x75, 0xe8, 0x61, 0x98, 0xd8, 0xbd, 0x44, 0xf5, 0x77, 0x55, 0x91, 0xcd, 0x90,
- 0xe0, 0x10, 0x86, 0x18, 0xa2, 0x6d, 0x54, 0x9c, 0x88, 0x80, 0xd1, 0xce, 0x7d, 0x55, 0x64, 0xc7,
- 0x84, 0x4d, 0x45, 0xb8, 0x80, 0x4b, 0xb6, 0x8d, 0x93, 0x4c, 0xcc, 0xb8, 0x3e, 0x9d, 0x66, 0x27,
- 0x39, 0x3b, 0x80, 0xce, 0x82, 0x40, 0xea, 0x6a, 0xff, 0x70, 0x7c, 0xbf, 0xd2, 0x96, 0x4d, 0x8e,
- 0x5c, 0x9c, 0xdd, 0x85, 0xb6, 0xe1, 0xfa, 0x54, 0x07, 0x8d, 0xfd, 0xe6, 0x41, 0xff, 0x70, 0xb4,
- 0x4e, 0xc4, 0xc5, 0x22, 0x1b, 0x0c, 0x7f, 0xf6, 0xa0, 0x85, 0x3e, 0xb6, 0x17, 0x91, 0x4a, 0x2e,
- 0xce, 0x43, 0x7a, 0xd0, 0xaa, 0xc9, 0xa6, 0xf2, 0xd9, 0x4d, 0xf0, 0x17, 0x4a, 0x72, 0x23, 0x63,
- 0x6e, 0x9c, 0x04, 0x7b, 0x16, 0x98, 0x98, 0x5a, 0x70, 0x7e, 0xe1, 0x84, 0xe4, 0x82, 0x8f, 0x2e,
- 0x30, 0x58, 0xac, 0x84, 0xfb, 0xb2, 0xed, 0x7a, 0x48, 0xc0, 0xc4, 0x60, 0x29, 0x8e, 0xd2, 0x0e,
- 0x51, 0xea, 0x3c, 0xe4, 0x33, 0xd1, 0x31, 0x4f, 0xb9, 0x3a, 0x23, 0x2d, 0xf5, 0xa2, 0x6e, 0xa2,
- 0x27, 0xe8, 0x62, 0x48, 0xc8, 0x34, 0x3e, 0x49, 0xf9, 0x92, 0xe4, 0xd4, 0x8b, 0xba, 0x42, 0xa6,
- 0x4f, 0x52, 0xbe, 0x0c, 0x67, 0xd0, 0xc7, 0x03, 0x1e, 0x0b, 0x4b, 0x60, 0x08, 0x2d, 0xac, 0xdf,
- 0xd1, 0xb7, 0xcd, 0x0a, 0xc5, 0xd8, 0x6d, 0x68, 0x69, 0x51, 0x31, 0x37, 0x5c, 0xe7, 0x1c, 0x8b,
- 0xd3, 0x88, 0x42, 0xe1, 0xaf, 0x0d, 0x00, 0x4b, 0x38, 0xb1, 0xb7, 0x7d, 0xd1, 0xf0, 0xf0, 0x14,
- 0x8d, 0xdd, 0xa5, 0xc5, 0xc3, 0x13, 0x30, 0x15, 0xec, 0x1a, 0x74, 0x71, 0x1b, 0x0c, 0x35, 0xd7,
- 0x5c, 0x4f, 0x05, 0xfb, 0x1f, 0xf8, 0x26, 0x39, 0x93, 0xb1, 0x2a, 0x52, 0x19, 0xb4, 0x68, 0xf3,
- 0x5a, 0x7f, 0x8f, 0xf8, 0xc5, 0x63, 0x93, 0x46, 0x3d, 0x4c, 0x89, 0x8a, 0x54, 0x92, 0xfc, 0x24,
- 0x5f, 0x18, 0x9b, 0x6f, 0x59, 0xf4, 0x09, 0xa1, 0xf0, 0x6d, 0x18, 0xd8, 0xb0, 0x90, 0xe7, 0xc9,
- 0xc2, 0x92, 0x89, 0x12, 0x43, 0xec, 0x88, 0xa0, 0x0d, 0xda, 0xba, 0x1b, 0xb4, 0xb1, 0x7f, 0x41,
- 0xdf, 0x75, 0xa8, 0x46, 0x2a, 0x58, 0x88, 0x12, 0xd6, 0x5d, 0xf2, 0x37, 0xba, 0xc4, 0xa0, 0xa5,
- 0x6b, 0x37, 0x16, 0x6d, 0x3c, 0x71, 0xa2, 0xe3, 0x93, 0x22, 0x4d, 0xe9, 0xc2, 0xf6, 0xa2, 0x4e,
- 0xa2, 0x9f, 0x14, 0x69, 0xca, 0xf6, 0x61, 0x90, 0x26, 0xd9, 0x69, 0x5c, 0xf2, 0x61, 0xaf, 0x2c,
- 0x20, 0x46, 0x92, 0x17, 0xe1, 0x67, 0x30, 0x72, 0x3c, 0x27, 0x67, 0x12, 0x0f, 0xfa, 0x51, 0x43,
- 0xed, 0x66, 0x9d, 0x49, 0xa7, 0xcc, 0x92, 0xb7, 0xf0, 0x19, 0x74, 0x2c, 0x97, 0x6c, 0x0c, 0x4d,
- 0xc1, 0x2f, 0xdc, 0xac, 0x45, 0x93, 0x1d, 0x02, 0xd8, 0x0f, 0x79, 0xb6, 0x94, 0x4e, 0x00, 0x97,
- 0x6b, 0x22, 0xc1, 0x35, 0x30, 0x14, 0xd1, 0xfa, 0x64, 0x86, 0x0f, 0xc0, 0xaf, 0x70, 0x1c, 0x32,
- 0xda, 0x70, 0x65, 0x5c, 0x81, 0xd6, 0xc1, 0x8d, 0x64, 0x56, 0x2a, 0x01, 0xcd, 0xf0, 0x05, 0x74,
- 0x9f, 0xe7, 0xe9, 0xc5, 0x32, 0xcf, 0x3e, 0xea, 0x40, 0xff, 0x81, 0xce, 0x2a, 0x4f, 0x32, 0xa3,
- 0x83, 0x26, 0xd5, 0xb4, 0xbb, 0xae, 0xe9, 0x39, 0xe2, 0x91, 0x0b, 0x87, 0x8b, 0x8a, 0x2f, 0xae,
- 0x4f, 0x27, 0x6a, 0xa9, 0x37, 0xb5, 0xe8, 0x6d, 0x69, 0xf1, 0x21, 0xf8, 0xc4, 0x3d, 0x57, 0xcb,
- 0x52, 0xef, 0xd7, 0x36, 0xef, 0xc4, 0x27, 0x2a, 0x2f, 0x56, 0xb8, 0x90, 0xbd, 0xf8, 0x68, 0x85,
- 0x5f, 0xc2, 0x70, 0x23, 0x54, 0x97, 0xb4, 0xb7, 0x21, 0xe9, 0x87, 0xd0, 0x5f, 0x62, 0x16, 0x75,
- 0x42, 0xbf, 0x4f, 0x28, 0x2d, 0x81, 0x5d, 0x89, 0x60, 0x59, 0x9a, 0x3a, 0xfc, 0xca, 0x03, 0xbf,
- 0x8a, 0xa0, 0x4a, 0xed, 0x1a, 0xd5, 0xea, 0x5d, 0xf2, 0xa7, 0x34, 0xa0, 0x6d, 0xc8, 0xc8, 0xd7,
- 0xc6, 0x11, 0xe6, 0x13, 0x32, 0x93, 0xaf, 0x0d, 0x8a, 0x98, 0xc6, 0x45, 0x9c, 0xca, 0x73, 0x99,
- 0xba, 0x27, 0x0e, 0x08, 0x7a, 0x8a, 0x08, 0x0e, 0x49, 0x5b, 0x58, 0x6b, 0x7b, 0x48, 0x52, 0x4d,
- 0x36, 0x18, 0xfe, 0xd6, 0x80, 0x56, 0xf4, 0x21, 0xe9, 0xdd, 0x85, 0x91, 0xa3, 0xb6, 0x3c, 0xbd,
- 0x2d, 0x61, 0xb0, 0xa8, 0x5a, 0x30, 0xdd, 0x1a, 0x06, 0xcd, 0xad, 0x06, 0xdc, 0x02, 0x58, 0x59,
- 0x1d, 0x60, 0xd4, 0xce, 0x49, 0xdf, 0x21, 0x53, 0xc1, 0xfe, 0x01, 0x1d, 0x2d, 0x68, 0xe5, 0xb6,
- 0xd3, 0x93, 0xc0, 0x25, 0x43, 0x18, 0x22, 0xcc, 0xd5, 0x32, 0xe6, 0x69, 0xc2, 0x75, 0x79, 0xb9,
- 0xb5, 0xc0, 0x06, 0x4d, 0x10, 0xc2, 0xc9, 0x9d, 0xaf, 0xa4, 0xe2, 0x26, 0x57, 0x74, 0xb9, 0xfd,
- 0xa8, 0xf2, 0xd9, 0x1d, 0x18, 0x96, 0xb6, 0x7d, 0x9f, 0xec, 0x1b, 0x3c, 0x28, 0xc1, 0xf2, 0x91,
- 0x2a, 0x37, 0x39, 0xe7, 0x69, 0x21, 0xdd, 0xb3, 0xec, 0x36, 0x79, 0x81, 0xd0, 0x07, 0x6f, 0x3b,
- 0x3d, 0x6e, 0xa9, 0x8c, 0x5f, 0x25, 0xe6, 0x65, 0xbc, 0x52, 0xe5, 0x23, 0xdd, 0x47, 0xf0, 0x8b,
- 0xc4, 0xbc, 0x7c, 0xae, 0x36, 0x7b, 0x3a, 0xd8, 0xe8, 0x69, 0xf8, 0x7d, 0x03, 0x9a, 0xc7, 0xe2,
- 0xfd, 0x99, 0x7a, 0x1d, 0x7a, 0x58, 0x0e, 0x95, 0x6b, 0x69, 0xee, 0x6a, 0x71, 0x4a, 0x95, 0xba,
- 0x50, 0xed, 0x57, 0x08, 0x43, 0xcf, 0xf0, 0xe2, 0xdc, 0x85, 0x16, 0x69, 0xfb, 0xbd, 0x71, 0x7a,
- 0x4c, 0xa7, 0x88, 0x28, 0x8a, 0xc7, 0x48, 0x16, 0x79, 0xe6, 0x48, 0x26, 0x1b, 0xef, 0x6c, 0xa1,
- 0x52, 0xc7, 0x2c, 0x9a, 0x28, 0x27, 0xf7, 0xa4, 0xe1, 0xe5, 0x77, 0xa4, 0x82, 0x85, 0x70, 0x02,
- 0xd4, 0x86, 0x26, 0x25, 0x58, 0x52, 0xdd, 0xd0, 0xa4, 0x84, 0x8d, 0x47, 0xd1, 0xdf, 0x7a, 0x14,
- 0xd7, 0x13, 0x15, 0xb6, 0xdf, 0xbd, 0x6a, 0x4a, 0xf7, 0xed, 0x7f, 0x44, 0xf9, 0xb8, 0x7d, 0xeb,
- 0x41, 0xc7, 0x1e, 0x04, 0x07, 0x8f, 0x95, 0x82, 0x1b, 0x3c, 0xe4, 0xfc, 0xed, 0x1f, 0x9f, 0xbf,
- 0xfe, 0xe3, 0x3b, 0x2b, 0xb4, 0x21, 0x01, 0xf6, 0x22, 0xb2, 0x11, 0x2b, 0xb2, 0xa4, 0x7c, 0x9f,
- 0xc9, 0xc6, 0x5d, 0xec, 0x68, 0xb4, 0xb4, 0x58, 0xa7, 0x52, 0x41, 0x77, 0xad, 0x82, 0xf0, 0x6b,
- 0x0f, 0x76, 0x8f, 0xe6, 0x8f, 0x5f, 0x62, 0xc2, 0xa7, 0x52, 0x6b, 0xbe, 0x94, 0xec, 0xbf, 0xf8,
- 0x4f, 0x82, 0x07, 0xc4, 0x1a, 0x47, 0x87, 0x57, 0xeb, 0x93, 0x66, 0x9e, 0x4a, 0x9b, 0x2c, 0x22,
- 0x9b, 0xe4, 0x04, 0xd0, 0xa8, 0x04, 0x70, 0x0f, 0x3a, 0x7c, 0x61, 0x92, 0x3c, 0xa3, 0xca, 0x47,
- 0x87, 0xac, 0xf6, 0x36, 0xce, 0x27, 0x14, 0x89, 0x5c, 0x06, 0x35, 0x34, 0x3b, 0xc9, 0xcb, 0x3f,
- 0x58, 0xb4, 0xc3, 0xdf, 0x3d, 0x18, 0xda, 0xd9, 0xf8, 0x67, 0x93, 0xf7, 0x2f, 0x9f, 0xed, 0x0f,
- 0xfc, 0x6b, 0xb3, 0x00, 0xba, 0xee, 0xae, 0xba, 0x9d, 0x4a, 0x17, 0x5f, 0x5f, 0xa3, 0x92, 0xe5,
- 0x52, 0xaa, 0x38, 0x4d, 0xb2, 0xf2, 0x79, 0xee, 0x3b, 0xec, 0x69, 0x92, 0x49, 0xf6, 0x6f, 0x18,
- 0x89, 0x44, 0x49, 0x2a, 0xd8, 0x26, 0x59, 0x52, 0x87, 0x15, 0x4a, 0x69, 0x65, 0xbb, 0xba, 0xb5,
- 0x76, 0xdd, 0x81, 0xa1, 0x90, 0x27, 0x32, 0x5b, 0xc8, 0x58, 0x1b, 0x6e, 0xac, 0xd4, 0xda, 0xd1,
- 0xc0, 0x81, 0xc7, 0x88, 0xdd, 0xfb, 0xce, 0x83, 0x41, 0x9d, 0x57, 0x36, 0x80, 0xde, 0x2c, 0xb6,
- 0x0c, 0x8c, 0x77, 0xd8, 0x18, 0x06, 0xa5, 0x87, 0x83, 0x6a, 0xec, 0xb1, 0x2b, 0x30, 0xae, 0x23,
- 0x38, 0xd9, 0xc7, 0x0d, 0x06, 0xd0, 0x99, 0xc5, 0x94, 0xd1, 0x64, 0x43, 0xf0, 0xad, 0x7d, 0x2c,
- 0x4e, 0xc7, 0x2d, 0x76, 0x09, 0x86, 0x95, 0x8b, 0x03, 0x72, 0xdc, 0x66, 0x3e, 0xb4, 0x67, 0x31,
- 0x46, 0x3b, 0xec, 0x32, 0xec, 0x96, 0xcb, 0x39, 0xc2, 0xc7, 0x5d, 0x36, 0x02, 0x98, 0xc5, 0x33,
- 0xf7, 0x14, 0x8f, 0x7b, 0xf7, 0xee, 0x43, 0xaf, 0x6c, 0x1e, 0xee, 0x34, 0xcd, 0xb4, 0x54, 0x66,
- 0xbc, 0x83, 0xf6, 0xe7, 0x74, 0x6f, 0xc6, 0x1e, 0xda, 0x47, 0x32, 0x95, 0x46, 0x8e, 0x1b, 0x8f,
- 0x82, 0x1f, 0xdf, 0xee, 0x79, 0x6f, 0xde, 0xee, 0x79, 0xbf, 0xbc, 0xdd, 0xf3, 0xbe, 0x79, 0xb7,
- 0xb7, 0xf3, 0xe6, 0xdd, 0xde, 0xce, 0x4f, 0xef, 0xf6, 0x76, 0xe6, 0x1d, 0x52, 0xc3, 0x83, 0x3f,
- 0x02, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x66, 0x5f, 0x69, 0x6e, 0x0d, 0x00, 0x00,
+ 0x12, 0x9e, 0xea, 0xff, 0x8a, 0xfe, 0x99, 0x26, 0x61, 0xa1, 0x16, 0x96, 0xd9, 0xa1, 0x60, 0xb5,
+ 0x23, 0xb4, 0xcb, 0x61, 0xe0, 0x05, 0x1a, 0x66, 0x59, 0xb5, 0xc4, 0x22, 0xb6, 0xa6, 0x97, 0xbd,
+ 0xb9, 0x94, 0xdd, 0x99, 0xd3, 0x94, 0xba, 0xa6, 0xaa, 0x95, 0x99, 0x35, 0x30, 0x4f, 0x61, 0x1f,
+ 0x7d, 0xf6, 0xc5, 0xf2, 0x83, 0x58, 0xf2, 0x91, 0xa3, 0x6f, 0xb6, 0x40, 0xf2, 0xc5, 0xf2, 0x3b,
+ 0x58, 0x11, 0x99, 0x55, 0x5d, 0xdd, 0x60, 0x9b, 0x5b, 0xc4, 0x17, 0x51, 0x99, 0x91, 0x5f, 0x7c,
+ 0x19, 0x59, 0x30, 0x5a, 0xab, 0xdc, 0xe4, 0xe7, 0x7a, 0xf9, 0x80, 0x0c, 0xd6, 0x2b, 0xfd, 0x9b,
+ 0x30, 0xe7, 0x5a, 0x5a, 0x34, 0x7c, 0x0a, 0xad, 0x89, 0x92, 0x9c, 0x8d, 0xa0, 0x91, 0x88, 0xc0,
+ 0x3b, 0xf4, 0x8e, 0xda, 0x51, 0x23, 0x11, 0xec, 0x26, 0xf4, 0xd6, 0x5c, 0xc9, 0xcc, 0x24, 0x22,
+ 0x68, 0x10, 0x5a, 0xf9, 0x8c, 0x41, 0x2b, 0xe3, 0xe7, 0x32, 0x68, 0x1e, 0x7a, 0x47, 0x7e, 0x44,
+ 0x76, 0xf8, 0x6d, 0x13, 0x3a, 0x4f, 0xf8, 0xb9, 0x54, 0xf5, 0xa5, 0x7c, 0x5a, 0xaa, 0x4c, 0x6f,
+ 0x6c, 0xd2, 0x11, 0x33, 0x97, 0x6b, 0xbb, 0x44, 0x3b, 0x22, 0x1b, 0x31, 0x2e, 0x84, 0x0a, 0x5a,
+ 0x36, 0x0f, 0x6d, 0x76, 0x1d, 0x3a, 0x5c, 0x49, 0x9e, 0x88, 0xa0, 0x4d, 0x99, 0xce, 0x63, 0x7f,
+ 0x01, 0x3f, 0xcd, 0xb3, 0x65, 0x62, 0x0a, 0x21, 0x83, 0xce, 0xa1, 0x77, 0xd4, 0x88, 0x36, 0x00,
+ 0x16, 0x9f, 0x72, 0x63, 0x83, 0x5d, 0x0a, 0x56, 0x3e, 0xee, 0xa2, 0x8c, 0x5e, 0x07, 0x3d, 0xbb,
+ 0x0b, 0xda, 0x54, 0xf1, 0x3a, 0xf0, 0x5d, 0xc5, 0x6b, 0xcc, 0x59, 0xe7, 0xca, 0x04, 0x60, 0xab,
+ 0x43, 0x1b, 0xd7, 0x2c, 0xb4, 0x54, 0x74, 0x92, 0x3e, 0x65, 0x56, 0xbe, 0x25, 0x4b, 0xeb, 0xd7,
+ 0xb9, 0x12, 0xc1, 0xc0, 0xc6, 0x4a, 0x9f, 0x5d, 0x83, 0xf6, 0x5c, 0xf1, 0x4c, 0x04, 0x43, 0x0a,
+ 0x58, 0x07, 0xbf, 0x50, 0x52, 0x4b, 0x75, 0x21, 0x45, 0x30, 0xb2, 0x5f, 0x94, 0x3e, 0xbb, 0x0d,
+ 0x90, 0xe8, 0x58, 0x15, 0x59, 0x96, 0x64, 0xcb, 0x60, 0xff, 0xd0, 0x3b, 0xea, 0x45, 0x7e, 0xa2,
+ 0x23, 0x0b, 0x60, 0x58, 0x15, 0x59, 0x2c, 0x33, 0x3e, 0x4f, 0x65, 0x30, 0xb6, 0x61, 0x55, 0x64,
+ 0xff, 0x22, 0x80, 0xfd, 0x19, 0x7a, 0x18, 0x26, 0x76, 0xaf, 0x50, 0xfd, 0x5d, 0x55, 0x64, 0x33,
+ 0x24, 0x38, 0x84, 0x21, 0x86, 0x68, 0x1b, 0x15, 0x27, 0x22, 0x60, 0xb4, 0x73, 0x5f, 0x15, 0xd9,
+ 0x29, 0x61, 0x53, 0x11, 0x2e, 0xe0, 0x8a, 0x6d, 0xe3, 0x24, 0x13, 0x33, 0xae, 0x57, 0xd3, 0xec,
+ 0x2c, 0x67, 0x47, 0xd0, 0x59, 0x10, 0x48, 0x5d, 0xed, 0x1f, 0x8f, 0x1f, 0x54, 0xda, 0xb2, 0xc9,
+ 0x91, 0x8b, 0xb3, 0x7b, 0xd0, 0x36, 0x5c, 0xaf, 0x74, 0xd0, 0x38, 0x6c, 0x1e, 0xf5, 0x8f, 0x47,
+ 0x9b, 0x44, 0x5c, 0x2c, 0xb2, 0xc1, 0xf0, 0x07, 0x0f, 0x5a, 0xe8, 0x63, 0x7b, 0x11, 0xa9, 0xe4,
+ 0xe2, 0x3c, 0xa4, 0x07, 0xad, 0x9a, 0x6c, 0x2a, 0x9f, 0xdd, 0x02, 0x7f, 0xa1, 0x24, 0x37, 0x32,
+ 0xe6, 0xc6, 0x49, 0xb0, 0x67, 0x81, 0x89, 0xa9, 0x05, 0xe7, 0x97, 0x4e, 0x48, 0x2e, 0xf8, 0xf8,
+ 0x12, 0x83, 0xc5, 0x5a, 0xb8, 0x2f, 0xdb, 0xae, 0x87, 0x04, 0x4c, 0x0c, 0x96, 0xe2, 0x28, 0xed,
+ 0x10, 0xa5, 0xce, 0x43, 0x3e, 0x13, 0x1d, 0xf3, 0x94, 0xab, 0x73, 0xd2, 0x52, 0x2f, 0xea, 0x26,
+ 0x7a, 0x82, 0x2e, 0x86, 0x84, 0x4c, 0xe3, 0xb3, 0x94, 0x2f, 0x49, 0x4e, 0xbd, 0xa8, 0x2b, 0x64,
+ 0xfa, 0x34, 0xe5, 0xcb, 0x70, 0x06, 0x7d, 0x3c, 0xe0, 0xa9, 0xb0, 0x04, 0x86, 0xd0, 0xc2, 0xfa,
+ 0x1d, 0x7d, 0xbb, 0xac, 0x50, 0x8c, 0xdd, 0x81, 0x96, 0x16, 0x15, 0x73, 0xc3, 0x4d, 0xce, 0xa9,
+ 0x58, 0x45, 0x14, 0x0a, 0x7f, 0x6a, 0x00, 0x58, 0xc2, 0x89, 0xbd, 0xdd, 0x8b, 0x86, 0x87, 0xa7,
+ 0x68, 0xec, 0x2e, 0x2d, 0x1e, 0x9e, 0x80, 0xa9, 0x60, 0x37, 0xa0, 0x8b, 0xdb, 0x60, 0xa8, 0xb9,
+ 0xe1, 0x7a, 0x2a, 0xd8, 0x3f, 0xc1, 0x37, 0xc9, 0xb9, 0x8c, 0x55, 0x91, 0xca, 0xa0, 0x45, 0x9b,
+ 0xd7, 0xfa, 0x7b, 0xc2, 0x2f, 0x9f, 0x98, 0x34, 0xea, 0x61, 0x4a, 0x54, 0xa4, 0x92, 0xe4, 0x27,
+ 0xf9, 0xc2, 0xd8, 0x7c, 0xcb, 0xa2, 0x4f, 0x08, 0x85, 0xef, 0xc0, 0xc0, 0x86, 0x85, 0xbc, 0x48,
+ 0x16, 0x96, 0x4c, 0x94, 0x18, 0x62, 0x27, 0x04, 0x6d, 0xd1, 0xd6, 0xdd, 0xa2, 0x8d, 0xfd, 0x15,
+ 0xfa, 0xae, 0x43, 0x35, 0x52, 0xc1, 0x42, 0x94, 0xb0, 0xe9, 0x92, 0xbf, 0xd5, 0x25, 0x06, 0x2d,
+ 0x5d, 0xbb, 0xb1, 0x68, 0xe3, 0x89, 0x13, 0x1d, 0x9f, 0x15, 0x69, 0x4a, 0x17, 0xb6, 0x17, 0x75,
+ 0x12, 0xfd, 0xb4, 0x48, 0x53, 0x76, 0x08, 0x83, 0x34, 0xc9, 0x56, 0x71, 0xc9, 0x87, 0xbd, 0xb2,
+ 0x80, 0x18, 0x49, 0x5e, 0x84, 0xff, 0x85, 0x91, 0xe3, 0x39, 0x39, 0x97, 0x78, 0xd0, 0x4f, 0x1a,
+ 0x6a, 0xb7, 0xea, 0x4c, 0x3a, 0x65, 0x96, 0xbc, 0x85, 0xcf, 0xa1, 0x63, 0xb9, 0x64, 0x63, 0x68,
+ 0x0a, 0x7e, 0xe9, 0x66, 0x2d, 0x9a, 0xec, 0x18, 0xc0, 0x7e, 0xc8, 0xb3, 0xa5, 0x74, 0x02, 0xb8,
+ 0x5a, 0x13, 0x09, 0xae, 0x81, 0xa1, 0x88, 0xd6, 0x27, 0x33, 0x7c, 0x08, 0x7e, 0x85, 0xe3, 0x90,
+ 0xd1, 0x86, 0x2b, 0xe3, 0x0a, 0xb4, 0x0e, 0x6e, 0x24, 0xb3, 0x52, 0x09, 0x68, 0x86, 0x2f, 0xa1,
+ 0xfb, 0x22, 0x4f, 0x2f, 0x97, 0x79, 0xf6, 0x49, 0x07, 0xfa, 0x3b, 0x74, 0xd6, 0x79, 0x92, 0x19,
+ 0x1d, 0x34, 0xa9, 0xa6, 0xfd, 0x4d, 0x4d, 0x2f, 0x10, 0x8f, 0x5c, 0x38, 0x5c, 0x54, 0x7c, 0x71,
+ 0xbd, 0x9a, 0xa8, 0xa5, 0xde, 0xd6, 0xa2, 0xb7, 0xa3, 0xc5, 0x47, 0xe0, 0x13, 0xf7, 0x5c, 0x2d,
+ 0x4b, 0xbd, 0xdf, 0xd8, 0xbe, 0x13, 0xff, 0x56, 0x79, 0xb1, 0xc6, 0x85, 0xec, 0xc5, 0x47, 0x2b,
+ 0xfc, 0x0c, 0x86, 0x5b, 0xa1, 0xba, 0xa4, 0xbd, 0x2d, 0x49, 0x3f, 0x82, 0xfe, 0x12, 0xb3, 0xa8,
+ 0x13, 0xfa, 0x43, 0x42, 0x69, 0x09, 0xec, 0x4a, 0x04, 0xcb, 0xd2, 0xd4, 0xe1, 0xd7, 0x1e, 0xf8,
+ 0x55, 0x04, 0x55, 0x6a, 0xd7, 0xa8, 0x56, 0xef, 0x92, 0x3f, 0xa5, 0x01, 0x6d, 0x43, 0x46, 0xbe,
+ 0x31, 0x8e, 0x30, 0x9f, 0x90, 0x99, 0x7c, 0x63, 0x50, 0xc4, 0x34, 0x2e, 0xe2, 0x54, 0x5e, 0xc8,
+ 0xd4, 0x3d, 0x71, 0x40, 0xd0, 0x33, 0x44, 0x70, 0x48, 0xda, 0xc2, 0x5a, 0xbb, 0x43, 0x92, 0x6a,
+ 0xb2, 0x41, 0x2c, 0x40, 0x4b, 0x63, 0x07, 0xb9, 0xbd, 0x66, 0x5d, 0x2d, 0x0d, 0x0e, 0xf2, 0xf0,
+ 0xe7, 0x06, 0xb4, 0xa2, 0x8f, 0xa9, 0xf2, 0x1e, 0x8c, 0x1c, 0xeb, 0x25, 0x31, 0xb6, 0xba, 0xc1,
+ 0xa2, 0xea, 0xce, 0x74, 0x67, 0x4e, 0x34, 0x77, 0x7a, 0x73, 0x1b, 0x60, 0x6d, 0x25, 0x82, 0x51,
+ 0x3b, 0x42, 0x7d, 0x87, 0x4c, 0x05, 0xfb, 0x13, 0x74, 0xb4, 0xa0, 0x95, 0xdb, 0x4e, 0x6a, 0x02,
+ 0x97, 0x0c, 0x61, 0x88, 0x30, 0x57, 0xcb, 0x98, 0xa7, 0x09, 0xd7, 0xe5, 0xbd, 0xd7, 0x02, 0x7b,
+ 0x37, 0x41, 0x08, 0x87, 0x7a, 0xbe, 0x96, 0x8a, 0x9b, 0x5c, 0xd1, 0xbd, 0xf7, 0xa3, 0xca, 0x67,
+ 0x77, 0x61, 0x58, 0xda, 0xf6, 0xc4, 0xf6, 0x79, 0x1e, 0x94, 0x60, 0xf9, 0x7e, 0x95, 0x9b, 0x5c,
+ 0xf0, 0xb4, 0x90, 0xee, 0xc5, 0x76, 0x9b, 0xbc, 0x44, 0xe8, 0xa3, 0x83, 0x80, 0xde, 0xbd, 0x54,
+ 0xc6, 0xaf, 0x13, 0xf3, 0x2a, 0x5e, 0xab, 0xf2, 0xfd, 0xee, 0x23, 0xf8, 0xff, 0xc4, 0xbc, 0x7a,
+ 0xa1, 0xb6, 0xdb, 0x3d, 0xd8, 0x6a, 0x77, 0xf8, 0x4d, 0x03, 0x9a, 0xa7, 0xe2, 0xc3, 0x71, 0x8b,
+ 0x0d, 0x12, 0x2b, 0x5b, 0x6e, 0xc3, 0x35, 0x48, 0xac, 0xa8, 0x52, 0x17, 0xaa, 0xfd, 0x25, 0x61,
+ 0xe8, 0x39, 0xde, 0xa9, 0x7b, 0xd0, 0x22, 0xd9, 0x7f, 0x30, 0x69, 0x4f, 0xe9, 0x14, 0x11, 0x45,
+ 0xf1, 0x18, 0xc9, 0x22, 0xcf, 0x1c, 0xc9, 0x64, 0xe3, 0x75, 0x2e, 0x54, 0xea, 0x98, 0x45, 0x13,
+ 0x95, 0xe6, 0x5e, 0x3b, 0x9c, 0x0b, 0x8e, 0x54, 0xb0, 0x10, 0x0e, 0x87, 0xda, 0x3c, 0xa5, 0x04,
+ 0x4b, 0xaa, 0x9b, 0xa7, 0x94, 0xb0, 0xf5, 0x5e, 0xfa, 0x3b, 0xef, 0xe5, 0x66, 0xd8, 0xc2, 0xee,
+ 0x93, 0x58, 0x0d, 0xf0, 0xbe, 0xfd, 0xc5, 0x28, 0xdf, 0xbd, 0x2f, 0x3d, 0xe8, 0xd8, 0x83, 0xe0,
+ 0x4c, 0xb2, 0x52, 0x70, 0x33, 0x89, 0x9c, 0x3f, 0xfc, 0x19, 0xf4, 0x37, 0x3f, 0x83, 0xe7, 0x85,
+ 0x36, 0x24, 0xc0, 0x5e, 0x44, 0x36, 0x62, 0x45, 0x96, 0x94, 0x4f, 0x37, 0xd9, 0xb8, 0x8b, 0x9d,
+ 0x9a, 0x96, 0x16, 0xeb, 0x54, 0x2a, 0xe8, 0x6e, 0x54, 0x10, 0x7e, 0xee, 0xc1, 0xfe, 0xc9, 0xfc,
+ 0xc9, 0x2b, 0x4c, 0xf8, 0x8f, 0xd4, 0x9a, 0x2f, 0x25, 0xfb, 0x07, 0xfe, 0xae, 0xe0, 0x01, 0xb1,
+ 0xc6, 0xd1, 0xf1, 0xf5, 0xfa, 0x10, 0x9a, 0xa7, 0xd2, 0x26, 0x8b, 0xc8, 0x26, 0x39, 0x01, 0x34,
+ 0x2a, 0x01, 0xdc, 0x87, 0x0e, 0x5f, 0x98, 0x24, 0xcf, 0xa8, 0xf2, 0xd1, 0x31, 0xab, 0x3d, 0x9b,
+ 0xf3, 0x09, 0x45, 0x22, 0x97, 0x41, 0x0d, 0xcd, 0xce, 0xf2, 0xf2, 0xe7, 0x16, 0xed, 0xf0, 0x17,
+ 0x0f, 0x86, 0x76, 0x6c, 0xfe, 0xd6, 0x50, 0xfe, 0xdd, 0x17, 0xfd, 0x23, 0xbf, 0xe1, 0x2c, 0x80,
+ 0xae, 0xbb, 0xab, 0x6e, 0xa7, 0xd2, 0xc5, 0x87, 0xd9, 0xa8, 0x64, 0xb9, 0x94, 0x2a, 0x4e, 0x93,
+ 0xac, 0x1c, 0x29, 0x7d, 0x87, 0x3d, 0x4b, 0x32, 0xc9, 0xfe, 0x06, 0x23, 0x91, 0x28, 0x49, 0x05,
+ 0xdb, 0x24, 0x4b, 0xea, 0xb0, 0x42, 0x29, 0xad, 0x6c, 0x57, 0xb7, 0xd6, 0xae, 0xbb, 0x30, 0x14,
+ 0xf2, 0x4c, 0x66, 0x0b, 0x19, 0x6b, 0xc3, 0x8d, 0x95, 0x5a, 0x3b, 0x1a, 0x38, 0xf0, 0x14, 0xb1,
+ 0xfb, 0x5f, 0x79, 0x30, 0xa8, 0xf3, 0xca, 0x06, 0xd0, 0x9b, 0xc5, 0x96, 0x81, 0xf1, 0x1e, 0x1b,
+ 0xc3, 0xa0, 0xf4, 0x70, 0x50, 0x8d, 0x3d, 0x76, 0x0d, 0xc6, 0x75, 0x04, 0x87, 0xfe, 0xb8, 0xc1,
+ 0x00, 0x3a, 0xb3, 0x98, 0x32, 0x9a, 0x6c, 0x08, 0xbe, 0xb5, 0x4f, 0xc5, 0x6a, 0xdc, 0x62, 0x57,
+ 0x60, 0x58, 0xb9, 0x38, 0x20, 0xc7, 0x6d, 0xe6, 0x43, 0x7b, 0x16, 0x63, 0xb4, 0xc3, 0xae, 0xc2,
+ 0x7e, 0xb9, 0x9c, 0x23, 0x7c, 0xdc, 0x65, 0x23, 0x80, 0x59, 0x3c, 0x73, 0xaf, 0xf4, 0xb8, 0x77,
+ 0xff, 0x01, 0xf4, 0xca, 0xe6, 0xe1, 0x4e, 0xd3, 0x4c, 0x4b, 0x65, 0xc6, 0x7b, 0x68, 0xff, 0x8f,
+ 0xee, 0xcd, 0xd8, 0x43, 0xfb, 0x44, 0xa6, 0xd2, 0xc8, 0x71, 0xe3, 0x71, 0xf0, 0xdd, 0xbb, 0x03,
+ 0xef, 0xed, 0xbb, 0x03, 0xef, 0xc7, 0x77, 0x07, 0xde, 0x17, 0xef, 0x0f, 0xf6, 0xde, 0xbe, 0x3f,
+ 0xd8, 0xfb, 0xfe, 0xfd, 0xc1, 0xde, 0xbc, 0x43, 0x6a, 0x78, 0xf8, 0x6b, 0x00, 0x00, 0x00, 0xff,
+ 0xff, 0x52, 0x77, 0x28, 0xfa, 0x89, 0x0d, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -2417,6 +2427,12 @@
}
i += n
}
+ }
+ if len(m.SetType) > 0 {
+ dAtA[i] = 0x2a
+ i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(len(m.SetType)))
+ i += copy(dAtA[i:], m.SetType)
}
return i, nil
}
@@ -3142,6 +3158,10 @@
n += 1 + l + sovProtomsg(uint64(l))
}
}
+ l = len(m.SetType)
+ if l > 0 {
+ n += 1 + l + sovProtomsg(uint64(l))
+ }
return n
}
@@ -3353,14 +3373,7 @@
}
func sovProtomsg(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozProtomsg(x uint64) (n int) {
return sovProtomsg(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -5803,6 +5816,38 @@
return err
}
iNdEx = postIndex
+ case 5:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field SetType", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ 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 ErrInvalidLengthProtomsg
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.SetType = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipProtomsg(dAtA[iNdEx:])
--
Gitblit v1.8.0