diff --git a/Directory.Build.props b/Directory.Build.props index 3173ec4..ea9cae4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,9 @@ - 7.2.1 - 2.2.0 - 2.5.0 + 7.3.0 + 2.3.0 + 2.7.0 diff --git a/common.props b/common.props index 0f01b26..f01f6c8 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 2.2.0 + 2.3.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj b/host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj index 01f0581..83f30bd 100644 --- a/host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj +++ b/host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/host/EasyAbp.NotificationService.IdentityServer/package.json b/host/EasyAbp.NotificationService.IdentityServer/package.json index 12d4d4e..1dfe228 100644 --- a/host/EasyAbp.NotificationService.IdentityServer/package.json +++ b/host/EasyAbp.NotificationService.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "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/host/EasyAbp.NotificationService.IdentityServer/yarn.lock b/host/EasyAbp.NotificationService.IdentityServer/yarn.lock index 1b59bdd..c19ecc1 100644 --- a/host/EasyAbp.NotificationService.IdentityServer/yarn.lock +++ b/host/EasyAbp.NotificationService.IdentityServer/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/host/EasyAbp.NotificationService.Web.Host/EasyAbp.NotificationService.Web.Host.csproj b/host/EasyAbp.NotificationService.Web.Host/EasyAbp.NotificationService.Web.Host.csproj index 645381b..1c20e57 100644 --- a/host/EasyAbp.NotificationService.Web.Host/EasyAbp.NotificationService.Web.Host.csproj +++ b/host/EasyAbp.NotificationService.Web.Host/EasyAbp.NotificationService.Web.Host.csproj @@ -20,7 +20,7 @@ - + diff --git a/host/EasyAbp.NotificationService.Web.Host/package.json b/host/EasyAbp.NotificationService.Web.Host/package.json index 330a0b3..24d9c85 100644 --- a/host/EasyAbp.NotificationService.Web.Host/package.json +++ b/host/EasyAbp.NotificationService.Web.Host/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/host/EasyAbp.NotificationService.Web.Host/yarn.lock b/host/EasyAbp.NotificationService.Web.Host/yarn.lock index f316e93..d707ec7 100644 --- a/host/EasyAbp.NotificationService.Web.Host/yarn.lock +++ b/host/EasyAbp.NotificationService.Web.Host/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/host/EasyAbp.NotificationService.Web.Unified/EasyAbp.NotificationService.Web.Unified.csproj b/host/EasyAbp.NotificationService.Web.Unified/EasyAbp.NotificationService.Web.Unified.csproj index 80359c9..6d31a39 100644 --- a/host/EasyAbp.NotificationService.Web.Unified/EasyAbp.NotificationService.Web.Unified.csproj +++ b/host/EasyAbp.NotificationService.Web.Unified/EasyAbp.NotificationService.Web.Unified.csproj @@ -14,7 +14,7 @@ - + diff --git a/host/EasyAbp.NotificationService.Web.Unified/package.json b/host/EasyAbp.NotificationService.Web.Unified/package.json index 330a0b3..24d9c85 100644 --- a/host/EasyAbp.NotificationService.Web.Unified/package.json +++ b/host/EasyAbp.NotificationService.Web.Unified/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/host/EasyAbp.NotificationService.Web.Unified/yarn.lock b/host/EasyAbp.NotificationService.Web.Unified/yarn.lock index 10c317a..8434fdd 100644 --- a/host/EasyAbp.NotificationService.Web.Unified/yarn.lock +++ b/host/EasyAbp.NotificationService.Web.Unified/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/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp/NotificationService/Provider/Sms/SmsNotificationTests.cs b/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp/NotificationService/Provider/Sms/SmsNotificationTests.cs index 257c8b8..a36a900 100644 --- a/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp/NotificationService/Provider/Sms/SmsNotificationTests.cs +++ b/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp/NotificationService/Provider/Sms/SmsNotificationTests.cs @@ -20,7 +20,6 @@ public class SmsNotificationTests : NotificationServiceTestBase SmsNotificationSendingJob { get; set; } @@ -28,7 +27,6 @@ public class SmsNotificationTests : NotificationServiceTestBase(); - JsonSerializer = ServiceProvider.GetRequiredService(); NotificationRepository = ServiceProvider.GetRequiredService(); NotificationInfoRepository = ServiceProvider.GetRequiredService(); SmsNotificationSendingJob = diff --git a/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj b/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj index 1064675..dc72d4a 100644 --- a/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj +++ b/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj @@ -9,8 +9,10 @@ - + + + diff --git a/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp/NotificationService/NotificationServiceDomainSharedModule.cs b/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp/NotificationService/NotificationServiceDomainSharedModule.cs index 749f16b..622bcd5 100644 --- a/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp/NotificationService/NotificationServiceDomainSharedModule.cs +++ b/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp/NotificationService/NotificationServiceDomainSharedModule.cs @@ -1,7 +1,9 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Domain; +using Volo.Abp.Modularity; using Volo.Abp.Localization; using EasyAbp.NotificationService.Localization; -using Volo.Abp.EventBus; +using Volo.Abp.EventBus.Abstractions; +using Volo.Abp.Json; using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Validation; using Volo.Abp.Validation.Localization; @@ -11,7 +13,9 @@ namespace EasyAbp.NotificationService { [DependsOn( typeof(AbpValidationModule), - typeof(AbpEventBusModule) + typeof(AbpDddDomainSharedModule), + typeof(AbpEventBusAbstractionsModule), + typeof(AbpJsonAbstractionsModule) )] public class NotificationServiceDomainSharedModule : AbpModule { diff --git a/test/EasyAbp.NotificationService.MongoDB.Tests/EasyAbp.NotificationService.MongoDB.Tests.csproj b/test/EasyAbp.NotificationService.MongoDB.Tests/EasyAbp.NotificationService.MongoDB.Tests.csproj index a3439d2..3effb21 100644 --- a/test/EasyAbp.NotificationService.MongoDB.Tests/EasyAbp.NotificationService.MongoDB.Tests.csproj +++ b/test/EasyAbp.NotificationService.MongoDB.Tests/EasyAbp.NotificationService.MongoDB.Tests.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/MongoDbFixture.cs index 10a5bcb..37888aa 100644 --- a/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/MongoDbFixture.cs +++ b/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/MongoDbFixture.cs @@ -1,17 +1,30 @@ using System; -using Mongo2Go; +using EphemeralMongo; namespace EasyAbp.NotificationService.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/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/NotificationServiceMongoDbTestModule.cs b/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/NotificationServiceMongoDbTestModule.cs index d60f9df..998017c 100644 --- a/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/NotificationServiceMongoDbTestModule.cs +++ b/test/EasyAbp.NotificationService.MongoDB.Tests/MongoDB/NotificationServiceMongoDbTestModule.cs @@ -13,18 +13,9 @@ public class NotificationServiceMongoDbTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') + - "Db_" + - Guid.NewGuid().ToString("N"); - Configure(options => { - options.ConnectionStrings.Default = connectionString; - }); - - Configure(options => - { - options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled; + options.ConnectionStrings.Default = MongoDbFixture.GetRandomConnectionString(); }); } }