diff --git a/aspnet-core/common.props b/aspnet-core/common.props index 5871a828f..bb4a0f908 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,7 +1,7 @@ latest - 3.2.0 + 3.3.0 LINGYUN $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-vue-admin-element-typescript/ diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj index 6e9fdbd4d..9aecfae64 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj index 4c7fd2d81..4fef853ca 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj index 789b101e7..671875157 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj index 9ecfba33d..bcdfac3e9 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj index 5f8129b39..6ebc79af3 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj index 5ec9bd15e..564052698 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj @@ -1,4 +1,4 @@ - + @@ -24,8 +24,8 @@ - - + + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj index 06fc5d2ec..587d5806c 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN.ApiGateway.Application.Contracts.csproj @@ -18,7 +18,8 @@ - + + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/ApiGatewayApplicationContractsModule.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/ApiGatewayApplicationContractsModule.cs index 4c3ed3a7c..821c9cb15 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/ApiGatewayApplicationContractsModule.cs +++ b/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) diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IAggregateReRouteAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IAggregateReRouteAppService.cs index e5b788ca4..33211045a 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IAggregateReRouteAppService.cs +++ b/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 GetAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId); + Task GetAsync(AggregateRouteGetByRouteIdInputDto input); - Task> GetAsync(AggregateRouteGetByAppIdInputDto aggregateRouteGetByAppId); + Task> GetAsync(AggregateRouteGetByAppIdInputDto input); - Task> GetPagedListAsync(AggregateRouteGetByPagedInputDto aggregateRouteGetByPaged); + Task> GetPagedListAsync(AggregateRouteGetByPagedInputDto input); - Task CreateAsync(AggregateReRouteCreateDto aggregateReRouteCreate); + Task CreateAsync(AggregateReRouteCreateDto input); - Task UpdateAsync(AggregateReRouteUpdateDto aggregateReRouteUpdate); + Task UpdateAsync(AggregateReRouteUpdateDto input); - Task DeleteAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId); + Task DeleteAsync(AggregateRouteGetByRouteIdInputDto input); - Task AddRouteConfigAsync(AggregateReRouteConfigCreateDto aggregateReRouteConfigCreate); + Task AddRouteConfigAsync(AggregateReRouteConfigCreateDto input); - Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto aggregateReRouteConfigGetByKey); + Task DeleteRouteConfigAsync(AggregateReRouteConfigGetByKeyInputDto input); } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IDynamicReRouteAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IDynamicReRouteAppService.cs index d18206029..8911d25bb 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IDynamicReRouteAppService.cs +++ b/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> GetAsync(DynamicRouteGetByAppIdInputDto dynamicRouteGetByAppId); + Task> GetAsync(DynamicRouteGetByAppIdInputDto input); } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IGlobalConfigurationAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IGlobalConfigurationAppService.cs index 2046dade9..60c31c484 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IGlobalConfigurationAppService.cs +++ b/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 GetAsync(GlobalGetByAppIdInputDto globalGetByAppId); + Task GetAsync(GlobalGetByAppIdInputDto input); - Task CreateAsync(GlobalCreateDto globalCreateDto); + Task CreateAsync(GlobalCreateDto input); - Task UpdateAsync(GlobalUpdateDto globalUpdateDto); + Task UpdateAsync(GlobalUpdateDto input); - Task> GetAsync(GlobalGetByPagedInputDto globalGetPaged); + Task> GetAsync(GlobalGetByPagedInputDto input); - Task DeleteAsync(GlobalGetByAppIdInputDto globalGetByAppId); + Task DeleteAsync(GlobalGetByAppIdInputDto input); } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IReRouteAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IReRouteAppService.cs index 0a035ab13..9759cd271 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IReRouteAppService.cs +++ b/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> GetAsync(ReRouteGetByAppIdInputDto routeGetByAppId); + Task> GetListByAppIdAsync(ReRouteGetByAppIdInputDto input); - Task> GetPagedListAsync(ReRouteGetByPagedInputDto routeGetByPaged); + Task> GetListAsync(ReRouteGetByPagedInputDto input); - Task GetByRouteNameAsync(ReRouteGetByNameInputDto routeGetByName); + Task GetByRouteNameAsync(ReRouteGetByNameInputDto input); - Task GetAsync(ReRouteGetByIdInputDto routeGetById); + Task GetAsync(ReRouteGetByIdInputDto input); - Task CreateAsync(ReRouteCreateDto routeCreateDto); + Task CreateAsync(ReRouteCreateDto input); - Task UpdateAsync(ReRouteUpdateDto routeUpdateDto); + Task UpdateAsync(ReRouteUpdateDto input); - Task DeleteAsync(ReRouteGetByIdInputDto routeGetById); + Task DeleteAsync(ReRouteGetByIdInputDto input); - Task RemoveAsync(ReRouteGetByAppIdInputDto routeGetByAppId); + Task RemoveAsync(ReRouteGetByAppIdInputDto input); } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IRouteGroupAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IRouteGroupAppService.cs index 9daec74c7..cdd76a1d6 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IRouteGroupAppService.cs +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application.Contracts/LINGYUN/ApiGateway/Ocelot/IRouteGroupAppService.cs @@ -7,14 +7,14 @@ namespace LINGYUN.ApiGateway.Ocelot { Task> GetActivedAsync(); - Task GetAsync(RouteGroupGetByAppIdInputDto routerGetByAppId); + Task GetAsync(RouteGroupGetByAppIdInputDto input); - Task> GetAsync(RouteGroupGetByPagedInputDto routerGetByPagedInput); + Task> GetAsync(RouteGroupGetByPagedInputDto input); - Task CreateAsync(RouteGroupCreateDto routerCreateDto); + Task CreateAsync(RouteGroupCreateDto input); - Task UpdateAsync(RouteGroupUpdateDto routerUpdateDto); + Task UpdateAsync(RouteGroupUpdateDto input); - Task DeleteAsync(RouteGroupGetByAppIdInputDto routerGetByAppId); + Task DeleteAsync(RouteGroupGetByAppIdInputDto input); } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj index 5c9895c7e..494902122 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN.ApiGateway.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,8 @@ - + + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationModule.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationModule.cs index 62a61fc10..317866318 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationModule.cs +++ b/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 diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationServiceBase.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationServiceBase.cs index 551258740..7e63a9fa7 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/ApiGatewayApplicationServiceBase.cs +++ b/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() { diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/AggregateReRouteAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/AggregateReRouteAppService.cs index 037cf17bd..77b125687 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/AggregateReRouteAppService.cs +++ b/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 GetAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId) + public virtual async Task GetAsync(AggregateRouteGetByRouteIdInputDto input) { - var routeId = long.Parse(aggregateRouteGetByRouteId.RouteId); + var routeId = long.Parse(input.RouteId); var reroute = await _aggregateReRouteRepository.GetByRouteIdAsync(routeId); return ObjectMapper.Map(reroute); } [Authorize(ApiGatewayPermissions.AggregateRoute.Export)] - public async Task> GetAsync(AggregateRouteGetByAppIdInputDto aggregateRouteGetByAppId) + public async Task> GetAsync(AggregateRouteGetByAppIdInputDto input) { - var reroutes = await _aggregateReRouteRepository.GetByAppIdAsync(aggregateRouteGetByAppId.AppId); + var reroutes = await _aggregateReRouteRepository.GetByAppIdAsync(input.AppId); return new ListResultDto(ObjectMapper.Map, List>(reroutes)); } - public async Task> GetPagedListAsync(AggregateRouteGetByPagedInputDto aggregateRouteGetByPaged) + public async Task> 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(reroutesTuple.total, ObjectMapper.Map, List>(reroutesTuple.routes)); } [Authorize(ApiGatewayPermissions.AggregateRoute.Create)] - public virtual async Task CreateAsync(AggregateReRouteCreateDto aggregateReRouteCreate) + public virtual async Task 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(aggregateReRouteCreate); - aggregateRoute.SetUpstream(aggregateReRouteCreate.UpstreamHost, aggregateReRouteCreate.UpstreamPathTemplate); - foreach (var httpMethod in aggregateReRouteCreate.UpstreamHttpMethod) + var aggregateRoute = ObjectMapper.Map(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 UpdateAsync(AggregateReRouteUpdateDto aggregateReRouteUpdate) + public virtual async Task 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 AddRouteConfigAsync(AggregateReRouteConfigCreateDto aggregateReRouteConfigCreate) + public virtual async Task 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); diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/DynamicReRouteAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/DynamicReRouteAppService.cs index 905464ddb..302e44df2 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/DynamicReRouteAppService.cs +++ b/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> GetAsync(DynamicRouteGetByAppIdInputDto dynamicRouteGetByAppId) + public async Task> GetAsync(DynamicRouteGetByAppIdInputDto input) { - var dynamicReRoutes = await _dynamicReRouteRepository.GetByAppIdAsync(dynamicRouteGetByAppId.AppId); + var dynamicReRoutes = await _dynamicReRouteRepository.GetByAppIdAsync(input.AppId); return new ListResultDto(ObjectMapper.Map, List>(dynamicReRoutes)); } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationAppService.cs index 483411fff..3e795b7c2 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationAppService.cs +++ b/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 GetAsync(GlobalGetByAppIdInputDto globalGetByAppId) + public virtual async Task 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(globalConfig); @@ -41,17 +41,17 @@ namespace LINGYUN.ApiGateway.Ocelot } [Authorize(ApiGatewayPermissions.Global.Create)] - public virtual async Task CreateAsync(GlobalCreateDto globalCreateDto) + public virtual async Task 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 UpdateAsync(GlobalUpdateDto globalUpdateDto) + public async Task 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); } - public virtual async Task> GetAsync(GlobalGetByPagedInputDto globalGetPaged) + public virtual async Task> 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>(globalsTupe.Globals); return new PagedResultDto(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); } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/ReRouteAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/ReRouteAppService.cs index 441b16a51..eb69995cc 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/ReRouteAppService.cs +++ b/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 CreateAsync(ReRouteCreateDto routeCreateDto) + public async Task CreateAsync(ReRouteCreateDto input) { - var reRoute = ObjectMapper.Map(routeCreateDto); + var reRoute = ObjectMapper.Map(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 UpdateAsync(ReRouteUpdateDto routeUpdateDto) + public async Task 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 GetAsync(ReRouteGetByIdInputDto routeGetById) + public async Task GetAsync(ReRouteGetByIdInputDto input) { - var reRoute = await _reRouteRepository.GetByReRouteIdAsync(routeGetById.RouteId); + var reRoute = await _reRouteRepository.GetByReRouteIdAsync(input.RouteId); return ObjectMapper.Map(reRoute); } - public async Task GetByRouteNameAsync(ReRouteGetByNameInputDto routeGetByName) + public async Task GetByRouteNameAsync(ReRouteGetByNameInputDto input) { - var reRoute = await _reRouteRepository.GetByNameAsync(routeGetByName.RouteName); + var reRoute = await _reRouteRepository.GetByNameAsync(input.RouteName); return ObjectMapper.Map(reRoute); } [Authorize(ApiGatewayPermissions.Route.Export)] - public async Task> GetAsync(ReRouteGetByAppIdInputDto routeGetByAppId) + public async Task> 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(ObjectMapper.Map, List>(routes)); } - public async Task> GetPagedListAsync(ReRouteGetByPagedInputDto routeGetByPaged) + public async Task> 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(reroutesTuple.total, ObjectMapper.Map, List>(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) diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/RouteGroupAppService.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/RouteGroupAppService.cs index ba25ac611..91fb2b0a1 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Application/LINGYUN/ApiGateway/Ocelot/RouteGroupAppService.cs +++ b/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 CreateAsync(RouteGroupCreateDto routerCreateDto) + public virtual async Task 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(router); } - public virtual async Task GetAsync(RouteGroupGetByAppIdInputDto routerGetByAppId) + public virtual async Task GetAsync(RouteGroupGetByAppIdInputDto input) { using (DataFilter.Disable()) { - var router = await RouterRepository.GetByAppIdAsync(routerGetByAppId.AppId); + var router = await RouterRepository.GetByAppIdAsync(input.AppId); return ObjectMapper.Map(router); } @@ -56,12 +56,12 @@ namespace LINGYUN.ApiGateway.Ocelot return new ListResultDto(appIdsDto); } - public virtual async Task> GetAsync(RouteGroupGetByPagedInputDto routerGetByPagedInput) + public virtual async Task> GetAsync(RouteGroupGetByPagedInputDto input) { using (DataFilter.Disable()) { - 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>(Routers); return new PagedResultDto(TotalCount, routers); @@ -69,13 +69,13 @@ namespace LINGYUN.ApiGateway.Ocelot } [Authorize(ApiGatewayPermissions.RouteGroup.Update)] - public virtual async Task UpdateAsync(RouteGroupUpdateDto routerUpdateDto) + public virtual async Task 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); } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj index dd6108848..eb07e0bcb 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain.Shared/LINGYUN.ApiGateway.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj index 1453e4084..97370b034 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.Domain/LINGYUN.ApiGateway.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj index 8e5e0313b..7267f9dda 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.EntityFrameworkCore/LINGYUN.ApiGateway.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj index 522780511..3ed2c40ab 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi.Client/LINGYUN.ApiGateway.HttpApi.Client.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj index 34b37e505..52b9d8688 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN.ApiGateway.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/ApiGatewayControllerBase.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/ApiGatewayControllerBase.cs index 0b68a7414..e3be8bce9 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/ApiGatewayControllerBase.cs +++ b/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() { diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/AggregateReRouteController.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/AggregateReRouteController.cs index e43842b8d..853d10ccf 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/AggregateReRouteController.cs +++ b/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> GetAsync(AggregateRouteGetByAppIdInputDto aggregateRouteGetByAppId) + public async Task> GetAsync(AggregateRouteGetByAppIdInputDto input) { - return await AggregateReRouteAppService.GetAsync(aggregateRouteGetByAppId); + return await AggregateReRouteAppService.GetAsync(input); } [HttpGet] - public async Task> GetPagedListAsync(AggregateRouteGetByPagedInputDto aggregateRouteGetByPaged) + public async Task> GetPagedListAsync(AggregateRouteGetByPagedInputDto input) { - return await AggregateReRouteAppService.GetPagedListAsync(aggregateRouteGetByPaged); + return await AggregateReRouteAppService.GetPagedListAsync(input); } [HttpGet] [Route("{RouteId}")] - public async Task GetAsync(AggregateRouteGetByRouteIdInputDto aggregateRouteGetByRouteId) + public async Task GetAsync(AggregateRouteGetByRouteIdInputDto input) { - return await AggregateReRouteAppService.GetAsync(aggregateRouteGetByRouteId); + return await AggregateReRouteAppService.GetAsync(input); } [HttpPost] - public async Task CreateAsync(AggregateReRouteCreateDto aggregateReRouteCreate) + public async Task CreateAsync(AggregateReRouteCreateDto input) { - return await AggregateReRouteAppService.CreateAsync(aggregateReRouteCreate); + return await AggregateReRouteAppService.CreateAsync(input); } [HttpPut] - public async Task UpdateAsync(AggregateReRouteUpdateDto aggregateReRouteUpdate) + public async Task 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 AddRouteConfigAsync(AggregateReRouteConfigCreateDto aggregateReRouteConfigCreate) + public async Task 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); } } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/DynamicReRouteController.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/DynamicReRouteController.cs index 12f8417d8..c7407c2e9 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/DynamicReRouteController.cs +++ b/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> GetAsync(DynamicRouteGetByAppIdInputDto dynamicRouteGetByAppId) + public virtual async Task> GetAsync(DynamicRouteGetByAppIdInputDto input) { - return await DynamicReRouteAppService.GetAsync(dynamicRouteGetByAppId); + return await DynamicReRouteAppService.GetAsync(input); } } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationController.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationController.cs index 555526fdc..c6ae0ddbf 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/GlobalConfigurationController.cs +++ b/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 GetAsync(GlobalGetByAppIdInputDto globalGetByAppId) + public async Task GetAsync(GlobalGetByAppIdInputDto input) { - return await GlobalConfigurationAppService.GetAsync(globalGetByAppId); + return await GlobalConfigurationAppService.GetAsync(input); } [HttpPost] - public async Task CreateAsync(GlobalCreateDto globalCreateDto) + public async Task CreateAsync(GlobalCreateDto input) { - return await GlobalConfigurationAppService.CreateAsync(globalCreateDto); + return await GlobalConfigurationAppService.CreateAsync(input); } [HttpPut] - public async Task UpdateAsync(GlobalUpdateDto globalUpdateDto) + public async Task 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> GetAsync(GlobalGetByPagedInputDto globalGetPaged) + public virtual async Task> GetAsync(GlobalGetByPagedInputDto input) { var user = CurrentUser; - return await GlobalConfigurationAppService.GetAsync(globalGetPaged); + return await GlobalConfigurationAppService.GetAsync(input); } } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/ReRouteController.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/ReRouteController.cs index 8e46753a1..65863ea1c 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/ReRouteController.cs +++ b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/ReRouteController.cs @@ -18,55 +18,55 @@ namespace LINGYUN.ApiGateway.Ocelot } [HttpPost] - public async Task CreateAsync(ReRouteCreateDto routeCreateDto) + public async Task CreateAsync(ReRouteCreateDto input) { - return await ReRouteAppService.CreateAsync(routeCreateDto); + return await ReRouteAppService.CreateAsync(input); } [HttpPut] - public async Task UpdateAsync(ReRouteUpdateDto routeUpdateDto) + public async Task UpdateAsync(ReRouteUpdateDto input) { - return await ReRouteAppService.UpdateAsync(routeUpdateDto); + return await ReRouteAppService.UpdateAsync(input); } [HttpGet] [Route("By-RouteId/{RouteId}")] - public async Task GetAsync(ReRouteGetByIdInputDto routeGetById) + public async Task GetAsync(ReRouteGetByIdInputDto input) { - return await ReRouteAppService.GetAsync(routeGetById); + return await ReRouteAppService.GetAsync(input); } [HttpGet] [Route("By-RouteName/{RouteName}")] - public async Task GetByRouteNameAsync(ReRouteGetByNameInputDto routeGetByName) + public async Task GetByRouteNameAsync(ReRouteGetByNameInputDto input) { - return await ReRouteAppService.GetByRouteNameAsync(routeGetByName); + return await ReRouteAppService.GetByRouteNameAsync(input); } [HttpGet] [Route("By-AppId/{AppId}")] - public async Task> GetAsync(ReRouteGetByAppIdInputDto routeGetByAppId) + public async Task> GetListByAppIdAsync(ReRouteGetByAppIdInputDto input) { - return await ReRouteAppService.GetAsync(routeGetByAppId); + return await ReRouteAppService.GetListByAppIdAsync(input); } [HttpGet] - public async Task> GetPagedListAsync(ReRouteGetByPagedInputDto routeGetByPaged) + public async Task> 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); } } } diff --git a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/RouteGroupController.cs b/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/RouteGroupController.cs index 1791cb63d..be01ea036 100644 --- a/aspnet-core/modules/apigateway/LINGYUN.ApiGateway.HttpApi/LINGYUN/ApiGateway/Ocelot/RouteGroupController.cs +++ b/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 CreateAsync(RouteGroupCreateDto routerCreateDto) + public virtual async Task CreateAsync(RouteGroupCreateDto input) { - return await RouterAppService.CreateAsync(routerCreateDto); + return await RouterAppService.CreateAsync(input); } [HttpGet] [Route("By-AppId/{AppId}")] - public virtual async Task GetAsync(RouteGroupGetByAppIdInputDto routerGetByAppId) + public virtual async Task 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> GetAsync(RouteGroupGetByPagedInputDto routerGetByPagedInput) + public virtual async Task> GetAsync(RouteGroupGetByPagedInputDto input) { - return await RouterAppService.GetAsync(routerGetByPagedInput); + return await RouterAppService.GetAsync(input); } [HttpPut] - public virtual async Task UpdateAsync(RouteGroupUpdateDto routerUpdateDto) + public virtual async Task 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); } } } diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj index 265f84553..3da92a2bf 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj index 0ff04929a..73180b09b 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj index 40a60afc7..4eac0703e 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj @@ -6,7 +6,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj index cf90800ca..e81f4130b 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Aliyun.Authorization/LINGYUN.Abp.Aliyun.Authorization.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj b/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj index c076ced26..e53d210e0 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj b/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj index 5e09bfd3b..42a4015e3 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj b/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj index 59dd80a7b..95aae0a6d 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj b/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj index ba270a13a..28bbeeb88 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.BackgroundJobs/LINGYUN.Abp.BackgroundJobs.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj b/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj index 29ad2a66b..fa6958408 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj b/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj index f44bcbe3e..55649492f 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock.Redis/LINGYUN.Abp.DistributedLock.Redis.csproj @@ -1,4 +1,4 @@ - + @@ -9,10 +9,10 @@ - - + + - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock/LINGYUN.Abp.DistributedLock.csproj b/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock/LINGYUN.Abp.DistributedLock.csproj index 6f3682eea..989fe915b 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock/LINGYUN.Abp.DistributedLock.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.DistributedLock/LINGYUN.Abp.DistributedLock.csproj @@ -1,4 +1,4 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj index 912b202d9..a2cb5c6d7 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Domain.Entities.Events/LINGYUN.Abp.Domain.Entities.Events.csproj @@ -6,7 +6,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj index 6a39d35dc..033060116 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj @@ -1,4 +1,4 @@ - + @@ -12,8 +12,8 @@ - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj b/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj index 41ece0404..24e3a55dc 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj b/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj index 199296896..11304ba1d 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj b/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj index 161c30c4d..3b5ab8e3d 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj index faff2f7ab..4ba653624 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj @@ -1,4 +1,4 @@ - + @@ -9,9 +9,9 @@ - + - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj index f7ad8f2ee..66ab7ed96 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj index 2d79057ca..2bdd74089 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj index 2e23a3ec3..1d436d159 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj b/aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj index 5133bac5e..676d66357 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj b/aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj index 7f324bea2..9f5c6051b 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj b/aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj index 635489aec..d681a21c7 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -13,8 +13,8 @@ - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj index 1ac4b2825..9d96ca1e0 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -17,9 +17,9 @@ - - - + + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj index 1bffc84af..f2c968eec 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj @@ -1,4 +1,4 @@ - + @@ -20,9 +20,9 @@ - - - + + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj index 5f9a46523..65be49448 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj index f2c543418..58380425b 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj index dd13d27ba..ba845b624 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj index 9c17b1282..2cc80b3c6 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj @@ -1,4 +1,4 @@ - + @@ -8,9 +8,9 @@ - - - + + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj b/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj index a9ebaa946..6acd58a00 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj b/aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj index cf90800ca..e81f4130b 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj index 0e5a7a1ea..03004c55a 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj @@ -1,4 +1,4 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj index 544ae2b07..5e76ffadb 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj index 04532fd24..79bf2fca4 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj index d894fb46c..31504daf5 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj @@ -1,4 +1,4 @@ - + @@ -20,9 +20,9 @@ - - - + + + diff --git a/aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj b/aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj index 275ccffcc..ec41a5f5f 100644 --- a/aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj +++ b/aspnet-core/modules/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj @@ -1,4 +1,4 @@ - + @@ -13,8 +13,8 @@ - - + + diff --git a/aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj b/aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj index cc87c47b8..e1fdc9871 100644 --- a/aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj +++ b/aspnet-core/modules/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj index 033c4cc3c..a6204eed5 100644 --- a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Application.Contracts/LINGYUN.Abp.FileManagement.Application.Contracts.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj index 37eb2a46d..034707f30 100644 --- a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain.Shared/LINGYUN.Abp.FileManagement.Domain.Shared.csproj @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj index 5c33cc2c6..29260b76d 100644 --- a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj +++ b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.Domain/LINGYUN.Abp.FileManagement.Domain.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj index 37f2dc2a1..726583689 100644 --- a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj +++ b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj index 0a13dfc00..410ab8f28 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj index 48d54147a..528fa5588 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj index 52e2fa5ff..56fc090c6 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj index 62a5a78b9..c0e43f0c3 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj index ebd26b5fb..b02fc95d8 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj index 47621ee78..413521dc2 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj index 4e9d7e3d4..25fd67c09 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.PermissionManagement.Domain.Identity/LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj index 9e57f44ea..26ae280fc 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -18,8 +18,8 @@ - - + + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj index 5473a4864..6ad7b3869 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj index 471aae7c1..fde55c578 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj index 491f84188..db7b7f939 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj index a6a88c7e5..d9dd7a591 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj index ab7a491ad..e02f2e7f2 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChatValidator/LINGYUN.Abp.IdentityServer.WeChatValidator.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj index 553cb00b1..cf02e7d67 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj index 9f876471a..7b0c251d5 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj index bad5d57b0..cba2e48f8 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj index 1e5430533..19ad0d511 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -18,11 +18,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj index ce18e5a57..e4bc7ff40 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj index fb54dba07..ea6d1b755 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj index 2d885a175..a16b2f56e 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj index ea1854834..681c031c4 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj index f0a990c7d..ca25d5e7b 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj +++ b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj index b6adae0e0..598cad9a2 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj index 25b4abda7..066eb3595 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj index 0a1a3c428..a1f41c87a 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj index 032dbb77e..99d4b0169 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj index 7a70429d6..fad83a1ce 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application.Contracts/LINGYUN.Abp.RulesManagement.Application.Contracts.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application.Contracts/LINGYUN.Abp.RulesManagement.Application.Contracts.csproj index 3dfa487fc..2b543dde6 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application.Contracts/LINGYUN.Abp.RulesManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application.Contracts/LINGYUN.Abp.RulesManagement.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application/LINGYUN.Abp.RulesManagement.Application.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application/LINGYUN.Abp.RulesManagement.Application.csproj index 0e9183995..3a74d6897 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application/LINGYUN.Abp.RulesManagement.Application.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Application/LINGYUN.Abp.RulesManagement.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain.Shared/LINGYUN.Abp.RulesManagement.Domain.Shared.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain.Shared/LINGYUN.Abp.RulesManagement.Domain.Shared.csproj index b8a1e7e64..821585076 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain.Shared/LINGYUN.Abp.RulesManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain.Shared/LINGYUN.Abp.RulesManagement.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain/LINGYUN.Abp.RulesManagement.Domain.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain/LINGYUN.Abp.RulesManagement.Domain.csproj index 79235b9d8..c05c6a17e 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain/LINGYUN.Abp.RulesManagement.Domain.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.Domain/LINGYUN.Abp.RulesManagement.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.EntityFrameworkCore/LINGYUN.Abp.RulesManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.EntityFrameworkCore/LINGYUN.Abp.RulesManagement.EntityFrameworkCore.csproj index 754a0bc46..eb0420f3b 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.EntityFrameworkCore/LINGYUN.Abp.RulesManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.EntityFrameworkCore/LINGYUN.Abp.RulesManagement.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi.Client/LINGYUN.Abp.RulesManagement.HttpApi.Client.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi.Client/LINGYUN.Abp.RulesManagement.HttpApi.Client.csproj index d51795862..df812755d 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi.Client/LINGYUN.Abp.RulesManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi.Client/LINGYUN.Abp.RulesManagement.HttpApi.Client.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi/LINGYUN.Abp.RulesManagement.HttpApi.csproj b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi/LINGYUN.Abp.RulesManagement.HttpApi.csproj index aa4f9a3d3..15186bd83 100644 --- a/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi/LINGYUN.Abp.RulesManagement.HttpApi.csproj +++ b/aspnet-core/modules/rules-management/LINGYUN.Abp.RulesManagement.HttpApi/LINGYUN.Abp.RulesManagement.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj index 50d8054be..f5e4417ff 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs index 0a1d00543..b7012c860 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs @@ -14,7 +14,6 @@ namespace LINGYUN.Abp.SettingManagement var settingPermissionGroup = context.AddGroup(AbpSettingManagementPermissions.GroupName, L("Permission:SettingManagement")); var settingPermissions = settingPermissionGroup.AddPermission(AbpSettingManagementPermissions.Settings.Default, L("Permission:Settings")); - settingPermissions.AddChild(AbpSettingManagementPermissions.Settings.Update, L("Permission:Update")); settingPermissions.AddChild(AbpSettingManagementPermissions.Settings.Manager, L("Permission:Manager")); } diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissions.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissions.cs index 656e1273a..61134d714 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissions.cs +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissions.cs @@ -10,7 +10,7 @@ namespace LINGYUN.Abp.SettingManagement { public const string Default = GroupName + ".Settings"; - [Obsolete("The best way to do this is to enable the configuration administrator privileges")] + [Obsolete("The best way to do this is to enable the configuration administrator privileges", true)] public const string Update = GroupName + ".Update"; public const string Manager = GroupName + ".Manager"; diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj index 33300381a..d2d6ee69e 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj index 780223ad3..00e36bbe8 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.DbFinder/LINGYUN.Abp.MultiTenancy.DbFinder.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.DbFinder/LINGYUN.Abp.MultiTenancy.DbFinder.csproj index ad3a3bcf5..4698a99a4 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.DbFinder/LINGYUN.Abp.MultiTenancy.DbFinder.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.DbFinder/LINGYUN.Abp.MultiTenancy.DbFinder.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj index 2b365409c..7d08e5a7f 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy/LINGYUN.Abp.MultiTenancy.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy/LINGYUN.Abp.MultiTenancy.csproj index 315ae385a..ede1d2d4c 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy/LINGYUN.Abp.MultiTenancy.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy/LINGYUN.Abp.MultiTenancy.csproj @@ -1,4 +1,4 @@ - + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application.Contracts/LINGYUN.Abp.TenantManagement.Application.Contracts.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application.Contracts/LINGYUN.Abp.TenantManagement.Application.Contracts.csproj index af9312563..fa6c9bd6e 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application.Contracts/LINGYUN.Abp.TenantManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application.Contracts/LINGYUN.Abp.TenantManagement.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -18,8 +18,8 @@ - - + + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application/LINGYUN.Abp.TenantManagement.Application.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application/LINGYUN.Abp.TenantManagement.Application.csproj index 67a953942..ccf3ea883 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application/LINGYUN.Abp.TenantManagement.Application.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.Application/LINGYUN.Abp.TenantManagement.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi.Client/LINGYUN.Abp.TenantManagement.HttpApi.Client.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi.Client/LINGYUN.Abp.TenantManagement.HttpApi.Client.csproj index bac814a85..b12484add 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi.Client/LINGYUN.Abp.TenantManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi.Client/LINGYUN.Abp.TenantManagement.HttpApi.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi/LINGYUN.Abp.TenantManagement.HttpApi.csproj b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi/LINGYUN.Abp.TenantManagement.HttpApi.csproj index 66da6c45e..0079567d7 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi/LINGYUN.Abp.TenantManagement.HttpApi.csproj +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.TenantManagement.HttpApi/LINGYUN.Abp.TenantManagement.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.Notifications.WeChat/LINGYUN.Abp.Notifications.WeChat.WeApp.csproj b/aspnet-core/modules/wechat/LINGYUN.Abp.Notifications.WeChat/LINGYUN.Abp.Notifications.WeChat.WeApp.csproj index 69f1e5cf5..b50a13b8f 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.Notifications.WeChat/LINGYUN.Abp.Notifications.WeChat.WeApp.csproj +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.Notifications.WeChat/LINGYUN.Abp.Notifications.WeChat.WeApp.csproj @@ -1,4 +1,4 @@ - + diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Authorization/LINGYUN.Abp.WeChat.Authorization.csproj b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Authorization/LINGYUN.Abp.WeChat.Authorization.csproj index 85bf57c60..22906cc67 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Authorization/LINGYUN.Abp.WeChat.Authorization.csproj +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Authorization/LINGYUN.Abp.WeChat.Authorization.csproj @@ -1,4 +1,4 @@ - + @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj index a31890133..9466440f7 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj @@ -1,4 +1,4 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs index fc03ad90d..d49f389e9 100644 --- a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs +++ b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs @@ -208,7 +208,7 @@ namespace AuthServer.Host app.UseHsts(); } - app.UseHttpsRedirection(); + // app.UseHttpsRedirection(); //TODO: 不启用则不能用MVC方式登录? app.UseCorrelationId(); app.UseVirtualFiles(); app.UseRouting(); diff --git a/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj b/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj index 642b0c45c..ce035f44e 100644 --- a/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj +++ b/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -15,26 +15,26 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/account/AuthServer.Host/Properties/launchSettings.json b/aspnet-core/services/account/AuthServer.Host/Properties/launchSettings.json index 581e8d94f..5aefc31bf 100644 --- a/aspnet-core/services/account/AuthServer.Host/Properties/launchSettings.json +++ b/aspnet-core/services/account/AuthServer.Host/Properties/launchSettings.json @@ -11,7 +11,7 @@ "AuthServer.Host": { "commandName": "Project", "launchBrowser": false, - "applicationUrl": "http://localhost:44385", + "applicationUrl": "http://localhost:44385;https://localhost:44386", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/aspnet-core/services/account/AuthServer.Host/package.json b/aspnet-core/services/account/AuthServer.Host/package.json index 709972e4c..7122956af 100644 --- a/aspnet-core/services/account/AuthServer.Host/package.json +++ b/aspnet-core/services/account/AuthServer.Host/package.json @@ -3,6 +3,6 @@ "name": "auth-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^3.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "~3.3.0" } } \ No newline at end of file diff --git a/aspnet-core/services/account/AuthServer.Host/wwwroot/libs/abp/core/abp.js b/aspnet-core/services/account/AuthServer.Host/wwwroot/libs/abp/core/abp.js index 20bd92147..72af4bd10 100644 --- a/aspnet-core/services/account/AuthServer.Host/wwwroot/libs/abp/core/abp.js +++ b/aspnet-core/services/account/AuthServer.Host/wwwroot/libs/abp/core/abp.js @@ -689,7 +689,7 @@ var abp = abp || {}; abp.security.antiForgery = abp.security.antiForgery || {}; abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN'; - abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN'; + abp.security.antiForgery.tokenHeaderName = 'RequestVerificationToken'; abp.security.antiForgery.getToken = function () { return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName); diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj index 415d82865..0f58e3d0c 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -26,11 +26,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -38,24 +38,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj index e5e14a0d0..12648e1f9 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -21,13 +21,13 @@ - - - - - - - + + + + + + + diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Ocelot/Configuration/Repository/ApiHttpClientFileConfigurationRepository.cs b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Ocelot/Configuration/Repository/ApiHttpClientFileConfigurationRepository.cs index 04bd7cf2a..fea8fc8fd 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Ocelot/Configuration/Repository/ApiHttpClientFileConfigurationRepository.cs +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Ocelot/Configuration/Repository/ApiHttpClientFileConfigurationRepository.cs @@ -42,7 +42,7 @@ namespace Ocelot.Configuration.Repository fileConfiguration.GlobalConfiguration = _objectMapper.Map(globalConfiguration); - var reRouteConfiguration = await _reRouteAppService.GetAsync(new ReRouteGetByAppIdInputDto { AppId = ApiGatewayOptions.AppId }); + var reRouteConfiguration = await _reRouteAppService.GetListByAppIdAsync(new ReRouteGetByAppIdInputDto { AppId = ApiGatewayOptions.AppId }); if (reRouteConfiguration != null && reRouteConfiguration.Items.Count > 0) { diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db index f25a991e6..3c399f006 100644 Binary files a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db and b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/event-bus-cap.db differ diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj index c26deb38e..100b5a8e5 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -14,11 +14,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -26,14 +26,14 @@ - - - - - - - - + + + + + + + + diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj index cc128aee3..d7759f7c0 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj @@ -19,11 +19,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -31,19 +31,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj index 64bb11753..9a011bcaf 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -19,11 +19,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -31,14 +31,14 @@ - - - - - - - - + + + + + + + + diff --git a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj index 43faa5fcb..073b299c9 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -23,11 +23,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -35,17 +35,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj index 7cb681b88..fccfeaac3 100644 --- a/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -6,8 +6,8 @@ - - + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj index 8823d7b76..69d35b514 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 diff --git a/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj b/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj index ba5aa49cc..365fe369b 100644 --- a/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/vueJs/src/api/instant-message.ts b/vueJs/src/api/instant-message.ts index 5c6585b85..f474c6f6f 100644 --- a/vueJs/src/api/instant-message.ts +++ b/vueJs/src/api/instant-message.ts @@ -4,7 +4,7 @@ import { PagedResultDto, PagedAndSortedResultRequestDto, ListResultDto } from '. const serviceUrl = process.env.VUE_APP_BASE_API export default class ImApiService { - public static addFriend(payload: AddUserFriend) { + public static addFriend(payload: AddUserFriend) { const _url = '/api/im/my-friends' return ApiService.Post(_url, payload, serviceUrl) } @@ -121,14 +121,6 @@ export class GetUserLastMessage { maxResultCount = 10 } -export class UserMessageGetByPaged extends PagedAndSortedResultRequestDto { - filter = '' - messageType = MessageType.Text - sorting = 'CreationTime' - reverse = true - receiveUserId = '' -} - export enum MessageType { Text = 0, Image = 10, @@ -138,6 +130,14 @@ export enum MessageType { File = 50 } +export class UserMessageGetByPaged extends PagedAndSortedResultRequestDto { + filter = '' + messageType = MessageType.Text + sorting = 'CreationTime' + reverse = true + receiveUserId = '' +} + export class ChatMessage { tenantId?: string groupId = '' @@ -151,7 +151,7 @@ export class ChatMessage { messageType = MessageType.Text public static getType(messageType: MessageType) { - switch(messageType) { + switch (messageType) { case MessageType.Text : case MessageType.Link : return 'text' @@ -164,7 +164,7 @@ export class ChatMessage { case MessageType.File : return 'file' default : - return 'text' + return 'text' } } } diff --git a/vueJs/src/api/notification.ts b/vueJs/src/api/notification.ts index 9e53f0279..b774868c1 100644 --- a/vueJs/src/api/notification.ts +++ b/vueJs/src/api/notification.ts @@ -23,10 +23,8 @@ export default class NotificationApiService { return ApiService.Get>(_url, serviceUrl) } - public static subscribeNotifier(name: string) { + public static subscribeNotifier(payload: UserSubscreNotification) { const _url = '/api/my-subscribes' - const payload = new UserSubscreNotification() - payload.name = name return ApiService.Post(_url, payload, serviceUrl) } diff --git a/vueJs/src/components/Lemon-IMUI/components/AddFriend.vue b/vueJs/src/components/Lemon-IMUI/components/AddFriend.vue index 6dedffc4a..2d6c50669 100644 --- a/vueJs/src/components/Lemon-IMUI/components/AddFriend.vue +++ b/vueJs/src/components/Lemon-IMUI/components/AddFriend.vue @@ -13,7 +13,7 @@ { + next(messages, isEnd) + }, 1000) }) .catch(() => { - next([], true) + setTimeout(() => { + next([], true) + }, 1000) }) } diff --git a/vueJs/src/views/admin/claim-type/index.vue b/vueJs/src/views/admin/claim-type/index.vue index 6eb84007b..53a0d5f27 100644 --- a/vueJs/src/views/admin/claim-type/index.vue +++ b/vueJs/src/views/admin/claim-type/index.vue @@ -120,7 +120,7 @@ >