From 8045a8bf6d6244bfb8362923839c997a5c49436b Mon Sep 17 00:00:00 2001 From: Baobhan Sith <80159437+Heavrnl@users.noreply.github.com> Date: Sun, 27 Apr 2025 00:04:54 +0800 Subject: [PATCH] update --- packages/backend/src/locales/en-US.json | 4 ---- packages/backend/src/locales/ja-JP.json | 3 --- packages/backend/src/locales/zh-CN.json | 3 --- packages/backend/src/services/event.service.ts | 3 --- packages/backend/src/types/audit.types.ts | 5 ----- packages/backend/src/types/notification.types.ts | 3 +-- .../frontend/src/components/NotificationSettingForm.vue | 2 +- packages/frontend/src/locales/en-US.json | 4 ---- packages/frontend/src/locales/ja-JP.json | 6 ------ packages/frontend/src/locales/zh-CN.json | 4 ---- packages/frontend/src/types/audit.types.ts | 4 ---- packages/frontend/src/types/server.types.ts | 6 ++---- packages/frontend/src/views/AuditLogView.vue | 2 +- 13 files changed, 5 insertions(+), 44 deletions(-) diff --git a/packages/backend/src/locales/en-US.json b/packages/backend/src/locales/en-US.json index a84973b..ad95d29 100644 --- a/packages/backend/src/locales/en-US.json +++ b/packages/backend/src/locales/en-US.json @@ -25,7 +25,6 @@ "CONNECTION_CREATED": "Connection Created", "CONNECTION_UPDATED": "Connection Updated", "CONNECTION_DELETED": "Connection Deleted", - "CONNECTION_TESTED": "Connection Tested", "PROXY_CREATED": "Proxy Created", "PROXY_UPDATED": "Proxy Updated", "PROXY_DELETED": "Proxy Deleted", @@ -37,12 +36,9 @@ "NOTIFICATION_SETTING_CREATED": "Notification Setting Created", "NOTIFICATION_SETTING_UPDATED": "Notification Setting Updated", "NOTIFICATION_SETTING_DELETED": "Notification Setting Deleted", - "SFTP_ACTION": "SFTP Action", "SSH_CONNECT_SUCCESS": "SSH Connection Successful", "SSH_CONNECT_FAILURE": "SSH Connection Failed", "SSH_SHELL_FAILURE": "SSH Shell Open Failed", - "SERVER_STARTED": "Server Started", - "SERVER_ERROR": "Server Error", "DATABASE_MIGRATION": "Database Migration", "ADMIN_SETUP_COMPLETE": "Initial Admin Setup Completed" } diff --git a/packages/backend/src/locales/ja-JP.json b/packages/backend/src/locales/ja-JP.json index 03de088..5f242c9 100644 --- a/packages/backend/src/locales/ja-JP.json +++ b/packages/backend/src/locales/ja-JP.json @@ -37,12 +37,9 @@ "NOTIFICATION_SETTING_CREATED": "通知設定を作成しました", "NOTIFICATION_SETTING_UPDATED": "通知設定を更新しました", "NOTIFICATION_SETTING_DELETED": "通知設定を削除しました", - "SFTP_ACTION": "SFTP 操作", "SSH_CONNECT_SUCCESS": "SSH 接続成功", "SSH_CONNECT_FAILURE": "SSH 接続失敗", "SSH_SHELL_FAILURE": "SSH Shell オープン失敗", - "SERVER_STARTED": "サーバー起動", - "SERVER_ERROR": "サーバーエラー", "DATABASE_MIGRATION": "データベース移行", "ADMIN_SETUP_COMPLETE": "初期管理者設定完了" } diff --git a/packages/backend/src/locales/zh-CN.json b/packages/backend/src/locales/zh-CN.json index 9504649..2a744cb 100644 --- a/packages/backend/src/locales/zh-CN.json +++ b/packages/backend/src/locales/zh-CN.json @@ -23,12 +23,9 @@ "NOTIFICATION_SETTING_CREATED": "通知设置已创建", "NOTIFICATION_SETTING_UPDATED": "通知设置已更新", "NOTIFICATION_SETTING_DELETED": "通知设置已删除", - "SFTP_ACTION": "SFTP 操作", "SSH_CONNECT_SUCCESS": "SSH 连接成功", "SSH_CONNECT_FAILURE": "SSH 连接失败", "SSH_SHELL_FAILURE": "SSH Shell 打开失败", - "SERVER_STARTED": "服务器已启动", - "SERVER_ERROR": "服务器错误", "DATABASE_MIGRATION": "数据库迁移", "ADMIN_SETUP_COMPLETE": "初始管理员设置完成", "testNotification": "测试通知" diff --git a/packages/backend/src/services/event.service.ts b/packages/backend/src/services/event.service.ts index b634886..fd0ce97 100644 --- a/packages/backend/src/services/event.service.ts +++ b/packages/backend/src/services/event.service.ts @@ -27,12 +27,9 @@ export enum AppEventType { NotificationSettingCreated = 'NOTIFICATION_SETTING_CREATED', NotificationSettingUpdated = 'NOTIFICATION_SETTING_UPDATED', NotificationSettingDeleted = 'NOTIFICATION_SETTING_DELETED', - SftpAction = 'SFTP_ACTION', SshConnectSuccess = 'SSH_CONNECT_SUCCESS', SshConnectFailure = 'SSH_CONNECT_FAILURE', SshShellFailure = 'SSH_SHELL_FAILURE', - ServerStarted = 'SERVER_STARTED', - ServerError = 'SERVER_ERROR', DatabaseMigration = 'DATABASE_MIGRATION', AdminSetupComplete = 'ADMIN_SETUP_COMPLETE', // 可以根据需要添加更多事件类型 diff --git a/packages/backend/src/types/audit.types.ts b/packages/backend/src/types/audit.types.ts index 42acac8..a012df0 100644 --- a/packages/backend/src/types/audit.types.ts +++ b/packages/backend/src/types/audit.types.ts @@ -38,17 +38,12 @@ export type AuditLogActionType = | 'NOTIFICATION_SETTING_DELETED' - // SFTP (Consider logging specific actions if needed, e.g., UPLOAD, DOWNLOAD, DELETE_FILE) - | 'SFTP_ACTION' // Generic SFTP action for now - // SSH Actions (via WebSocket) | 'SSH_CONNECT_SUCCESS' | 'SSH_CONNECT_FAILURE' | 'SSH_SHELL_FAILURE' // System/Error - | 'SERVER_STARTED' - | 'SERVER_ERROR' | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; diff --git a/packages/backend/src/types/notification.types.ts b/packages/backend/src/types/notification.types.ts index 86d869e..c5173f3 100644 --- a/packages/backend/src/types/notification.types.ts +++ b/packages/backend/src/types/notification.types.ts @@ -9,9 +9,8 @@ export type NotificationEvent = | 'TAG_CREATED' | 'TAG_UPDATED' | 'TAG_DELETED' | 'SETTINGS_UPDATED' | 'IP_WHITELIST_UPDATED' | 'IP_BLOCKED' | 'NOTIFICATION_SETTING_CREATED' | 'NOTIFICATION_SETTING_UPDATED' | 'NOTIFICATION_SETTING_DELETED' - | 'SFTP_ACTION' | 'SSH_CONNECT_SUCCESS' | 'SSH_CONNECT_FAILURE' | 'SSH_SHELL_FAILURE' - | 'SERVER_STARTED' | 'SERVER_ERROR' | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; + | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; export interface WebhookConfig { url: string; diff --git a/packages/frontend/src/components/NotificationSettingForm.vue b/packages/frontend/src/components/NotificationSettingForm.vue index f4a84d6..9c64e79 100644 --- a/packages/frontend/src/components/NotificationSettingForm.vue +++ b/packages/frontend/src/components/NotificationSettingForm.vue @@ -278,7 +278,7 @@ const allNotificationEvents: NotificationEvent[] = [ 'SETTINGS_UPDATED', 'IP_WHITELIST_UPDATED', // Added IP_WHITELIST_UPDATED 'NOTIFICATION_SETTING_CREATED', 'NOTIFICATION_SETTING_UPDATED', 'NOTIFICATION_SETTING_DELETED', // Added NOTIFICATION types 'SSH_CONNECT_SUCCESS', 'SSH_CONNECT_FAILURE', 'SSH_SHELL_FAILURE', // Added SSH types - 'SERVER_STARTED', 'SERVER_ERROR', 'DATABASE_MIGRATION', 'ADMIN_SETUP_COMPLETE' // Added SERVER_STARTED, DB_MIGRATION, ADMIN_SETUP + 'DATABASE_MIGRATION', 'ADMIN_SETUP_COMPLETE' // Removed IP_BLACKLISTED as it's not in the Audit Log list source ]; diff --git a/packages/frontend/src/locales/en-US.json b/packages/frontend/src/locales/en-US.json index 8e9b361..7782215 100644 --- a/packages/frontend/src/locales/en-US.json +++ b/packages/frontend/src/locales/en-US.json @@ -515,8 +515,6 @@ "SSH_CONNECT_SUCCESS": "SSH Connection Successful", "SSH_CONNECT_FAILURE": "SSH Connection Failed", "SSH_SHELL_FAILURE": "SSH Shell Open Failed", - "SERVER_STARTED": "Server Started", - "SERVER_ERROR": "Server Error", "DATABASE_MIGRATION": "Database Migration", "ADMIN_SETUP_COMPLETE": "Initial Admin Setup Completed" } @@ -737,8 +735,6 @@ "SSH_CONNECT_SUCCESS": "SSH Connection Successful", "SSH_CONNECT_FAILURE": "SSH Connection Failed", "SSH_SHELL_FAILURE": "SSH Shell Open Failed", - "SERVER_STARTED": "Server Started", - "SERVER_ERROR": "Server Error", "DATABASE_MIGRATION": "Database Migration", "ADMIN_SETUP_COMPLETE": "Initial Admin Setup Completed", "REMOTE_DESKTOP_CONNECTING": "Remote Desktop Connecting", diff --git a/packages/frontend/src/locales/ja-JP.json b/packages/frontend/src/locales/ja-JP.json index fda215e..f7f15d6 100644 --- a/packages/frontend/src/locales/ja-JP.json +++ b/packages/frontend/src/locales/ja-JP.json @@ -513,12 +513,9 @@ "NOTIFICATION_SETTING_CREATED": "通知設定作成", "NOTIFICATION_SETTING_UPDATED": "通知設定更新", "NOTIFICATION_SETTING_DELETED": "通知設定削除", - "SFTP_ACTION": "SFTP 操作", "SSH_CONNECT_SUCCESS": "SSH 接続成功", "SSH_CONNECT_FAILURE": "SSH 接続失敗", "SSH_SHELL_FAILURE": "SSH Shell オープン失敗", - "SERVER_STARTED": "サーバー起動", - "SERVER_ERROR": "サーバーエラー", "DATABASE_MIGRATION": "データベース移行", "ADMIN_SETUP_COMPLETE": "初期管理者設定完了" } @@ -739,12 +736,9 @@ "NOTIFICATION_SETTING_CREATED": "通知設定作成", "NOTIFICATION_SETTING_UPDATED": "通知設定更新", "NOTIFICATION_SETTING_DELETED": "通知設定削除", - "SFTP_ACTION": "SFTP 操作", "SSH_CONNECT_SUCCESS": "SSH 接続成功", "SSH_CONNECT_FAILURE": "SSH 接続失敗", "SSH_SHELL_FAILURE": "SSH Shell オープン失敗", - "SERVER_STARTED": "サーバー起動", - "SERVER_ERROR": "サーバーエラー", "DATABASE_MIGRATION": "データベース移行", "ADMIN_SETUP_COMPLETE": "初期管理者設定完了", "REMOTE_DESKTOP_CONNECTING": "リモートデスクトップ接続中", diff --git a/packages/frontend/src/locales/zh-CN.json b/packages/frontend/src/locales/zh-CN.json index f03e0b8..24c6cba 100644 --- a/packages/frontend/src/locales/zh-CN.json +++ b/packages/frontend/src/locales/zh-CN.json @@ -516,8 +516,6 @@ "SSH_CONNECT_SUCCESS": "SSH 连接成功", "SSH_CONNECT_FAILURE": "SSH 连接失败", "SSH_SHELL_FAILURE": "SSH Shell 打开失败", - "SERVER_STARTED": "服务器已启动", - "SERVER_ERROR": "服务器错误", "DATABASE_MIGRATION": "数据库迁移", "ADMIN_SETUP_COMPLETE": "初始管理员设置完成" } @@ -741,8 +739,6 @@ "SSH_CONNECT_SUCCESS": "SSH 连接成功", "SSH_CONNECT_FAILURE": "SSH 连接失败", "SSH_SHELL_FAILURE": "SSH Shell 打开失败", - "SERVER_STARTED": "服务器已启动", - "SERVER_ERROR": "服务器错误", "DATABASE_MIGRATION": "数据库迁移", "ADMIN_SETUP_COMPLETE": "初始管理员设置完成", "REMOTE_DESKTOP_CONNECTING": "远程桌面连接中", diff --git a/packages/frontend/src/types/audit.types.ts b/packages/frontend/src/types/audit.types.ts index 954b3a7..2828986 100644 --- a/packages/frontend/src/types/audit.types.ts +++ b/packages/frontend/src/types/audit.types.ts @@ -31,15 +31,11 @@ export type AuditLogActionType = | 'NOTIFICATION_SETTING_CREATED' | 'NOTIFICATION_SETTING_UPDATED' | 'NOTIFICATION_SETTING_DELETED' - // SFTP - | 'SFTP_ACTION' // SSH Actions | 'SSH_CONNECT_SUCCESS' | 'SSH_CONNECT_FAILURE' | 'SSH_SHELL_FAILURE' // System/Error - | 'SERVER_STARTED' - | 'SERVER_ERROR' | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; diff --git a/packages/frontend/src/types/server.types.ts b/packages/frontend/src/types/server.types.ts index 5e93545..bf857e3 100644 --- a/packages/frontend/src/types/server.types.ts +++ b/packages/frontend/src/types/server.types.ts @@ -27,11 +27,10 @@ export type NotificationEvent = | 'TAG_CREATED' | 'TAG_UPDATED' | 'TAG_DELETED' | 'SETTINGS_UPDATED' | 'IP_WHITELIST_UPDATED' | 'NOTIFICATION_SETTING_CREATED' | 'NOTIFICATION_SETTING_UPDATED' | 'NOTIFICATION_SETTING_DELETED' - | 'SFTP_ACTION' // SSH Actions | 'SSH_CONNECT_SUCCESS' | 'SSH_CONNECT_FAILURE' | 'SSH_SHELL_FAILURE' // System/Error - | 'SERVER_STARTED' | 'SERVER_ERROR' | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; + | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; // Settings (Specific) - Keep aligned with AuditLogActionType // Note: IP_BLACKLISTED was in NotificationEvent but not AuditLogActionType, removed for consistency based on user request @@ -81,11 +80,10 @@ export type AuditLogActionType = | 'TAG_CREATED' | 'TAG_UPDATED' | 'TAG_DELETED' | 'SETTINGS_UPDATED' | 'IP_WHITELIST_UPDATED' | 'NOTIFICATION_SETTING_CREATED' | 'NOTIFICATION_SETTING_UPDATED' | 'NOTIFICATION_SETTING_DELETED' - | 'SFTP_ACTION' // SSH Actions | 'SSH_CONNECT_SUCCESS' | 'SSH_CONNECT_FAILURE' | 'SSH_SHELL_FAILURE' // System/Error - | 'SERVER_STARTED' | 'SERVER_ERROR' | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; + | 'DATABASE_MIGRATION' | 'ADMIN_SETUP_COMPLETE'; // Settings (Specific) // | 'FOCUS_SWITCHER_SEQUENCE_UPDATED'; // Removed Focus Switcher type diff --git a/packages/frontend/src/views/AuditLogView.vue b/packages/frontend/src/views/AuditLogView.vue index 81b66f6..46fabfa 100644 --- a/packages/frontend/src/views/AuditLogView.vue +++ b/packages/frontend/src/views/AuditLogView.vue @@ -127,7 +127,7 @@ const allActionTypes: AuditLogActionType[] = [ // SSH Actions 'SSH_CONNECT_SUCCESS', 'SSH_CONNECT_FAILURE', 'SSH_SHELL_FAILURE', // System/Error - 'SERVER_STARTED', 'SERVER_ERROR', 'DATABASE_MIGRATION', 'ADMIN_SETUP_COMPLETE' + 'DATABASE_MIGRATION', 'ADMIN_SETUP_COMPLETE' // Settings (Specific) // 'FOCUS_SWITCHER_SEQUENCE_UPDATED' // Removed Focus Switcher type from dropdown ];