From bbc5219fcfcf855ae609f1cb0ce9830d885bd93f Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 10 Apr 2025 18:39:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(vben5):=20=E5=A2=9E=E5=8A=A0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app-antd/src/locales/langs/en-US/abp.json | 5 +- .../app-antd/src/locales/langs/zh-CN/abp.json | 5 +- .../app-antd/src/router/routes/modules/abp.ts | 11 +- .../src/views/auditing/loggings/index.vue | 15 + .../packages/@abp/auditing/src/api/index.ts | 1 + .../@abp/auditing/src/api/useLoggingsApi.ts | 38 ++ .../components/audit-logs/AuditLogTable.vue | 3 + .../@abp/auditing/src/components/index.ts | 1 + .../src/components/loggings/LoggingDrawer.vue | 138 +++++++ .../src/components/loggings/LoggingTable.vue | 345 ++++++++++++++++++ .../auditing/src/constants/permissions.ts | 4 + .../packages/@abp/auditing/src/types/index.ts | 1 + .../@abp/auditing/src/types/loggings.ts | 65 ++++ 13 files changed, 627 insertions(+), 5 deletions(-) create mode 100644 apps/vben5/apps/app-antd/src/views/auditing/loggings/index.vue create mode 100644 apps/vben5/packages/@abp/auditing/src/api/useLoggingsApi.ts create mode 100644 apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingDrawer.vue create mode 100644 apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingTable.vue create mode 100644 apps/vben5/packages/@abp/auditing/src/types/loggings.ts diff --git a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json index 0844acf85..f992975e9 100644 --- a/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json +++ b/apps/vben5/apps/app-antd/src/locales/langs/en-US/abp.json @@ -22,7 +22,6 @@ "claimTypes": "Claim Types", "securityLogs": "Security Logs", "organizationUnits": "Organization Units", - "auditLogs": "Audit Logs", "sessions": "Sessions" }, "permissions": { @@ -55,7 +54,9 @@ "dataProtection": { "title": "Data Protection", "entityTypeInfos": "Entity Type Infos" - } + }, + "auditLogs": "Audit Logs", + "loggings": "System Logs" }, "openiddict": { "title": "OpenIddict", diff --git a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json index d1da0fbd7..2117b07a0 100644 --- a/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/vben5/apps/app-antd/src/locales/langs/zh-CN/abp.json @@ -22,7 +22,6 @@ "claimTypes": "身份标识", "securityLogs": "安全日志", "organizationUnits": "组织机构", - "auditLogs": "审计日志", "sessions": "会话管理" }, "permissions": { @@ -55,7 +54,9 @@ "dataProtection": { "title": "数据权限", "entityTypeInfos": "实体列表" - } + }, + "auditLogs": "审计日志", + "loggings": "系统日志" }, "openiddict": { "title": "OpenIddict", diff --git a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts index e31424022..d5c084512 100644 --- a/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts +++ b/apps/vben5/apps/app-antd/src/router/routes/modules/abp.ts @@ -237,13 +237,22 @@ const routes: RouteRecordRaw[] = [ }, { meta: { - title: $t('abp.manage.identity.auditLogs'), + title: $t('abp.manage.auditLogs'), icon: 'fluent-mdl2:compliance-audit', }, name: 'AuditingAuditLogs', path: '/manage/audit-logs', component: () => import('#/views/auditing/audit-logs/index.vue'), }, + { + meta: { + title: $t('abp.manage.loggings'), + icon: 'icon-park-outline:log', + }, + name: 'AuditingLoggings', + path: '/manage/sys-logs', + component: () => import('#/views/auditing/loggings/index.vue'), + }, { meta: { title: $t('abp.manage.notifications.title'), diff --git a/apps/vben5/apps/app-antd/src/views/auditing/loggings/index.vue b/apps/vben5/apps/app-antd/src/views/auditing/loggings/index.vue new file mode 100644 index 000000000..82604b309 --- /dev/null +++ b/apps/vben5/apps/app-antd/src/views/auditing/loggings/index.vue @@ -0,0 +1,15 @@ + + + diff --git a/apps/vben5/packages/@abp/auditing/src/api/index.ts b/apps/vben5/packages/@abp/auditing/src/api/index.ts index 8613244d7..71fdf044a 100644 --- a/apps/vben5/packages/@abp/auditing/src/api/index.ts +++ b/apps/vben5/packages/@abp/auditing/src/api/index.ts @@ -1,2 +1,3 @@ export { useAuditLogsApi } from './useAuditLogsApi'; export { useEntityChangesApi } from './useEntityChangesApi'; +export { useLoggingsApi } from './useLoggingsApi'; diff --git a/apps/vben5/packages/@abp/auditing/src/api/useLoggingsApi.ts b/apps/vben5/packages/@abp/auditing/src/api/useLoggingsApi.ts new file mode 100644 index 000000000..77e65c6b9 --- /dev/null +++ b/apps/vben5/packages/@abp/auditing/src/api/useLoggingsApi.ts @@ -0,0 +1,38 @@ +import type { PagedResultDto } from '@abp/core'; + +import type { LogDto, LogGetListInput } from '../types/loggings'; + +import { useRequest } from '@abp/request'; + +export function useLoggingsApi() { + const { cancel, request } = useRequest(); + + /** + * 获取系统日志 + * @param id 日志id + */ + function getApi(id: string): Promise { + return request(`/api/auditing/logging/${id}`, { + method: 'GET', + }); + } + + /** + * 获取系统日志分页列表 + * @param input 参数 + */ + function getPagedListApi( + input: LogGetListInput, + ): Promise> { + return request>('/api/auditing/logging', { + method: 'GET', + params: input, + }); + } + + return { + cancel, + getApi, + getPagedListApi, + }; +} diff --git a/apps/vben5/packages/@abp/auditing/src/components/audit-logs/AuditLogTable.vue b/apps/vben5/packages/@abp/auditing/src/components/audit-logs/AuditLogTable.vue index 0b4b4a27e..cc97d7b5b 100644 --- a/apps/vben5/packages/@abp/auditing/src/components/audit-logs/AuditLogTable.vue +++ b/apps/vben5/packages/@abp/auditing/src/components/audit-logs/AuditLogTable.vue @@ -41,6 +41,9 @@ const formOptions: VbenFormProps = { schema: [ { component: 'RangePicker', + componentProps: { + showTime: true, + }, fieldName: 'executionTime', formItemClass: 'col-span-2 items-baseline', label: $t('AbpAuditLogging.ExecutionTime'), diff --git a/apps/vben5/packages/@abp/auditing/src/components/index.ts b/apps/vben5/packages/@abp/auditing/src/components/index.ts index 1d99b4a46..68e953a86 100644 --- a/apps/vben5/packages/@abp/auditing/src/components/index.ts +++ b/apps/vben5/packages/@abp/auditing/src/components/index.ts @@ -1,2 +1,3 @@ export { default as AuditLogTable } from './audit-logs/AuditLogTable.vue'; export { default as EntityChangeDrawer } from './entity-changes/EntityChangeDrawer.vue'; +export { default as LoggingTable } from './loggings/LoggingTable.vue'; diff --git a/apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingDrawer.vue b/apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingDrawer.vue new file mode 100644 index 000000000..616b5568d --- /dev/null +++ b/apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingDrawer.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingTable.vue b/apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingTable.vue new file mode 100644 index 000000000..7ac48088d --- /dev/null +++ b/apps/vben5/packages/@abp/auditing/src/components/loggings/LoggingTable.vue @@ -0,0 +1,345 @@ + + + + + diff --git a/apps/vben5/packages/@abp/auditing/src/constants/permissions.ts b/apps/vben5/packages/@abp/auditing/src/constants/permissions.ts index 00e8dc003..759747745 100644 --- a/apps/vben5/packages/@abp/auditing/src/constants/permissions.ts +++ b/apps/vben5/packages/@abp/auditing/src/constants/permissions.ts @@ -4,3 +4,7 @@ export const AuditLogPermissions = { /** 删除 */ Delete: 'AbpAuditing.AuditLog.Delete', }; +/** 系统日志权限 */ +export const SystemLogPermissions = { + Default: 'AbpAuditing.SystemLog', +}; diff --git a/apps/vben5/packages/@abp/auditing/src/types/index.ts b/apps/vben5/packages/@abp/auditing/src/types/index.ts index 900570716..125df9c4a 100644 --- a/apps/vben5/packages/@abp/auditing/src/types/index.ts +++ b/apps/vben5/packages/@abp/auditing/src/types/index.ts @@ -1,2 +1,3 @@ export * from './audit-logs'; export * from './entity-changes'; +export * from './loggings'; diff --git a/apps/vben5/packages/@abp/auditing/src/types/loggings.ts b/apps/vben5/packages/@abp/auditing/src/types/loggings.ts new file mode 100644 index 000000000..e5ce7e797 --- /dev/null +++ b/apps/vben5/packages/@abp/auditing/src/types/loggings.ts @@ -0,0 +1,65 @@ +interface LogExceptionDto { + class?: string; + depth?: number; + helpUrl?: string; + hResult?: number; + message?: string; + source?: string; + stackTrace?: string; +} + +interface LogFieldDto { + actionId?: string; + actionName?: string; + application?: string; + clientId?: string; + connectionId?: string; + context?: string; + correlationId?: string; + environment?: string; + id: string; + machineName?: string; + processId?: number; + requestId?: string; + requestPath?: string; + threadId?: number; + userId?: string; +} + +enum LogLevel { + Critical = 5, + Debug = 1, + Error = 4, + Information = 2, + None = 6, + Trace = 0, + Warning = 3, +} + +interface LogDto { + exceptions: LogExceptionDto[]; + fields: LogFieldDto; + level: LogLevel; + message: string; + timeStamp: Date; +} + +interface LogGetListInput { + application?: string; + context?: string; + correlationId?: string; + endTime?: Date; + environment?: string; + hasException?: boolean; + level?: LogLevel; + machineName?: string; + processId?: number; + requestId?: string; + requestPath?: string; + startTime?: Date; + threadId?: number; +} + +export type { LogDto, LogExceptionDto, LogFieldDto, LogGetListInput }; + +export { LogLevel };