Browse Source

Merge pull request #117 from colinin/3.3

upgrade abp framework to 3.3.0
pull/177/head
cKey 5 years ago
committed by GitHub
parent
commit
80848f0daa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      aspnet-core/common.props
  2. 4
      aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj
  3. 6
      aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj
  4. 4
      aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj
  5. 4
      aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj
  6. 4
      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. 3
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj
  9. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/ApiGatewayApplicationContractsModule.cs
  10. 16
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IAggregateReRouteAppService.cs
  11. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IDynamicReRouteAppService.cs
  12. 10
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IGlobalConfigurationAppService.cs
  13. 16
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IReRouteAppService.cs
  14. 10
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IRouteGroupAppService.cs
  15. 5
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj
  16. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationModule.cs
  17. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationServiceBase.cs
  18. 70
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/AggregateReRouteAppService.cs
  19. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/DynamicReRouteAppService.cs
  20. 44
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationAppService.cs
  21. 90
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/ReRouteAppService.cs
  22. 36
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/RouteGroupAppService.cs
  23. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj
  24. 6
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj
  25. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj
  26. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj
  27. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj
  28. 2
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/ApiGatewayControllerBase.cs
  29. 32
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/AggregateReRouteController.cs
  30. 4
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/DynamicReRouteController.cs
  31. 20
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationController.cs
  32. 32
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/ReRouteController.cs
  33. 20
      aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/RouteGroupController.cs
  34. 12
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj
  35. 10
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj
  36. 2
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj
  37. 4
      aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj
  38. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj
  39. 2
      aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj
  40. 6
      aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj
  41. 4
      aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj
  42. 2
      aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj
  43. 8
      aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj
  44. 2
      aspnet-core/modules/common/LINGYUN.Abp.DistributedLock/LINGYUN.Abp.DistributedLock.csproj
  45. 2
      aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj
  46. 6
      aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj
  47. 4
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj
  48. 4
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj
  49. 4
      aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj
  50. 6
      aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj
  51. 2
      aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj
  52. 4
      aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj
  53. 4
      aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj
  54. 4
      aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj
  55. 6
      aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj
  56. 6
      aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj
  57. 8
      aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj
  58. 8
      aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj
  59. 6
      aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj
  60. 4
      aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj
  61. 6
      aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj
  62. 8
      aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj
  63. 4
      aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj
  64. 4
      aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj
  65. 2
      aspnet-core/modules/common/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj
  66. 4
      aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj
  67. 2
      aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj
  68. 8
      aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj
  69. 6
      aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj
  70. 4
      aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj
  71. 2
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj
  72. 2
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj
  73. 4
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj
  74. 2
      aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj
  75. 4
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj
  76. 4
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj
  77. 2
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj
  78. 4
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj
  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. 6
      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. 4
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj
  84. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj
  85. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj
  86. 4
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj
  87. 4
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj
  88. 6
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj
  89. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj
  90. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj
  91. 12
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj
  92. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj
  93. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj
  94. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj
  95. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj
  96. 4
      aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj
  97. 4
      aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj
  98. 4
      aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj
  99. 10
      aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj
  100. 2
      aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj

2
aspnet-core/common.props

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

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Sms" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Account.Application" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Sms" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\..\common.props" />
@ -24,8 +24,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Account.Web" Version="3.2.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.6" />
<PackageReference Include="Volo.Abp.Account.Web" Version="3.3.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.8" />
</ItemGroup>
<ItemGroup>

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

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

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

@ -6,7 +6,9 @@ using Volo.Abp.VirtualFileSystem;
namespace LINGYUN.ApiGateway
{
[DependsOn(typeof(ApiGatewayDomainSharedModule), typeof(AbpDddApplicationModule))]
[DependsOn(
typeof(ApiGatewayDomainSharedModule),
typeof(AbpDddApplicationContractsModule))]
public class ApiGatewayApplicationContractsModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)

16
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IAggregateReRouteAppService.cs

@ -6,20 +6,20 @@ namespace LINGYUN.ApiGateway.Ocelot
{
public interface IAggregateReRouteAppService : IApplicationService
{
Task<AggregateReRouteDto> GetAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId);
Task<AggregateReRouteDto> GetAsync(AggregateRouteGetByRouteIdInputDto input);
Task<ListResultDto<AggregateReRouteDto>> GetAsync(AggregateRouteGetByAppIdInputDto aggregateRouteGetByAppId);
Task<ListResultDto<AggregateReRouteDto>> GetAsync(AggregateRouteGetByAppIdInputDto input);
Task<PagedResultDto<AggregateReRouteDto>> GetPagedListAsync(AggregateRouteGetByPagedInputDto aggregateRouteGetByPaged);
Task<PagedResultDto<AggregateReRouteDto>> GetPagedListAsync(AggregateRouteGetByPagedInputDto input);
Task<AggregateReRouteDto> CreateAsync(AggregateReRouteCreateDto aggregateReRouteCreate);
Task<AggregateReRouteDto> CreateAsync(AggregateReRouteCreateDto input);
Task<AggregateReRouteDto> UpdateAsync(AggregateReRouteUpdateDto aggregateReRouteUpdate);
Task<AggregateReRouteDto> UpdateAsync(AggregateReRouteUpdateDto input);
Task DeleteAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId);
Task DeleteAsync(AggregateRouteGetByRouteIdInputDto input);
Task<AggregateReRouteConfigDto> AddRouteConfigAsync(AggregateReRouteConfigCreateDto aggregateReRouteConfigCreate);
Task<AggregateReRouteConfigDto> AddRouteConfigAsync(AggregateReRouteConfigCreateDto input);
Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto aggregateReRouteConfigGetByKey);
Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto input);
}
}

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IDynamicReRouteAppService.cs

@ -6,6 +6,6 @@ namespace LINGYUN.ApiGateway.Ocelot
{
public interface IDynamicReRouteAppService : IApplicationService
{
Task<ListResultDto<DynamicReRouteDto>> GetAsync(DynamicRouteGetByAppIdInputDto dynamicRouteGetByAppId);
Task<ListResultDto<DynamicReRouteDto>> GetAsync(DynamicRouteGetByAppIdInputDto input);
}
}

10
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IGlobalConfigurationAppService.cs

@ -6,14 +6,14 @@ namespace LINGYUN.ApiGateway.Ocelot
{
public interface IGlobalConfigurationAppService : IApplicationService
{
Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto globalGetByAppId);
Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto input);
Task<GlobalConfigurationDto> CreateAsync(GlobalCreateDto globalCreateDto);
Task<GlobalConfigurationDto> CreateAsync(GlobalCreateDto input);
Task<GlobalConfigurationDto> UpdateAsync(GlobalUpdateDto globalUpdateDto);
Task<GlobalConfigurationDto> UpdateAsync(GlobalUpdateDto input);
Task<PagedResultDto<GlobalConfigurationDto>> GetAsync(GlobalGetByPagedInputDto globalGetPaged);
Task<PagedResultDto<GlobalConfigurationDto>> GetAsync(GlobalGetByPagedInputDto input);
Task DeleteAsync(GlobalGetByAppIdInputDto globalGetByAppId);
Task DeleteAsync(GlobalGetByAppIdInputDto input);
}
}

16
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IReRouteAppService.cs

@ -6,20 +6,20 @@ namespace LINGYUN.ApiGateway.Ocelot
{
public interface IReRouteAppService : IApplicationService
{
Task<ListResultDto<ReRouteDto>> GetAsync(ReRouteGetByAppIdInputDto routeGetByAppId);
Task<ListResultDto<ReRouteDto>> GetListByAppIdAsync(ReRouteGetByAppIdInputDto input);
Task<PagedResultDto<ReRouteDto>> GetPagedListAsync(ReRouteGetByPagedInputDto routeGetByPaged);
Task<PagedResultDto<ReRouteDto>> GetListAsync(ReRouteGetByPagedInputDto input);
Task<ReRouteDto> GetByRouteNameAsync(ReRouteGetByNameInputDto routeGetByName);
Task<ReRouteDto> GetByRouteNameAsync(ReRouteGetByNameInputDto input);
Task<ReRouteDto> GetAsync(ReRouteGetByIdInputDto routeGetById);
Task<ReRouteDto> GetAsync(ReRouteGetByIdInputDto input);
Task<ReRouteDto> CreateAsync(ReRouteCreateDto routeCreateDto);
Task<ReRouteDto> CreateAsync(ReRouteCreateDto input);
Task<ReRouteDto> UpdateAsync(ReRouteUpdateDto routeUpdateDto);
Task<ReRouteDto> UpdateAsync(ReRouteUpdateDto input);
Task DeleteAsync(ReRouteGetByIdInputDto routeGetById);
Task DeleteAsync(ReRouteGetByIdInputDto input);
Task RemoveAsync(ReRouteGetByAppIdInputDto routeGetByAppId);
Task RemoveAsync(ReRouteGetByAppIdInputDto input);
}
}

10
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IRouteGroupAppService.cs

@ -7,14 +7,14 @@ namespace LINGYUN.ApiGateway.Ocelot
{
Task<ListResultDto<RouteGroupAppIdsDto>> GetActivedAsync();
Task<RouteGroupDto> GetAsync(RouteGroupGetByAppIdInputDto routerGetByAppId);
Task<RouteGroupDto> GetAsync(RouteGroupGetByAppIdInputDto input);
Task<PagedResultDto<RouteGroupDto>> GetAsync(RouteGroupGetByPagedInputDto routerGetByPagedInput);
Task<PagedResultDto<RouteGroupDto>> GetAsync(RouteGroupGetByPagedInputDto input);
Task<RouteGroupDto> CreateAsync(RouteGroupCreateDto routerCreateDto);
Task<RouteGroupDto> CreateAsync(RouteGroupCreateDto input);
Task<RouteGroupDto> UpdateAsync(RouteGroupUpdateDto routerUpdateDto);
Task<RouteGroupDto> UpdateAsync(RouteGroupUpdateDto input);
Task DeleteAsync(RouteGroupGetByAppIdInputDto routerGetByAppId);
Task DeleteAsync(RouteGroupGetByAppIdInputDto input);
}
}

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

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

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationModule.cs

@ -1,4 +1,5 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Application;
using Volo.Abp.AutoMapper;
using Volo.Abp.Modularity;
@ -7,6 +8,7 @@ namespace LINGYUN.ApiGateway
[DependsOn(
typeof(ApiGatewayDomainModule),
typeof(ApiGatewayApplicationContractsModule),
typeof(AbpDddApplicationModule),
typeof(AbpAutoMapperModule)
)]
public class ApiGatewayApplicationModule : AbpModule

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationServiceBase.cs

@ -3,7 +3,7 @@ using Volo.Abp.Application.Services;
namespace LINGYUN.ApiGateway
{
public class ApiGatewayApplicationServiceBase : ApplicationService
public abstract class ApiGatewayApplicationServiceBase : ApplicationService
{
protected ApiGatewayApplicationServiceBase()
{

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

@ -26,49 +26,49 @@ namespace LINGYUN.ApiGateway.Ocelot
_aggregateReRouteRepository = aggregateReRouteRepository;
}
public virtual async Task<AggregateReRouteDto> GetAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId)
public virtual async Task<AggregateReRouteDto> GetAsync(AggregateRouteGetByRouteIdInputDto input)
{
var routeId = long.Parse(aggregateRouteGetByRouteId.RouteId);
var routeId = long.Parse(input.RouteId);
var reroute = await _aggregateReRouteRepository.GetByRouteIdAsync(routeId);
return ObjectMapper.Map<AggregateReRoute, AggregateReRouteDto>(reroute);
}
[Authorize(ApiGatewayPermissions.AggregateRoute.Export)]
public async Task<ListResultDto<AggregateReRouteDto>> GetAsync(AggregateRouteGetByAppIdInputDto aggregateRouteGetByAppId)
public async Task<ListResultDto<AggregateReRouteDto>> GetAsync(AggregateRouteGetByAppIdInputDto input)
{
var reroutes = await _aggregateReRouteRepository.GetByAppIdAsync(aggregateRouteGetByAppId.AppId);
var reroutes = await _aggregateReRouteRepository.GetByAppIdAsync(input.AppId);
return new ListResultDto<AggregateReRouteDto>(ObjectMapper.Map<List<AggregateReRoute>, List<AggregateReRouteDto>>(reroutes));
}
public async Task<PagedResultDto<AggregateReRouteDto>> GetPagedListAsync(AggregateRouteGetByPagedInputDto aggregateRouteGetByPaged)
public async Task<PagedResultDto<AggregateReRouteDto>> GetPagedListAsync(AggregateRouteGetByPagedInputDto input)
{
var reroutesTuple = await _aggregateReRouteRepository
.GetPagedListAsync(aggregateRouteGetByPaged.AppId, aggregateRouteGetByPaged.Filter,
aggregateRouteGetByPaged.Sorting, aggregateRouteGetByPaged.SkipCount,
aggregateRouteGetByPaged.MaxResultCount);
.GetPagedListAsync(input.AppId, input.Filter,
input.Sorting, input.SkipCount,
input.MaxResultCount);
return new PagedResultDto<AggregateReRouteDto>(reroutesTuple.total,
ObjectMapper.Map<List<AggregateReRoute>, List<AggregateReRouteDto>>(reroutesTuple.routes));
}
[Authorize(ApiGatewayPermissions.AggregateRoute.Create)]
public virtual async Task<AggregateReRouteDto> CreateAsync(AggregateReRouteCreateDto aggregateReRouteCreate)
public virtual async Task<AggregateReRouteDto> CreateAsync(AggregateReRouteCreateDto input)
{
var aggregateNameExists = await _aggregateReRouteRepository
.AggregateReRouteNameExistsAsync(aggregateReRouteCreate.Name);
.AggregateReRouteNameExistsAsync(input.Name);
if (aggregateNameExists)
{
throw new UserFriendlyException(L["AggregateReRouteExists", aggregateReRouteCreate.Name]);
throw new UserFriendlyException(L["AggregateReRouteExists", input.Name]);
}
var aggregateRoute = ObjectMapper.Map<AggregateReRouteCreateDto, AggregateReRoute>(aggregateReRouteCreate);
aggregateRoute.SetUpstream(aggregateReRouteCreate.UpstreamHost, aggregateReRouteCreate.UpstreamPathTemplate);
foreach (var httpMethod in aggregateReRouteCreate.UpstreamHttpMethod)
var aggregateRoute = ObjectMapper.Map<AggregateReRouteCreateDto, AggregateReRoute>(input);
aggregateRoute.SetUpstream(input.UpstreamHost, input.UpstreamPathTemplate);
foreach (var httpMethod in input.UpstreamHttpMethod)
{
aggregateRoute.AddUpstreamHttpMethod(httpMethod);
}
foreach (var routeKey in aggregateReRouteCreate.ReRouteKeys)
foreach (var routeKey in input.ReRouteKeys)
{
aggregateRoute.AddRouteKey(routeKey);
}
@ -80,24 +80,24 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.AggregateRoute.Update)]
public virtual async Task<AggregateReRouteDto> UpdateAsync(AggregateReRouteUpdateDto aggregateReRouteUpdate)
public virtual async Task<AggregateReRouteDto> UpdateAsync(AggregateReRouteUpdateDto input)
{
var routeId = long.Parse(aggregateReRouteUpdate.RouteId);
var routeId = long.Parse(input.RouteId);
var aggregateRoute = await _aggregateReRouteRepository.GetByRouteIdAsync(routeId);
aggregateRoute.Priority = aggregateReRouteUpdate.Priority;
aggregateRoute.ConcurrencyStamp = aggregateReRouteUpdate.ConcurrencyStamp;
aggregateRoute.ReRouteIsCaseSensitive = aggregateReRouteUpdate.ReRouteIsCaseSensitive;
aggregateRoute.Aggregator = aggregateReRouteUpdate.Aggregator;
aggregateRoute.SetUpstream(aggregateReRouteUpdate.UpstreamHost, aggregateReRouteUpdate.UpstreamPathTemplate);
aggregateRoute.Priority = input.Priority;
aggregateRoute.ConcurrencyStamp = input.ConcurrencyStamp;
aggregateRoute.ReRouteIsCaseSensitive = input.ReRouteIsCaseSensitive;
aggregateRoute.Aggregator = input.Aggregator;
aggregateRoute.SetUpstream(input.UpstreamHost, input.UpstreamPathTemplate);
aggregateRoute.RemoveAllUpstreamHttpMethod();
foreach (var httpMethod in aggregateReRouteUpdate.UpstreamHttpMethod)
foreach (var httpMethod in input.UpstreamHttpMethod)
{
aggregateRoute.AddUpstreamHttpMethod(httpMethod);
}
aggregateRoute.RemoveAllRouteKey();
foreach (var routeKey in aggregateReRouteUpdate.ReRouteKeys)
foreach (var routeKey in input.ReRouteKeys)
{
aggregateRoute.AddRouteKey(routeKey);
}
@ -110,9 +110,9 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.AggregateRoute.Delete)]
public virtual async Task DeleteAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId)
public virtual async Task DeleteAsync(AggregateRouteGetByRouteIdInputDto input)
{
var routeId = long.Parse(aggregateRouteGetByRouteId.RouteId);
var routeId = long.Parse(input.RouteId);
var aggregateRoute = await _aggregateReRouteRepository.GetByRouteIdAsync(routeId);
await _aggregateReRouteRepository.DeleteAsync(aggregateRoute);
@ -120,14 +120,14 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.AggregateRoute.ManageRouteConfig)]
public virtual async Task<AggregateReRouteConfigDto> AddRouteConfigAsync(AggregateReRouteConfigCreateDto aggregateReRouteConfigCreate)
public virtual async Task<AggregateReRouteConfigDto> AddRouteConfigAsync(AggregateReRouteConfigCreateDto input)
{
var routeId = long.Parse(aggregateReRouteConfigCreate.RouteId);
var routeId = long.Parse(input.RouteId);
var aggregateRoute = await _aggregateReRouteRepository.GetByRouteIdAsync(routeId);
aggregateRoute.RemoveReRouteConfig(aggregateReRouteConfigCreate.ReRouteKey)
.AddReRouteConfig(aggregateReRouteConfigCreate.ReRouteKey, aggregateReRouteConfigCreate.Parameter,
aggregateReRouteConfigCreate.JsonPath);
var aggregateRouteConfig = aggregateRoute.FindReRouteConfig(aggregateReRouteConfigCreate.ReRouteKey);
aggregateRoute.RemoveReRouteConfig(input.ReRouteKey)
.AddReRouteConfig(input.ReRouteKey, input.Parameter,
input.JsonPath);
var aggregateRouteConfig = aggregateRoute.FindReRouteConfig(input.ReRouteKey);
await _aggregateReRouteRepository.UpdateAsync(aggregateRoute);
@ -137,11 +137,11 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.AggregateRoute.ManageRouteConfig)]
public virtual async Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto aggregateReRouteConfigGetByKey)
public virtual async Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto input)
{
var routeId = long.Parse(aggregateReRouteConfigGetByKey.RouteId);
var routeId = long.Parse(input.RouteId);
var aggregateRoute = await _aggregateReRouteRepository.GetByRouteIdAsync(routeId);
aggregateRoute.RemoveReRouteConfig(aggregateReRouteConfigGetByKey.ReRouteKey);
aggregateRoute.RemoveReRouteConfig(input.ReRouteKey);
await _aggregateReRouteRepository.UpdateAsync(aggregateRoute);

4
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/DynamicReRouteAppService.cs

@ -15,9 +15,9 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.DynamicRoute.Export)]
public async Task<ListResultDto<DynamicReRouteDto>> GetAsync(DynamicRouteGetByAppIdInputDto dynamicRouteGetByAppId)
public async Task<ListResultDto<DynamicReRouteDto>> GetAsync(DynamicRouteGetByAppIdInputDto input)
{
var dynamicReRoutes = await _dynamicReRouteRepository.GetByAppIdAsync(dynamicRouteGetByAppId.AppId);
var dynamicReRoutes = await _dynamicReRouteRepository.GetByAppIdAsync(input.AppId);
return new ListResultDto<DynamicReRouteDto>(ObjectMapper.Map<List<DynamicReRoute>, List<DynamicReRouteDto>>(dynamicReRoutes));
}

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

@ -29,11 +29,11 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.Global.Export)]
public virtual async Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto globalGetByAppId)
public virtual async Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto input)
{
await _routeGroupChecker.CheckActiveAsync(globalGetByAppId.AppId);
await _routeGroupChecker.CheckActiveAsync(input.AppId);
var globalConfig = await _globalConfigRepository.GetByAppIdAsync(globalGetByAppId.AppId);
var globalConfig = await _globalConfigRepository.GetByAppIdAsync(input.AppId);
var globalConfigDto = ObjectMapper.Map<GlobalConfiguration, GlobalConfigurationDto>(globalConfig);
@ -41,17 +41,17 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.Global.Create)]
public virtual async Task<GlobalConfigurationDto> CreateAsync(GlobalCreateDto globalCreateDto)
public virtual async Task<GlobalConfigurationDto> CreateAsync(GlobalCreateDto input)
{
await _routeGroupChecker.CheckActiveAsync(globalCreateDto.AppId);
await _routeGroupChecker.CheckActiveAsync(input.AppId);
var globalConfiguration = new GlobalConfiguration(_snowflakeIdGenerator.NextId(),
globalCreateDto.BaseUrl, globalCreateDto.AppId);
globalConfiguration.RequestIdKey = globalCreateDto.RequestIdKey;
globalConfiguration.DownstreamScheme = globalCreateDto.DownstreamScheme;
globalConfiguration.DownstreamHttpVersion = globalCreateDto.DownstreamHttpVersion;
input.BaseUrl, input.AppId);
globalConfiguration.RequestIdKey = input.RequestIdKey;
globalConfiguration.DownstreamScheme = input.DownstreamScheme;
globalConfiguration.DownstreamHttpVersion = input.DownstreamHttpVersion;
ApplyGlobalConfigurationOptions(globalConfiguration, globalCreateDto);
ApplyGlobalConfigurationOptions(globalConfiguration, input);
globalConfiguration = await _globalConfigRepository.InsertAsync(globalConfiguration, true);
@ -61,16 +61,16 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.Global.Update)]
public async Task<GlobalConfigurationDto> UpdateAsync(GlobalUpdateDto globalUpdateDto)
public async Task<GlobalConfigurationDto> UpdateAsync(GlobalUpdateDto input)
{
var globalConfiguration = await _globalConfigRepository.GetByItemIdAsync(globalUpdateDto.ItemId);
var globalConfiguration = await _globalConfigRepository.GetByItemIdAsync(input.ItemId);
globalConfiguration.BaseUrl = globalUpdateDto.BaseUrl;
globalConfiguration.RequestIdKey = globalUpdateDto.RequestIdKey;
globalConfiguration.DownstreamScheme = globalUpdateDto.DownstreamScheme;
globalConfiguration.DownstreamHttpVersion = globalUpdateDto.DownstreamHttpVersion;
globalConfiguration.BaseUrl = input.BaseUrl;
globalConfiguration.RequestIdKey = input.RequestIdKey;
globalConfiguration.DownstreamScheme = input.DownstreamScheme;
globalConfiguration.DownstreamHttpVersion = input.DownstreamHttpVersion;
ApplyGlobalConfigurationOptions(globalConfiguration, globalUpdateDto);
ApplyGlobalConfigurationOptions(globalConfiguration, input);
globalConfiguration = await _globalConfigRepository.UpdateAsync(globalConfiguration, true);
@ -79,19 +79,19 @@ namespace LINGYUN.ApiGateway.Ocelot
return ObjectMapper.Map<GlobalConfiguration, GlobalConfigurationDto>(globalConfiguration);
}
public virtual async Task<PagedResultDto<GlobalConfigurationDto>> GetAsync(GlobalGetByPagedInputDto globalGetPaged)
public virtual async Task<PagedResultDto<GlobalConfigurationDto>> GetAsync(GlobalGetByPagedInputDto input)
{
var globalsTupe = await _globalConfigRepository.GetPagedListAsync(globalGetPaged.Filter, globalGetPaged.Sorting,
globalGetPaged.SkipCount, globalGetPaged.MaxResultCount);
var globalsTupe = await _globalConfigRepository.GetPagedListAsync(input.Filter, input.Sorting,
input.SkipCount, input.MaxResultCount);
var globals = ObjectMapper.Map<List<GlobalConfiguration>, List<GlobalConfigurationDto>>(globalsTupe.Globals);
return new PagedResultDto<GlobalConfigurationDto>(globalsTupe.TotalCount, globals);
}
[Authorize(ApiGatewayPermissions.Global.Delete)]
public virtual async Task DeleteAsync(GlobalGetByAppIdInputDto globalGetByAppId)
public virtual async Task DeleteAsync(GlobalGetByAppIdInputDto input)
{
var globalConfiguration = await _globalConfigRepository.GetByAppIdAsync(globalGetByAppId.AppId);
var globalConfiguration = await _globalConfigRepository.GetByAppIdAsync(input.AppId);
await _globalConfigRepository.DeleteAsync(globalConfiguration);
}

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

@ -26,11 +26,11 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.Route.Create)]
public async Task<ReRouteDto> CreateAsync(ReRouteCreateDto routeCreateDto)
public async Task<ReRouteDto> CreateAsync(ReRouteCreateDto input)
{
var reRoute = ObjectMapper.Map<ReRouteCreateDto, ReRoute>(routeCreateDto);
var reRoute = ObjectMapper.Map<ReRouteCreateDto, ReRoute>(input);
ApplyReRouteOptions(reRoute, routeCreateDto);
ApplyReRouteOptions(reRoute, input);
reRoute = await _reRouteRepository.InsertAsync(reRoute, true);
@ -42,32 +42,32 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.Route.Update)]
public async Task<ReRouteDto> UpdateAsync(ReRouteUpdateDto routeUpdateDto)
public async Task<ReRouteDto> UpdateAsync(ReRouteUpdateDto input)
{
var reRoute = await _reRouteRepository.GetByReRouteIdAsync(long.Parse(routeUpdateDto.ReRouteId));
reRoute.SetRouteName(routeUpdateDto.ReRouteName);
reRoute.DangerousAcceptAnyServerCertificateValidator = routeUpdateDto.DangerousAcceptAnyServerCertificateValidator;
reRoute.DownstreamScheme = routeUpdateDto.DownstreamScheme;
reRoute.Key = routeUpdateDto.Key;
reRoute.Priority = routeUpdateDto.Priority;
reRoute.RequestIdKey = routeUpdateDto.RequestIdKey;
reRoute.ReRouteIsCaseSensitive = routeUpdateDto.ReRouteIsCaseSensitive;
reRoute.ServiceName = routeUpdateDto.ServiceName;
reRoute.ServiceNamespace = routeUpdateDto.ServiceNamespace;
reRoute.Timeout = routeUpdateDto.Timeout;
reRoute.UpstreamHost = routeUpdateDto.UpstreamHost;
reRoute.DownstreamHttpVersion = routeUpdateDto.DownstreamHttpVersion;
reRoute.SetDownstreamHeader(routeUpdateDto.DownstreamHeaderTransform);
reRoute.SetQueriesParamter(routeUpdateDto.AddQueriesToRequest);
reRoute.SetRequestClaims(routeUpdateDto.AddClaimsToRequest);
reRoute.SetRequestHeader(routeUpdateDto.AddHeadersToRequest);
reRoute.SetRouteClaims(routeUpdateDto.RouteClaimsRequirement);
reRoute.SetUpstreamHeader(routeUpdateDto.UpstreamHeaderTransform);
reRoute.SetChangeDownstreamPath(routeUpdateDto.ChangeDownstreamPathTemplate);
reRoute.SetDelegatingHandler(routeUpdateDto.DelegatingHandlers);
ApplyReRouteOptions(reRoute, routeUpdateDto);
var reRoute = await _reRouteRepository.GetByReRouteIdAsync(long.Parse(input.ReRouteId));
reRoute.SetRouteName(input.ReRouteName);
reRoute.DangerousAcceptAnyServerCertificateValidator = input.DangerousAcceptAnyServerCertificateValidator;
reRoute.DownstreamScheme = input.DownstreamScheme;
reRoute.Key = input.Key;
reRoute.Priority = input.Priority;
reRoute.RequestIdKey = input.RequestIdKey;
reRoute.ReRouteIsCaseSensitive = input.ReRouteIsCaseSensitive;
reRoute.ServiceName = input.ServiceName;
reRoute.ServiceNamespace = input.ServiceNamespace;
reRoute.Timeout = input.Timeout;
reRoute.UpstreamHost = input.UpstreamHost;
reRoute.DownstreamHttpVersion = input.DownstreamHttpVersion;
reRoute.SetDownstreamHeader(input.DownstreamHeaderTransform);
reRoute.SetQueriesParamter(input.AddQueriesToRequest);
reRoute.SetRequestClaims(input.AddClaimsToRequest);
reRoute.SetRequestHeader(input.AddHeadersToRequest);
reRoute.SetRouteClaims(input.RouteClaimsRequirement);
reRoute.SetUpstreamHeader(input.UpstreamHeaderTransform);
reRoute.SetChangeDownstreamPath(input.ChangeDownstreamPathTemplate);
reRoute.SetDelegatingHandler(input.DelegatingHandlers);
ApplyReRouteOptions(reRoute, input);
reRoute = await _reRouteRepository.UpdateAsync(reRoute, true);
@ -78,44 +78,44 @@ namespace LINGYUN.ApiGateway.Ocelot
return reRouteDto;
}
public async Task<ReRouteDto> GetAsync(ReRouteGetByIdInputDto routeGetById)
public async Task<ReRouteDto> GetAsync(ReRouteGetByIdInputDto input)
{
var reRoute = await _reRouteRepository.GetByReRouteIdAsync(routeGetById.RouteId);
var reRoute = await _reRouteRepository.GetByReRouteIdAsync(input.RouteId);
return ObjectMapper.Map<ReRoute, ReRouteDto>(reRoute);
}
public async Task<ReRouteDto> GetByRouteNameAsync(ReRouteGetByNameInputDto routeGetByName)
public async Task<ReRouteDto> GetByRouteNameAsync(ReRouteGetByNameInputDto input)
{
var reRoute = await _reRouteRepository.GetByNameAsync(routeGetByName.RouteName);
var reRoute = await _reRouteRepository.GetByNameAsync(input.RouteName);
return ObjectMapper.Map<ReRoute, ReRouteDto>(reRoute);
}
[Authorize(ApiGatewayPermissions.Route.Export)]
public async Task<ListResultDto<ReRouteDto>> GetAsync(ReRouteGetByAppIdInputDto routeGetByAppId)
public async Task<ListResultDto<ReRouteDto>> GetListByAppIdAsync(ReRouteGetByAppIdInputDto input)
{
await _routeGroupChecker.CheckActiveAsync(routeGetByAppId.AppId);
await _routeGroupChecker.CheckActiveAsync(input.AppId);
var routes = await _reRouteRepository.GetByAppIdAsync(routeGetByAppId.AppId);
var routes = await _reRouteRepository.GetByAppIdAsync(input.AppId);
return new ListResultDto<ReRouteDto>(ObjectMapper.Map<List<ReRoute>, List<ReRouteDto>>(routes));
}
public async Task<PagedResultDto<ReRouteDto>> GetPagedListAsync(ReRouteGetByPagedInputDto routeGetByPaged)
public async Task<PagedResultDto<ReRouteDto>> GetListAsync(ReRouteGetByPagedInputDto input)
{
await _routeGroupChecker.CheckActiveAsync(routeGetByPaged.AppId);
await _routeGroupChecker.CheckActiveAsync(input.AppId);
var reroutesTuple = await _reRouteRepository
.GetPagedListAsync(routeGetByPaged.AppId, routeGetByPaged.Filter, routeGetByPaged.Sorting,
routeGetByPaged.SkipCount, routeGetByPaged.MaxResultCount);
.GetPagedListAsync(input.AppId, input.Filter, input.Sorting,
input.SkipCount, input.MaxResultCount);
return new PagedResultDto<ReRouteDto>(reroutesTuple.total, ObjectMapper.Map<List<ReRoute>, List<ReRouteDto>>(reroutesTuple.routes));
}
[Authorize(ApiGatewayPermissions.Route.Delete)]
public async Task DeleteAsync(ReRouteGetByIdInputDto routeGetById)
public async Task DeleteAsync(ReRouteGetByIdInputDto input)
{
var reRoute = await _reRouteRepository.GetByReRouteIdAsync(routeGetById.RouteId);
var reRoute = await _reRouteRepository.GetByReRouteIdAsync(input.RouteId);
await _reRouteRepository.DeleteAsync(reRoute);
@ -123,13 +123,13 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.Route.Delete)]
public async Task RemoveAsync(ReRouteGetByAppIdInputDto routeGetByAppId)
public async Task RemoveAsync(ReRouteGetByAppIdInputDto input)
{
await _routeGroupChecker.CheckActiveAsync(routeGetByAppId.AppId);
await _routeGroupChecker.CheckActiveAsync(input.AppId);
await _reRouteRepository.DeleteAsync(x => x.AppId.Equals(routeGetByAppId.AppId));
await _reRouteRepository.DeleteAsync(x => x.AppId.Equals(input.AppId));
await DistributedEventBus.PublishAsync(new ApigatewayConfigChangeEventData(routeGetByAppId.AppId, "ReRoute", "Clean"));
await DistributedEventBus.PublishAsync(new ApigatewayConfigChangeEventData(input.AppId, "ReRoute", "Clean"));
}
protected virtual void ApplyReRouteOptions(ReRoute reRoute, ReRouteDtoBase routeDto)

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

@ -21,23 +21,23 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.RouteGroup.Create)]
public virtual async Task<RouteGroupDto> CreateAsync(RouteGroupCreateDto routerCreateDto)
public virtual async Task<RouteGroupDto> CreateAsync(RouteGroupCreateDto input)
{
var router = new RouteGroup(routerCreateDto.AppId, routerCreateDto.AppName, routerCreateDto.AppIpAddress);
router.Name = routerCreateDto.Name;
router.IsActive = routerCreateDto.IsActive;
router.Description = routerCreateDto.Description;
var router = new RouteGroup(input.AppId, input.AppName, input.AppIpAddress);
router.Name = input.Name;
router.IsActive = input.IsActive;
router.Description = input.Description;
router = await RouterRepository.InsertAsync(router, true);
return ObjectMapper.Map<RouteGroup, RouteGroupDto>(router);
}
public virtual async Task<RouteGroupDto> GetAsync(RouteGroupGetByAppIdInputDto routerGetByAppId)
public virtual async Task<RouteGroupDto> GetAsync(RouteGroupGetByAppIdInputDto input)
{
using (DataFilter.Disable<IActivation>())
{
var router = await RouterRepository.GetByAppIdAsync(routerGetByAppId.AppId);
var router = await RouterRepository.GetByAppIdAsync(input.AppId);
return ObjectMapper.Map<RouteGroup, RouteGroupDto>(router);
}
@ -56,12 +56,12 @@ namespace LINGYUN.ApiGateway.Ocelot
return new ListResultDto<RouteGroupAppIdsDto>(appIdsDto);
}
public virtual async Task<PagedResultDto<RouteGroupDto>> GetAsync(RouteGroupGetByPagedInputDto routerGetByPagedInput)
public virtual async Task<PagedResultDto<RouteGroupDto>> GetAsync(RouteGroupGetByPagedInputDto input)
{
using (DataFilter.Disable<IActivation>())
{
var (Routers, TotalCount) = await RouterRepository.GetPagedListAsync(routerGetByPagedInput.Filter,
routerGetByPagedInput.Sorting, routerGetByPagedInput.SkipCount, routerGetByPagedInput.MaxResultCount);
var (Routers, TotalCount) = await RouterRepository.GetPagedListAsync(input.Filter,
input.Sorting, input.SkipCount, input.MaxResultCount);
var routers = ObjectMapper.Map<List<RouteGroup>, List<RouteGroupDto>>(Routers);
return new PagedResultDto<RouteGroupDto>(TotalCount, routers);
@ -69,13 +69,13 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.RouteGroup.Update)]
public virtual async Task<RouteGroupDto> UpdateAsync(RouteGroupUpdateDto routerUpdateDto)
public virtual async Task<RouteGroupDto> UpdateAsync(RouteGroupUpdateDto input)
{
var router = await RouterRepository.GetByAppIdAsync(routerUpdateDto.AppId);
router.Name = routerUpdateDto.Name;
router.IsActive = routerUpdateDto.IsActive;
router.Description = routerUpdateDto.Description;
router.SwitchApp(routerUpdateDto.AppName, routerUpdateDto.AppIpAddress);
var router = await RouterRepository.GetByAppIdAsync(input.AppId);
router.Name = input.Name;
router.IsActive = input.IsActive;
router.Description = input.Description;
router.SwitchApp(input.AppName, input.AppIpAddress);
await RouterRepository.UpdateAsync(router);
await CurrentUnitOfWork.SaveChangesAsync();
@ -84,9 +84,9 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[Authorize(ApiGatewayPermissions.RouteGroup.Delete)]
public virtual async Task DeleteAsync(RouteGroupGetByAppIdInputDto routerGetByAppId)
public virtual async Task DeleteAsync(RouteGroupGetByAppIdInputDto input)
{
var router = await RouterRepository.GetByAppIdAsync(routerGetByAppId.AppId);
var router = await RouterRepository.GetByAppIdAsync(input.AppId);
await RouterRepository.DeleteAsync(router);
}
}

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

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

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

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

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

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

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

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

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

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

2
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/ApiGatewayControllerBase.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LINGYUN.ApiGateway
{
public class ApiGatewayControllerBase : AbpController
public abstract class ApiGatewayControllerBase : AbpController
{
protected ApiGatewayControllerBase()
{

32
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/AggregateReRouteController.cs

@ -19,54 +19,54 @@ namespace LINGYUN.ApiGateway.Ocelot
[HttpGet]
[Route("by-AppId/{AppId}")]
public async Task<ListResultDto<AggregateReRouteDto>> GetAsync(AggregateRouteGetByAppIdInputDto aggregateRouteGetByAppId)
public async Task<ListResultDto<AggregateReRouteDto>> GetAsync(AggregateRouteGetByAppIdInputDto input)
{
return await AggregateReRouteAppService.GetAsync(aggregateRouteGetByAppId);
return await AggregateReRouteAppService.GetAsync(input);
}
[HttpGet]
public async Task<PagedResultDto<AggregateReRouteDto>> GetPagedListAsync(AggregateRouteGetByPagedInputDto aggregateRouteGetByPaged)
public async Task<PagedResultDto<AggregateReRouteDto>> GetPagedListAsync(AggregateRouteGetByPagedInputDto input)
{
return await AggregateReRouteAppService.GetPagedListAsync(aggregateRouteGetByPaged);
return await AggregateReRouteAppService.GetPagedListAsync(input);
}
[HttpGet]
[Route("{RouteId}")]
public async Task<AggregateReRouteDto> GetAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId)
public async Task<AggregateReRouteDto> GetAsync(AggregateRouteGetByRouteIdInputDto input)
{
return await AggregateReRouteAppService.GetAsync(aggregateRouteGetByRouteId);
return await AggregateReRouteAppService.GetAsync(input);
}
[HttpPost]
public async Task<AggregateReRouteDto> CreateAsync(AggregateReRouteCreateDto aggregateReRouteCreate)
public async Task<AggregateReRouteDto> CreateAsync(AggregateReRouteCreateDto input)
{
return await AggregateReRouteAppService.CreateAsync(aggregateReRouteCreate);
return await AggregateReRouteAppService.CreateAsync(input);
}
[HttpPut]
public async Task<AggregateReRouteDto> UpdateAsync(AggregateReRouteUpdateDto aggregateReRouteUpdate)
public async Task<AggregateReRouteDto> UpdateAsync(AggregateReRouteUpdateDto input)
{
return await AggregateReRouteAppService.UpdateAsync(aggregateReRouteUpdate);
return await AggregateReRouteAppService.UpdateAsync(input);
}
[HttpDelete]
public async Task DeleteAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId)
public async Task DeleteAsync(AggregateRouteGetByRouteIdInputDto input)
{
await AggregateReRouteAppService.DeleteAsync(aggregateRouteGetByRouteId);
await AggregateReRouteAppService.DeleteAsync(input);
}
[HttpPost]
[Route("RouteConfig")]
public async Task<AggregateReRouteConfigDto> AddRouteConfigAsync(AggregateReRouteConfigCreateDto aggregateReRouteConfigCreate)
public async Task<AggregateReRouteConfigDto> AddRouteConfigAsync(AggregateReRouteConfigCreateDto input)
{
return await AggregateReRouteAppService.AddRouteConfigAsync(aggregateReRouteConfigCreate);
return await AggregateReRouteAppService.AddRouteConfigAsync(input);
}
[HttpDelete]
[Route("RouteConfig")]
public async Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto aggregateReRouteConfigGetByKey)
public async Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto input)
{
await AggregateReRouteAppService.DeleteRouteConfigAsync(aggregateReRouteConfigGetByKey);
await AggregateReRouteAppService.DeleteRouteConfigAsync(input);
}
}
}

4
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/DynamicReRouteController.cs

@ -19,9 +19,9 @@ namespace LINGYUN.ApiGateway.Ocelot
[HttpGet]
[Route("By-AppId/{AppId}")]
public virtual async Task<ListResultDto<DynamicReRouteDto>> GetAsync(DynamicRouteGetByAppIdInputDto dynamicRouteGetByAppId)
public virtual async Task<ListResultDto<DynamicReRouteDto>> GetAsync(DynamicRouteGetByAppIdInputDto input)
{
return await DynamicReRouteAppService.GetAsync(dynamicRouteGetByAppId);
return await DynamicReRouteAppService.GetAsync(input);
}
}
}

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

@ -24,34 +24,34 @@ namespace LINGYUN.ApiGateway.Ocelot
[HttpGet]
[Route("By-AppId/{AppId}")]
public async Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto globalGetByAppId)
public async Task<GlobalConfigurationDto> GetAsync(GlobalGetByAppIdInputDto input)
{
return await GlobalConfigurationAppService.GetAsync(globalGetByAppId);
return await GlobalConfigurationAppService.GetAsync(input);
}
[HttpPost]
public async Task<GlobalConfigurationDto> CreateAsync(GlobalCreateDto globalCreateDto)
public async Task<GlobalConfigurationDto> CreateAsync(GlobalCreateDto input)
{
return await GlobalConfigurationAppService.CreateAsync(globalCreateDto);
return await GlobalConfigurationAppService.CreateAsync(input);
}
[HttpPut]
public async Task<GlobalConfigurationDto> UpdateAsync(GlobalUpdateDto globalUpdateDto)
public async Task<GlobalConfigurationDto> UpdateAsync(GlobalUpdateDto input)
{
return await GlobalConfigurationAppService.UpdateAsync(globalUpdateDto);
return await GlobalConfigurationAppService.UpdateAsync(input);
}
[HttpDelete]
public virtual async Task DeleteAsync(GlobalGetByAppIdInputDto globalGetByAppId)
public virtual async Task DeleteAsync(GlobalGetByAppIdInputDto input)
{
await GlobalConfigurationAppService.DeleteAsync(globalGetByAppId);
await GlobalConfigurationAppService.DeleteAsync(input);
}
[HttpGet]
public virtual async Task<PagedResultDto<GlobalConfigurationDto>> GetAsync(GlobalGetByPagedInputDto globalGetPaged)
public virtual async Task<PagedResultDto<GlobalConfigurationDto>> GetAsync(GlobalGetByPagedInputDto input)
{
var user = CurrentUser;
return await GlobalConfigurationAppService.GetAsync(globalGetPaged);
return await GlobalConfigurationAppService.GetAsync(input);
}
}
}

32
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/ReRouteController.cs

@ -18,55 +18,55 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[HttpPost]
public async Task<ReRouteDto> CreateAsync(ReRouteCreateDto routeCreateDto)
public async Task<ReRouteDto> CreateAsync(ReRouteCreateDto input)
{
return await ReRouteAppService.CreateAsync(routeCreateDto);
return await ReRouteAppService.CreateAsync(input);
}
[HttpPut]
public async Task<ReRouteDto> UpdateAsync(ReRouteUpdateDto routeUpdateDto)
public async Task<ReRouteDto> UpdateAsync(ReRouteUpdateDto input)
{
return await ReRouteAppService.UpdateAsync(routeUpdateDto);
return await ReRouteAppService.UpdateAsync(input);
}
[HttpGet]
[Route("By-RouteId/{RouteId}")]
public async Task<ReRouteDto> GetAsync(ReRouteGetByIdInputDto routeGetById)
public async Task<ReRouteDto> GetAsync(ReRouteGetByIdInputDto input)
{
return await ReRouteAppService.GetAsync(routeGetById);
return await ReRouteAppService.GetAsync(input);
}
[HttpGet]
[Route("By-RouteName/{RouteName}")]
public async Task<ReRouteDto> GetByRouteNameAsync(ReRouteGetByNameInputDto routeGetByName)
public async Task<ReRouteDto> GetByRouteNameAsync(ReRouteGetByNameInputDto input)
{
return await ReRouteAppService.GetByRouteNameAsync(routeGetByName);
return await ReRouteAppService.GetByRouteNameAsync(input);
}
[HttpGet]
[Route("By-AppId/{AppId}")]
public async Task<ListResultDto<ReRouteDto>> GetAsync(ReRouteGetByAppIdInputDto routeGetByAppId)
public async Task<ListResultDto<ReRouteDto>> GetListByAppIdAsync(ReRouteGetByAppIdInputDto input)
{
return await ReRouteAppService.GetAsync(routeGetByAppId);
return await ReRouteAppService.GetListByAppIdAsync(input);
}
[HttpGet]
public async Task<PagedResultDto<ReRouteDto>> GetPagedListAsync(ReRouteGetByPagedInputDto routeGetByPaged)
public async Task<PagedResultDto<ReRouteDto>> GetListAsync(ReRouteGetByPagedInputDto input)
{
return await ReRouteAppService.GetPagedListAsync(routeGetByPaged);
return await ReRouteAppService.GetListAsync(input);
}
[HttpDelete]
[Route("Clear")]
public async Task RemoveAsync(ReRouteGetByAppIdInputDto routeGetByAppId)
public async Task RemoveAsync(ReRouteGetByAppIdInputDto input)
{
await ReRouteAppService.RemoveAsync(routeGetByAppId);
await ReRouteAppService.RemoveAsync(input);
}
[HttpDelete]
public async Task DeleteAsync(ReRouteGetByIdInputDto routeGetById)
public async Task DeleteAsync(ReRouteGetByIdInputDto input)
{
await ReRouteAppService.DeleteAsync(routeGetById);
await ReRouteAppService.DeleteAsync(input);
}
}
}

20
aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/RouteGroupController.cs

@ -17,16 +17,16 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[HttpPost]
public virtual async Task<RouteGroupDto> CreateAsync(RouteGroupCreateDto routerCreateDto)
public virtual async Task<RouteGroupDto> CreateAsync(RouteGroupCreateDto input)
{
return await RouterAppService.CreateAsync(routerCreateDto);
return await RouterAppService.CreateAsync(input);
}
[HttpGet]
[Route("By-AppId/{AppId}")]
public virtual async Task<RouteGroupDto> GetAsync(RouteGroupGetByAppIdInputDto routerGetByAppId)
public virtual async Task<RouteGroupDto> GetAsync(RouteGroupGetByAppIdInputDto input)
{
return await RouterAppService.GetAsync(routerGetByAppId);
return await RouterAppService.GetAsync(input);
}
[HttpGet]
@ -37,21 +37,21 @@ namespace LINGYUN.ApiGateway.Ocelot
}
[HttpGet]
public virtual async Task<PagedResultDto<RouteGroupDto>> GetAsync(RouteGroupGetByPagedInputDto routerGetByPagedInput)
public virtual async Task<PagedResultDto<RouteGroupDto>> GetAsync(RouteGroupGetByPagedInputDto input)
{
return await RouterAppService.GetAsync(routerGetByPagedInput);
return await RouterAppService.GetAsync(input);
}
[HttpPut]
public virtual async Task<RouteGroupDto> UpdateAsync(RouteGroupUpdateDto routerUpdateDto)
public virtual async Task<RouteGroupDto> UpdateAsync(RouteGroupUpdateDto input)
{
return await RouterAppService.UpdateAsync(routerUpdateDto);
return await RouterAppService.UpdateAsync(input);
}
[HttpDelete]
public virtual async Task DeleteAsync(RouteGroupGetByAppIdInputDto routerGetByAppId)
public virtual async Task DeleteAsync(RouteGroupGetByAppIdInputDto input)
{
await RouterAppService.DeleteAsync(routerGetByAppId);
await RouterAppService.DeleteAsync(input);
}
}
}

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -11,11 +11,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Features" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Features" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -6,10 +6,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AutoMapper" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="3.3.0" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Core" Version="3.3.0" />
</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="3.1.6" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.HangFire" Version="3.2.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.2.0" />
<PackageReference Include="Volo.Abp.HangFire" Version="3.3.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.2.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.BlobStoring" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -9,10 +9,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.8" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Volo.Abp.Core" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Core" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />

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="3.1.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="DotNetCore.CAP" Version="3.0.4" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="3.2.0" />
<PackageReference Include="Volo.Abp.EventBus" Version="3.2.0" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="3.3.0" />
<PackageReference Include="Volo.Abp.EventBus" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Emailing" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Emailing" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

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

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -9,9 +9,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.8" />
<PackageReference Include="StackExchange.Redis" Version="2.0.593" />
<PackageReference Include="Volo.Abp.Core" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Core" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Features" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Hangfire.MySql.Core" Version="2.2.5" />
<PackageReference Include="Volo.Abp.HangFire" Version="3.2.0" />
<PackageReference Include="Volo.Abp.HangFire" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="HangFire.SqlServer" Version="1.7.11" />
<PackageReference Include="Volo.Abp.HangFire" Version="3.2.0" />
<PackageReference Include="Volo.Abp.HangFire" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching" Version="3.1.0" />
<PackageReference Include="Volo.Abp.IdentityModel" Version="3.1.0" />
<PackageReference Include="Volo.Abp.Caching" Version="3.3.0" />
<PackageReference Include="Volo.Abp.IdentityModel" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -17,9 +17,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.2" />
<PackageReference Include="Volo.Abp.Json" Version="2.8.0" />
<PackageReference Include="Volo.Abp.Localization" Version="2.8.0" />
<PackageReference Include="Volo.Abp.Threading" Version="2.8.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Localization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Threading" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -20,9 +20,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.7" />
<PackageReference Include="Volo.Abp.Localization" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Threading" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Localization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Threading" Version="3.3.0" />
</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="3.1.7" />
<PackageReference Include="Volo.Abp.Localization" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Threading" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Localization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Threading" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Core" Version="3.3.0" />
</ItemGroup>
</Project>

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,9 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.EventBus" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.2.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.2.0" />
<PackageReference Include="Volo.Abp.EventBus" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.3.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.3.0" />
</ItemGroup>
</Project>

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

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

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Settings" Version="3.3.0" />
</ItemGroup>
</Project>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -20,9 +20,9 @@
<ItemGroup>
<PackageReference Include="aliyun-net-sdk-core" Version="1.5.8" />
<PackageReference Include="Volo.Abp.Json" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Localization" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Sms" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Json" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Localization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Sms" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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" />
@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Authorization" Version="3.2.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Features" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Features" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Validation" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.BlobStoring.FileSystem" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="3.3.0" />
</ItemGroup>
</Project>

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

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

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="3.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="3.3.0" />
</ItemGroup>
</Project>

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

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

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="3.2.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Uow" Version="3.2.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Uow" Version="3.3.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -18,8 +18,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="3.2.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="3.3.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="3.3.0" />
</ItemGroup>
</Project>

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

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

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="3.2.0" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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="3.2.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Authorization" Version="3.3.0" />
</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="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Application" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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="3.2.0" />
<PackageReference Include="Volo.Abp.Users.Domain.Shared" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Localization" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Users.Domain.Shared" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
@ -18,11 +18,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Caching" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.2.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="3.2.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Users.Abstractions" Version="3.2.0" />
<PackageReference Include="Volo.Abp.Caching" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="3.3.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="3.3.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs" Version="3.3.0" />
<PackageReference Include="Volo.Abp.Users.Abstractions" Version="3.3.0" />
</ItemGroup>
<ItemGroup>

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

4
aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj

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

4
aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj

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

4
aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj

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

10
aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj

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

2
aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj

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

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

Loading…
Cancel
Save