From 6da9c4cf6827a07c511c081cf3bc2577cb313249 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 1 Dec 2021 17:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E7=94=A8=E6=88=B7=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=9F=9F=E5=90=8D=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BB=99=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/message_dao.go | 7 +++++-- internal/rpc/services/service_server.go | 10 +++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/internal/db/models/message_dao.go b/internal/db/models/message_dao.go index 949880b1..0e3c6410 100644 --- a/internal/db/models/message_dao.go +++ b/internal/db/models/message_dao.go @@ -26,6 +26,8 @@ const ( type MessageType = string const ( + // 这里的命名问题（首字母大写）为历史遗留问题，暂不修改 + MessageTypeHealthCheckFailed MessageType = "HealthCheckFailed" // 节点健康检查失败 MessageTypeHealthCheckNodeUp MessageType = "HealthCheckNodeUp" // 因健康检查节点上线 MessageTypeHealthCheckNodeDown MessageType = "HealthCheckNodeDown" // 因健康检查节点下线 @@ -36,8 +38,9 @@ const ( MessageTypeSSLCertACMETaskFailed MessageType = "SSLCertACMETaskFailed" // SSL证书任务执行失败 MessageTypeSSLCertACMETaskSuccess MessageType = "SSLCertACMETaskSuccess" // SSL证书任务执行成功 MessageTypeLogCapacityOverflow MessageType = "LogCapacityOverflow" // 日志超出最大限制 - MessageTypeServerNamesAuditingSuccess MessageType = "ServerNamesAuditingSuccess" // 服务域名审核成功 - MessageTypeServerNamesAuditingFailed MessageType = "ServerNamesAuditingFailed" // 服务域名审核失败 + MessageTypeServerNamesAuditingSuccess MessageType = "ServerNamesAuditingSuccess" // 服务域名审核成功（用户） + MessageTypeServerNamesAuditingFailed MessageType = "ServerNamesAuditingFailed" // 服务域名审核失败（用户） + MessageTypeServerNamesRequireAuditing MessageType = "serverNamesRequireAuditing" // 服务域名需要审核（管理员） MessageTypeThresholdSatisfied MessageType = "ThresholdSatisfied" // 满足阈值 MessageTypeFirewallEvent MessageType = "FirewallEvent" // 防火墙事件 MessageTypeIPAddrUp MessageType = "IPAddrUp" // IP地址上线 diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index 016f6e2c..179053cf 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -466,10 +466,8 @@ func (this *ServerService) UpdateServerNames(ctx context.Context, req *pb.Update if err != nil { return nil, err } - } - // 是否需要审核 - if userId > 0 { + // 是否需要审核 globalConfig, err := models.SharedSysSettingDAO.ReadGlobalConfig(tx) if err != nil { return nil, err @@ -479,6 +477,12 @@ func (this *ServerService) UpdateServerNames(ctx context.Context, req *pb.Update if err != nil { return nil, err } + + // 发送审核通知 + err = models.SharedMessageDAO.CreateMessage(tx, 0, 0, models.MessageTypeServerNamesRequireAuditing, models.MessageLevelWarning, "有新的网站域名需要审核", "有新的网站域名需要审核", maps.Map{ + "serverId": req.ServerId, + }.AsJSON()) + return this.Success() } }