Browse Source

upgrade abp framework 4.2.1

pull/200/head
cKey 5 years ago
parent
commit
c4f0d34515
  1. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj
  2. 4
      aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj
  3. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj
  4. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj
  5. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj
  6. 6
      aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj
  7. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj
  8. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj
  9. 3
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/AggregateReRouteAppService.cs
  10. 3
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationAppService.cs
  11. 3
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/ReRouteAppService.cs
  12. 3
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/RouteGroupAppService.cs
  13. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj
  14. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj
  15. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj
  16. 12
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreAggregateReRouteRepository.cs
  17. 9
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreDynamicReRouteRepository.cs
  18. 18
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreGlobalConfigRepository.cs
  19. 31
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreReRouteRepository.cs
  20. 9
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreRouteGroupRepository.cs
  21. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj
  22. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj
  23. 6
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationController.cs
  24. 10
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj
  25. 8
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj
  26. 2
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj
  27. 8
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj
  28. 6
      aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj
  29. 2
      aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj
  30. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Validation/LINGYUN.Abp.AspNetCore.Mvc.Validation.csproj
  31. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj
  32. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj
  33. 4
      aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj
  34. 2
      aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj
  35. 2
      aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj
  36. 2
      aspnet-core/modules/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj
  37. 2
      aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj
  38. 2
      aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj
  39. 4
      aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj
  40. 2
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj
  41. 2
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj
  42. 2
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj
  43. 2
      aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj
  44. 2
      aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj
  45. 2
      aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj
  46. 2
      aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj
  47. 4
      aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj
  48. 4
      aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj
  49. 4
      aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj
  50. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj
  51. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj
  52. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj
  53. 2
      aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj
  54. 4
      aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj
  55. 3
      aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN/Abp/Notifications/SignalR/Hubs/NotificationsHub.cs
  56. 2
      aspnet-core/modules/common/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj
  57. 6
      aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj
  58. 2
      aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj
  59. 7
      aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/Hubs/OnlineClientHubBase.cs
  60. 2
      aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj
  61. 2
      aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj
  62. 2
      aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj
  63. 2
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj
  64. 2
      aspnet-core/modules/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj
  65. 4
      aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj
  66. 8
      aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN/Abp/FeatureManagement/Client/ClientFeatureManagementProvider.cs
  67. 2
      aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj
  68. 2
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj
  69. 2
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj
  70. 4
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj
  71. 2
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj
  72. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj
  73. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj
  74. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj
  75. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj
  76. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj
  77. 23
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs
  78. 49
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
  79. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj
  80. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj
  81. 4
      aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj
  82. 6
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj
  83. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj
  84. 3
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/AbpIdentityServerAppServiceBase.cs
  85. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj
  86. 13
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN/Abp/IdentityServer/ApiScopes/IApiScopeRepository.cs
  87. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj
  88. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/ApiResources/EfCoreApiResourceRepository.cs
  89. 37
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/ApiScopes/EfCoreApiScopeRepository.cs
  90. 4
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/Grants/EfCorePersistentGrantRepository.cs
  91. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/IdentityResources/EfCoreIdentityResourceRepository.cs
  92. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj
  93. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj
  94. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat/LINGYUN.Abp.IdentityServer.WeChat.csproj
  95. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj
  96. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj
  97. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj
  98. 5
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/ChatAppService.cs
  99. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj
  100. 10
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj

2
aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Sms" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Account.Application" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Sms" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

6
aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj

@ -29,9 +29,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Web" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Sms" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Emailing" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Account.Web" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Sms" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Emailing" Version="4.2.1" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.8" />
</ItemGroup>

4
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj

@ -18,8 +18,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

4
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

3
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/AggregateReRouteAppService.cs

@ -15,8 +15,7 @@ namespace LINGYUN.ApiGateway.Ocelot
[Authorize(ApiGatewayPermissions.AggregateRoute.Default)]
public class AggregateReRouteAppService : ApiGatewayApplicationServiceBase, IAggregateReRouteAppService
{
private IDistributedEventBus _eventBus;
protected IDistributedEventBus DistributedEventBus => LazyGetRequiredService(ref _eventBus);
protected IDistributedEventBus DistributedEventBus => LazyServiceProvider.LazyGetRequiredService<IDistributedEventBus>();
private readonly IAggregateReRouteRepository _aggregateReRouteRepository;

3
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationAppService.cs

@ -11,8 +11,7 @@ namespace LINGYUN.ApiGateway.Ocelot
[Authorize(ApiGatewayPermissions.Global.Default)]
public class GlobalConfigurationAppService : ApiGatewayApplicationServiceBase, IGlobalConfigurationAppService
{
private IDistributedEventBus _eventBus;
protected IDistributedEventBus DistributedEventBus => LazyGetRequiredService(ref _eventBus);
protected IDistributedEventBus DistributedEventBus => LazyServiceProvider.LazyGetRequiredService<IDistributedEventBus>();
private readonly IRouteGroupChecker _routeGroupChecker;
private readonly IGlobalConfigRepository _globalConfigRepository;

3
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/ReRouteAppService.cs

@ -10,8 +10,7 @@ namespace LINGYUN.ApiGateway.Ocelot
[Authorize(ApiGatewayPermissions.Route.Default)]
public class ReRouteAppService : ApiGatewayApplicationServiceBase, IReRouteAppService
{
private IDistributedEventBus _eventBus;
protected IDistributedEventBus DistributedEventBus => LazyGetRequiredService(ref _eventBus);
protected IDistributedEventBus DistributedEventBus => LazyServiceProvider.LazyGetRequiredService<IDistributedEventBus>();
private readonly IRouteGroupChecker _routeGroupChecker;
private readonly IReRouteRepository _reRouteRepository;

3
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/RouteGroupAppService.cs

@ -10,8 +10,7 @@ namespace LINGYUN.ApiGateway.Ocelot
[Authorize(ApiGatewayPermissions.RouteGroup.Default)]
public class RouteGroupAppService : ApiGatewayApplicationServiceBase, IRouteGroupAppService
{
private IDataFilter _dataFilter;
protected IDataFilter DataFilter => LazyGetRequiredService(ref _dataFilter);
protected IDataFilter DataFilter => LazyServiceProvider.LazyGetRequiredService<IDataFilter>();
protected IRouteGroupRepository RouterRepository { get; }
public RouteGroupAppService(

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Caching" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.1.2" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

12
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreAggregateReRouteRepository.cs

@ -17,23 +17,25 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task<bool> AggregateReRouteNameExistsAsync(string name)
{
return await DbSet.AnyAsync(ar => ar.Name.Equals(name));
return await (await GetDbSetAsync()).AnyAsync(ar => ar.Name.Equals(name));
}
public async Task<AggregateReRoute> GetByRouteIdAsync(long routeId)
{
return await WithDetails().Where(ar => ar.ReRouteId.Equals(routeId)).FirstOrDefaultAsync();
return await (await WithDetailsAsync())
.Where(ar => ar.ReRouteId.Equals(routeId)).FirstOrDefaultAsync();
}
public async Task<List<AggregateReRoute>> GetByAppIdAsync(string appId)
{
return await WithDetails().Where(ar => ar.AppId.Equals(appId)).ToListAsync();
return await (await WithDetailsAsync())
.Where(ar => ar.AppId.Equals(appId)).ToListAsync();
}
public async Task<(List<AggregateReRoute> routes, long total)> GetPagedListAsync(string appId, string filter = "",
string sorting = "", int skipCount = 1, int maxResultCount = 100)
{
var resultReRoutes = await WithDetails()
var resultReRoutes = await (await WithDetailsAsync())
.Where(ar => ar.AppId.Equals(appId))
.WhereIf(!filter.IsNullOrWhiteSpace(), ar => ar.ReRouteKeys.Contains(filter) ||
ar.UpstreamHost.Contains(filter) || ar.UpstreamPathTemplate.Contains(filter))
@ -41,7 +43,7 @@ namespace LINGYUN.ApiGateway.Ocelot
.EfPageBy(skipCount, maxResultCount)
.ToListAsync();
var total = await GetQueryable()
var total = await (await GetQueryableAsync())
.Where(ar => ar.AppId.Equals(appId))
.WhereIf(!filter.IsNullOrWhiteSpace(), ar => ar.ReRouteKeys.Contains(filter) ||
ar.UpstreamHost.Contains(filter) || ar.UpstreamPathTemplate.Contains(filter)).LongCountAsync();

9
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreDynamicReRouteRepository.cs

@ -17,12 +17,17 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task<DynamicReRoute> GetByItemIdAsync(int itemId)
{
return await GetQueryable().Where(x => x.DynamicReRouteId.Equals(itemId)).FirstOrDefaultAsync();
return await (await GetQueryableAsync()).Where(x => x.DynamicReRouteId.Equals(itemId)).FirstOrDefaultAsync();
}
public async Task<List<DynamicReRoute>> GetByAppIdAsync(string appId)
{
return await WithDetails().Where(x => x.AppId.Equals(appId)).ToListAsync();
return await (await WithDetailsAsync()).Where(x => x.AppId.Equals(appId)).ToListAsync();
}
public override async Task<IQueryable<DynamicReRoute>> WithDetailsAsync()
{
return await WithDetailsAsync(x => x.RateLimitRule); ;
}
public override IQueryable<DynamicReRoute> WithDetails()

18
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreGlobalConfigRepository.cs

@ -19,7 +19,7 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task<GlobalConfiguration> GetByItemIdAsync(long itemId)
{
var globalConfiguration = await WithDetails().Where(x => x.ItemId.Equals(itemId)).FirstOrDefaultAsync();
var globalConfiguration = await (await WithDetailsAsync()).Where(x => x.ItemId.Equals(itemId)).FirstOrDefaultAsync();
if(globalConfiguration == null)
{
throw new EntityNotFoundException(typeof(GlobalConfiguration));
@ -29,7 +29,7 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task<GlobalConfiguration> GetByAppIdAsync(string appId)
{
return await WithDetails()
return await (await WithDetailsAsync())
.Where(g => g.AppId.Equals(appId))
.FirstOrDefaultAsync();
}
@ -37,13 +37,13 @@ namespace LINGYUN.ApiGateway.Ocelot
public virtual async Task<(List<GlobalConfiguration> Globals, long TotalCount)> GetPagedListAsync(string filter = "", string sorting = "",
int skipCount = 1, int maxResultCount = 10)
{
var globals = await WithDetails()
var globals = await (await WithDetailsAsync())
.WhereIf(!filter.IsNullOrWhiteSpace(), g => g.AppId.Contains(filter) ||
g.BaseUrl.Contains(filter) || g.DownstreamScheme.Contains(filter))
.OrderBy(g => sorting ?? g.BaseUrl)
.EfPageBy(skipCount, maxResultCount)
.ToListAsync();
var total = await GetQueryable()
var total = await (await GetQueryableAsync())
.WhereIf(!filter.IsNullOrWhiteSpace(), g => g.AppId.Contains(filter) ||
g.BaseUrl.Contains(filter) || g.DownstreamScheme.Contains(filter))
.LongCountAsync();
@ -51,6 +51,16 @@ namespace LINGYUN.ApiGateway.Ocelot
return ValueTuple.Create(globals, total);
}
public override async Task<IQueryable<GlobalConfiguration>> WithDetailsAsync()
{
return await WithDetailsAsync(
x => x.HttpHandlerOptions,
x => x.LoadBalancerOptions,
x => x.QoSOptions,
x => x.RateLimitOptions,
x => x.ServiceDiscoveryProvider);
}
public override IQueryable<GlobalConfiguration> WithDetails()
{
return WithDetails(

31
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreReRouteRepository.cs

@ -19,19 +19,19 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task<ReRoute> GetByNameAsync(string routeName)
{
var reRoute = await WithDetails().Where(x => x.ReRouteName.Equals(routeName)).FirstOrDefaultAsync();
var reRoute = await (await WithDetailsAsync()).Where(x => x.ReRouteName.Equals(routeName)).FirstOrDefaultAsync();
return reRoute ?? throw new EntityNotFoundException(typeof(ReRoute), routeName);
}
public async Task<ReRoute> GetByReRouteIdAsync(long routeId)
{
var reRoute = await WithDetails().Where(x => x.ReRouteId.Equals(routeId)).FirstOrDefaultAsync();
var reRoute = await (await WithDetailsAsync()).Where(x => x.ReRouteId.Equals(routeId)).FirstOrDefaultAsync();
return reRoute ?? throw new EntityNotFoundException(typeof(ReRoute), routeId);
}
public async Task<List<ReRoute>> GetByAppIdAsync(string appId)
{
return await WithDetails()
return await (await WithDetailsAsync())
.Where(r => r.AppId.Equals(appId))
.ToListAsync();
}
@ -39,7 +39,7 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task<(List<ReRoute> routes, long total)> GetPagedListAsync(string appId, string filter = "",
string sorting = "", int skipCount = 1, int maxResultCount = 100)
{
var resultReRoutes = await WithDetails()
var resultReRoutes = await (await WithDetailsAsync())
.Where(r => r.AppId.Equals(appId))
.WhereIf(!filter.IsNullOrWhiteSpace(), r => r.ReRouteName.Contains(filter) ||
r.DownstreamHostAndPorts.Contains(filter) || r.ServiceName.Contains(filter))
@ -47,7 +47,7 @@ namespace LINGYUN.ApiGateway.Ocelot
.EfPageBy(skipCount, maxResultCount)
.ToListAsync();
var total = await GetQueryable()
var total = await (await GetQueryableAsync())
.Where(r => r.AppId.Equals(appId))
.WhereIf(!filter.IsNullOrWhiteSpace(), r => r.ReRouteName.Contains(filter) ||
r.DownstreamHostAndPorts.Contains(filter) || r.ServiceName.Contains(filter))
@ -58,20 +58,21 @@ namespace LINGYUN.ApiGateway.Ocelot
public async Task RemoveAsync(CancellationToken cancellationToken = default(CancellationToken))
{
var entityType = DbContext.Model.FindEntityType(typeof(ReRoute));
var dbContext = await GetDbContextAsync();
var entityType = dbContext.Model.FindEntityType(typeof(ReRoute));
var tableName = entityType.GetTableName();//.Relational().TableName;
var sqlText = $"DELETE FROM @tableName";
var sqlParam = new List<object> { new { tableName } };
// TODO: Test
await DbContext.Database.ExecuteSqlRawAsync(sqlText, sqlParam, cancellationToken);
await dbContext.Database.ExecuteSqlRawAsync(sqlText, sqlParam, cancellationToken);
//await DbContext.Database.ExecuteSqlCommandAsync(sqlText, sqlParam, cancellationToken);
}
public override IQueryable<ReRoute> WithDetails()
public override async Task<IQueryable<ReRoute>> WithDetailsAsync()
{
return WithDetails(
return await WithDetailsAsync(
x => x.AuthenticationOptions,
x => x.CacheOptions,
x => x.HttpHandlerOptions,
@ -80,5 +81,17 @@ namespace LINGYUN.ApiGateway.Ocelot
x => x.RateLimitOptions,
x => x.SecurityOptions);
}
public override IQueryable<ReRoute> WithDetails()
{
return WithDetails(
x => x.AuthenticationOptions,
x => x.CacheOptions,
x => x.HttpHandlerOptions,
x => x.LoadBalancerOptions,
x => x.QoSOptions,
x => x.RateLimitOptions,
x => x.SecurityOptions);
}
}
}

9
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreRouteGroupRepository.cs

@ -18,24 +18,25 @@ namespace LINGYUN.ApiGateway.Ocelot
public virtual async Task<IEnumerable<RouteGroupAppKey>> GetActivedAppsAsync()
{
return await DbSet.Select(g => new RouteGroupAppKey(g.AppId, g.AppName)).ToArrayAsync();
return await (await GetDbSetAsync()).Select(g => new RouteGroupAppKey(g.AppId, g.AppName)).ToArrayAsync();
}
public virtual async Task<RouteGroup> GetByAppIdAsync(string appId)
{
var routeGroup = await DbSet.Where(g => g.AppId.Equals(appId)).FirstOrDefaultAsync();
var routeGroup = await (await GetDbSetAsync()).Where(g => g.AppId.Equals(appId)).FirstOrDefaultAsync();
return routeGroup ?? throw new EntityNotFoundException(typeof(RouteGroup), appId);
}
public virtual async Task<(List<RouteGroup> Routers, long TotalCount)> GetPagedListAsync(string filter = "", string sorting = "", int skipCount = 1, int maxResultCount = 10)
{
var groups = await DbSet
var dbSet = await GetDbSetAsync();
var groups = await dbSet
.WhereIf(!filter.IsNullOrWhiteSpace(), g => g.AppId.Contains(filter) ||
g.AppName.Contains(filter) || g.AppIpAddress.Contains(filter) || g.Description.Contains(filter))
.OrderBy(g => sorting ?? nameof(RouteGroup.AppId))
.EfPageBy(skipCount, maxResultCount)
.ToListAsync();
var toatl = await DbSet
var toatl = await dbSet
.WhereIf(!filter.IsNullOrWhiteSpace(), g => g.AppId.Contains(filter) ||
g.AppName.Contains(filter) || g.AppIpAddress.Contains(filter) || g.Description.Contains(filter))
.LongCountAsync();

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Http.Client" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

6
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationController.cs

@ -1,10 +1,8 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Clients;
namespace LINGYUN.ApiGateway.Ocelot
{
@ -27,8 +25,6 @@ namespace LINGYUN.ApiGateway.Ocelot
[Route("By-AppId/{AppId}")]
public async Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto input)
{
ICurrentClient client = null;
var currentClient = LazyGetRequiredService(ref client);
return await GlobalConfigurationAppService.GetAsync(input);
}

10
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj

@ -13,11 +13,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Features" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Features" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" />
</ItemGroup>
</Project>

8
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj

@ -8,10 +8,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.2.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

8
aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj

@ -21,10 +21,10 @@
<ItemGroup>
<PackageReference Include="aliyun-net-sdk-core" Version="1.5.10" />
<PackageReference Include="Volo.Abp.Caching" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Settings" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Caching" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Json" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Settings" Version="4.2.1" />
</ItemGroup>
</Project>

6
aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj

@ -19,9 +19,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Settings" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Json" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Settings" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Validation/LINGYUN.Abp.AspNetCore.Mvc.Validation.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.0" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.HangFire" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.1.2" />
<PackageReference Include="Volo.Abp.HangFire" Version="4.2.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj

@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.10.0" />
<PackageReference Include="Volo.Abp.BlobStoring" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BlobStoring" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj

@ -12,7 +12,7 @@
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Volo.Abp.Core" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj

@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="DotNetCore.CAP" Version="3.1.2" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.1.2" />
<PackageReference Include="Volo.Abp.EventBus" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.2.1" />
<PackageReference Include="Volo.Abp.EventBus" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj

@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Emailing" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Emailing" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
</ItemGroup>

2
aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj

@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.0.593" />
<PackageReference Include="Volo.Abp.Core" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Features" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Features" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Volo.Abp.HangFire" Version="4.1.2" />
<PackageReference Include="Volo.Abp.HangFire" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="HangFire.SqlServer" Version="1.7.19" />
<PackageReference Include="Volo.Abp.HangFire" Version="4.1.2" />
<PackageReference Include="Volo.Abp.HangFire" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

4
aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Auditing" Version="4.1.2" />
<PackageReference Include="Volo.Abp.EventBus" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Auditing" Version="4.2.1" />
<PackageReference Include="Volo.Abp.EventBus" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj

@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityModel" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Caching" Version="4.2.1" />
<PackageReference Include="Volo.Abp.IdentityModel" Version="4.2.1" />
</ItemGroup>
</Project>

6
aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj

@ -17,9 +17,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Threading" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Threading" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

6
aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj

@ -20,9 +20,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Threading" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Json" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Threading" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

6
aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj

@ -20,9 +20,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0" />
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Threading" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Json" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Threading" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

3
aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN/Abp/Notifications/SignalR/Hubs/NotificationsHub.cs

@ -12,8 +12,7 @@ namespace LINGYUN.Abp.Notifications.SignalR.Hubs
[Authorize]
public class NotificationsHub : OnlineClientHubBase
{
private INotificationStore _notificationStore;
protected INotificationStore NotificationStore => LazyGetRequiredService(ref _notificationStore);
protected INotificationStore NotificationStore => LazyServiceProvider.LazyGetRequiredService<INotificationStore>();
protected override async Task OnClientConnectedAsync(IOnlineClient client)
{

2
aspnet-core/modules/common/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Sms" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Sms" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

6
aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj

@ -8,9 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EventBus" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.1.2" />
<PackageReference Include="Volo.Abp.EventBus" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Json" Version="4.2.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

7
aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/Hubs/OnlineClientHubBase.cs

@ -9,11 +9,8 @@ namespace LINGYUN.Abp.RealTime.SignalR
{
public abstract class OnlineClientHubBase : AbpHub, IClient
{
private IWebClientInfoProvider _webClientInfoProvider;
protected IWebClientInfoProvider WebClientInfoProvider => LazyGetRequiredService(ref _webClientInfoProvider);
private IOnlineClientManager _onlineClientManager;
protected IOnlineClientManager OnlineClientManager => LazyGetRequiredService(ref _onlineClientManager);
protected IWebClientInfoProvider WebClientInfoProvider => LazyServiceProvider.LazyGetRequiredService<IWebClientInfoProvider>();
protected IOnlineClientManager OnlineClientManager => LazyServiceProvider.LazyGetRequiredService<IOnlineClientManager>();
public override async Task OnConnectedAsync()
{

2
aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Settings" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Settings" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj

@ -19,7 +19,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Sms" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Sms" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Security" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Security" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Authorization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

8
aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN/Abp/FeatureManagement/Client/ClientFeatureManagementProvider.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.Features.Client;
using System.Threading.Tasks;
using Volo.Abp.Clients;
using Volo.Abp.DependencyInjection;
using Volo.Abp.FeatureManagement;
@ -20,14 +21,15 @@ namespace LINGYUN.Abp.FeatureManagement.Client
CurrentClient = currentClient;
}
protected override string NormalizeProviderKey(string providerKey)
protected override Task<string> NormalizeProviderKeyAsync(string providerKey)
{
if (providerKey != null)
{
return providerKey;
base.NormalizeProviderKeyAsync(providerKey);
}
return CurrentClient.Id;
return Task.FromResult(CurrentClient.Id);
}
}
}

2
aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Features" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Features" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Validation" Version="4.2.1" />
</ItemGroup>
</Project>

4
aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.FileSystem" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BlobStoring.FileSystem" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

23
aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs

@ -1,5 +1,4 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Internal;
using System;
using System.Collections.Generic;
using System.Linq;
@ -26,7 +25,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
return await DbSet.IncludeDetails(includeDetails)
return await (await GetDbSetAsync()).IncludeDetails(includeDetails)
.Where(role => roleIds.Contains(role.Id))
.ToListAsync(GetCancellationToken(cancellationToken));
}
@ -36,8 +35,9 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
bool includeDetails = false,
CancellationToken cancellationToken = default)
{
var query = from roleOU in DbContext.Set<OrganizationUnitRole>()
join ou in DbContext.OrganizationUnits.IncludeDetails(includeDetails) on roleOU.OrganizationUnitId equals ou.Id
var dbContext = await GetDbContextAsync();
var query = from roleOU in dbContext.Set<OrganizationUnitRole>()
join ou in dbContext.OrganizationUnits.IncludeDetails(includeDetails) on roleOU.OrganizationUnitId equals ou.Id
where roleOU.RoleId == id
select ou;
@ -48,8 +48,8 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
List<Guid> organizationUnitIds,
CancellationToken cancellationToken = default)
{
var query = from roleOu in DbContext.Set<OrganizationUnitRole>()
join user in DbSet on roleOu.RoleId equals user.Id
var query = from roleOu in (await GetDbContextAsync()).Set<OrganizationUnitRole>()
join user in (await GetDbSetAsync()) on roleOu.RoleId equals user.Id
where organizationUnitIds.Contains(roleOu.OrganizationUnitId)
select user;
return await query.ToListAsync(GetCancellationToken(cancellationToken));
@ -59,8 +59,8 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
Guid organizationUnitId,
CancellationToken cancellationToken = default)
{
var query = from roleOu in DbContext.Set<OrganizationUnitRole>()
join user in DbSet on roleOu.RoleId equals user.Id
var query = from roleOu in (await GetDbContextAsync()).Set<OrganizationUnitRole>()
join user in (await GetDbSetAsync()) on roleOu.RoleId equals user.Id
where roleOu.OrganizationUnitId == organizationUnitId
select user;
return await query.ToListAsync(GetCancellationToken(cancellationToken));
@ -70,9 +70,10 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
string code,
CancellationToken cancellationToken = default)
{
var query = from roleOU in DbContext.Set<OrganizationUnitRole>()
join user in DbSet on roleOU.RoleId equals user.Id
join ou in DbContext.Set<OrganizationUnit>() on roleOU.OrganizationUnitId equals ou.Id
var dbContext = await GetDbContextAsync();
var query = from roleOU in dbContext.Set<OrganizationUnitRole>()
join user in (await GetDbSetAsync()) on roleOU.RoleId equals user.Id
join ou in dbContext.Set<OrganizationUnit>() on roleOU.OrganizationUnitId equals ou.Id
where ou.Code.StartsWith(code)
select user;
return await query.ToListAsync(GetCancellationToken(cancellationToken));

49
aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@ -24,7 +24,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
string phoneNumber,
CancellationToken cancellationToken = default)
{
return await DbSet.IncludeDetails(false)
return await (await GetDbSetAsync()).IncludeDetails(false)
.AnyAsync(user => user.PhoneNumber == phoneNumber,
GetCancellationToken(cancellationToken));
}
@ -33,7 +33,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
string phoneNumber,
CancellationToken cancellationToken = default)
{
return await DbSet.IncludeDetails(false)
return await (await GetDbSetAsync()).IncludeDetails(false)
.AnyAsync(user => user.PhoneNumber == phoneNumber && user.PhoneNumberConfirmed,
GetCancellationToken(cancellationToken));
}
@ -42,7 +42,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
string normalizedEmail,
CancellationToken cancellationToken = default)
{
return await DbSet.IncludeDetails(false)
return await (await GetDbSetAsync()).IncludeDetails(false)
.AnyAsync(user => user.NormalizedEmail == normalizedEmail && user.EmailConfirmed,
GetCancellationToken(cancellationToken));
}
@ -53,7 +53,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
bool includeDetails = false,
CancellationToken cancellationToken = default)
{
return await DbSet.IncludeDetails(includeDetails)
return await (await GetDbSetAsync()).IncludeDetails(includeDetails)
.Where(user => user.PhoneNumber == phoneNumber && user.PhoneNumberConfirmed == isConfirmed)
.FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
}
@ -64,7 +64,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
return await DbSet.IncludeDetails(includeDetails)
return await (await GetDbSetAsync()).IncludeDetails(includeDetails)
.Where(user => userIds.Contains(user.Id))
.ToListAsync(GetCancellationToken(cancellationToken));
}
@ -78,8 +78,9 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOU in DbContext.Set<IdentityUserOrganizationUnit>()
join ou in DbContext.OrganizationUnits.IncludeDetails(includeDetails) on userOU.OrganizationUnitId equals ou.Id
var dbContext = await GetDbContextAsync();
var query = from userOU in dbContext.Set<IdentityUserOrganizationUnit>()
join ou in dbContext.OrganizationUnits.IncludeDetails(includeDetails) on userOU.OrganizationUnitId equals ou.Id
where userOU.UserId == id
select ou;
@ -95,8 +96,9 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
join user in DbSet on userOu.UserId equals user.Id
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in (await GetDbSetAsync()) on userOu.UserId equals user.Id
where userOu.OrganizationUnitId == organizationUnitId
select user;
return await query
@ -115,8 +117,9 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
join user in DbSet on userOu.UserId equals user.Id
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in (await GetDbSetAsync()) on userOu.UserId equals user.Id
where userOu.OrganizationUnitId == organizationUnitId
select user;
return await query
@ -134,8 +137,9 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
join user in DbSet on userOu.UserId equals user.Id
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in (await GetDbSetAsync()) on userOu.UserId equals user.Id
where organizationUnitIds.Contains(userOu.OrganizationUnitId)
select user;
return await query
@ -154,8 +158,9 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
join user in DbSet on userOu.UserId equals user.Id
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in (await GetDbSetAsync()) on userOu.UserId equals user.Id
where organizationUnitIds.Contains(userOu.OrganizationUnitId)
select user;
return await query
@ -173,9 +178,10 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
join user in DbSet on userOu.UserId equals user.Id
join ou in DbContext.Set<OrganizationUnit>() on userOu.OrganizationUnitId equals ou.Id
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in (await GetDbSetAsync()) on userOu.UserId equals user.Id
join ou in dbContext.Set<OrganizationUnit>() on userOu.OrganizationUnitId equals ou.Id
where ou.Code.StartsWith(code)
select user;
return await query
@ -194,9 +200,10 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
CancellationToken cancellationToken = default
)
{
var query = from userOu in DbContext.Set<IdentityUserOrganizationUnit>()
join user in DbSet on userOu.UserId equals user.Id
join ou in DbContext.Set<OrganizationUnit>() on userOu.OrganizationUnitId equals ou.Id
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in (await GetDbSetAsync()) on userOu.UserId equals user.Id
join ou in dbContext.Set<OrganizationUnit>() on userOu.OrganizationUnitId equals ou.Id
where ou.Code.StartsWith(code)
select user;
return await query

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

4
aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Uow" Version="4.1.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Uow" Version="4.2.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

6
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj

@ -18,9 +18,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.2.1" />
</ItemGroup>
</Project>

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

3
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/AbpIdentityServerAppServiceBase.cs

@ -7,8 +7,7 @@ namespace LINGYUN.Abp.IdentityServer
{
public abstract class AbpIdentityServerAppServiceBase : ApplicationService
{
private IPermissionChecker _permissionChecker;
protected IPermissionChecker PermissionChecker => LazyGetRequiredService(ref _permissionChecker);
protected IPermissionChecker PermissionChecker => LazyServiceProvider.LazyGetRequiredService<IPermissionChecker>();
protected AbpIdentityServerAppServiceBase()
{
LocalizationResource = typeof(AbpIdentityServerResource);

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.2.1" />
</ItemGroup>
</Project>

13
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN/Abp/IdentityServer/ApiScopes/IApiScopeRepository.cs

@ -1,13 +0,0 @@
using System.Threading;
using System.Threading.Tasks;
namespace LINGYUN.Abp.IdentityServer.ApiScopes
{
public interface IApiScopeRepository : Volo.Abp.IdentityServer.ApiScopes.IApiScopeRepository
{
Task<int> GetCountAsync(
string filter = null,
CancellationToken cancellationToken = default
);
}
}

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/ApiResources/EfCoreApiResourceRepository.cs

@ -26,7 +26,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
public virtual async Task<List<string>> GetNamesAsync(CancellationToken cancellationToken = default)
{
return await DbSet
return await (await GetDbSetAsync())
.Select(x => x.Name)
.Distinct()
.ToListAsync(GetCancellationToken(cancellationToken));

37
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/ApiScopes/EfCoreApiScopeRepository.cs

@ -1,37 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Volo.Abp.DependencyInjection;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.IdentityServer.ApiScopes;
using Volo.Abp.IdentityServer.EntityFrameworkCore;
namespace LINGYUN.Abp.IdentityServer.ApiScopes
{
[Dependency(ServiceLifetime.Transient)]
[ExposeServices(
typeof(IApiScopeRepository),
typeof(ApiScopeRepository),
typeof(Volo.Abp.IdentityServer.ApiScopes.IApiScopeRepository))]
public class EfCoreApiScopeRepository : ApiScopeRepository, IApiScopeRepository
{
public EfCoreApiScopeRepository(IDbContextProvider<IIdentityServerDbContext> dbContextProvider)
: base(dbContextProvider)
{
}
public virtual async Task<int> GetCountAsync(
string filter = null,
CancellationToken cancellationToken = default)
{
return await DbSet
.WhereIf(!filter.IsNullOrWhiteSpace(), x =>
x.Name.Contains(filter) || x.DisplayName.Contains(filter) || x.Description.Contains(filter))
.CountAsync(GetCancellationToken(cancellationToken));
}
}
}

4
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/Grants/EfCorePersistentGrantRepository.cs

@ -27,7 +27,7 @@ namespace LINGYUN.Abp.IdentityServer.Grants
public virtual async Task<long> GetCountAsync(string subjectId = null, string filter = null, CancellationToken cancellation = default)
{
return await DbSet
return await (await GetDbSetAsync())
.WhereIf(!subjectId.IsNullOrWhiteSpace(), x => x.SubjectId.Equals(subjectId))
.WhereIf(!filter.IsNullOrWhiteSpace(), x =>
x.Type.Contains(filter) || x.ClientId.Contains(filter) || x.Key.Contains(filter))
@ -36,7 +36,7 @@ namespace LINGYUN.Abp.IdentityServer.Grants
public virtual async Task<List<PersistedGrant>> GetListAsync(string subjectId = null, string filter = null, string sorting = "CreationTime", int skipCount = 1, int maxResultCount = 10, CancellationToken cancellation = default)
{
return await DbSet
return await (await GetDbSetAsync())
.WhereIf(!subjectId.IsNullOrWhiteSpace(), x => x.SubjectId.Equals(subjectId))
.WhereIf(!filter.IsNullOrWhiteSpace(), x =>
x.Type.Contains(filter) || x.ClientId.Contains(filter) || x.Key.Contains(filter))

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/IdentityResources/EfCoreIdentityResourceRepository.cs

@ -26,7 +26,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
public virtual async Task<List<string>> GetNamesAsync(CancellationToken cancellationToken = default)
{
return await DbSet
return await (await GetDbSetAsync())
.Select(x => x.Name)
.Distinct()
.ToListAsync(GetCancellationToken(cancellationToken));

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat/LINGYUN.Abp.IdentityServer.WeChat.csproj

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

4
aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

2
aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

5
aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/ChatAppService.cs

@ -11,8 +11,7 @@ namespace LINGYUN.Abp.MessageService.Chat
{
public class ChatAppService : ApplicationService, IChatAppService
{
private IMessageSender _messageSender;
protected IMessageSender MessageSender => LazyGetRequiredService(ref _messageSender);
protected IMessageSender MessageSender => LazyServiceProvider.LazyGetRequiredService<IMessageSender>();
private readonly IUserGroupStore _userGroupStore;
private readonly IMessageStore _messageStore;
@ -127,7 +126,7 @@ namespace LINGYUN.Abp.MessageService.Chat
public virtual async Task<ChatMessageSendResultDto> SendMessageAsync(ChatMessage input)
{
// TODO:向其他租户发送消息?
input.TenantId = input.TenantId ?? CurrentTenant.Id;
input.TenantId ??= CurrentTenant.Id;
await MessageSender.SendMessageAsync(input);

4
aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Users.Domain.Shared" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Users.Domain.Shared" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

10
aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj

@ -18,11 +18,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.1.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.1.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Users.Abstractions" Version="4.1.2" />
<PackageReference Include="Volo.Abp.Caching" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.2.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.2.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Users.Abstractions" Version="4.2.1" />
</ItemGroup>
<ItemGroup>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save