From 6374d4fe0ba9795642b12bd109aff631fd5a0730 Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Tue, 25 Jul 2023 02:36:26 +0800
Subject: [PATCH] Upgrade to ABP 7.3.0

---
 Directory.Build.props                         |  6 ++---
 common.props                                  |  2 +-
 ...ChatManagement.Common.Domain.Shared.csproj |  1 +
 ...eChatManagementCommonDomainSharedModule.cs |  6 +++--
 ...ChatManagement.Common.MongoDB.Tests.csproj |  5 +++-
 .../MongoDB/CommonMongoDbTestModule.cs        |  7 +-----
 .../MongoDB/MongoDbFixture.cs                 | 23 +++++++++++++++----
 .../WeChatMiniProgramTokenExtensionGrant.cs   |  6 ++---
 ...nagement.MiniPrograms.Domain.Shared.csproj |  1 +
 ...anagementMiniProgramsDomainSharedModule.cs |  2 ++
 ...nagement.MiniPrograms.MongoDB.Tests.csproj |  5 +++-
 .../MongoDB/MongoDbFixture.cs                 | 23 +++++++++++++++----
 ...ManagementMiniProgramsMongoDbTestModule.cs |  6 +----
 ...t.ThirdPartyPlatforms.Domain.Shared.csproj |  1 +
 ...ntThirdPartyPlatformsDomainSharedModule.cs |  4 +++-
 ...t.ThirdPartyPlatforms.MongoDB.Tests.csproj |  5 +++-
 .../MongoDB/MongoDbFixture.cs                 | 23 +++++++++++++++----
 .../ThirdPartyPlatformsMongoDbTestModule.cs   |  7 +-----
 .../WeChatManagementSample.Web.Ids4.csproj    |  2 +-
 .../package.json                              |  2 +-
 .../WeChatManagementSample.Web.Ids4/yarn.lock |  8 +++----
 ...ChatManagementSample.Web.OpenIddict.csproj |  2 +-
 .../package.json                              |  2 +-
 .../yarn.lock                                 |  8 +++----
 24 files changed, 100 insertions(+), 57 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 54052c60..0cee818a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>7.2.1</AbpVersion>
-    <EasyAbpAbpTagHelperPlusModuleVersion>1.5.0</EasyAbpAbpTagHelperPlusModuleVersion>
-    <EasyAbpAbpWeChatModuleVersion>2.5.0</EasyAbpAbpWeChatModuleVersion>
+    <AbpVersion>7.3.0</AbpVersion>
+    <EasyAbpAbpTagHelperPlusModuleVersion>1.6.0</EasyAbpAbpTagHelperPlusModuleVersion>
+    <EasyAbpAbpWeChatModuleVersion>2.7.0</EasyAbpAbpWeChatModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
index 3ba9776d..c700f384 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.3.0</Version>
+    <Version>2.4.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp.WeChatManagement.Common.Domain.Shared.csproj b/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp.WeChatManagement.Common.Domain.Shared.csproj
index eb9eb398..47121be0 100644
--- a/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp.WeChatManagement.Common.Domain.Shared.csproj
+++ b/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp.WeChatManagement.Common.Domain.Shared.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Validation" Version="$(AbpVersion)" />
   </ItemGroup>
 
diff --git a/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp/WeChatManagement/Common/WeChatManagementCommonDomainSharedModule.cs b/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp/WeChatManagement/Common/WeChatManagementCommonDomainSharedModule.cs
index 8ebb1703..5816e931 100644
--- a/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp/WeChatManagement/Common/WeChatManagementCommonDomainSharedModule.cs
+++ b/modules/Common/src/EasyAbp.WeChatManagement.Common.Domain.Shared/EasyAbp/WeChatManagement/Common/WeChatManagementCommonDomainSharedModule.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Domain;
+using Volo.Abp.Modularity;
 using Volo.Abp.Localization;
 using EasyAbp.WeChatManagement.Common.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
@@ -9,7 +10,8 @@
 namespace EasyAbp.WeChatManagement.Common
 {
     [DependsOn(
-        typeof(AbpValidationModule)
+        typeof(AbpValidationModule),
+        typeof(AbpDddDomainSharedModule)
     )]
     public class WeChatManagementCommonDomainSharedModule : AbpModule
     {
diff --git a/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/EasyAbp.WeChatManagement.Common.MongoDB.Tests.csproj b/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/EasyAbp.WeChatManagement.Common.MongoDB.Tests.csproj
index 5d7f5812..2a733e2b 100644
--- a/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/EasyAbp.WeChatManagement.Common.MongoDB.Tests.csproj
+++ b/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/EasyAbp.WeChatManagement.Common.MongoDB.Tests.csproj
@@ -7,7 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Mongo2Go" Version="3.1.3" />
+    <PackageReference Include="EphemeralMongo.Core" Version="1.1.0" />
+    <PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
+    <PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
+    <PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
     <ProjectReference Include="..\..\src\EasyAbp.WeChatManagement.Common.MongoDB\EasyAbp.WeChatManagement.Common.MongoDB.csproj" />
     <ProjectReference Include="..\EasyAbp.WeChatManagement.Common.TestBase\EasyAbp.WeChatManagement.Common.TestBase.csproj" />
   </ItemGroup>
diff --git a/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/CommonMongoDbTestModule.cs b/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/CommonMongoDbTestModule.cs
index 1639d286..b8bc87f5 100644
--- a/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/CommonMongoDbTestModule.cs
+++ b/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/CommonMongoDbTestModule.cs
@@ -13,14 +13,9 @@ public class CommonMongoDbTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var stringArray = MongoDbFixture.ConnectionString.Split('?');
-            var connectionString = stringArray[0].EnsureEndsWith('/')  +
-                                       "Db_" +
-                                   Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
-
             Configure<AbpDbConnectionOptions>(options =>
             {
-                options.ConnectionStrings.Default = connectionString;
+                options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString();
             });
         }
     }
diff --git a/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index fab2cf6a..0d00c36e 100644
--- a/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/modules/Common/test/EasyAbp.WeChatManagement.Common.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,17 +1,30 @@
 using System;
-using Mongo2Go;
+using EphemeralMongo;
 
 namespace EasyAbp.WeChatManagement.Common.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner;
-        public static readonly string ConnectionString;
+        public readonly static IMongoRunner MongoDbRunner;
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 20);
-            ConnectionString = MongoDbRunner.ConnectionString;
+            MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions
+            {
+                UseSingleNodeReplicaSet = true
+            });
+        }
+
+        public static string GetRandomConnectionString()
+        {
+            return GetConnectionString("Db_" + Guid.NewGuid().ToString("N"));
+        }
+
+        public static string GetConnectionString(string databaseName)
+        {
+            var stringArray = MongoDbRunner.ConnectionString.Split('?');
+            var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1];
+            return connectionString;
         }
 
         public void Dispose()
diff --git a/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.OpenIddict/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramTokenExtensionGrant.cs b/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.OpenIddict/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramTokenExtensionGrant.cs
index cf60249d..7590ca28 100644
--- a/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.OpenIddict/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramTokenExtensionGrant.cs
+++ b/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.OpenIddict/EasyAbp/WeChatManagement/MiniPrograms/WeChatMiniProgramTokenExtensionGrant.cs
@@ -32,8 +32,8 @@ public virtual async Task<IActionResult> HandleAsync(ExtensionGrantContext conte
             var identityUserManager = context.HttpContext.RequestServices.GetRequiredService<IdentityUserManager>();
             var signInManager = context.HttpContext.RequestServices.GetRequiredService<SignInManager<IdentityUser>>();
             var scopeManager = context.HttpContext.RequestServices.GetRequiredService<IOpenIddictScopeManager>();
-            var openIddictClaimDestinationsManager = context.HttpContext.RequestServices
-                .GetRequiredService<AbpOpenIddictClaimDestinationsManager>();
+            var abpOpenIddictClaimsPrincipalManager = context.HttpContext.RequestServices
+                .GetRequiredService<AbpOpenIddictClaimsPrincipalManager>();
             var identitySecurityLogManager =
                 context.HttpContext.RequestServices.GetRequiredService<IdentitySecurityLogManager>();
 
@@ -96,7 +96,7 @@ public virtual async Task<IActionResult> HandleAsync(ExtensionGrantContext conte
             principal.SetResources(await GetResourcesAsync(context.Request.GetScopes(), scopeManager));
             principal.SetClaim(WeChatMiniProgramConsts.AppIdClaim, appId); // 记录 appid
 
-            await openIddictClaimDestinationsManager.SetAsync(principal);
+            await abpOpenIddictClaimsPrincipalManager.HandleAsync(context.Request, principal);
 
             await identitySecurityLogManager.SaveAsync(
                 new IdentitySecurityLogContext
diff --git a/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared.csproj b/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared.csproj
index ffb0eac5..e7fa5a8e 100644
--- a/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared.csproj
+++ b/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Validation" Version="$(AbpVersion)" />
   </ItemGroup>
 
diff --git a/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp/WeChatManagement/MiniPrograms/WeChatManagementMiniProgramsDomainSharedModule.cs b/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp/WeChatManagement/MiniPrograms/WeChatManagementMiniProgramsDomainSharedModule.cs
index adeac193..0286d59a 100644
--- a/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp/WeChatManagement/MiniPrograms/WeChatManagementMiniProgramsDomainSharedModule.cs
+++ b/modules/MiniPrograms/src/EasyAbp.WeChatManagement.MiniPrograms.Domain.Shared/EasyAbp/WeChatManagement/MiniPrograms/WeChatManagementMiniProgramsDomainSharedModule.cs
@@ -1,5 +1,6 @@
 using EasyAbp.WeChatManagement.Common;
 using EasyAbp.WeChatManagement.Common.Localization;
+using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
 using Volo.Abp.Localization;
 using EasyAbp.WeChatManagement.MiniPrograms.Localization;
@@ -12,6 +13,7 @@ namespace EasyAbp.WeChatManagement.MiniPrograms
 {
     [DependsOn(
         typeof(AbpValidationModule),
+        typeof(AbpDddDomainSharedModule),
         typeof(WeChatManagementCommonDomainSharedModule)
     )]
     public class WeChatManagementMiniProgramsDomainSharedModule : AbpModule
diff --git a/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests.csproj b/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests.csproj
index 1c23875b..8846ada1 100644
--- a/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests.csproj
+++ b/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests.csproj
@@ -7,7 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Mongo2Go" Version="3.1.3" />
+    <PackageReference Include="EphemeralMongo.Core" Version="1.1.0" />
+    <PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
+    <PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
+    <PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
     <ProjectReference Include="..\..\src\EasyAbp.WeChatManagement.MiniPrograms.MongoDB\EasyAbp.WeChatManagement.MiniPrograms.MongoDB.csproj" />
     <ProjectReference Include="..\EasyAbp.WeChatManagement.MiniPrograms.TestBase\EasyAbp.WeChatManagement.MiniPrograms.TestBase.csproj" />
   </ItemGroup>
diff --git a/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index 718bc4a9..a8f5d087 100644
--- a/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,17 +1,30 @@
 using System;
-using Mongo2Go;
+using EphemeralMongo;
 
 namespace EasyAbp.WeChatManagement.MiniPrograms.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner;
-        public static readonly string ConnectionString;
+        public readonly static IMongoRunner MongoDbRunner;
 
         static MongoDbFixture()
         {
-            MongoDbRunner = MongoDbRunner.Start();
-            ConnectionString = MongoDbRunner.ConnectionString;
+            MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions
+            {
+                UseSingleNodeReplicaSet = true
+            });
+        }
+
+        public static string GetRandomConnectionString()
+        {
+            return GetConnectionString("Db_" + Guid.NewGuid().ToString("N"));
+        }
+
+        public static string GetConnectionString(string databaseName)
+        {
+            var stringArray = MongoDbRunner.ConnectionString.Split('?');
+            var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1];
+            return connectionString;
         }
 
         public void Dispose()
diff --git a/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/WeChatManagementMiniProgramsMongoDbTestModule.cs b/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/WeChatManagementMiniProgramsMongoDbTestModule.cs
index cb0be02a..11389289 100644
--- a/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/WeChatManagementMiniProgramsMongoDbTestModule.cs
+++ b/modules/MiniPrograms/test/EasyAbp.WeChatManagement.MiniPrograms.MongoDB.Tests/MongoDB/WeChatManagementMiniProgramsMongoDbTestModule.cs
@@ -12,13 +12,9 @@ public class WeChatManagementMiniProgramsMongoDbTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
-                                   "Db_" +
-                                    Guid.NewGuid().ToString("N");
-
             Configure<AbpDbConnectionOptions>(options =>
             {
-                options.ConnectionStrings.Default = connectionString;
+                options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString();
             });
         }
     }
diff --git a/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared.csproj b/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared.csproj
index 5016265f..c1f07aa9 100644
--- a/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared.csproj
+++ b/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Validation" Version="$(AbpVersion)" />
   </ItemGroup>
 
diff --git a/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp/WeChatManagement/ThirdPartyPlatforms/WeChatManagementThirdPartyPlatformsDomainSharedModule.cs b/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp/WeChatManagement/ThirdPartyPlatforms/WeChatManagementThirdPartyPlatformsDomainSharedModule.cs
index 11192151..754fb7a6 100644
--- a/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp/WeChatManagement/ThirdPartyPlatforms/WeChatManagementThirdPartyPlatformsDomainSharedModule.cs
+++ b/modules/ThirdPartyPlatforms/src/EasyAbp.WeChatManagement.ThirdPartyPlatforms.Domain.Shared/EasyAbp/WeChatManagement/ThirdPartyPlatforms/WeChatManagementThirdPartyPlatformsDomainSharedModule.cs
@@ -1,4 +1,5 @@
 using EasyAbp.WeChatManagement.Common;
+using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
 using Volo.Abp.Localization;
 using EasyAbp.WeChatManagement.ThirdPartyPlatforms.Localization;
@@ -11,7 +12,8 @@ namespace EasyAbp.WeChatManagement.ThirdPartyPlatforms;
 
 [DependsOn(
     typeof(WeChatManagementCommonDomainSharedModule),
-    typeof(AbpValidationModule)
+    typeof(AbpValidationModule),
+    typeof(AbpDddDomainSharedModule)
 )]
 public class WeChatManagementThirdPartyPlatformsDomainSharedModule : AbpModule
 {
diff --git a/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests.csproj b/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests.csproj
index fc44ec73..9ac31e22 100644
--- a/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests.csproj
+++ b/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests.csproj
@@ -7,7 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Mongo2Go" Version="3.1.3" />
+    <PackageReference Include="EphemeralMongo.Core" Version="1.1.0" />
+    <PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
+    <PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
+    <PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
     <ProjectReference Include="..\..\src\EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB\EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.csproj" />
     <ProjectReference Include="..\EasyAbp.WeChatManagement.ThirdPartyPlatforms.TestBase\EasyAbp.WeChatManagement.ThirdPartyPlatforms.TestBase.csproj" />
   </ItemGroup>
diff --git a/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/MongoDbFixture.cs
index 45973dea..648dfced 100644
--- a/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/MongoDbFixture.cs
+++ b/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -1,17 +1,30 @@
 using System;
-using Mongo2Go;
+using EphemeralMongo;
 
 namespace EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB;
 
 public class MongoDbFixture : IDisposable
 {
-    private static readonly MongoDbRunner MongoDbRunner;
-    public static readonly string ConnectionString;
+    public readonly static IMongoRunner MongoDbRunner;
 
     static MongoDbFixture()
     {
-        MongoDbRunner = MongoDbRunner.Start(singleNodeReplSet: true, singleNodeReplSetWaitTimeout: 20);
-        ConnectionString = MongoDbRunner.ConnectionString;
+        MongoDbRunner = MongoRunner.Run(new MongoRunnerOptions
+        {
+            UseSingleNodeReplicaSet = true
+        });
+    }
+
+    public static string GetRandomConnectionString()
+    {
+        return GetConnectionString("Db_" + Guid.NewGuid().ToString("N"));
+    }
+
+    public static string GetConnectionString(string databaseName)
+    {
+        var stringArray = MongoDbRunner.ConnectionString.Split('?');
+        var connectionString = stringArray[0].EnsureEndsWith('/') + databaseName + "/?" + stringArray[1];
+        return connectionString;
     }
 
     public void Dispose()
diff --git a/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/ThirdPartyPlatformsMongoDbTestModule.cs b/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/ThirdPartyPlatformsMongoDbTestModule.cs
index 014dd56d..1c209b96 100644
--- a/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/ThirdPartyPlatformsMongoDbTestModule.cs
+++ b/modules/ThirdPartyPlatforms/test/EasyAbp.WeChatManagement.ThirdPartyPlatforms.MongoDB.Tests/MongoDB/ThirdPartyPlatformsMongoDbTestModule.cs
@@ -13,14 +13,9 @@ public class ThirdPartyPlatformsMongoDbTestModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        var stringArray = MongoDbFixture.ConnectionString.Split('?');
-        var connectionString = stringArray[0].EnsureEndsWith('/') +
-                                   "Db_" +
-                               Guid.NewGuid().ToString("N") + "/?" + stringArray[1];
-
         Configure<AbpDbConnectionOptions>(options =>
         {
-            options.ConnectionStrings.Default = connectionString;
+            options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString();
         });
     }
 }
diff --git a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/WeChatManagementSample.Web.Ids4.csproj b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/WeChatManagementSample.Web.Ids4.csproj
index 616479f3..1d7e7a56 100644
--- a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/WeChatManagementSample.Web.Ids4.csproj
+++ b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/WeChatManagementSample.Web.Ids4.csproj
@@ -41,7 +41,7 @@
     <ProjectReference Include="..\WeChatManagementSample.HttpApi\WeChatManagementSample.HttpApi.csproj" />
     <ProjectReference Include="..\WeChatManagementSample.EntityFrameworkCore\WeChatManagementSample.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\MiniPrograms\src\EasyAbp.WeChatManagement.MiniPrograms.Web\EasyAbp.WeChatManagement.MiniPrograms.Web.csproj" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.2.*-*" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.3.*-*" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
diff --git a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/package.json b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/package.json
index 330a0b36..24d9c858 100644
--- a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/package.json
+++ b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0"
   }
 }
\ No newline at end of file
diff --git a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/yarn.lock b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/yarn.lock
index b74ede02..fa65a449 100644
--- a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/yarn.lock
+++ b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.Ids4/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1":
-  version "2.2.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628"
-  integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g==
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0":
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be"
+  integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"
 
diff --git a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/WeChatManagementSample.Web.OpenIddict.csproj b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/WeChatManagementSample.Web.OpenIddict.csproj
index 0688340a..e09b7211 100644
--- a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/WeChatManagementSample.Web.OpenIddict.csproj
+++ b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/WeChatManagementSample.Web.OpenIddict.csproj
@@ -42,7 +42,7 @@
     <ProjectReference Include="..\WeChatManagementSample.HttpApi\WeChatManagementSample.HttpApi.csproj" />
     <ProjectReference Include="..\WeChatManagementSample.EntityFrameworkCore\WeChatManagementSample.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\MiniPrograms\src\EasyAbp.WeChatManagement.MiniPrograms.Web\EasyAbp.WeChatManagement.MiniPrograms.Web.csproj" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.2.*-*" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.3.*-*" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.Web" Version="$(AbpVersion)" />
diff --git a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/package.json b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/package.json
index 330a0b36..24d9c858 100644
--- a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/package.json
+++ b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0"
   }
 }
\ No newline at end of file
diff --git a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/yarn.lock b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/yarn.lock
index b74ede02..fa65a449 100644
--- a/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/yarn.lock
+++ b/samples/WeChatManagementSample/aspnet-core/src/WeChatManagementSample.Web.OpenIddict/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1":
-  version "2.2.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628"
-  integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g==
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0":
+  version "2.3.0"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be"
+  integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"