From 0685984a802713a006e82b45b74edc21801cdc35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com> Date: Tue, 26 Aug 2025 22:04:01 +0800 Subject: [PATCH] ref: Adjust the content of alert information (#10152) --- agent/app/service/alert_helper.go | 26 ++++------ frontend/src/lang/modules/en.ts | 4 +- frontend/src/lang/modules/ja.ts | 2 +- frontend/src/lang/modules/ms.ts | 2 +- frontend/src/lang/modules/pt-br.ts | 2 +- frontend/src/lang/modules/ru.ts | 2 +- frontend/src/lang/modules/tr.ts | 2 +- frontend/src/lang/modules/zh-Hant.ts | 8 +-- frontend/src/lang/modules/zh.ts | 10 ++-- .../src/views/setting/alert/dash/index.vue | 49 +++++++++---------- .../views/setting/alert/dash/task/index.vue | 16 +++--- .../alert/setting/time-range/index.vue | 22 ++++----- 12 files changed, 67 insertions(+), 78 deletions(-) diff --git a/agent/app/service/alert_helper.go b/agent/app/service/alert_helper.go index cd263a442..04f0f2abe 100644 --- a/agent/app/service/alert_helper.go +++ b/agent/app/service/alert_helper.go @@ -394,7 +394,6 @@ func loadPanelLogin(alert dto.AlertDTO) { alertType := alert.Type quota := strconv.Itoa(count) quotaType := strconv.Itoa(int(alert.Cycle)) - var params []dto.Param if err != nil { global.LOG.Errorf("Failed to count recent failed login logs: %v", err) } @@ -402,7 +401,7 @@ func loadPanelLogin(alert dto.AlertDTO) { alertType = "panelLogin" quota = strconv.Itoa(count) quotaType = "panelLogin" - params = append([]dto.Param{ + params := []dto.Param{ { Index: "1", Key: "cycle", @@ -413,7 +412,7 @@ func loadPanelLogin(alert dto.AlertDTO) { Key: "project", Value: "", }, - }) + } sendAlerts(alert, alertType, quota, quotaType, params) } @@ -432,7 +431,7 @@ func loadPanelLogin(alert dto.AlertDTO) { }(), "\n") alertType = "panelIpLogin" quotaType = "panelIpLogin" - params = append([]dto.Param{ + params := []dto.Param{ { Index: "1", Key: "cycle", @@ -443,7 +442,7 @@ func loadPanelLogin(alert dto.AlertDTO) { Key: "project", Value: " IP ", }, - }) + } sendAlerts(alert, alertType, quota, quotaType, params) } } @@ -453,7 +452,6 @@ func loadSSHLogin(alert dto.AlertDTO) { alertType := alert.Type quota := strconv.Itoa(count) quotaType := strconv.Itoa(int(alert.Cycle)) - var params []dto.Param if err != nil { global.LOG.Errorf("Failed to count recent failed ssh login logs: %v", err) } @@ -461,7 +459,7 @@ func loadSSHLogin(alert dto.AlertDTO) { alertType = "sshLogin" quota = strconv.Itoa(count) quotaType = "sshLogin" - params = append([]dto.Param{ + params := []dto.Param{ { Index: "1", Key: "cycle", @@ -472,7 +470,7 @@ func loadSSHLogin(alert dto.AlertDTO) { Key: "project", Value: "", }, - }) + } sendAlerts(alert, alertType, quota, quotaType, params) } whitelist := strings.Split(strings.TrimSpace(alert.AdvancedParams), "\n") @@ -481,16 +479,10 @@ func loadSSHLogin(alert dto.AlertDTO) { global.LOG.Errorf("Failed to check recent failed ip ssh login logs: %v", err) } if len(records) > 0 { - quota = strings.Join(func() []string { - var ips []string - for _, r := range records { - ips = append(ips, r) - } - return ips - }(), "\n") + quota = strings.Join(records, "\n") alertType = "sshIpLogin" quotaType = "sshIpLogin" - params = append([]dto.Param{ + params := []dto.Param{ { Index: "1", Key: "cycle", @@ -501,7 +493,7 @@ func loadSSHLogin(alert dto.AlertDTO) { Key: "project", Value: " IP ", }, - }) + } sendAlerts(alert, alertType, quota, quotaType, params) } } diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 9f1eab92b..d3a21f2ce 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -3562,7 +3562,7 @@ const message = { alertRule: 'Alert Rules', titleSearchHelper: 'Enter alert title for fuzzy search', taskType: 'Type', - ssl: 'Certificate (SSL) Expiry', + ssl: 'Certificate Expiry', siteEndTime: 'Website Expiry', panelPwdEndTime: 'Panel Password Expiry', panelUpdate: 'New Panel Version Available', @@ -3646,7 +3646,7 @@ const message = { cleanAlertLogs: 'Clean Alert Logs', daily: 'Daily Alert Count: {0}', cumulative: 'Cumulative Alert Count: {0}', - clams: 'Virus scan', + clams: 'Virus scan alert', taskName: 'Task Name', cronJobType: 'Task Type', clamPath: 'Scan Directory', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index e82ed4140..1142fd548 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -3444,7 +3444,7 @@ const message = { alertRule: 'アラートルール', titleSearchHelper: 'アラートタイトルを入力して検索します', taskType: 'タイプ', - ssl: '証明書 (SSL) 期限切れ', + ssl: '証明書期限切れ', siteEndTime: 'ウェブサイト期限切れ', panelPwdEndTime: 'パネルパスワード期限切れ', panelUpdate: '新しいパネルバージョンあり', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index fc2dcb35f..912441f2b 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -3522,7 +3522,7 @@ const message = { alertRule: 'Peraturan Amaran', titleSearchHelper: 'Masukkan tajuk amaran untuk pencarian kabur', taskType: 'Jenis', - ssl: 'Sijil (SSL) Tamat Tempoh', + ssl: 'Sijil Tamat Tempoh', siteEndTime: 'Tamat Tempoh Laman Web', panelPwdEndTime: 'Kata Laluan Panel Tamat Tempoh', panelUpdate: 'Versi Panel Baharu Tersedia', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index f988b514d..99f44c4a7 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -3531,7 +3531,7 @@ const message = { alertRule: 'Regras de Alerta', titleSearchHelper: 'Digite o título do alerta para busca aproximada', taskType: 'Tipo', - ssl: 'Expiração do Certificado (SSL)', + ssl: 'Expiração do Certificado', siteEndTime: 'Expiração do Site', panelPwdEndTime: 'Expiração da Senha do Painel', panelUpdate: 'Nova Versão do Painel Disponível', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 0358c01ef..6e468dd24 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -3518,7 +3518,7 @@ const message = { alertRule: 'Правила Уведомлений', titleSearchHelper: 'Введите название уведомления для нечеткого поиска', taskType: 'Тип', - ssl: 'Срок действия сертификата (SSL)', + ssl: 'Срок действия сертификата', siteEndTime: 'Истечение срока действия сайта', panelPwdEndTime: 'Истечение срока действия пароля панели', panelUpdate: 'Доступна новая версия панели', diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 2ac203b75..ed95d115c 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -3599,7 +3599,7 @@ const message = { alertRule: 'Uyarı Kuralları', titleSearchHelper: 'Bulanık arama için uyarı başlığını girin', taskType: 'Tür', - ssl: 'Sertifika (SSL) Sona Ermesi', + ssl: 'Sertifika Sona Ermesi', siteEndTime: 'Web Sitesi Sona Ermesi', panelPwdEndTime: 'Panel Şifresi Sona Ermesi', panelUpdate: 'Yeni Panel Sürümü Mevcut', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 2b967b5a6..8117e379c 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -3315,7 +3315,7 @@ const message = { alertRule: '告警規則', titleSearchHelper: '請輸入告警標題,支援模糊搜尋', taskType: '告警類型', - ssl: '網站證書(SSL)到期', + ssl: '網站證書到期', siteEndTime: '網站到期', panelPwdEndTime: '面板密碼到期', panelUpdate: '面板新版本提醒', @@ -3360,8 +3360,8 @@ const message = { specifiedTime: '指定時間', deleteTitle: '删除告警', deleteMsg: '是否確認删除告警任務?', - allSslTitle: '所有網站證書(SSL)到期告警', - sslTitle: '網站「{0}」證書(SSL)到期告警', + allSslTitle: '所有網站證書到期告警', + sslTitle: '網站「{0}」證書到期告警', allSiteEndTimeTitle: '所有網站到期告警', siteEndTimeTitle: '網站「{0}」到期告警', panelPwdEndTimeTitle: '面板密碼到期告警', @@ -3392,7 +3392,7 @@ const message = { cleanAlertLogs: '清空告警日誌', daily: '當日第 {0} 次告警', cumulative: '累計第 {0} 次告警', - clams: '病毒掃描', + clams: '病毒掃描告警', taskName: '任務名稱', cronJobType: '任務類型', clamPath: '掃描目錄', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index fd87e687d..cc7dcd011 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -3285,7 +3285,7 @@ const message = { alertRule: '告警规则', titleSearchHelper: '请输入告警标题,支持模糊搜索', taskType: '告警类型', - ssl: '网站证书(SSL)到期', + ssl: '网站证书到期', siteEndTime: '网站到期', panelPwdEndTime: '面板密码到期', panelUpdate: '面板新版本提醒', @@ -3330,8 +3330,8 @@ const message = { deleteTitle: '删除告警', deleteMsg: '是否确认删除告警任务?', - allSslTitle: '所有网站证书(SSL)到期告警', - sslTitle: '网站「 {0} 」证书(SSL)到期告警', + allSslTitle: '所有网站证书到期告警', + sslTitle: '网站「 {0} 」证书到期告警', allSiteEndTimeTitle: '所有网站到期告警', siteEndTimeTitle: '网站「 {0} 」到期告警', panelPwdEndTimeTitle: '面板密码到期告警', @@ -3365,11 +3365,11 @@ const message = { cleanAlertLogs: '清空告警日志', daily: '当日第 {0} 次告警', cumulative: '累计第 {0} 次告警', - clams: '病毒扫描', + clams: '病毒扫描告警', taskName: '任务名称', cronJobType: '任务类型', clamPath: '扫描目录', - cronjob: '计划任务', + cronjob: '计划任务执行{0}异常', app: '备份应用', web: '备份网站', database: '备份数据库', diff --git a/frontend/src/views/setting/alert/dash/index.vue b/frontend/src/views/setting/alert/dash/index.vue index 48582e878..c3bd34306 100644 --- a/frontend/src/views/setting/alert/dash/index.vue +++ b/frontend/src/views/setting/alert/dash/index.vue @@ -15,38 +15,35 @@