From 0d3ee5a9c502fd42f635a719104293f94bc3cfb7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 22 六月 2019 12:40:13 +0800
Subject: [PATCH] changes
---
sysset.proto | 40 +++-
protomsg.proto | 4
sysset.pb.go | 252 ++++++++++++++++++++++++---
protomsg.pb.go | 216 +++++++++++++-----------
4 files changed, 375 insertions(+), 137 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index cf0fcb9..2bd99c7 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -1134,7 +1134,9 @@
type GroupRule struct {
GroupId string `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
- Rules []*Rule `protobuf:"bytes,2,rep,name=rules,proto3" json:"rules,omitempty"`
+ 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"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -1170,6 +1172,20 @@
return m.GroupId
}
return ""
+}
+
+func (m *GroupRule) GetGroupText() string {
+ if m != nil {
+ return m.GroupText
+ }
+ return ""
+}
+
+func (m *GroupRule) GetAlarmLevel() int32 {
+ if m != nil {
+ return m.AlarmLevel
+ }
+ return 0
}
func (m *GroupRule) GetRules() []*Rule {
@@ -1702,102 +1718,104 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1538 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcd, 0x92, 0xdb, 0xc4,
- 0x13, 0x8f, 0xbf, 0x64, 0xab, 0xfd, 0x11, 0x67, 0xfe, 0xf9, 0x27, 0x4a, 0x42, 0x8a, 0x8d, 0x12,
- 0x8a, 0xad, 0x14, 0xc9, 0x61, 0x93, 0x17, 0x30, 0x59, 0x42, 0xb9, 0x2a, 0xa4, 0x82, 0xbc, 0x84,
- 0x1b, 0xaa, 0xb1, 0x67, 0x56, 0x51, 0x59, 0x1e, 0xb9, 0x66, 0xa4, 0x84, 0x3d, 0xf0, 0x04, 0x1c,
- 0xb8, 0xf2, 0x0a, 0x3c, 0x08, 0xcf, 0xc1, 0x8d, 0x0b, 0xc5, 0x3b, 0x50, 0xdd, 0x33, 0x92, 0x65,
- 0x67, 0x81, 0x14, 0xb7, 0xfe, 0xd2, 0x4c, 0xf7, 0xaf, 0xbf, 0x46, 0x30, 0xd9, 0xea, 0xbc, 0xc8,
- 0x37, 0x26, 0x79, 0x4c, 0x04, 0x1b, 0x54, 0xfc, 0x6d, 0x58, 0x72, 0x23, 0xad, 0x34, 0x2c, 0x60,
- 0xb2, 0x10, 0xeb, 0x8d, 0x49, 0xbe, 0x4d, 0x8b, 0x37, 0x67, 0xdc, 0xac, 0xd9, 0x75, 0xe8, 0x19,
- 0xb1, 0x4e, 0x45, 0xd0, 0x3a, 0x6a, 0x1d, 0xfb, 0x91, 0x65, 0x58, 0x00, 0x7d, 0x23, 0xd6, 0xc5,
- 0xc5, 0x56, 0x06, 0x6d, 0x92, 0x57, 0xac, 0xd3, 0xbc, 0xe4, 0x1b, 0x19, 0x74, 0x6a, 0x0d, 0xb2,
- 0x4e, 0x23, 0x78, 0xc1, 0x83, 0xee, 0x51, 0xeb, 0x78, 0x14, 0x55, 0x6c, 0xf8, 0x63, 0x0b, 0x7c,
- 0xbc, 0xec, 0x05, 0x5f, 0xca, 0x8c, 0xdd, 0x00, 0xaf, 0xe0, 0x66, 0x77, 0xa5, 0xe3, 0xd8, 0x6d,
- 0x18, 0x20, 0xa5, 0xf0, 0x68, 0x7b, 0x69, 0xcd, 0xb3, 0xa7, 0x30, 0x40, 0xc7, 0xd4, 0x79, 0x6e,
- 0x82, 0xce, 0x51, 0xe7, 0x78, 0x78, 0x12, 0x3c, 0xae, 0x03, 0xde, 0x8f, 0x28, 0xaa, 0x2d, 0x31,
- 0xb6, 0x54, 0x09, 0xf9, 0x3d, 0xf9, 0xd3, 0x8b, 0x2c, 0x13, 0xbe, 0x03, 0x58, 0x88, 0xf5, 0x57,
- 0xd2, 0x18, 0x9e, 0x48, 0x36, 0x85, 0xce, 0xaa, 0x76, 0x05, 0x49, 0xfc, 0x6a, 0xc5, 0x85, 0xd0,
- 0xce, 0x09, 0xcb, 0xb0, 0x47, 0xd0, 0x47, 0x6f, 0x32, 0xbe, 0xa4, 0xb8, 0x87, 0x27, 0xff, 0xdb,
- 0x39, 0x50, 0xc7, 0x16, 0x55, 0x36, 0x8c, 0x41, 0xb7, 0x81, 0x04, 0xd1, 0xe1, 0x73, 0xe8, 0xce,
- 0xb4, 0xe4, 0x6c, 0x02, 0x6d, 0x77, 0x63, 0x2f, 0x6a, 0xdb, 0xc0, 0xb7, 0x5c, 0x4b, 0x55, 0xa4,
- 0x82, 0xee, 0xec, 0x45, 0x35, 0x8f, 0xe7, 0xa8, 0x1d, 0xd6, 0x44, 0x87, 0xbf, 0x76, 0xc0, 0x7b,
- 0xc6, 0x37, 0x52, 0x37, 0x8f, 0xf2, 0xe9, 0xa8, 0xca, 0xbc, 0xbd, 0x33, 0x47, 0x19, 0x25, 0xb2,
- 0x43, 0x47, 0x13, 0x8d, 0x32, 0x0a, 0xb1, 0x6b, 0xed, 0x28, 0xc2, 0x1b, 0xe0, 0x71, 0x2d, 0x79,
- 0x2a, 0x82, 0x1e, 0x59, 0x3a, 0x8e, 0x7d, 0x04, 0x7e, 0x96, 0xab, 0x24, 0x2d, 0x4a, 0x21, 0x03,
- 0xef, 0xa8, 0x75, 0xdc, 0x8e, 0x76, 0x02, 0x74, 0x3e, 0xe3, 0x85, 0x55, 0xf6, 0x49, 0x59, 0xf3,
- 0x78, 0x8b, 0x2e, 0xcc, 0x36, 0x18, 0xd8, 0x5b, 0x90, 0x26, 0x8f, 0xb7, 0x81, 0xef, 0x3c, 0xde,
- 0xa2, 0xcd, 0x36, 0xd7, 0x45, 0x00, 0xd6, 0x3b, 0xa4, 0xf1, 0xcc, 0xd2, 0x48, 0x4d, 0x91, 0x0c,
- 0x6d, 0x25, 0x54, 0xbc, 0x05, 0xcb, 0x98, 0x77, 0xb9, 0x16, 0xc1, 0xc8, 0xea, 0x2a, 0x1e, 0x33,
- 0xb7, 0xd4, 0x5c, 0x89, 0x60, 0x6c, 0x33, 0x47, 0x0c, 0x7e, 0xa1, 0xa5, 0x91, 0xfa, 0xad, 0x14,
- 0xc1, 0xc4, 0x7e, 0x51, 0xf1, 0xec, 0x2e, 0x40, 0x6a, 0x62, 0x5d, 0x2a, 0x95, 0xaa, 0x24, 0xb8,
- 0x7a, 0xd4, 0x3a, 0x1e, 0x44, 0x7e, 0x6a, 0x22, 0x2b, 0x40, 0xb5, 0x2e, 0x55, 0x2c, 0x15, 0x5f,
- 0x66, 0x32, 0x98, 0x5a, 0xb5, 0x2e, 0xd5, 0x17, 0x24, 0x60, 0xb7, 0x60, 0x80, 0x6a, 0x42, 0xf7,
- 0x1a, 0xf9, 0xdf, 0xd7, 0xa5, 0x3a, 0x43, 0x80, 0x43, 0x18, 0xa3, 0x8a, 0xae, 0xd1, 0x71, 0x2a,
- 0x02, 0x46, 0x37, 0x0f, 0x75, 0xa9, 0x16, 0x24, 0x9b, 0x8b, 0x70, 0x05, 0xd7, 0x6c, 0x1a, 0x67,
- 0x4a, 0x60, 0x09, 0xcd, 0xd5, 0x79, 0xce, 0x8e, 0xc1, 0x5b, 0x91, 0x90, 0xb2, 0x3a, 0x3c, 0x99,
- 0xee, 0xca, 0xcc, 0x1a, 0x47, 0x4e, 0xcf, 0x1e, 0x40, 0x0f, 0xab, 0xcd, 0x04, 0x6d, 0x6a, 0x88,
- 0xc9, 0x7e, 0x3d, 0x46, 0x56, 0x19, 0xfe, 0xd6, 0x82, 0x2e, 0x35, 0xfa, 0x7f, 0x69, 0xbb, 0x3b,
- 0xe0, 0xaf, 0xb4, 0xe4, 0x85, 0x8c, 0x79, 0xe1, 0x4a, 0x70, 0x60, 0x05, 0xb3, 0xa2, 0xa1, 0x5c,
- 0x5e, 0xb8, 0x42, 0x72, 0xca, 0xcf, 0x2f, 0x50, 0x59, 0x6e, 0x85, 0xfb, 0xb2, 0xe7, 0x72, 0x48,
- 0x82, 0x59, 0x81, 0xae, 0x38, 0x48, 0x3d, 0x82, 0xd4, 0x71, 0x88, 0x67, 0x6a, 0x62, 0x9e, 0x71,
- 0xbd, 0xa1, 0x5a, 0x1a, 0x44, 0xfd, 0xd4, 0xcc, 0x90, 0x45, 0x95, 0x90, 0x59, 0x7c, 0x9e, 0xf1,
- 0x84, 0xca, 0x69, 0x10, 0xf5, 0x85, 0xcc, 0x9e, 0x67, 0x3c, 0x09, 0xcf, 0x60, 0x88, 0x01, 0x2e,
- 0x84, 0x05, 0x30, 0x84, 0x2e, 0xfa, 0xef, 0xe0, 0x3b, 0x44, 0x85, 0x74, 0xec, 0x1e, 0x74, 0x8d,
- 0xa8, 0x91, 0x1b, 0xef, 0x8d, 0x92, 0x88, 0x54, 0xe1, 0xef, 0x6d, 0x00, 0x0b, 0x38, 0xa1, 0x77,
- 0xd8, 0x68, 0x18, 0x3c, 0x69, 0x63, 0xd7, 0xb4, 0x18, 0x3c, 0x09, 0xe6, 0x82, 0xdd, 0xb4, 0xb3,
- 0x02, 0x55, 0x9d, 0x1d, 0xd6, 0x73, 0xc1, 0x1e, 0x81, 0x5f, 0xa4, 0x1b, 0x19, 0xeb, 0x32, 0x93,
- 0x41, 0x97, 0x2e, 0x6f, 0xe4, 0xf7, 0x94, 0x5f, 0x3c, 0x2b, 0xb2, 0x68, 0x80, 0x26, 0x51, 0x99,
- 0x49, 0x2a, 0x3f, 0xc9, 0x57, 0x85, 0xb5, 0xb7, 0x28, 0xfa, 0x24, 0x21, 0xf5, 0x3d, 0x18, 0x59,
- 0xb5, 0x90, 0x6f, 0xd3, 0x95, 0x05, 0x13, 0x4b, 0x0c, 0x65, 0xa7, 0x24, 0xda, 0x83, 0xad, 0xbf,
- 0x07, 0x1b, 0xfb, 0x18, 0x86, 0x2e, 0x43, 0x0d, 0x50, 0xc1, 0x8a, 0xc8, 0x60, 0x97, 0x25, 0x7f,
- 0x2f, 0x4b, 0x0c, 0xba, 0xa6, 0xd1, 0xb1, 0x48, 0x63, 0xc4, 0xa9, 0x89, 0xcf, 0xcb, 0x2c, 0xa3,
- 0x86, 0x1d, 0x44, 0x5e, 0x6a, 0x9e, 0x97, 0x59, 0xc6, 0x8e, 0x60, 0x94, 0xa5, 0x6a, 0x1d, 0x57,
- 0x78, 0xd8, 0x96, 0x05, 0x94, 0x51, 0xc9, 0x8b, 0xf0, 0x6b, 0x98, 0x38, 0x9c, 0xd3, 0x8d, 0xc4,
- 0x40, 0x3f, 0x68, 0xa8, 0xdd, 0x69, 0x22, 0xe9, 0x2a, 0xb3, 0xc2, 0x2d, 0x7c, 0x09, 0x9e, 0xc5,
- 0x12, 0xa7, 0xbb, 0xe0, 0x17, 0x6e, 0xd6, 0x22, 0xc9, 0x4e, 0x00, 0xec, 0x87, 0x5c, 0x25, 0xd2,
- 0x15, 0x40, 0x73, 0x94, 0xe3, 0x19, 0xa8, 0x8a, 0xe8, 0x7c, 0x22, 0xc3, 0x27, 0xe0, 0xd7, 0x72,
- 0x5a, 0x98, 0x05, 0xd7, 0x45, 0xbd, 0x30, 0x91, 0xc1, 0x8b, 0xa4, 0xaa, 0x2a, 0x01, 0xc9, 0xf0,
- 0x35, 0xf4, 0x5f, 0xe5, 0xd9, 0x45, 0x92, 0xab, 0x0f, 0x0a, 0xe8, 0x53, 0xf0, 0xb6, 0x79, 0xaa,
- 0x8a, 0x6a, 0xbf, 0x5d, 0xdd, 0xf9, 0xf4, 0x0a, 0xe5, 0x91, 0x53, 0x87, 0xab, 0x1a, 0x2f, 0x6e,
- 0xd6, 0x33, 0x9d, 0x98, 0xfd, 0x5a, 0x6c, 0x1d, 0xd4, 0xe2, 0x53, 0xf0, 0x09, 0x7b, 0xae, 0x93,
- 0xaa, 0xde, 0x6f, 0xee, 0xf7, 0xc4, 0x97, 0x3a, 0x2f, 0xb7, 0x78, 0x90, 0x6d, 0x7c, 0xa4, 0xc2,
- 0xef, 0x60, 0xbc, 0xa7, 0x6a, 0x96, 0x74, 0x6b, 0xaf, 0xa4, 0x9f, 0xc2, 0x30, 0x41, 0x2b, 0xca,
- 0x84, 0x79, 0x1f, 0x50, 0x3a, 0x02, 0xb3, 0x12, 0x41, 0x52, 0x91, 0x26, 0x7c, 0x01, 0x7e, 0xad,
- 0xc0, 0x22, 0xb5, 0x47, 0xd4, 0x87, 0xf7, 0x89, 0x9f, 0x0b, 0x9c, 0x71, 0xcd, 0x73, 0x1b, 0xdd,
- 0x4c, 0x47, 0x5a, 0x65, 0xf8, 0x47, 0x1b, 0xba, 0xd1, 0x65, 0x95, 0xf3, 0x00, 0x26, 0x0e, 0x99,
- 0xca, 0x79, 0x0b, 0xf9, 0x68, 0x55, 0x23, 0x38, 0x3f, 0xe8, 0xe5, 0xce, 0x01, 0x7e, 0x77, 0x01,
- 0xb6, 0x36, 0x8d, 0xa8, 0xb5, 0x63, 0xce, 0x77, 0x92, 0xb9, 0x60, 0xff, 0x07, 0xcf, 0x08, 0x3a,
- 0xb9, 0x57, 0xbf, 0x9f, 0xe6, 0x02, 0xc7, 0x3f, 0x8a, 0xb9, 0x4e, 0x62, 0x9e, 0xa5, 0xdc, 0x54,
- 0xbd, 0x69, 0x04, 0xe2, 0x3b, 0x43, 0x11, 0x0e, 0xde, 0x7c, 0x2b, 0x35, 0x2f, 0x72, 0x4d, 0xbd,
- 0xe9, 0x47, 0x35, 0xcf, 0xee, 0xc3, 0xb8, 0xa2, 0xed, 0x7a, 0xb1, 0x2b, 0x74, 0x54, 0x09, 0xab,
- 0x1d, 0x53, 0x5d, 0xf2, 0x96, 0x67, 0xa5, 0x74, 0x5b, 0xd5, 0x5d, 0xf2, 0x1a, 0x45, 0x97, 0x36,
- 0x2b, 0xed, 0xa6, 0x4c, 0xc6, 0xef, 0xd2, 0xe2, 0x4d, 0xbc, 0xd5, 0xd5, 0x8e, 0x1d, 0xa2, 0x10,
- 0x5f, 0x51, 0xaf, 0xf4, 0x7e, 0x4e, 0x46, 0x7b, 0x39, 0x09, 0x7f, 0x69, 0x43, 0x67, 0x21, 0xde,
- 0x1f, 0x89, 0xb7, 0xe8, 0x8d, 0x16, 0x1f, 0x3c, 0x1a, 0xc9, 0x53, 0xa7, 0x52, 0x97, 0xbc, 0x1a,
- 0x1f, 0x40, 0x97, 0x4a, 0xf3, 0xbd, 0x69, 0xb8, 0xa0, 0x28, 0x22, 0xd2, 0x62, 0x18, 0xe9, 0x2a,
- 0x57, 0x0e, 0x64, 0xa2, 0xb1, 0xe5, 0x4a, 0x9d, 0x39, 0x64, 0x91, 0xc4, 0x91, 0xe6, 0x36, 0x12,
- 0xf6, 0xae, 0x03, 0x15, 0xac, 0x08, 0x1b, 0xb8, 0x31, 0xf3, 0xc8, 0xc0, 0x82, 0xea, 0x66, 0x1e,
- 0x19, 0xec, 0xed, 0x34, 0xff, 0x60, 0xa7, 0xed, 0x06, 0x22, 0x1c, 0xae, 0xad, 0x7a, 0xc8, 0x0e,
- 0xed, 0x33, 0xa0, 0xda, 0x4d, 0x3f, 0xb7, 0xc0, 0xb3, 0x81, 0xe0, 0xdc, 0xb0, 0xa5, 0xe0, 0xe6,
- 0x06, 0x31, 0xff, 0xfa, 0x60, 0xf3, 0x77, 0x0f, 0xb6, 0x4d, 0x69, 0x0a, 0x2a, 0xc0, 0x41, 0x44,
- 0x34, 0xca, 0x4a, 0x95, 0x56, 0xeb, 0x95, 0x68, 0xbc, 0xc5, 0x4e, 0x36, 0x0b, 0x8b, 0x65, 0xea,
- 0x2a, 0xe8, 0xef, 0xaa, 0x20, 0xfc, 0xa9, 0x05, 0x57, 0x4f, 0x97, 0xcf, 0xde, 0xa0, 0x41, 0xf5,
- 0x18, 0xfe, 0x0c, 0x9f, 0x14, 0x18, 0x20, 0xfa, 0x38, 0x39, 0xb9, 0xd1, 0x1c, 0x14, 0xcb, 0x4c,
- 0x5a, 0x63, 0x11, 0x59, 0x23, 0x57, 0x00, 0xed, 0xba, 0x00, 0x1e, 0x82, 0xc7, 0x57, 0x45, 0x9a,
- 0x2b, 0xf2, 0x7c, 0x72, 0xc2, 0x1a, 0xab, 0x6d, 0x39, 0x23, 0x4d, 0xe4, 0x2c, 0x28, 0xa1, 0xea,
- 0x3c, 0xaf, 0x1e, 0xa0, 0x48, 0x87, 0x7f, 0xb6, 0x60, 0x6c, 0x47, 0xdb, 0xdf, 0x0d, 0xce, 0x7f,
- 0xdc, 0xba, 0x97, 0x3c, 0x95, 0xf1, 0x9f, 0xc4, 0xf5, 0xaa, 0xbb, 0xa9, 0x62, 0x71, 0x79, 0x16,
- 0x3a, 0x4d, 0x12, 0xa9, 0xe3, 0x2c, 0x55, 0xd5, 0x76, 0x1d, 0x3a, 0xd9, 0x8b, 0x54, 0x49, 0xf6,
- 0x09, 0x4c, 0x44, 0xaa, 0x25, 0x39, 0x6c, 0x8d, 0x2c, 0xa8, 0xe3, 0x5a, 0x4a, 0x66, 0x55, 0xba,
- 0xfa, 0x8d, 0x74, 0xdd, 0x87, 0xb1, 0x90, 0xe7, 0x52, 0xad, 0x64, 0x6c, 0x0a, 0x5e, 0xd8, 0x52,
- 0xeb, 0x45, 0x23, 0x27, 0x5c, 0xa0, 0xec, 0xe1, 0x0f, 0x30, 0x6a, 0xc2, 0xca, 0x46, 0x30, 0x38,
- 0x8b, 0x2d, 0x00, 0xd3, 0x2b, 0x6c, 0x0a, 0xa3, 0x8a, 0xc3, 0x39, 0x35, 0x6d, 0xb1, 0xeb, 0x30,
- 0x6d, 0x4a, 0x70, 0x2e, 0x4f, 0xdb, 0x0c, 0xc0, 0x3b, 0x8b, 0xc9, 0xa2, 0xc3, 0xc6, 0xe0, 0x5b,
- 0x7a, 0x21, 0xd6, 0xd3, 0x2e, 0xbb, 0x06, 0xe3, 0x9a, 0xc5, 0xf9, 0x38, 0xed, 0x31, 0x1f, 0x7a,
- 0x67, 0x31, 0x6a, 0xbd, 0x87, 0x8f, 0x61, 0x50, 0xa5, 0x05, 0x0f, 0x99, 0x2b, 0x23, 0x75, 0x31,
- 0xbd, 0x82, 0xf4, 0x37, 0xd4, 0x11, 0xd3, 0x16, 0xd2, 0xa7, 0x32, 0x93, 0x85, 0x9c, 0xb6, 0x97,
- 0x1e, 0x65, 0xf3, 0xc9, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x47, 0x28, 0xff, 0x37, 0x6a, 0x0e,
- 0x00, 0x00,
+ // 1573 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcd, 0x8e, 0x14, 0x47,
+ 0x12, 0xa6, 0xff, 0xbb, 0xa2, 0x7f, 0x68, 0x72, 0x59, 0x28, 0x60, 0xd1, 0x0e, 0x05, 0xab, 0x1d,
+ 0xa1, 0x85, 0xc3, 0xc0, 0x0b, 0xf4, 0x32, 0xcb, 0xaa, 0x25, 0x8c, 0x70, 0xf5, 0x18, 0xdf, 0x5c,
+ 0xca, 0xee, 0xcc, 0x29, 0x4a, 0x5d, 0x9d, 0xd5, 0xca, 0xcc, 0x1a, 0x98, 0x83, 0x9f, 0xc0, 0x96,
+ 0x7c, 0xf5, 0x2b, 0xf8, 0x41, 0xfc, 0x1c, 0xbe, 0xf9, 0x62, 0xf9, 0x1d, 0xac, 0x88, 0xcc, 0xaa,
+ 0xfe, 0x61, 0x6c, 0x23, 0xdf, 0x22, 0xbe, 0x88, 0xce, 0x8c, 0xf8, 0x22, 0x32, 0xa2, 0x1a, 0xc6,
+ 0x1b, 0x5d, 0xd8, 0x62, 0x6d, 0xd2, 0xa7, 0x24, 0xb0, 0x7e, 0xa5, 0xdf, 0x85, 0x05, 0x37, 0xd2,
+ 0xa1, 0x91, 0x85, 0xf1, 0x5c, 0xac, 0xd6, 0x26, 0xfd, 0x32, 0xb3, 0xef, 0xce, 0xb8, 0x59, 0xb1,
+ 0x9b, 0xd0, 0x31, 0x62, 0x95, 0x89, 0xb0, 0x71, 0xd4, 0x38, 0x0e, 0x62, 0xa7, 0xb0, 0x10, 0x7a,
+ 0x46, 0xac, 0xec, 0xe5, 0x46, 0x86, 0x4d, 0xc2, 0x2b, 0xd5, 0x5b, 0x5e, 0xf3, 0xb5, 0x0c, 0x5b,
+ 0xb5, 0x05, 0x55, 0x6f, 0x11, 0xdc, 0xf2, 0xb0, 0x7d, 0xd4, 0x38, 0x1e, 0xc6, 0x95, 0x1a, 0x7d,
+ 0xd3, 0x80, 0x00, 0x2f, 0x7b, 0xc5, 0x17, 0x32, 0x67, 0xb7, 0xa0, 0x6b, 0xb9, 0xd9, 0x5e, 0xe9,
+ 0x35, 0x76, 0x17, 0xfa, 0x28, 0x29, 0x3c, 0xda, 0x5d, 0x5a, 0xeb, 0xec, 0x39, 0xf4, 0x31, 0x30,
+ 0x75, 0x5e, 0x98, 0xb0, 0x75, 0xd4, 0x3a, 0x1e, 0x9c, 0x84, 0x4f, 0xeb, 0x84, 0xf7, 0x33, 0x8a,
+ 0x6b, 0x4f, 0xcc, 0x2d, 0x53, 0x42, 0x7e, 0xa0, 0x78, 0x3a, 0xb1, 0x53, 0xa2, 0xf7, 0x00, 0x73,
+ 0xb1, 0xfa, 0x4c, 0x1a, 0xc3, 0x53, 0xc9, 0x26, 0xd0, 0x5a, 0xd6, 0xa1, 0xa0, 0x88, 0xbf, 0x5a,
+ 0x72, 0x21, 0xb4, 0x0f, 0xc2, 0x29, 0xec, 0x09, 0xf4, 0x30, 0x9a, 0x9c, 0x2f, 0x28, 0xef, 0xc1,
+ 0xc9, 0xdf, 0xb6, 0x01, 0xd4, 0xb9, 0xc5, 0x95, 0x0f, 0x63, 0xd0, 0xde, 0x61, 0x82, 0xe4, 0xe8,
+ 0x25, 0xb4, 0xa7, 0x5a, 0x72, 0x36, 0x86, 0xa6, 0xbf, 0xb1, 0x13, 0x37, 0x5d, 0xe2, 0x1b, 0xae,
+ 0xa5, 0xb2, 0x99, 0xa0, 0x3b, 0x3b, 0x71, 0xad, 0xe3, 0x39, 0x6a, 0xcb, 0x35, 0xc9, 0xd1, 0x8f,
+ 0x2d, 0xe8, 0xbe, 0xe0, 0x6b, 0xa9, 0x77, 0x8f, 0x0a, 0xe8, 0xa8, 0xca, 0xbd, 0xb9, 0x75, 0x47,
+ 0x8c, 0x0a, 0xd9, 0xa2, 0xa3, 0x49, 0x46, 0x8c, 0x52, 0x6c, 0x3b, 0x3f, 0xca, 0xf0, 0x16, 0x74,
+ 0xb9, 0x96, 0x3c, 0x13, 0x61, 0x87, 0x3c, 0xbd, 0xc6, 0xfe, 0x01, 0x41, 0x5e, 0xa8, 0x34, 0xb3,
+ 0xa5, 0x90, 0x61, 0xf7, 0xa8, 0x71, 0xdc, 0x8c, 0xb7, 0x00, 0x06, 0x9f, 0x73, 0xeb, 0x8c, 0x3d,
+ 0x32, 0xd6, 0x3a, 0xde, 0xa2, 0xad, 0xd9, 0x84, 0x7d, 0x77, 0x0b, 0xca, 0x14, 0xf1, 0x26, 0x0c,
+ 0x7c, 0xc4, 0x1b, 0xf4, 0xd9, 0x14, 0xda, 0x86, 0xe0, 0xa2, 0x43, 0x19, 0xcf, 0x2c, 0x8d, 0xd4,
+ 0x94, 0xc9, 0xc0, 0x75, 0x42, 0xa5, 0x3b, 0xb2, 0x8c, 0x79, 0x5f, 0x68, 0x11, 0x0e, 0x9d, 0xad,
+ 0xd2, 0xb1, 0x72, 0x0b, 0xcd, 0x95, 0x08, 0x47, 0xae, 0x72, 0xa4, 0xe0, 0x2f, 0xb4, 0x34, 0x52,
+ 0x5f, 0x48, 0x11, 0x8e, 0xdd, 0x2f, 0x2a, 0x9d, 0xdd, 0x07, 0xc8, 0x4c, 0xa2, 0x4b, 0xa5, 0x32,
+ 0x95, 0x86, 0xd7, 0x8f, 0x1a, 0xc7, 0xfd, 0x38, 0xc8, 0x4c, 0xec, 0x00, 0x34, 0xeb, 0x52, 0x25,
+ 0x52, 0xf1, 0x45, 0x2e, 0xc3, 0x89, 0x33, 0xeb, 0x52, 0xfd, 0x8f, 0x00, 0x76, 0x07, 0xfa, 0x68,
+ 0x26, 0x76, 0x6f, 0x50, 0xfc, 0x3d, 0x5d, 0xaa, 0x33, 0x24, 0x38, 0x82, 0x11, 0x9a, 0xe8, 0x1a,
+ 0x9d, 0x64, 0x22, 0x64, 0x74, 0xf3, 0x40, 0x97, 0x6a, 0x4e, 0xd8, 0x4c, 0x44, 0x4b, 0xb8, 0xe1,
+ 0xca, 0x38, 0x55, 0x02, 0x5b, 0x68, 0xa6, 0xce, 0x0b, 0x76, 0x0c, 0xdd, 0x25, 0x81, 0x54, 0xd5,
+ 0xc1, 0xc9, 0x64, 0xdb, 0x66, 0xce, 0x39, 0xf6, 0x76, 0xf6, 0x08, 0x3a, 0xd8, 0x6d, 0x26, 0x6c,
+ 0xd2, 0x83, 0x18, 0xef, 0xf7, 0x63, 0xec, 0x8c, 0xd1, 0x4f, 0x0d, 0x68, 0xd3, 0x43, 0xff, 0x2b,
+ 0xcf, 0xee, 0x1e, 0x04, 0x4b, 0x2d, 0xb9, 0x95, 0x09, 0xb7, 0xbe, 0x05, 0xfb, 0x0e, 0x98, 0xda,
+ 0x1d, 0xe3, 0xe2, 0xd2, 0x37, 0x92, 0x37, 0xfe, 0xf7, 0x12, 0x8d, 0xe5, 0x46, 0xf8, 0x5f, 0x76,
+ 0x7c, 0x0d, 0x09, 0x98, 0x5a, 0x0c, 0xc5, 0x53, 0xda, 0x25, 0x4a, 0xbd, 0x86, 0x7c, 0x66, 0x26,
+ 0xe1, 0x39, 0xd7, 0x6b, 0xea, 0xa5, 0x7e, 0xdc, 0xcb, 0xcc, 0x14, 0x55, 0x34, 0x09, 0x99, 0x27,
+ 0xe7, 0x39, 0x4f, 0xa9, 0x9d, 0xfa, 0x71, 0x4f, 0xc8, 0xfc, 0x65, 0xce, 0xd3, 0xe8, 0x0c, 0x06,
+ 0x98, 0xe0, 0x5c, 0x38, 0x02, 0x23, 0x68, 0x63, 0xfc, 0x9e, 0xbe, 0x43, 0x56, 0xc8, 0xc6, 0x1e,
+ 0x40, 0xdb, 0x88, 0x9a, 0xb9, 0xd1, 0xde, 0x28, 0x89, 0xc9, 0x14, 0xfd, 0xdc, 0x04, 0x70, 0x84,
+ 0x13, 0x7b, 0x87, 0x0f, 0x0d, 0x93, 0x27, 0x6b, 0xe2, 0x1f, 0x2d, 0x26, 0x4f, 0xc0, 0x4c, 0xb0,
+ 0xdb, 0x6e, 0x56, 0xa0, 0xa9, 0xb5, 0xe5, 0x7a, 0x26, 0xd8, 0x13, 0x08, 0x6c, 0xb6, 0x96, 0x89,
+ 0x2e, 0x73, 0x19, 0xb6, 0xe9, 0xf2, 0x9d, 0xfa, 0x9e, 0xf2, 0xcb, 0x17, 0x36, 0x8f, 0xfb, 0xe8,
+ 0x12, 0x97, 0xb9, 0xa4, 0xf6, 0x93, 0x7c, 0x69, 0x9d, 0xbf, 0x63, 0x31, 0x20, 0x84, 0xcc, 0x0f,
+ 0x60, 0xe8, 0xcc, 0x42, 0x5e, 0x64, 0x4b, 0x47, 0x26, 0xb6, 0x18, 0x62, 0xa7, 0x04, 0xed, 0xd1,
+ 0xd6, 0xdb, 0xa3, 0x8d, 0xfd, 0x13, 0x06, 0xbe, 0x42, 0x3b, 0xa4, 0x82, 0x83, 0xc8, 0x61, 0x5b,
+ 0xa5, 0x60, 0xaf, 0x4a, 0x0c, 0xda, 0x66, 0xe7, 0xc5, 0xa2, 0x8c, 0x19, 0x67, 0x26, 0x39, 0x2f,
+ 0xf3, 0x9c, 0x1e, 0x6c, 0x3f, 0xee, 0x66, 0xe6, 0x65, 0x99, 0xe7, 0xec, 0x08, 0x86, 0x79, 0xa6,
+ 0x56, 0x49, 0xc5, 0x87, 0x7b, 0xb2, 0x80, 0x18, 0xb5, 0xbc, 0x88, 0x3e, 0x87, 0xb1, 0xe7, 0x39,
+ 0x5b, 0x4b, 0x4c, 0xf4, 0x93, 0x86, 0xda, 0xbd, 0x5d, 0x26, 0x7d, 0x67, 0x56, 0xbc, 0x45, 0xaf,
+ 0xa1, 0xeb, 0xb8, 0xc4, 0xe9, 0x2e, 0xf8, 0xa5, 0x9f, 0xb5, 0x28, 0xb2, 0x13, 0x00, 0xf7, 0x43,
+ 0xae, 0x52, 0xe9, 0x1b, 0x60, 0x77, 0x94, 0xe3, 0x19, 0x68, 0x8a, 0xe9, 0x7c, 0x12, 0xa3, 0x67,
+ 0x10, 0xd4, 0x38, 0x2d, 0x4c, 0xcb, 0xb5, 0xad, 0x17, 0x26, 0x2a, 0x78, 0x91, 0x54, 0x55, 0x27,
+ 0xa0, 0x18, 0xbd, 0x85, 0xde, 0x9b, 0x22, 0xbf, 0x4c, 0x0b, 0xf5, 0x49, 0x09, 0xfd, 0x1b, 0xba,
+ 0x9b, 0x22, 0x53, 0xb6, 0xda, 0x6f, 0xd7, 0xb7, 0x31, 0xbd, 0x41, 0x3c, 0xf6, 0xe6, 0x68, 0x59,
+ 0xf3, 0xc5, 0xcd, 0x6a, 0xaa, 0x53, 0xb3, 0xdf, 0x8b, 0x8d, 0x83, 0x5e, 0x7c, 0x0e, 0x01, 0x71,
+ 0xcf, 0x75, 0x5a, 0xf5, 0xfb, 0xed, 0xfd, 0x37, 0xf1, 0x7f, 0x5d, 0x94, 0x1b, 0x3c, 0xc8, 0x3d,
+ 0x7c, 0x94, 0xa2, 0xaf, 0x60, 0xb4, 0x67, 0xda, 0x6d, 0xe9, 0xc6, 0x5e, 0x4b, 0x3f, 0x87, 0x41,
+ 0x8a, 0x5e, 0x54, 0x09, 0xf3, 0x31, 0xa1, 0x74, 0x04, 0x56, 0x25, 0x86, 0xb4, 0x12, 0x4d, 0xf4,
+ 0x6d, 0x03, 0x82, 0xda, 0x82, 0x5d, 0xea, 0xce, 0xa8, 0x4f, 0xef, 0x91, 0x3e, 0xa3, 0x01, 0xed,
+ 0x4c, 0x56, 0x7e, 0xb0, 0x9e, 0xb0, 0x80, 0x90, 0x33, 0xf9, 0xc1, 0x62, 0x13, 0xd3, 0xb8, 0x48,
+ 0x72, 0x79, 0x21, 0x73, 0xbf, 0xe2, 0x80, 0xa0, 0x57, 0x88, 0xe0, 0x90, 0x74, 0x81, 0xb5, 0x0f,
+ 0x87, 0x24, 0xc5, 0xe4, 0x8c, 0xd1, 0x2f, 0x4d, 0x68, 0xc7, 0x57, 0xb5, 0xde, 0x23, 0x18, 0x7b,
+ 0x6a, 0xab, 0xec, 0x5d, 0x08, 0xc3, 0x65, 0x5d, 0x82, 0xd9, 0xc1, 0x30, 0x68, 0x1d, 0x14, 0xe0,
+ 0x3e, 0xc0, 0xc6, 0xf5, 0x01, 0x5a, 0xdd, 0x9c, 0x0c, 0x3c, 0x32, 0x13, 0xec, 0xef, 0xd0, 0x35,
+ 0x82, 0x4e, 0xee, 0xd4, 0x1f, 0x60, 0x33, 0x81, 0xfb, 0x03, 0x61, 0xae, 0xd3, 0x84, 0xe7, 0x19,
+ 0x37, 0xd5, 0xe3, 0x36, 0x02, 0x0b, 0x34, 0x45, 0x08, 0x27, 0x77, 0xb1, 0x91, 0x9a, 0xdb, 0x42,
+ 0xd3, 0xe3, 0x0e, 0xe2, 0x5a, 0x67, 0x0f, 0x61, 0x54, 0xc9, 0x6e, 0x3f, 0xb9, 0x1d, 0x3c, 0xac,
+ 0xc0, 0x6a, 0x49, 0x55, 0x97, 0x5c, 0xf0, 0xbc, 0x94, 0x7e, 0x2d, 0xfb, 0x4b, 0xde, 0x22, 0x74,
+ 0xe5, 0x6b, 0xa7, 0xe5, 0x96, 0xcb, 0xe4, 0x7d, 0x66, 0xdf, 0x25, 0x1b, 0x5d, 0x2d, 0xe9, 0x01,
+ 0x82, 0xf8, 0x19, 0xf6, 0x46, 0xef, 0xd7, 0x74, 0xb8, 0x57, 0xd3, 0xe8, 0x87, 0x26, 0xb4, 0xe6,
+ 0xe2, 0xe3, 0x99, 0x7a, 0x87, 0x3e, 0xf2, 0x92, 0x83, 0xaf, 0x4e, 0x8a, 0xd4, 0x9b, 0xd4, 0x15,
+ 0x9f, 0x9d, 0x8f, 0xa0, 0x4d, 0xbd, 0xfd, 0xd1, 0x38, 0x9d, 0x53, 0x16, 0x31, 0x59, 0x31, 0x8d,
+ 0x6c, 0x59, 0x28, 0x4f, 0x32, 0xc9, 0xf8, 0x66, 0x4b, 0x9d, 0x7b, 0x66, 0x51, 0xc4, 0x76, 0xf2,
+ 0x2b, 0x0d, 0x1f, 0xbf, 0x27, 0x15, 0x1c, 0x84, 0x13, 0x60, 0x67, 0x68, 0x92, 0x83, 0x23, 0xd5,
+ 0x0f, 0x4d, 0x72, 0xd8, 0x5b, 0x8a, 0xc1, 0xc1, 0x52, 0xdc, 0x4e, 0x54, 0x38, 0xdc, 0x7b, 0xf5,
+ 0x94, 0x1e, 0xb8, 0xef, 0x88, 0x6a, 0xb9, 0x7d, 0xdf, 0x80, 0xae, 0x4b, 0x04, 0x07, 0x8f, 0x6b,
+ 0x05, 0x3f, 0x78, 0x48, 0xf9, 0xd3, 0x2f, 0xbe, 0x60, 0xfb, 0xc5, 0xb7, 0x2e, 0x8d, 0xa5, 0x06,
+ 0xec, 0xc7, 0x24, 0x23, 0x56, 0xaa, 0xac, 0xda, 0xcf, 0x24, 0xe3, 0x2d, 0x6e, 0x34, 0x3a, 0x5a,
+ 0x9c, 0x52, 0x77, 0x41, 0x6f, 0xdb, 0x05, 0xd1, 0x77, 0x0d, 0xb8, 0x7e, 0xba, 0x78, 0xf1, 0x0e,
+ 0x1d, 0xaa, 0xaf, 0xe9, 0xff, 0xe0, 0x37, 0x09, 0x26, 0x88, 0x31, 0x8e, 0x4f, 0x6e, 0xed, 0x4e,
+ 0x9a, 0x45, 0x2e, 0x9d, 0xb3, 0x88, 0x9d, 0x93, 0x6f, 0x80, 0x66, 0xdd, 0x00, 0x8f, 0xa1, 0xcb,
+ 0x97, 0x36, 0x2b, 0x14, 0x45, 0x3e, 0x3e, 0x61, 0x3b, 0xbb, 0x71, 0x31, 0x25, 0x4b, 0xec, 0x3d,
+ 0xa8, 0xa0, 0xea, 0xbc, 0xa8, 0xbe, 0x60, 0x51, 0x8e, 0x7e, 0x6d, 0xc0, 0xc8, 0xcd, 0xc6, 0xdf,
+ 0x9b, 0xbc, 0x7f, 0xb8, 0xb6, 0xaf, 0xf8, 0xd6, 0xc6, 0x3f, 0x35, 0xfe, 0xad, 0xfa, 0x9b, 0x2a,
+ 0x15, 0xb7, 0xaf, 0xd5, 0x59, 0x9a, 0x4a, 0x9d, 0xe4, 0x99, 0xaa, 0xd6, 0xf3, 0xc0, 0x63, 0xaf,
+ 0x32, 0x25, 0xd9, 0xbf, 0x60, 0x2c, 0x32, 0x2d, 0x29, 0x60, 0xe7, 0xe4, 0x48, 0x1d, 0xd5, 0x28,
+ 0xb9, 0x55, 0xe5, 0xea, 0xed, 0x94, 0xeb, 0x21, 0x8c, 0x84, 0x3c, 0x97, 0x6a, 0x29, 0x13, 0x63,
+ 0xb9, 0x75, 0xad, 0xd6, 0x89, 0x87, 0x1e, 0x9c, 0x23, 0xf6, 0xf8, 0x6b, 0x18, 0xee, 0xd2, 0xca,
+ 0x86, 0xd0, 0x3f, 0x4b, 0x1c, 0x01, 0x93, 0x6b, 0x6c, 0x02, 0xc3, 0x4a, 0xc3, 0x39, 0x35, 0x69,
+ 0xb0, 0x9b, 0x30, 0xd9, 0x45, 0x70, 0xb0, 0x4f, 0x9a, 0x0c, 0xa0, 0x7b, 0x96, 0x90, 0x47, 0x8b,
+ 0x8d, 0x20, 0x70, 0xf2, 0x5c, 0xac, 0x26, 0x6d, 0x76, 0x03, 0x46, 0xb5, 0x8a, 0xf3, 0x71, 0xd2,
+ 0x61, 0x01, 0x74, 0xce, 0x12, 0xb4, 0x76, 0x1f, 0x3f, 0x85, 0x7e, 0x55, 0x16, 0x3c, 0x64, 0xa6,
+ 0x8c, 0xd4, 0x76, 0x72, 0x0d, 0xe5, 0x2f, 0xe8, 0x45, 0x4c, 0x1a, 0x28, 0x9f, 0xca, 0x5c, 0x5a,
+ 0x39, 0x69, 0x2e, 0xba, 0x54, 0xcd, 0x67, 0xbf, 0x05, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xa4, 0x6a,
+ 0x9e, 0xab, 0x0e, 0x00, 0x00,
}
diff --git a/protomsg.proto b/protomsg.proto
index 26af413..c589de7 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -132,7 +132,9 @@
message GroupRule {
string group_id = 1;
- repeated Rule rules = 2;
+ string group_text = 2;
+ int32 alarm_level = 3;
+ repeated Rule rules = 4;
}
message Rule {
diff --git a/sysset.pb.go b/sysset.pb.go
index ce5bebf..3a9f565 100644
--- a/sysset.pb.go
+++ b/sysset.pb.go
@@ -24,15 +24,18 @@
ServerId string `protobuf:"bytes,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
ServerName string `protobuf:"bytes,2,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"`
ServerType int32 `protobuf:"varint,3,opt,name=server_type,json=serverType,proto3" json:"server_type,omitempty"`
- AlarmIp string `protobuf:"bytes,4,opt,name=alarm_ip,json=alarmIp,proto3" json:"alarm_ip,omitempty"`
- AlarmPort int32 `protobuf:"varint,5,opt,name=alarm_port,json=alarmPort,proto3" json:"alarm_port,omitempty"`
- WebPicIp string `protobuf:"bytes,6,opt,name=web_pic_ip,json=webPicIp,proto3" json:"web_pic_ip,omitempty"`
- WebPicPort int32 `protobuf:"varint,7,opt,name=web_pic_port,json=webPicPort,proto3" json:"web_pic_port,omitempty"`
- EsPicIp string `protobuf:"bytes,8,opt,name=es_pic_ip,json=esPicIp,proto3" json:"es_pic_ip,omitempty"`
- EsPicPort int32 `protobuf:"varint,9,opt,name=es_pic_port,json=esPicPort,proto3" json:"es_pic_port,omitempty"`
- CutMaxDuration int32 `protobuf:"varint,10,opt,name=cut_max_duration,json=cutMaxDuration,proto3" json:"cut_max_duration,omitempty"`
- CutMinDuration int32 `protobuf:"varint,11,opt,name=cut_min_duration,json=cutMinDuration,proto3" json:"cut_min_duration,omitempty"`
- Reserved string `protobuf:"bytes,12,opt,name=reserved,proto3" json:"reserved,omitempty"`
+ ServerIp string `protobuf:"bytes,4,opt,name=server_ip,json=serverIp,proto3" json:"server_ip,omitempty"`
+ AlarmIp string `protobuf:"bytes,5,opt,name=alarm_ip,json=alarmIp,proto3" json:"alarm_ip,omitempty"`
+ AlarmPort int32 `protobuf:"varint,6,opt,name=alarm_port,json=alarmPort,proto3" json:"alarm_port,omitempty"`
+ WebPicIp string `protobuf:"bytes,7,opt,name=web_pic_ip,json=webPicIp,proto3" json:"web_pic_ip,omitempty"`
+ WebPicPort int32 `protobuf:"varint,8,opt,name=web_pic_port,json=webPicPort,proto3" json:"web_pic_port,omitempty"`
+ EsPicIp string `protobuf:"bytes,9,opt,name=es_pic_ip,json=esPicIp,proto3" json:"es_pic_ip,omitempty"`
+ EsPicPort int32 `protobuf:"varint,10,opt,name=es_pic_port,json=esPicPort,proto3" json:"es_pic_port,omitempty"`
+ CutMaxDuration int32 `protobuf:"varint,11,opt,name=cut_max_duration,json=cutMaxDuration,proto3" json:"cut_max_duration,omitempty"`
+ CutMinDuration int32 `protobuf:"varint,12,opt,name=cut_min_duration,json=cutMinDuration,proto3" json:"cut_min_duration,omitempty"`
+ Reserved string `protobuf:"bytes,13,opt,name=reserved,proto3" json:"reserved,omitempty"`
+ GateWay string `protobuf:"bytes,14,opt,name=gate_way,json=gateWay,proto3" json:"gate_way,omitempty"`
+ NetMask string `protobuf:"bytes,15,opt,name=net_mask,json=netMask,proto3" json:"net_mask,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -82,6 +85,13 @@
return m.ServerType
}
return 0
+}
+
+func (m *LocalConfig) GetServerIp() string {
+ if m != nil {
+ return m.ServerIp
+ }
+ return ""
}
func (m *LocalConfig) GetAlarmIp() string {
@@ -147,30 +157,216 @@
return ""
}
+func (m *LocalConfig) GetGateWay() string {
+ if m != nil {
+ return m.GateWay
+ }
+ return ""
+}
+
+func (m *LocalConfig) GetNetMask() string {
+ if m != nil {
+ return m.NetMask
+ }
+ return ""
+}
+
+type Cluster struct {
+ ClusterId string `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+ ClusterName string `protobuf:"bytes,2,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
+ Password string `protobuf:"bytes,3,opt,name=password,proto3" json:"password,omitempty"`
+ VirtualIp string `protobuf:"bytes,4,opt,name=virtual_ip,json=virtualIp,proto3" json:"virtual_ip,omitempty"`
+ Nodes []*ClusterNode `protobuf:"bytes,5,rep,name=nodes,proto3" json:"nodes,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *Cluster) Reset() { *m = Cluster{} }
+func (m *Cluster) String() string { return proto.CompactTextString(m) }
+func (*Cluster) ProtoMessage() {}
+func (*Cluster) Descriptor() ([]byte, []int) {
+ return fileDescriptor_5be590c6b2a0d755, []int{1}
+}
+
+func (m *Cluster) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_Cluster.Unmarshal(m, b)
+}
+func (m *Cluster) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_Cluster.Marshal(b, m, deterministic)
+}
+func (m *Cluster) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Cluster.Merge(m, src)
+}
+func (m *Cluster) XXX_Size() int {
+ return xxx_messageInfo_Cluster.Size(m)
+}
+func (m *Cluster) XXX_DiscardUnknown() {
+ xxx_messageInfo_Cluster.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Cluster proto.InternalMessageInfo
+
+func (m *Cluster) GetClusterId() string {
+ if m != nil {
+ return m.ClusterId
+ }
+ return ""
+}
+
+func (m *Cluster) GetClusterName() string {
+ if m != nil {
+ return m.ClusterName
+ }
+ return ""
+}
+
+func (m *Cluster) GetPassword() string {
+ if m != nil {
+ return m.Password
+ }
+ return ""
+}
+
+func (m *Cluster) GetVirtualIp() string {
+ if m != nil {
+ return m.VirtualIp
+ }
+ return ""
+}
+
+func (m *Cluster) GetNodes() []*ClusterNode {
+ if m != nil {
+ return m.Nodes
+ }
+ return nil
+}
+
+type ClusterNode struct {
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ ClusterId string `protobuf:"bytes,2,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"`
+ ServerId string `protobuf:"bytes,3,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
+ ServerName string `protobuf:"bytes,4,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"`
+ NodeId string `protobuf:"bytes,5,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"`
+ NodeIp string `protobuf:"bytes,6,opt,name=node_ip,json=nodeIp,proto3" json:"node_ip,omitempty"`
+ CreateTime string `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *ClusterNode) Reset() { *m = ClusterNode{} }
+func (m *ClusterNode) String() string { return proto.CompactTextString(m) }
+func (*ClusterNode) ProtoMessage() {}
+func (*ClusterNode) Descriptor() ([]byte, []int) {
+ return fileDescriptor_5be590c6b2a0d755, []int{2}
+}
+
+func (m *ClusterNode) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_ClusterNode.Unmarshal(m, b)
+}
+func (m *ClusterNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_ClusterNode.Marshal(b, m, deterministic)
+}
+func (m *ClusterNode) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_ClusterNode.Merge(m, src)
+}
+func (m *ClusterNode) XXX_Size() int {
+ return xxx_messageInfo_ClusterNode.Size(m)
+}
+func (m *ClusterNode) XXX_DiscardUnknown() {
+ xxx_messageInfo_ClusterNode.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClusterNode proto.InternalMessageInfo
+
+func (m *ClusterNode) GetId() string {
+ if m != nil {
+ return m.Id
+ }
+ return ""
+}
+
+func (m *ClusterNode) GetClusterId() string {
+ if m != nil {
+ return m.ClusterId
+ }
+ return ""
+}
+
+func (m *ClusterNode) GetServerId() string {
+ if m != nil {
+ return m.ServerId
+ }
+ return ""
+}
+
+func (m *ClusterNode) GetServerName() string {
+ if m != nil {
+ return m.ServerName
+ }
+ return ""
+}
+
+func (m *ClusterNode) GetNodeId() string {
+ if m != nil {
+ return m.NodeId
+ }
+ return ""
+}
+
+func (m *ClusterNode) GetNodeIp() string {
+ if m != nil {
+ return m.NodeIp
+ }
+ return ""
+}
+
+func (m *ClusterNode) GetCreateTime() string {
+ if m != nil {
+ return m.CreateTime
+ }
+ return ""
+}
+
func init() {
proto.RegisterType((*LocalConfig)(nil), "protomsg.LocalConfig")
+ proto.RegisterType((*Cluster)(nil), "protomsg.Cluster")
+ proto.RegisterType((*ClusterNode)(nil), "protomsg.ClusterNode")
}
func init() { proto.RegisterFile("sysset.proto", fileDescriptor_5be590c6b2a0d755) }
var fileDescriptor_5be590c6b2a0d755 = []byte{
- // 276 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x4d, 0x4e, 0xc3, 0x30,
- 0x10, 0x85, 0x55, 0x4a, 0xdb, 0x64, 0x12, 0x21, 0xe4, 0x95, 0x29, 0x7f, 0x11, 0xab, 0xac, 0xd8,
- 0x70, 0x04, 0xd8, 0x44, 0x02, 0x54, 0x21, 0xf6, 0x91, 0x93, 0x0c, 0x95, 0xa5, 0x26, 0xb6, 0x6c,
- 0x87, 0x36, 0xd7, 0xe0, 0xc4, 0x88, 0x99, 0xa4, 0x65, 0x15, 0xcd, 0x7b, 0xdf, 0xa7, 0x89, 0x6d,
- 0x48, 0xfd, 0xe0, 0x3d, 0x86, 0x47, 0xeb, 0x4c, 0x30, 0x22, 0xa2, 0x4f, 0xeb, 0xb7, 0x0f, 0x3f,
- 0x73, 0x48, 0x5e, 0x4d, 0xad, 0x76, 0xcf, 0xa6, 0xfb, 0xd2, 0x5b, 0x71, 0x0d, 0xb1, 0x47, 0xf7,
- 0x8d, 0xae, 0xd4, 0x8d, 0x9c, 0x65, 0xb3, 0x3c, 0xfe, 0x88, 0x38, 0x28, 0x1a, 0x71, 0x0f, 0xc9,
- 0x58, 0x76, 0xaa, 0x45, 0x79, 0x46, 0x35, 0x70, 0xf4, 0xae, 0x5a, 0xfc, 0x07, 0x84, 0xc1, 0xa2,
- 0x9c, 0x67, 0xb3, 0x7c, 0x31, 0x01, 0x9f, 0x83, 0x45, 0x71, 0x05, 0x91, 0xda, 0x29, 0xd7, 0x96,
- 0xda, 0xca, 0x73, 0xd2, 0x57, 0x34, 0x17, 0x56, 0xdc, 0x02, 0x70, 0x65, 0x8d, 0x0b, 0x72, 0x41,
- 0x6a, 0x4c, 0xc9, 0xc6, 0xb8, 0x20, 0x6e, 0x00, 0xf6, 0x58, 0x95, 0x56, 0xd7, 0x7f, 0xee, 0x92,
- 0xff, 0x6c, 0x8f, 0xd5, 0x46, 0xd7, 0x85, 0x15, 0x19, 0xa4, 0x53, 0x4b, 0xfa, 0x8a, 0x37, 0x73,
- 0x4f, 0xfe, 0x1a, 0x62, 0xf4, 0x93, 0x1e, 0xf1, 0x6a, 0xf4, 0x6c, 0xdf, 0x41, 0x32, 0x76, 0x24,
- 0xc7, 0xbc, 0x9b, 0x5a, 0x72, 0x73, 0xb8, 0xac, 0xfb, 0x50, 0xb6, 0xea, 0x50, 0x36, 0xbd, 0x53,
- 0x41, 0x9b, 0x4e, 0x02, 0x41, 0x17, 0x75, 0x1f, 0xde, 0xd4, 0xe1, 0x65, 0x4c, 0x8f, 0xa4, 0xee,
- 0x4e, 0x64, 0x72, 0x22, 0x75, 0x77, 0x24, 0xd7, 0x10, 0x39, 0xa4, 0x9b, 0x69, 0x64, 0xca, 0xa7,
- 0x99, 0xe6, 0x6a, 0x49, 0xcf, 0xf3, 0xf4, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x00, 0xfc, 0xa0, 0x93,
- 0xb5, 0x01, 0x00, 0x00,
+ // 469 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x6a, 0xdb, 0x30,
+ 0x14, 0xc6, 0x49, 0x93, 0xd8, 0xc7, 0x59, 0x36, 0x04, 0x63, 0x5a, 0xf6, 0x97, 0xe5, 0x2a, 0x30,
+ 0xc8, 0xc5, 0xf6, 0x08, 0xdd, 0x8d, 0x61, 0x2d, 0x25, 0x14, 0x76, 0x69, 0x14, 0xeb, 0x2c, 0x88,
+ 0xc6, 0x96, 0x90, 0xe4, 0xa6, 0x7e, 0xae, 0x3d, 0xc7, 0x1e, 0x63, 0xef, 0x31, 0x24, 0xd9, 0xb1,
+ 0xdb, 0x41, 0xaf, 0x92, 0xf3, 0xfd, 0x1c, 0x9f, 0xa3, 0xf3, 0xc1, 0xdc, 0x34, 0xc6, 0xa0, 0xdd,
+ 0x2a, 0x2d, 0xad, 0x24, 0xb1, 0xff, 0x29, 0xcd, 0x61, 0xfd, 0x77, 0x0c, 0xe9, 0x0f, 0x59, 0xb0,
+ 0xe3, 0xa5, 0xac, 0x7e, 0x89, 0x03, 0x79, 0x07, 0x89, 0x41, 0x7d, 0x8f, 0x3a, 0x17, 0x9c, 0x46,
+ 0xab, 0x68, 0x93, 0xec, 0xe2, 0x00, 0x64, 0x9c, 0x7c, 0x82, 0xb4, 0x25, 0x2b, 0x56, 0x22, 0x1d,
+ 0x79, 0x1a, 0x02, 0x74, 0xcd, 0x4a, 0x1c, 0x08, 0x6c, 0xa3, 0x90, 0x8e, 0x57, 0xd1, 0x66, 0xd2,
+ 0x09, 0x6e, 0x1b, 0x85, 0xc3, 0xf6, 0x8a, 0x5e, 0x3c, 0x6a, 0xaf, 0xc8, 0x5b, 0x88, 0xd9, 0x91,
+ 0xe9, 0xd2, 0x71, 0x13, 0xcf, 0xcd, 0x7c, 0x9d, 0x29, 0xf2, 0x01, 0x20, 0x50, 0x4a, 0x6a, 0x4b,
+ 0xa7, 0xbe, 0x6f, 0xe2, 0x91, 0x1b, 0xa9, 0x2d, 0x79, 0x0f, 0x70, 0xc2, 0x7d, 0xae, 0x44, 0xe1,
+ 0xbc, 0xb3, 0xd0, 0xf7, 0x84, 0xfb, 0x1b, 0x51, 0x64, 0x8a, 0xac, 0x60, 0xde, 0xb1, 0xde, 0x1e,
+ 0x87, 0xb1, 0x02, 0xef, 0xfd, 0x4b, 0x48, 0xd0, 0x74, 0xf6, 0x24, 0x7c, 0x1a, 0x4d, 0x70, 0x7f,
+ 0x84, 0xb4, 0xe5, 0xbc, 0x19, 0xc2, 0xb7, 0x3d, 0xeb, 0xbd, 0x1b, 0x78, 0x55, 0xd4, 0x36, 0x2f,
+ 0xd9, 0x43, 0xce, 0x6b, 0xcd, 0xac, 0x90, 0x15, 0x4d, 0xbd, 0x68, 0x51, 0xd4, 0xf6, 0x8a, 0x3d,
+ 0x7c, 0x6f, 0xd1, 0xb3, 0x52, 0x54, 0xbd, 0x72, 0xde, 0x2b, 0x45, 0x75, 0x56, 0x2e, 0x21, 0xd6,
+ 0xe8, 0xdf, 0x85, 0xd3, 0x17, 0x61, 0x9b, 0xae, 0x76, 0xaf, 0x74, 0x60, 0x16, 0xf3, 0x13, 0x6b,
+ 0xe8, 0x22, 0x8c, 0xea, 0xea, 0x9f, 0xac, 0x71, 0x54, 0x85, 0x6e, 0x14, 0x73, 0x47, 0x5f, 0x06,
+ 0xaa, 0x42, 0x7b, 0xc5, 0xcc, 0xdd, 0xfa, 0x77, 0x04, 0xb3, 0xcb, 0x63, 0x6d, 0x2c, 0x6a, 0xf7,
+ 0x98, 0x45, 0xf8, 0xdb, 0x1f, 0x39, 0x69, 0x91, 0x8c, 0x93, 0xcf, 0x30, 0xef, 0xe8, 0xc1, 0x99,
+ 0xd3, 0x16, 0xf3, 0x77, 0x5e, 0x42, 0xac, 0x98, 0x31, 0x27, 0xa9, 0xb9, 0x3f, 0x72, 0xb2, 0x3b,
+ 0xd7, 0xae, 0xfb, 0xbd, 0xd0, 0xb6, 0x66, 0xc7, 0xfe, 0xc6, 0x49, 0x8b, 0x64, 0x8a, 0x7c, 0x81,
+ 0x49, 0x25, 0x39, 0x1a, 0x3a, 0x59, 0x8d, 0x37, 0xe9, 0xd7, 0xd7, 0xdb, 0x2e, 0x8a, 0xdb, 0x76,
+ 0xbc, 0x6b, 0xc9, 0x71, 0x17, 0x34, 0xeb, 0x3f, 0x11, 0xa4, 0x03, 0x98, 0x2c, 0x60, 0x74, 0x9e,
+ 0x78, 0x24, 0xf8, 0x93, 0x4d, 0x46, 0x4f, 0x37, 0x79, 0x14, 0xe6, 0xf1, 0xf3, 0x61, 0xbe, 0xf8,
+ 0x2f, 0xcc, 0x6f, 0x60, 0xe6, 0xa6, 0x70, 0xde, 0x90, 0xc6, 0xa9, 0x2b, 0x33, 0xde, 0x13, 0xca,
+ 0x27, 0xb1, 0x23, 0x94, 0x6b, 0x59, 0x68, 0x74, 0xc7, 0xb1, 0xa2, 0xc4, 0x36, 0x87, 0x10, 0xa0,
+ 0x5b, 0x51, 0xe2, 0x7e, 0xea, 0x97, 0xfd, 0xf6, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x31, 0xf2, 0x53,
+ 0x2d, 0x8e, 0x03, 0x00, 0x00,
}
diff --git a/sysset.proto b/sysset.proto
index d89d5af..952a1e0 100644
--- a/sysset.proto
+++ b/sysset.proto
@@ -6,13 +6,35 @@
string server_id = 1;
string server_name = 2;
int32 server_type = 3;
- string alarm_ip = 4;
- int32 alarm_port = 5;
- string web_pic_ip = 6;
- int32 web_pic_port = 7;
- string es_pic_ip = 8;
- int32 es_pic_port = 9;
- int32 cut_max_duration = 10;
- int32 cut_min_duration = 11;
- string reserved = 12;
+ string server_ip = 4;//鏈嶅姟鍣╥p,璋冪敤绯荤粺鍛戒护鑾峰彇
+ string alarm_ip = 5;
+ int32 alarm_port = 6;
+ string web_pic_ip = 7;
+ int32 web_pic_port = 8;
+ string es_pic_ip = 9;
+ int32 es_pic_port = 10;
+ int32 cut_max_duration = 11;
+ int32 cut_min_duration = 12;
+ string reserved = 13;
+
+ string gate_way = 14;
+ string net_mask = 15;
+}
+
+message Cluster {
+ string cluster_id = 1;
+ string cluster_name = 2;
+ string password = 3;
+ string virtual_ip = 4;
+ repeated ClusterNode nodes = 5;
+}
+
+message ClusterNode {
+ string id = 1;
+ string cluster_id = 2;
+ string server_id = 3;
+ string server_name = 4;
+ string node_id = 5;
+ string node_ip = 6;
+ string create_time = 7;
}
\ No newline at end of file
--
Gitblit v1.8.0