Upgrade to ABP 5.0.1

Complete permission check Use options to configure payment methods Payment list and Refund list will be get with details Use distributed event bus with outbox Fix some bugs Add UTs
EasyAbp · Jan 1, 2022 · 3adea26 · 3adea26
1 parent ded70ed
commit 3adea26
Show file tree

Hide file tree

Showing 188 changed files with 37,636 additions and 25,027 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,6 +10,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: NuGet/setup-nuget@v1.0.5
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
 
       - name: read common.props
         id: commonProps
@@ -39,8 +42,16 @@ jobs:
           cd dest
           del * -Exclude EasyAbp.*
           del * -Exclude *.${{ steps.getVersion.outputs.first_match }}.nupkg
-          del *.HttpApi.Client.ConsoleTestApp*
-          del *.Host.Shared*
+          del *.Blazor.Host.*
+          del *.Blazor.Server.Host.*
+          del *.Host.Shared.*
+          del *.HttpApi.Host.*
+          del *.IdentityServer.*
+          del *.Web.Host.*
+          del *.Web.Unified.*
+          del *.HttpApi.Client.ConsoleTestApp.*
+          del *.Tests.*
+          del *.TestBase.*
           dir -name
 
       - name: dotnet nuget push to GitHub

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>4.4.0</AbpVersion>
-    <EasyAbpAbpWeChatModuleVersion>1.7.12</EasyAbpAbpWeChatModuleVersion>
+    <AbpVersion>5.0.1</AbpVersion>
+    <EasyAbpAbpWeChatModuleVersion>1.8.0</EasyAbpAbpWeChatModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,7 +27,7 @@ stages:
           - task: UseDotNet@2
             inputs:
               packageType: 'sdk'
-              version: '5.x'
+              version: '6.x'
 
           - task: DotNetCoreCLI@2
             displayName: 'restore'
@@ -83,7 +83,7 @@ stages:
           - task: UseDotNet@2
             inputs:
               packageType: 'sdk'
-              version: '5.x'
+              version: '6.x'
           - task: CmdLine@2
             displayName: 'install dotnet-ef'
             inputs:

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.10.4</Version>
+    <Version>2.0.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.2.0">
+    <PackageReference Include="Fody" Version="6.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/docs/Prepayment/README.md b/docs/Prepayment/README.md
@@ -1,7 +1,9 @@
 # PaymentService.Prepayment
 
+[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FPaymentService%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.PaymentService.Prepayment.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.PaymentService.Prepayment.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.PaymentService.Prepayment.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.PaymentService.Prepayment.Domain.Shared)
+[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/PaymentService?style=social)](https://www.github.com/EasyAbp/PaymentService)
 
 Prepayment implementation of the EasyAbp.PaymentService module.
@@ -36,12 +38,10 @@ We have launched an online demo for this module: [https://pay.samples.easyabp.io
 
 1. Register the Prepayment payment method:
     ```csharp
-    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    Configure<PaymentServiceOptions>(options =>
     {
-        var resolver = context.ServiceProvider.GetRequiredService<IPaymentServiceResolver>();
-
-        resolver.TryRegisterProvider(PrepaymentPaymentServiceProvider.PaymentMethod, typeof(PrepaymentPaymentServiceProvider));
-    }
+        options.Providers.Configure<PrepaymentPaymentServiceProvider>(PrepaymentPaymentServiceProvider.PaymentMethod);
+    });
     ```
 
 2. Configure the prepayment to define a account group:

diff --git a/docs/README.md b/docs/README.md
@@ -3,6 +3,7 @@
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FPaymentService%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.PaymentService.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.PaymentService.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.PaymentService.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.PaymentService.Domain.Shared)
+[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/PaymentService?style=social)](https://www.github.com/EasyAbp/PaymentService)
 
 An abp application module that provides payment service.
@@ -33,15 +34,15 @@ We have launched an online demo for this module: [https://pay.samples.easyabp.io
 
 ## Usage
 
-1. Register the Free payment method, it is used to pay with 0.00 amount:
+1. Register the Free payment method, it is used to pay when the amount is 0.00:
 
     ```csharp
-    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    Configure<PaymentServiceOptions>(options =>
     {
-        var resolver = context.ServiceProvider.GetRequiredService<IPaymentServiceResolver>();
-
-        resolver.TryRegisterProvider(FreePaymentServiceProvider.PaymentMethod, typeof(FreePaymentServiceProvider));
-    }
+        options.Providers.Configure<FreePaymentServiceProvider>(FreePaymentServiceProvider.PaymentMethod);
+        // options.Providers.Configure<PrepaymentPaymentServiceProvider>(PrepaymentPaymentServiceProvider.PaymentMethod);
+        // options.Providers.Configure<WeChatPayPaymentServiceProvider>(WeChatPayPaymentServiceProvider.PaymentMethod);
+    });
     ```
 
 2. Choose the payment service providers you want:
@@ -58,4 +59,4 @@ We have launched an online demo for this module: [https://pay.samples.easyabp.io
 - [ ] Support Paypal.
 - [ ] Support Alipay.
 - [ ] Support Bitcoin payment.
-- [ ] Unit tests.
+- [x] Unit tests.
diff --git a/docs/WeChatPay/README.md b/docs/WeChatPay/README.md
@@ -1,7 +1,9 @@
 # PaymentService.WeChatPay
 
+[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FPaymentService%2Fmaster%2FDirectory.Build.props)](https://abp.io)
 [![NuGet](https://img.shields.io/nuget/v/EasyAbp.PaymentService.WeChatPay.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.PaymentService.WeChatPay.Domain.Shared)
 [![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.PaymentService.WeChatPay.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.PaymentService.WeChatPay.Domain.Shared)
+[![Discord online](https://badgen.net/discord/online-members/S6QaezrCRq?label=Discord)](https://discord.gg/S6QaezrCRq)
 [![GitHub stars](https://img.shields.io/github/stars/EasyAbp/PaymentService?style=social)](https://www.github.com/EasyAbp/PaymentService)
 
 WeChatPay implementation of the EasyAbp.PaymentService module.
@@ -36,12 +38,10 @@ We have launched an online demo for this module: [https://pay.samples.easyabp.io
 
 1. Register the WeChatPay payment method:
     ```csharp
-    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    Configure<PaymentServiceOptions>(options =>
     {
-        var resolver = context.ServiceProvider.GetRequiredService<IPaymentServiceResolver>();
-
-        resolver.TryRegisterProvider(WeChatPayPaymentServiceProvider.PaymentMethod, typeof(WeChatPayPaymentServiceProvider));
-    }
+        options.Providers.Configure<WeChatPayPaymentServiceProvider>(WeChatPayPaymentServiceProvider.PaymentMethod);
+    });
     ```
 
 2. Configure the [WeChatPay settings](https://github.com/EasyAbp/PaymentService/blob/master/modules/EasyAbp.PaymentService.WeChatPay/src/EasyAbp.PaymentService.WeChatPay.Domain/EasyAbp/PaymentService/WeChatPay/Settings/WeChatPaySettings.cs), you can try to use [SettingUI](https://github.com/EasyAbp/Abp.SettingUi) to finish this work.

diff --git a/...ment.Application.Contracts/EasyAbp.PaymentService.Prepayment.Application.Contracts.csproj b/...ment.Application.Contracts/EasyAbp.PaymentService.Prepayment.Application.Contracts.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />
     <ProjectReference Include="..\EasyAbp.PaymentService.Prepayment.Domain.Shared\EasyAbp.PaymentService.Prepayment.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\EasyAbp.PaymentService\src\EasyAbp.PaymentService.Domain.Shared\EasyAbp.PaymentService.Domain.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...s/EasyAbp/PaymentService/Prepayment/PaymentServicePrepaymentApplicationContractsModule.cs b/...s/EasyAbp/PaymentService/Prepayment/PaymentServicePrepaymentApplicationContractsModule.cs
@@ -6,6 +6,7 @@ namespace EasyAbp.PaymentService.Prepayment
 {
     [DependsOn(
         typeof(PaymentServicePrepaymentDomainSharedModule),
+        typeof(PaymentServiceDomainSharedModule),
         typeof(AbpDddApplicationContractsModule),
         typeof(AbpAuthorizationModule)
         )]

diff --git a/...ce.Prepayment.Application/EasyAbp/PaymentService/Prepayment/Accounts/AccountAppService.cs b/...ce.Prepayment.Application/EasyAbp/PaymentService/Prepayment/Accounts/AccountAppService.cs
@@ -57,9 +57,10 @@ public override async Task<AccountDto> GetAsync(Guid id)
             return dto;
         }
 
-        protected override IQueryable<Account> CreateFilteredQuery(GetAccountListInput input)
+        protected override async Task<IQueryable<Account>> CreateFilteredQueryAsync(GetAccountListInput input)
         {
-            return base.CreateFilteredQuery(input).WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value);
+            return (await base.CreateFilteredQueryAsync(input))
+                .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value);
         }
 
         [Authorize]

diff --git a/...yment.Application/EasyAbp/PaymentService/Prepayment/Transactions/TransactionAppService.cs b/...yment.Application/EasyAbp/PaymentService/Prepayment/Transactions/TransactionAppService.cs
@@ -55,9 +55,9 @@ public override async Task<PagedResultDto<TransactionDto>> GetListAsync(GetTrans
             return await base.GetListAsync(input);
         }
 
-        protected override IQueryable<Transaction> CreateFilteredQuery(GetTransactionListInput input)
+        protected override async Task<IQueryable<Transaction>> CreateFilteredQueryAsync(GetTransactionListInput input)
         {
-            return base.CreateFilteredQuery(input).Where(x => x.AccountId == input.AccountId);
+            return (await base.CreateFilteredQueryAsync(input)).Where(x => x.AccountId == input.AccountId);
         }
     }
 }
diff --git a/...ation/EasyAbp/PaymentService/Prepayment/WithdrawalRequests/WithdrawalRequestAppService.cs b/...ation/EasyAbp/PaymentService/Prepayment/WithdrawalRequests/WithdrawalRequestAppService.cs
@@ -31,9 +31,9 @@ public WithdrawalRequestAppService(
             _repository = repository;
         }
 
-        protected override IQueryable<WithdrawalRequest> CreateFilteredQuery(GetWithdrawalRequestListInput input)
+        protected override async Task<IQueryable<WithdrawalRequest>> CreateFilteredQueryAsync(GetWithdrawalRequestListInput input)
         {
-            return base.CreateFilteredQuery(input)
+            return (await base.CreateFilteredQueryAsync(input))
                 .WhereIf(input.PendingOnly, x => !x.ReviewTime.HasValue)
                 .WhereIf(input.AccountId.HasValue, x => x.AccountId == input.AccountId.Value)
                 .WhereIf(input.AccountUserId.HasValue, x => x.AccountUserId == input.AccountUserId.Value);

diff --git a/...ntService.Prepayment.Domain.Shared/EasyAbp.PaymentService.Prepayment.Domain.Shared.csproj b/...ntService.Prepayment.Domain.Shared/EasyAbp.PaymentService.Prepayment.Domain.Shared.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.*" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...main/EasyAbp/PaymentService/Prepayment/PaymentService/PrepaymentPaymentServiceProvider.cs b/...main/EasyAbp/PaymentService/Prepayment/PaymentService/PrepaymentPaymentServiceProvider.cs
@@ -10,6 +10,7 @@
 using Volo.Abp.Data;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Uow;
 using Volo.Abp.Users;
 
 namespace EasyAbp.PaymentService.Prepayment.PaymentService
@@ -47,14 +48,15 @@ public PrepaymentPaymentServiceProvider(
             _accountGroupConfigurationProvider = accountGroupConfigurationProvider;
         }
 
+        [UnitOfWork(true)]
         public override async Task OnPaymentStartedAsync(Payment payment, ExtraPropertyDictionary configurations)
         {
             if (payment.ActualPaymentAmount <= decimal.Zero)
             {
-                throw new PaymentAmountInvalidException(payment.ActualPaymentAmount, PaymentMethod);
+                throw new PaymentAmountInvalidException(payment.ActualPaymentAmount, payment.PaymentMethod);
             }
 
-            if (!Guid.TryParse(configurations.GetOrDefault("AccountId") as string, out var accountId))
+            if (!Guid.TryParse(configurations.GetOrDefault("AccountId").ToString(), out var accountId))
             {
                 throw new ArgumentNullException("AccountId");
             }
@@ -110,6 +112,7 @@ public override async Task OnCancelStartedAsync(Payment payment)
             await _paymentManager.CompleteCancelAsync(payment);
         }
 
+        [UnitOfWork(true)]
         public override async Task OnRefundStartedAsync(Payment payment, Refund refund)
         {
             if (!Guid.TryParse(payment.GetProperty<string>("AccountId"), out var accountId))
@@ -121,7 +124,7 @@ public override async Task OnRefundStartedAsync(Payment payment, Refund refund)
 
             var configuration = _accountGroupConfigurationProvider.Get(account.AccountGroupName);
 
-            var accountChangedBalance = payment.ActualPaymentAmount;
+            var accountChangedBalance = refund.RefundAmount;
 
             var transaction = new Transaction(_guidGenerator.Create(), _currentTenant.Id, account.Id, account.UserId,
                 payment.Id, TransactionType.Debit, PrepaymentConsts.RefundActionName, payment.PaymentMethod,

diff --git a/...epayment.EntityFrameworkCore/EasyAbp.PaymentService.Prepayment.EntityFrameworkCore.csproj b/...epayment.EntityFrameworkCore/EasyAbp.PaymentService.Prepayment.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/...yment.EntityFrameworkCore/EasyAbp/PaymentService/Prepayment/Accounts/AccountRepository.cs b/...yment.EntityFrameworkCore/EasyAbp/PaymentService/Prepayment/Accounts/AccountRepository.cs
@@ -5,9 +5,9 @@
 
 namespace EasyAbp.PaymentService.Prepayment.Accounts
 {
-    public class AccountRepository : EfCoreRepository<IPrepaymentDbContext, Account, Guid>, IAccountRepository
+    public class AccountRepository : EfCoreRepository<IPaymentServicePrepaymentDbContext, Account, Guid>, IAccountRepository
     {
-        public AccountRepository(IDbContextProvider<IPrepaymentDbContext> dbContextProvider) : base(dbContextProvider)
+        public AccountRepository(IDbContextProvider<IPaymentServicePrepaymentDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
     }

diff --git a/...tityFrameworkCore/IPrepaymentDbContext.cs → ...ore/IPaymentServicePrepaymentDbContext.cs b/...tityFrameworkCore/IPrepaymentDbContext.cs → ...ore/IPaymentServicePrepaymentDbContext.cs
@@ -9,7 +9,7 @@
 namespace EasyAbp.PaymentService.Prepayment.EntityFrameworkCore
 {
     [ConnectionStringName(PrepaymentDbProperties.ConnectionStringName)]
-    public interface IPrepaymentDbContext : IEfCoreDbContext
+    public interface IPaymentServicePrepaymentDbContext : IEfCoreDbContext
     {
         /* Add DbSet for each Aggregate Root here. Example:
          * DbSet<Question> Questions { get; }

diff --git a/...ntityFrameworkCore/PrepaymentDbContext.cs → ...Core/PaymentServicePrepaymentDbContext.cs b/...ntityFrameworkCore/PrepaymentDbContext.cs → ...Core/PaymentServicePrepaymentDbContext.cs
@@ -9,7 +9,7 @@
 namespace EasyAbp.PaymentService.Prepayment.EntityFrameworkCore
 {
     [ConnectionStringName(PrepaymentDbProperties.ConnectionStringName)]
-    public class PrepaymentDbContext : AbpDbContext<PrepaymentDbContext>, IPrepaymentDbContext
+    public class PaymentServicePrepaymentDbContext : AbpDbContext<PaymentServicePrepaymentDbContext>, IPaymentServicePrepaymentDbContext
     {
         /* Add DbSet for each Aggregate Root here. Example:
          * public DbSet<Question> Questions { get; set; }
@@ -19,7 +19,7 @@ public class PrepaymentDbContext : AbpDbContext<PrepaymentDbContext>, IPrepaymen
         public DbSet<WithdrawalRecord> WithdrawalRecords { get; set; }
         public DbSet<WithdrawalRequest> WithdrawalRequests { get; set; }
 
-        public PrepaymentDbContext(DbContextOptions<PrepaymentDbContext> options) 
+        public PaymentServicePrepaymentDbContext(DbContextOptions<PaymentServicePrepaymentDbContext> options) 
             : base(options)
         {
 

diff --git a/...rvice/Prepayment/EntityFrameworkCore/PaymentServicePrepaymentEntityFrameworkCoreModule.cs b/...rvice/Prepayment/EntityFrameworkCore/PaymentServicePrepaymentEntityFrameworkCoreModule.cs
@@ -16,7 +16,7 @@ public class PaymentServicePrepaymentEntityFrameworkCoreModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAbpDbContext<PrepaymentDbContext>(options =>
+            context.Services.AddAbpDbContext<PaymentServicePrepaymentDbContext>(options =>
             {
                 /* Add custom repositories here. Example:
                  * options.AddRepository<Question, EfCoreQuestionRepository>();

diff --git a/...ymentService/Prepayment/EntityFrameworkCore/PrepaymentDbContextModelCreatingExtensions.cs b/...ymentService/Prepayment/EntityFrameworkCore/PrepaymentDbContextModelCreatingExtensions.cs
@@ -52,6 +52,7 @@ public static void ConfigurePaymentServicePrepayment(
                 /* Configure more properties here */
                 b.Property(x => x.Balance).HasColumnType("decimal(20,8)");
                 b.Property(x => x.LockedBalance).HasColumnType("decimal(20,8)");
+                b.Property(x => x.PendingWithdrawalAmount).HasColumnType("decimal(20,8)");
                 b.HasIndex(x => x.UserId);
             });
 

diff --git a/...tityFrameworkCore/EasyAbp/PaymentService/Prepayment/Transactions/TransactionRepository.cs b/...tityFrameworkCore/EasyAbp/PaymentService/Prepayment/Transactions/TransactionRepository.cs
@@ -5,9 +5,9 @@
 
 namespace EasyAbp.PaymentService.Prepayment.Transactions
 {
-    public class TransactionRepository : EfCoreRepository<IPrepaymentDbContext, Transaction, Guid>, ITransactionRepository
+    public class TransactionRepository : EfCoreRepository<IPaymentServicePrepaymentDbContext, Transaction, Guid>, ITransactionRepository
     {
-        public TransactionRepository(IDbContextProvider<IPrepaymentDbContext> dbContextProvider) : base(dbContextProvider)
+        public TransactionRepository(IDbContextProvider<IPaymentServicePrepaymentDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
     }

diff --git a/...orkCore/EasyAbp/PaymentService/Prepayment/WithdrawalRecords/WithdrawalRecordRepository.cs b/...orkCore/EasyAbp/PaymentService/Prepayment/WithdrawalRecords/WithdrawalRecordRepository.cs
@@ -8,10 +8,10 @@
 
 namespace EasyAbp.PaymentService.Prepayment.WithdrawalRecords
 {
-    public class WithdrawalRecordRepository : EfCoreRepository<IPrepaymentDbContext, WithdrawalRecord, Guid>,
+    public class WithdrawalRecordRepository : EfCoreRepository<IPaymentServicePrepaymentDbContext, WithdrawalRecord, Guid>,
         IWithdrawalRecordRepository
     {
-        public WithdrawalRecordRepository(IDbContextProvider<IPrepaymentDbContext> dbContextProvider) : base(
+        public WithdrawalRecordRepository(IDbContextProvider<IPaymentServicePrepaymentDbContext> dbContextProvider) : base(
             dbContextProvider)
         {
         }

diff --git a/...tService.Prepayment.EntityFrameworkCore/WithdrawalRequests/WithdrawalRequestRepository.cs b/...tService.Prepayment.EntityFrameworkCore/WithdrawalRequests/WithdrawalRequestRepository.cs
@@ -5,9 +5,9 @@
 
 namespace EasyAbp.PaymentService.Prepayment.WithdrawalRequests
 {
-    public class WithdrawalRequestRepository : EfCoreRepository<IPrepaymentDbContext, WithdrawalRequest, Guid>, IWithdrawalRequestRepository
+    public class WithdrawalRequestRepository : EfCoreRepository<IPaymentServicePrepaymentDbContext, WithdrawalRequest, Guid>, IWithdrawalRequestRepository
     {
-        public WithdrawalRequestRepository(IDbContextProvider<IPrepaymentDbContext> dbContextProvider) : base(dbContextProvider)
+        public WithdrawalRequestRepository(IDbContextProvider<IPaymentServicePrepaymentDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
     }

diff --git a/...Service.Prepayment.HttpApi.Client/EasyAbp.PaymentService.Prepayment.HttpApi.Client.csproj b/...Service.Prepayment.HttpApi.Client/EasyAbp.PaymentService.Prepayment.HttpApi.Client.csproj
@@ -12,4 +12,9 @@
     <ProjectReference Include="..\EasyAbp.PaymentService.Prepayment.Application.Contracts\EasyAbp.PaymentService.Prepayment.Application.Contracts.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="**\*generate-proxy.json" />
+    <Content Remove="**\*generate-proxy.json" />
+  </ItemGroup>
+
 </Project>