diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 85cccaa6..875e20d4 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -4,10 +4,6 @@ on: branches: - master - main - pull_request: - branches: - - master - - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a5081def..a77494e4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,10 +4,6 @@ on: branches: - master - main - pull_request: - branches: - - master - - main jobs: publish: runs-on: windows-latest diff --git a/Directory.Build.props b/Directory.Build.props index 1a852896..70f455bf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@  - 4.0.2 + 4.2.2 \ No newline at end of file diff --git a/common.props b/common.props index 5b4754ef..3938ba3b 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 2.1.1 + 2.1.2 $(NoWarn);CS1591 true EasyAbp Team diff --git a/integration/EasyAbp.EShop/test/EasyAbp.EShop.Application.Tests/EasyAbp.EShop.Application.Tests.csproj b/integration/EasyAbp.EShop/test/EasyAbp.EShop.Application.Tests/EasyAbp.EShop.Application.Tests.csproj index 20c78d5c..86ca570e 100644 --- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.Application.Tests/EasyAbp.EShop.Application.Tests.csproj +++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.Application.Tests/EasyAbp.EShop.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/integration/EasyAbp.EShop/test/EasyAbp.EShop.Domain.Tests/EasyAbp.EShop.Domain.Tests.csproj b/integration/EasyAbp.EShop/test/EasyAbp.EShop.Domain.Tests/EasyAbp.EShop.Domain.Tests.csproj index 9abae5be..bd17801d 100644 --- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.Domain.Tests/EasyAbp.EShop.Domain.Tests.csproj +++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.Domain.Tests/EasyAbp.EShop.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/integration/EasyAbp.EShop/test/EasyAbp.EShop.EntityFrameworkCore.Tests/EasyAbp.EShop.EntityFrameworkCore.Tests.csproj b/integration/EasyAbp.EShop/test/EasyAbp.EShop.EntityFrameworkCore.Tests/EasyAbp.EShop.EntityFrameworkCore.Tests.csproj index 4dd769e7..b1f444eb 100644 --- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.EntityFrameworkCore.Tests/EasyAbp.EShop.EntityFrameworkCore.Tests.csproj +++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.EntityFrameworkCore.Tests/EasyAbp.EShop.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/integration/EasyAbp.EShop/test/EasyAbp.EShop.MongoDB.Tests/EasyAbp.EShop.MongoDB.Tests.csproj b/integration/EasyAbp.EShop/test/EasyAbp.EShop.MongoDB.Tests/EasyAbp.EShop.MongoDB.Tests.csproj index 1e7e4aa0..d66f2a9d 100644 --- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.MongoDB.Tests/EasyAbp.EShop.MongoDB.Tests.csproj +++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.MongoDB.Tests/EasyAbp.EShop.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj b/integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj index 0e41d313..293f881e 100644 --- a/integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj +++ b/integration/EasyAbp.EShop/test/EasyAbp.EShop.TestBase/EasyAbp.EShop.TestBase.csproj @@ -8,12 +8,12 @@ - + - + - + diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs index 25ca7b6c..eed755fe 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/OrderAppService.cs @@ -40,9 +40,9 @@ namespace EasyAbp.EShop.Orders.Orders _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetOrderListDto input) + protected override async Task> CreateFilteredQueryAsync(GetOrderListDto input) { - var query = _repository.WithDetails(); + var query = await _repository.WithDetailsAsync(); if (input.StoreId.HasValue) { diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/Orders/OrderRepository.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/Orders/OrderRepository.cs index afa6414c..e4e2ae53 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/Orders/OrderRepository.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/Orders/OrderRepository.cs @@ -16,9 +16,9 @@ namespace EasyAbp.EShop.Orders.Orders { } - public override IQueryable WithDetails() + public override async Task> WithDetailsAsync() { - return base.WithDetails() + return (await base.WithDetailsAsync()) .Include(x => x.OrderLines) .Include(x => x.OrderExtraFees); } diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/EasyAbp.EShop.Orders.Application.Tests.csproj b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/EasyAbp.EShop.Orders.Application.Tests.csproj index 260f8576..642bd5a3 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/EasyAbp.EShop.Orders.Application.Tests.csproj +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/EasyAbp.EShop.Orders.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/EasyAbp.EShop.Orders.Domain.Tests.csproj b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/EasyAbp.EShop.Orders.Domain.Tests.csproj index e3354528..6eff2007 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/EasyAbp.EShop.Orders.Domain.Tests.csproj +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/EasyAbp.EShop.Orders.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj index a9384092..f9d1fc24 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests/EasyAbp.EShop.Orders.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.MongoDB.Tests/EasyAbp.EShop.Orders.MongoDB.Tests.csproj b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.MongoDB.Tests/EasyAbp.EShop.Orders.MongoDB.Tests.csproj index 447cf54f..301ccaaa 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.MongoDB.Tests/EasyAbp.EShop.Orders.MongoDB.Tests.csproj +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.MongoDB.Tests/EasyAbp.EShop.Orders.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj index 36006968..298da666 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.TestBase/EasyAbp.EShop.Orders.TestBase.csproj @@ -8,12 +8,12 @@ - + - + - + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj index a4ab86ea..242503c4 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj @@ -8,7 +8,7 @@ - + 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 fc4801b3..9a986026 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 @@ -50,9 +50,9 @@ namespace EasyAbp.EShop.Payments.Payments return payment; } - protected override IQueryable CreateFilteredQuery(GetPaymentListDto input) + protected override async Task> CreateFilteredQueryAsync(GetPaymentListDto input) { - var query = base.CreateFilteredQuery(input); + var query = await base.CreateFilteredQueryAsync(input); if (input.UserId.HasValue) { @@ -95,21 +95,19 @@ namespace EasyAbp.EShop.Payments.Payments new PaymentOperationAuthorizationRequirement(PaymentOperation.Creation) ); - var createPaymentEto = new CreatePaymentEto - { - TenantId = CurrentTenant.Id, - UserId = CurrentUser.GetId(), - PaymentMethod = input.PaymentMethod, - Currency = orders.First().Currency, - ExtraProperties = new ExtraPropertyDictionary(), - PaymentItems = orders.Select(order => new CreatePaymentItemEto + var createPaymentEto = new CreatePaymentEto( + CurrentTenant.Id, + CurrentUser.GetId(), + input.PaymentMethod, + orders.First().Currency, + orders.Select(order => new CreatePaymentItemEto { ItemType = PaymentsConsts.PaymentItemType, ItemKey = order.Id.ToString(), OriginalPaymentAmount = order.ActualTotalPrice, ExtraProperties = new ExtraPropertyDictionary {{"StoreId", order.StoreId.ToString()}} }).ToList() - }; + ); await _distributedEventBus.PublishAsync(createPaymentEto); } diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs index e42589f1..a2bdd41c 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application/EasyAbp/EShop/Payments/Refunds/RefundAppService.cs @@ -60,12 +60,12 @@ namespace EasyAbp.EShop.Payments.Refunds return refund; } - - protected override IQueryable CreateFilteredQuery(GetRefundListDto input) - { - var query = input.UserId.HasValue ? _repository.GetQueryableByUserId(input.UserId.Value) : _repository; - return query; + protected override async Task> CreateFilteredQueryAsync(GetRefundListDto input) + { + return input.UserId.HasValue + ? await _repository.GetQueryableByUserIdAsync(input.UserId.Value) + : _repository; } // Todo: should a store owner user see orders of other stores in the same payment/refund? @@ -132,11 +132,7 @@ namespace EasyAbp.EShop.Payments.Refunds }); } - await _distributedEventBus.PublishAsync(new RefundPaymentEto - { - TenantId = CurrentTenant.Id, - CreateRefundInput = createRefundInput - }); + await _distributedEventBus.PublishAsync(new RefundPaymentEto(CurrentTenant.Id, createRefundInput)); } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj index 3aa52383..41e7f6ed 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs index f4d8f316..15c27774 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/IRefundRepository.cs @@ -1,11 +1,12 @@ using System; using System.Linq; +using System.Threading.Tasks; using Volo.Abp.Domain.Repositories; namespace EasyAbp.EShop.Payments.Refunds { public interface IRefundRepository : IRepository { - IQueryable GetQueryableByUserId(Guid userId); + Task> GetQueryableByUserIdAsync(Guid userId); } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs index 6a211283..7d7128ce 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Payments/PaymentRepository.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading.Tasks; using EasyAbp.EShop.Payments.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; @@ -13,9 +14,9 @@ namespace EasyAbp.EShop.Payments.Payments { } - public override IQueryable WithDetails() + public override async Task> WithDetailsAsync() { - return base.WithDetails().Include(x => x.PaymentItems); + return (await base.WithDetailsAsync()).Include(x => x.PaymentItems); } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs index ab680473..f4465e13 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/Refunds/RefundRepository.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading.Tasks; using EasyAbp.EShop.Payments.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; @@ -13,15 +14,15 @@ namespace EasyAbp.EShop.Payments.Refunds { } - public override IQueryable WithDetails() + public override async Task> WithDetailsAsync() { - return base.WithDetails().Include(x => x.RefundItems); + return (await base.WithDetailsAsync()).Include(x => x.RefundItems); } - public IQueryable GetQueryableByUserId(Guid userId) + public virtual async Task> GetQueryableByUserIdAsync(Guid userId) { - return from refund in DbContext.Refunds - join payment in DbContext.Payments on refund.PaymentId equals payment.Id + return from refund in (await GetDbContextAsync()).Refunds + join payment in (await GetDbContextAsync()).Payments on refund.PaymentId equals payment.Id where payment.UserId == userId select refund; } diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/EasyAbp.EShop.Payments.Application.Tests.csproj b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/EasyAbp.EShop.Payments.Application.Tests.csproj index adcf153f..ca506296 100644 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/EasyAbp.EShop.Payments.Application.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/EasyAbp.EShop.Payments.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/EasyAbp.EShop.Payments.Domain.Tests.csproj b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/EasyAbp.EShop.Payments.Domain.Tests.csproj index 48ab9773..db4857e2 100644 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/EasyAbp.EShop.Payments.Domain.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/EasyAbp.EShop.Payments.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj index 84cd3463..4b49c58b 100644 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests/EasyAbp.EShop.Payments.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.MongoDB.Tests/EasyAbp.EShop.Payments.MongoDB.Tests.csproj b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.MongoDB.Tests/EasyAbp.EShop.Payments.MongoDB.Tests.csproj index 970dd70a..1e627487 100644 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.MongoDB.Tests/EasyAbp.EShop.Payments.MongoDB.Tests.csproj +++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.MongoDB.Tests/EasyAbp.EShop.Payments.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj index b7b288c6..c6b5ee30 100644 --- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj +++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.TestBase/EasyAbp.EShop.Payments.TestBase.csproj @@ -8,12 +8,12 @@ - + - + - + diff --git a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Application.Tests/EasyAbp.EShop.Plugins.Application.Tests.csproj b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Application.Tests/EasyAbp.EShop.Plugins.Application.Tests.csproj index 27f51026..e0213912 100644 --- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Application.Tests/EasyAbp.EShop.Plugins.Application.Tests.csproj +++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Application.Tests/EasyAbp.EShop.Plugins.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Domain.Tests/EasyAbp.EShop.Plugins.Domain.Tests.csproj b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Domain.Tests/EasyAbp.EShop.Plugins.Domain.Tests.csproj index 66579f68..2f9f9af4 100644 --- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Domain.Tests/EasyAbp.EShop.Plugins.Domain.Tests.csproj +++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.Domain.Tests/EasyAbp.EShop.Plugins.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj index adf92d7e..7711237b 100644 --- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj +++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.MongoDB.Tests/EasyAbp.EShop.Plugins.MongoDB.Tests.csproj b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.MongoDB.Tests/EasyAbp.EShop.Plugins.MongoDB.Tests.csproj index dcecd586..56a1dfe6 100644 --- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.MongoDB.Tests/EasyAbp.EShop.Plugins.MongoDB.Tests.csproj +++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.MongoDB.Tests/EasyAbp.EShop.Plugins.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.TestBase/EasyAbp.EShop.Plugins.TestBase.csproj b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.TestBase/EasyAbp.EShop.Plugins.TestBase.csproj index 9d9e7511..f115e6cc 100644 --- a/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.TestBase/EasyAbp.EShop.Plugins.TestBase.csproj +++ b/modules/EasyAbp.EShop.Plugins/test/EasyAbp.EShop.Plugins.TestBase/EasyAbp.EShop.Plugins.TestBase.csproj @@ -8,12 +8,12 @@ - + - + - + diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj index 8f1a1f4b..d30b15fb 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp.EShop.Products.Application.Contracts.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj index 662666ae..f8d7399b 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp.EShop.Products.Application.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Categories/CategoryAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Categories/CategoryAppService.cs index 681d26af..4ad27740 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Categories/CategoryAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Categories/CategoryAppService.cs @@ -27,9 +27,9 @@ namespace EasyAbp.EShop.Products.Categories _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetCategoryListDto input) + protected override async Task> CreateFilteredQueryAsync(GetCategoryListDto input) { - var query = base.CreateFilteredQuery(input).Where(x => x.ParentId == input.ParentId); + var query = (await base.CreateFilteredQueryAsync(input)).Where(x => x.ParentId == input.ParentId); return input.ShowHidden ? query : query.Where(x => !x.IsHidden); } diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs index 7f9296a9..9e63008d 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs @@ -20,7 +20,7 @@ namespace EasyAbp.EShop.Products.ProductCategories _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetProductCategoryListDto input) + protected override async Task> CreateFilteredQueryAsync(GetProductCategoryListDto input) { var queryable = Repository.AsQueryable(); diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs index ea6a2626..23022d00 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs @@ -20,9 +20,9 @@ namespace EasyAbp.EShop.Products.ProductDetailHistories _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetProductDetailHistoryListDto input) + protected override async Task> CreateFilteredQueryAsync(GetProductDetailHistoryListDto input) { - return base.CreateFilteredQuery(input).Where(x => x.ProductDetailId == input.ProductDetailId); + return (await base.CreateFilteredQueryAsync(input)).Where(x => x.ProductDetailId == input.ProductDetailId); } public async Task GetByTimeAsync(Guid productId, DateTime modificationTime) diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs index 002483fb..0758d784 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs @@ -30,7 +30,7 @@ namespace EasyAbp.EShop.Products.ProductDetails _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetProductDetailListInput input) + protected override async Task> CreateFilteredQueryAsync(GetProductDetailListInput input) { return _repository.WhereIf(input.StoreId.HasValue, x => x.StoreId == input.StoreId.Value); } @@ -40,7 +40,7 @@ namespace EasyAbp.EShop.Products.ProductDetails await AuthorizationService.CheckMultiStorePolicyAsync(input.StoreId, GetListPolicyName, ProductsPermissions.Products.CrossStore); - var query = CreateFilteredQuery(input); + var query = await CreateFilteredQueryAsync(input); var totalCount = await AsyncExecuter.CountAsync(query); diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs index f22613f8..658eaa22 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs @@ -20,9 +20,9 @@ namespace EasyAbp.EShop.Products.ProductHistories _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetProductHistoryListDto input) + protected override async Task> CreateFilteredQueryAsync(GetProductHistoryListDto input) { - return base.CreateFilteredQuery(input).Where(x => x.ProductId == input.ProductId); + return (await base.CreateFilteredQueryAsync(input)).Where(x => x.ProductId == input.ProductId); } public async Task GetByTimeAsync(Guid productId, DateTime modificationTime) diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs index 5e7a1d05..4a4f2053 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs @@ -50,11 +50,11 @@ namespace EasyAbp.EShop.Products.Products _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetProductListInput input) + protected override async Task> CreateFilteredQueryAsync(GetProductListInput input) { var query = input.CategoryId.HasValue ? _repository.WithDetails(input.CategoryId.Value) - : _repository.WithDetails(); + : (await _repository.WithDetailsAsync()); return query .Where(x => x.StoreId == input.StoreId) @@ -267,7 +267,7 @@ namespace EasyAbp.EShop.Products.Products } // Todo: Products cache. - var query = CreateFilteredQuery(input); + var query = await CreateFilteredQueryAsync(input); if (!isCurrentUserStoreAdmin) { diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs index c56e809a..b90c786f 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs @@ -35,11 +35,11 @@ namespace EasyAbp.EShop.Products.Products _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetProductListInput input) + protected override async Task> CreateFilteredQueryAsync(GetProductListInput input) { var query = input.CategoryId.HasValue ? _repository.WithDetails(input.CategoryId.Value) - : _repository.WithDetails(); + : (await _repository.WithDetailsAsync()); return query .Where(x => x.StoreId == input.StoreId) @@ -55,7 +55,7 @@ namespace EasyAbp.EShop.Products.Products await BuildStoreProductViewsAsync(input.StoreId); } - var query = CreateFilteredQuery(input); + var query = await CreateFilteredQueryAsync(input); var totalCount = await AsyncExecuter.CountAsync(query); diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj index 38fd7540..4d139192 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp.EShop.Products.Domain.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj index f75e61ec..81a6ff97 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp.EShop.Products.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj index 8581fc54..b2af889c 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp.EShop.Products.EntityFrameworkCore.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs index 14b267e0..5d106fe5 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductCategories/ProductCategoryRepository.cs @@ -19,13 +19,13 @@ namespace EasyAbp.EShop.Products.ProductCategories public virtual async Task> GetListByCategoryIdAsync(Guid categoryId, CancellationToken cancellationToken = default) { - return await GetQueryable().Where(pc => pc.CategoryId == categoryId).ToListAsync(cancellationToken); + return await (await GetQueryableAsync()).Where(pc => pc.CategoryId == categoryId).ToListAsync(cancellationToken); } public virtual async Task> GetListByProductIdAsync(Guid productId, CancellationToken cancellationToken = default) { - return await GetQueryable().Where(pc => pc.ProductId == productId).ToListAsync(cancellationToken); + return await (await GetQueryableAsync()).Where(pc => pc.ProductId == productId).ToListAsync(cancellationToken); } } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs index 35780698..9be1dc07 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductRepository.cs @@ -31,7 +31,7 @@ namespace EasyAbp.EShop.Products.Products protected virtual async Task CheckUniqueNameAsync(Product entity, CancellationToken cancellationToken = new CancellationToken()) { - if (await DbSet.AnyAsync( + if (await (await GetDbSetAsync()).AnyAsync( x => x.StoreId == entity.StoreId && x.UniqueName == entity.UniqueName && x.Id != entity.Id, cancellationToken)) { @@ -39,9 +39,9 @@ namespace EasyAbp.EShop.Products.Products } } - public override IQueryable WithDetails() + public override async Task> WithDetailsAsync() { - return base.WithDetails() + return (await base.WithDetailsAsync()) .Include(x => x.ProductAttributes).ThenInclude(x => x.ProductAttributeOptions) .Include(x => x.ProductSkus); } diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductViewRepository.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductViewRepository.cs index 8d2395dd..c17c7913 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductViewRepository.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/Products/ProductViewRepository.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading.Tasks; using EasyAbp.EShop.Products.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; @@ -12,9 +13,9 @@ namespace EasyAbp.EShop.Products.Products { } - public override IQueryable WithDetails() + public override async Task> WithDetailsAsync() { - return base.GetQueryable().IncludeDetails(); + return (await base.GetQueryableAsync()).IncludeDetails(); } public IQueryable GetQueryable(Guid categoryId) diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj index a007077e..893563ee 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EasyAbp.EShop.Products.Web.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/EasyAbp.EShop.Products.Application.Tests.csproj b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/EasyAbp.EShop.Products.Application.Tests.csproj index ec9fb8f4..520ff934 100644 --- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/EasyAbp.EShop.Products.Application.Tests.csproj +++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/EasyAbp.EShop.Products.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/EasyAbp.EShop.Products.Domain.Tests.csproj b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/EasyAbp.EShop.Products.Domain.Tests.csproj index ce264e73..e4fb8bb1 100644 --- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/EasyAbp.EShop.Products.Domain.Tests.csproj +++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/EasyAbp.EShop.Products.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj index 174f0423..d7def459 100644 --- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj +++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EasyAbp.EShop.Products.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.MongoDB.Tests/EasyAbp.EShop.Products.MongoDB.Tests.csproj b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.MongoDB.Tests/EasyAbp.EShop.Products.MongoDB.Tests.csproj index 8f114ca7..9a766b61 100644 --- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.MongoDB.Tests/EasyAbp.EShop.Products.MongoDB.Tests.csproj +++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.MongoDB.Tests/EasyAbp.EShop.Products.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj index f3a27bc3..eafe0752 100644 --- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj +++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/EasyAbp.EShop.Products.TestBase.csproj @@ -8,12 +8,12 @@ - + - + - + diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerAppService.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerAppService.cs index 455e1aaf..b539e3d4 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerAppService.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerAppService.cs @@ -72,7 +72,7 @@ namespace EasyAbp.EShop.Stores.StoreOwners return result; } - protected override IQueryable CreateFilteredQuery(GetStoreOwnerListDto input) + protected override async Task> CreateFilteredQueryAsync(GetStoreOwnerListDto input) { var queryable = Repository.AsQueryable(); diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Stores/StoreAppService.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Stores/StoreAppService.cs index 4f0e0705..37d1f0be 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Stores/StoreAppService.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Stores/StoreAppService.cs @@ -29,14 +29,14 @@ namespace EasyAbp.EShop.Stores.Stores _repository = repository; } - protected virtual async Task> CreateFilteredQueryAsync(GetStoreListInput input) + protected override async Task> CreateFilteredQueryAsync(GetStoreListInput input) { if (!input.OnlyManageable || await _permissionChecker.IsGrantedAsync(StoresPermissions.Stores.CrossStore)) { return _repository.AsQueryable(); } - return _repository.GetQueryableOnlyOwnStore(CurrentUser.GetId()); + return await _repository.GetQueryableOnlyOwnStoreAsync(CurrentUser.GetId()); } public override async Task> GetListAsync(GetStoreListInput input) diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Transactions/TransactionAppService.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Transactions/TransactionAppService.cs index 2a7c88e2..28b56572 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Transactions/TransactionAppService.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application/EasyAbp/EShop/Stores/Transactions/TransactionAppService.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading.Tasks; using EasyAbp.EShop.Stores.Permissions; using EasyAbp.EShop.Stores.Transactions.Dtos; using Volo.Abp.Application.Dtos; @@ -23,9 +24,9 @@ namespace EasyAbp.EShop.Stores.Transactions _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetTransactionListInput input) + protected override async Task> CreateFilteredQueryAsync(GetTransactionListInput input) { - return base.CreateFilteredQuery(input).Where(x => x.StoreId == input.StoreId); + return (await base.CreateFilteredQueryAsync(input)).Where(x => x.StoreId == input.StoreId); } } } diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/IStoreRepository.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/IStoreRepository.cs index d252330e..3595993c 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/IStoreRepository.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Domain/EasyAbp/EShop/Stores/Stores/IStoreRepository.cs @@ -10,6 +10,6 @@ namespace EasyAbp.EShop.Stores.Stores { Task FindDefaultStoreAsync(CancellationToken cancellationToken = default); - IQueryable GetQueryableOnlyOwnStore(Guid userId); + Task> GetQueryableOnlyOwnStoreAsync(Guid userId); } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerRepository.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerRepository.cs index 40b60de5..815613f2 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerRepository.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/StoreOwners/StoreOwnerRepository.cs @@ -19,18 +19,18 @@ namespace EasyAbp.EShop.Stores.StoreOwners public async Task> GetListByStoreIdAsync(Guid storeId, CancellationToken cancellationToken = default) { - return await GetQueryable().Where(pc => pc.StoreId == storeId).ToListAsync(cancellationToken); + return await (await GetQueryableAsync()).Where(pc => pc.StoreId == storeId).ToListAsync(cancellationToken); } public async Task> GetListByOwnerUserIdAsync(Guid ownerUserId, CancellationToken cancellationToken = default) { - return await GetQueryable().Where(pc => pc.OwnerUserId == ownerUserId).ToListAsync(cancellationToken); + return await (await GetQueryableAsync()).Where(pc => pc.OwnerUserId == ownerUserId).ToListAsync(cancellationToken); } public async Task IsExistAsync(Guid storeId, Guid ownerUserId, CancellationToken cancellationToken = default) { - var storeOwner = await GetQueryable().FirstOrDefaultAsync( + var storeOwner = await (await GetQueryableAsync()).FirstOrDefaultAsync( x => x.OwnerUserId == ownerUserId && x.StoreId == storeId, cancellationToken: cancellationToken); diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/Stores/StoreRepository.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/Stores/StoreRepository.cs index c174ab8f..5bd5e003 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/Stores/StoreRepository.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.EntityFrameworkCore/EasyAbp/EShop/Stores/Stores/StoreRepository.cs @@ -17,13 +17,13 @@ namespace EasyAbp.EShop.Stores.Stores public async Task FindDefaultStoreAsync(CancellationToken cancellationToken = default) { - return await WithDetails().FirstOrDefaultAsync(cancellationToken: cancellationToken); + return await (await WithDetailsAsync()).FirstOrDefaultAsync(cancellationToken: cancellationToken); } - public virtual IQueryable GetQueryableOnlyOwnStore(Guid userId) + public virtual async Task> GetQueryableOnlyOwnStoreAsync(Guid userId) { - return DbSet.Join( - DbContext.StoreOwners.Where(storeOwner => storeOwner.OwnerUserId == userId), + return (await GetDbSetAsync()).Join( + (await GetDbContextAsync()).StoreOwners.Where(storeOwner => storeOwner.OwnerUserId == userId), store => store.Id, storeOwner => storeOwner.StoreId, (store, storeOwner) => store diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj index 156161c0..c4832ef5 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EasyAbp.EShop.Stores.Web.csproj @@ -12,7 +12,7 @@ - + diff --git a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Application.Tests/EasyAbp.EShop.Stores.Application.Tests.csproj b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Application.Tests/EasyAbp.EShop.Stores.Application.Tests.csproj index 93896fb0..d5b8e778 100644 --- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Application.Tests/EasyAbp.EShop.Stores.Application.Tests.csproj +++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Application.Tests/EasyAbp.EShop.Stores.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Domain.Tests/EasyAbp.EShop.Stores.Domain.Tests.csproj b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Domain.Tests/EasyAbp.EShop.Stores.Domain.Tests.csproj index 563d88ee..31e564de 100644 --- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Domain.Tests/EasyAbp.EShop.Stores.Domain.Tests.csproj +++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.Domain.Tests/EasyAbp.EShop.Stores.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj index 88c8b774..938a312a 100644 --- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj +++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests/EasyAbp.EShop.Stores.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.MongoDB.Tests/EasyAbp.EShop.Stores.MongoDB.Tests.csproj b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.MongoDB.Tests/EasyAbp.EShop.Stores.MongoDB.Tests.csproj index d99251a1..f169a8e9 100644 --- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.MongoDB.Tests/EasyAbp.EShop.Stores.MongoDB.Tests.csproj +++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.MongoDB.Tests/EasyAbp.EShop.Stores.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj index 25e14ff5..a2c16f35 100644 --- a/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj +++ b/modules/EasyAbp.EShop.Stores/test/EasyAbp.EShop.Stores.TestBase/EasyAbp.EShop.Stores.TestBase.csproj @@ -8,12 +8,12 @@ - + - + - + diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs index f7736358..1b7ec73c 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Application/EasyAbp/EShop/Plugins/Baskets/BasketItems/BasketItemAppService.cs @@ -83,7 +83,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems await AuthorizationService.CheckAsync(BasketsPermissions.BasketItem.Manage); } - var query = CreateFilteredQuery(input); + var query = await CreateFilteredQueryAsync(input); var totalCount = await AsyncExecuter.CountAsync(query); @@ -170,7 +170,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.BasketItems } } - protected override IQueryable CreateFilteredQuery(GetBasketItemListDto input) + protected override async Task> CreateFilteredQueryAsync(GetBasketItemListDto input) { var userId = input.UserId ?? CurrentUser.GetId(); diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/ProductUpdates/ProductUpdateRepository.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/ProductUpdates/ProductUpdateRepository.cs index 6c5dd17e..47d297b2 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/ProductUpdates/ProductUpdateRepository.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore/EasyAbp/EShop/Plugins/Baskets/ProductUpdates/ProductUpdateRepository.cs @@ -18,7 +18,7 @@ namespace EasyAbp.EShop.Plugins.Baskets.ProductUpdates public async Task> GetListByProductSkuIdsAsync(IEnumerable productSkuIds, CancellationToken cancellationToken = default) { - return await GetQueryable().Where(x => productSkuIds.Contains(x.ProductSkuId)) + return await (await GetQueryableAsync()).Where(x => productSkuIds.Contains(x.ProductSkuId)) .ToListAsync(cancellationToken: cancellationToken); } } diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj index a49d7e36..25480cc7 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Application.Tests/EasyAbp.EShop.Plugins.Baskets.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj index 007553c2..5366aaaf 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.Domain.Tests/EasyAbp.EShop.Plugins.Baskets.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj index 373420dd..50806176 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj index 2874850e..1084e942 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests/EasyAbp.EShop.Plugins.Baskets.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj index 9093ca32..c8cf8da9 100644 --- a/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj +++ b/plugins/Baskets/test/EasyAbp.EShop.Plugins.Baskets.TestBase/EasyAbp.EShop.Plugins.Baskets.TestBase.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateAppService.cs b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateAppService.cs index 93d14ee7..4c8f90e2 100644 --- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateAppService.cs +++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateAppService.cs @@ -28,9 +28,9 @@ namespace EasyAbp.EShop.Plugins.Coupons.CouponTemplates _repository = repository; } - protected override IQueryable CreateFilteredQuery(PagedAndSortedResultRequestDto input) + protected override async Task> CreateFilteredQueryAsync(PagedAndSortedResultRequestDto input) { - return _repository.WithDetails(); + return (await _repository.WithDetailsAsync()); } public override async Task CreateAsync(CreateUpdateCouponTemplateDto input) diff --git a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponAppService.cs b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponAppService.cs index 4cdaf9fb..564e85f6 100644 --- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponAppService.cs +++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponAppService.cs @@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons _repository = repository; } - protected override IQueryable CreateFilteredQuery(GetCouponListInput input) + protected override async Task> CreateFilteredQueryAsync(GetCouponListInput input) { return (input.AvailableOnly ? _repository.GetAvailableCouponQueryable(Clock) : _repository.AsQueryable()) .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value) diff --git a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateRepository.cs b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateRepository.cs index 233cfcb5..f9b14987 100644 --- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateRepository.cs +++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/CouponTemplates/CouponTemplateRepository.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading.Tasks; using EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; @@ -13,9 +14,9 @@ namespace EasyAbp.EShop.Plugins.Coupons.CouponTemplates { } - public override IQueryable WithDetails() + public override async Task> WithDetailsAsync() { - return base.WithDetails().Include(x => x.Scopes); + return (await base.WithDetailsAsync()).Include(x => x.Scopes); } } } \ No newline at end of file diff --git a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponRepository.cs b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponRepository.cs index a387f803..7b0c7cae 100644 --- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponRepository.cs +++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore/EasyAbp/EShop/Plugins/Coupons/Coupons/CouponRepository.cs @@ -36,7 +36,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons var clock = ServiceProvider.GetRequiredService(); var notExpiredCouponQuantity = - await DbSet.CountAsync(x => x.UserId == entity.UserId && x.ExpirationTime > clock.Now, + await (await GetDbSetAsync()).CountAsync(x => x.UserId == entity.UserId && x.ExpirationTime > clock.Now, cancellationToken); if (notExpiredCouponQuantity >= CouponsConsts.MaxNotExpiredCouponQuantityPerUser) diff --git a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Application.Tests/EasyAbp.EShop.Plugins.Coupons.Application.Tests.csproj b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Application.Tests/EasyAbp.EShop.Plugins.Coupons.Application.Tests.csproj index bfc28b63..b50f499c 100644 --- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Application.Tests/EasyAbp.EShop.Plugins.Coupons.Application.Tests.csproj +++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Application.Tests/EasyAbp.EShop.Plugins.Coupons.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Domain.Tests/EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Domain.Tests/EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj index 8fe8dd8f..40ffd9a5 100644 --- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Domain.Tests/EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj +++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.Domain.Tests/EasyAbp.EShop.Plugins.Coupons.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj index 1b7ed7b1..8293481f 100644 --- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj +++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests/EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests.csproj b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests.csproj index 6ac4e9f3..5ece86ac 100644 --- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests.csproj +++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests/EasyAbp.EShop.Plugins.Coupons.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.TestBase/EasyAbp.EShop.Plugins.Coupons.TestBase.csproj b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.TestBase/EasyAbp.EShop.Plugins.Coupons.TestBase.csproj index 959293f0..27ddc181 100644 --- a/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.TestBase/EasyAbp.EShop.Plugins.Coupons.TestBase.csproj +++ b/plugins/Coupons/test/EasyAbp.EShop.Plugins.Coupons.TestBase/EasyAbp.EShop.Plugins.Coupons.TestBase.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj index 7389eef3..034a6bd6 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj index eb9a0dc3..538a80c2 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj index ae898602..46288e75 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj index e31bd731..23104c35 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj index ffb6f2ac..ce70040b 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj index 263faee1..2d195e51 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj index cdb0328e..df519975 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj index ec812cf2..9f84fc66 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj @@ -50,9 +50,9 @@ - - - + + + diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json b/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json index f51d986a..f22d5cd7 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~4.0.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~4.2.2" } } \ No newline at end of file diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/yarn.lock b/samples/EShopSample/aspnet-core/src/EShopSample.Web/yarn.lock index 96b1b5da..c9101903 100644 --- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/yarn.lock +++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.basic/download/@abp/aspnetcore.mvc.ui.theme.basic-4.0.2.tgz#ca6cf7407cf4137e83436d33187c8550995adb94" - integrity sha1-ymz3QHz0E36DQ20zGHyFUJla25Q= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~4.0.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.shared/download/@abp/aspnetcore.mvc.ui.theme.shared-4.0.2.tgz#5b4d9ed4e3212bf5ed7671c59811c15def47be86" - integrity sha1-W02e1OMhK/XtdnHFmBHBXe9HvoY= - dependencies: - "@abp/aspnetcore.mvc.ui" "~4.0.2" - "@abp/bootstrap" "~4.0.2" - "@abp/bootstrap-datepicker" "~4.0.2" - "@abp/datatables.net-bs4" "~4.0.2" - "@abp/font-awesome" "~4.0.2" - "@abp/jquery-form" "~4.0.2" - "@abp/jquery-validation-unobtrusive" "~4.0.2" - "@abp/lodash" "~4.0.2" - "@abp/luxon" "~4.0.2" - "@abp/malihu-custom-scrollbar-plugin" "~4.0.2" - "@abp/select2" "~4.0.2" - "@abp/sweetalert" "~4.0.2" - "@abp/timeago" "~4.0.2" - "@abp/toastr" "~4.0.2" - -"@abp/aspnetcore.mvc.ui@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui/download/@abp/aspnetcore.mvc.ui-4.0.2.tgz#6e3554cafca18e5794867cb77686e8b67084859d" - integrity sha1-bjVUyvyhjleUhny3dobotnCEhZ0= +"@abp/aspnetcore.mvc.ui.theme.basic@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.basic/download/@abp/aspnetcore.mvc.ui.theme.basic-4.2.2.tgz#7de6a36c8e6d0a60b8dbd13d1fd15e31b4ea91c3" + integrity sha1-feajbI5tCmC429E9H9FeMbTqkcM= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.2" + +"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui.theme.shared/download/@abp/aspnetcore.mvc.ui.theme.shared-4.2.2.tgz#3902475befccfb27b35c37a3372c4c56a7f09588" + integrity sha1-OQJHW+/M+yezXDejNyxMVqfwlYg= + dependencies: + "@abp/aspnetcore.mvc.ui" "~4.2.2" + "@abp/bootstrap" "~4.2.2" + "@abp/bootstrap-datepicker" "~4.2.2" + "@abp/datatables.net-bs4" "~4.2.2" + "@abp/font-awesome" "~4.2.2" + "@abp/jquery-form" "~4.2.2" + "@abp/jquery-validation-unobtrusive" "~4.2.2" + "@abp/lodash" "~4.2.2" + "@abp/luxon" "~4.2.2" + "@abp/malihu-custom-scrollbar-plugin" "~4.2.2" + "@abp/select2" "~4.2.2" + "@abp/sweetalert" "~4.2.2" + "@abp/timeago" "~4.2.2" + "@abp/toastr" "~4.2.2" + +"@abp/aspnetcore.mvc.ui@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/aspnetcore.mvc.ui/download/@abp/aspnetcore.mvc.ui-4.2.2.tgz#df4640836f460c590574c61607f5a023f2e3f510" + integrity sha1-30ZAg29GDFkFdMYWB/WgI/Lj9RA= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,145 +43,145 @@ micromatch "^4.0.2" path "^0.12.7" -"@abp/bootstrap-datepicker@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/bootstrap-datepicker/download/@abp/bootstrap-datepicker-4.0.2.tgz#e7865846791765da4aa4c7afa609fc401d370fd3" - integrity sha1-54ZYRnkXZdpKpMevpgn8QB03D9M= +"@abp/bootstrap-datepicker@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/bootstrap-datepicker/download/@abp/bootstrap-datepicker-4.2.2.tgz#1a553fb6824f2e795aecb0e803b8f5984a6f5ac6" + integrity sha1-GlU/toJPLnla7LDoA7j1mEpvWsY= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/bootstrap/download/@abp/bootstrap-4.0.2.tgz#eba957e39be0df0737e117e09b7e2cdfba395618" - integrity sha1-66lX45vg3wc34Rfgm34s37o5Vhg= +"@abp/bootstrap@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/bootstrap/download/@abp/bootstrap-4.2.2.tgz#3ae98e695edc32b2acb106bffc612c02627021b3" + integrity sha1-OumOaV7cMrKssQa//GEsAmJwIbM= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" bootstrap "^4.5.0" bootstrap-v4-rtl "4.4.1-2" -"@abp/core@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/core/download/@abp/core-4.0.2.tgz#cc4ad9459b2b3431bd576e8978a3fc8bf7e8df91" - integrity sha1-zErZRZsrNDG9V26JeKP8i/fo35E= +"@abp/core@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/core/download/@abp/core-4.2.2.tgz#a375404dec4f5b1e3f7496c2d5c92b18ab561fb6" + integrity sha1-o3VATexPWx4/dJbC1ckrGKtWH7Y= dependencies: - "@abp/utils" "^4.0.2" + "@abp/utils" "^4.2.2" -"@abp/datatables.net-bs4@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/datatables.net-bs4/download/@abp/datatables.net-bs4-4.0.2.tgz#afbdda7c776d0e21ab3fe8b6b6e3eced503a0d78" - integrity sha1-r73afHdtDiGrP+i2tuPs7VA6DXg= +"@abp/datatables.net-bs4@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/datatables.net-bs4/download/@abp/datatables.net-bs4-4.2.2.tgz#d74f738b79e87f7b8b9f8c5d8d4b84c7a56d6ac4" + integrity sha1-109zi3nof3uLn4xdjUuEx6VtasQ= dependencies: - "@abp/datatables.net" "~4.0.2" + "@abp/datatables.net" "~4.2.2" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/datatables.net/download/@abp/datatables.net-4.0.2.tgz#0822d438f4681e82633d3da8bac76ce721647441" - integrity sha1-CCLUOPRoHoJjPT2ousds5yFkdEE= +"@abp/datatables.net@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/datatables.net/download/@abp/datatables.net-4.2.2.tgz#5e3ac4f9b40b35696e065ef8ba206ce0aa25973a" + integrity sha1-XjrE+bQLNWluBl74uiBs4Kollzo= dependencies: - "@abp/jquery" "~4.0.2" + "@abp/jquery" "~4.2.2" datatables.net "^1.10.21" -"@abp/font-awesome@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/font-awesome/download/@abp/font-awesome-4.0.2.tgz#4971dfff0e9d010a256ec72dd8a226fc5de4cfd3" - integrity sha1-SXHf/w6dAQolbsct2KIm/F3kz9M= +"@abp/font-awesome@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/font-awesome/download/@abp/font-awesome-4.2.2.tgz#d6babe704b44bf3902d896a1342569069d6c07e0" + integrity sha1-1rq+cEtEvzkC2JahNCVpBp1sB+A= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/jquery-form/download/@abp/jquery-form-4.0.2.tgz#0996f8b2081c44c0c56594e861516bfff2c8ee6b" - integrity sha1-CZb4sggcRMDFZZToYVFr//LI7ms= +"@abp/jquery-form@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/jquery-form/download/@abp/jquery-form-4.2.2.tgz#a35c3eb8c2f4f0fa535fd020469273ce301c4941" + integrity sha1-o1w+uML08PpTX9AgRpJzzjAcSUE= dependencies: - "@abp/jquery" "~4.0.2" + "@abp/jquery" "~4.2.2" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/jquery-validation-unobtrusive/download/@abp/jquery-validation-unobtrusive-4.0.2.tgz#fa34b5e509104d1792e3201c126902a45600764a" - integrity sha1-+jS15QkQTReS4yAcEmkCpFYAdko= +"@abp/jquery-validation-unobtrusive@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/jquery-validation-unobtrusive/download/@abp/jquery-validation-unobtrusive-4.2.2.tgz#f05298475d263b0f82c59bce23a8a9470782f718" + integrity sha1-8FKYR10mOw+CxZvOI6ipRweC9xg= dependencies: - "@abp/jquery-validation" "~4.0.2" + "@abp/jquery-validation" "~4.2.2" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/jquery-validation/download/@abp/jquery-validation-4.0.2.tgz#feb61513923e6b97c59a840fc6cccfb73294fe02" - integrity sha1-/rYVE5I+a5fFmoQPxszPtzKU/gI= +"@abp/jquery-validation@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/jquery-validation/download/@abp/jquery-validation-4.2.2.tgz#fe245a903c06baaae08222164cb1299af0ecf23b" + integrity sha1-/iRakDwGuqrggiIWTLEpmvDs8js= dependencies: - "@abp/jquery" "~4.0.2" + "@abp/jquery" "~4.2.2" jquery-validation "^1.19.2" -"@abp/jquery@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/jquery/download/@abp/jquery-4.0.2.tgz#1b1db4e5de7a7be9f12805dcfda1aa5f1d01cc25" - integrity sha1-Gx205d56e+nxKAXc/aGqXx0BzCU= +"@abp/jquery@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/jquery/download/@abp/jquery-4.2.2.tgz#9caf1692cf7153a6166332b72e8f3108b1990268" + integrity sha1-nK8Wks9xU6YWYzK3Lo8xCLGZAmg= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" jquery "~3.5.1" -"@abp/lodash@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/lodash/download/@abp/lodash-4.0.2.tgz#b35a54a6fe17f3696ba087ca77f99620567c765e" - integrity sha1-s1pUpv4X82lroIfKd/mWIFZ8dl4= +"@abp/lodash@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/lodash/download/@abp/lodash-4.2.2.tgz#537808a7c062eed62a2f057bd68c80721398e490" + integrity sha1-U3gIp8Bi7tYqLwV71oyAchOY5JA= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" lodash "^4.17.15" -"@abp/luxon@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/luxon/download/@abp/luxon-4.0.2.tgz#a0156f03f496b37e2db08f8416df974fa7093300" - integrity sha1-oBVvA/SWs34tsI+EFt+XT6cJMwA= +"@abp/luxon@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/luxon/download/@abp/luxon-4.2.2.tgz#29d79ee76e97c148d5d015d7c05cd2eb6f03cde6" + integrity sha1-Kdee526XwUjV0BXXwFzS628DzeY= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/malihu-custom-scrollbar-plugin/download/@abp/malihu-custom-scrollbar-plugin-4.0.2.tgz#9813192b921219617b1ecef1d1b16c8c080534ec" - integrity sha1-mBMZK5ISGWF7Hs7x0bFsjAgFNOw= +"@abp/malihu-custom-scrollbar-plugin@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/malihu-custom-scrollbar-plugin/download/@abp/malihu-custom-scrollbar-plugin-4.2.2.tgz#41a50143d576b6a6d90cdf555f37071b80198e0c" + integrity sha1-QaUBQ9V2tqbZDN9VXzcHG4AZjgw= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/select2/download/@abp/select2-4.0.2.tgz#700234b74401e29156470a798bcfd02b64e6b450" - integrity sha1-cAI0t0QB4pFWRwp5i8/QK2TmtFA= +"@abp/select2@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/select2/download/@abp/select2-4.2.2.tgz#cff05d9d8078de237a6ce83642583a9fd1418b7c" + integrity sha1-z/BdnYB43iN6bOg2Qlg6n9FBi3w= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" select2 "^4.0.13" -"@abp/sweetalert@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/sweetalert/download/@abp/sweetalert-4.0.2.tgz#54eba2d029d75ab1ae0b688fca4ccde309bc2a26" - integrity sha1-VOui0CnXWrGuC2iPykzN4wm8KiY= +"@abp/sweetalert@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/sweetalert/download/@abp/sweetalert-4.2.2.tgz#227459cfdac1ef4095c71d08bc2cd52dd49a5390" + integrity sha1-InRZz9rB70CVxx0IvCzVLdSaU5A= dependencies: - "@abp/core" "~4.0.2" + "@abp/core" "~4.2.2" sweetalert "^2.1.2" -"@abp/timeago@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/timeago/download/@abp/timeago-4.0.2.tgz#64f4a40f6acb50b4a202280dc00498f7370a7146" - integrity sha1-ZPSkD2rLULSiAigNwASY9zcKcUY= +"@abp/timeago@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/timeago/download/@abp/timeago-4.2.2.tgz#8b9731fb070f71a7e0a833c771cc527bcbfb937d" + integrity sha1-i5cx+wcPcafgqDPHccxSe8v7k30= dependencies: - "@abp/jquery" "~4.0.2" + "@abp/jquery" "~4.2.2" timeago "^1.6.7" -"@abp/toastr@~4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/toastr/download/@abp/toastr-4.0.2.tgz#039adfada21f6ed83bce8a1a9e6ada8decb4d808" - integrity sha1-A5rfraIfbtg7zooanmrajey02Ag= +"@abp/toastr@~4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/toastr/download/@abp/toastr-4.2.2.tgz#9d9fc8cc131e49cf2ed1cdfeead2a6fc30d16deb" + integrity sha1-nZ/IzBMeSc8u0c3+6tKm/DDRbes= dependencies: - "@abp/jquery" "~4.0.2" + "@abp/jquery" "~4.2.2" toastr "^2.1.4" -"@abp/utils@^4.0.2": - version "4.0.2" - resolved "https://registry.npm.taobao.org/@abp/utils/download/@abp/utils-4.0.2.tgz#ebdbb25ee680d4874d049d4190446e64a75b512d" - integrity sha1-69uyXuaA1IdNBJ1BkERuZKdbUS0= +"@abp/utils@^4.2.2": + version "4.2.2" + resolved "https://registry.npm.taobao.org/@abp/utils/download/@abp/utils-4.2.2.tgz#7afdbbd14246ce06c074109c51d01588596805a9" + integrity sha1-ev270UJGzgbAdBCcUdAViFloBak= dependencies: just-compare "^1.3.0" diff --git a/samples/EShopSample/aspnet-core/test/EShopSample.Application.Tests/EShopSample.Application.Tests.csproj b/samples/EShopSample/aspnet-core/test/EShopSample.Application.Tests/EShopSample.Application.Tests.csproj index a4e3551d..a6105205 100644 --- a/samples/EShopSample/aspnet-core/test/EShopSample.Application.Tests/EShopSample.Application.Tests.csproj +++ b/samples/EShopSample/aspnet-core/test/EShopSample.Application.Tests/EShopSample.Application.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/samples/EShopSample/aspnet-core/test/EShopSample.Domain.Tests/EShopSample.Domain.Tests.csproj b/samples/EShopSample/aspnet-core/test/EShopSample.Domain.Tests/EShopSample.Domain.Tests.csproj index 15ed2476..09b985c7 100644 --- a/samples/EShopSample/aspnet-core/test/EShopSample.Domain.Tests/EShopSample.Domain.Tests.csproj +++ b/samples/EShopSample/aspnet-core/test/EShopSample.Domain.Tests/EShopSample.Domain.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/EShopSample/aspnet-core/test/EShopSample.EntityFrameworkCore.Tests/EShopSample.EntityFrameworkCore.Tests.csproj b/samples/EShopSample/aspnet-core/test/EShopSample.EntityFrameworkCore.Tests/EShopSample.EntityFrameworkCore.Tests.csproj index 9be81218..945ecab0 100644 --- a/samples/EShopSample/aspnet-core/test/EShopSample.EntityFrameworkCore.Tests/EShopSample.EntityFrameworkCore.Tests.csproj +++ b/samples/EShopSample/aspnet-core/test/EShopSample.EntityFrameworkCore.Tests/EShopSample.EntityFrameworkCore.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/samples/EShopSample/aspnet-core/test/EShopSample.TestBase/EShopSample.TestBase.csproj b/samples/EShopSample/aspnet-core/test/EShopSample.TestBase/EShopSample.TestBase.csproj index 2c794864..6e324920 100644 --- a/samples/EShopSample/aspnet-core/test/EShopSample.TestBase/EShopSample.TestBase.csproj +++ b/samples/EShopSample/aspnet-core/test/EShopSample.TestBase/EShopSample.TestBase.csproj @@ -15,12 +15,12 @@ - + - + - + diff --git a/samples/EShopSample/aspnet-core/test/EShopSample.Web.Tests/EShopSample.Web.Tests.csproj b/samples/EShopSample/aspnet-core/test/EShopSample.Web.Tests/EShopSample.Web.Tests.csproj index 33fb3149..7df7d139 100644 --- a/samples/EShopSample/aspnet-core/test/EShopSample.Web.Tests/EShopSample.Web.Tests.csproj +++ b/samples/EShopSample/aspnet-core/test/EShopSample.Web.Tests/EShopSample.Web.Tests.csproj @@ -14,7 +14,7 @@ - +