Upgrade to ABP 7.4.0

EasyAbp · Oct 19, 2023 · 451754b · 451754b
1 parent c4fc562
commit 451754b
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 46 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
  <PropertyGroup>
 
- <AbpVersion>7.3.0</AbpVersion>
- <EasyAbpPrivateMessagingModuleVersion>2.3.0</EasyAbpPrivateMessagingModuleVersion>
- <EasyAbpAbpWeChatModuleVersion>2.7.0</EasyAbpAbpWeChatModuleVersion>
+ <AbpVersion>7.4.0</AbpVersion>
+ <EasyAbpPrivateMessagingModuleVersion>2.4.0</EasyAbpPrivateMessagingModuleVersion>
+ <EasyAbpAbpWeChatModuleVersion>2.8.0</EasyAbpAbpWeChatModuleVersion>
 
  </PropertyGroup>
 </Project>
diff --git 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/.../EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj b/.../EasyAbp.NotificationService.HttpApi.Host/EasyAbp.NotificationService.HttpApi.Host.csproj
@@ -10,12 +10,12 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+ <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
  <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
- <PackageReference Include="IdentityModel" Version="6.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
+ <PackageReference Include="IdentityModel" Version="6.2.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
  <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpVersion)" />

diff --git a/...yAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj b/...yAbp.NotificationService.IdentityServer/EasyAbp.NotificationService.IdentityServer.csproj
@@ -8,10 +8,10 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+ <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
  <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
  <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpVersion)" />

diff --git 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"
  }
 }
diff --git 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
@@ -10,17 +10,17 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+ <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
  <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
  <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.Http.Client.Web" Version="$(AbpVersion)" />
- <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.3.*-*" />
+ <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.4.1" />
  <PackageReference Include="Volo.Abp.Identity.Web" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.SettingManagement.Web" Version="$(AbpVersion)" />

diff --git 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"
  }
 }
diff --git 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
@@ -10,11 +10,11 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+ <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
  <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
  <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
- <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.3.*-*" />
+ <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="2.4.1" />
  <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
  <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpVersion)" />

diff --git 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"
  }
 }
diff --git 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/...nService.Provider.Mailing.Tests/EasyAbp.NotificationService.Provider.Mailing.Tests.csproj b/...nService.Provider.Mailing.Tests/EasyAbp.NotificationService.Provider.Mailing.Tests.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="NSubstitute" Version="4.3.0" />
- <PackageReference Include="Shouldly" Version="4.0.1" />
+ <PackageReference Include="Shouldly" Version="4.1.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

diff --git a/...PrivateMessaging.Tests/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests.csproj b/...PrivateMessaging.Tests/EasyAbp.NotificationService.Provider.PrivateMessaging.Tests.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="NSubstitute" Version="4.3.0" />
- <PackageReference Include="Shouldly" Version="4.0.1" />
+ <PackageReference Include="Shouldly" Version="4.1.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

diff --git a/...ificationService.Provider.Sms.Tests/EasyAbp.NotificationService.Provider.Sms.Tests.csproj b/...ificationService.Provider.Sms.Tests/EasyAbp.NotificationService.Provider.Sms.Tests.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="NSubstitute" Version="4.3.0" />
- <PackageReference Include="Shouldly" Version="4.0.1" />
+ <PackageReference Include="Shouldly" Version="4.1.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

diff --git a/...der.WeChatOfficial.Tests/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests.csproj b/...der.WeChatOfficial.Tests/EasyAbp.NotificationService.Provider.WeChatOfficial.Tests.csproj
@@ -9,7 +9,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="NSubstitute" Version="4.3.0" />
- <PackageReference Include="Shouldly" Version="4.0.1" />
+ <PackageReference Include="Shouldly" Version="4.1.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

diff --git a/...ionService.Application.Contracts/EasyAbp.NotificationService.Application.Contracts.csproj b/...ionService.Application.Contracts/EasyAbp.NotificationService.Application.Contracts.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\..\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
  <RootNamespace />
  </PropertyGroup>
 

diff --git a/...asyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj b/...asyAbp.NotificationService.Domain.Shared/EasyAbp.NotificationService.Domain.Shared.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\..\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
  <RootNamespace />
  <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
  </PropertyGroup>
@@ -16,7 +16,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+ <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/EasyAbp.NotificationService.Domain/EasyAbp.NotificationService.Domain.csproj b/src/EasyAbp.NotificationService.Domain/EasyAbp.NotificationService.Domain.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\..\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
  <RootNamespace />
  </PropertyGroup>
 

diff --git a/...yAbp.NotificationService.HttpApi.Client/EasyAbp.NotificationService.HttpApi.Client.csproj b/...yAbp.NotificationService.HttpApi.Client/EasyAbp.NotificationService.HttpApi.Client.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\..\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
  <RootNamespace />
  </PropertyGroup>
 

diff --git a/...ce.HttpApi/EasyAbp/NotificationService/Notifications/NotificationIntegrationController.cs b/...ce.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<ListResultDto<NotificationDto>> CreateAsync(CreateNotificationInfoModel input)
+ {
+ return _service.CreateAsync(input);
+ }
+
+ [HttpPost]
+ [Route("quick-send")]
+ public virtual Task<ListResultDto<NotificationDto>> QuickSendAsync(CreateNotificationInfoModel input)
+ {
+ return _service.QuickSendAsync(input);
+ }
+}
diff --git a/src/EasyAbp.NotificationService.MongoDB/EasyAbp.NotificationService.MongoDB.csproj b/src/EasyAbp.NotificationService.MongoDB/EasyAbp.NotificationService.MongoDB.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\..\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
+ <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
  <RootNamespace />
  </PropertyGroup>
 

diff --git a/src/EasyAbp.NotificationService.Web/EasyAbp.NotificationService.Web.csproj b/src/EasyAbp.NotificationService.Web/EasyAbp.NotificationService.Web.csproj
@@ -21,7 +21,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
+ <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/...ce.EntityFrameworkCore.Tests/EasyAbp.NotificationService.EntityFrameworkCore.Tests.csproj b/...ce.EntityFrameworkCore.Tests/EasyAbp.NotificationService.EntityFrameworkCore.Tests.csproj
@@ -7,7 +7,7 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
  <ProjectReference Include="..\..\src\EasyAbp.NotificationService.EntityFrameworkCore\EasyAbp.NotificationService.EntityFrameworkCore.csproj" />
  <ProjectReference Include="..\EasyAbp.NotificationService.TestBase\EasyAbp.NotificationService.TestBase.csproj" />
  <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="$(AbpVersion)" />

diff --git a/test/EasyAbp.NotificationService.TestBase/EasyAbp.NotificationService.TestBase.csproj b/test/EasyAbp.NotificationService.TestBase/EasyAbp.NotificationService.TestBase.csproj
@@ -8,7 +8,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="NSubstitute" Version="4.3.0" />
- <PackageReference Include="Shouldly" Version="4.0.1" />
+ <PackageReference Include="Shouldly" Version="4.1.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />