From 76b3ea921f608da483106a64bf7fa355ed900ede Mon Sep 17 00:00:00 2001 From: guotianliang <1265346495@qq.com> Date: Thu, 16 Jun 2022 18:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AE=A1=E8=AE=A1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9B=B8=E5=85=B3ControllerName=E7=89=B9=E6=80=A7?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Auditing/AuditLogs/AuditLogController.cs | 90 +++++++++--------- .../AuditLogs/EntityChangesController.cs | 24 ++++- .../Abp/Auditing/Logging/LogController.cs | 68 +++++++------- .../SecurityLogs/SecurityLogController.cs | 92 +++++++++---------- 4 files changed, 145 insertions(+), 129 deletions(-) diff --git a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/AuditLogController.cs b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/AuditLogController.cs index f201572..192dc5c 100644 --- a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/AuditLogController.cs +++ b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/AuditLogController.cs @@ -5,57 +5,55 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc; -namespace Sanhe.Abp.Auditing.AuditLogs +namespace Sanhe.Abp.Auditing.AuditLogs; + +/// +/// 审计日志 +/// +[RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] +[Area("auditing")] +[Route("api/auditing/audit-log")] +public class AuditLogController : AbpController, IAuditLogAppService { + protected IAuditLogAppService AuditLogAppService { get; } + + public AuditLogController(IAuditLogAppService auditLogAppService) + { + AuditLogAppService = auditLogAppService; + } + /// - /// 审计日志 + /// 根据Id获取 /// - [RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] - [Area("auditing")] - [ControllerName("audit-log")] - [Route("api/auditing/audit-log")] - public class AuditLogController : AbpController, IAuditLogAppService + /// + /// + [HttpGet] + [Route("{id}")] + public virtual Task GetAsync(Guid id) { - protected IAuditLogAppService AuditLogAppService { get; } - - public AuditLogController(IAuditLogAppService auditLogAppService) - { - AuditLogAppService = auditLogAppService; - } - - /// - /// 根据Id获取 - /// - /// - /// - [HttpGet] - [Route("{id}")] - public virtual Task GetAsync(Guid id) - { - return AuditLogAppService.GetAsync(id); - } + return AuditLogAppService.GetAsync(id); + } - /// - /// 分页获取 - /// - /// - /// - [HttpGet] - public virtual Task> GetListAsync(AuditLogGetByPagedDto input) - { - return AuditLogAppService.GetListAsync(input); - } + /// + /// 分页获取 + /// + /// + /// + [HttpGet] + public virtual Task> GetListAsync(AuditLogGetByPagedDto input) + { + return AuditLogAppService.GetListAsync(input); + } - /// - /// 根据Id删除 - /// - /// - /// - [HttpDelete] - [Route("{id}")] - public virtual Task DeleteAsync(Guid id) - { - return AuditLogAppService.DeleteAsync(id); - } + /// + /// 根据Id删除 + /// + /// + /// + [HttpDelete] + [Route("{id}")] + public virtual Task DeleteAsync(Guid id) + { + return AuditLogAppService.DeleteAsync(id); } } diff --git a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/EntityChangesController.cs b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/EntityChangesController.cs index 7145ed3..00f5c63 100644 --- a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/EntityChangesController.cs +++ b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/AuditLogs/EntityChangesController.cs @@ -7,9 +7,11 @@ using Volo.Abp.AspNetCore.Mvc; namespace Sanhe.Abp.Auditing.AuditLogs; +/// +/// 实体变更 +/// [RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] [Area("auditing")] -[ControllerName("entity-changes")] [Route("api/auditing/entity-changes")] public class EntityChangesController : AbpControllerBase, IEntityChangesAppService { @@ -20,6 +22,11 @@ public class EntityChangesController : AbpControllerBase, IEntityChangesAppServi EntityChangeAppService = entityChangeAppService; } + /// + /// 根据Id获取 + /// + /// + /// [HttpGet] [Route("{id}")] public Task GetAsync(Guid id) @@ -27,12 +34,22 @@ public class EntityChangesController : AbpControllerBase, IEntityChangesAppServi return EntityChangeAppService.GetAsync(id); } + /// + /// 分页获取 + /// + /// + /// [HttpGet] public Task> GetListAsync(EntityChangeGetByPagedDto input) { return EntityChangeAppService.GetListAsync(input); } + /// + /// 根据Id获取并带用户名 + /// + /// + /// [HttpGet] [Route("with-username/{id}")] public Task GetWithUsernameAsync(Guid id) @@ -40,6 +57,11 @@ public class EntityChangesController : AbpControllerBase, IEntityChangesAppServi return EntityChangeAppService.GetWithUsernameAsync(id); } + /// + /// 根据实体Id与完全类名称获取并带用户名 + /// + /// + /// [HttpGet] [Route("with-username")] public Task> GetWithUsernameAsync(EntityChangeGetWithUsernameDto input) diff --git a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/Logging/LogController.cs b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/Logging/LogController.cs index b7bde9b..1440ec3 100644 --- a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/Logging/LogController.cs +++ b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/Logging/LogController.cs @@ -5,45 +5,43 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc; -namespace Sanhe.Abp.Auditing.Logging +namespace Sanhe.Abp.Auditing.Logging; + +/// +/// 日志 +/// +[RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] +[Area("auditing")] +[Route("api/auditing/logging")] +public class LogController : AbpController, ILogAppService { + private readonly ILogAppService _service; + + public LogController(ILogAppService service) + { + _service = service; + } + /// - /// 日志 + /// 根据Id获取 /// - [RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] - [Area("auditing")] - [ControllerName("logging")] - [Route("api/auditing/logging")] - public class LogController : AbpController, ILogAppService + /// + /// + [HttpGet] + [Route("{id}")] + public virtual Task GetAsync(string id) { - private readonly ILogAppService _service; - - public LogController(ILogAppService service) - { - _service = service; - } - - /// - /// 根据Id获取 - /// - /// - /// - [HttpGet] - [Route("{id}")] - public virtual Task GetAsync(string id) - { - return _service.GetAsync(id); - } + return _service.GetAsync(id); + } - /// - /// 分页获取 - /// - /// - /// - [HttpGet] - public virtual Task> GetListAsync(LogGetByPagedDto input) - { - return _service.GetListAsync(input); - } + /// + /// 分页获取 + /// + /// + /// + [HttpGet] + public virtual Task> GetListAsync(LogGetByPagedDto input) + { + return _service.GetListAsync(input); } } diff --git a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/SecurityLogs/SecurityLogController.cs b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/SecurityLogs/SecurityLogController.cs index 59332b8..b9a9267 100644 --- a/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/SecurityLogs/SecurityLogController.cs +++ b/modules/auditing/Sanhe.Abp.Auditing.HttpApi/Sanhe/Abp/Auditing/SecurityLogs/SecurityLogController.cs @@ -5,58 +5,56 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc; -namespace Sanhe.Abp.Auditing.SecurityLogs +namespace Sanhe.Abp.Auditing.SecurityLogs; + +/// +/// 安全日志 +/// +[RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] +[Area("auditing")] +[Route("api/auditing/security-log")] +public class SecurityLogController : AbpController, ISecurityLogAppService { + protected ISecurityLogAppService SecurityLogAppService { get; } + + public SecurityLogController(ISecurityLogAppService securityLogAppService) + { + SecurityLogAppService = securityLogAppService; + } + /// - /// 安全日志 + /// 根据Id获取 /// - [RemoteService(Name = AuditingRemoteServiceConsts.RemoteServiceName)] - [Area("auditing")] - [ControllerName("security-log")] - [Route("api/auditing/security-log")] - public class SecurityLogController : AbpController, ISecurityLogAppService + /// + /// + [HttpGet] + [Route("{id}")] + public virtual Task GetAsync(Guid id) { - protected ISecurityLogAppService SecurityLogAppService { get; } - - public SecurityLogController(ISecurityLogAppService securityLogAppService) - { - SecurityLogAppService = securityLogAppService; - } - - /// - /// 根据Id获取 - /// - /// - /// - [HttpGet] - [Route("{id}")] - public virtual Task GetAsync(Guid id) - { - return SecurityLogAppService.GetAsync(id); - } - - /// - /// 分页获取 - /// - /// - /// - [HttpGet] - public virtual Task> GetListAsync(SecurityLogGetByPagedDto input) - { - return SecurityLogAppService.GetListAsync(input); - } + return SecurityLogAppService.GetAsync(id); + } - /// - /// 根据Id删除 - /// - /// - /// - [HttpDelete] - [Route("{id}")] - public virtual Task DeleteAsync(Guid id) - { - return SecurityLogAppService.DeleteAsync(id); - } + /// + /// 分页获取 + /// + /// + /// + [HttpGet] + public virtual Task> GetListAsync(SecurityLogGetByPagedDto input) + { + return SecurityLogAppService.GetListAsync(input); + } + /// + /// 根据Id删除 + /// + /// + /// + [HttpDelete] + [Route("{id}")] + public virtual Task DeleteAsync(Guid id) + { + return SecurityLogAppService.DeleteAsync(id); } + }