From 4922436eb78c6e6735c7fb6ce4920c67a449cbf0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 13 七月 2020 18:19:18 +0800
Subject: [PATCH] add operator_type

---
 commsg.pb.go |  147 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 114 insertions(+), 33 deletions(-)

diff --git a/commsg.pb.go b/commsg.pb.go
index 23abc96..5e386e6 100644
--- a/commsg.pb.go
+++ b/commsg.pb.go
@@ -1,11 +1,11 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: commsg.proto
 
 package protomsg
 
 import (
 	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
+	proto "github.com/gogo/protobuf/proto"
 	math "math"
 )
 
@@ -18,7 +18,7 @@
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type SdkmsgWithTask struct {
 	Ipcid                string   `protobuf:"bytes,1,opt,name=ipcid,proto3" json:"ipcid,omitempty"`
@@ -35,7 +35,6 @@
 func (*SdkmsgWithTask) Descriptor() ([]byte, []int) {
 	return fileDescriptor_968fba5e415d8aac, []int{0}
 }
-
 func (m *SdkmsgWithTask) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SdkmsgWithTask.Unmarshal(m, b)
 }
@@ -91,7 +90,6 @@
 func (*TaskLabel) Descriptor() ([]byte, []int) {
 	return fileDescriptor_968fba5e415d8aac, []int{1}
 }
-
 func (m *TaskLabel) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TaskLabel.Unmarshal(m, b)
 }
@@ -139,13 +137,14 @@
 }
 
 type SdkMessage struct {
-	Cid                  string     `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"`
-	Caddr                string     `protobuf:"bytes,2,opt,name=caddr,proto3" json:"caddr,omitempty"`
-	Tasklab              *TaskLabel `protobuf:"bytes,3,opt,name=tasklab,proto3" json:"tasklab,omitempty"`
-	Data                 []byte     `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
-	XXX_unrecognized     []byte     `json:"-"`
-	XXX_sizecache        int32      `json:"-"`
+	Cid                  string      `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"`
+	Caddr                string      `protobuf:"bytes,2,opt,name=caddr,proto3" json:"caddr,omitempty"`
+	Tasklab              *TaskLabel  `protobuf:"bytes,3,opt,name=tasklab,proto3" json:"tasklab,omitempty"`
+	Data                 []byte      `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
+	Push                 *PushAttach `protobuf:"bytes,5,opt,name=push,proto3" json:"push,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
 }
 
 func (m *SdkMessage) Reset()         { *m = SdkMessage{} }
@@ -154,7 +153,6 @@
 func (*SdkMessage) Descriptor() ([]byte, []int) {
 	return fileDescriptor_968fba5e415d8aac, []int{2}
 }
-
 func (m *SdkMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SdkMessage.Unmarshal(m, b)
 }
@@ -201,6 +199,13 @@
 	return nil
 }
 
+func (m *SdkMessage) GetPush() *PushAttach {
+	if m != nil {
+		return m.Push
+	}
+	return nil
+}
+
 type Recvmsg struct {
 	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	Addr                 string   `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
@@ -216,7 +221,6 @@
 func (*Recvmsg) Descriptor() ([]byte, []int) {
 	return fileDescriptor_968fba5e415d8aac, []int{3}
 }
-
 func (m *Recvmsg) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Recvmsg.Unmarshal(m, b)
 }
@@ -256,33 +260,110 @@
 	return nil
 }
 
+type RuleMessage struct {
+	Taskid               string        `protobuf:"bytes,1,opt,name=taskid,proto3" json:"taskid,omitempty"`
+	Taskname             string        `protobuf:"bytes,2,opt,name=taskname,proto3" json:"taskname,omitempty"`
+	Msgtype              string        `protobuf:"bytes,3,opt,name=msgtype,proto3" json:"msgtype,omitempty"`
+	Sdkmsg               *SdkMessage   `protobuf:"bytes,4,opt,name=sdkmsg,proto3" json:"sdkmsg,omitempty"`
+	Alarmmsg             *AlarmMessage `protobuf:"bytes,5,opt,name=alarmmsg,proto3" json:"alarmmsg,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *RuleMessage) Reset()         { *m = RuleMessage{} }
+func (m *RuleMessage) String() string { return proto.CompactTextString(m) }
+func (*RuleMessage) ProtoMessage()    {}
+func (*RuleMessage) Descriptor() ([]byte, []int) {
+	return fileDescriptor_968fba5e415d8aac, []int{4}
+}
+func (m *RuleMessage) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_RuleMessage.Unmarshal(m, b)
+}
+func (m *RuleMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_RuleMessage.Marshal(b, m, deterministic)
+}
+func (m *RuleMessage) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RuleMessage.Merge(m, src)
+}
+func (m *RuleMessage) XXX_Size() int {
+	return xxx_messageInfo_RuleMessage.Size(m)
+}
+func (m *RuleMessage) XXX_DiscardUnknown() {
+	xxx_messageInfo_RuleMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_RuleMessage proto.InternalMessageInfo
+
+func (m *RuleMessage) GetTaskid() string {
+	if m != nil {
+		return m.Taskid
+	}
+	return ""
+}
+
+func (m *RuleMessage) GetTaskname() string {
+	if m != nil {
+		return m.Taskname
+	}
+	return ""
+}
+
+func (m *RuleMessage) GetMsgtype() string {
+	if m != nil {
+		return m.Msgtype
+	}
+	return ""
+}
+
+func (m *RuleMessage) GetSdkmsg() *SdkMessage {
+	if m != nil {
+		return m.Sdkmsg
+	}
+	return nil
+}
+
+func (m *RuleMessage) GetAlarmmsg() *AlarmMessage {
+	if m != nil {
+		return m.Alarmmsg
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*SdkmsgWithTask)(nil), "protomsg.SdkmsgWithTask")
 	proto.RegisterType((*TaskLabel)(nil), "protomsg.TaskLabel")
 	proto.RegisterType((*SdkMessage)(nil), "protomsg.SdkMessage")
 	proto.RegisterType((*Recvmsg)(nil), "protomsg.recvmsg")
+	proto.RegisterType((*RuleMessage)(nil), "protomsg.RuleMessage")
 }
 
 func init() { proto.RegisterFile("commsg.proto", fileDescriptor_968fba5e415d8aac) }
 
 var fileDescriptor_968fba5e415d8aac = []byte{
-	// 283 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x4d, 0x4e, 0xc3, 0x30,
-	0x10, 0x85, 0x95, 0xa4, 0x6d, 0xd2, 0x69, 0x55, 0xa1, 0x01, 0x21, 0x8b, 0x55, 0x94, 0x55, 0x36,
-	0x64, 0x51, 0xb8, 0x03, 0x1b, 0xd8, 0xa4, 0x48, 0x48, 0xec, 0x9c, 0xd8, 0x04, 0xcb, 0x75, 0x12,
-	0x65, 0x22, 0x7e, 0xce, 0xc0, 0xa5, 0x91, 0x9d, 0x9f, 0xb6, 0x2b, 0xbf, 0xcf, 0x1e, 0xbf, 0x79,
-	0x33, 0xb0, 0x2d, 0x1b, 0x63, 0xa8, 0xca, 0xda, 0xae, 0xe9, 0x1b, 0x8c, 0xdc, 0x61, 0xa8, 0x4a,
-	0xde, 0x61, 0x77, 0x10, 0xda, 0x50, 0xf5, 0xa6, 0xfa, 0xcf, 0x57, 0x4e, 0x1a, 0x6f, 0x60, 0xa9,
-	0xda, 0x52, 0x09, 0xe6, 0xc5, 0x5e, 0xba, 0xce, 0x07, 0x40, 0x06, 0x21, 0x09, 0xdd, 0xff, 0xb6,
-	0x92, 0xf9, 0xee, 0x7e, 0xc2, 0xf1, 0x45, 0xf0, 0x9e, 0xb3, 0x45, 0xec, 0xa5, 0xdb, 0x7c, 0xc2,
-	0xe4, 0xcf, 0x83, 0xb5, 0xb5, 0x7c, 0xe6, 0x85, 0x3c, 0xe2, 0x2d, 0xac, 0x7a, 0x4e, 0x7a, 0x36,
-	0x1e, 0x09, 0xef, 0x20, 0xb2, 0xaa, 0xe6, 0x66, 0xb2, 0x9e, 0x19, 0x1f, 0x21, 0x22, 0xa1, 0x55,
-	0xfd, 0xd1, 0x10, 0x0b, 0xe2, 0x20, 0xdd, 0xec, 0x59, 0x36, 0x45, 0xcf, 0x2e, 0x73, 0xe7, 0x73,
-	0xa5, 0x9b, 0xa0, 0x16, 0xf2, 0xc7, 0xe5, 0x59, 0xe6, 0x03, 0x24, 0xdf, 0x00, 0x07, 0xa1, 0x5f,
-	0x24, 0x11, 0xaf, 0x24, 0x5e, 0x41, 0x70, 0x9a, 0xd1, 0x4a, 0xfb, 0xab, 0xe4, 0x42, 0x74, 0x63,
-	0x88, 0x01, 0xf0, 0x1e, 0x42, 0x9b, 0xe6, 0xc8, 0x0b, 0x16, 0xc4, 0x5e, 0xba, 0xd9, 0x5f, 0x9f,
-	0x02, 0xcc, 0xb3, 0xe5, 0x53, 0x0d, 0x22, 0x2c, 0xce, 0x36, 0xe1, 0x74, 0xf2, 0x04, 0x61, 0x27,
-	0xcb, 0x2f, 0x43, 0x15, 0xee, 0xc0, 0x9f, 0x9b, 0xfa, 0x4a, 0xd8, 0xf2, 0xb3, 0x96, 0x4e, 0xdb,
-	0x7d, 0xb6, 0xaa, 0x74, 0x2e, 0xc1, 0xb0, 0xcf, 0x11, 0x8b, 0x95, 0xeb, 0xfc, 0xf0, 0x1f, 0x00,
-	0x00, 0xff, 0xff, 0xf6, 0xc9, 0xa4, 0x99, 0xcc, 0x01, 0x00, 0x00,
+	// 376 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xcd, 0x4e, 0x83, 0x40,
+	0x18, 0x0c, 0xa5, 0x2d, 0xf4, 0xa3, 0x69, 0xcc, 0xda, 0x34, 0x9b, 0x9e, 0x08, 0x27, 0x0e, 0xda,
+	0x43, 0xf5, 0x05, 0x7a, 0xf2, 0xa2, 0x89, 0xd9, 0x9a, 0x98, 0x78, 0xdb, 0xb2, 0x08, 0x04, 0xb6,
+	0x10, 0x3e, 0x6a, 0xf4, 0x19, 0x7c, 0x0a, 0x1f, 0xc4, 0x77, 0x33, 0xbb, 0xcb, 0x4f, 0x7b, 0xf5,
+	0xc4, 0x0c, 0x3b, 0xdf, 0xc7, 0xcc, 0x2c, 0x30, 0x8f, 0x4a, 0x29, 0x31, 0xd9, 0x54, 0x75, 0xd9,
+	0x94, 0xc4, 0xd5, 0x0f, 0x89, 0xc9, 0x7a, 0xd1, 0x21, 0x73, 0xb2, 0xf6, 0x78, 0xc1, 0x6b, 0x69,
+	0x48, 0xf0, 0x06, 0x8b, 0xbd, 0xc8, 0x25, 0x26, 0xaf, 0x59, 0x93, 0xbe, 0x70, 0xcc, 0xc9, 0x12,
+	0x26, 0x59, 0x15, 0x65, 0x82, 0x5a, 0xbe, 0x15, 0xce, 0x98, 0x21, 0x84, 0x82, 0x83, 0x22, 0x6f,
+	0xbe, 0xaa, 0x98, 0x8e, 0xf4, 0xfb, 0x8e, 0xb6, 0x27, 0x82, 0x37, 0x9c, 0x8e, 0x7d, 0x2b, 0x9c,
+	0xb3, 0x8e, 0x06, 0xdf, 0x16, 0xcc, 0xd4, 0xca, 0x47, 0x7e, 0x88, 0x0b, 0xb2, 0x82, 0x69, 0xc3,
+	0x31, 0xef, 0x17, 0xb7, 0x8c, 0xac, 0xc1, 0x55, 0xe8, 0xc8, 0x65, 0xb7, 0xba, 0xe7, 0xe4, 0x1e,
+	0x5c, 0x14, 0x79, 0x76, 0x7c, 0x2f, 0x91, 0xda, 0xbe, 0x1d, 0x7a, 0x5b, 0xba, 0xe9, 0xd3, 0x5c,
+	0xfa, 0x66, 0xbd, 0x52, 0x27, 0x38, 0x8a, 0xf8, 0x53, 0xfb, 0x99, 0x30, 0x43, 0x82, 0x1f, 0x0b,
+	0x60, 0x2f, 0xf2, 0xa7, 0x18, 0x91, 0x27, 0x31, 0xb9, 0x02, 0x7b, 0x08, 0xa9, 0xa0, 0x1a, 0x8b,
+	0xb8, 0x10, 0x75, 0xeb, 0xc2, 0x10, 0x72, 0x0b, 0x8e, 0xb2, 0x53, 0xf0, 0x03, 0xb5, 0x7d, 0x2b,
+	0xf4, 0xb6, 0xd7, 0x83, 0x83, 0x3e, 0x1c, 0xeb, 0x34, 0x84, 0xc0, 0xf8, 0xac, 0x0a, 0x8d, 0x49,
+	0x08, 0xe3, 0xea, 0x84, 0x29, 0x9d, 0xe8, 0xf9, 0xe5, 0x30, 0xff, 0x7c, 0xc2, 0x74, 0xd7, 0x34,
+	0x3c, 0x4a, 0x99, 0x56, 0x04, 0x0f, 0xe0, 0xd4, 0x71, 0xf4, 0x21, 0x31, 0x21, 0x0b, 0x18, 0xf5,
+	0xf6, 0x46, 0x99, 0x50, 0x8b, 0xcf, 0xcc, 0x69, 0xac, 0xaa, 0xaf, 0xb2, 0x48, 0x7f, 0xcf, 0x36,
+	0xd5, 0xb7, 0x34, 0xf8, 0xb5, 0xc0, 0x63, 0xa7, 0x22, 0xee, 0xd2, 0xfe, 0xa7, 0x7c, 0x0a, 0x8e,
+	0xc4, 0x44, 0x5f, 0xb9, 0x6d, 0xae, 0xbc, 0xa5, 0xe4, 0x06, 0xa6, 0xa8, 0xcb, 0xd7, 0x31, 0x2f,
+	0x22, 0x0d, 0x0d, 0xb3, 0x56, 0x43, 0xb6, 0xe0, 0xea, 0x3f, 0x4e, 0xe9, 0x4d, 0x05, 0xab, 0x41,
+	0xbf, 0x53, 0x27, 0xdd, 0x44, 0xaf, 0x3b, 0x4c, 0xb5, 0xe0, 0xee, 0x2f, 0x00, 0x00, 0xff, 0xff,
+	0xc8, 0xc5, 0x13, 0x57, 0xd4, 0x02, 0x00, 0x00,
 }

--
Gitblit v1.8.0