From 10b5390b1f330c0c0490a38cee4192528dc59b59 Mon Sep 17 00:00:00 2001 From: windy liu Date: Wed, 30 Oct 2019 22:05:26 +0800 Subject: [PATCH] Add virual appservice method --- .../Volo/Abp/Account/AccountAppService.cs | 2 +- .../Abp/FeatureManagement/FeatureAppService.cs | 4 ++-- .../Abp/Identity/IdentityRoleAppService.cs | 10 +++++----- .../Abp/Identity/IdentityUserAppService.cs | 18 +++++++++--------- .../Identity/IdentityUserLookupAppService.cs | 4 ++-- .../Volo/Abp/Identity/ProfileAppService.cs | 6 +++--- .../PermissionAppService.cs | 4 ++-- .../Abp/TenantManagement/TenantAppService.cs | 16 ++++++++-------- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs index def2b83757..eba47666a4 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs +++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.Account UserManager = userManager; } - public async Task RegisterAsync(RegisterDto input) + public virtual async Task RegisterAsync(RegisterDto input) { var user = new IdentityUser(GuidGenerator.Create(), input.UserName, input.EmailAddress, CurrentTenant.Id); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs index d7f22193d0..097ea7ffa0 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.FeatureManagement Options = options.Value; } - public async Task GetAsync([NotNull] string providerName, [NotNull] string providerKey) + public virtual async Task GetAsync([NotNull] string providerName, [NotNull] string providerKey) { await CheckProviderPolicy(providerName); @@ -57,7 +57,7 @@ namespace Volo.Abp.FeatureManagement return new FeatureListDto { Features = features }; } - public async Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdateFeaturesDto input) + public virtual async Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdateFeaturesDto input) { await CheckProviderPolicy(providerName); diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs index 8cdeac0ce2..0c1750f2fb 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs @@ -21,14 +21,14 @@ namespace Volo.Abp.Identity _roleRepository = roleRepository; } - public async Task GetAsync(Guid id) + public virtual async Task GetAsync(Guid id) { return ObjectMapper.Map( await _roleManager.GetByIdAsync(id) ); } - public async Task> GetListAsync() + public virtual async Task> GetListAsync() { var list = await _roleRepository.GetListAsync(); @@ -36,7 +36,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Roles.Create)] - public async Task CreateAsync(IdentityRoleCreateDto input) + public virtual async Task CreateAsync(IdentityRoleCreateDto input) { var role = new IdentityRole(GuidGenerator.Create(), input.Name, CurrentTenant.Id); @@ -50,7 +50,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Roles.Update)] - public async Task UpdateAsync(Guid id, IdentityRoleUpdateDto input) + public virtual async Task UpdateAsync(Guid id, IdentityRoleUpdateDto input) { var role = await _roleManager.GetByIdAsync(id); role.ConcurrencyStamp = input.ConcurrencyStamp; @@ -67,7 +67,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Roles.Delete)] - public async Task DeleteAsync(Guid id) + public virtual async Task DeleteAsync(Guid id) { var role = await _roleManager.FindByIdAsync(id.ToString()); if (role == null) diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs index 92717ec060..b408828af0 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Identity //TODO: [Authorize(IdentityPermissions.Users.Default)] should go the IdentityUserAppService class. [Authorize(IdentityPermissions.Users.Default)] - public async Task GetAsync(Guid id) + public virtual async Task GetAsync(Guid id) { return ObjectMapper.Map( await _userManager.GetByIdAsync(id) @@ -30,7 +30,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Default)] - public async Task> GetListAsync(GetIdentityUsersInput input) + public virtual async Task> GetListAsync(GetIdentityUsersInput input) { var count = await _userRepository.GetCountAsync(input.Filter); var list = await _userRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter); @@ -42,7 +42,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Default)] - public async Task> GetRolesAsync(Guid id) + public virtual async Task> GetRolesAsync(Guid id) { var roles = await _userRepository.GetRolesAsync(id); return new ListResultDto( @@ -51,7 +51,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Create)] - public async Task CreateAsync(IdentityUserCreateDto input) + public virtual async Task CreateAsync(IdentityUserCreateDto input) { var user = new IdentityUser(GuidGenerator.Create(), input.UserName, input.Email, CurrentTenant.Id); @@ -64,7 +64,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Update)] - public async Task UpdateAsync(Guid id, IdentityUserUpdateDto input) + public virtual async Task UpdateAsync(Guid id, IdentityUserUpdateDto input) { var user = await _userManager.GetByIdAsync(id); user.ConcurrencyStamp = input.ConcurrencyStamp; @@ -85,7 +85,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Delete)] - public async Task DeleteAsync(Guid id) + public virtual async Task DeleteAsync(Guid id) { if (CurrentUser.Id == id) { @@ -102,7 +102,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Update)] - public async Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input) + public virtual async Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input) { var user = await _userManager.GetByIdAsync(id); (await _userManager.SetRolesAsync(user, input.RoleNames)).CheckErrors(); @@ -110,7 +110,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Default)] - public async Task FindByUsernameAsync(string username) + public virtual async Task FindByUsernameAsync(string username) { return ObjectMapper.Map( await _userManager.FindByNameAsync(username) @@ -118,7 +118,7 @@ namespace Volo.Abp.Identity } [Authorize(IdentityPermissions.Users.Default)] - public async Task FindByEmailAsync(string email) + public virtual async Task FindByEmailAsync(string email) { return ObjectMapper.Map( await _userManager.FindByEmailAsync(email) diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs index 48d42c4579..6325daa535 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.Identity UserLookupServiceProvider = userLookupServiceProvider; } - public virtual async Task FindByIdAsync(Guid id) + public virtual virtual async Task FindByIdAsync(Guid id) { var userData = await UserLookupServiceProvider.FindByIdAsync(id); if (userData == null) @@ -27,7 +27,7 @@ namespace Volo.Abp.Identity return new UserData(userData); } - public virtual async Task FindByUserNameAsync(string userName) + public virtual virtual async Task FindByUserNameAsync(string userName) { var userData = await UserLookupServiceProvider.FindByUserNameAsync(userName); if (userData == null) diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs index cd0365be2f..0b8712b93d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs @@ -17,14 +17,14 @@ namespace Volo.Abp.Identity _userManager = userManager; } - public async Task GetAsync() + public virtual async Task GetAsync() { return ObjectMapper.Map( await _userManager.GetByIdAsync(CurrentUser.GetId()) ); } - public async Task UpdateAsync(UpdateProfileDto input) + public virtual async Task UpdateAsync(UpdateProfileDto input) { var user = await _userManager.GetByIdAsync(CurrentUser.GetId()); @@ -50,7 +50,7 @@ namespace Volo.Abp.Identity return ObjectMapper.Map(user); } - public async Task ChangePasswordAsync(ChangePasswordInput input) + public virtual async Task ChangePasswordAsync(ChangePasswordInput input) { var currentUser = await _userManager.GetByIdAsync(CurrentUser.GetId()); (await _userManager.ChangePasswordAsync(currentUser, input.CurrentPassword, input.NewPassword)).CheckErrors(); diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs index 2155420600..63065fd688 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.PermissionManagement _stringLocalizerFactory = stringLocalizerFactory; } - public async Task GetAsync(string providerName, string providerKey) + public virtual async Task GetAsync(string providerName, string providerKey) { await CheckProviderPolicy(providerName); @@ -99,7 +99,7 @@ namespace Volo.Abp.PermissionManagement return result; } - public async Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input) + public virtual async Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input) { await CheckProviderPolicy(providerName); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs index 4d7e643d82..b8a0d827ed 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs @@ -24,14 +24,14 @@ namespace Volo.Abp.TenantManagement TenantManager = tenantManager; } - public async Task GetAsync(Guid id) + public virtual async Task GetAsync(Guid id) { return ObjectMapper.Map( await TenantRepository.GetAsync(id) ); } - public async Task> GetListAsync(GetTenantsInput input) + public virtual async Task> GetListAsync(GetTenantsInput input) { var count = await TenantRepository.GetCountAsync(input.Filter); var list = await TenantRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter); @@ -43,7 +43,7 @@ namespace Volo.Abp.TenantManagement } [Authorize(TenantManagementPermissions.Tenants.Create)] - public async Task CreateAsync(TenantCreateDto input) + public virtual async Task CreateAsync(TenantCreateDto input) { var tenant = await TenantManager.CreateAsync(input.Name); await TenantRepository.InsertAsync(tenant); @@ -60,7 +60,7 @@ namespace Volo.Abp.TenantManagement } [Authorize(TenantManagementPermissions.Tenants.Update)] - public async Task UpdateAsync(Guid id, TenantUpdateDto input) + public virtual async Task UpdateAsync(Guid id, TenantUpdateDto input) { var tenant = await TenantRepository.GetAsync(id); await TenantManager.ChangeNameAsync(tenant, input.Name); @@ -69,7 +69,7 @@ namespace Volo.Abp.TenantManagement } [Authorize(TenantManagementPermissions.Tenants.Delete)] - public async Task DeleteAsync(Guid id) + public virtual async Task DeleteAsync(Guid id) { var tenant = await TenantRepository.FindAsync(id); if (tenant == null) @@ -81,14 +81,14 @@ namespace Volo.Abp.TenantManagement } [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] - public async Task GetDefaultConnectionStringAsync(Guid id) + public virtual async Task GetDefaultConnectionStringAsync(Guid id) { var tenant = await TenantRepository.GetAsync(id); return tenant?.FindDefaultConnectionString(); } [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] - public async Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString) + public virtual async Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString) { var tenant = await TenantRepository.GetAsync(id); tenant.SetDefaultConnectionString(defaultConnectionString); @@ -96,7 +96,7 @@ namespace Volo.Abp.TenantManagement } [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)] - public async Task DeleteDefaultConnectionStringAsync(Guid id) + public virtual async Task DeleteDefaultConnectionStringAsync(Guid id) { var tenant = await TenantRepository.GetAsync(id); tenant.RemoveDefaultConnectionString();