From 8a55e863fac20ba75fca981cb338003f30f19b22 Mon Sep 17 00:00:00 2001 From: guotianliang <1265346495@qq.com> Date: Thu, 12 May 2022 17:41:52 +0800 Subject: [PATCH] return await task -> return task --- .../Identity/IdentityClaimTypeController.cs | 24 +++---- .../Abp/Identity/IdentityRoleController.cs | 28 ++++---- .../Abp/Identity/IdentityUserController.cs | 40 +++++------ .../Identity/OrganizationUnitController.cs | 68 +++++++++---------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityClaimTypeController.cs b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityClaimTypeController.cs index 2adbe47..4735549 100644 --- a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityClaimTypeController.cs +++ b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityClaimTypeController.cs @@ -28,9 +28,9 @@ namespace Sanhe.Abp.Identity /// /// [HttpPost] - public async virtual Task CreateAsync(IdentityClaimTypeCreateDto input) + public virtual Task CreateAsync(IdentityClaimTypeCreateDto input) { - return await IdentityClaimTypeAppService.CreateAsync(input); + return IdentityClaimTypeAppService.CreateAsync(input); } /// @@ -40,9 +40,9 @@ namespace Sanhe.Abp.Identity /// [HttpDelete] [Route("{id}")] - public async virtual Task DeleteAsync(Guid id) + public virtual Task DeleteAsync(Guid id) { - await IdentityClaimTypeAppService.DeleteAsync(id); + return IdentityClaimTypeAppService.DeleteAsync(id); } /// @@ -51,9 +51,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("actived-list")] - public async virtual Task> GetAllListAsync() + public virtual Task> GetAllListAsync() { - return await IdentityClaimTypeAppService.GetAllListAsync(); + return IdentityClaimTypeAppService.GetAllListAsync(); } /// @@ -63,9 +63,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}")] - public async virtual Task GetAsync(Guid id) + public virtual Task GetAsync(Guid id) { - return await IdentityClaimTypeAppService.GetAsync(id); + return IdentityClaimTypeAppService.GetAsync(id); } /// @@ -74,9 +74,9 @@ namespace Sanhe.Abp.Identity /// /// [HttpGet] - public async virtual Task> GetListAsync(IdentityClaimTypeGetByPagedDto input) + public virtual Task> GetListAsync(IdentityClaimTypeGetByPagedDto input) { - return await IdentityClaimTypeAppService.GetListAsync(input); + return IdentityClaimTypeAppService.GetListAsync(input); } /// @@ -87,9 +87,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}")] - public async virtual Task UpdateAsync(Guid id, IdentityClaimTypeUpdateDto input) + public virtual Task UpdateAsync(Guid id, IdentityClaimTypeUpdateDto input) { - return await IdentityClaimTypeAppService.UpdateAsync(id, input); + return IdentityClaimTypeAppService.UpdateAsync(id, input); } } } diff --git a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityRoleController.cs b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityRoleController.cs index dbd2c23..64c2861 100644 --- a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityRoleController.cs +++ b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityRoleController.cs @@ -31,9 +31,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/organization-units")] - public async virtual Task> GetOrganizationUnitsAsync(Guid id) + public virtual Task> GetOrganizationUnitsAsync(Guid id) { - return await RoleAppService.GetOrganizationUnitsAsync(id); + return RoleAppService.GetOrganizationUnitsAsync(id); } /// @@ -44,9 +44,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/organization-units")] - public async virtual Task SetOrganizationUnitsAsync(Guid id, IdentityRoleAddOrRemoveOrganizationUnitDto input) + public virtual Task SetOrganizationUnitsAsync(Guid id, IdentityRoleAddOrRemoveOrganizationUnitDto input) { - await RoleAppService.SetOrganizationUnitsAsync(id, input); + return RoleAppService.SetOrganizationUnitsAsync(id, input); } /// @@ -57,9 +57,9 @@ namespace Sanhe.Abp.Identity /// [HttpDelete] [Route("{id}/organization-units/{ouId}")] - public async virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId) + public virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId) { - await RoleAppService.RemoveOrganizationUnitsAsync(id, ouId); + return RoleAppService.RemoveOrganizationUnitsAsync(id, ouId); } #endregion @@ -73,9 +73,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/claims")] - public async virtual Task> GetClaimsAsync(Guid id) + public virtual Task> GetClaimsAsync(Guid id) { - return await RoleAppService.GetClaimsAsync(id); + return RoleAppService.GetClaimsAsync(id); } /// @@ -86,9 +86,9 @@ namespace Sanhe.Abp.Identity /// [HttpPost] [Route("{id}/claims")] - public async virtual Task AddClaimAsync(Guid id, IdentityRoleClaimCreateDto input) + public virtual Task AddClaimAsync(Guid id, IdentityRoleClaimCreateDto input) { - await RoleAppService.AddClaimAsync(id, input); + return RoleAppService.AddClaimAsync(id, input); } /// @@ -99,9 +99,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/claims")] - public async virtual Task UpdateClaimAsync(Guid id, IdentityRoleClaimUpdateDto input) + public virtual Task UpdateClaimAsync(Guid id, IdentityRoleClaimUpdateDto input) { - await RoleAppService.UpdateClaimAsync(id, input); + return RoleAppService.UpdateClaimAsync(id, input); } /// @@ -112,9 +112,9 @@ namespace Sanhe.Abp.Identity /// [HttpDelete] [Route("{id}/claims")] - public async virtual Task DeleteClaimAsync(Guid id, IdentityRoleClaimDeleteDto input) + public virtual Task DeleteClaimAsync(Guid id, IdentityRoleClaimDeleteDto input) { - await RoleAppService.DeleteClaimAsync(id, input); + return RoleAppService.DeleteClaimAsync(id, input); } #endregion } diff --git a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityUserController.cs b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityUserController.cs index afb29f1..c971c62 100644 --- a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityUserController.cs +++ b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/IdentityUserController.cs @@ -31,9 +31,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/organization-units")] - public async virtual Task> GetOrganizationUnitsAsync(Guid id) + public virtual Task> GetOrganizationUnitsAsync(Guid id) { - return await UserAppService.GetOrganizationUnitsAsync(id); + return UserAppService.GetOrganizationUnitsAsync(id); } /// @@ -44,9 +44,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/organization-units")] - public async virtual Task SetOrganizationUnitsAsync(Guid id, IdentityUserOrganizationUnitUpdateDto input) + public virtual Task SetOrganizationUnitsAsync(Guid id, IdentityUserOrganizationUnitUpdateDto input) { - await UserAppService.SetOrganizationUnitsAsync(id, input); + return UserAppService.SetOrganizationUnitsAsync(id, input); } /// @@ -57,9 +57,9 @@ namespace Sanhe.Abp.Identity /// [HttpDelete] [Route("{id}/organization-units/{ouId}")] - public async virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId) + public virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId) { - await UserAppService.RemoveOrganizationUnitsAsync(id, ouId); + return UserAppService.RemoveOrganizationUnitsAsync(id, ouId); } #endregion @@ -73,9 +73,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/claims")] - public async virtual Task> GetClaimsAsync(Guid id) + public virtual Task> GetClaimsAsync(Guid id) { - return await UserAppService.GetClaimsAsync(id); + return UserAppService.GetClaimsAsync(id); } /// @@ -86,9 +86,9 @@ namespace Sanhe.Abp.Identity /// [HttpPost] [Route("{id}/claims")] - public async virtual Task AddClaimAsync(Guid id, IdentityUserClaimCreateDto input) + public virtual Task AddClaimAsync(Guid id, IdentityUserClaimCreateDto input) { - await UserAppService.AddClaimAsync(id, input); + return UserAppService.AddClaimAsync(id, input); } /// @@ -99,9 +99,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/claims")] - public async virtual Task UpdateClaimAsync(Guid id, IdentityUserClaimUpdateDto input) + public virtual Task UpdateClaimAsync(Guid id, IdentityUserClaimUpdateDto input) { - await UserAppService.UpdateClaimAsync(id, input); + return UserAppService.UpdateClaimAsync(id, input); } /// @@ -112,9 +112,9 @@ namespace Sanhe.Abp.Identity /// [HttpDelete] [Route("{id}/claims")] - public async virtual Task DeleteClaimAsync(Guid id, IdentityUserClaimDeleteDto input) + public virtual Task DeleteClaimAsync(Guid id, IdentityUserClaimDeleteDto input) { - await UserAppService.DeleteClaimAsync(id, input); + return UserAppService.DeleteClaimAsync(id, input); } #endregion @@ -127,9 +127,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("change-two-factor")] - public async virtual Task ChangeTwoFactorEnabledAsync(Guid id, TwoFactorEnabledDto input) + public virtual Task ChangeTwoFactorEnabledAsync(Guid id, TwoFactorEnabledDto input) { - await UserAppService.ChangeTwoFactorEnabledAsync(id, input); + return UserAppService.ChangeTwoFactorEnabledAsync(id, input); } /// @@ -140,9 +140,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/lock/{seconds}")] - public async virtual Task LockAsync(Guid id, int seconds) + public virtual Task LockAsync(Guid id, int seconds) { - await UserAppService.LockAsync(id, seconds); + return UserAppService.LockAsync(id, seconds); } /// @@ -152,9 +152,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/unlock")] - public async virtual Task UnLockAsync(Guid id) + public virtual Task UnLockAsync(Guid id) { - await UserAppService.UnLockAsync(id); + return UserAppService.UnLockAsync(id); } } } diff --git a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/OrganizationUnitController.cs b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/OrganizationUnitController.cs index 673018d..ce3831d 100644 --- a/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/OrganizationUnitController.cs +++ b/modules/identity/Sanhe.Abp.Identity.HttpApi/Sanhe/Abp/Identity/OrganizationUnitController.cs @@ -28,9 +28,9 @@ namespace Sanhe.Abp.Identity /// /// [HttpPost] - public async virtual Task CreateAsync(OrganizationUnitCreateDto input) + public virtual Task CreateAsync(OrganizationUnitCreateDto input) { - return await OrganizationUnitAppService.CreateAsync(input); + return OrganizationUnitAppService.CreateAsync(input); } /// @@ -40,9 +40,9 @@ namespace Sanhe.Abp.Identity /// [HttpDelete] [Route("{id}")] - public async virtual Task DeleteAsync(Guid id) + public virtual Task DeleteAsync(Guid id) { - await OrganizationUnitAppService.DeleteAsync(id); + return OrganizationUnitAppService.DeleteAsync(id); } /// @@ -52,9 +52,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("find-children")] - public async virtual Task> FindChildrenAsync(OrganizationUnitGetChildrenDto input) + public virtual Task> FindChildrenAsync(OrganizationUnitGetChildrenDto input) { - return await OrganizationUnitAppService.FindChildrenAsync(input); + return OrganizationUnitAppService.FindChildrenAsync(input); } /// @@ -64,9 +64,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}")] - public async virtual Task GetAsync(Guid id) + public virtual Task GetAsync(Guid id) { - return await OrganizationUnitAppService.GetAsync(id); + return OrganizationUnitAppService.GetAsync(id); } /// @@ -75,9 +75,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("root-node")] - public async virtual Task> GetRootAsync() + public virtual Task> GetRootAsync() { - return await OrganizationUnitAppService.GetRootAsync(); + return OrganizationUnitAppService.GetRootAsync(); } /// @@ -87,9 +87,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("last-children")] - public async virtual Task GetLastChildOrNullAsync(Guid? parentId) + public virtual Task GetLastChildOrNullAsync(Guid? parentId) { - return await OrganizationUnitAppService.GetLastChildOrNullAsync(parentId); + return OrganizationUnitAppService.GetLastChildOrNullAsync(parentId); } /// @@ -98,9 +98,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("all")] - public async virtual Task> GetAllListAsync() + public virtual Task> GetAllListAsync() { - return await OrganizationUnitAppService.GetAllListAsync(); + return OrganizationUnitAppService.GetAllListAsync(); } /// @@ -109,9 +109,9 @@ namespace Sanhe.Abp.Identity /// /// [HttpGet] - public async virtual Task> GetListAsync(OrganizationUnitGetByPagedDto input) + public virtual Task> GetListAsync(OrganizationUnitGetByPagedDto input) { - return await OrganizationUnitAppService.GetListAsync(input); + return OrganizationUnitAppService.GetListAsync(input); } /// @@ -121,9 +121,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/role-names")] - public async virtual Task> GetRoleNamesAsync(Guid id) + public virtual Task> GetRoleNamesAsync(Guid id) { - return await OrganizationUnitAppService.GetRoleNamesAsync(id); + return OrganizationUnitAppService.GetRoleNamesAsync(id); } /// @@ -134,9 +134,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/unadded-roles")] - public async virtual Task> GetUnaddedRolesAsync(Guid id, OrganizationUnitGetUnaddedRoleByPagedDto input) + public virtual Task> GetUnaddedRolesAsync(Guid id, OrganizationUnitGetUnaddedRoleByPagedDto input) { - return await OrganizationUnitAppService.GetUnaddedRolesAsync(id, input); + return OrganizationUnitAppService.GetUnaddedRolesAsync(id, input); } /// @@ -147,9 +147,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/roles")] - public async virtual Task> GetRolesAsync(Guid id, PagedAndSortedResultRequestDto input) + public virtual Task> GetRolesAsync(Guid id, PagedAndSortedResultRequestDto input) { - return await OrganizationUnitAppService.GetRolesAsync(id, input); + return OrganizationUnitAppService.GetRolesAsync(id, input); } /// @@ -160,9 +160,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/unadded-users")] - public async virtual Task> GetUnaddedUsersAsync(Guid id, OrganizationUnitGetUnaddedUserByPagedDto input) + public virtual Task> GetUnaddedUsersAsync(Guid id, OrganizationUnitGetUnaddedUserByPagedDto input) { - return await OrganizationUnitAppService.GetUnaddedUsersAsync(id, input); + return OrganizationUnitAppService.GetUnaddedUsersAsync(id, input); } /// @@ -173,9 +173,9 @@ namespace Sanhe.Abp.Identity /// [HttpGet] [Route("{id}/users")] - public async virtual Task> GetUsersAsync(Guid id, GetIdentityUsersInput input) + public virtual Task> GetUsersAsync(Guid id, GetIdentityUsersInput input) { - return await OrganizationUnitAppService.GetUsersAsync(id, input); + return OrganizationUnitAppService.GetUsersAsync(id, input); } /// @@ -186,9 +186,9 @@ namespace Sanhe.Abp.Identity /// [HttpPost] [Route("{id}/users")] - public async virtual Task AddUsersAsync(Guid id, OrganizationUnitAddUserDto input) + public virtual Task AddUsersAsync(Guid id, OrganizationUnitAddUserDto input) { - await OrganizationUnitAppService.AddUsersAsync(id, input); + return OrganizationUnitAppService.AddUsersAsync(id, input); } /// @@ -199,9 +199,9 @@ namespace Sanhe.Abp.Identity /// [HttpPost] [Route("{id}/roles")] - public async virtual Task AddRolesAsync(Guid id, OrganizationUnitAddRoleDto input) + public virtual Task AddRolesAsync(Guid id, OrganizationUnitAddRoleDto input) { - await OrganizationUnitAppService.AddRolesAsync(id, input); + return OrganizationUnitAppService.AddRolesAsync(id, input); } /// @@ -212,9 +212,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}/move")] - public async virtual Task MoveAsync(Guid id, OrganizationUnitMoveDto input) + public virtual Task MoveAsync(Guid id, OrganizationUnitMoveDto input) { - await OrganizationUnitAppService.MoveAsync(id, input); + return OrganizationUnitAppService.MoveAsync(id, input); } /// @@ -225,9 +225,9 @@ namespace Sanhe.Abp.Identity /// [HttpPut] [Route("{id}")] - public async virtual Task UpdateAsync(Guid id, OrganizationUnitUpdateDto input) + public virtual Task UpdateAsync(Guid id, OrganizationUnitUpdateDto input) { - return await OrganizationUnitAppService.UpdateAsync(id, input); + return OrganizationUnitAppService.UpdateAsync(id, input); } } }