|
@@ -1,7 +1,12 @@
|
|
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
|
|
// versions:
|
|
|
+<<<<<<< HEAD
|
|
|
// protoc-gen-go v1.28.0
|
|
|
// protoc v3.15.1
|
|
|
+=======
|
|
|
+// protoc-gen-go v1.27.1
|
|
|
+// protoc v3.19.4
|
|
|
+>>>>>>> master
|
|
|
// source: bxsubscribe.proto
|
|
|
|
|
|
package bxsubscribe
|
|
@@ -782,6 +787,397 @@ func (x *SomeInfo) GetUserId() string {
|
|
|
return ""
|
|
|
}
|
|
|
|
|
|
+//
|
|
|
+type StatusResp struct {
|
|
|
+ state protoimpl.MessageState
|
|
|
+ sizeCache protoimpl.SizeCache
|
|
|
+ unknownFields protoimpl.UnknownFields
|
|
|
+
|
|
|
+ ErrorMsg string `protobuf:"bytes,1,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`
|
|
|
+ ErrorCode int64 `protobuf:"varint,2,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"`
|
|
|
+ Status int64 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
|
|
|
+}
|
|
|
+
|
|
|
+func (x *StatusResp) Reset() {
|
|
|
+ *x = StatusResp{}
|
|
|
+ if protoimpl.UnsafeEnabled {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[7]
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (x *StatusResp) String() string {
|
|
|
+ return protoimpl.X.MessageStringOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+func (*StatusResp) ProtoMessage() {}
|
|
|
+
|
|
|
+func (x *StatusResp) ProtoReflect() protoreflect.Message {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[7]
|
|
|
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ if ms.LoadMessageInfo() == nil {
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+ return ms
|
|
|
+ }
|
|
|
+ return mi.MessageOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+// Deprecated: Use StatusResp.ProtoReflect.Descriptor instead.
|
|
|
+func (*StatusResp) Descriptor() ([]byte, []int) {
|
|
|
+ return file_bxsubscribe_proto_rawDescGZIP(), []int{7}
|
|
|
+}
|
|
|
+
|
|
|
+func (x *StatusResp) GetErrorMsg() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.ErrorMsg
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *StatusResp) GetErrorCode() int64 {
|
|
|
+ if x != nil {
|
|
|
+ return x.ErrorCode
|
|
|
+ }
|
|
|
+ return 0
|
|
|
+}
|
|
|
+
|
|
|
+func (x *StatusResp) GetStatus() int64 {
|
|
|
+ if x != nil {
|
|
|
+ return x.Status
|
|
|
+ }
|
|
|
+ return 0
|
|
|
+}
|
|
|
+
|
|
|
+type UpdateSubScribeInfoReq struct {
|
|
|
+ state protoimpl.MessageState
|
|
|
+ sizeCache protoimpl.SizeCache
|
|
|
+ unknownFields protoimpl.UnknownFields
|
|
|
+
|
|
|
+ Area map[string]*CityList `protobuf:"bytes,1,rep,name=area,proto3" json:"area,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //地区
|
|
|
+ Buyerclass []string `protobuf:"bytes,2,rep,name=buyerclass,proto3" json:"buyerclass,omitempty"` //采购单位类型
|
|
|
+ Items []*Items `protobuf:"bytes,3,rep,name=items,proto3" json:"items,omitempty"` //关键词
|
|
|
+ Infotype []string `protobuf:"bytes,4,rep,name=infotype,proto3" json:"infotype,omitempty"` //信息类型
|
|
|
+ Matchway string `protobuf:"bytes,5,opt,name=matchway,proto3" json:"matchway,omitempty"` //匹配方式 1标题 2正文
|
|
|
+ Projectmatch string `protobuf:"bytes,6,opt,name=projectmatch,proto3" json:"projectmatch,omitempty"` //项目匹配 1开始 0关闭
|
|
|
+ Ratemode string `protobuf:"bytes,7,opt,name=ratemode,proto3" json:"ratemode,omitempty"` // 1:实时推送,2:每天9点推送,3:每周推送,4:每月推送 5:每日推送两次
|
|
|
+ Apppush string `protobuf:"bytes,8,opt,name=apppush,proto3" json:"apppush,omitempty"` //app推送 1开启 0关闭
|
|
|
+ Mailpush string `protobuf:"bytes,9,opt,name=mailpush,proto3" json:"mailpush,omitempty"` //邮箱推送 1开启 0关闭
|
|
|
+ Mail string `protobuf:"bytes,10,opt,name=mail,proto3" json:"mail,omitempty"` //邮箱
|
|
|
+ Otherbuyerclass string `protobuf:"bytes,11,opt,name=otherbuyerclass,proto3" json:"otherbuyerclass,omitempty"` //匹配未分类类型 1匹配 0不匹配
|
|
|
+ UserId string `protobuf:"bytes,12,opt,name=userId,proto3" json:"userId,omitempty"` //用户id
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) Reset() {
|
|
|
+ *x = UpdateSubScribeInfoReq{}
|
|
|
+ if protoimpl.UnsafeEnabled {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[8]
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) String() string {
|
|
|
+ return protoimpl.X.MessageStringOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+func (*UpdateSubScribeInfoReq) ProtoMessage() {}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) ProtoReflect() protoreflect.Message {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[8]
|
|
|
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ if ms.LoadMessageInfo() == nil {
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+ return ms
|
|
|
+ }
|
|
|
+ return mi.MessageOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+// Deprecated: Use UpdateSubScribeInfoReq.ProtoReflect.Descriptor instead.
|
|
|
+func (*UpdateSubScribeInfoReq) Descriptor() ([]byte, []int) {
|
|
|
+ return file_bxsubscribe_proto_rawDescGZIP(), []int{8}
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetArea() map[string]*CityList {
|
|
|
+ if x != nil {
|
|
|
+ return x.Area
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetBuyerclass() []string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Buyerclass
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetItems() []*Items {
|
|
|
+ if x != nil {
|
|
|
+ return x.Items
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetInfotype() []string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Infotype
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetMatchway() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Matchway
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetProjectmatch() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Projectmatch
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetRatemode() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Ratemode
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetApppush() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Apppush
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetMailpush() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Mailpush
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetMail() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Mail
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetOtherbuyerclass() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Otherbuyerclass
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *UpdateSubScribeInfoReq) GetUserId() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.UserId
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+//城市
|
|
|
+type CityList struct {
|
|
|
+ state protoimpl.MessageState
|
|
|
+ sizeCache protoimpl.SizeCache
|
|
|
+ unknownFields protoimpl.UnknownFields
|
|
|
+
|
|
|
+ City []string `protobuf:"bytes,1,rep,name=city,proto3" json:"city,omitempty"`
|
|
|
+}
|
|
|
+
|
|
|
+func (x *CityList) Reset() {
|
|
|
+ *x = CityList{}
|
|
|
+ if protoimpl.UnsafeEnabled {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[9]
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (x *CityList) String() string {
|
|
|
+ return protoimpl.X.MessageStringOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+func (*CityList) ProtoMessage() {}
|
|
|
+
|
|
|
+func (x *CityList) ProtoReflect() protoreflect.Message {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[9]
|
|
|
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ if ms.LoadMessageInfo() == nil {
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+ return ms
|
|
|
+ }
|
|
|
+ return mi.MessageOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+// Deprecated: Use CityList.ProtoReflect.Descriptor instead.
|
|
|
+func (*CityList) Descriptor() ([]byte, []int) {
|
|
|
+ return file_bxsubscribe_proto_rawDescGZIP(), []int{9}
|
|
|
+}
|
|
|
+
|
|
|
+func (x *CityList) GetCity() []string {
|
|
|
+ if x != nil {
|
|
|
+ return x.City
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+//分类
|
|
|
+type Items struct {
|
|
|
+ state protoimpl.MessageState
|
|
|
+ sizeCache protoimpl.SizeCache
|
|
|
+ unknownFields protoimpl.UnknownFields
|
|
|
+
|
|
|
+ SItem string `protobuf:"bytes,1,opt,name=s_item,json=sItem,proto3" json:"s_item,omitempty"` //分类名称
|
|
|
+ UpdateTime int64 `protobuf:"varint,2,opt,name=updateTime,proto3" json:"updateTime,omitempty"`
|
|
|
+ AKey []*Keys `protobuf:"bytes,3,rep,name=a_key,json=aKey,proto3" json:"a_key,omitempty"`
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Items) Reset() {
|
|
|
+ *x = Items{}
|
|
|
+ if protoimpl.UnsafeEnabled {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[10]
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Items) String() string {
|
|
|
+ return protoimpl.X.MessageStringOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+func (*Items) ProtoMessage() {}
|
|
|
+
|
|
|
+func (x *Items) ProtoReflect() protoreflect.Message {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[10]
|
|
|
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ if ms.LoadMessageInfo() == nil {
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+ return ms
|
|
|
+ }
|
|
|
+ return mi.MessageOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+// Deprecated: Use Items.ProtoReflect.Descriptor instead.
|
|
|
+func (*Items) Descriptor() ([]byte, []int) {
|
|
|
+ return file_bxsubscribe_proto_rawDescGZIP(), []int{10}
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Items) GetSItem() string {
|
|
|
+ if x != nil {
|
|
|
+ return x.SItem
|
|
|
+ }
|
|
|
+ return ""
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Items) GetUpdateTime() int64 {
|
|
|
+ if x != nil {
|
|
|
+ return x.UpdateTime
|
|
|
+ }
|
|
|
+ return 0
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Items) GetAKey() []*Keys {
|
|
|
+ if x != nil {
|
|
|
+ return x.AKey
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+//关键词
|
|
|
+type Keys struct {
|
|
|
+ state protoimpl.MessageState
|
|
|
+ sizeCache protoimpl.SizeCache
|
|
|
+ unknownFields protoimpl.UnknownFields
|
|
|
+
|
|
|
+ Key []string `protobuf:"bytes,1,rep,name=key,proto3" json:"key,omitempty"`
|
|
|
+ Notkey []string `protobuf:"bytes,2,rep,name=notkey,proto3" json:"notkey,omitempty"`
|
|
|
+ UpdateTime int64 `protobuf:"varint,3,opt,name=updateTime,proto3" json:"updateTime,omitempty"`
|
|
|
+ Matchway int64 `protobuf:"varint,4,opt,name=matchway,proto3" json:"matchway,omitempty"`
|
|
|
+ AppendKey []string `protobuf:"bytes,5,rep,name=appendKey,proto3" json:"appendKey,omitempty"`
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) Reset() {
|
|
|
+ *x = Keys{}
|
|
|
+ if protoimpl.UnsafeEnabled {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[11]
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) String() string {
|
|
|
+ return protoimpl.X.MessageStringOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+func (*Keys) ProtoMessage() {}
|
|
|
+
|
|
|
+func (x *Keys) ProtoReflect() protoreflect.Message {
|
|
|
+ mi := &file_bxsubscribe_proto_msgTypes[11]
|
|
|
+ if protoimpl.UnsafeEnabled && x != nil {
|
|
|
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
|
|
+ if ms.LoadMessageInfo() == nil {
|
|
|
+ ms.StoreMessageInfo(mi)
|
|
|
+ }
|
|
|
+ return ms
|
|
|
+ }
|
|
|
+ return mi.MessageOf(x)
|
|
|
+}
|
|
|
+
|
|
|
+// Deprecated: Use Keys.ProtoReflect.Descriptor instead.
|
|
|
+func (*Keys) Descriptor() ([]byte, []int) {
|
|
|
+ return file_bxsubscribe_proto_rawDescGZIP(), []int{11}
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) GetKey() []string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Key
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) GetNotkey() []string {
|
|
|
+ if x != nil {
|
|
|
+ return x.Notkey
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) GetUpdateTime() int64 {
|
|
|
+ if x != nil {
|
|
|
+ return x.UpdateTime
|
|
|
+ }
|
|
|
+ return 0
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) GetMatchway() int64 {
|
|
|
+ if x != nil {
|
|
|
+ return x.Matchway
|
|
|
+ }
|
|
|
+ return 0
|
|
|
+}
|
|
|
+
|
|
|
+func (x *Keys) GetAppendKey() []string {
|
|
|
+ if x != nil {
|
|
|
+ return x.AppendKey
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
var File_bxsubscribe_proto protoreflect.FileDescriptor
|
|
|
|
|
|
var file_bxsubscribe_proto_rawDesc = []byte{
|
|
@@ -816,6 +1212,7 @@ var file_bxsubscribe_proto_rawDesc = []byte{
|
|
|
0x65, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
|
0x09, 0x65, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65,
|
|
|
0x70, 0x74, 0x49, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x70, 0x74,
|
|
|
+<<<<<<< HEAD
|
|
|
0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18,
|
|
|
0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
|
|
|
0x22, 0x78, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66,
|
|
@@ -887,9 +1284,110 @@ var file_bxsubscribe_proto_rawDesc = []byte{
|
|
|
0x65, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
|
|
|
0x22, 0x88, 0x02, 0x0a, 0x08, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a,
|
|
|
0x06, 0x68, 0x61, 0x73, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x68,
|
|
|
+<<<<<<< HEAD
|
|
|
0x61, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, 0x49, 0x6e, 0x54, 0x53, 0x67,
|
|
|
0x75, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x49, 0x6e,
|
|
|
0x54, 0x53, 0x67, 0x75, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x45, 0x78, 0x70,
|
|
|
+=======
|
|
|
+ 0x61, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x49, 0x6e, 0x47, 0x75, 0x69,
|
|
|
+ 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x49, 0x6e, 0x47, 0x75,
|
|
|
+ 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x18,
|
|
|
+ 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x12,
|
|
|
+ 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x54, 0x61, 0x69, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
|
|
|
+ 0x03, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x54, 0x61, 0x69, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x69,
|
|
|
+ 0x73, 0x50, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
|
|
|
+ 0x52, 0x0b, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a,
|
|
|
+ 0x09, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
|
|
|
+ 0x52, 0x09, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x69,
|
|
|
+ 0x73, 0x52, 0x65, 0x61, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x52,
|
|
|
+ 0x65, 0x61, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, 0x79, 0x18,
|
|
|
+ 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, 0x79, 0x12,
|
|
|
+ 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
|
+ 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x32, 0xa3, 0x01, 0x0a, 0x0b, 0x42, 0x78, 0x73, 0x75,
|
|
|
+ 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x75,
|
|
|
+ 0x62, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72,
|
|
|
+ 0x69, 0x62, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66,
|
|
|
+ 0x6f, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72,
|
|
|
+ 0x69, 0x62, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66,
|
|
|
+ 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x45, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62,
|
|
|
+ 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62,
|
|
|
+ 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
|
|
+ 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
|
|
|
+ 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0f, 0x5a,
|
|
|
+ 0x0d, 0x2e, 0x2f, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x62, 0x06,
|
|
|
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
|
|
+=======
|
|
|
+ 0x49, 0x64, 0x22, 0x78, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49,
|
|
|
+ 0x6e, 0x66, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f,
|
|
|
+ 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43,
|
|
|
+ 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02,
|
|
|
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x2e, 0x0a, 0x04,
|
|
|
+ 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x78, 0x73,
|
|
|
+ 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
|
|
|
+ 0x62, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x77, 0x0a, 0x0d,
|
|
|
+ 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a,
|
|
|
+ 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f,
|
|
|
+ 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x68, 0x61, 0x73, 0x4e, 0x65, 0x78, 0x74, 0x50, 0x61,
|
|
|
+ 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x68, 0x61, 0x73, 0x4e, 0x65, 0x78,
|
|
|
+ 0x74, 0x50, 0x61, 0x67, 0x65, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20,
|
|
|
+ 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
|
|
|
+ 0x65, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
|
|
+ 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0xd4, 0x04, 0x0a, 0x0d, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72,
|
|
|
+ 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0f, 0x0a, 0x03, 0x5f, 0x69, 0x64, 0x18, 0x01,
|
|
|
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c,
|
|
|
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x12,
|
|
|
+ 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72,
|
|
|
+ 0x65, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x73, 0x73,
|
|
|
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x43, 0x6c, 0x61,
|
|
|
+ 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20,
|
|
|
+ 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08,
|
|
|
+ 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
|
|
|
+ 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c,
|
|
|
+ 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x70,
|
|
|
+ 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x61,
|
|
|
+ 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x63, 0x61,
|
|
|
+ 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x17, 0x0a, 0x07, 0x63, 0x61, 0x5f, 0x64, 0x61, 0x74, 0x65,
|
|
|
+ 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x61, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1d,
|
|
|
+ 0x0a, 0x0a, 0x63, 0x61, 0x5f, 0x69, 0x73, 0x76, 0x69, 0x73, 0x69, 0x74, 0x18, 0x0a, 0x20, 0x01,
|
|
|
+ 0x28, 0x03, 0x52, 0x09, 0x63, 0x61, 0x49, 0x73, 0x76, 0x69, 0x73, 0x69, 0x74, 0x12, 0x17, 0x0a,
|
|
|
+ 0x07, 0x63, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
|
|
|
+ 0x63, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x4b,
|
|
|
+ 0x65, 0x79, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68,
|
|
|
+ 0x4b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x18, 0x0d,
|
|
|
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09,
|
|
|
+ 0x62, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
|
+ 0x09, 0x62, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f,
|
|
|
+ 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a,
|
|
|
+ 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75,
|
|
|
+ 0x79, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72,
|
|
|
+ 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18,
|
|
|
+ 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61,
|
|
|
+ 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x12, 0x20, 0x01,
|
|
|
+ 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x69,
|
|
|
+ 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52,
|
|
|
+ 0x0b, 0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08,
|
|
|
+ 0x63, 0x61, 0x5f, 0x69, 0x73, 0x76, 0x69, 0x70, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
|
|
|
+ 0x63, 0x61, 0x49, 0x73, 0x76, 0x69, 0x70, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x61, 0x5f, 0x66, 0x69,
|
|
|
+ 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c,
|
|
|
+ 0x63, 0x61, 0x46, 0x69, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22, 0x57, 0x0a, 0x0b,
|
|
|
+ 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61,
|
|
|
+ 0x70, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49,
|
|
|
+ 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
|
|
+ 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65,
|
|
|
+ 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65,
|
|
|
+ 0x72, 0x54, 0x79, 0x70, 0x65, 0x22, 0x6d, 0x0a, 0x0c, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66,
|
|
|
+ 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64,
|
|
|
+ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65,
|
|
|
+ 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28,
|
|
|
+ 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x29, 0x0a, 0x04, 0x64, 0x61, 0x74,
|
|
|
+ 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73,
|
|
|
+ 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
|
|
|
+ 0x64, 0x61, 0x74, 0x61, 0x22, 0x84, 0x02, 0x0a, 0x08, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66,
|
|
|
+ 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x61, 0x73, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
|
|
|
+ 0x08, 0x52, 0x06, 0x68, 0x61, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x49,
|
|
|
+ 0x6e, 0x47, 0x75, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73,
|
|
|
+ 0x49, 0x6e, 0x47, 0x75, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x45, 0x78, 0x70,
|
|
|
+>>>>>>> origin/feature/v1.1.5
|
|
|
0x69, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x73, 0x45, 0x78, 0x70,
|
|
|
0x69, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x54, 0x61, 0x69, 0x6c, 0x18,
|
|
|
0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x54, 0x61, 0x69, 0x6c, 0x12,
|
|
@@ -901,6 +1399,7 @@ var file_bxsubscribe_proto_rawDesc = []byte{
|
|
|
0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73,
|
|
|
0x74, 0x72, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73,
|
|
|
0x74, 0x72, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x09, 0x20,
|
|
|
+<<<<<<< HEAD
|
|
|
0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x32, 0xa3, 0x01, 0x0a, 0x0b,
|
|
|
0x42, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x4d, 0x0a, 0x0a, 0x47,
|
|
|
0x65, 0x74, 0x53, 0x75, 0x62, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x2e, 0x62, 0x78, 0x73, 0x75,
|
|
@@ -914,6 +1413,83 @@ var file_bxsubscribe_proto_rawDesc = []byte{
|
|
|
0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
|
|
|
0x70, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x2f, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
|
|
|
0x62, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
|
|
+=======
|
|
|
+ 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x60, 0x0a, 0x0a, 0x53,
|
|
|
+ 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72,
|
|
|
+ 0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72,
|
|
|
+ 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f,
|
|
|
+ 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f,
|
|
|
+ 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
|
|
|
+ 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xf9, 0x03,
|
|
|
+ 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x53, 0x63, 0x72, 0x69, 0x62,
|
|
|
+ 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x41, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61,
|
|
|
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63,
|
|
|
+ 0x72, 0x69, 0x62, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75, 0x62, 0x53, 0x63,
|
|
|
+ 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x2e, 0x41, 0x72, 0x65, 0x61,
|
|
|
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x62,
|
|
|
+ 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
|
|
|
+ 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x28, 0x0a, 0x05, 0x69,
|
|
|
+ 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x62, 0x78, 0x73,
|
|
|
+ 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x05,
|
|
|
+ 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x66, 0x6f, 0x74, 0x79, 0x70,
|
|
|
+ 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x66, 0x6f, 0x74, 0x79, 0x70,
|
|
|
+ 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x77, 0x61, 0x79, 0x18, 0x05, 0x20,
|
|
|
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x77, 0x61, 0x79, 0x12, 0x22, 0x0a,
|
|
|
+ 0x0c, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20,
|
|
|
+ 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x6d, 0x61, 0x74, 0x63,
|
|
|
+ 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x74, 0x65, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20,
|
|
|
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x61, 0x74, 0x65, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a,
|
|
|
+ 0x07, 0x61, 0x70, 0x70, 0x70, 0x75, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
|
|
|
+ 0x61, 0x70, 0x70, 0x70, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6c, 0x70,
|
|
|
+ 0x75, 0x73, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x61, 0x69, 0x6c, 0x70,
|
|
|
+ 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28,
|
|
|
+ 0x09, 0x52, 0x04, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6f, 0x74, 0x68, 0x65, 0x72,
|
|
|
+ 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09,
|
|
|
+ 0x52, 0x0f, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73,
|
|
|
+ 0x73, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28,
|
|
|
+ 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x1a, 0x4e, 0x0a, 0x09, 0x41, 0x72, 0x65,
|
|
|
+ 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
|
|
+ 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
|
|
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73,
|
|
|
+ 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05,
|
|
|
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x1e, 0x0a, 0x08, 0x43, 0x69, 0x74,
|
|
|
+ 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20,
|
|
|
+ 0x03, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x22, 0x66, 0x0a, 0x05, 0x49, 0x74, 0x65,
|
|
|
+ 0x6d, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01,
|
|
|
+ 0x28, 0x09, 0x52, 0x05, 0x73, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64,
|
|
|
+ 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75,
|
|
|
+ 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x05, 0x61, 0x5f, 0x6b,
|
|
|
+ 0x65, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62,
|
|
|
+ 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x04, 0x61, 0x4b, 0x65,
|
|
|
+ 0x79, 0x22, 0x8a, 0x01, 0x0a, 0x04, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
|
|
+ 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06,
|
|
|
+ 0x6e, 0x6f, 0x74, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f,
|
|
|
+ 0x74, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69,
|
|
|
+ 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
|
|
|
+ 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x77, 0x61, 0x79,
|
|
|
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x77, 0x61, 0x79,
|
|
|
+ 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x4b, 0x65, 0x79, 0x18, 0x05, 0x20,
|
|
|
+ 0x03, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x4b, 0x65, 0x79, 0x32, 0xf8,
|
|
|
+ 0x01, 0x0a, 0x0b, 0x42, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x4d,
|
|
|
+ 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x2e, 0x62,
|
|
|
+ 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63,
|
|
|
+ 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x62,
|
|
|
+ 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63,
|
|
|
+ 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x45, 0x0a,
|
|
|
+ 0x0e, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
|
|
|
+ 0x18, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x6f,
|
|
|
+ 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x62, 0x78, 0x73, 0x75,
|
|
|
+ 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f,
|
|
|
+ 0x52, 0x65, 0x73, 0x70, 0x12, 0x53, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x75,
|
|
|
+ 0x62, 0x53, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x23, 0x2e, 0x62, 0x78,
|
|
|
+ 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
|
|
|
+ 0x53, 0x75, 0x62, 0x53, 0x63, 0x72, 0x69, 0x62, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71,
|
|
|
+ 0x1a, 0x17, 0x2e, 0x62, 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53,
|
|
|
+ 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x2f, 0x62,
|
|
|
+ 0x78, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
|
|
+ 0x6f, 0x33,
|
|
|
+>>>>>>> master
|
|
|
+>>>>>>> origin/feature/v1.1.5
|
|
|
}
|
|
|
|
|
|
var (
|
|
@@ -928,29 +1504,41 @@ func file_bxsubscribe_proto_rawDescGZIP() []byte {
|
|
|
return file_bxsubscribe_proto_rawDescData
|
|
|
}
|
|
|
|
|
|
-var file_bxsubscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
|
|
|
+var file_bxsubscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
|
|
|
var file_bxsubscribe_proto_goTypes = []interface{}{
|
|
|
- (*SubscribeInfosReq)(nil), // 0: bxsubscribe.SubscribeInfosReq
|
|
|
- (*SubscribeInfosResp)(nil), // 1: bxsubscribe.SubscribeInfosResp
|
|
|
- (*SubscribeData)(nil), // 2: bxsubscribe.subscribeData
|
|
|
- (*SubscribeInfo)(nil), // 3: bxsubscribe.subscribeInfo
|
|
|
- (*SomeInfoReq)(nil), // 4: bxsubscribe.SomeInfoReq
|
|
|
- (*SomeInfoResp)(nil), // 5: bxsubscribe.SomeInfoResp
|
|
|
- (*SomeInfo)(nil), // 6: bxsubscribe.SomeInfo
|
|
|
+ (*SubscribeInfosReq)(nil), // 0: bxsubscribe.SubscribeInfosReq
|
|
|
+ (*SubscribeInfosResp)(nil), // 1: bxsubscribe.SubscribeInfosResp
|
|
|
+ (*SubscribeData)(nil), // 2: bxsubscribe.subscribeData
|
|
|
+ (*SubscribeInfo)(nil), // 3: bxsubscribe.subscribeInfo
|
|
|
+ (*SomeInfoReq)(nil), // 4: bxsubscribe.SomeInfoReq
|
|
|
+ (*SomeInfoResp)(nil), // 5: bxsubscribe.SomeInfoResp
|
|
|
+ (*SomeInfo)(nil), // 6: bxsubscribe.SomeInfo
|
|
|
+ (*StatusResp)(nil), // 7: bxsubscribe.StatusResp
|
|
|
+ (*UpdateSubScribeInfoReq)(nil), // 8: bxsubscribe.UpdateSubScribeInfoReq
|
|
|
+ (*CityList)(nil), // 9: bxsubscribe.CityList
|
|
|
+ (*Items)(nil), // 10: bxsubscribe.Items
|
|
|
+ (*Keys)(nil), // 11: bxsubscribe.Keys
|
|
|
+ nil, // 12: bxsubscribe.UpdateSubScribeInfoReq.AreaEntry
|
|
|
}
|
|
|
var file_bxsubscribe_proto_depIdxs = []int32{
|
|
|
- 2, // 0: bxsubscribe.SubscribeInfosResp.data:type_name -> bxsubscribe.subscribeData
|
|
|
- 3, // 1: bxsubscribe.subscribeData.list:type_name -> bxsubscribe.subscribeInfo
|
|
|
- 6, // 2: bxsubscribe.SomeInfoResp.data:type_name -> bxsubscribe.SomeInfo
|
|
|
- 0, // 3: bxsubscribe.Bxsubscribe.GetSubList:input_type -> bxsubscribe.SubscribeInfosReq
|
|
|
- 4, // 4: bxsubscribe.Bxsubscribe.GetSubSomeInfo:input_type -> bxsubscribe.SomeInfoReq
|
|
|
- 1, // 5: bxsubscribe.Bxsubscribe.GetSubList:output_type -> bxsubscribe.SubscribeInfosResp
|
|
|
- 5, // 6: bxsubscribe.Bxsubscribe.GetSubSomeInfo:output_type -> bxsubscribe.SomeInfoResp
|
|
|
- 5, // [5:7] is the sub-list for method output_type
|
|
|
- 3, // [3:5] is the sub-list for method input_type
|
|
|
- 3, // [3:3] is the sub-list for extension type_name
|
|
|
- 3, // [3:3] is the sub-list for extension extendee
|
|
|
- 0, // [0:3] is the sub-list for field type_name
|
|
|
+ 2, // 0: bxsubscribe.SubscribeInfosResp.data:type_name -> bxsubscribe.subscribeData
|
|
|
+ 3, // 1: bxsubscribe.subscribeData.list:type_name -> bxsubscribe.subscribeInfo
|
|
|
+ 6, // 2: bxsubscribe.SomeInfoResp.data:type_name -> bxsubscribe.SomeInfo
|
|
|
+ 12, // 3: bxsubscribe.UpdateSubScribeInfoReq.area:type_name -> bxsubscribe.UpdateSubScribeInfoReq.AreaEntry
|
|
|
+ 10, // 4: bxsubscribe.UpdateSubScribeInfoReq.items:type_name -> bxsubscribe.Items
|
|
|
+ 11, // 5: bxsubscribe.Items.a_key:type_name -> bxsubscribe.Keys
|
|
|
+ 9, // 6: bxsubscribe.UpdateSubScribeInfoReq.AreaEntry.value:type_name -> bxsubscribe.CityList
|
|
|
+ 0, // 7: bxsubscribe.Bxsubscribe.GetSubList:input_type -> bxsubscribe.SubscribeInfosReq
|
|
|
+ 4, // 8: bxsubscribe.Bxsubscribe.GetSubSomeInfo:input_type -> bxsubscribe.SomeInfoReq
|
|
|
+ 8, // 9: bxsubscribe.Bxsubscribe.UpdateSubScribeInfo:input_type -> bxsubscribe.UpdateSubScribeInfoReq
|
|
|
+ 1, // 10: bxsubscribe.Bxsubscribe.GetSubList:output_type -> bxsubscribe.SubscribeInfosResp
|
|
|
+ 5, // 11: bxsubscribe.Bxsubscribe.GetSubSomeInfo:output_type -> bxsubscribe.SomeInfoResp
|
|
|
+ 7, // 12: bxsubscribe.Bxsubscribe.UpdateSubScribeInfo:output_type -> bxsubscribe.StatusResp
|
|
|
+ 10, // [10:13] is the sub-list for method output_type
|
|
|
+ 7, // [7:10] is the sub-list for method input_type
|
|
|
+ 7, // [7:7] is the sub-list for extension type_name
|
|
|
+ 7, // [7:7] is the sub-list for extension extendee
|
|
|
+ 0, // [0:7] is the sub-list for field type_name
|
|
|
}
|
|
|
|
|
|
func init() { file_bxsubscribe_proto_init() }
|
|
@@ -1043,6 +1631,66 @@ func file_bxsubscribe_proto_init() {
|
|
|
return nil
|
|
|
}
|
|
|
}
|
|
|
+ file_bxsubscribe_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
|
|
|
+ switch v := v.(*StatusResp); i {
|
|
|
+ case 0:
|
|
|
+ return &v.state
|
|
|
+ case 1:
|
|
|
+ return &v.sizeCache
|
|
|
+ case 2:
|
|
|
+ return &v.unknownFields
|
|
|
+ default:
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
+ file_bxsubscribe_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
|
|
|
+ switch v := v.(*UpdateSubScribeInfoReq); i {
|
|
|
+ case 0:
|
|
|
+ return &v.state
|
|
|
+ case 1:
|
|
|
+ return &v.sizeCache
|
|
|
+ case 2:
|
|
|
+ return &v.unknownFields
|
|
|
+ default:
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
+ file_bxsubscribe_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
|
|
|
+ switch v := v.(*CityList); i {
|
|
|
+ case 0:
|
|
|
+ return &v.state
|
|
|
+ case 1:
|
|
|
+ return &v.sizeCache
|
|
|
+ case 2:
|
|
|
+ return &v.unknownFields
|
|
|
+ default:
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
+ file_bxsubscribe_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
|
|
|
+ switch v := v.(*Items); i {
|
|
|
+ case 0:
|
|
|
+ return &v.state
|
|
|
+ case 1:
|
|
|
+ return &v.sizeCache
|
|
|
+ case 2:
|
|
|
+ return &v.unknownFields
|
|
|
+ default:
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
+ file_bxsubscribe_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
|
|
|
+ switch v := v.(*Keys); i {
|
|
|
+ case 0:
|
|
|
+ return &v.state
|
|
|
+ case 1:
|
|
|
+ return &v.sizeCache
|
|
|
+ case 2:
|
|
|
+ return &v.unknownFields
|
|
|
+ default:
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
type x struct{}
|
|
|
out := protoimpl.TypeBuilder{
|
|
@@ -1050,7 +1698,7 @@ func file_bxsubscribe_proto_init() {
|
|
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
|
|
RawDescriptor: file_bxsubscribe_proto_rawDesc,
|
|
|
NumEnums: 0,
|
|
|
- NumMessages: 7,
|
|
|
+ NumMessages: 13,
|
|
|
NumExtensions: 0,
|
|
|
NumServices: 1,
|
|
|
},
|