diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureDefinitionProvider.cs b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureDefinitionProvider.cs index 6b13a4ed5..c5ba76842 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureDefinitionProvider.cs +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureDefinitionProvider.cs @@ -13,15 +13,21 @@ namespace LINGYUN.Abp.Auditing.Features name: AuditingFeatureNames.GroupName, displayName: L("Features:Auditing")); - auditingGroup.AddFeature( - name: AuditingFeatureNames.AuditLog.Default, + var loggingFeature = auditingGroup.AddFeature( + name: AuditingFeatureNames.Logging.Default, + displayName: L("Features:Auditing"), + description: L("Features:Auditing") + ); + + loggingFeature.CreateChild( + name: AuditingFeatureNames.Logging.AuditLog, defaultValue: true.ToString(), displayName: L("Features:DisplayName:AuditLog"), description: L("Features:Description:AuditLog"), valueType: new ToggleStringValueType(new BooleanValueValidator()) ); - auditingGroup.AddFeature( - name: AuditingFeatureNames.SecurityLog.Default, + loggingFeature.CreateChild( + name: AuditingFeatureNames.Logging.SecurityLog, defaultValue: true.ToString(), displayName: L("Features:DisplayName:SecurityLog"), description: L("Features:Description:SecurityLog"), diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureNames.cs b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureNames.cs index c9409203a..4685db1fc 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureNames.cs +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Features/AuditingFeatureNames.cs @@ -3,14 +3,13 @@ public static class AuditingFeatureNames { public const string GroupName = "AbpAuditing"; - public class AuditLog + public class Logging { - public const string Default = GroupName + ".AuditLog"; - } + public const string Default = GroupName + ".Logging"; - public class SecurityLog - { - public const string Default = GroupName + ".SecurityLog"; + public const string AuditLog = Default + ".AuditLog"; + + public const string SecurityLog = Default + ".SecurityLog"; } } } diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/AuditLogAppService.cs b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/AuditLogAppService.cs index ae612fffc..e63c766e6 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/AuditLogAppService.cs +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/AuditLogAppService.cs @@ -12,7 +12,7 @@ using Volo.Abp.Features; namespace LINGYUN.Abp.Auditing.Logging { [Authorize(AuditingPermissionNames.AuditLog.Default)] - [RequiresFeature(AuditingFeatureNames.AuditLog.Default)] + [RequiresFeature(AuditingFeatureNames.Logging.AuditLog)] public class AuditLogAppService : AuditingApplicationServiceBase, IAuditLogAppService { protected IAuditLogRepository AuditLogRepository { get; } diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Security/SecurityLogAppService.cs b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Security/SecurityLogAppService.cs index c8a910450..37e4b14d1 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Security/SecurityLogAppService.cs +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Security/SecurityLogAppService.cs @@ -11,7 +11,7 @@ using Volo.Abp.Identity; namespace LINGYUN.Abp.Auditing.Security { [Authorize(AuditingPermissionNames.SecurityLog.Default)] - [RequiresFeature(AuditingFeatureNames.SecurityLog.Default)] + [RequiresFeature(AuditingFeatureNames.Logging.SecurityLog)] public class SecurityLogAppService : AuditingApplicationServiceBase, ISecurityLogAppService { protected IIdentitySecurityLogRepository SecurityLogRepository { get; } diff --git a/vueJs/src/views/admin/auditing/audit-log/index.vue b/vueJs/src/views/admin/auditing/audit-log/index.vue index af0860ac9..6a470b97b 100644 --- a/vueJs/src/views/admin/auditing/audit-log/index.vue +++ b/vueJs/src/views/admin/auditing/audit-log/index.vue @@ -239,7 +239,7 @@ >