TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2026-02-04 18:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化消息通知相关代码

Browse Source
This commit is contained in:
GoEdgeLab
2023-10-14 17:15:52 +08:00
parent 3120199855
commit 279bb5f341
11 changed files with 403 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/rpc/protos/models/model_message_receiver.proto
View File

@@ -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;
}

32
pkg/rpc/protos/service_message_receiver.proto
View File

@@ -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<string, RecipientOptions> recipientOptions = 6; // type => options
map<string, RecipientOptions> 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
}

18
pkg/rpc/protos/service_message_recipient.proto
View File

@@ -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列表
}
// 删除接收人