From 451754bc410f7a3dbddcf62ad95f8b6ed53af085 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Fri, 20 Oct 2023 00:15:26 +0800 Subject: [PATCH] Upgrade to ABP 7.4.0 --- Directory.Build.props | 6 ++-- common.props | 2 +- ...bp.NotificationService.HttpApi.Host.csproj | 10 +++--- ....NotificationService.IdentityServer.csproj | 6 ++-- .../package.json | 2 +- .../yarn.lock | 8 ++--- ...asyAbp.NotificationService.Web.Host.csproj | 6 ++-- .../package.json | 2 +- .../yarn.lock | 8 ++--- ...Abp.NotificationService.Web.Unified.csproj | 6 ++-- .../package.json | 2 +- .../yarn.lock | 8 ++--- ...ationService.Provider.Mailing.Tests.csproj | 2 +- ...ice.Provider.PrivateMessaging.Tests.csproj | 2 +- ...ificationService.Provider.Sms.Tests.csproj | 2 +- ...rvice.Provider.WeChatOfficial.Tests.csproj | 2 +- ...cationService.Application.Contracts.csproj | 2 +- ...p.NotificationService.Domain.Shared.csproj | 4 +-- .../EasyAbp.NotificationService.Domain.csproj | 2 +- ....NotificationService.HttpApi.Client.csproj | 2 +- .../NotificationIntegrationController.cs | 33 +++++++++++++++++++ ...EasyAbp.NotificationService.MongoDB.csproj | 2 +- .../EasyAbp.NotificationService.Web.csproj | 2 +- ...onService.EntityFrameworkCore.Tests.csproj | 2 +- ...asyAbp.NotificationService.TestBase.csproj | 2 +- 25 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 src/EasyAbp.NotificationService.HttpApi/EasyAbp/NotificationService/Notifications/NotificationIntegrationController.cs diff --git a/Directory.Build.props b/Directory.Build.props index ea9cae4..069be25 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,9 @@ - 7.3.0 - 2.3.0 - 2.7.0 + 7.4.0 + 2.4.0 + 2.8.0 diff --git a/common.props b/common.props index f01f6c8..fad1377 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 2.3.0 + 2.4.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 83f30bd..5fe6de4 100644 --- a/host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj +++ b/host/EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj @@ -10,12 +10,12 @@ - + - - - - + + + + diff --git a/host/EasyAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj b/host/EasyAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj index 576520f..f8ee3e9 100644 --- a/host/EasyAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj +++ b/host/EasyAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj @@ -8,10 +8,10 @@ - + - - + + diff --git a/host/EasyAbp.NotificationService.IdentityServer/package.json b/host/EasyAbp.NotificationService.IdentityServer/package.json index 1dfe228..b3186d4 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.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ No newline at end of file diff --git a/host/EasyAbp.NotificationService.IdentityServer/yarn.lock b/host/EasyAbp.NotificationService.IdentityServer/yarn.lock index c19ecc1..11e9f4a 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.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== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1": + version "2.4.1" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c" + integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA== 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 1c20e57..c0d3424 100644 --- a/host/EasyAbp.NotificationService.Web.Host/EasyAbp.NotificationService.Web.Host.csproj +++ b/host/EasyAbp.NotificationService.Web.Host/EasyAbp.NotificationService.Web.Host.csproj @@ -10,9 +10,9 @@ - + - + @@ -20,7 +20,7 @@ - + diff --git a/host/EasyAbp.NotificationService.Web.Host/package.json b/host/EasyAbp.NotificationService.Web.Host/package.json index 24d9c85..2f90441 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.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ 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 d707ec7..229600c 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.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== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1": + version "2.4.1" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c" + integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA== 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 6d31a39..24be8b3 100644 --- a/host/EasyAbp.NotificationService.Web.Unified/EasyAbp.NotificationService.Web.Unified.csproj +++ b/host/EasyAbp.NotificationService.Web.Unified/EasyAbp.NotificationService.Web.Unified.csproj @@ -10,11 +10,11 @@ - + - + - + diff --git a/host/EasyAbp.NotificationService.Web.Unified/package.json b/host/EasyAbp.NotificationService.Web.Unified/package.json index 24d9c85..2f90441 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.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ 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 8434fdd..1e28a5d 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.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== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1": + version "2.4.1" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c" + integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/providers/Mailing/EasyAbp.NotificationService.Provider.Mailing.Tests/EasyAbp.NotificationService.Provider.Mailing.Tests.csproj b/providers/Mailing/EasyAbp.NotificationService.Provider.Mailing.Tests/EasyAbp.NotificationService.Provider.Mailing.Tests.csproj index 3678f86..ec286b4 100644 --- a/providers/Mailing/EasyAbp.NotificationService.Provider.Mailing.Tests/EasyAbp.NotificationService.Provider.Mailing.Tests.csproj +++ b/providers/Mailing/EasyAbp.NotificationService.Provider.Mailing.Tests/EasyAbp.NotificationService.Provider.Mailing.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests.csproj b/providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests.csproj index b19c49e..4ea4afb 100644 --- a/providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests.csproj +++ b/providers/PrivateMessaing/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp.NotificationService.Provider.Sms.Tests.csproj b/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp.NotificationService.Provider.Sms.Tests.csproj index e564b9e..3b53b5f 100644 --- a/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp.NotificationService.Provider.Sms.Tests.csproj +++ b/providers/Sms/EasyAbp.NotificationService.Provider.Sms.Tests/EasyAbp.NotificationService.Provider.Sms.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/providers/WeChatOfficial/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests.csproj b/providers/WeChatOfficial/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests.csproj index a7dfedc..34c0f42 100644 --- a/providers/WeChatOfficial/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests.csproj +++ b/providers/WeChatOfficial/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/EasyAbp.NotificationService.Application.Contracts/EasyAbp.NotificationService.Application.Contracts.csproj b/src/EasyAbp.NotificationService.Application.Contracts/EasyAbp.NotificationService.Application.Contracts.csproj index 5939cf1..8dc6f34 100644 --- a/src/EasyAbp.NotificationService.Application.Contracts/EasyAbp.NotificationService.Application.Contracts.csproj +++ b/src/EasyAbp.NotificationService.Application.Contracts/EasyAbp.NotificationService.Application.Contracts.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 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 dc72d4a..f6be841 100644 --- a/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj +++ b/src/EasyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 true @@ -16,7 +16,7 @@ - + diff --git a/src/EasyAbp.NotificationService.Domain/EasyAbp.NotificationService.Domain.csproj b/src/EasyAbp.NotificationService.Domain/EasyAbp.NotificationService.Domain.csproj index 1b819ad..a6c1340 100644 --- a/src/EasyAbp.NotificationService.Domain/EasyAbp.NotificationService.Domain.csproj +++ b/src/EasyAbp.NotificationService.Domain/EasyAbp.NotificationService.Domain.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.NotificationService.HttpApi.Client/EasyAbp.NotificationService.HttpApi.Client.csproj b/src/EasyAbp.NotificationService.HttpApi.Client/EasyAbp.NotificationService.HttpApi.Client.csproj index 5e23eb9..bfeea4f 100644 --- a/src/EasyAbp.NotificationService.HttpApi.Client/EasyAbp.NotificationService.HttpApi.Client.csproj +++ b/src/EasyAbp.NotificationService.HttpApi.Client/EasyAbp.NotificationService.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.NotificationService.HttpApi/EasyAbp/NotificationService/Notifications/NotificationIntegrationController.cs b/src/EasyAbp.NotificationService.HttpApi/EasyAbp/NotificationService/Notifications/NotificationIntegrationController.cs new file mode 100644 index 0000000..7acfe69 --- /dev/null +++ b/src/EasyAbp.NotificationService.HttpApi/EasyAbp/NotificationService/Notifications/NotificationIntegrationController.cs @@ -0,0 +1,33 @@ +using EasyAbp.NotificationService.Notifications.Dtos; +using Volo.Abp.Application.Dtos; +using System.Threading.Tasks; +using EasyAbp.NotificationService.IntegrationServices; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp; + +namespace EasyAbp.NotificationService.Notifications; + +[RemoteService(Name = NotificationServiceRemoteServiceConsts.RemoteServiceName)] +[Route("/integration-api/notification-service/notification")] +public class NotificationIntegrationController : NotificationServiceController, INotificationIntegrationService +{ + private readonly INotificationIntegrationService _service; + + public NotificationIntegrationController(INotificationIntegrationService service) + { + _service = service; + } + + [HttpPost] + public virtual Task> CreateAsync(CreateNotificationInfoModel input) + { + return _service.CreateAsync(input); + } + + [HttpPost] + [Route("quick-send")] + public virtual Task> QuickSendAsync(CreateNotificationInfoModel input) + { + return _service.QuickSendAsync(input); + } +} \ No newline at end of file diff --git a/src/EasyAbp.NotificationService.MongoDB/EasyAbp.NotificationService.MongoDB.csproj b/src/EasyAbp.NotificationService.MongoDB/EasyAbp.NotificationService.MongoDB.csproj index ad95dc1..7056b17 100644 --- a/src/EasyAbp.NotificationService.MongoDB/EasyAbp.NotificationService.MongoDB.csproj +++ b/src/EasyAbp.NotificationService.MongoDB/EasyAbp.NotificationService.MongoDB.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 diff --git a/src/EasyAbp.NotificationService.Web/EasyAbp.NotificationService.Web.csproj b/src/EasyAbp.NotificationService.Web/EasyAbp.NotificationService.Web.csproj index 901c6a3..33a855e 100644 --- a/src/EasyAbp.NotificationService.Web/EasyAbp.NotificationService.Web.csproj +++ b/src/EasyAbp.NotificationService.Web/EasyAbp.NotificationService.Web.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/EasyAbp.NotificationService.EntityFrameworkCore.Tests/EasyAbp.NotificationService.EntityFrameworkCore.Tests.csproj b/test/EasyAbp.NotificationService.EntityFrameworkCore.Tests/EasyAbp.NotificationService.EntityFrameworkCore.Tests.csproj index ae5c691..509b202 100644 --- a/test/EasyAbp.NotificationService.EntityFrameworkCore.Tests/EasyAbp.NotificationService.EntityFrameworkCore.Tests.csproj +++ b/test/EasyAbp.NotificationService.EntityFrameworkCore.Tests/EasyAbp.NotificationService.EntityFrameworkCore.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/EasyAbp.NotificationService.TestBase/EasyAbp.NotificationService.TestBase.csproj b/test/EasyAbp.NotificationService.TestBase/EasyAbp.NotificationService.TestBase.csproj index 2346748..0d5ed98 100644 --- a/test/EasyAbp.NotificationService.TestBase/EasyAbp.NotificationService.TestBase.csproj +++ b/test/EasyAbp.NotificationService.TestBase/EasyAbp.NotificationService.TestBase.csproj @@ -8,7 +8,7 @@ - +