Skip to content

Commit

Permalink
Merge pull request #102 from EasyAbp/abp8.1
Browse files Browse the repository at this point in the history
Upgrade to ABP 8.1.0
  • Loading branch information
gdlcf88 authored Apr 14, 2024
2 parents f2d7d63 + 88cefb4 commit 51dcfe0
Show file tree
Hide file tree
Showing 380 changed files with 58,784 additions and 60,964 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion common.props
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -33,7 +34,7 @@ public 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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,7 +44,7 @@ public 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);

Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down
Loading

0 comments on commit 51dcfe0

Please sign in to comment.