Merge pull request #102 from EasyAbp/abp8.1

Upgrade to ABP 8.1.0
EasyAbp · Apr 14, 2024 · 51dcfe0 · 51dcfe0
2 parents f2d7d63 + 88cefb4
commit 51dcfe0
Show file tree

Hide file tree

Showing 380 changed files with 58,784 additions and 60,964 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>8.0.0</AbpVersion>
-    <EasyAbpAbpTagHelperPlusModuleVersion>1.8.0</EasyAbpAbpTagHelperPlusModuleVersion>
-    <EasyAbpAbpWeChatModuleVersion>2.9.0</EasyAbpAbpWeChatModuleVersion>
+    <AbpVersion>8.1.0</AbpVersion>
+    <EasyAbpAbpTagHelperPlusModuleVersion>2.1.0</EasyAbpAbpTagHelperPlusModuleVersion>
+    <EasyAbpAbpWeChatModuleVersion>3.1.0</EasyAbpAbpWeChatModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.6.0</Version>
+    <Version>3.0.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/...n/EasyAbp/WeChatManagement/ThirdPartyPlatforms/RequestHandling/EventHandlingAppService.cs b/...n/EasyAbp/WeChatManagement/ThirdPartyPlatforms/RequestHandling/EventHandlingAppService.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using EasyAbp.Abp.WeChat.Common.RequestHandling;
+using EasyAbp.Abp.WeChat.Common.RequestHandling.Dtos;
 using EasyAbp.Abp.WeChat.OpenPlatform.RequestHandling.Dtos;
 using EasyAbp.Abp.WeChat.OpenPlatform.ThirdPartyPlatform.RequestHandling;
 using Volo.Abp.Application.Services;

diff --git a/...rdPartyPlatform/EventNotification/UnauthorizedWeChatThirdPartyPlatformAuthEventHandler.cs b/...rdPartyPlatform/EventNotification/UnauthorizedWeChatThirdPartyPlatformAuthEventHandler.cs
@@ -12,9 +12,10 @@
 namespace EasyAbp.Abp.WeChat.OpenPlatform.ThirdPartyPlatform.EventNotification;
 
 public class UnauthorizedWeChatThirdPartyPlatformAuthEventHandler :
-    IWeChatThirdPartyPlatformAuthEventHandler, ITransientDependency
+    WeChatThirdPartyPlatformAuthEventHandlerBase<UnauthorizedWeChatThirdPartyPlatformAuthEventHandler>,
+    ITransientDependency
 {
-    public string InfoType => WeChatThirdPartyPlatformAuthEventInfoTypes.Unauthorized;
+    public override string InfoType => WeChatThirdPartyPlatformAuthEventInfoTypes.Unauthorized;
 
     private readonly IUnitOfWorkManager _unitOfWorkManager;
     private readonly IAuthorizerAccessTokenCache _authorizerAccessTokenCache;
@@ -33,7 +34,7 @@ public class UnauthorizedWeChatThirdPartyPlatformAuthEventHandler :
         _authorizerSecretRepository = authorizerSecretRepository;
     }
 
-    public virtual async Task<WeChatRequestHandlingResult> HandleAsync(AuthEventModel model)
+    public override async Task<WeChatRequestHandlingResult> HandleAsync(AuthEventModel model)
     {
         using var uow = _unitOfWorkManager.Begin(true);
 

diff --git a/...rtyPlatform/EventNotification/UpdateAuthorizedWeChatThirdPartyPlatformAuthEventHandler.cs b/...rtyPlatform/EventNotification/UpdateAuthorizedWeChatThirdPartyPlatformAuthEventHandler.cs
@@ -16,9 +16,10 @@
 namespace EasyAbp.Abp.WeChat.OpenPlatform.ThirdPartyPlatform.EventNotification;
 
 public class UpdateAuthorizedWeChatThirdPartyPlatformAuthEventHandler :
-    IWeChatThirdPartyPlatformAuthEventHandler, ITransientDependency
+    WeChatThirdPartyPlatformAuthEventHandlerBase<UpdateAuthorizedWeChatThirdPartyPlatformAuthEventHandler>,
+    ITransientDependency
 {
-    public string InfoType => WeChatThirdPartyPlatformAuthEventInfoTypes.UpdateAuthorized;
+    public override string InfoType => WeChatThirdPartyPlatformAuthEventInfoTypes.UpdateAuthorized;
 
     private readonly IUnitOfWorkManager _unitOfWorkManager;
     private readonly IAuthorizerAccessTokenCache _authorizerAccessTokenCache;
@@ -43,7 +44,7 @@ public class UpdateAuthorizedWeChatThirdPartyPlatformAuthEventHandler :
         _abpWeChatServiceFactory = abpWeChatServiceFactory;
     }
 
-    public virtual async Task<WeChatRequestHandlingResult> HandleAsync(AuthEventModel model)
+    public override async Task<WeChatRequestHandlingResult> HandleAsync(AuthEventModel model)
     {
         using var uow = _unitOfWorkManager.Begin(true);
 
@@ -61,7 +62,7 @@ public virtual async Task<WeChatRequestHandlingResult> HandleAsync(AuthEventMode
 
         var thirdPartyPlatformWeService =
             await _abpWeChatServiceFactory.CreateAsync<ThirdPartyPlatformWeService>(model.AppId);
-        
+
         var response = await thirdPartyPlatformWeService.QueryAuthAsync(model.AuthorizationCode);
 
         if (response.ErrorCode != 0)

diff --git a/...bp/WeChatManagement/ThirdPartyPlatforms/Controllers/WeChatThirdPartyPlatformController.cs b/...bp/WeChatManagement/ThirdPartyPlatforms/Controllers/WeChatThirdPartyPlatformController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Asp.Versioning;
 using EasyAbp.WeChatManagement.ThirdPartyPlatforms.ActionResultProviders;
 using EasyAbp.WeChatManagement.ThirdPartyPlatforms.Authorization;
 using EasyAbp.WeChatManagement.ThirdPartyPlatforms.Authorization.Dtos;

diff --git a/...i/EasyAbp/WeChatManagement/ThirdPartyPlatforms/RequestHandling/EventHandlingController.cs b/...i/EasyAbp/WeChatManagement/ThirdPartyPlatforms/RequestHandling/EventHandlingController.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using EasyAbp.Abp.WeChat.Common.RequestHandling;
+using EasyAbp.Abp.WeChat.Common.RequestHandling.Dtos;
 using EasyAbp.Abp.WeChat.OpenPlatform.RequestHandling.Dtos;
 using EasyAbp.WeChatManagement.Common;
 using Microsoft.AspNetCore.Mvc;

diff --git a/...ThirdPartyPlatforms/RequestHandling/RemoteWeChatThirdPartyPlatformEventHandlingService.cs b/...ThirdPartyPlatforms/RequestHandling/RemoteWeChatThirdPartyPlatformEventHandlingService.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using EasyAbp.Abp.WeChat.Common.RequestHandling;
+using EasyAbp.Abp.WeChat.Common.RequestHandling.Dtos;
 using EasyAbp.Abp.WeChat.OpenPlatform.RequestHandling;
 using EasyAbp.Abp.WeChat.OpenPlatform.RequestHandling.Dtos;
 using Volo.Abp.DependencyInjection;

diff --git a/...ent.ThirdPartyPlatforms.Application.Tests/RequestHandling/EventHandlingAppServiceTests.cs b/...ent.ThirdPartyPlatforms.Application.Tests/RequestHandling/EventHandlingAppServiceTests.cs
@@ -85,7 +85,7 @@ public async Task Should_Save_Verify_Ticket()
                 PostData = encryptedMsg,
                 MsgSignature = xml.Element("xml")!.Element("MsgSignature")!.Value,
                 Timestamp = TimeStamp,
-                Notice = Nonce
+                Nonce = Nonce
             }
         })).Success.ShouldBeTrue();
 
@@ -137,7 +137,7 @@ public async Task Should_Update_Refresh_Token()
                 PostData = encryptedMsg,
                 MsgSignature = xml.Element("xml")!.Element("MsgSignature")!.Value,
                 Timestamp = TimeStamp,
-                Notice = Nonce
+                Nonce = Nonce
             }
         })).Success.ShouldBeTrue();
 
@@ -187,7 +187,7 @@ public async Task Should_Delete_AuthorizerSecret_Entity()
                 PostData = encryptedMsg,
                 MsgSignature = xml.Element("xml")!.Element("MsgSignature")!.Value,
                 Timestamp = TimeStamp,
-                Notice = Nonce
+                Nonce = Nonce
             }
         })).Success.ShouldBeTrue();