更新AOP配置扩展方法

dotnetcore · Nov 5, 2023 · 7d5f37a · 7d5f37a
1 parent 4877edf
commit 7d5f37a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>7</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>67</VersionPatch>
+		<VersionPatch>68</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 	</PropertyGroup>

diff --git a/src/Util.Aop.AspectCore/AppBuilderExtensions.cs b/src/Util.Aop.AspectCore/AppBuilderExtensions.cs
@@ -1,5 +1,4 @@
 using Util.Configs;
-using Util.Helpers;
 
 namespace Util.Aop;
 
@@ -24,13 +23,22 @@ public static IAppBuilder AddAop( this IAppBuilder builder,bool isEnableIAopProx
         return builder.AddAop( null, isEnableIAopProxy );
     }
 
+    /// <summary>
+    /// 启用AspectCore拦截器
+    /// </summary>
+    /// <param name="builder">应用生成器</param>
+    /// <param name="setupAction">AspectCore拦截器配置操作</param>
+    public static IAppBuilder AddAop( this IAppBuilder builder, Action<IAspectConfiguration> setupAction ) {
+        return builder.AddAop( setupAction, false );
+    }
+
     /// <summary>
     /// 启用AspectCore拦截器
     /// </summary>
     /// <param name="builder">应用生成器</param>
     /// <param name="setupAction">AspectCore拦截器配置操作</param>
     /// <param name="isEnableIAopProxy">是否启用IAopProxy接口标记</param>
-    public static IAppBuilder AddAop( this IAppBuilder builder, Action<IAspectConfiguration> setupAction, bool isEnableIAopProxy ) {
+    private static IAppBuilder AddAop( this IAppBuilder builder, Action<IAspectConfiguration> setupAction, bool isEnableIAopProxy ) {
         builder.CheckNull( nameof( builder ) );
         builder.Host.UseServiceProviderFactory( new DynamicProxyServiceProviderFactory() );
         builder.Host.ConfigureServices( ( context, services ) => {
@@ -61,8 +69,6 @@ private static bool IsProxy( Type type, bool isEnableIAopProxy ) {
         if ( type == null )
             return false;
         if ( isEnableIAopProxy == false ) {
-            if ( Reflection.GetTopBaseType( type ).SafeString() == "Microsoft.EntityFrameworkCore.DbContext" )
-                return false;
             if ( type.SafeString().Contains( "Xunit.DependencyInjection.ITestOutputHelperAccessor" ) )
                 return false;
             return true;
@@ -78,7 +84,7 @@ private static bool IsProxy( Type type, bool isEnableIAopProxy ) {
     }
 
     /// <summary>
-    /// 注册拦截作用域
+    /// 注册拦截器服务
     /// </summary>
     private static void RegisterAspectScoped( IServiceCollection services ) {
         services.AddScoped<IAspectScheduler, ScopeAspectScheduler>();

diff --git a/src/Util.Application.EntityFrameworkCore/CrudServiceBase.cs b/src/Util.Application.EntityFrameworkCore/CrudServiceBase.cs
@@ -136,6 +136,8 @@ protected CrudServiceBase( IServiceProvider serviceProvider, IUnitOfWork unitOfW
 
     /// <inheritdoc />
     public virtual async Task<string> CreateAsync( TCreateRequest request ) {
+        request.CheckNull( nameof(request) );
+        request.Validate();
         var entity = ToEntity( request );
         entity.CheckNull( nameof( entity ) );
         await CreateAsync( entity );
@@ -199,6 +201,8 @@ protected virtual Task CreateCommitAfterAsync( TEntity entity ) {
 
     /// <inheritdoc />
     public virtual async Task UpdateAsync( TUpdateRequest request ) {
+        request.CheckNull( nameof(request) );
+        request.Validate();
         if ( request.Id.IsEmpty() )
             throw new InvalidOperationException( R.IdIsEmpty );
         var oldEntity = await FindOldEntityAsync( request.Id );

diff --git a/src/Util.Application.EntityFrameworkCore/Trees/TreeServiceBase.cs b/src/Util.Application.EntityFrameworkCore/Trees/TreeServiceBase.cs
@@ -112,6 +112,8 @@ protected TreeServiceBase( IServiceProvider serviceProvider, IUnitOfWork unitOfW
     /// </summary>
     /// <param name="request">创建参数</param>
     public virtual async Task<string> CreateAsync( TCreateRequest request ) {
+        request.CheckNull( nameof( request ) );
+        request.Validate();
         var entity = ToEntity( request );
         entity.CheckNull( nameof( entity ) );
         await CreateAsync( entity );
@@ -177,6 +179,8 @@ protected virtual Task CreateCommitAfterAsync( TEntity entity ) {
 
     /// <inheritdoc />
     public virtual async Task UpdateAsync( TUpdateRequest request ) {
+        request.CheckNull( nameof( request ) );
+        request.Validate();
         if ( request.Id.IsEmpty() )
             throw new InvalidOperationException( R.IdIsEmpty );
         var oldEntity = await FindOldEntityAsync( request.Id );

diff --git a/src/Util.Application/ICrudService.cs b/src/Util.Application/ICrudService.cs
@@ -1,7 +1,5 @@
-using Util.Aop;
-using Util.Applications.Dtos;
+using Util.Applications.Dtos;
 using Util.Data.Queries;
-using Util.Validation;
 
 namespace Util.Applications; 
 
@@ -31,12 +29,12 @@ public interface ICrudService<TDto, in TCreateRequest, in TUpdateRequest, in TQu
     /// 创建
     /// </summary>
     /// <param name="request">创建参数</param>
-    Task<string> CreateAsync( [NotNull] [Valid] TCreateRequest request );
+    Task<string> CreateAsync( TCreateRequest request );
     /// <summary>
     /// 修改
     /// </summary>
     /// <param name="request">修改参数</param>
-    Task UpdateAsync( [NotNull] [Valid] TUpdateRequest request );
+    Task UpdateAsync( TUpdateRequest request );
     /// <summary>
     /// 删除
     /// </summary>

diff --git a/src/Util.Application/Trees/ITreeService.cs b/src/Util.Application/Trees/ITreeService.cs
@@ -1,7 +1,5 @@
-using Util.Aop;
-using Util.Applications.Dtos;
+using Util.Applications.Dtos;
 using Util.Data.Trees;
-using Util.Validation;
 
 namespace Util.Applications.Trees; 
 
@@ -31,12 +29,12 @@ public interface ITreeService<TDto, in TCreateRequest, in TUpdateRequest, in TQu
     /// 创建
     /// </summary>
     /// <param name="request">创建参数</param>
-    Task<string> CreateAsync( [NotNull][Valid] TCreateRequest request );
+    Task<string> CreateAsync( TCreateRequest request );
     /// <summary>
     /// 修改
     /// </summary>
     /// <param name="request">修改参数</param>
-    Task UpdateAsync( [NotNull][Valid] TUpdateRequest request );
+    Task UpdateAsync( TUpdateRequest request );
     /// <summary>
     /// 删除
     /// </summary>