Browse Source

Merge pull request #249 from colinin/4.3

upgrade abp framework 4.3.0
pull/252/head
cKey 5 years ago
committed by GitHub
parent
commit
16281df6e1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      aspnet-core/common.props
  2. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj
  3. 4
      aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj
  4. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj
  5. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj
  6. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj
  7. 6
      aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj
  8. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj
  9. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj
  10. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj
  11. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj
  12. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj
  13. 10
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/EntityFrameworkCore/ApiGatewayEfCoreRepositoryBase.cs
  14. 8
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreAggregateReRouteRepository.cs
  15. 5
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreDynamicReRouteRepository.cs
  16. 5
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreGlobalConfigRepository.cs
  17. 11
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/Ocelot/EfCoreReRouteRepository.cs
  18. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj
  19. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj
  20. 10
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj
  21. 8
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj
  22. 2
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj
  23. 4
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj
  24. 8
      aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj
  25. 6
      aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj
  26. 2
      aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj
  27. 7
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj
  28. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Validation/LINGYUN.Abp.AspNetCore.Mvc.Validation.csproj
  29. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj
  30. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj
  31. 4
      aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj
  32. 2
      aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj
  33. 2
      aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj
  34. 2
      aspnet-core/modules/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj
  35. 2
      aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj
  36. 2
      aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj
  37. 4
      aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj
  38. 2
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj
  39. 2
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj
  40. 2
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj
  41. 2
      aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj
  42. 2
      aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj
  43. 2
      aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj
  44. 4
      aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj
  45. 4
      aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj
  46. 4
      aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj
  47. 4
      aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj
  48. 6
      aspnet-core/modules/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN.Abp.Localization.Dynamic.csproj
  49. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj
  50. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj
  51. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj
  52. 2
      aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj
  53. 4
      aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj
  54. 2
      aspnet-core/modules/common/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj
  55. 6
      aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj
  56. 2
      aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj
  57. 2
      aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj
  58. 2
      aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj
  59. 2
      aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj
  60. 2
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj
  61. 2
      aspnet-core/modules/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj
  62. 2
      aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN.Abp.Dapr.Actors.AspNetCore.csproj
  63. 4
      aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.IdentityModel/LINGYUN.Abp.Dapr.Actors.IdentityModel.csproj
  64. 10
      aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj
  65. 4
      aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj
  66. 6
      aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj
  67. 2
      aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj
  68. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj
  69. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj
  70. 10
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN/Abp/Identity/MyProfileAppService.cs
  71. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj
  72. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj
  73. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj
  74. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj
  75. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj
  76. 4
      aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj
  77. 16
      aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN/Abp/PermissionManagement/Identity/IdentityPermissionManager.cs
  78. 6
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj
  79. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj
  80. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj
  81. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj
  82. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj
  83. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj
  84. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat/LINGYUN.Abp.IdentityServer.WeChat.csproj
  85. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj
  86. 4
      aspnet-core/modules/localization/LINGYUN.Abp.Localization.Json/LINGYUN.Abp.Localization.Json.csproj
  87. 1
      aspnet-core/modules/localization/LINGYUN.Abp.Localization.Json/LINGYUN/Abp/Localization/Json/AbpLocalizationJsonModule.cs
  88. 6
      aspnet-core/modules/localization/LINGYUN.Abp.Localization.Xml/LINGYUN.Abp.Localization.Xml.csproj
  89. 4
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application.Contracts/LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj
  90. 4
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj
  91. 6
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN.Abp.LocalizationManagement.Domain.Shared.csproj
  92. 6
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj
  93. 2
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj
  94. 2
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN.Abp.LocalizationManagement.HttpApi.csproj
  95. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj
  96. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj
  97. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj
  98. 10
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj
  99. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj
  100. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj

2
aspnet-core/common.props

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>4.2.1</Version> <Version>4.3.0</Version>
<Authors>LINGYUN</Authors> <Authors>LINGYUN</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn> <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl> <PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

10
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN/ApiGateway/EntityFrameworkCore/ApiGatewayEfCoreRepositoryBase.cs

@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
@ -17,10 +18,19 @@ namespace LINGYUN.ApiGateway.EntityFrameworkCore
{ {
} }
public override async Task<IQueryable<TEntity>> GetQueryableAsync()
{
var query = await base.GetQueryableAsync();
query = base.ApplyDataFilters(query);
return query;
}
/// <summary> /// <summary>
/// 重写查询,添加过滤器 /// 重写查询,添加过滤器
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[System.Obsolete("将在abp框架移除之后删除")]
protected override IQueryable<TEntity> GetQueryable() protected override IQueryable<TEntity> GetQueryable()
{ {
var query = base.GetQueryable(); var query = base.GetQueryable();

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

@ -15,24 +15,24 @@ namespace LINGYUN.ApiGateway.Ocelot
{ {
} }
public async Task<bool> AggregateReRouteNameExistsAsync(string name) public virtual async Task<bool> AggregateReRouteNameExistsAsync(string name)
{ {
return await (await GetDbSetAsync()).AnyAsync(ar => ar.Name.Equals(name)); return await (await GetDbSetAsync()).AnyAsync(ar => ar.Name.Equals(name));
} }
public async Task<AggregateReRoute> GetByRouteIdAsync(long routeId) public virtual async Task<AggregateReRoute> GetByRouteIdAsync(long routeId)
{ {
return await (await WithDetailsAsync()) return await (await WithDetailsAsync())
.Where(ar => ar.ReRouteId.Equals(routeId)).FirstOrDefaultAsync(); .Where(ar => ar.ReRouteId.Equals(routeId)).FirstOrDefaultAsync();
} }
public async Task<List<AggregateReRoute>> GetByAppIdAsync(string appId) public virtual async Task<List<AggregateReRoute>> GetByAppIdAsync(string appId)
{ {
return await (await WithDetailsAsync()) return await (await WithDetailsAsync())
.Where(ar => ar.AppId.Equals(appId)).ToListAsync(); .Where(ar => ar.AppId.Equals(appId)).ToListAsync();
} }
public async Task<(List<AggregateReRoute> routes, long total)> GetPagedListAsync(string appId, string filter = "", public virtual async Task<(List<AggregateReRoute> routes, long total)> GetPagedListAsync(string appId, string filter = "",
string sorting = "", int skipCount = 1, int maxResultCount = 100) string sorting = "", int skipCount = 1, int maxResultCount = 100)
{ {
var resultReRoutes = await (await WithDetailsAsync()) var resultReRoutes = await (await WithDetailsAsync())

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

@ -15,12 +15,12 @@ namespace LINGYUN.ApiGateway.Ocelot
} }
public async Task<DynamicReRoute> GetByItemIdAsync(int itemId) public virtual async Task<DynamicReRoute> GetByItemIdAsync(int itemId)
{ {
return await (await GetQueryableAsync()).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) public virtual async Task<List<DynamicReRoute>> GetByAppIdAsync(string appId)
{ {
return await (await WithDetailsAsync()).Where(x => x.AppId.Equals(appId)).ToListAsync(); return await (await WithDetailsAsync()).Where(x => x.AppId.Equals(appId)).ToListAsync();
} }
@ -30,6 +30,7 @@ namespace LINGYUN.ApiGateway.Ocelot
return await WithDetailsAsync(x => x.RateLimitRule); ; return await WithDetailsAsync(x => x.RateLimitRule); ;
} }
[System.Obsolete("将在abp框架移除之后删除")]
public override IQueryable<DynamicReRoute> WithDetails() public override IQueryable<DynamicReRoute> WithDetails()
{ {
return WithDetails(x => x.RateLimitRule); return WithDetails(x => x.RateLimitRule);

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

@ -17,7 +17,7 @@ namespace LINGYUN.ApiGateway.Ocelot
} }
public async Task<GlobalConfiguration> GetByItemIdAsync(long itemId) public virtual async Task<GlobalConfiguration> GetByItemIdAsync(long itemId)
{ {
var globalConfiguration = await (await WithDetailsAsync()).Where(x => x.ItemId.Equals(itemId)).FirstOrDefaultAsync(); var globalConfiguration = await (await WithDetailsAsync()).Where(x => x.ItemId.Equals(itemId)).FirstOrDefaultAsync();
if(globalConfiguration == null) if(globalConfiguration == null)
@ -27,7 +27,7 @@ namespace LINGYUN.ApiGateway.Ocelot
return globalConfiguration; return globalConfiguration;
} }
public async Task<GlobalConfiguration> GetByAppIdAsync(string appId) public virtual async Task<GlobalConfiguration> GetByAppIdAsync(string appId)
{ {
return await (await WithDetailsAsync()) return await (await WithDetailsAsync())
.Where(g => g.AppId.Equals(appId)) .Where(g => g.AppId.Equals(appId))
@ -61,6 +61,7 @@ namespace LINGYUN.ApiGateway.Ocelot
x => x.ServiceDiscoveryProvider); x => x.ServiceDiscoveryProvider);
} }
[Obsolete("将在abp框架移除之后删除")]
public override IQueryable<GlobalConfiguration> WithDetails() public override IQueryable<GlobalConfiguration> WithDetails()
{ {
return WithDetails( return WithDetails(

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

@ -17,26 +17,26 @@ namespace LINGYUN.ApiGateway.Ocelot
{ {
} }
public async Task<ReRoute> GetByNameAsync(string routeName) public virtual async Task<ReRoute> GetByNameAsync(string routeName)
{ {
var reRoute = await (await WithDetailsAsync()).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); return reRoute ?? throw new EntityNotFoundException(typeof(ReRoute), routeName);
} }
public async Task<ReRoute> GetByReRouteIdAsync(long routeId) public virtual async Task<ReRoute> GetByReRouteIdAsync(long routeId)
{ {
var reRoute = await (await WithDetailsAsync()).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); return reRoute ?? throw new EntityNotFoundException(typeof(ReRoute), routeId);
} }
public async Task<List<ReRoute>> GetByAppIdAsync(string appId) public virtual async Task<List<ReRoute>> GetByAppIdAsync(string appId)
{ {
return await (await WithDetailsAsync()) return await (await WithDetailsAsync())
.Where(r => r.AppId.Equals(appId)) .Where(r => r.AppId.Equals(appId))
.ToListAsync(); .ToListAsync();
} }
public async Task<(List<ReRoute> routes, long total)> GetPagedListAsync(string appId, string filter = "", public virtual async Task<(List<ReRoute> routes, long total)> GetPagedListAsync(string appId, string filter = "",
string sorting = "", int skipCount = 1, int maxResultCount = 100) string sorting = "", int skipCount = 1, int maxResultCount = 100)
{ {
var resultReRoutes = await (await WithDetailsAsync()) var resultReRoutes = await (await WithDetailsAsync())
@ -56,7 +56,7 @@ namespace LINGYUN.ApiGateway.Ocelot
return ValueTuple.Create(resultReRoutes, total); return ValueTuple.Create(resultReRoutes, total);
} }
public async Task RemoveAsync(CancellationToken cancellationToken = default(CancellationToken)) public virtual async Task RemoveAsync(CancellationToken cancellationToken = default(CancellationToken))
{ {
var dbContext = await GetDbContextAsync(); var dbContext = await GetDbContextAsync();
var entityType = dbContext.Model.FindEntityType(typeof(ReRoute)); var entityType = dbContext.Model.FindEntityType(typeof(ReRoute));
@ -82,6 +82,7 @@ namespace LINGYUN.ApiGateway.Ocelot
x => x.SecurityOptions); x => x.SecurityOptions);
} }
[Obsolete("将在abp框架移除之后删除")]
public override IQueryable<ReRoute> WithDetails() public override IQueryable<ReRoute> WithDetails()
{ {
return WithDetails( return WithDetails(

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

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

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

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

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

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

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

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

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

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

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

@ -16,8 +16,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.3.0" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

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

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

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

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

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

7
aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -6,11 +6,12 @@
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client.Common" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client.Common" Version="4.3.0" />
<PackageReference Include="Volo.Abp.EventBus" Version="4.2.1" /> <PackageReference Include="Volo.Abp.EventBus" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Core" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </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.Caching.StackExchangeRedis" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Polly" Version="7.2.1" /> <PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Volo.Abp.Core" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Core" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="HangFire.SqlServer" Version="1.7.19" /> <PackageReference Include="HangFire.SqlServer" Version="1.7.22" />
<PackageReference Include="Volo.Abp.HangFire" Version="4.2.1" /> <PackageReference Include="Volo.Abp.HangFire" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

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

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

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

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

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

6
aspnet-core/modules/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN.Abp.Localization.Dynamic.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.EventBus" Version="4.2.1" /> <PackageReference Include="Volo.Abp.EventBus" Version="4.3.0" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Localization" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN.Abp.Dapr.Actors.AspNetCore.csproj

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.1.0" /> <PackageReference Include="Dapr.Actors.AspNetCore" Version="1.1.0" />
<PackageReference Include="Volo.Abp.AspNetCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.IdentityModel/LINGYUN.Abp.Dapr.Actors.IdentityModel.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.IdentityModel" Version="4.2.1" /> <PackageReference Include="Volo.Abp.IdentityModel" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -9,9 +9,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapr.Actors" Version="1.1.0" /> <PackageReference Include="Dapr.Actors" Version="1.1.0" />
<PackageReference Include="Volo.Abp.Castle.Core" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Castle.Core" Version="4.3.0" />
<PackageReference Include="Volo.Abp.ExceptionHandling" Version="4.2.1" /> <PackageReference Include="Volo.Abp.ExceptionHandling" Version="4.3.0" />
<PackageReference Include="Volo.Abp.MultiTenancy" Version="4.2.1" /> <PackageReference Include="Volo.Abp.MultiTenancy" Version="4.3.0" />
<PackageReference Include="Volo.Abp.Validation" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Validation" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapr.Client" Version="1.1.0" /> <PackageReference Include="Dapr.Client" Version="1.1.0" />
<PackageReference Include="Volo.Abp.Http.Client" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Http.Client" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -13,8 +13,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Authorization" Version="4.3.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

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

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

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

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

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

10
aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN/Abp/Identity/MyProfileAppService.cs

@ -38,10 +38,12 @@ namespace LINGYUN.Abp.Identity
public virtual async Task ChangeTwoFactorEnabledAsync(ChangeTwoFactorEnabledDto input) public virtual async Task ChangeTwoFactorEnabledAsync(ChangeTwoFactorEnabledDto input)
{ {
if (!await SettingProvider.IsTrueAsync(IdentitySettingNames.TwoFactor.UsersCanChange)) // Removed See: https://github.com/abpframework/abp/pull/7719
{ //if (!await SettingProvider.IsTrueAsync(IdentitySettingNames.TwoFactor.UsersCanChange))
throw new BusinessException(Volo.Abp.Identity.IdentityErrorCodes.CanNotChangeTwoFactor); //{
} // throw new BusinessException(Volo.Abp.Identity.IdentityErrorCodes.CanNotChangeTwoFactor);
//}
// TODO: Abp官方移除了双因素的设置,不排除以后会增加,如果在用户接口中启用了双因素认证,可能造成登录失败!
await IdentityOptions.SetAsync(); await IdentityOptions.SetAsync();
var user = await UserManager.GetByIdAsync(CurrentUser.GetId()); var user = await UserManager.GetByIdAsync(CurrentUser.GetId());

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

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

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

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

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

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

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

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

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

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

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

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

16
aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN/Abp/PermissionManagement/Identity/IdentityPermissionManager.cs

@ -3,6 +3,7 @@ using Microsoft.Extensions.Options;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Authorization.Permissions; using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Caching;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids; using Volo.Abp.Guids;
using Volo.Abp.Identity; using Volo.Abp.Identity;
@ -23,15 +24,26 @@ namespace LINGYUN.Abp.PermissionManagement.Identity
protected IUserRoleFinder UserRoleFinder { get; } protected IUserRoleFinder UserRoleFinder { get; }
public IdentityPermissionManager( public IdentityPermissionManager(
IPermissionDefinitionManager permissionDefinitionManager, IPermissionDefinitionManager permissionDefinitionManager,
IPermissionStateManager permissionStateManager,
IPermissionGrantRepository permissionGrantRepository, IPermissionGrantRepository permissionGrantRepository,
IPermissionStore permissionStore, IPermissionStore permissionStore,
IServiceProvider serviceProvider, IServiceProvider serviceProvider,
IGuidGenerator guidGenerator, IGuidGenerator guidGenerator,
IOptions<PermissionManagementOptions> options, IOptions<PermissionManagementOptions> options,
ICurrentTenant currentTenant, ICurrentTenant currentTenant,
IDistributedCache<PermissionGrantCacheItem> cache,
IUserRoleFinder userRoleFinder) IUserRoleFinder userRoleFinder)
: base(permissionDefinitionManager, permissionGrantRepository, permissionStore, serviceProvider, guidGenerator, options, currentTenant) : base(
permissionDefinitionManager,
permissionStateManager,
permissionGrantRepository,
permissionStore,
serviceProvider,
guidGenerator,
options,
currentTenant,
cache)
{ {
UserRoleFinder = userRoleFinder; UserRoleFinder = userRoleFinder;
} }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
aspnet-core/modules/localization/LINGYUN.Abp.Localization.Json/LINGYUN.Abp.Localization.Json.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Localization" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.*" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.*" />
</ItemGroup> </ItemGroup>

1
aspnet-core/modules/localization/LINGYUN.Abp.Localization.Json/LINGYUN/Abp/Localization/Json/AbpLocalizationJsonModule.cs

@ -3,6 +3,7 @@ using Volo.Abp.Modularity;
namespace LINGYUN.Abp.Localization.Json namespace LINGYUN.Abp.Localization.Json
{ {
[System.Obsolete("Volo.Abp.Localization就可实现,将在后续删除")]
[DependsOn(typeof(AbpLocalizationModule))] [DependsOn(typeof(AbpLocalizationModule))]
public class AbpLocalizationJsonModule : AbpModule public class AbpLocalizationJsonModule : AbpModule
{ {

6
aspnet-core/modules/localization/LINGYUN.Abp.Localization.Xml/LINGYUN.Abp.Localization.Xml.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Localization" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.*"/> <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application.Contracts/LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj

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

4
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN.Abp.LocalizationManagement.Domain.Shared.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -18,8 +18,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Validation" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Validation" Version="4.3.0" />
<PackageReference Include="Volo.Abp.Localization" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Localization" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="4.3.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Ddd.Domain" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj

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

2
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN.Abp.LocalizationManagement.HttpApi.csproj

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save