Merge pull request #24 from netcorepal/v2

use v2.x
netcorepal · Nov 26, 2024 · 1109720 · 1109720
2 parents 7432491 + ef9e213
commit 1109720
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/template/Directory.Build.targets b/template/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <NetCorePalVersion>2.0.0-preview.1.2411120955</NetCorePalVersion>
+    <NetCorePalVersion>2.0.0-preview.1.2411260738</NetCorePalVersion>
     <FrameworkVersion>8.0.0</FrameworkVersion>
     <ExtensionsVersion>8.0.0</ExtensionsVersion>
     <EntityFrameworkVersion>8.0.0</EntityFrameworkVersion>

diff --git a/template/src/ABC.Template.Web/Program.cs b/template/src/ABC.Template.Web/Program.cs
@@ -16,8 +16,7 @@
 using Serilog.Formatting.Json;
 using Hangfire;
 using Hangfire.Redis.StackExchange;
-using NetCorePal.Extensions.AspNetCore.Json;
-using NetCorePal.Extensions.MultiEnv;
+using NetCorePal.Extensions.NewtonsoftJson;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Refit;
@@ -122,15 +121,15 @@
     builder.Services.AddUnitOfWork<ApplicationDbContext>();
     builder.Services.AddMySqlTransactionHandler();
     builder.Services.AddRedisLocks();
-    //配置多环境Options
-    builder.Services.Configure<EnvOptions>(envOptions => builder.Configuration.GetSection("Env").Bind(envOptions));
     builder.Services.AddContext().AddEnvContext().AddCapContextProcessor();
     builder.Services.AddNetCorePalServiceDiscoveryClient();
     builder.Services.AddIntegrationEventServices(typeof(Program))
         .AddIIntegrationEventConverter(typeof(Program))
         .UseCap(typeof(Program))
-        .AddContextIntegrationFilters()
-        .AddEnvIntegrationFilters(envOption => envOption.ServiceName = "Abc.Template");
+        .AddContextIntegrationFilters();
+    builder.Services.AddMultiEnv(envOption => envOption.ServiceName = "Abc.Template")
+        .AddEnvIntegrationFilters()
+        .AddEnvServiceSelector();
     builder.Services.AddCap(x =>
     {
         x.JsonSerializerOptions.Converters.Add(new EntityIdJsonConverterFactory());

diff --git a/template/src/ABC.Template.Web/appsettings.json b/template/src/ABC.Template.Web/appsettings.json
@@ -15,6 +15,7 @@
     "HostName": "localhost",
     "UserName": "guest",
     "Password": "guest",
-    "VirtualHost": "/"
+    "VirtualHost": "/",
+    "Port": 5672
   }
 }
diff --git a/template/test/ABC.Template.Web.Tests/Extensions/MyWebApplicationFactory.cs b/template/test/ABC.Template.Web.Tests/Extensions/MyWebApplicationFactory.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.Hosting;
-using NetCorePal.Extensions.AspNetCore.Json;
 
 namespace ABC.Template.Web.Tests.Extensions;
 

diff --git a/template/test/ABC.Template.Web.Tests/ProgramTests.cs b/template/test/ABC.Template.Web.Tests/ProgramTests.cs
@@ -1,6 +1,5 @@
 using System.Net.Http.Json;
 using Microsoft.AspNetCore.Mvc.Testing;
-using NetCorePal.Extensions.AspNetCore.Json;
 using Xunit;
 
 namespace ABC.Template.Web.Tests