fix: 修复工作单元传递审计信息问题

Author: jianxuanbing

framework/src/Bing.Datas.EntityFramework/Core/UnitOfWorkBase.cs

@@ -452,8 +452,8 @@ protected virtual void SaveChangesBefore()
         /// <param name="entry">输入实体</param>
         protected virtual void ApplyInterceptForAddedEntity(EntityEntry entry)
         {
-            AuditPropertySetter?.SetCreationProperties(entry);
-            AuditPropertySetter?.SetModificationProperties(entry);
+            AuditPropertySetter?.SetCreationProperties(entry.Entity);
+            AuditPropertySetter?.SetModificationProperties(entry.Entity);
             //SetCreationAudited(entry);
             //SetModificationAudited(entry);
             SetVersion(entry);
@@ -469,7 +469,7 @@ protected virtual void ApplyInterceptForAddedEntity(EntityEntry entry)
         /// <param name="entry">输入实体</param>
         protected virtual void ApplyInterceptForModifiedEntity(EntityEntry entry)
         {
-            AuditPropertySetter?.SetModificationProperties(entry);
+            AuditPropertySetter?.SetModificationProperties(entry.Entity);
             //SetModificationAudited(entry);
             SetVersion(entry);
         }
@@ -484,8 +484,8 @@ protected virtual void ApplyInterceptForModifiedEntity(EntityEntry entry)
         /// <param name="entry">输入实体</param>
         protected virtual void ApplyInterceptForDeletedEntity(EntityEntry entry)
         {
-            AuditPropertySetter?.SetDeletionProperties(entry);
-            AuditPropertySetter?.SetModificationProperties(entry);
+            AuditPropertySetter?.SetDeletionProperties(entry.Entity);
+            AuditPropertySetter?.SetModificationProperties(entry.Entity);
             SetVersion(entry);
             //SetModificationAudited(entry);
         }

modules/admin/src/Bing.Admin/Apis/TestController.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Bing.Admin.Data;
 using Bing.Admin.Service.Abstractions;
 using Bing.Admin.Systems.Domain.Events;
@@ -165,5 +166,34 @@ public Task<IActionResult> TestLoggerAsync(string text)
                 .LogWarning();
             return Task.FromResult(Success());
         }
+
+        /// <summary>
+        /// 测试GUID
+        /// </summary>
+        /// <param name="id"></param>
+        [AllowAnonymous]
+        [HttpGet("testGuid")]
+        public IActionResult TestGuid(Guid id)
+        {
+            return Success(id);
+        }
+
+        /// <summary>
+        /// 测试 GUID 模型
+        /// </summary>
+        /// <param name="request"></param>
+        [AllowAnonymous]
+        [HttpGet("testGuidModel")]
+        public IActionResult TestGuidModel([FromQuery] TestNullableGuidRequest request)
+        {
+            return Success(request.TestId);
+        }
+
+        public class TestNullableGuidRequest
+        {
+            public Guid? TestId { get; set; }
+
+            public Guid? TestId2 { get; set; }
+        }
     }
 }

modules/admin/src/Bing.Admin/Bing.Admin.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RootNamespace>Bing.Admin</RootNamespace>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

modules/admin/src/Bing.Admin/Modules/AppModule.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Globalization;
 using System.Text;
 using AspectCore.Configuration;
 using Bing.AspNetCore;
@@ -14,6 +15,7 @@
 using Bing.Tracing;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Authorization;
@@ -49,6 +51,8 @@ public override IServiceCollection AddServices(IServiceCollection services)
                     o.Filters.Add<ResultHandlerAttribute>();
                     o.Filters.Add<BingExceptionFilter>();
                     o.Conventions.Add(new AuthorizeControllerModelConvention());
+                    o.ModelBindingMessageProvider
+                        .SetNonPropertyAttemptedValueIsInvalidAccessor((x) => $"'{x}' 是不合法的参数");
                 })
                 .AddControllersAsServices()// 解决属性注入无法在控制器中注入的问题
                 .AddNewtonsoftJson(options =>

modules/admin/src/Bing.Admin/Modules/SwaggerModule.cs

@@ -99,6 +99,7 @@ public override void UseModule(IApplicationBuilder app)
                 {
                     UseSwaggerUI(config);
                     config.UseDefaultSwaggerUI();
+                    config.EnableValidator(null);
                     config.UseTokenStorage("oauth2");
                 };
             });