From e01b008b4c6a293ec8bb2f185dd30c67dadd08ca Mon Sep 17 00:00:00 2001 From: gdlcf88 <47396430@qq.com> Date: Sun, 10 May 2020 02:08:53 +0800 Subject: [PATCH] Adjustment wechat pay module folder structure --- .../common.props | 16 ++++++++++ ...nts.WeChatPay.Application.Contracts.csproj | 2 +- .../WeChatPayPermissionDefinitionProvider.cs | 0 .../Authorization/WeChatPayPermissions.cs | 0 ...entsWeChatPayApplicationContractsModule.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...Shop.Payments.WeChatPay.Application.csproj | 2 +- ...EShopPaymentsWeChatPayApplicationModule.cs | 0 .../WeChatPay}/WeChatPayAppService.cs | 0 .../WeChatPayApplicationAutoMapperProfile.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...op.Payments.WeChatPay.Domain.Shared.csproj | 6 ++-- ...ShopPaymentsWeChatPayDomainSharedModule.cs | 6 ++-- .../WeChatPay}/Localization/WeChatPay/cs.json | 0 .../WeChatPay}/Localization/WeChatPay/en.json | 0 .../WeChatPay}/Localization/WeChatPay/pl.json | 0 .../Localization/WeChatPay/pt-BR.json | 0 .../WeChatPay}/Localization/WeChatPay/sl.json | 0 .../WeChatPay}/Localization/WeChatPay/tr.json | 0 .../WeChatPay}/Localization/WeChatPay/vi.json | 0 .../Localization/WeChatPay/zh-Hans.json | 0 .../Localization/WeChatPay/zh-Hant.json | 0 .../Localization/WeChatPayResource.cs | 0 .../WeChatPay}/WeChatPayErrorCodes.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...Abp.EShop.Payments.WeChatPay.Domain.csproj | 2 +- .../WeChatPay}/ClaimPaymentOpenIdProvider.cs | 0 .../EShopPaymentsWeChatPayDomainModule.cs | 0 .../WeChatPay}/EShopWeChatPayHandler.cs | 7 +++++ .../WeChatPay}/IPaymentOpenIdProvider.cs | 0 .../SettingOptionResolveContributor.cs | 0 .../WeChatPaySettingDefinitionProvider.cs | 0 .../WeChatPay}/Settings/WeChatPaySettings.cs | 0 .../WeChatPay}/UnifiedOrderFailedException.cs | 0 .../WeChatPay}/WeChatPayDbProperties.cs | 0 .../WeChatPayPaymentServiceProvider.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...ments.WeChatPay.EntityFrameworkCore.csproj | 6 +++- ...mentsWeChatPayEntityFrameworkCoreModule.cs | 0 .../IWeChatPayDbContext.cs | 0 .../EntityFrameworkCore/WeChatPayDbContext.cs | 0 ...ChatPayDbContextModelCreatingExtensions.cs | 0 ...ChatPayModelBuilderConfigurationOptions.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...p.Payments.WeChatPay.HttpApi.Client.csproj | 2 +- ...hopPaymentsWeChatPayHttpApiClientModule.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...bp.EShop.Payments.WeChatPay.HttpApi.csproj | 2 +- .../EShopPaymentsWeChatPayHttpApiModule.cs | 0 .../WeChatPay}/WeChatPayController.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...bp.EShop.Payments.WeChatPay.MongoDB.csproj | 6 +++- .../EShopPaymentsWeChatPayMongoDbModule.cs | 0 .../MongoDB/IWeChatPayMongoDbContext.cs | 0 .../MongoDB/WeChatPayMongoDbContext.cs | 0 .../WeChatPayMongoDbContextExtensions.cs | 0 ...ayMongoModelBuilderConfigurationOptions.cs | 0 .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../EShop/Payments/WeChatPay/Index.cshtml | 7 +++++ .../Payments}/WeChatPay/Index.cshtml.cs | 2 +- .../Payments}/WeChatPay/_ViewImports.cshtml | 0 .../Pages/WeChatPay/Index.cshtml | 7 ----- ...ayments.WeChatPay.Application.Tests.csproj | 2 +- .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...hop.Payments.WeChatPay.Domain.Tests.csproj | 2 +- .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...WeChatPay.EntityFrameworkCore.Tests.csproj | 2 +- .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...atPay.HttpApi.Client.ConsoleTestApp.csproj | 2 +- ...op.Payments.WeChatPay.MongoDB.Tests.csproj | 2 +- .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ ...p.EShop.Payments.WeChatPay.TestBase.csproj | 2 +- .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../Payments/Payments/PaymentAppService.cs | 12 ++++++++ 89 files changed, 532 insertions(+), 27 deletions(-) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/{ => EasyAbp/EShop/Payments/WeChatPay}/Authorization/WeChatPayPermissionDefinitionProvider.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/{ => EasyAbp/EShop/Payments/WeChatPay}/Authorization/WeChatPayPermissions.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopPaymentsWeChatPayApplicationContractsModule.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopPaymentsWeChatPayApplicationModule.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/{ => EasyAbp/EShop/Payments/WeChatPay}/WeChatPayAppService.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/{ => EasyAbp/EShop/Payments/WeChatPay}/WeChatPayApplicationAutoMapperProfile.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopPaymentsWeChatPayDomainSharedModule.cs (82%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/cs.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/en.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/pl.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/pt-BR.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/sl.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/tr.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/vi.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/zh-Hans.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPay/zh-Hant.json (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/Localization/WeChatPayResource.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/{ => EasyAbp/EShop/Payments/WeChatPay}/WeChatPayErrorCodes.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/ClaimPaymentOpenIdProvider.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopPaymentsWeChatPayDomainModule.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopWeChatPayHandler.cs (85%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/IPaymentOpenIdProvider.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/SettingOptionResolveContributor.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/Settings/WeChatPaySettingDefinitionProvider.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/Settings/WeChatPaySettings.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/UnifiedOrderFailedException.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/WeChatPayDbProperties.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/{ => EasyAbp/EShop/Payments/WeChatPay}/WeChatPayPaymentServiceProvider.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/{ => EasyAbp/EShop/Payments/WeChatPay}/EntityFrameworkCore/EShopPaymentsWeChatPayEntityFrameworkCoreModule.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/{ => EasyAbp/EShop/Payments/WeChatPay}/EntityFrameworkCore/IWeChatPayDbContext.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/{ => EasyAbp/EShop/Payments/WeChatPay}/EntityFrameworkCore/WeChatPayDbContext.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/{ => EasyAbp/EShop/Payments/WeChatPay}/EntityFrameworkCore/WeChatPayDbContextModelCreatingExtensions.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/{ => EasyAbp/EShop/Payments/WeChatPay}/EntityFrameworkCore/WeChatPayModelBuilderConfigurationOptions.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopPaymentsWeChatPayHttpApiClientModule.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/{ => EasyAbp/EShop/Payments/WeChatPay}/EShopPaymentsWeChatPayHttpApiModule.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/{ => EasyAbp/EShop/Payments/WeChatPay}/WeChatPayController.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xsd rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/{ => EasyAbp/EShop/Payments/WeChatPay}/MongoDB/EShopPaymentsWeChatPayMongoDbModule.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/{ => EasyAbp/EShop/Payments/WeChatPay}/MongoDB/IWeChatPayMongoDbContext.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/{ => EasyAbp/EShop/Payments/WeChatPay}/MongoDB/WeChatPayMongoDbContext.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/{ => EasyAbp/EShop/Payments/WeChatPay}/MongoDB/WeChatPayMongoDbContextExtensions.cs (100%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/{ => EasyAbp/EShop/Payments/WeChatPay}/MongoDB/WeChatPayMongoModelBuilderConfigurationOptions.cs (100%) create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xsd create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xsd create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/{ => EShop/Payments}/WeChatPay/Index.cshtml.cs (58%) rename modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/{ => EShop/Payments}/WeChatPay/_ViewImports.cshtml (100%) delete mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xsd create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xsd create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xsd create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xsd create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xml create mode 100644 modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xsd diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props index 67dc21da..8a1b1708 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/common.props +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/common.props @@ -3,10 +3,26 @@ latest 0.1.5 $(NoWarn);CS1591 + true + EasyAbp Team + An abp application module group that provides basic e-shop service. + https://github.com/EasyAbp/EShop + https://github.com/EasyAbp/EShop + abp module easyabp EShop shopping shop ordering product payment store mall + EasyAbp + Apache-2.0 + + + + all + runtime; build; native; contentfiles; analyzers + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts.csproj index 29fb3379..d5fe5376 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts.csproj @@ -4,7 +4,7 @@ netstandard2.0 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/Authorization/WeChatPayPermissionDefinitionProvider.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp/EShop/Payments/WeChatPay/Authorization/WeChatPayPermissionDefinitionProvider.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/Authorization/WeChatPayPermissionDefinitionProvider.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp/EShop/Payments/WeChatPay/Authorization/WeChatPayPermissionDefinitionProvider.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/Authorization/WeChatPayPermissions.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp/EShop/Payments/WeChatPay/Authorization/WeChatPayPermissions.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/Authorization/WeChatPayPermissions.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp/EShop/Payments/WeChatPay/Authorization/WeChatPayPermissions.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EShopPaymentsWeChatPayApplicationContractsModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayApplicationContractsModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EShopPaymentsWeChatPayApplicationContractsModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayApplicationContractsModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application.Contracts/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp.EShop.Payments.WeChatPay.Application.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp.EShop.Payments.WeChatPay.Application.csproj index 1515b4d0..27916534 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp.EShop.Payments.WeChatPay.Application.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp.EShop.Payments.WeChatPay.Application.csproj @@ -4,7 +4,7 @@ netstandard2.0 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EShopPaymentsWeChatPayApplicationModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayApplicationModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EShopPaymentsWeChatPayApplicationModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayApplicationModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/WeChatPayAppService.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp/EShop/Payments/WeChatPay/WeChatPayAppService.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/WeChatPayAppService.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp/EShop/Payments/WeChatPay/WeChatPayAppService.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/WeChatPayApplicationAutoMapperProfile.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp/EShop/Payments/WeChatPay/WeChatPayApplicationAutoMapperProfile.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/WeChatPayApplicationAutoMapperProfile.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/EasyAbp/EShop/Payments/WeChatPay/WeChatPayApplicationAutoMapperProfile.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Application/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared.csproj index 4e2f6a6a..719f3169 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared.csproj @@ -4,7 +4,7 @@ netstandard2.0 - EasyAbp.EShop.Payments.WeChatPay + @@ -12,8 +12,8 @@ - - + + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EShopPaymentsWeChatPayDomainSharedModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayDomainSharedModule.cs similarity index 82% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EShopPaymentsWeChatPayDomainSharedModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayDomainSharedModule.cs index 422d760f..d531ab9a 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EShopPaymentsWeChatPayDomainSharedModule.cs +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayDomainSharedModule.cs @@ -17,7 +17,7 @@ namespace EasyAbp.EShop.Payments.WeChatPay { Configure(options => { - options.FileSets.AddEmbedded("EasyAbp.EShop.Payments.WeChatPay"); + options.FileSets.AddEmbedded(); }); Configure(options => @@ -25,12 +25,12 @@ namespace EasyAbp.EShop.Payments.WeChatPay options.Resources .Add("en") .AddBaseTypes(typeof(AbpValidationResource)) - .AddVirtualJson("/Localization/WeChatPay"); + .AddVirtualJson("/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay"); }); Configure(options => { - options.MapCodeNamespace("WeChatPay", typeof(WeChatPayResource)); + options.MapCodeNamespace("EasyAbp.EShop.Payments.WeChatPay", typeof(WeChatPayResource)); }); } } diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/cs.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/cs.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/cs.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/cs.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/en.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/en.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/en.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/en.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/pl.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/pl.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/pl.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/pl.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/pt-BR.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/pt-BR.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/pt-BR.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/pt-BR.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/sl.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/sl.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/sl.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/sl.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/tr.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/tr.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/tr.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/tr.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/vi.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/vi.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/vi.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/vi.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/zh-Hans.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/zh-Hans.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/zh-Hans.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/zh-Hans.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/zh-Hant.json b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/zh-Hant.json similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPay/zh-Hant.json rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPay/zh-Hant.json diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPayResource.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPayResource.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/Localization/WeChatPayResource.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/Localization/WeChatPayResource.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/WeChatPayErrorCodes.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/WeChatPayErrorCodes.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/WeChatPayErrorCodes.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/EasyAbp/EShop/Payments/WeChatPay/WeChatPayErrorCodes.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain.Shared/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp.EShop.Payments.WeChatPay.Domain.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp.EShop.Payments.WeChatPay.Domain.csproj index 888e4127..4ee15718 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp.EShop.Payments.WeChatPay.Domain.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp.EShop.Payments.WeChatPay.Domain.csproj @@ -4,7 +4,7 @@ netstandard2.0 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/ClaimPaymentOpenIdProvider.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/ClaimPaymentOpenIdProvider.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/ClaimPaymentOpenIdProvider.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/ClaimPaymentOpenIdProvider.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EShopPaymentsWeChatPayDomainModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayDomainModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EShopPaymentsWeChatPayDomainModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayDomainModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EShopWeChatPayHandler.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopWeChatPayHandler.cs similarity index 85% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EShopWeChatPayHandler.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopWeChatPayHandler.cs index 37784ca5..b5479583 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EShopWeChatPayHandler.cs +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/EShopWeChatPayHandler.cs @@ -3,7 +3,9 @@ using System.Threading.Tasks; using System.Xml; using EasyAbp.Abp.WeChat.Pay.Infrastructure; using EasyAbp.EShop.Payments.Payments; +using Volo.Abp.Data; using Volo.Abp.DependencyInjection; +using Volo.Abp.MultiTenancy; using Volo.Abp.Timing; namespace EasyAbp.EShop.Payments.WeChatPay @@ -11,18 +13,23 @@ namespace EasyAbp.EShop.Payments.WeChatPay public class EShopWeChatPayHandler : IWeChatPayHandler, ITransientDependency { private readonly IClock _clock; + private readonly IDataFilter _dataFilter; private readonly IPaymentRepository _paymentRepository; public EShopWeChatPayHandler( IClock clock, + IDataFilter dataFilter, IPaymentRepository paymentRepository) { _clock = clock; + _dataFilter = dataFilter; _paymentRepository = paymentRepository; } public virtual async Task HandleAsync(XmlDocument xmlDocument) { + using var disabledDataFilter = _dataFilter.Disable(); + if (xmlDocument.Attributes == null || xmlDocument.Attributes["return_code"].Value != "SUCCESS") { return; diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/IPaymentOpenIdProvider.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/IPaymentOpenIdProvider.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/IPaymentOpenIdProvider.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/IPaymentOpenIdProvider.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/SettingOptionResolveContributor.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/SettingOptionResolveContributor.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/SettingOptionResolveContributor.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/SettingOptionResolveContributor.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettingDefinitionProvider.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/Settings/WeChatPaySettingDefinitionProvider.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettingDefinitionProvider.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/Settings/WeChatPaySettingDefinitionProvider.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettings.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/Settings/WeChatPaySettings.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/Settings/WeChatPaySettings.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/Settings/WeChatPaySettings.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/UnifiedOrderFailedException.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/UnifiedOrderFailedException.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/UnifiedOrderFailedException.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/UnifiedOrderFailedException.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/WeChatPayDbProperties.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/WeChatPayDbProperties.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/WeChatPayDbProperties.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/WeChatPayDbProperties.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/WeChatPayPaymentServiceProvider.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/WeChatPayPaymentServiceProvider.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/WeChatPayPaymentServiceProvider.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/EasyAbp/EShop/Payments/WeChatPay/WeChatPayPaymentServiceProvider.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Domain/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.csproj index 5b902ea8..1bf83d04 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ netstandard2.0 - EasyAbp.EShop.Payments.WeChatPay + @@ -12,4 +12,8 @@ + + + + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/EShopPaymentsWeChatPayEntityFrameworkCoreModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/EShopPaymentsWeChatPayEntityFrameworkCoreModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/EShopPaymentsWeChatPayEntityFrameworkCoreModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/EShopPaymentsWeChatPayEntityFrameworkCoreModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/IWeChatPayDbContext.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/IWeChatPayDbContext.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/IWeChatPayDbContext.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/IWeChatPayDbContext.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/WeChatPayDbContext.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/WeChatPayDbContext.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/WeChatPayDbContext.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/WeChatPayDbContext.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/WeChatPayDbContextModelCreatingExtensions.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/WeChatPayDbContextModelCreatingExtensions.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/WeChatPayDbContextModelCreatingExtensions.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/WeChatPayDbContextModelCreatingExtensions.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/WeChatPayModelBuilderConfigurationOptions.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/WeChatPayModelBuilderConfigurationOptions.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EntityFrameworkCore/WeChatPayModelBuilderConfigurationOptions.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/EasyAbp/EShop/Payments/WeChatPay/EntityFrameworkCore/WeChatPayModelBuilderConfigurationOptions.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.csproj index 6b8236c3..95b61117 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EShopPaymentsWeChatPayHttpApiClientModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayHttpApiClientModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EShopPaymentsWeChatPayHttpApiClientModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayHttpApiClientModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp.EShop.Payments.WeChatPay.HttpApi.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp.EShop.Payments.WeChatPay.HttpApi.csproj index ff559f4f..395c3345 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp.EShop.Payments.WeChatPay.HttpApi.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp.EShop.Payments.WeChatPay.HttpApi.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EShopPaymentsWeChatPayHttpApiModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayHttpApiModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EShopPaymentsWeChatPayHttpApiModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp/EShop/Payments/WeChatPay/EShopPaymentsWeChatPayHttpApiModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/WeChatPayController.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp/EShop/Payments/WeChatPay/WeChatPayController.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/WeChatPayController.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/EasyAbp/EShop/Payments/WeChatPay/WeChatPayController.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.HttpApi/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp.EShop.Payments.WeChatPay.MongoDB.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp.EShop.Payments.WeChatPay.MongoDB.csproj index 4a4c6543..9a78b940 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp.EShop.Payments.WeChatPay.MongoDB.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp.EShop.Payments.WeChatPay.MongoDB.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + @@ -12,4 +12,8 @@ + + + + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/EShopPaymentsWeChatPayMongoDbModule.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/EShopPaymentsWeChatPayMongoDbModule.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/EShopPaymentsWeChatPayMongoDbModule.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/EShopPaymentsWeChatPayMongoDbModule.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/IWeChatPayMongoDbContext.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/IWeChatPayMongoDbContext.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/IWeChatPayMongoDbContext.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/IWeChatPayMongoDbContext.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/WeChatPayMongoDbContext.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/WeChatPayMongoDbContext.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/WeChatPayMongoDbContext.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/WeChatPayMongoDbContext.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/WeChatPayMongoDbContextExtensions.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/WeChatPayMongoDbContextExtensions.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/WeChatPayMongoDbContextExtensions.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/WeChatPayMongoDbContextExtensions.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/WeChatPayMongoModelBuilderConfigurationOptions.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/WeChatPayMongoModelBuilderConfigurationOptions.cs similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/MongoDB/WeChatPayMongoModelBuilderConfigurationOptions.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/EasyAbp/EShop/Payments/WeChatPay/MongoDB/WeChatPayMongoModelBuilderConfigurationOptions.cs diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.MongoDB/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml new file mode 100644 index 00000000..6c844ef0 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml @@ -0,0 +1,7 @@ +@page +@inherits EasyAbp.EShop.Payments.WeChatPay.Web.Pages.WeChatPayPage +@model EasyAbp.EShop.Payments.WeChatPay.Web.Pages.EShop.Payments.WeChatPay.IndexModel +@{ +} +

WeChatPay

+

A sample page for the WeChatPay module.

\ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml.cs b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml.cs similarity index 58% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml.cs rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml.cs index 82611240..790b2f88 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml.cs +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/Index.cshtml.cs @@ -1,4 +1,4 @@ -namespace EasyAbp.EShop.Payments.WeChatPay.Web.Pages.WeChatPay +namespace EasyAbp.EShop.Payments.WeChatPay.Web.Pages.EShop.Payments.WeChatPay { public class IndexModel : WeChatPayPageModel { diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/_ViewImports.cshtml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/_ViewImports.cshtml similarity index 100% rename from modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/_ViewImports.cshtml rename to modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/EShop/Payments/WeChatPay/_ViewImports.cshtml diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml b/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml deleted file mode 100644 index 44ae09cc..00000000 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/src/EasyAbp.EShop.Payments.WeChatPay.Web/Pages/WeChatPay/Index.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@page -@inherits EasyAbp.EShop.Payments.WeChatPay.Web.Pages.WeChatPayPage -@model EasyAbp.EShop.Payments.WeChatPay.Web.Pages.WeChatPay.IndexModel -@{ -} -

WeChatPay

-

A sample page for the WeChatPay module.

\ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/EasyAbp.EShop.Payments.WeChatPay.Application.Tests.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/EasyAbp.EShop.Payments.WeChatPay.Application.Tests.csproj index d12662b4..ed3260fb 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/EasyAbp.EShop.Payments.WeChatPay.Application.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/EasyAbp.EShop.Payments.WeChatPay.Application.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Application.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests.csproj index d9ccdda5..04e38710 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.Domain.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests.csproj index 1a5e9a63..f8169661 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.EntityFrameworkCore.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp.csproj index b5ebb2c7..d81eb860 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp/EasyAbp.EShop.Payments.WeChatPay.HttpApi.Client.ConsoleTestApp.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests.csproj index 1473a5a4..7ea9a24f 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.MongoDB.Tests/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/EasyAbp.EShop.Payments.WeChatPay.TestBase.csproj b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/EasyAbp.EShop.Payments.WeChatPay.TestBase.csproj index eb0b4df2..c503cffb 100644 --- a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/EasyAbp.EShop.Payments.WeChatPay.TestBase.csproj +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/EasyAbp.EShop.Payments.WeChatPay.TestBase.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 - EasyAbp.EShop.Payments.WeChatPay + diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xml b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xml new file mode 100644 index 00000000..be0de3a9 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xsd b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xsd new file mode 100644 index 00000000..3f3946e2 --- /dev/null +++ b/modules/EasyAbp.EShop.Payments.WeChatPay/test/EasyAbp.EShop.Payments.WeChatPay.TestBase/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs index 54ed8555..63215415 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Payments/PaymentAppService.cs @@ -28,6 +28,18 @@ namespace EasyAbp.EShop.Payments.Payments _repository = repository; } + public override Task GetAsync(Guid id) + { + // Todo: Check permission. + return base.GetAsync(id); + } + + public override Task> GetListAsync(PagedAndSortedResultRequestDto input) + { + // Todo: Check permission. + return base.GetListAsync(input); + } + public override async Task CreateAsync(CreatePaymentDto input) { await CheckCreatePolicyAsync();