diff --git a/admin/src/views/system/log.vue b/admin/src/views/system/log.vue index d7e4ba4..417f90d 100644 --- a/admin/src/views/system/log.vue +++ b/admin/src/views/system/log.vue @@ -284,33 +284,6 @@ onMounted(() => { {{ row.description || '-' }} - - - { > {{ currentLogDetail.description || '-' }} - - - {{ currentLogDetail.requestMethod }} - - - - - - {{ currentLogDetail.requestUrl || '-' }} - - - {{ currentLogDetail.targetId || '-' }} - - - {{ currentLogDetail.ip || '-' }} - - - - {{ currentLogDetail.executeTime }}ms - - - - - - - + + - {{ formatTime(currentLogDetail.createTime) }} - - -
- {{ currentLogDetail.userAgent || '-' }} -
-
- -
-
{{ currentLogDetail.requestParams }}
- - -
-
- -
-
{{ currentLogDetail.responseResult }}
- - -
-
-
{{ currentLogDetail.errorMsg || '-' }} diff --git a/server/src/XiangYi.AdminApi/Controllers/AdminSystemController.cs b/server/src/XiangYi.AdminApi/Controllers/AdminSystemController.cs index d512793..cad2808 100644 --- a/server/src/XiangYi.AdminApi/Controllers/AdminSystemController.cs +++ b/server/src/XiangYi.AdminApi/Controllers/AdminSystemController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Security.Claims; +using XiangYi.AdminApi.Filters; using XiangYi.Application.DTOs.Requests; using XiangYi.Application.DTOs.Responses; using XiangYi.Application.Interfaces; @@ -41,6 +42,7 @@ public class AdminSystemController : ControllerBase /// 获取管理员列表 /// [HttpGet("admins")] + [OperationLog("管理员管理", "查询", Description = "查询管理员列表")] public async Task>> GetAdminList([FromQuery] AdminAccountQueryRequest request) { var result = await _adminAccountService.GetAdminListAsync(request); @@ -51,6 +53,7 @@ public class AdminSystemController : ControllerBase /// 获取管理员详情 /// [HttpGet("admins/{id}")] + [OperationLog("管理员管理", "查看", Description = "查看管理员详情")] public async Task> GetAdminDetail(long id) { var result = await _adminAccountService.GetAdminDetailAsync(id); @@ -61,6 +64,7 @@ public class AdminSystemController : ControllerBase /// 创建管理员 /// [HttpPost("admins")] + [OperationLog("管理员管理", "新增", Description = "创建管理员")] public async Task> CreateAdmin([FromBody] CreateAdminAccountRequest request) { var result = await _adminAccountService.CreateAdminAsync(request); @@ -71,6 +75,7 @@ public class AdminSystemController : ControllerBase /// 更新管理员 /// [HttpPut("admins/{id}")] + [OperationLog("管理员管理", "修改", Description = "更新管理员")] public async Task UpdateAdmin(long id, [FromBody] UpdateAdminAccountRequest request) { var result = await _adminAccountService.UpdateAdminAsync(id, request); @@ -81,6 +86,7 @@ public class AdminSystemController : ControllerBase /// 删除管理员 /// [HttpDelete("admins/{id}")] + [OperationLog("管理员管理", "删除", Description = "删除管理员")] public async Task DeleteAdmin(long id) { var operatorId = GetCurrentAdminId(); @@ -92,6 +98,7 @@ public class AdminSystemController : ControllerBase /// 重置管理员密码 /// [HttpPost("admins/{id}/resetPassword")] + [OperationLog("管理员管理", "修改", Description = "重置管理员密码", LogRequestParams = false)] public async Task ResetAdminPassword(long id, [FromBody] ResetPasswordRequest request) { var result = await _adminAccountService.ResetPasswordAsync(id, request.NewPassword); @@ -102,6 +109,7 @@ public class AdminSystemController : ControllerBase /// 分配管理员角色 /// [HttpPost("admins/{id}/roles")] + [OperationLog("管理员管理", "修改", Description = "分配管理员角色")] public async Task AssignAdminRoles(long id, [FromBody] AssignAdminRolesRequest request) { var result = await _adminAccountService.AssignRolesAsync(id, request.RoleIds); @@ -126,6 +134,7 @@ public class AdminSystemController : ControllerBase /// 获取角色列表 /// [HttpGet("roles")] + [OperationLog("角色管理", "查询", Description = "查询角色列表")] public async Task>> GetRoleList([FromQuery] AdminRoleQueryRequest request) { var result = await _adminRoleService.GetRoleListAsync(request); @@ -156,6 +165,7 @@ public class AdminSystemController : ControllerBase /// 创建角色 /// [HttpPost("roles")] + [OperationLog("角色管理", "新增", Description = "创建角色")] public async Task> CreateRole([FromBody] CreateRoleRequest request) { var result = await _adminRoleService.CreateRoleAsync(request); @@ -166,6 +176,7 @@ public class AdminSystemController : ControllerBase /// 更新角色 /// [HttpPut("roles/{id}")] + [OperationLog("角色管理", "修改", Description = "更新角色")] public async Task UpdateRole(long id, [FromBody] UpdateRoleRequest request) { var result = await _adminRoleService.UpdateRoleAsync(id, request); diff --git a/server/src/XiangYi.AdminApi/Controllers/AdminUserController.cs b/server/src/XiangYi.AdminApi/Controllers/AdminUserController.cs index cbde849..becf3c1 100644 --- a/server/src/XiangYi.AdminApi/Controllers/AdminUserController.cs +++ b/server/src/XiangYi.AdminApi/Controllers/AdminUserController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Security.Claims; +using XiangYi.AdminApi.Filters; using XiangYi.Application.DTOs.Requests; using XiangYi.Application.DTOs.Responses; using XiangYi.Application.Interfaces; @@ -30,6 +31,7 @@ public class AdminUserController : ControllerBase /// 查询请求 /// 分页用户列表 [HttpGet] + [OperationLog("用户管理", "查询", Description = "查询用户列表")] public async Task>> GetUserList([FromQuery] AdminUserQueryRequest request) { var result = await _adminUserService.GetUserListAsync(request); @@ -42,6 +44,7 @@ public class AdminUserController : ControllerBase /// 用户ID /// 用户详情 [HttpGet("{id}")] + [OperationLog("用户管理", "查看", Description = "查看用户详情")] public async Task> GetUserDetail(long id) { var result = await _adminUserService.GetUserDetailAsync(id); @@ -55,6 +58,7 @@ public class AdminUserController : ControllerBase /// 状态更新请求 /// 操作结果 [HttpPut("{id}/status")] + [OperationLog("用户管理", "修改", Description = "更新用户状态")] public async Task UpdateUserStatus(long id, [FromBody] UpdateUserStatusRequest request) { var adminId = GetCurrentAdminId(); @@ -79,6 +83,7 @@ public class AdminUserController : ControllerBase /// 创建请求 /// 创建的用户ID列表 [HttpPost("test-users")] + [OperationLog("用户管理", "新增", Description = "创建测试用户")] public async Task>> CreateTestUsers([FromBody] CreateTestUsersRequest request) { if (request.Count <= 0 || request.Count > 50) diff --git a/server/src/XiangYi.AdminApi/Filters/ValidationFilter.cs b/server/src/XiangYi.AdminApi/Filters/ValidationFilter.cs index 7cfec2c..a1ee6ef 100644 --- a/server/src/XiangYi.AdminApi/Filters/ValidationFilter.cs +++ b/server/src/XiangYi.AdminApi/Filters/ValidationFilter.cs @@ -67,6 +67,7 @@ public static class ValidationFilterExtensions return services.AddControllers(options => { options.Filters.Add(); + options.Filters.Add(); }); } }