🆕 (entity) 添加数据审计时可以忽略某些不需要审计或者敏感的实体属性的功能 #143 #64

Author: gmf520

samples/web/Liuliu.Demo.Web/Controllers/IdentityController.cs

@@ -202,7 +202,7 @@ public async Task<AjaxResult> Login(LoginDto dto)
         /// <returns>JSON操作结果</returns>
         [HttpPost]
         [ModuleInfo]
-        [Description("JwtToken")]
+        [Description("Token")]
         public async Task<AjaxResult> Token(TokenDto dto)
         {
             string grantType = dto.GrantType?.UpperToLowerAndSplit("_");

samples/web/ui/ng-alain8/src/app/routes/passport/login/login.component.html

@@ -66,7 +66,7 @@
     </nz-col>
   </nz-form-item>
   <nz-form-item>
-    <button nz-button type="submit" nzType="primary" nzSize="large" acl="Root.Site.Identity.Jwtoken" [nzLoading]="http.loading" nzBlock [disabled]="http.loading">
+    <button nz-button type="submit" nzType="primary" nzSize="large" [nzLoading]="http.loading" nzBlock [disabled]="http.loading">
       {{ 'app.login.login' | translate }}
     </button>
   </nz-form-item>

src/OSharp.AspNetCore/Mvc/Filters/AuditOperationAttribute.cs

@@ -80,7 +80,9 @@ public override void OnResultExecuted(ResultExecutedContext context)
             IUnitOfWork unitOfWork = provider.GetUnitOfWork<Function, Guid>();
             //回滚之前业务处理中的未提交事务，防止审计信息保存时误提交
             unitOfWork?.Rollback();
-
+            
+            //移除当前功能，使保存审计信息的时候不再获取记录变更，审计信息不需要再审计
+            dict.Function = null;
             IAuditStore store = provider.GetService<IAuditStore>();
             store?.Save(dict.AuditOperation);
             unitOfWork?.Commit();

src/OSharp.EntityFrameworkCore/AuditEntityProvider.cs

@@ -19,6 +19,7 @@
 using OSharp.Authorization.Functions;
 using OSharp.Collections;
 using OSharp.Dependency;
+using OSharp.Reflection;
 
 
 namespace OSharp.Entity
@@ -100,6 +101,12 @@ private static AuditEntityEntry GetAuditEntity(EntityEntry entry, IEntityInfo en
                 {
                     continue;
                 }
+
+                if (property.PropertyInfo == null || property.PropertyInfo.HasAttribute<AuditIgnoreAttribute>())
+                {
+                    continue;
+                }
+
                 string name = property.Name;
                 if (property.IsPrimaryKey())
                 {
@@ -110,7 +117,7 @@ private static AuditEntityEntry GetAuditEntity(EntityEntry entry, IEntityInfo en
                 AuditPropertyEntry auditProperty = new AuditPropertyEntry()
                 {
                     FieldName = name,
-                    DisplayName = entityProperties.First(m => m.Name == name)?.Display ?? name,
+                    DisplayName = entityProperties.FirstOrDefault(m => m.Name == name)?.Display ?? name,
                     DataType = property.ClrType.ToString()
                 };
                 if (entry.State == EntityState.Added)

src/OSharp.Identity/Identity/Entities/RoleBase.cs

@@ -11,6 +11,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
+using OSharp.Audits;
 using OSharp.Entity;
 
 
@@ -41,13 +42,13 @@ protected RoleBase()
         /// <summary>
         /// 获取或设置 标准化角色名称
         /// </summary>
-        [Required, DisplayName("标准化角色名称")]
+        [Required, DisplayName("标准化角色名称"), AuditIgnore]
         public string NormalizedName { get; set; }
 
         /// <summary>
         /// 获取或设置 一个随机值，每当某个角色被保存到存储区时，该值将发生变化。
         /// </summary>
-        [DisplayName("版本标识")]
+        [DisplayName("版本标识"), AuditIgnore]
         public string ConcurrencyStamp { get; set; } = Guid.NewGuid().ToString();
 
         /// <summary>

src/OSharp.Identity/Identity/Entities/UserBase.cs

@@ -11,6 +11,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
+using OSharp.Audits;
 using OSharp.Entity;
 
 
@@ -41,7 +42,7 @@ protected UserBase()
         /// <summary>
         /// 获取或设置 标准化的用户名
         /// </summary>
-        [Required, DisplayName("标准化的用户名")]
+        [Required, DisplayName("标准化的用户名"), AuditIgnore]
         public string NormalizedUserName { get; set; }
 
         /// <summary>
@@ -59,7 +60,7 @@ protected UserBase()
         /// <summary>
         /// 获取或设置 标准化的电子邮箱
         /// </summary>
-        [DisplayName("标准化的电子邮箱"), DataType(DataType.EmailAddress)]
+        [DisplayName("标准化的电子邮箱"), DataType(DataType.EmailAddress), AuditIgnore]
         public string NormalizeEmail { get; set; }
 
         /// <summary>
@@ -71,7 +72,7 @@ protected UserBase()
         /// <summary>
         /// 获取或设置 密码哈希值
         /// </summary>
-        [DisplayName("密码哈希值")]
+        [DisplayName("密码哈希值"), AuditIgnore]
         public string PasswordHash { get; set; }
 
         /// <summary>
@@ -83,13 +84,13 @@ protected UserBase()
         /// <summary>
         /// 获取或设置 每当用户凭据发生变化（密码更改、登录删除）时必须更改的随机值。
         /// </summary>
-        [DisplayName("安全标识")]
+        [DisplayName("安全标识"), AuditIgnore]
         public string SecurityStamp { get; set; }
 
         /// <summary>
         /// 获取或设置 一个随机值，必须在用户持续存储时更改。
         /// </summary>
-        [DisplayName("版本标识")]
+        [DisplayName("版本标识"), AuditIgnore]
         public string ConcurrencyStamp { get; set; } = Guid.NewGuid().ToString();
 
         /// <summary>

src/OSharp/Audits/AuditIgnoreAttribute.cs

@@ -0,0 +1,21 @@
+// -----------------------------------------------------------------------
+//  <copyright file="AuditIgnoreAttribute.cs" company="OSharp开源团队">
+//      Copyright (c) 2014-2020 OSharp. All rights reserved.
+//  </copyright>
+//  <site>http://www.osharp.org</site>
+//  <last-editor>郭明锋</last-editor>
+//  <last-date>2020-03-26 15:06</last-date>
+// -----------------------------------------------------------------------
+
+using System;
+
+
+namespace OSharp.Audits
+{
+    /// <summary>
+    /// 标记在审计中忽略的属性
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+    public sealed class AuditIgnoreAttribute : Attribute
+    { }
+}

src/OSharp/Entity/ICreatedTime.cs

@@ -8,6 +8,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.ComponentModel;
 
 
 namespace OSharp.Entity
@@ -20,6 +21,7 @@ public interface ICreatedTime
         /// <summary>
         /// 获取或设置 创建时间
         /// </summary>
+        [DisplayName("创建时间")]
         DateTime CreatedTime { get; set; }
     }
 }

src/OSharp/Entity/ISoftDeletable.cs

@@ -8,6 +8,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.ComponentModel;
 
 
 namespace OSharp.Entity
@@ -20,6 +21,7 @@ public interface ISoftDeletable
         /// <summary>
         /// 获取或设置 数据逻辑删除时间，为null表示正常数据，有值表示已逻辑删除，同时删除时间每次不同也能保证索引唯一性
         /// </summary>
+        [DisplayName("删除时间")]
         DateTime? DeletedTime { get; set; }
     }
 }