diff --git a/build/rpc.json b/build/rpc.json index 91de2f2..0caaa99 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -4481,6 +4481,17 @@ ], "isDeprecated": false }, + { + "name": "findAllEnabledMessageReceiversWithMessageRecipientId", + "requestMessageName": "FindAllEnabledMessageReceiversWithMessageRecipientIdRequest", + "responseMessageName": "FindAllEnabledMessageReceiversWithMessageRecipientIdResponse", + "code": "rpc findAllEnabledMessageReceiversWithMessageRecipientId (FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) returns (FindAllEnabledMessageReceiversWithMessageRecipientIdResponse);", + "doc": "根据接收人查找关联的接收者", + "roles": [ + "admin" + ], + "isDeprecated": false + }, { "name": "deleteMessageReceiver", "requestMessageName": "DeleteMessageReceiverRequest", @@ -14118,7 +14129,7 @@ }, { "name": "CountAllEnabledMessageReceiversRequest", - "code": "message CountAllEnabledMessageReceiversRequest {\n\tstring role = 4;\n\tint64 nodeClusterId = 1;\n\tint64 nodeId = 2;\n\tint64 serverId = 3;\n}", + "code": "message CountAllEnabledMessageReceiversRequest {\n\tstring role = 4; // 集群角色:node 或 dns\n\tint64 nodeClusterId = 1; // 集群ID\n\tint64 nodeId = 2; // 节点ID\n\tint64 serverId = 3; // 网站ID\n}", "doc": "计算接收者数量" }, { @@ -14973,7 +14984,7 @@ }, { "name": "CreateMessageRecipientRequest", - "code": "message CreateMessageRecipientRequest {\n\tint64 adminId = 1;\n\tint64 messageMediaInstanceId = 2;\n\trepeated int64 messageRecipientGroupIds = 3;\n\tstring description = 4;\n\tstring user = 5;\n\tstring timeFrom = 6;\n\tstring timeTo = 7;\n}", + "code": "message CreateMessageRecipientRequest {\n\tint64 adminId = 1; // 关联的管理员ID\n\tint64 messageMediaInstanceId = 2; // 媒介实例ID\n\trepeated int64 messageRecipientGroupIds = 3; // 所属分组ID列表\n\tstring description = 4; // 可选项,备注描述\n\tstring user = 5; // 用户标识\n\tstring timeFrom = 6; // 可选项,接收消息的,开始时间\n\tstring timeTo = 7; // 可选项,接收消息的,结束时间\n\n\trepeated int64 nodeClusterIds = 8; // 关联的CDN边缘节点集群ID列表\n}", "doc": "创建接收人" }, { @@ -15763,7 +15774,7 @@ }, { "name": "DeleteMessageReceiverRequest", - "code": "message DeleteMessageReceiverRequest {\n\tint64 messageReceiverId = 1;\n}", + "code": "message DeleteMessageReceiverRequest {\n\tint64 messageReceiverId = 1; // 接收者ID\n}", "doc": "删除接收者" }, { @@ -16688,7 +16699,7 @@ }, { "name": "FindAllEnabledMessageReceiversRequest", - "code": "message FindAllEnabledMessageReceiversRequest {\n\tstring role = 4;\n\tint64 nodeClusterId = 1;\n\tint64 nodeId = 2;\n\tint64 serverId = 3;\n}", + "code": "message FindAllEnabledMessageReceiversRequest {\n\tstring role = 4; // 集群角色:node 或 dns\n\tint64 nodeClusterId = 1; // 集群ID\n\tint64 nodeId = 2; // 节点ID\n\tint64 serverId = 3; // 网站ID\n}", "doc": "查找接收者" }, { @@ -16696,6 +16707,16 @@ "code": "message FindAllEnabledMessageReceiversResponse {\n\trepeated MessageReceiver messageReceivers = 1;\n}", "doc": "" }, + { + "name": "FindAllEnabledMessageReceiversWithMessageRecipientIdRequest", + "code": "message FindAllEnabledMessageReceiversWithMessageRecipientIdRequest {\n\tint64 messageRecipientId = 1; // 关联的接收人ID\n}", + "doc": "根据接收人查找关联的接收者" + }, + { + "name": "FindAllEnabledMessageReceiversWithMessageRecipientIdResponse", + "code": "message FindAllEnabledMessageReceiversWithMessageRecipientIdResponse {\n\trepeated MessageReceiver messageReceivers = 1;\n}", + "doc": "" + }, { "name": "FindAllEnabledMessageRecipientGroupsRequest", "code": "message FindAllEnabledMessageRecipientGroupsRequest {\n\n}", @@ -20658,7 +20679,7 @@ }, { "name": "MessageReceiver", - "code": "message MessageReceiver {\n\tint64 id = 1;\n\tint64 clusterId = 2;\n\tint64 nodeId = 3;\n\tint64 serverId = 4;\n\tstring type = 5;\n\tbytes paramsJSON = 6;\n\tMessageRecipient messageRecipient = 7;\n\tMessageRecipientGroup messageRecipientGroup = 8;\n}", + "code": "message MessageReceiver {\n\tint64 id = 1;\n\tint64 clusterId = 2;\n\tint64 nodeId = 3;\n\tint64 serverId = 4;\n\tstring type = 5;\n\tbytes paramsJSON = 6;\n\tstring role = 9; // 集群角色:node 或 dns\n\n\tMessageRecipient messageRecipient = 7;\n\tMessageRecipientGroup messageRecipientGroup = 8;\n}", "doc": "" }, { @@ -21858,7 +21879,7 @@ }, { "name": "UpdateMessageReceiversRequest", - "code": "message UpdateMessageReceiversRequest {\n\tstring role = 7;\n\tint64 nodeClusterId = 1;\n\tint64 nodeId = 2;\n\tint64 serverId = 3;\n\tbytes paramsJSON = 5;\n\tmap\u003cstring, RecipientOptions\u003e recipientOptions = 6; // type =\u003e options\n\n\n\tmessage RecipientOption {\n\t\tint64 messageRecipientId = 1;\n\t\tint64 messageRecipientGroupId = 2;\n\t}\n\n\n\tmessage RecipientOptions {\n\t\trepeated RecipientOption recipientOptions = 1;\n\t}\n}", + "code": "message UpdateMessageReceiversRequest {\n\tstring role = 7;\n\tint64 nodeClusterId = 1;\n\tint64 nodeId = 2;\n\tint64 serverId = 3;\n\tbytes paramsJSON = 5;\n\tmap\u003cstring, RecipientOptions\u003e recipientOptions = 6; // type =\u003e options,type为recipient或者group\n\n\n\tmessage RecipientOption {\n\t\tint64 messageRecipientId = 1;\n\t\tint64 messageRecipientGroupId = 2;\n\t}\n\n\n\tmessage RecipientOptions {\n\t\trepeated RecipientOption recipientOptions = 1;\n\t}\n}", "doc": "修改接收者" }, { @@ -21868,7 +21889,7 @@ }, { "name": "UpdateMessageRecipientRequest", - "code": "message UpdateMessageRecipientRequest {\n\tint64 messageRecipientId = 1;\n\tint64 adminId = 2;\n\tint64 messageMediaInstanceId = 3;\n\trepeated int64 messageRecipientGroupIds = 4;\n\tstring description = 5;\n\tbool isOn = 6;\n\tstring user = 7;\n\tstring timeFrom = 8;\n\tstring timeTo = 9;\n}", + "code": "message UpdateMessageRecipientRequest {\n\tint64 messageRecipientId = 1;\n\tint64 adminId = 2;\n\tint64 messageMediaInstanceId = 3;\n\trepeated int64 messageRecipientGroupIds = 4;\n\tstring description = 5;\n\tbool isOn = 6;\n\tstring user = 7;\n\tstring timeFrom = 8;\n\tstring timeTo = 9;\n\n\trepeated int64 nodeClusterIds = 10; // 关联的CDN边缘节点集群ID列表\n}", "doc": "修改接收人" }, { diff --git a/pkg/langs/codes/codes.go b/pkg/langs/codes/codes.go index 33be895..037ea5b 100644 --- a/pkg/langs/codes/codes.go +++ b/pkg/langs/codes/codes.go @@ -234,6 +234,7 @@ const ( MessageMediaInstance_LogCreateMessageMediaInstance langs.MessageCode = "message_media_instance@log_create_message_media_instance" // 创建消息媒介 %d MessageMediaInstance_LogDeleteMessageMediaInstance langs.MessageCode = "message_media_instance@log_delete_message_media_instance" // 删除消息媒介 %d MessageMediaInstance_LogUpdateMessageMediaInstance langs.MessageCode = "message_media_instance@log_update_message_media_instance" // 修改消息媒介 %d + MessageReceiver_LogDeleteReceiver langs.MessageCode = "message_receiver@log_delete_receiver" // 删除接收人关联关系 %d MessageReceiver_LogUpdateClusterMessageReceivers langs.MessageCode = "message_receiver@log_update_cluster_message_receivers" // 修改集群 %d 消息接收人 MessageRecipient_LogCreateMessageRecipient langs.MessageCode = "message_recipient@log_create_message_recipient" // 创建媒介接收人 %d MessageRecipient_LogDeleteMessageRecipient langs.MessageCode = "message_recipient@log_delete_message_recipient" // 删除媒介接收人 %d diff --git a/pkg/langs/messages/messages_zh_cn.go b/pkg/langs/messages/messages_zh_cn.go index 56cfa03..6ba5323 100644 --- a/pkg/langs/messages/messages_zh_cn.go +++ b/pkg/langs/messages/messages_zh_cn.go @@ -235,6 +235,7 @@ func init() { "message_media_instance@log_create_message_media_instance": "创建消息媒介 %d", "message_media_instance@log_delete_message_media_instance": "删除消息媒介 %d", "message_media_instance@log_update_message_media_instance": "修改消息媒介 %d", + "message_receiver@log_delete_receiver": "删除接收人关联关系 %d", "message_receiver@log_update_cluster_message_receivers": "修改集群 %d 消息接收人", "message_recipient@log_create_message_recipient": "创建媒介接收人 %d", "message_recipient@log_delete_message_recipient": "删除媒介接收人 %d", diff --git a/pkg/langs/protos/zh-cn/message_receiver.json b/pkg/langs/protos/zh-cn/message_receiver.json index 1217b79..0cf90a2 100644 --- a/pkg/langs/protos/zh-cn/message_receiver.json +++ b/pkg/langs/protos/zh-cn/message_receiver.json @@ -1,3 +1,4 @@ { - "log_update_cluster_message_receivers": "修改集群 %d 消息接收人" + "log_update_cluster_message_receivers": "修改集群 %d 消息接收人", + "log_delete_receiver": "删除接收人关联关系 %d" } \ No newline at end of file diff --git a/pkg/rpc/pb/model_message_receiver.pb.go b/pkg/rpc/pb/model_message_receiver.pb.go index 12be058..57b8c34 100644 --- a/pkg/rpc/pb/model_message_receiver.pb.go +++ b/pkg/rpc/pb/model_message_receiver.pb.go @@ -31,6 +31,7 @@ type MessageReceiver struct { ServerId int64 `protobuf:"varint,4,opt,name=serverId,proto3" json:"serverId,omitempty"` Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"` ParamsJSON []byte `protobuf:"bytes,6,opt,name=paramsJSON,proto3" json:"paramsJSON,omitempty"` + Role string `protobuf:"bytes,9,opt,name=role,proto3" json:"role,omitempty"` // 集群角色:node 或 dns MessageRecipient *MessageRecipient `protobuf:"bytes,7,opt,name=messageRecipient,proto3" json:"messageRecipient,omitempty"` MessageRecipientGroup *MessageRecipientGroup `protobuf:"bytes,8,opt,name=messageRecipientGroup,proto3" json:"messageRecipientGroup,omitempty"` } @@ -109,6 +110,13 @@ func (x *MessageReceiver) GetParamsJSON() []byte { return nil } +func (x *MessageReceiver) GetRole() string { + if x != nil { + return x.Role + } + return "" +} + func (x *MessageReceiver) GetMessageRecipient() *MessageRecipient { if x != nil { return x.MessageRecipient @@ -133,7 +141,7 @@ var file_models_model_message_receiver_proto_rawDesc = []byte{ 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x5f, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xba, 0x02, 0x0a, 0x0f, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xce, 0x02, 0x0a, 0x0f, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, @@ -144,17 +152,18 @@ var file_models_model_message_receiver_proto_rawDesc = []byte{ 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x40, 0x0a, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, - 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, - 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x4f, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, - 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x40, 0x0a, 0x10, 0x6d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x4f, 0x0a, 0x15, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x2e, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, + 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/rpc/pb/service_message_receiver.pb.go b/pkg/rpc/pb/service_message_receiver.pb.go index fb25a69..82caecc 100644 --- a/pkg/rpc/pb/service_message_receiver.pb.go +++ b/pkg/rpc/pb/service_message_receiver.pb.go @@ -31,7 +31,7 @@ type UpdateMessageReceiversRequest struct { NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` ServerId int64 `protobuf:"varint,3,opt,name=serverId,proto3" json:"serverId,omitempty"` ParamsJSON []byte `protobuf:"bytes,5,opt,name=paramsJSON,proto3" json:"paramsJSON,omitempty"` - RecipientOptions map[string]*UpdateMessageReceiversRequest_RecipientOptions `protobuf:"bytes,6,rep,name=recipientOptions,proto3" json:"recipientOptions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // type => options + RecipientOptions map[string]*UpdateMessageReceiversRequest_RecipientOptions `protobuf:"bytes,6,rep,name=recipientOptions,proto3" json:"recipientOptions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // type => options,type为recipient或者group } func (x *UpdateMessageReceiversRequest) Reset() { @@ -114,10 +114,10 @@ type FindAllEnabledMessageReceiversRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Role string `protobuf:"bytes,4,opt,name=role,proto3" json:"role,omitempty"` - NodeClusterId int64 `protobuf:"varint,1,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` - NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` - ServerId int64 `protobuf:"varint,3,opt,name=serverId,proto3" json:"serverId,omitempty"` + Role string `protobuf:"bytes,4,opt,name=role,proto3" json:"role,omitempty"` // 集群角色:node 或 dns + NodeClusterId int64 `protobuf:"varint,1,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` // 集群ID + NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` // 节点ID + ServerId int64 `protobuf:"varint,3,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindAllEnabledMessageReceiversRequest) Reset() { @@ -227,19 +227,114 @@ func (x *FindAllEnabledMessageReceiversResponse) GetMessageReceivers() []*Messag return nil } +// 根据接收人查找关联的接收者 +type FindAllEnabledMessageReceiversWithMessageRecipientIdRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + MessageRecipientId int64 `protobuf:"varint,1,opt,name=messageRecipientId,proto3" json:"messageRecipientId,omitempty"` // 关联的接收人ID +} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) Reset() { + *x = FindAllEnabledMessageReceiversWithMessageRecipientIdRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_service_message_receiver_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) ProtoMessage() {} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) ProtoReflect() protoreflect.Message { + mi := &file_service_message_receiver_proto_msgTypes[3] + 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 FindAllEnabledMessageReceiversWithMessageRecipientIdRequest.ProtoReflect.Descriptor instead. +func (*FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) Descriptor() ([]byte, []int) { + return file_service_message_receiver_proto_rawDescGZIP(), []int{3} +} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) GetMessageRecipientId() int64 { + if x != nil { + return x.MessageRecipientId + } + return 0 +} + +type FindAllEnabledMessageReceiversWithMessageRecipientIdResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + MessageReceivers []*MessageReceiver `protobuf:"bytes,1,rep,name=messageReceivers,proto3" json:"messageReceivers,omitempty"` +} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) Reset() { + *x = FindAllEnabledMessageReceiversWithMessageRecipientIdResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_service_message_receiver_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) ProtoMessage() {} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) ProtoReflect() protoreflect.Message { + mi := &file_service_message_receiver_proto_msgTypes[4] + 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 FindAllEnabledMessageReceiversWithMessageRecipientIdResponse.ProtoReflect.Descriptor instead. +func (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) Descriptor() ([]byte, []int) { + return file_service_message_receiver_proto_rawDescGZIP(), []int{4} +} + +func (x *FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) GetMessageReceivers() []*MessageReceiver { + if x != nil { + return x.MessageReceivers + } + return nil +} + // 删除接收者 type DeleteMessageReceiverRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MessageReceiverId int64 `protobuf:"varint,1,opt,name=messageReceiverId,proto3" json:"messageReceiverId,omitempty"` + MessageReceiverId int64 `protobuf:"varint,1,opt,name=messageReceiverId,proto3" json:"messageReceiverId,omitempty"` // 接收者ID } func (x *DeleteMessageReceiverRequest) Reset() { *x = DeleteMessageReceiverRequest{} if protoimpl.UnsafeEnabled { - mi := &file_service_message_receiver_proto_msgTypes[3] + mi := &file_service_message_receiver_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -252,7 +347,7 @@ func (x *DeleteMessageReceiverRequest) String() string { func (*DeleteMessageReceiverRequest) ProtoMessage() {} func (x *DeleteMessageReceiverRequest) ProtoReflect() protoreflect.Message { - mi := &file_service_message_receiver_proto_msgTypes[3] + mi := &file_service_message_receiver_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -265,7 +360,7 @@ func (x *DeleteMessageReceiverRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteMessageReceiverRequest.ProtoReflect.Descriptor instead. func (*DeleteMessageReceiverRequest) Descriptor() ([]byte, []int) { - return file_service_message_receiver_proto_rawDescGZIP(), []int{3} + return file_service_message_receiver_proto_rawDescGZIP(), []int{5} } func (x *DeleteMessageReceiverRequest) GetMessageReceiverId() int64 { @@ -281,16 +376,16 @@ type CountAllEnabledMessageReceiversRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Role string `protobuf:"bytes,4,opt,name=role,proto3" json:"role,omitempty"` - NodeClusterId int64 `protobuf:"varint,1,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` - NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` - ServerId int64 `protobuf:"varint,3,opt,name=serverId,proto3" json:"serverId,omitempty"` + Role string `protobuf:"bytes,4,opt,name=role,proto3" json:"role,omitempty"` // 集群角色:node 或 dns + NodeClusterId int64 `protobuf:"varint,1,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` // 集群ID + NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` // 节点ID + ServerId int64 `protobuf:"varint,3,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *CountAllEnabledMessageReceiversRequest) Reset() { *x = CountAllEnabledMessageReceiversRequest{} if protoimpl.UnsafeEnabled { - mi := &file_service_message_receiver_proto_msgTypes[4] + mi := &file_service_message_receiver_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -303,7 +398,7 @@ func (x *CountAllEnabledMessageReceiversRequest) String() string { func (*CountAllEnabledMessageReceiversRequest) ProtoMessage() {} func (x *CountAllEnabledMessageReceiversRequest) ProtoReflect() protoreflect.Message { - mi := &file_service_message_receiver_proto_msgTypes[4] + mi := &file_service_message_receiver_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -316,7 +411,7 @@ func (x *CountAllEnabledMessageReceiversRequest) ProtoReflect() protoreflect.Mes // Deprecated: Use CountAllEnabledMessageReceiversRequest.ProtoReflect.Descriptor instead. func (*CountAllEnabledMessageReceiversRequest) Descriptor() ([]byte, []int) { - return file_service_message_receiver_proto_rawDescGZIP(), []int{4} + return file_service_message_receiver_proto_rawDescGZIP(), []int{6} } func (x *CountAllEnabledMessageReceiversRequest) GetRole() string { @@ -359,7 +454,7 @@ type UpdateMessageReceiversRequest_RecipientOption struct { func (x *UpdateMessageReceiversRequest_RecipientOption) Reset() { *x = UpdateMessageReceiversRequest_RecipientOption{} if protoimpl.UnsafeEnabled { - mi := &file_service_message_receiver_proto_msgTypes[6] + mi := &file_service_message_receiver_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -372,7 +467,7 @@ func (x *UpdateMessageReceiversRequest_RecipientOption) String() string { func (*UpdateMessageReceiversRequest_RecipientOption) ProtoMessage() {} func (x *UpdateMessageReceiversRequest_RecipientOption) ProtoReflect() protoreflect.Message { - mi := &file_service_message_receiver_proto_msgTypes[6] + mi := &file_service_message_receiver_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -413,7 +508,7 @@ type UpdateMessageReceiversRequest_RecipientOptions struct { func (x *UpdateMessageReceiversRequest_RecipientOptions) Reset() { *x = UpdateMessageReceiversRequest_RecipientOptions{} if protoimpl.UnsafeEnabled { - mi := &file_service_message_receiver_proto_msgTypes[7] + mi := &file_service_message_receiver_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -426,7 +521,7 @@ func (x *UpdateMessageReceiversRequest_RecipientOptions) String() string { func (*UpdateMessageReceiversRequest_RecipientOptions) ProtoMessage() {} func (x *UpdateMessageReceiversRequest_RecipientOptions) ProtoReflect() protoreflect.Message { - mi := &file_service_message_receiver_proto_msgTypes[7] + mi := &file_service_message_receiver_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -514,6 +609,21 @@ var file_service_message_receiver_proto_rawDesc = []byte{ 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x52, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x72, 0x73, 0x22, 0x6d, 0x0a, 0x3b, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, + 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, + 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, + 0x6e, 0x74, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x3c, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, + 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x72, 0x52, 0x10, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x22, 0x4c, 0x0a, 0x1c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, @@ -528,7 +638,7 @@ var file_service_message_receiver_proto_rawDesc = []byte{ 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x32, 0x8e, 0x03, 0x0a, + 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x32, 0xca, 0x04, 0x0a, 0x16, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4b, 0x0a, 0x16, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, @@ -542,19 +652,31 @@ var file_service_message_receiver_proto_rawDesc = []byte{ 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x49, 0x0a, - 0x15, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, - 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x63, 0x0a, 0x1f, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x2e, 0x70, 0x62, - 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0xb9, 0x01, + 0x0a, 0x34, 0x66, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x57, 0x69, 0x74, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, + 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x3f, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, + 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, + 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x57, 0x69, 0x74, 0x68, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, + 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x49, 0x0a, 0x15, 0x64, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x72, 0x12, 0x20, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x12, 0x63, 0x0a, 0x1f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6c, 0x6c, + 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -569,38 +691,43 @@ func file_service_message_receiver_proto_rawDescGZIP() []byte { return file_service_message_receiver_proto_rawDescData } -var file_service_message_receiver_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_service_message_receiver_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_service_message_receiver_proto_goTypes = []interface{}{ - (*UpdateMessageReceiversRequest)(nil), // 0: pb.UpdateMessageReceiversRequest - (*FindAllEnabledMessageReceiversRequest)(nil), // 1: pb.FindAllEnabledMessageReceiversRequest - (*FindAllEnabledMessageReceiversResponse)(nil), // 2: pb.FindAllEnabledMessageReceiversResponse - (*DeleteMessageReceiverRequest)(nil), // 3: pb.DeleteMessageReceiverRequest - (*CountAllEnabledMessageReceiversRequest)(nil), // 4: pb.CountAllEnabledMessageReceiversRequest - nil, // 5: pb.UpdateMessageReceiversRequest.RecipientOptionsEntry - (*UpdateMessageReceiversRequest_RecipientOption)(nil), // 6: pb.UpdateMessageReceiversRequest.RecipientOption - (*UpdateMessageReceiversRequest_RecipientOptions)(nil), // 7: pb.UpdateMessageReceiversRequest.RecipientOptions - (*MessageReceiver)(nil), // 8: pb.MessageReceiver - (*RPCSuccess)(nil), // 9: pb.RPCSuccess - (*RPCCountResponse)(nil), // 10: pb.RPCCountResponse + (*UpdateMessageReceiversRequest)(nil), // 0: pb.UpdateMessageReceiversRequest + (*FindAllEnabledMessageReceiversRequest)(nil), // 1: pb.FindAllEnabledMessageReceiversRequest + (*FindAllEnabledMessageReceiversResponse)(nil), // 2: pb.FindAllEnabledMessageReceiversResponse + (*FindAllEnabledMessageReceiversWithMessageRecipientIdRequest)(nil), // 3: pb.FindAllEnabledMessageReceiversWithMessageRecipientIdRequest + (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse)(nil), // 4: pb.FindAllEnabledMessageReceiversWithMessageRecipientIdResponse + (*DeleteMessageReceiverRequest)(nil), // 5: pb.DeleteMessageReceiverRequest + (*CountAllEnabledMessageReceiversRequest)(nil), // 6: pb.CountAllEnabledMessageReceiversRequest + nil, // 7: pb.UpdateMessageReceiversRequest.RecipientOptionsEntry + (*UpdateMessageReceiversRequest_RecipientOption)(nil), // 8: pb.UpdateMessageReceiversRequest.RecipientOption + (*UpdateMessageReceiversRequest_RecipientOptions)(nil), // 9: pb.UpdateMessageReceiversRequest.RecipientOptions + (*MessageReceiver)(nil), // 10: pb.MessageReceiver + (*RPCSuccess)(nil), // 11: pb.RPCSuccess + (*RPCCountResponse)(nil), // 12: pb.RPCCountResponse } var file_service_message_receiver_proto_depIdxs = []int32{ - 5, // 0: pb.UpdateMessageReceiversRequest.recipientOptions:type_name -> pb.UpdateMessageReceiversRequest.RecipientOptionsEntry - 8, // 1: pb.FindAllEnabledMessageReceiversResponse.messageReceivers:type_name -> pb.MessageReceiver - 7, // 2: pb.UpdateMessageReceiversRequest.RecipientOptionsEntry.value:type_name -> pb.UpdateMessageReceiversRequest.RecipientOptions - 6, // 3: pb.UpdateMessageReceiversRequest.RecipientOptions.recipientOptions:type_name -> pb.UpdateMessageReceiversRequest.RecipientOption - 0, // 4: pb.MessageReceiverService.updateMessageReceivers:input_type -> pb.UpdateMessageReceiversRequest - 1, // 5: pb.MessageReceiverService.findAllEnabledMessageReceivers:input_type -> pb.FindAllEnabledMessageReceiversRequest - 3, // 6: pb.MessageReceiverService.deleteMessageReceiver:input_type -> pb.DeleteMessageReceiverRequest - 4, // 7: pb.MessageReceiverService.countAllEnabledMessageReceivers:input_type -> pb.CountAllEnabledMessageReceiversRequest - 9, // 8: pb.MessageReceiverService.updateMessageReceivers:output_type -> pb.RPCSuccess - 2, // 9: pb.MessageReceiverService.findAllEnabledMessageReceivers:output_type -> pb.FindAllEnabledMessageReceiversResponse - 9, // 10: pb.MessageReceiverService.deleteMessageReceiver:output_type -> pb.RPCSuccess - 10, // 11: pb.MessageReceiverService.countAllEnabledMessageReceivers:output_type -> pb.RPCCountResponse - 8, // [8:12] is the sub-list for method output_type - 4, // [4:8] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 7, // 0: pb.UpdateMessageReceiversRequest.recipientOptions:type_name -> pb.UpdateMessageReceiversRequest.RecipientOptionsEntry + 10, // 1: pb.FindAllEnabledMessageReceiversResponse.messageReceivers:type_name -> pb.MessageReceiver + 10, // 2: pb.FindAllEnabledMessageReceiversWithMessageRecipientIdResponse.messageReceivers:type_name -> pb.MessageReceiver + 9, // 3: pb.UpdateMessageReceiversRequest.RecipientOptionsEntry.value:type_name -> pb.UpdateMessageReceiversRequest.RecipientOptions + 8, // 4: pb.UpdateMessageReceiversRequest.RecipientOptions.recipientOptions:type_name -> pb.UpdateMessageReceiversRequest.RecipientOption + 0, // 5: pb.MessageReceiverService.updateMessageReceivers:input_type -> pb.UpdateMessageReceiversRequest + 1, // 6: pb.MessageReceiverService.findAllEnabledMessageReceivers:input_type -> pb.FindAllEnabledMessageReceiversRequest + 3, // 7: pb.MessageReceiverService.findAllEnabledMessageReceiversWithMessageRecipientId:input_type -> pb.FindAllEnabledMessageReceiversWithMessageRecipientIdRequest + 5, // 8: pb.MessageReceiverService.deleteMessageReceiver:input_type -> pb.DeleteMessageReceiverRequest + 6, // 9: pb.MessageReceiverService.countAllEnabledMessageReceivers:input_type -> pb.CountAllEnabledMessageReceiversRequest + 11, // 10: pb.MessageReceiverService.updateMessageReceivers:output_type -> pb.RPCSuccess + 2, // 11: pb.MessageReceiverService.findAllEnabledMessageReceivers:output_type -> pb.FindAllEnabledMessageReceiversResponse + 4, // 12: pb.MessageReceiverService.findAllEnabledMessageReceiversWithMessageRecipientId:output_type -> pb.FindAllEnabledMessageReceiversWithMessageRecipientIdResponse + 11, // 13: pb.MessageReceiverService.deleteMessageReceiver:output_type -> pb.RPCSuccess + 12, // 14: pb.MessageReceiverService.countAllEnabledMessageReceivers:output_type -> pb.RPCCountResponse + 10, // [10:15] is the sub-list for method output_type + 5, // [5:10] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_service_message_receiver_proto_init() } @@ -648,7 +775,7 @@ func file_service_message_receiver_proto_init() { } } file_service_message_receiver_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteMessageReceiverRequest); i { + switch v := v.(*FindAllEnabledMessageReceiversWithMessageRecipientIdRequest); i { case 0: return &v.state case 1: @@ -660,7 +787,19 @@ func file_service_message_receiver_proto_init() { } } file_service_message_receiver_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CountAllEnabledMessageReceiversRequest); i { + switch v := v.(*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_service_message_receiver_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DeleteMessageReceiverRequest); i { case 0: return &v.state case 1: @@ -672,6 +811,18 @@ func file_service_message_receiver_proto_init() { } } file_service_message_receiver_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CountAllEnabledMessageReceiversRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_service_message_receiver_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateMessageReceiversRequest_RecipientOption); i { case 0: return &v.state @@ -683,7 +834,7 @@ func file_service_message_receiver_proto_init() { return nil } } - file_service_message_receiver_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_service_message_receiver_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateMessageReceiversRequest_RecipientOptions); i { case 0: return &v.state @@ -702,7 +853,7 @@ func file_service_message_receiver_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_service_message_receiver_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 10, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/rpc/pb/service_message_receiver_grpc.pb.go b/pkg/rpc/pb/service_message_receiver_grpc.pb.go index aed6fca..4be822f 100644 --- a/pkg/rpc/pb/service_message_receiver_grpc.pb.go +++ b/pkg/rpc/pb/service_message_receiver_grpc.pb.go @@ -19,10 +19,11 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - MessageReceiverService_UpdateMessageReceivers_FullMethodName = "/pb.MessageReceiverService/updateMessageReceivers" - MessageReceiverService_FindAllEnabledMessageReceivers_FullMethodName = "/pb.MessageReceiverService/findAllEnabledMessageReceivers" - MessageReceiverService_DeleteMessageReceiver_FullMethodName = "/pb.MessageReceiverService/deleteMessageReceiver" - MessageReceiverService_CountAllEnabledMessageReceivers_FullMethodName = "/pb.MessageReceiverService/countAllEnabledMessageReceivers" + MessageReceiverService_UpdateMessageReceivers_FullMethodName = "/pb.MessageReceiverService/updateMessageReceivers" + MessageReceiverService_FindAllEnabledMessageReceivers_FullMethodName = "/pb.MessageReceiverService/findAllEnabledMessageReceivers" + MessageReceiverService_FindAllEnabledMessageReceiversWithMessageRecipientId_FullMethodName = "/pb.MessageReceiverService/findAllEnabledMessageReceiversWithMessageRecipientId" + MessageReceiverService_DeleteMessageReceiver_FullMethodName = "/pb.MessageReceiverService/deleteMessageReceiver" + MessageReceiverService_CountAllEnabledMessageReceivers_FullMethodName = "/pb.MessageReceiverService/countAllEnabledMessageReceivers" ) // MessageReceiverServiceClient is the client API for MessageReceiverService service. @@ -33,6 +34,8 @@ type MessageReceiverServiceClient interface { UpdateMessageReceivers(ctx context.Context, in *UpdateMessageReceiversRequest, opts ...grpc.CallOption) (*RPCSuccess, error) // 查找接收者 FindAllEnabledMessageReceivers(ctx context.Context, in *FindAllEnabledMessageReceiversRequest, opts ...grpc.CallOption) (*FindAllEnabledMessageReceiversResponse, error) + // 根据接收人查找关联的接收者 + FindAllEnabledMessageReceiversWithMessageRecipientId(ctx context.Context, in *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest, opts ...grpc.CallOption) (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse, error) // 删除接收者 DeleteMessageReceiver(ctx context.Context, in *DeleteMessageReceiverRequest, opts ...grpc.CallOption) (*RPCSuccess, error) // 计算接收者数量 @@ -65,6 +68,15 @@ func (c *messageReceiverServiceClient) FindAllEnabledMessageReceivers(ctx contex return out, nil } +func (c *messageReceiverServiceClient) FindAllEnabledMessageReceiversWithMessageRecipientId(ctx context.Context, in *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest, opts ...grpc.CallOption) (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse, error) { + out := new(FindAllEnabledMessageReceiversWithMessageRecipientIdResponse) + err := c.cc.Invoke(ctx, MessageReceiverService_FindAllEnabledMessageReceiversWithMessageRecipientId_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *messageReceiverServiceClient) DeleteMessageReceiver(ctx context.Context, in *DeleteMessageReceiverRequest, opts ...grpc.CallOption) (*RPCSuccess, error) { out := new(RPCSuccess) err := c.cc.Invoke(ctx, MessageReceiverService_DeleteMessageReceiver_FullMethodName, in, out, opts...) @@ -91,6 +103,8 @@ type MessageReceiverServiceServer interface { UpdateMessageReceivers(context.Context, *UpdateMessageReceiversRequest) (*RPCSuccess, error) // 查找接收者 FindAllEnabledMessageReceivers(context.Context, *FindAllEnabledMessageReceiversRequest) (*FindAllEnabledMessageReceiversResponse, error) + // 根据接收人查找关联的接收者 + FindAllEnabledMessageReceiversWithMessageRecipientId(context.Context, *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse, error) // 删除接收者 DeleteMessageReceiver(context.Context, *DeleteMessageReceiverRequest) (*RPCSuccess, error) // 计算接收者数量 @@ -107,6 +121,9 @@ func (UnimplementedMessageReceiverServiceServer) UpdateMessageReceivers(context. func (UnimplementedMessageReceiverServiceServer) FindAllEnabledMessageReceivers(context.Context, *FindAllEnabledMessageReceiversRequest) (*FindAllEnabledMessageReceiversResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FindAllEnabledMessageReceivers not implemented") } +func (UnimplementedMessageReceiverServiceServer) FindAllEnabledMessageReceiversWithMessageRecipientId(context.Context, *FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) (*FindAllEnabledMessageReceiversWithMessageRecipientIdResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindAllEnabledMessageReceiversWithMessageRecipientId not implemented") +} func (UnimplementedMessageReceiverServiceServer) DeleteMessageReceiver(context.Context, *DeleteMessageReceiverRequest) (*RPCSuccess, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteMessageReceiver not implemented") } @@ -161,6 +178,24 @@ func _MessageReceiverService_FindAllEnabledMessageReceivers_Handler(srv interfac return interceptor(ctx, in, info, handler) } +func _MessageReceiverService_FindAllEnabledMessageReceiversWithMessageRecipientId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MessageReceiverServiceServer).FindAllEnabledMessageReceiversWithMessageRecipientId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: MessageReceiverService_FindAllEnabledMessageReceiversWithMessageRecipientId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MessageReceiverServiceServer).FindAllEnabledMessageReceiversWithMessageRecipientId(ctx, req.(*FindAllEnabledMessageReceiversWithMessageRecipientIdRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _MessageReceiverService_DeleteMessageReceiver_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteMessageReceiverRequest) if err := dec(in); err != nil { @@ -212,6 +247,10 @@ var MessageReceiverService_ServiceDesc = grpc.ServiceDesc{ MethodName: "findAllEnabledMessageReceivers", Handler: _MessageReceiverService_FindAllEnabledMessageReceivers_Handler, }, + { + MethodName: "findAllEnabledMessageReceiversWithMessageRecipientId", + Handler: _MessageReceiverService_FindAllEnabledMessageReceiversWithMessageRecipientId_Handler, + }, { MethodName: "deleteMessageReceiver", Handler: _MessageReceiverService_DeleteMessageReceiver_Handler, diff --git a/pkg/rpc/pb/service_message_recipient.pb.go b/pkg/rpc/pb/service_message_recipient.pb.go index b133688..a639930 100644 --- a/pkg/rpc/pb/service_message_recipient.pb.go +++ b/pkg/rpc/pb/service_message_recipient.pb.go @@ -26,13 +26,14 @@ type CreateMessageRecipientRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AdminId int64 `protobuf:"varint,1,opt,name=adminId,proto3" json:"adminId,omitempty"` - MessageMediaInstanceId int64 `protobuf:"varint,2,opt,name=messageMediaInstanceId,proto3" json:"messageMediaInstanceId,omitempty"` - MessageRecipientGroupIds []int64 `protobuf:"varint,3,rep,packed,name=messageRecipientGroupIds,proto3" json:"messageRecipientGroupIds,omitempty"` - Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` - User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user,omitempty"` - TimeFrom string `protobuf:"bytes,6,opt,name=timeFrom,proto3" json:"timeFrom,omitempty"` - TimeTo string `protobuf:"bytes,7,opt,name=timeTo,proto3" json:"timeTo,omitempty"` + AdminId int64 `protobuf:"varint,1,opt,name=adminId,proto3" json:"adminId,omitempty"` // 关联的管理员ID + MessageMediaInstanceId int64 `protobuf:"varint,2,opt,name=messageMediaInstanceId,proto3" json:"messageMediaInstanceId,omitempty"` // 媒介实例ID + MessageRecipientGroupIds []int64 `protobuf:"varint,3,rep,packed,name=messageRecipientGroupIds,proto3" json:"messageRecipientGroupIds,omitempty"` // 所属分组ID列表 + Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` // 可选项,备注描述 + User string `protobuf:"bytes,5,opt,name=user,proto3" json:"user,omitempty"` // 用户标识 + TimeFrom string `protobuf:"bytes,6,opt,name=timeFrom,proto3" json:"timeFrom,omitempty"` // 可选项,接收消息的,开始时间 + TimeTo string `protobuf:"bytes,7,opt,name=timeTo,proto3" json:"timeTo,omitempty"` // 可选项,接收消息的,结束时间 + NodeClusterIds []int64 `protobuf:"varint,8,rep,packed,name=nodeClusterIds,proto3" json:"nodeClusterIds,omitempty"` // 关联的CDN边缘节点集群ID列表 } func (x *CreateMessageRecipientRequest) Reset() { @@ -116,6 +117,13 @@ func (x *CreateMessageRecipientRequest) GetTimeTo() string { return "" } +func (x *CreateMessageRecipientRequest) GetNodeClusterIds() []int64 { + if x != nil { + return x.NodeClusterIds + } + return nil +} + type CreateMessageRecipientResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -178,6 +186,7 @@ type UpdateMessageRecipientRequest struct { User string `protobuf:"bytes,7,opt,name=user,proto3" json:"user,omitempty"` TimeFrom string `protobuf:"bytes,8,opt,name=timeFrom,proto3" json:"timeFrom,omitempty"` TimeTo string `protobuf:"bytes,9,opt,name=timeTo,proto3" json:"timeTo,omitempty"` + NodeClusterIds []int64 `protobuf:"varint,10,rep,packed,name=nodeClusterIds,proto3" json:"nodeClusterIds,omitempty"` // 关联的CDN边缘节点集群ID列表 } func (x *UpdateMessageRecipientRequest) Reset() { @@ -275,6 +284,13 @@ func (x *UpdateMessageRecipientRequest) GetTimeTo() string { return "" } +func (x *UpdateMessageRecipientRequest) GetNodeClusterIds() []int64 { + if x != nil { + return x.NodeClusterIds + } + return nil +} + // 删除接收人 type DeleteMessageRecipientRequest struct { state protoimpl.MessageState @@ -634,7 +650,7 @@ var file_service_message_recipient_proto_rawDesc = []byte{ 0x64, 0x65, 0x6c, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x02, 0x0a, 0x1d, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbf, 0x02, 0x0a, 0x1d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x61, 0x64, 0x6d, 0x69, 0x6e, @@ -652,33 +668,38 @@ var file_service_message_recipient_proto_rawDesc = []byte{ 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x6f, - 0x22, 0x50, 0x0a, 0x1e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, - 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, + 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, + 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x50, 0x0a, 0x1e, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, + 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x83, 0x03, 0x0a, 0x1d, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, + 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, - 0x49, 0x64, 0x22, 0xdb, 0x02, 0x0a, 0x1d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, - 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, - 0x6e, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x36, - 0x0a, 0x16, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x16, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x49, 0x6e, 0x73, 0x74, - 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x3a, 0x0a, 0x18, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, - 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x03, 0x52, 0x18, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, - 0x64, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, - 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x6d, 0x65, - 0x54, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x6f, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x61, + 0x64, 0x6d, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x16, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x16, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4d, + 0x65, 0x64, 0x69, 0x61, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x3a, + 0x0a, 0x18, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, + 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x03, + 0x52, 0x18, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, + 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, + 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, + 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x75, 0x73, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x6f, 0x6d, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x6f, 0x6d, + 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x6f, 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x6f, 0x64, 0x65, + 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x03, + 0x52, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x4f, 0x0a, 0x1d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x63, 0x69, diff --git a/pkg/rpc/protos/models/model_message_receiver.proto b/pkg/rpc/protos/models/model_message_receiver.proto index 4912580..ffd8f41 100644 --- a/pkg/rpc/protos/models/model_message_receiver.proto +++ b/pkg/rpc/protos/models/model_message_receiver.proto @@ -13,6 +13,8 @@ message MessageReceiver { int64 serverId = 4; string type = 5; bytes paramsJSON = 6; + string role = 9; // 集群角色:node 或 dns + MessageRecipient messageRecipient = 7; MessageRecipientGroup messageRecipientGroup = 8; } \ No newline at end of file diff --git a/pkg/rpc/protos/service_message_receiver.proto b/pkg/rpc/protos/service_message_receiver.proto index db1cbe7..ec4946d 100644 --- a/pkg/rpc/protos/service_message_receiver.proto +++ b/pkg/rpc/protos/service_message_receiver.proto @@ -14,6 +14,9 @@ service MessageReceiverService { // 查找接收者 rpc findAllEnabledMessageReceivers (FindAllEnabledMessageReceiversRequest) returns (FindAllEnabledMessageReceiversResponse); + // 根据接收人查找关联的接收者 + rpc findAllEnabledMessageReceiversWithMessageRecipientId (FindAllEnabledMessageReceiversWithMessageRecipientIdRequest) returns (FindAllEnabledMessageReceiversWithMessageRecipientIdResponse); + // 删除接收者 rpc deleteMessageReceiver (DeleteMessageReceiverRequest) returns (RPCSuccess); @@ -28,7 +31,7 @@ message UpdateMessageReceiversRequest { int64 nodeId = 2; int64 serverId = 3; bytes paramsJSON = 5; - map recipientOptions = 6; // type => options + map recipientOptions = 6; // type => options,type为recipient或者group message RecipientOption { int64 messageRecipientId = 1; @@ -42,25 +45,34 @@ message UpdateMessageReceiversRequest { // 查找接收者 message FindAllEnabledMessageReceiversRequest { - string role = 4; - int64 nodeClusterId = 1; - int64 nodeId = 2; - int64 serverId = 3; + string role = 4; // 集群角色:node 或 dns + int64 nodeClusterId = 1; // 集群ID + int64 nodeId = 2; // 节点ID + int64 serverId = 3; // 网站ID } message FindAllEnabledMessageReceiversResponse { repeated MessageReceiver messageReceivers = 1; } +// 根据接收人查找关联的接收者 +message FindAllEnabledMessageReceiversWithMessageRecipientIdRequest { + int64 messageRecipientId = 1; // 关联的接收人ID +} + +message FindAllEnabledMessageReceiversWithMessageRecipientIdResponse { + repeated MessageReceiver messageReceivers = 1; +} + // 删除接收者 message DeleteMessageReceiverRequest { - int64 messageReceiverId = 1; + int64 messageReceiverId = 1; // 接收者ID } // 计算接收者数量 message CountAllEnabledMessageReceiversRequest { - string role = 4; - int64 nodeClusterId = 1; - int64 nodeId = 2; - int64 serverId = 3; + string role = 4; // 集群角色:node 或 dns + int64 nodeClusterId = 1; // 集群ID + int64 nodeId = 2; // 节点ID + int64 serverId = 3; // 网站ID } \ No newline at end of file diff --git a/pkg/rpc/protos/service_message_recipient.proto b/pkg/rpc/protos/service_message_recipient.proto index b96f34f..bb5f8f5 100644 --- a/pkg/rpc/protos/service_message_recipient.proto +++ b/pkg/rpc/protos/service_message_recipient.proto @@ -29,13 +29,15 @@ service MessageRecipientService { // 创建接收人 message CreateMessageRecipientRequest { - int64 adminId = 1; - int64 messageMediaInstanceId = 2; - repeated int64 messageRecipientGroupIds = 3; - string description = 4; - string user = 5; - string timeFrom = 6; - string timeTo = 7; + int64 adminId = 1; // 关联的管理员ID + int64 messageMediaInstanceId = 2; // 媒介实例ID + repeated int64 messageRecipientGroupIds = 3; // 所属分组ID列表 + string description = 4; // 可选项,备注描述 + string user = 5; // 用户标识 + string timeFrom = 6; // 可选项,接收消息的,开始时间 + string timeTo = 7; // 可选项,接收消息的,结束时间 + + repeated int64 nodeClusterIds = 8; // 关联的CDN边缘节点集群ID列表 } message CreateMessageRecipientResponse { @@ -53,6 +55,8 @@ message UpdateMessageRecipientRequest { string user = 7; string timeFrom = 8; string timeTo = 9; + + repeated int64 nodeClusterIds = 10; // 关联的CDN边缘节点集群ID列表 } // 删除接收人