- 增加 DbContextOptions.AuditValue 基于 Ioc Scoped 审计值;

This commit is contained in:
2881099
2024-01-29 09:17:49 +08:00
parent c74b202b54
commit 096ecdfb84
9 changed files with 417 additions and 9 deletions

View File

@ -1,4 +1,5 @@

using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
using System.Linq;
@ -47,5 +48,34 @@ namespace FreeSql
/// 实体变化事件
/// </summary>
public Action<List<DbContext.EntityChangeReport.ChangeInfo>> OnEntityChange { get; set; }
/// <summary>
/// DbContext/Repository 审计值事件,适合 Scoped IOC 中获取登陆信息
/// </summary>
public event EventHandler<DbContextAuditValueEventArgs> AuditValue;
public EventHandler<DbContextAuditValueEventArgs> AuditValueHandler => AuditValue;
}
public class DbContextAuditValueEventArgs : EventArgs
{
public DbContextAuditValueEventArgs(Aop.AuditValueType auditValueType, Type entityType, object obj)
{
this.AuditValueType = auditValueType;
this.EntityType = entityType;
this.Object = obj;
}
/// <summary>
/// 类型
/// </summary>
public Aop.AuditValueType AuditValueType { get; }
/// <summary>
/// 类型
/// </summary>
public Type EntityType { get; }
/// <summary>
/// 实体对象
/// </summary>
public object Object { get; }
}
}

View File

@ -66,16 +66,27 @@ namespace FreeSql
if (_db.Options.NoneParameter != null) insert.NoneParameter(_db.Options.NoneParameter.Value);
return insert;
}
protected virtual IInsert<TEntity> OrmInsert(TEntity data)
protected virtual IInsert<TEntity> OrmInsert(TEntity entity)
{
var insert = OrmInsert();
if (data != null) (insert as InsertProvider<TEntity>)._source.Add(data); //防止 Aop.AuditValue 触发两次
if (entity != null)
{
(insert as InsertProvider<TEntity>)._source.Add(entity); //防止 Aop.AuditValue 触发两次
if (_db.Options.AuditValueHandler != null)
_db.Options.AuditValueHandler(_db, new DbContextAuditValueEventArgs(Aop.AuditValueType.Insert, _table.Type, entity));
}
return insert;
}
protected virtual IInsert<TEntity> OrmInsert(IEnumerable<TEntity> data)
protected virtual IInsert<TEntity> OrmInsert(IEnumerable<TEntity> entitys)
{
var insert = OrmInsert();
if (data != null) (insert as InsertProvider<TEntity>)._source.AddRange(data.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
if (entitys != null)
{
(insert as InsertProvider<TEntity>)._source.AddRange(entitys.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
if (_db.Options.AuditValueHandler != null)
foreach (var item in entitys)
_db.Options.AuditValueHandler(_db, new DbContextAuditValueEventArgs(Aop.AuditValueType.Insert, _table.Type, item));
}
return insert;
}
@ -84,7 +95,13 @@ namespace FreeSql
var update = _db.OrmOriginal.Update<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction());
if (_db.Options.NoneParameter != null) update.NoneParameter(_db.Options.NoneParameter.Value);
if (_db.Options.EnableGlobalFilter == false) update.DisableGlobalFilter();
if (entitys != null) (update as UpdateProvider<TEntity>)._source.AddRange(entitys.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
if (entitys != null)
{
(update as UpdateProvider<TEntity>)._source.AddRange(entitys.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
if (_db.Options.AuditValueHandler != null)
foreach (var item in entitys)
_db.Options.AuditValueHandler(_db, new DbContextAuditValueEventArgs(Aop.AuditValueType.Update, _table.Type, item));
}
return update;
}
protected virtual IDelete<TEntity> OrmDelete(object dywhere)

View File

@ -130,6 +130,26 @@
实体变化事件
</summary>
</member>
<member name="E:FreeSql.DbContextOptions.AuditValue">
<summary>
DbContext/Repository 审计值事件,适合 Scoped IOC 中获取登陆信息
</summary>
</member>
<member name="P:FreeSql.DbContextAuditValueEventArgs.AuditValueType">
<summary>
类型
</summary>
</member>
<member name="P:FreeSql.DbContextAuditValueEventArgs.EntityType">
<summary>
类型
</summary>
</member>
<member name="P:FreeSql.DbContextAuditValueEventArgs.Object">
<summary>
实体对象
</summary>
</member>
<member name="M:FreeSql.DbSet`1.AsType(System.Type)">
<summary>
动态Type在使用 DbSet&lt;object&gt; 后使用本方法,指定实体类型
@ -806,5 +826,14 @@
<param name="that"></param>
<returns></returns>
</member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members>
</doc>

View File

@ -72,6 +72,7 @@ namespace FreeSql
{
var repoInfo = new RepoInfo(repository);
repository.UnitOfWork = Current;
if (_repos.Any(a => a.Repository == repository)) return;
_repos.Add(repoInfo);
}
void SetAllRepositoryUow()