use netcorepal v2.2.0

netcorepal · Jan 15, 2025 · 33ce59a · 33ce59a
1 parent 45a7f7c
commit 33ce59a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/template/Directory.Build.targets b/template/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <NetCorePalVersion>2.1.0</NetCorePalVersion>
+    <NetCorePalVersion>2.2.0</NetCorePalVersion>
     <FrameworkVersion>9.0.0</FrameworkVersion>
     <ExtensionsVersion>9.0.0</ExtensionsVersion>
     <EntityFrameworkVersion>9.0.0</EntityFrameworkVersion>

diff --git a/template/src/ABC.Template.Domain/AggregatesModel/OrderAggregate/Order.cs b/template/src/ABC.Template.Domain/AggregatesModel/OrderAggregate/Order.cs
@@ -16,7 +16,9 @@ public partial class Order : Entity<OrderId>, IAggregateRoot
         /// <summary>
         /// 受保护的默认构造函数，用以作为EF Core的反射入口
         /// </summary>
-        protected Order() { }
+        protected Order()
+        {
+        }
 
         public Order(string name, int count)
         {
@@ -31,6 +33,10 @@ public Order(string name, int count)
 
         public int Count { get; private set; }
 
+        public RowVersion RowVersion { get; private set; } = new RowVersion();
+
+        public UpdateTime UpdateTime { get; private set; } = new UpdateTime(DateTimeOffset.UtcNow);
+
         public void OrderPaid()
         {
             if (Paid)
@@ -44,4 +50,4 @@ public void OrderPaid()
             }
         }
     }
-}
+}
diff --git a/template/src/ABC.Template.Web/Program.cs b/template/src/ABC.Template.Web/Program.cs
@@ -62,10 +62,7 @@
 
     #region Controller
 
-    builder.Services.AddControllers().AddJsonOptions(options =>
-    {
-        options.JsonSerializerOptions.Converters.Add(new EntityIdJsonConverterFactory());
-    });
+    builder.Services.AddControllers().AddNetCorePalSystemTextJson();
     // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
     builder.Services.AddEndpointsApiExplorer();
     builder.Services.AddSwaggerGen(c => c.AddEntityIdSchemaMap()); //强类型id swagger schema 映射

diff --git a/template/test/ABC.Template.Web.Tests/DemoTests.cs b/template/test/ABC.Template.Web.Tests/DemoTests.cs
@@ -30,9 +30,9 @@ public DemoTests(MyWebApplicationFactory factory)
 
 
         [Fact]
-        public void HealthCheckTest()
+        public async Task HealthCheckTest()
         {
-            var response = _client.GetAsync("/health").Result;
+            var response = await _client.GetAsync("/health");
             Assert.True(response.IsSuccessStatusCode);
         }