Merge pull request #691 from colinin/upt-5.3.4

adjust the keyword sequence.

aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs

@@ -54,7 +54,7 @@ namespace LINGYUN.Abp.Account
             IdentitySecurityLogManager = identitySecurityLogManager;
         }
 
-        public virtual async Task RegisterAsync(WeChatRegisterDto input)
+        public async virtual Task RegisterAsync(WeChatRegisterDto input)
         {
             ThowIfInvalidEmailAddress(input.EmailAddress);
 
@@ -103,7 +103,7 @@ namespace LINGYUN.Abp.Account
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        public virtual async Task SendPhoneRegisterCodeAsync(SendPhoneRegisterCodeDto input)
+        public async virtual Task SendPhoneRegisterCodeAsync(SendPhoneRegisterCodeDto input)
         {
             await CheckSelfRegistrationAsync();
             await CheckNewUserPhoneNumberNotBeUsedAsync(input.PhoneNumber);
@@ -136,7 +136,7 @@ namespace LINGYUN.Abp.Account
                     });
         }
 
-        public virtual async Task RegisterAsync(PhoneRegisterDto input)
+        public async virtual Task RegisterAsync(PhoneRegisterDto input)
         {
             await CheckSelfRegistrationAsync();
             await IdentityOptions.SetAsync();
@@ -191,7 +191,7 @@ namespace LINGYUN.Abp.Account
             throw new UserFriendlyException(L["InvalidVerifyCode"]);
         }
 
-        public virtual async Task SendPhoneResetPasswordCodeAsync(SendPhoneResetPasswordCodeDto input)
+        public async virtual Task SendPhoneResetPasswordCodeAsync(SendPhoneResetPasswordCodeDto input)
         {
             /*
              * 注解: 微软的重置密码方法通过 UserManager.GeneratePasswordResetTokenAsync 接口生成密码重置Token
@@ -240,7 +240,7 @@ namespace LINGYUN.Abp.Account
                     });
         }
 
-        public virtual async Task ResetPasswordAsync(PhoneResetPasswordDto input)
+        public async virtual Task ResetPasswordAsync(PhoneResetPasswordDto input)
         {
             var securityTokenCacheKey = SecurityTokenCacheItem.CalculateSmsCacheKey(input.PhoneNumber, "SmsVerifyCode");
             var securityTokenCacheItem = await SecurityTokenCache.GetAsync(securityTokenCacheKey);
@@ -281,7 +281,7 @@ namespace LINGYUN.Abp.Account
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        public virtual async Task SendPhoneSigninCodeAsync(SendPhoneSigninCodeDto input)
+        public async virtual Task SendPhoneSigninCodeAsync(SendPhoneSigninCodeDto input)
         {
             var securityTokenCacheKey = SecurityTokenCacheItem.CalculateSmsCacheKey(input.PhoneNumber, "SmsVerifyCode");
             var securityTokenCacheItem = await SecurityTokenCache.GetAsync(securityTokenCacheKey);
@@ -336,7 +336,7 @@ namespace LINGYUN.Abp.Account
                 userFactors.Select(key => new NameValue(L[$"TwoFactor:{key}"].Value, key)).ToList());
         }
 
-        protected virtual async Task<IdentityUser> GetUserByPhoneNumberAsync(string phoneNumber, bool isConfirmed = true)
+        protected async virtual Task<IdentityUser> GetUserByPhoneNumberAsync(string phoneNumber, bool isConfirmed = true)
         {
             var user = await UserRepository.FindByPhoneNumberAsync(phoneNumber, isConfirmed, true);
             if (user == null)
@@ -350,7 +350,7 @@ namespace LINGYUN.Abp.Account
         /// 检查是否允许用户注册
         /// </summary>
         /// <returns></returns>
-        protected virtual async Task CheckSelfRegistrationAsync()
+        protected async virtual Task CheckSelfRegistrationAsync()
         {
             if (!await SettingProvider.IsTrueAsync(Volo.Abp.Account.Settings.AccountSettingNames.IsSelfRegistrationEnabled))
             {
@@ -358,7 +358,7 @@ namespace LINGYUN.Abp.Account
             }
         }
 
-        protected virtual async Task CheckNewUserPhoneNumberNotBeUsedAsync(string phoneNumber)
+        protected async virtual Task CheckNewUserPhoneNumberNotBeUsedAsync(string phoneNumber)
         {
             if (await UserRepository.IsPhoneNumberUedAsync(phoneNumber))
             {

aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountApplicationServiceBase.cs

@@ -19,7 +19,7 @@ namespace LINGYUN.Abp.Account
             LocalizationResource = typeof(AccountResource);
         }
 
-        protected virtual async Task<IdentityUser> GetCurrentUserAsync()
+        protected async virtual Task<IdentityUser> GetCurrentUserAsync()
         {
             await IdentityOptions.SetAsync();
 

aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MyClaimAppService.cs

@@ -15,7 +15,7 @@ namespace LINGYUN.Abp.Account
 
         }
 
-        public virtual async Task ChangeAvatarAsync(ChangeAvatarInput input)
+        public async virtual Task ChangeAvatarAsync(ChangeAvatarInput input)
         {
             var user = await GetCurrentUserAsync();
 

aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MyProfileAppService.cs

@@ -36,7 +36,7 @@ namespace LINGYUN.Abp.Account
             LocalizationResource = typeof(AccountResource);
         }
 
-        public virtual async Task<TwoFactorEnabledDto> GetTwoFactorEnabledAsync()
+        public async virtual Task<TwoFactorEnabledDto> GetTwoFactorEnabledAsync()
         {
             var user = await GetCurrentUserAsync();
 
@@ -46,7 +46,7 @@ namespace LINGYUN.Abp.Account
             };
         }
 
-        public virtual async Task ChangeTwoFactorEnabledAsync(TwoFactorEnabledDto input)
+        public async virtual Task ChangeTwoFactorEnabledAsync(TwoFactorEnabledDto input)
         {
             // Removed See: https://github.com/abpframework/abp/pull/7719
             //if (!await SettingProvider.IsTrueAsync(IdentitySettingNames.TwoFactor.UsersCanChange))
@@ -61,7 +61,7 @@ namespace LINGYUN.Abp.Account
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        public virtual async Task SendChangePhoneNumberCodeAsync(SendChangePhoneNumberCodeInput input)
+        public async virtual Task SendChangePhoneNumberCodeAsync(SendChangePhoneNumberCodeInput input)
         {
             var securityTokenCacheKey = SecurityTokenCacheItem.CalculateSmsCacheKey(input.NewPhoneNumber, "SmsChangePhoneNumber");
             var securityTokenCacheItem = await SecurityTokenCache.GetAsync(securityTokenCacheKey);
@@ -92,7 +92,7 @@ namespace LINGYUN.Abp.Account
                     });
         }
 
-        public virtual async Task ChangePhoneNumberAsync(ChangePhoneNumberInput input)
+        public async virtual Task ChangePhoneNumberAsync(ChangePhoneNumberInput input)
         {
             // 是否已有用户使用手机号绑定
             if (await UserRepository.IsPhoneNumberConfirmedAsync(input.NewPhoneNumber))

aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/MyClaimController.cs

@@ -22,7 +22,7 @@ namespace LINGYUN.Abp.Account
 
         [HttpPost]
         [Route("change-avatar")]
-        public virtual async Task ChangeAvatarAsync(ChangeAvatarInput input)
+        public async virtual Task ChangeAvatarAsync(ChangeAvatarInput input)
         {
             await _service.ChangeAvatarAsync(input);
         }

aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/MyProfileController.cs

@@ -22,28 +22,28 @@ namespace LINGYUN.Abp.Account
 
         [HttpGet]
         [Route("two-factor")]
-        public virtual async Task<TwoFactorEnabledDto> GetTwoFactorEnabledAsync()
+        public async virtual Task<TwoFactorEnabledDto> GetTwoFactorEnabledAsync()
         {
             return await MyProfileAppService.GetTwoFactorEnabledAsync();
         }
 
         [HttpPut]
         [Route("change-two-factor")]
-        public virtual async Task ChangeTwoFactorEnabledAsync(TwoFactorEnabledDto input)
+        public async virtual Task ChangeTwoFactorEnabledAsync(TwoFactorEnabledDto input)
         {
             await MyProfileAppService.ChangeTwoFactorEnabledAsync(input);
         }
 
         [HttpPost]
         [Route("send-phone-number-change-code")]
-        public virtual async Task SendChangePhoneNumberCodeAsync(SendChangePhoneNumberCodeInput input)
+        public async virtual Task SendChangePhoneNumberCodeAsync(SendChangePhoneNumberCodeInput input)
         {
             await MyProfileAppService.SendChangePhoneNumberCodeAsync(input);
         }
 
         [HttpPut]
         [Route("change-phone-number")]
-        public virtual async Task ChangePhoneNumberAsync(ChangePhoneNumberInput input)
+        public async virtual Task ChangePhoneNumberAsync(ChangePhoneNumberInput input)
         {
             await MyProfileAppService.ChangePhoneNumberAsync(input);
         }

aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml.cs

@@ -23,12 +23,12 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account
             return Page();
         }
 
-        public virtual async Task<IActionResult> OnPostAsync()
+        public async virtual Task<IActionResult> OnPostAsync()
         {
             var user = await SignInManager.GetTwoFactorAuthenticationUserAsync();
             if (user == null)
             {
-                Alerts.Warning("双因素认证失败,用户未登录!");
+                Alerts.Warning("˫������֤ʧ��,�û�δ��¼!");
                 return Page();
             }
 
@@ -45,7 +45,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account
             var code = await UserManager.GenerateTwoFactorTokenAsync(user, SendCodeInput.SelectedProvider);
             if (string.IsNullOrWhiteSpace(code))
             {
-                Alerts.Warning("验证码生成失败,请联系系统管理员!");
+                Alerts.Warning("��֤������ʧ��,����ϵϵͳ����Ա!");
                 return Page();
             }
 

aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml.cs

@@ -18,7 +18,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account
             return Page();
         }
 
-        public virtual async Task<IActionResult> OnPostAsync()
+        public async virtual Task<IActionResult> OnPostAsync()
         {
             var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(Input.Code, Input.RememberMe, Input.RememberBrowser);
             if (result.Succeeded)
@@ -33,7 +33,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account
             }
             else
             {
-                Alerts.Danger("ÊÚȨÂëÑéÖ¤ÎÞЧ!");
+                Alerts.Danger("��Ȩ����֤��Ч!");
                 return Page();
             }
         }

aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml.cs

@@ -18,12 +18,12 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account
             return Page();
         }
 
-        public virtual async Task<IActionResult> OnPostAsync()
+        public async virtual Task<IActionResult> OnPostAsync()
         {
             var user = await SignInManager.GetTwoFactorAuthenticationUserAsync();
             if (user == null)
             {
-                Alerts.Warning("双因素认证失败,用户未登录或已失效!");
+                Alerts.Warning("˫������֤ʧ��,�û�δ��¼����ʧЧ!");
                 return Page();
             }
 
@@ -40,7 +40,7 @@ namespace LINGYUN.Abp.Account.Web.Pages.Account
             }
             else
             {
-                Alerts.Danger("授权码验证无效!");
+                Alerts.Danger("��Ȩ����֤��Ч!");
                 return Page();
             }
         }

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/ElasticsearchAuditLogManager.cs

@@ -42,7 +42,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
         }
 
 
-        public virtual async Task<long> GetCountAsync(
+        public async virtual Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string httpMethod = null,
@@ -85,7 +85,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             return response.Count;
         }
 
-        public virtual async Task<List<AuditLog>> GetListAsync(
+        public async virtual Task<List<AuditLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -157,7 +157,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             return response.Documents.ToList();
         }
 
-        public virtual async Task<AuditLog> GetAsync(
+        public async virtual Task<AuditLog> GetAsync(
             Guid id,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -173,7 +173,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             return response.Source;
         }
 
-        public virtual async Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
+        public async virtual Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
         {
             var client = _clientFactory.Create();
 
@@ -184,7 +184,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
                 cancellationToken);
         }
 
-        public virtual async Task<string> SaveAsync(
+        public async virtual Task<string> SaveAsync(
             AuditLogInfo auditInfo,
             CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -205,7 +205,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             return "";
         }
 
-        protected virtual async Task<string> SaveLogAsync(
+        protected async virtual Task<string> SaveLogAsync(
             AuditLogInfo auditLogInfo,
             CancellationToken cancellationToken = default(CancellationToken))
         {

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/ElasticsearchSecurityLogManager.cs

@@ -41,7 +41,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             Logger = NullLogger<ElasticsearchSecurityLogManager>.Instance;
         }
 
-        public virtual async Task SaveAsync(
+        public async virtual Task SaveAsync(
             SecurityLogInfo securityLogInfo,
             CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -64,7 +64,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
                 cancellationToken);
         }
 
-        public virtual async Task<SecurityLog> GetAsync(
+        public async virtual Task<SecurityLog> GetAsync(
             Guid id,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -80,7 +80,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             return response.Source;
         }
 
-        public virtual async Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
+        public async virtual Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
         {
             var client = _clientFactory.Create();
 
@@ -91,7 +91,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
                 cancellationToken);
         }
 
-        public virtual async Task<List<SecurityLog>> GetListAsync(
+        public async virtual Task<List<SecurityLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -141,7 +141,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
         }
 
 
-        public virtual async Task<long> GetCountAsync(
+        public async virtual Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string applicationName = null,

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/IndexInitializer.cs

@@ -34,7 +34,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             Logger = NullLogger<IndexInitializer>.Instance;
         }
 
-        public virtual async Task InitializeAsync()
+        public async virtual Task InitializeAsync()
         {
             var client = _clientFactory.Create();
             var dateTimeFormat = !_jsonOptions.DefaultDateTimeFormat.IsNullOrWhiteSpace()
@@ -48,7 +48,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             await InitlizeSecurityLogIndex(client, indexState, dateTimeFormat);
         }
 
-        protected virtual async Task InitlizeAuditLogIndex(IElasticClient client, IIndexState indexState, string dateTimeFormat)
+        protected async virtual Task InitlizeAuditLogIndex(IElasticClient client, IIndexState indexState, string dateTimeFormat)
         {
             var indexName = _nameNormalizer.NormalizeIndex("audit-log");
             var indexExists = await client.Indices.ExistsAsync(indexName);
@@ -82,7 +82,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
             }
         }
 
-        protected virtual async Task InitlizeSecurityLogIndex(IElasticClient client, IIndexState indexState, string dateTimeFormat)
+        protected async virtual Task InitlizeSecurityLogIndex(IElasticClient client, IIndexState indexState, string dateTimeFormat)
         {
             var indexName = _nameNormalizer.NormalizeIndex("security-log");
             var indexExists = await client.Indices.ExistsAsync(indexName);

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/AuditLogManager.cs

@@ -42,7 +42,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
         }
 
 
-        public virtual async Task<long> GetCountAsync(
+        public async virtual Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string httpMethod = null,
@@ -76,7 +76,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
                 cancellationToken);
         }
 
-        public virtual async Task<List<AuditLog>> GetListAsync(
+        public async virtual Task<List<AuditLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -120,7 +120,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             return ObjectMapper.Map<List<Volo.Abp.AuditLogging.AuditLog>, List<AuditLog>>(auditLogs);
         }
 
-        public virtual async Task<AuditLog> GetAsync(
+        public async virtual Task<AuditLog> GetAsync(
             Guid id,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -130,7 +130,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             return ObjectMapper.Map<Volo.Abp.AuditLogging.AuditLog, AuditLog>(auditLog);
         }
 
-        public virtual async Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
+        public async virtual Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
         {
             using (var uow = UnitOfWorkManager.Begin(true))
             {
@@ -139,7 +139,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             }
         }
 
-        public virtual async Task<string> SaveAsync(
+        public async virtual Task<string> SaveAsync(
             AuditLogInfo auditInfo,
             CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -160,7 +160,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             return "";
         }
 
-        protected virtual async Task<string> SaveLogAsync(
+        protected async virtual Task<string> SaveLogAsync(
             AuditLogInfo auditInfo,
             CancellationToken cancellationToken = default(CancellationToken))
         {

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN/Abp/AuditLogging/EntityFrameworkCore/SecurityLogManager.cs

@@ -40,7 +40,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             UnitOfWorkManager = unitOfWorkManager;
         }
 
-        public virtual async Task SaveAsync(
+        public async virtual Task SaveAsync(
             SecurityLogInfo securityLogInfo,
             CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -59,7 +59,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             }
         }
 
-        public virtual async Task<SecurityLog> GetAsync(
+        public async virtual Task<SecurityLog> GetAsync(
             Guid id,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -69,7 +69,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             return ObjectMapper.Map<IdentitySecurityLog, SecurityLog>(securityLog);
         }
 
-        public virtual async Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
+        public async virtual Task DeleteAsync(Guid id, CancellationToken cancellationToken = default)
         {
             using (var uow = UnitOfWorkManager.Begin(true))
             {
@@ -78,7 +78,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
             }
         }
 
-        public virtual async Task<List<SecurityLog>> GetListAsync(
+        public async virtual Task<List<SecurityLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -115,7 +115,7 @@ namespace LINGYUN.Abp.AuditLogging.EntityFrameworkCore
         }
 
 
-        public virtual async Task<long> GetCountAsync(
+        public async virtual Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string applicationName = null,

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging/LINGYUN/Abp/AuditLogging/AuditingStore.cs

@@ -15,7 +15,7 @@ namespace LINGYUN.Abp.AuditLogging
             _manager = manager;
         }
 
-        public virtual async Task SaveAsync(AuditLogInfo auditInfo)
+        public async virtual Task SaveAsync(AuditLogInfo auditInfo)
         {
             await _manager.SaveAsync(auditInfo);
         }

aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging/LINGYUN/Abp/AuditLogging/SecurityLogStore.cs

@@ -15,7 +15,7 @@ namespace LINGYUN.Abp.AuditLogging
             _manager = manager;
         }
 
-        public virtual async Task SaveAsync(SecurityLogInfo securityLogInfo)
+        public async virtual Task SaveAsync(SecurityLogInfo securityLogInfo)
         {
             await _manager.SaveAsync(securityLogInfo);
         }

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/AuditLogs/AuditLogAppService.cs

@@ -22,14 +22,14 @@ namespace LINGYUN.Abp.Auditing.AuditLogs
             AuditLogManager = auditLogManager;
         }
 
-        public virtual async Task<AuditLogDto> GetAsync(Guid id)
+        public async virtual Task<AuditLogDto> GetAsync(Guid id)
         {
             var auditLog = await AuditLogManager.GetAsync(id, includeDetails: true);
 
             return ObjectMapper.Map<AuditLog, AuditLogDto>(auditLog);
         }
 
-        public virtual async Task<PagedResultDto<AuditLogDto>> GetListAsync(AuditLogGetByPagedDto input)
+        public async virtual Task<PagedResultDto<AuditLogDto>> GetListAsync(AuditLogGetByPagedDto input)
         {
             var auditLogCount = await AuditLogManager
                 .GetCountAsync(input.StartTime, input.EndTime,
@@ -55,7 +55,7 @@ namespace LINGYUN.Abp.Auditing.AuditLogs
         }
 
         [Authorize(AuditingPermissionNames.AuditLog.Delete)]
-        public virtual async Task DeleteAsync([Required] Guid id)
+        public async virtual Task DeleteAsync([Required] Guid id)
         {
             await AuditLogManager.DeleteAsync(id);
         }

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/LogAppService.cs

@@ -14,14 +14,14 @@ namespace LINGYUN.Abp.Auditing.Logging
             _manager = manager;
         }
 
-        public virtual async Task<LogDto> GetAsync(string id)
+        public async virtual Task<LogDto> GetAsync(string id)
         {
             var log = await _manager.GetAsync(id);
 
             return ObjectMapper.Map<LogInfo, LogDto>(log);
         }
 
-        public virtual async Task<PagedResultDto<LogDto>> GetListAsync(LogGetByPagedDto input)
+        public async virtual Task<PagedResultDto<LogDto>> GetListAsync(LogGetByPagedDto input)
         {
             var count = await _manager.GetCountAsync(
                 input.StartTime, input.EndTime, input.Level,

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/SecurityLogs/SecurityLogAppService.cs

@@ -20,14 +20,14 @@ namespace LINGYUN.Abp.Auditing.SecurityLogs
             SecurityLogManager = securityLogManager;
         }
 
-        public virtual async Task<SecurityLogDto> GetAsync(Guid id)
+        public async virtual Task<SecurityLogDto> GetAsync(Guid id)
         {
             var securityLog = await SecurityLogManager.GetAsync(id, includeDetails: true);
 
             return ObjectMapper.Map<SecurityLog, SecurityLogDto>(securityLog);
         }
 
-        public virtual async Task<PagedResultDto<SecurityLogDto>> GetListAsync(SecurityLogGetByPagedDto input)
+        public async virtual Task<PagedResultDto<SecurityLogDto>> GetListAsync(SecurityLogGetByPagedDto input)
         {
             var securityLogCount = await SecurityLogManager
                 .GetCountAsync(input.StartTime, input.EndTime,
@@ -48,7 +48,7 @@ namespace LINGYUN.Abp.Auditing.SecurityLogs
         }
 
         [Authorize(AuditingPermissionNames.SecurityLog.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await SecurityLogManager.DeleteAsync(id);
         }

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/AuditLogs/AuditLogController.cs

@@ -22,20 +22,20 @@ namespace LINGYUN.Abp.Auditing.AuditLogs
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await AuditLogAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<AuditLogDto> GetAsync(Guid id)
+        public async virtual Task<AuditLogDto> GetAsync(Guid id)
         {
             return await AuditLogAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<AuditLogDto>> GetListAsync(AuditLogGetByPagedDto input)
+        public async virtual Task<PagedResultDto<AuditLogDto>> GetListAsync(AuditLogGetByPagedDto input)
         {
             return await AuditLogAppService.GetListAsync(input);
         }

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/Logging/LogController.cs

@@ -21,13 +21,13 @@ namespace LINGYUN.Abp.Auditing.Logging
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<LogDto> GetAsync(string id)
+        public async virtual Task<LogDto> GetAsync(string id)
         {
             return await _service.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<LogDto>> GetListAsync(LogGetByPagedDto input)
+        public async virtual Task<PagedResultDto<LogDto>> GetListAsync(LogGetByPagedDto input)
         {
             return await _service.GetListAsync(input);
         }

aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/SecurityLogs/SecurityLogController.cs

@@ -22,20 +22,20 @@ namespace LINGYUN.Abp.Auditing.SecurityLogs
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await SecurityLogAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<SecurityLogDto> GetAsync(Guid id)
+        public async virtual Task<SecurityLogDto> GetAsync(Guid id)
         {
             return await SecurityLogAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<SecurityLogDto>> GetListAsync(SecurityLogGetByPagedDto input)
+        public async virtual Task<PagedResultDto<SecurityLogDto>> GetListAsync(SecurityLogGetByPagedDto input)
         {
             return await SecurityLogAppService.GetListAsync(input);
         }

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs

@@ -45,7 +45,7 @@ namespace LINGYUN.Abp.Cli.Commands
             Logger = NullLogger<CreateCommand>.Instance;
         }
 
-        public virtual async Task CreateAsync(ProjectCreateArgs createArgs)
+        public async virtual Task CreateAsync(ProjectCreateArgs createArgs)
         {
             Logger.LogInformation("Execute dotnet command...");
 
@@ -128,7 +128,7 @@ namespace LINGYUN.Abp.Cli.Commands
             }
         }
 
-        protected virtual async Task TryReplaceVersionWithProjectFile(
+        protected async virtual Task TryReplaceVersionWithProjectFile(
             List<FindFile> projectFiles,
             string version)
         {
@@ -163,7 +163,7 @@ namespace LINGYUN.Abp.Cli.Commands
             }
         }
 
-        protected virtual async Task TryReplaceApplicationUrlWithProjectFile(
+        protected async virtual Task TryReplaceApplicationUrlWithProjectFile(
             List<FindFile> projectFiles,
             string port = "5000",
             string daprPort = "3500")
@@ -182,7 +182,7 @@ namespace LINGYUN.Abp.Cli.Commands
             }
         }
 
-        protected virtual async Task TryReplaceAppSettingsWithProjectFile(
+        protected async virtual Task TryReplaceAppSettingsWithProjectFile(
             List<FindFile> projectFiles,
             string packageName,
             string companyName,
@@ -201,7 +201,7 @@ namespace LINGYUN.Abp.Cli.Commands
             }
         }
 
-        protected virtual async Task TryReplacePackageAndCompanyNameWithProjectFile(
+        protected async virtual Task TryReplacePackageAndCompanyNameWithProjectFile(
             List<FindFile> projectFiles,
             string packageName,
             string companyName,

aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs

@@ -5,10 +5,10 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Volo.Abp.Cli;
+using Volo.Abp.Cli;
 using Volo.Abp.Cli.Commands;
 using Volo.Abp.Cli.Http;
-using Volo.Abp.Cli.ServiceProxying;
+using Volo.Abp.Cli.ServiceProxying;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.Json;
@@ -255,7 +255,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
     {
         var returnSign = returnTypeName == "void" ? "Task" : $"Task<{returnTypeName}>";
 
-        methodBuilder.AppendLine($"public virtual async {returnSign} {action.Name}(<args>)");
+        methodBuilder.AppendLine($"public async virtual {returnSign} {action.Name}(<args>)");
 
         foreach (var parameter in action.ParametersOnMethod)
         {
@@ -372,14 +372,14 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         usingNamespaceList.Add(rootNamespace);
     }
 
-    private static string GetClientProxyProvider(string provider)
+    private static string GetClientProxyProvider(string provider)
-    {
+    {
-        return provider switch
+        return provider switch
-        {
+        {
-            "dapr" => "DaprClientProxyBase",
+            "dapr" => "DaprClientProxyBase",
-            "http" => "ClientProxyBase",
+            "http" => "ClientProxyBase",
-            _ => "ClientProxyBase"
+            _ => "ClientProxyBase"
-        };
+        };
     }
 
     private string NormalizeTypeName(string typeName)

aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs

@@ -28,17 +28,17 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
             LocalizationResource = typeof(AliyunResource);
         }
 
-        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
+        public async virtual Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
         }
 
-        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
+        public async virtual Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
         }
 
-        protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
+        protected async virtual Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
         {
             var settingGroups = new SettingGroupResult();
 

aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs

@@ -22,14 +22,14 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
 
         [HttpGet]
         [Route("by-current-tenant")]
-        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
+        public async virtual Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await AppService.GetAllForCurrentTenantAsync();
         }
 
         [HttpGet]
         [Route("by-global")]
-        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
+        public async virtual Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await AppService.GetAllForGlobalAsync();
         }

aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/AliyunClientFactory.cs

@@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Aliyun
             SettingProvider = settingProvider;
         }
 
-        public virtual async Task<TClient> CreateAsync()
+        public async virtual Task<TClient> CreateAsync()
         {
             var regionId = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Authorization.RegionId);
             var accessKey = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Authorization.AccessKeyId);
@@ -52,7 +52,7 @@ namespace LINGYUN.Abp.Aliyun
 
         protected abstract TClient GetSecurityTokenClient(string regionId, string accessKeyId, string accessKeySecret, string securityToken);
 
-        protected virtual async Task<AliyunBasicSessionCredentialsCacheItem> GetCacheItemAsync(string accessKeyId, string accessKeySecret, string regionId)
+        protected async virtual Task<AliyunBasicSessionCredentialsCacheItem> GetCacheItemAsync(string accessKeyId, string accessKeySecret, string regionId)
         {
             var cacheItem = await Cache.GetAsync(AliyunBasicSessionCredentialsCacheItem.CacheKey);
             if (cacheItem == null)
@@ -111,7 +111,7 @@ namespace LINGYUN.Abp.Aliyun
             SettingProvider = settingProvider;
         }
 
-        public virtual async Task<TClient> CreateAsync(TConfiguration configuration)
+        public async virtual Task<TClient> CreateAsync(TConfiguration configuration)
         {
             var regionId = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Authorization.RegionId);
             var accessKey = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Authorization.AccessKeyId);
@@ -135,7 +135,7 @@ namespace LINGYUN.Abp.Aliyun
 
         protected abstract TClient GetSecurityTokenClient(TConfiguration configuration, string regionId, string accessKeyId, string accessKeySecret, string securityToken);
 
-        protected virtual async Task<AliyunBasicSessionCredentialsCacheItem> GetCacheItemAsync(string accessKeyId, string accessKeySecret, string regionId)
+        protected async virtual Task<AliyunBasicSessionCredentialsCacheItem> GetCacheItemAsync(string accessKeyId, string accessKeySecret, string regionId)
         {
             var cacheItem = await Cache.GetAsync(AliyunBasicSessionCredentialsCacheItem.CacheKey);
             if (cacheItem == null)

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/LINGYUN/Abp/BlobStoring/Tencent/CosClientFactory.cs

@@ -26,7 +26,7 @@ public class CosClientFactory : AbstractTencentCloudClientFactory<CosXml, Tencen
         ConfigurationProvider = configurationProvider;
     }
 
-    public virtual async Task<CosXml> CreateAsync<TContainer>()
+    public async virtual Task<CosXml> CreateAsync<TContainer>()
     {
         var configuration = ConfigurationProvider.Get<TContainer>();
 

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/LINGYUN/Abp/BlobStoring/Tencent/TencentCloudBlobProvider.cs

@@ -117,14 +117,14 @@ public class TencentCloudBlobProvider : BlobProviderBase, ITransientDependency
         ossClient.PutObject(putRequest);
     }
 
-    protected virtual async Task<CosXml> GetOssClientAsync(BlobProviderArgs args)
+    protected async virtual Task<CosXml> GetOssClientAsync(BlobProviderArgs args)
     {
         var configuration = args.Configuration.GetTencentConfiguration();
         var ossClient = await CosClientFactory.CreateAsync(configuration);
         return ossClient;
     }
 
-    protected virtual async Task CreateBucketIfNotExists(CosXml cos, BlobProviderArgs args, IList<string> refererList = null)
+    protected async virtual Task CreateBucketIfNotExists(CosXml cos, BlobProviderArgs args, IList<string> refererList = null)
     {
         if (!await BucketExistsAsync(cos, args))
         {

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/TencentCloudSmsSender.cs

@@ -42,7 +42,7 @@ namespace LINGYUN.Abp.Sms.Tencent
         }
 
         [RequiresFeature(TencentCloudFeatures.Sms.Enable)]
-        public virtual async Task SendAsync(SmsMessage smsMessage)
+        public async virtual Task SendAsync(SmsMessage smsMessage)
         {
             var appId = await SettingProvider.GetOrNullAsync(TencentCloudSettingNames.Sms.AppId);
 

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.QQ/LINGYUN/Abp/Tencent/QQ/AbpTencentQQOptionsFactory.cs

@@ -14,7 +14,7 @@ namespace LINGYUN.Abp.Tencent.QQ
             Options = options;
         }
 
-        public virtual async Task<AbpTencentQQOptions> CreateAsync()
+        public async virtual Task<AbpTencentQQOptions> CreateAsync()
         {
             await Options.SetAsync();
 

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.QQ/LINGYUN/Abp/Tencent/QQ/AbpTencentQQOptionsManager.cs

@@ -35,7 +35,7 @@ public class AbpTencentQQOptionsManager : AbpDynamicOptionsManager<AbpTencentQQO
         options.IsMobile = cacheItem.IsMobile;
     }
 
-    protected virtual async Task<AbpTencentQQCacheItem> GetCacheItemAsync()
+    protected async virtual Task<AbpTencentQQCacheItem> GetCacheItemAsync()
     {
         var cacheKey = AbpTencentQQCacheItem.CalculateCacheKey(CurrentTenant.Id);
 

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN/Abp/Tencent/SettingManagement/TencentCloudSettingAppService.cs

@@ -31,17 +31,17 @@ public class TencentCloudSettingAppService : ApplicationService, ITencentCloudSe
         LocalizationResource = typeof(TencentCloudResource);
     }
 
-    public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
+    public async virtual Task<SettingGroupResult> GetAllForCurrentTenantAsync()
     {
         return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
     }
 
-    public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
+    public async virtual Task<SettingGroupResult> GetAllForGlobalAsync()
     {
         return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
     }
 
-    protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
+    protected async virtual Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
     {
         var settingGroups = new SettingGroupResult();
 

aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN/Abp/Tencent/AbstractTencentCloudClientFactory.cs

@@ -23,7 +23,7 @@ public abstract class AbstractTencentCloudClientFactory<TClient>
         SettingProvider = settingProvider;
     }
 
-    public virtual async Task<TClient> CreateAsync()
+    public async virtual Task<TClient> CreateAsync()
     {
         var clientCacheItem = await GetClientCacheItemAsync();
 
@@ -32,7 +32,7 @@ public abstract class AbstractTencentCloudClientFactory<TClient>
 
     protected abstract TClient CreateClient(TencentCloudClientCacheItem cloudCache);
 
-    protected virtual async Task<TencentCloudClientCacheItem> GetClientCacheItemAsync()
+    protected async virtual Task<TencentCloudClientCacheItem> GetClientCacheItemAsync()
     {
         return await ClientCache.GetOrCreateAsync(
             TencentCloudClientCacheItem.CalculateCacheKey(CurrentTenant),
@@ -80,7 +80,7 @@ public abstract class AbstractTencentCloudClientFactory<TClient, TConfiguration>
         SettingProvider = settingProvider;
     }
 
-    public virtual async Task<TClient> CreateAsync(TConfiguration configuration)
+    public async virtual Task<TClient> CreateAsync(TConfiguration configuration)
     {
         var clientCacheItem = await GetClientCacheItemAsync();
 
@@ -89,7 +89,7 @@ public abstract class AbstractTencentCloudClientFactory<TClient, TConfiguration>
 
     protected abstract TClient CreateClient(TConfiguration configuration, TencentCloudClientCacheItem cloudCache);
 
-    protected virtual async Task<TencentCloudClientCacheItem> GetClientCacheItemAsync()
+    protected async virtual Task<TencentCloudClientCacheItem> GetClientCacheItemAsync()
     {
         return await ClientCache.GetOrCreateAsync(
             TencentCloudClientCacheItem.CalculateCacheKey(CurrentTenant),

aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN/Abp/AspNetCore/Mvc/Client/MvcCurrentApplicationConfigurationCacheResetEventHandler.cs

@@ -21,7 +21,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Client
             Cache = cache;
         }
 
-        public virtual async Task HandleEventAsync(CurrentApplicationConfigurationCacheResetEventData eventData)
+        public async virtual Task HandleEventAsync(CurrentApplicationConfigurationCacheResetEventData eventData)
         {
             await Cache.RemoveAsync(CreateCacheKey());
         }

aspnet-core/modules/common/LINGYUN.Abp.BackgroundWorkers.Hangfire/LINGYUN/Abp/BackgroundWorkers/Hangfire/HangfireBackgroundWorkerAdapter.cs

@@ -16,7 +16,7 @@ namespace LINGYUN.Abp.BackgroundWorkers.Hangfire
             _doWorkMethod = typeof(TWorker).GetMethod("DoWork", BindingFlags.Instance | BindingFlags.NonPublic);
         }
 
-        public virtual async Task ExecuteAsync()
+        public async virtual Task ExecuteAsync()
         {
             var worker = (IBackgroundWorker)ServiceProvider.GetService(typeof(TWorker));
             var workerContext = new PeriodicBackgroundWorkerContext(ServiceProvider);

aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs

@@ -90,14 +90,14 @@ namespace LINGYUN.Abp.BlobStoring.Aliyun
             ossClient.PutObject(bucketName, blobName, args.BlobStream);
         }
 
-        protected virtual async Task<IOss> GetOssClientAsync(BlobProviderArgs args)
+        protected async virtual Task<IOss> GetOssClientAsync(BlobProviderArgs args)
         {
             var configuration = args.Configuration.GetAliyunConfiguration();
             var ossClient = await OssClientFactory.CreateAsync(configuration);
             return ossClient;
         }
 
-        protected virtual async Task CreateBucketIfNotExists(IOss ossClient, BlobProviderArgs args, IList<string> refererList = null)
+        protected async virtual Task CreateBucketIfNotExists(IOss ossClient, BlobProviderArgs args, IList<string> refererList = null)
         {
             if (! await BucketExistsAsync(ossClient, args))
             {

aspnet-core/modules/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN/Abp/BlobStoring/Aliyun/OssClientFactory.cs

@@ -20,7 +20,7 @@ namespace LINGYUN.Abp.BlobStoring.Aliyun
             ConfigurationProvider = configurationProvider;
         }
 
-        public virtual async Task<IOss> CreateAsync<TContainer>()
+        public async virtual Task<IOss> CreateAsync<TContainer>()
         {
             var configuration = ConfigurationProvider.Get<TContainer>();
 

aspnet-core/modules/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN/Abp/Data/DbMigrator/DefaultDbSchemaMigrator.cs

@@ -23,7 +23,7 @@ namespace LINGYUN.Abp.Data.DbMigrator
             _dbConnectionOptions = dbConnectionOptions.Value;
         }
 
-        public virtual async Task MigrateAsync<TDbContext>(
+        public async virtual Task MigrateAsync<TDbContext>(
             [NotNull] Func<string, DbContextOptionsBuilder<TDbContext>, TDbContext> configureDbContext) 
             where TDbContext : AbpDbContext<TDbContext>
         {

aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPSubscribeInvoker.cs

@@ -52,7 +52,7 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <param name="context"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public virtual async Task<ConsumerExecutedResult> InvokeAsync(ConsumerContext context, CancellationToken cancellationToken = default)
+        public async virtual Task<ConsumerExecutedResult> InvokeAsync(ConsumerContext context, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 

aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/FailedThresholdCallbackNotifier.cs

@@ -19,7 +19,7 @@ namespace LINGYUN.Abp.EventBus.CAP
             ExceptionNotifier = exceptionNotifier;
         }
 
-        public virtual async Task NotifyAsync(AbpCAPExecutionFailedException exception)
+        public async virtual Task NotifyAsync(AbpCAPExecutionFailedException exception)
         {
             // 通过额外的选项来控制是否发送消息处理失败的事件
             if (Options.NotifyFailedCallback)

aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN/Abp/Features/LimitValidation/Redis/RedisRequiresLimitFeatureChecker.cs

@@ -52,7 +52,7 @@ namespace LINGYUN.Abp.Features.LimitValidation.Redis
             Logger = NullLogger<RedisRequiresLimitFeatureChecker>.Instance;
         }
 
-        public virtual async Task<bool> CheckAsync(RequiresLimitFeatureContext context, CancellationToken cancellation = default)
+        public async virtual Task<bool> CheckAsync(RequiresLimitFeatureContext context, CancellationToken cancellation = default)
         {
             await ConnectAsync(cancellation);
 
@@ -60,7 +60,7 @@ namespace LINGYUN.Abp.Features.LimitValidation.Redis
             return result + 1 <= context.Limit;
         }
 
-        public virtual async Task ProcessAsync(RequiresLimitFeatureContext context, CancellationToken cancellation = default)
+        public async virtual Task ProcessAsync(RequiresLimitFeatureContext context, CancellationToken cancellation = default)
         {
             await ConnectAsync(cancellation);
             

aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/FeaturesLimitValidationInterceptor.cs

@@ -60,7 +60,7 @@ namespace LINGYUN.Abp.Features.LimitValidation
             await PostCheckFeatureAsync(limitFeatureContext);
         }
 
-        protected virtual async Task PreCheckFeatureAsync(RequiresLimitFeatureContext context)
+        protected async virtual Task PreCheckFeatureAsync(RequiresLimitFeatureContext context)
         {
             var allowed = await _limitFeatureChecker.CheckAsync(context);
             if (!allowed)
@@ -69,7 +69,7 @@ namespace LINGYUN.Abp.Features.LimitValidation
             }
         }
 
-        protected virtual async Task PostCheckFeatureAsync(RequiresLimitFeatureContext context)
+        protected async virtual Task PostCheckFeatureAsync(RequiresLimitFeatureContext context)
         {
             await _limitFeatureChecker.ProcessAsync(context);
         }

aspnet-core/modules/common/LINGYUN.Abp.Hangfire.Dashboard/LINGYUN/Abp/Hangfire/Dashboard/Authorization/DashboardPermissionChecker.cs

@@ -22,7 +22,7 @@ namespace LINGYUN.Abp.Hangfire.Dashboard.Authorization
             _permissionChecker = permissionChecker;
         }
 
-        public virtual async Task<bool> IsGrantedAsync(DashboardContext context, string[] requiredPermissionNames)
+        public async virtual Task<bool> IsGrantedAsync(DashboardContext context, string[] requiredPermissionNames)
         {
             var localPermissionKey = $"_HDPS:{requiredPermissionNames.JoinAsString(";")}";
 

aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN/Abp/IM/SignalR/Hubs/MessagesHub.cs

@@ -69,7 +69,7 @@ namespace LINGYUN.Abp.IM.SignalR.Hubs
             }
         }
 
-        protected virtual async Task SendUserOnlineStateAsync(bool isOnlined = true)
+        protected async virtual Task SendUserOnlineStateAsync(bool isOnlined = true)
         {
             var methodName = isOnlined ? Options.UserOnlineMethod : Options.UserOfflineMethod;
 
@@ -99,13 +99,13 @@ namespace LINGYUN.Abp.IM.SignalR.Hubs
         /// <param name="chatMessage"></param>
         /// <returns></returns>
         [HubMethodName("send")]
-        public virtual async Task<string> SendMessageAsync(ChatMessage chatMessage)
+        public async virtual Task<string> SendMessageAsync(ChatMessage chatMessage)
         {
             return await SendMessageAsync(Options.GetChatMessageMethod, chatMessage, true);
         }
 
         [HubMethodName("recall")]
-        public virtual async Task ReCallAsync(ChatMessage chatMessage)
+        public async virtual Task ReCallAsync(ChatMessage chatMessage)
         {
             try
             {
@@ -177,7 +177,7 @@ namespace LINGYUN.Abp.IM.SignalR.Hubs
         }
 
         [HubMethodName("read")]
-        public virtual async Task ReadAsync(ChatMessage chatMessage)
+        public async virtual Task ReadAsync(ChatMessage chatMessage)
         {
             try
             {
@@ -189,7 +189,7 @@ namespace LINGYUN.Abp.IM.SignalR.Hubs
             }
         }
 
-        protected virtual async Task<string> SendMessageAsync(string methodName, ChatMessage chatMessage, bool callbackException = false)
+        protected async virtual Task<string> SendMessageAsync(string methodName, ChatMessage chatMessage, bool callbackException = false)
         {
             // 持久化
             try
@@ -248,13 +248,13 @@ namespace LINGYUN.Abp.IM.SignalR.Hubs
             return "";
         }
 
-        protected virtual async Task SendMessageToGroupAsync(string methodName, ChatMessage chatMessage)
+        protected async virtual Task SendMessageToGroupAsync(string methodName, ChatMessage chatMessage)
         {
             var signalRClient = Clients.Group(chatMessage.GroupId);
             await signalRClient.SendAsync(methodName, chatMessage);
         }
 
-        protected virtual async Task SendMessageToUserAsync(string methodName, ChatMessage chatMessage)
+        protected async virtual Task SendMessageToUserAsync(string methodName, ChatMessage chatMessage)
         {
             var onlineClients = Clients.User(chatMessage.ToUserId.GetValueOrDefault().ToString());
             await onlineClients.SendAsync(methodName, chatMessage);

aspnet-core/modules/common/LINGYUN.Abp.IM.SignalR/LINGYUN/Abp/IM/SignalR/Messages/SignalRMessageSenderProvider.cs

@@ -40,7 +40,7 @@ namespace LINGYUN.Abp.IM.SignalR.Messages
             await TrySendMessageToUserAsync(chatMessage, true);
         }
 
-        protected virtual async Task TrySendMessageToGroupAsync(ChatMessage chatMessage, bool sendingExceptionCallback = true)
+        protected async virtual Task TrySendMessageToGroupAsync(ChatMessage chatMessage, bool sendingExceptionCallback = true)
         {
             try
             {
@@ -65,7 +65,7 @@ namespace LINGYUN.Abp.IM.SignalR.Messages
             }
         }
 
-        protected virtual async Task TrySendMessageToUserAsync(ChatMessage chatMessage, bool sendingExceptionCallback = true)
+        protected async virtual Task TrySendMessageToUserAsync(ChatMessage chatMessage, bool sendingExceptionCallback = true)
         {
             try
             {
@@ -89,7 +89,7 @@ namespace LINGYUN.Abp.IM.SignalR.Messages
             }
         }
 
-        protected virtual async Task TrySendBusinessErrorMessage(Exception ex, ChatMessage chatMessage)
+        protected async virtual Task TrySendBusinessErrorMessage(Exception ex, ChatMessage chatMessage)
         {
             if (ex is IBusinessException)
             {

aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN/Abp/IM/Messages/MessageSender.cs

@@ -19,7 +19,7 @@ namespace LINGYUN.Abp.IM.Messages
             DistributedIdGenerator = distributedIdGenerator;
         }
 
-        public virtual async Task<string> SendMessageAsync(ChatMessage chatMessage)
+        public async virtual Task<string> SendMessageAsync(ChatMessage chatMessage)
         {
             chatMessage.SetProperty(nameof(ChatMessage.IsAnonymous), chatMessage.IsAnonymous);
             chatMessage.MessageId = DistributedIdGenerator.Create().ToString();

aspnet-core/modules/common/LINGYUN.Abp.IM/LINGYUN/Abp/IM/Messages/MessageSenderProviderBase.cs

@@ -22,7 +22,7 @@ namespace LINGYUN.Abp.IM.Messages
             ServiceProvider = serviceProvider;
         }
 
-        public virtual async Task SendMessageAsync(ChatMessage chatMessage)
+        public async virtual Task SendMessageAsync(ChatMessage chatMessage)
         {
             try
             {

aspnet-core/modules/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelCachedAuthenticationService.cs

@@ -42,7 +42,7 @@ namespace LINGYUN.Abp.IdentityModel
             return accessTokenCacheItem.AccessToken;
         }
 
-        protected virtual async Task<IdentityModelAuthenticationCacheItem> GetCacheItemAsync(IdentityClientConfiguration configuration)
+        protected async virtual Task<IdentityModelAuthenticationCacheItem> GetCacheItemAsync(IdentityClientConfiguration configuration)
         {
             var cacheKey = IdentityModelAuthenticationCacheItem.CalculateCacheKey(configuration.GrantType, configuration.ClientId, configuration.UserName);
             
@@ -74,7 +74,7 @@ namespace LINGYUN.Abp.IdentityModel
             return cacheItem;
         }
 
-        protected virtual async Task<TokenResponse> GetAccessTokenResponseAsync(IdentityClientConfiguration configuration)
+        protected async virtual Task<TokenResponse> GetAccessTokenResponseAsync(IdentityClientConfiguration configuration)
         {
             var discoveryResponse = await GetDiscoveryResponse(configuration);
             if (discoveryResponse.IsError)

aspnet-core/modules/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLanguageProvider.cs

@@ -25,7 +25,7 @@ namespace LINGYUN.Abp.Localization.Dynamic
             Options = options.Value;
         }
 
-        public virtual async Task<IReadOnlyList<LanguageInfo>> GetLanguagesAsync()
+        public async virtual Task<IReadOnlyList<LanguageInfo>> GetLanguagesAsync()
         {
             var languages = await Store.GetLanguageListAsync();
 

aspnet-core/modules/common/LINGYUN.Abp.Location.Amap/LINGYUN/Abp/Location/Amap/AmapHttpRequestClient.cs

@@ -42,7 +42,7 @@ namespace LINGYUN.Abp.Location.Amap
             CancellationTokenProvider = cancellationTokenProvider;
         }
 
-        public virtual async Task<GecodeLocation> PositiveAsync(AmapPositiveHttpRequestParamter requestParamter)
+        public async virtual Task<GecodeLocation> PositiveAsync(AmapPositiveHttpRequestParamter requestParamter)
         {
             var client = HttpClientFactory.CreateClient(AmapHttpConsts.HttpClientName);
             var requestUrlBuilder = new StringBuilder(128);
@@ -110,7 +110,7 @@ namespace LINGYUN.Abp.Location.Amap
             return postiveLocation;
         }
 
-        public virtual async Task<ReGeocodeLocation> InverseAsync(AmapInverseHttpRequestParamter requestParamter)
+        public async virtual Task<ReGeocodeLocation> InverseAsync(AmapInverseHttpRequestParamter requestParamter)
         {
             if(requestParamter.Locations.Length > 20)
             {

aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN/Abp/Location/Baidu/BaiduLocationHttpClient.cs

@@ -40,7 +40,7 @@ namespace LINGYUN.Abp.Location.Baidu
             CancellationTokenProvider = cancellationTokenProvider;
         }
 
-        public virtual async Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
+        public async virtual Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
         {
             var requestParamters = new Dictionary<string, string>
             {
@@ -88,7 +88,7 @@ namespace LINGYUN.Abp.Location.Baidu
             return location;
         }
 
-        public virtual async Task<GecodeLocation> GeocodeAsync(string address, string city = null)
+        public async virtual Task<GecodeLocation> GeocodeAsync(string address, string city = null)
         {
             var requestParamters = new Dictionary<string, string>
             {
@@ -137,7 +137,7 @@ namespace LINGYUN.Abp.Location.Baidu
             return location;
         }
 
-        public virtual async Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 1000)
+        public async virtual Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 1000)
         {
             var requestParamters = new Dictionary<string, string>
             {
@@ -222,7 +222,7 @@ namespace LINGYUN.Abp.Location.Baidu
             return location;
         }
 
-        protected virtual async Task<string> MakeRequestAndGetResultAsync(string url)
+        protected async virtual Task<string> MakeRequestAndGetResultAsync(string url)
         {
             var client = HttpClientFactory.CreateClient(BaiduLocationHttpConsts.HttpClientName);
             var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);

aspnet-core/modules/common/LINGYUN.Abp.Location.Baidu/LINGYUN/Abp/Location/Baidu/BaiduLocationResolveProvider.cs

@@ -15,17 +15,17 @@ namespace LINGYUN.Abp.Location.Baidu
             BaiduLocationHttpClient = baiduHttpRequestClient;
         }
 
-        public virtual async Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
+        public async virtual Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
         {
             return await BaiduLocationHttpClient.IPGeocodeAsync(ipAddress);
         }
 
-        public virtual async Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 50)
+        public async virtual Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 50)
         {
             return await BaiduLocationHttpClient.ReGeocodeAsync(lat, lng, radius);
         }
 
-        public virtual async Task<GecodeLocation> GeocodeAsync(string address, string city = null)
+        public async virtual Task<GecodeLocation> GeocodeAsync(string address, string city = null)
         {
             return await BaiduLocationHttpClient.GeocodeAsync(address, city);
         }

aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN/Abp/Location/Tencent/TencentLocationHttpClient.cs

@@ -40,7 +40,7 @@ namespace LINGYUN.Abp.Location.Tencent
             CancellationTokenProvider = cancellationTokenProvider;
         }
 
-        public virtual async Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
+        public async virtual Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
         {
             var requestParamters = new Dictionary<string, string>
             {
@@ -77,7 +77,7 @@ namespace LINGYUN.Abp.Location.Tencent
             return location;
         }
 
-        public virtual async Task<GecodeLocation> GeocodeAsync(string address, string city = null)
+        public async virtual Task<GecodeLocation> GeocodeAsync(string address, string city = null)
         {
             var requestParamters = new Dictionary<string, string>
             {
@@ -110,7 +110,7 @@ namespace LINGYUN.Abp.Location.Tencent
             return location;
         }
 
-        public virtual async Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 1000)
+        public async virtual Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 1000)
         {
             var requestParamters = new Dictionary<string, string>
             {
@@ -168,7 +168,7 @@ namespace LINGYUN.Abp.Location.Tencent
             return location;
         }
 
-        protected virtual async Task<string> MakeRequestAndGetResultAsync(string url)
+        protected async virtual Task<string> MakeRequestAndGetResultAsync(string url)
         {
             var client = HttpClientFactory.CreateClient(TencentLocationHttpConsts.HttpClientName);
             var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
@@ -188,7 +188,7 @@ namespace LINGYUN.Abp.Location.Tencent
             return CancellationTokenProvider.Token;
         }
 
-        protected virtual async Task<TResponse> GetTencentMapResponseAsync<TResponse>(string url, string path, IDictionary<string, string> paramters)
+        protected async virtual Task<TResponse> GetTencentMapResponseAsync<TResponse>(string url, string path, IDictionary<string, string> paramters)
             where TResponse : TencentLocationResponse
         {
             var requestUrl = BuildRequestUrl(url, path, paramters);

aspnet-core/modules/common/LINGYUN.Abp.Location.Tencent/LINGYUN/Abp/Location/Tencent/TencentLocationResolveProvider.cs

@@ -15,17 +15,17 @@ namespace LINGYUN.Abp.Location.Tencent
             TencentLocationHttpClient = tencentLocationHttpClient;
         }
 
-        public virtual async Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
+        public async virtual Task<IPGecodeLocation> IPGeocodeAsync(string ipAddress)
         {
             return await TencentLocationHttpClient.IPGeocodeAsync(ipAddress);
         }
 
-        public virtual async Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 50)
+        public async virtual Task<ReGeocodeLocation> ReGeocodeAsync(double lat, double lng, int radius = 50)
         {
             return await TencentLocationHttpClient.ReGeocodeAsync(lat, lng, radius);
         }
 
-        public virtual async Task<GecodeLocation> GeocodeAsync(string address, string city = null)
+        public async virtual Task<GecodeLocation> GeocodeAsync(string address, string city = null)
         {
             return await TencentLocationHttpClient.GeocodeAsync(address, city);
         }

aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/NotificationDefinitionManager.cs

@@ -20,7 +20,7 @@ namespace LINGYUN.Abp.Notifications
             _dynamicStore = dynamicStore;
         }
 
-        public virtual async Task<NotificationDefinition> GetAsync(string name)
+        public async virtual Task<NotificationDefinition> GetAsync(string name)
         {
             var notification = await GetOrNullAsync(name);
             if (notification == null)
@@ -31,7 +31,7 @@ namespace LINGYUN.Abp.Notifications
             return notification;
         }
 
-        public virtual async Task<NotificationDefinition> GetOrNullAsync(string name)
+        public async virtual Task<NotificationDefinition> GetOrNullAsync(string name)
         {
             Check.NotNull(name, nameof(name));
 
@@ -39,7 +39,7 @@ namespace LINGYUN.Abp.Notifications
                    await _dynamicStore.GetOrNullAsync(name);
         }
 
-        public virtual async Task<IReadOnlyList<NotificationDefinition>> GetNotificationsAsync()
+        public async virtual Task<IReadOnlyList<NotificationDefinition>> GetNotificationsAsync()
         {
             var staticNotifications = await _staticStore.GetNotificationsAsync();
             var staticNotificationNames = staticNotifications

aspnet-core/modules/common/LINGYUN.Abp.Notifications.SignalR/LINGYUN/Abp/Notifications/SignalR/Hubs/NotificationsHub.cs

@@ -48,7 +48,7 @@ namespace LINGYUN.Abp.Notifications.SignalR.Hubs
 
         // [HubMethodName("MySubscriptions")]
         [HubMethodName("my-subscriptions")]
-        public virtual async Task<ListResultDto<NotificationSubscriptionInfo>> GetMySubscriptionsAsync()
+        public async virtual Task<ListResultDto<NotificationSubscriptionInfo>> GetMySubscriptionsAsync()
         {
             var subscriptions = await NotificationStore
                 .GetUserSubscriptionsAsync(CurrentTenant.Id, CurrentUser.GetId());
@@ -59,7 +59,7 @@ namespace LINGYUN.Abp.Notifications.SignalR.Hubs
         [UnitOfWork]
         // [HubMethodName("GetNotification")]
         [HubMethodName("get-notifications")]
-        public virtual async Task<ListResultDto<NotificationInfo>> GetNotificationAsync()
+        public async virtual Task<ListResultDto<NotificationInfo>> GetNotificationAsync()
         {
             var userNotifications = await NotificationStore
                 .GetUserNotificationsAsync(CurrentTenant.Id, CurrentUser.GetId(), NotificationReadState.UnRead, 10);
@@ -69,7 +69,7 @@ namespace LINGYUN.Abp.Notifications.SignalR.Hubs
 
         // [HubMethodName("ChangeState")]
         [HubMethodName("change-state")]
-        public virtual async Task ChangeStateAsync(string id, NotificationReadState readState = NotificationReadState.Read)
+        public async virtual Task ChangeStateAsync(string id, NotificationReadState readState = NotificationReadState.Read)
         {
             await NotificationStore
                 .ChangeUserNotificationReadStateAsync(

aspnet-core/modules/common/LINGYUN.Abp.Notifications.Sms/LINGYUN/Abp/Notifications/Sms/SmsNotificationSender.cs

@@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Notifications.Sms
         /// <param name="notification"></param>
         /// <param name="phoneNumbers"></param>
         /// <returns></returns>
-        public virtual async Task SendAsync(NotificationInfo notification, string phoneNumbers)
+        public async virtual Task SendAsync(NotificationInfo notification, string phoneNumbers)
         {
             var templateCode = notification.Data.TryGetData("TemplateCode");
             if (templateCode == null)

aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Internal/NotificationSubscriptionManager.cs

@@ -16,7 +16,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             _store = store;
         }
 
-        public virtual async Task<List<NotificationSubscriptionInfo>> GetUsersSubscriptionsAsync(
+        public async virtual Task<List<NotificationSubscriptionInfo>> GetUsersSubscriptionsAsync(
             Guid? tenantId,
             string notificationName, 
             IEnumerable<UserIdentifier> identifiers = null,
@@ -25,7 +25,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             return await _store.GetUserSubscriptionsAsync(tenantId, notificationName, identifiers, cancellationToken);
         }
 
-        public virtual async Task<List<NotificationSubscriptionInfo>> GetUserSubscriptionsAsync(
+        public async virtual Task<List<NotificationSubscriptionInfo>> GetUserSubscriptionsAsync(
             Guid? tenantId, 
             Guid userId,
             CancellationToken cancellationToken = default)
@@ -33,7 +33,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             return await _store.GetUserSubscriptionsAsync(tenantId, userId, cancellationToken);
         }
 
-        public virtual async Task<List<NotificationSubscriptionInfo>> GetUserSubscriptionsAsync(
+        public async virtual Task<List<NotificationSubscriptionInfo>> GetUserSubscriptionsAsync(
             Guid? tenantId, 
             string userName,
             CancellationToken cancellationToken = default)
@@ -41,7 +41,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             return await _store.GetUserSubscriptionsAsync(tenantId, userName, cancellationToken);
         }
 
-        public virtual async Task<bool> IsSubscribedAsync(
+        public async virtual Task<bool> IsSubscribedAsync(
             Guid? tenantId, 
             Guid userId, 
             string notificationName,
@@ -50,7 +50,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             return await _store.IsSubscribedAsync(tenantId, userId, notificationName, cancellationToken);
         }
 
-        public virtual async Task SubscribeAsync(
+        public async virtual Task SubscribeAsync(
             Guid? tenantId,
             UserIdentifier identifier,
             string notificationName,
@@ -63,7 +63,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             await _store.InsertUserSubscriptionAsync(tenantId, identifier, notificationName, cancellationToken);
         }
 
-        public virtual async Task SubscribeAsync(
+        public async virtual Task SubscribeAsync(
             Guid? tenantId, 
             IEnumerable<UserIdentifier> identifiers, 
             string notificationName,
@@ -75,7 +75,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             }
         }
 
-        public virtual async Task UnsubscribeAsync(
+        public async virtual Task UnsubscribeAsync(
             Guid? tenantId, 
             UserIdentifier identifier, 
             string notificationName,
@@ -84,7 +84,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             await _store.DeleteUserSubscriptionAsync(tenantId, identifier.UserId, notificationName, cancellationToken);
         }
 
-        public virtual async Task UnsubscribeAllAsync(
+        public async virtual Task UnsubscribeAllAsync(
             Guid? tenantId, 
             string notificationName,
             CancellationToken cancellationToken = default)
@@ -92,7 +92,7 @@ namespace LINGYUN.Abp.Notifications.Internal
             await _store.DeleteAllUserSubscriptionAsync(tenantId, notificationName, cancellationToken);
         }
 
-        public virtual async Task UnsubscribeAsync(
+        public async virtual Task UnsubscribeAsync(
             Guid? tenantId,
             IEnumerable<UserIdentifier> identifiers,
             string notificationName,

aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs

@@ -36,7 +36,7 @@ namespace LINGYUN.Abp.Sms.Aliyun
             AcsClientFactory = acsClientFactory;
         }
 
-        public virtual async Task SendAsync(SmsMessage smsMessage)
+        public async virtual Task SendAsync(SmsMessage smsMessage)
         {
             var domain = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Sms.Domain);
             var action = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Sms.ActionName);

aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN/Abp/Dapr/Client/DynamicProxying/DaprApiDescriptionFinder.cs

@@ -14,7 +14,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.DynamicProxying;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.Reflection;
+using Volo.Abp.Reflection;
 using Volo.Abp.Threading;
 using Volo.Abp.Tracing;
 
@@ -22,9 +22,9 @@ namespace LINGYUN.Abp.Dapr.Client.DynamicProxying
 {
     public class DaprApiDescriptionFinder : IDaprApiDescriptionFinder, ITransientDependency
     {
-        public static JsonSerializerOptions DeserializeOptions = new JsonSerializerOptions
+        public static JsonSerializerOptions DeserializeOptions = new JsonSerializerOptions
-        {
+        {
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
         };
 
         public ICancellationTokenProvider CancellationTokenProvider { get; set; }
@@ -50,7 +50,7 @@ namespace LINGYUN.Abp.Dapr.Client.DynamicProxying
             CancellationTokenProvider = NullCancellationTokenProvider.Instance;
         }
 
-        public virtual async Task<ActionApiDescriptionModel> FindActionAsync(string service, string appId, Type serviceType, MethodInfo method)
+        public async virtual Task<ActionApiDescriptionModel> FindActionAsync(string service, string appId, Type serviceType, MethodInfo method)
         {
             var apiDescription = await GetApiDescriptionAsync(service, appId);
 
@@ -94,12 +94,12 @@ namespace LINGYUN.Abp.Dapr.Client.DynamicProxying
             throw new AbpException($"Could not found remote action for method: {method} on the appId: {appId}");
         }
 
-        public virtual async Task<ApplicationApiDescriptionModel> GetApiDescriptionAsync(string service, string appId)
+        public async virtual Task<ApplicationApiDescriptionModel> GetApiDescriptionAsync(string service, string appId)
         {
             return await Cache.GetAsync(appId, () => GetApiDescriptionFromServerAsync(service, appId));
         }
 
-        protected virtual async Task<ApplicationApiDescriptionModel> GetApiDescriptionFromServerAsync(string service, string appId)
+        protected async virtual Task<ApplicationApiDescriptionModel> GetApiDescriptionFromServerAsync(string service, string appId)
         {
             var client = DaprClientFactory.CreateClient(service);
             var requestMessage = client.CreateInvokeMethodRequest(HttpMethod.Get, appId, "api/abp/api-definition");

aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN/Abp/Dapr/Client/DynamicProxying/DynamicDaprClientProxyInterceptor.cs

@@ -70,7 +70,7 @@ namespace LINGYUN.Abp.Dapr.Client.DynamicProxying
             }
         }
 
-        protected virtual async Task<ActionApiDescriptionModel> GetActionApiDescriptionModel(IAbpMethodInvocation invocation)
+        protected async virtual Task<ActionApiDescriptionModel> GetActionApiDescriptionModel(IAbpMethodInvocation invocation)
         {
             var clientConfig = ClientProxyOptions.DaprClientProxies.GetOrDefault(typeof(TService)) ??
                                throw new AbpException($"Could not get DynamicDaprClientProxyConfig for {typeof(TService).FullName}.");
@@ -84,12 +84,12 @@ namespace LINGYUN.Abp.Dapr.Client.DynamicProxying
             );
         }
 
-        protected virtual async Task<T> CallRequestAsync<T>(ClientProxyRequestContext context)
+        protected async virtual Task<T> CallRequestAsync<T>(ClientProxyRequestContext context)
         {
             return await InterceptorClientProxy.CallRequestAsync<T>(context);
         }
 
-        protected virtual async Task<object> GetResultAsync(Task task, Type resultType)
+        protected async virtual Task<object> GetResultAsync(Task task, Type resultType)
         {
             await task;
             var resultProperty = typeof(Task<>)

aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN/Abp/DataProtection/EntityFrameworkCore/EfCoreDataProtectionRepositoryBase.cs

@@ -115,7 +115,7 @@ namespace LINGYUN.Abp.DataProtection.EntityFrameworkCore
 
             await DeleteManyAsync(entities, autoSave, cancellationToken);
         }
-        protected virtual async Task<IQueryable<TEntity>> WithDetailsAsync(ProtectBehavior behavior = ProtectBehavior.All)
+        protected async virtual Task<IQueryable<TEntity>> WithDetailsAsync(ProtectBehavior behavior = ProtectBehavior.All)
         {
             if (typeof(IDataProtection).IsAssignableFrom(typeof(TEntity)))
             {
@@ -131,7 +131,7 @@ namespace LINGYUN.Abp.DataProtection.EntityFrameworkCore
 
             return await base.WithDetailsAsync();
         }
-        protected virtual async Task<IQueryable<TEntity>> WithDetailsAsync(ResourceGrantedResult resourceGranted)
+        protected async virtual Task<IQueryable<TEntity>> WithDetailsAsync(ResourceGrantedResult resourceGranted)
         {
             if (AbpEntityOptions.DefaultWithDetailsFunc == null)
             {
@@ -140,7 +140,7 @@ namespace LINGYUN.Abp.DataProtection.EntityFrameworkCore
 
             return AbpEntityOptions.DefaultWithDetailsFunc(await GetQueryableAsync(resourceGranted));
         }
-        protected virtual async Task<IQueryable<TEntity>> GetQueryableAsync(ProtectBehavior behavior = ProtectBehavior.All)
+        protected async virtual Task<IQueryable<TEntity>> GetQueryableAsync(ProtectBehavior behavior = ProtectBehavior.All)
         {
             if (typeof(IDataProtection).IsAssignableFrom(typeof(TEntity)))
             {
@@ -156,7 +156,7 @@ namespace LINGYUN.Abp.DataProtection.EntityFrameworkCore
 
             return await base.GetQueryableAsync();
         }
-        protected virtual async Task<IQueryable<TEntity>> GetQueryableAsync(ResourceGrantedResult resourceGranted)
+        protected async virtual Task<IQueryable<TEntity>> GetQueryableAsync(ResourceGrantedResult resourceGranted)
         {
             var queryable = await base.GetQueryableAsync();
             if (!resourceGranted.Succeeded)

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

@@ -24,7 +24,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.IdentityClaimType.Create)]
-        public virtual async Task<IdentityClaimTypeDto> CreateAsync(IdentityClaimTypeCreateDto input)
+        public async virtual Task<IdentityClaimTypeDto> CreateAsync(IdentityClaimTypeCreateDto input)
         {
             if (await IdentityClaimTypeRepository.AnyAsync(input.Name))
             {
@@ -47,7 +47,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.IdentityClaimType.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             var identityClaimType = await IdentityClaimTypeRepository.FindAsync(id);
             if (identityClaimType == null)
@@ -58,14 +58,14 @@ namespace LINGYUN.Abp.Identity
             await IdentityClaimTypeRepository.DeleteAsync(identityClaimType);
         }
 
-        public virtual async Task<IdentityClaimTypeDto> GetAsync(Guid id)
+        public async virtual Task<IdentityClaimTypeDto> GetAsync(Guid id)
         {
             var identityClaimType = await IdentityClaimTypeRepository.FindAsync(id);
 
             return ObjectMapper.Map<IdentityClaimType, IdentityClaimTypeDto>(identityClaimType);
         }
 
-        public virtual async Task<ListResultDto<IdentityClaimTypeDto>> GetAllListAsync()
+        public async virtual Task<ListResultDto<IdentityClaimTypeDto>> GetAllListAsync()
         {
             var identityClaimTypes = await IdentityClaimTypeRepository
                 .GetListAsync();
@@ -74,7 +74,7 @@ namespace LINGYUN.Abp.Identity
                 ObjectMapper.Map<List<IdentityClaimType>, List<IdentityClaimTypeDto>>(identityClaimTypes));
         }
 
-        public virtual async Task<PagedResultDto<IdentityClaimTypeDto>> GetListAsync(IdentityClaimTypeGetByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityClaimTypeDto>> GetListAsync(IdentityClaimTypeGetByPagedDto input)
         {
             var identityClaimTypeCount = await IdentityClaimTypeRepository.GetCountAsync(input.Filter);
 
@@ -86,7 +86,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.IdentityClaimType.Update)]
-        public virtual async Task<IdentityClaimTypeDto> UpdateAsync(Guid id, IdentityClaimTypeUpdateDto input)
+        public async virtual Task<IdentityClaimTypeDto> UpdateAsync(Guid id, IdentityClaimTypeUpdateDto input)
         {
             var identityClaimType = await IdentityClaimTypeRepository.GetAsync(id);
             CheckChangingClaimType(identityClaimType);

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

@@ -27,7 +27,7 @@ namespace LINGYUN.Abp.Identity
         #region OrganizationUnit
 
         [Authorize(IdentityPermissions.Roles.ManageOrganizationUnits)]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
         {
             var origanizationUnits = await IdentityRoleRepository.GetOrganizationUnitsAsync(id);
 
@@ -36,7 +36,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.ManageOrganizationUnits)]
-        public virtual async Task SetOrganizationUnitsAsync(Guid id, IdentityRoleAddOrRemoveOrganizationUnitDto input)
+        public async virtual Task SetOrganizationUnitsAsync(Guid id, IdentityRoleAddOrRemoveOrganizationUnitDto input)
         {
             var origanizationUnits = await IdentityRoleRepository.GetOrganizationUnitsAsync(id, true);
 
@@ -57,7 +57,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.ManageOrganizationUnits)]
-        public virtual async Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
+        public async virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
         {
             await OrganizationUnitManager.RemoveRoleFromOrganizationUnitAsync(id, ouId);
 
@@ -68,7 +68,7 @@ namespace LINGYUN.Abp.Identity
 
         #region ClaimType
 
-        public virtual async Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
+        public async virtual Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
         {
             var role = await IdentityRoleRepository.GetAsync(id);
 
@@ -76,7 +76,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.ManageClaims)]
-        public virtual async Task AddClaimAsync(Guid id, IdentityRoleClaimCreateDto input)
+        public async virtual Task AddClaimAsync(Guid id, IdentityRoleClaimCreateDto input)
         {
             var role = await IdentityRoleRepository.GetAsync(id);
             var claim = new Claim(input.ClaimType, input.ClaimValue);
@@ -92,7 +92,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.ManageClaims)]
-        public virtual async Task UpdateClaimAsync(Guid id, IdentityRoleClaimUpdateDto input)
+        public async virtual Task UpdateClaimAsync(Guid id, IdentityRoleClaimUpdateDto input)
         {
             var role = await IdentityRoleRepository.GetAsync(id);
             var oldClaim = role.FindClaim(new Claim(input.ClaimType, input.ClaimValue));
@@ -108,7 +108,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Roles.ManageClaims)]
-        public virtual async Task DeleteClaimAsync(Guid id, IdentityRoleClaimDeleteDto input)
+        public async virtual Task DeleteClaimAsync(Guid id, IdentityRoleClaimDeleteDto input)
         {
             var role = await IdentityRoleRepository.GetAsync(id);
             role.RemoveClaim(new Claim(input.ClaimType, input.ClaimValue));

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

@@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Identity
 
 
         [Authorize(IdentityPermissions.Users.ManageOrganizationUnits)]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
         {
             var user = await UserManager.GetByIdAsync(id);
 
@@ -39,7 +39,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.ManageOrganizationUnits)]
-        public virtual async Task SetOrganizationUnitsAsync(Guid id, IdentityUserOrganizationUnitUpdateDto input)
+        public async virtual Task SetOrganizationUnitsAsync(Guid id, IdentityUserOrganizationUnitUpdateDto input)
         {
             var user = await UserManager.GetByIdAsync(id);
 
@@ -49,7 +49,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.ManageOrganizationUnits)]
-        public virtual async Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
+        public async virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
         {
             await UserManager.RemoveFromOrganizationUnitAsync(id, ouId);
 
@@ -60,7 +60,7 @@ namespace LINGYUN.Abp.Identity
 
         #region Claim
 
-        public virtual async Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
+        public async virtual Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
         {
             var user = await UserManager.GetByIdAsync(id);
 
@@ -68,7 +68,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.ManageClaims)]
-        public virtual async Task AddClaimAsync(Guid id, IdentityUserClaimCreateDto input)
+        public async virtual Task AddClaimAsync(Guid id, IdentityUserClaimCreateDto input)
         {
             var user = await UserManager.GetByIdAsync(id);
             var claim = new Claim(input.ClaimType, input.ClaimValue);
@@ -83,7 +83,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.ManageClaims)]
-        public virtual async Task UpdateClaimAsync(Guid id, IdentityUserClaimUpdateDto input)
+        public async virtual Task UpdateClaimAsync(Guid id, IdentityUserClaimUpdateDto input)
         {
             var user = await UserManager.GetByIdAsync(id);
             var oldClaim = new Claim(input.ClaimType, input.ClaimValue);
@@ -95,7 +95,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.Users.ManageClaims)]
-        public virtual async Task DeleteClaimAsync(Guid id, IdentityUserClaimDeleteDto input)
+        public async virtual Task DeleteClaimAsync(Guid id, IdentityUserClaimDeleteDto input)
         {
             var user = await UserManager.GetByIdAsync(id);
             user.RemoveClaim(new Claim(input.ClaimType, input.ClaimValue));
@@ -131,7 +131,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(Volo.Abp.Identity.IdentityPermissions.Users.Update)]
-        public virtual async Task ChangeTwoFactorEnabledAsync(Guid id, TwoFactorEnabledDto input)
+        public async virtual Task ChangeTwoFactorEnabledAsync(Guid id, TwoFactorEnabledDto input)
         {
             var user = await GetUserAsync(id);
 
@@ -141,7 +141,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(Volo.Abp.Identity.IdentityPermissions.Users.Update)]
-        public virtual async Task LockAsync(Guid id, int seconds)
+        public async virtual Task LockAsync(Guid id, int seconds)
         {
             var user = await GetUserAsync(id);
             //if (!UserManager.SupportsUserLockout)
@@ -155,7 +155,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(Volo.Abp.Identity.IdentityPermissions.Users.Update)]
-        public virtual async Task UnLockAsync(Guid id)
+        public async virtual Task UnLockAsync(Guid id)
         {
             var user = await GetUserAsync(id);
             (await UserManager.SetLockoutEndDateAsync(user, null)).CheckErrors();
@@ -163,7 +163,7 @@ namespace LINGYUN.Abp.Identity
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        protected virtual async Task<IdentityUser> GetUserAsync(Guid id)
+        protected async virtual Task<IdentityUser> GetUserAsync(Guid id)
         {
             await IdentityOptions.SetAsync();
             var user = await UserManager.GetByIdAsync(id);

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

@@ -36,7 +36,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.Create)]
-        public virtual async Task<OrganizationUnitDto> CreateAsync(OrganizationUnitCreateDto input)
+        public async virtual Task<OrganizationUnitDto> CreateAsync(OrganizationUnitCreateDto input)
         {
             var origanizationUnit = new OrganizationUnit(
                 GuidGenerator.Create(), input.DisplayName, input.ParentId, CurrentTenant.Id)
@@ -52,7 +52,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             var origanizationUnit = await OrganizationUnitRepository.FindAsync(id);
             if (origanizationUnit == null)
@@ -62,7 +62,7 @@ namespace LINGYUN.Abp.Identity
             await OrganizationUnitManager.DeleteAsync(id);
         }
 
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetRootAsync()
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetRootAsync()
         {
             var rootOriganizationUnits = await OrganizationUnitManager.FindChildrenAsync(null, recursive: false);
 
@@ -70,7 +70,7 @@ namespace LINGYUN.Abp.Identity
                 ObjectMapper.Map<List<OrganizationUnit>, List<OrganizationUnitDto>>(rootOriganizationUnits));
         }
 
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> FindChildrenAsync(OrganizationUnitGetChildrenDto input)
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> FindChildrenAsync(OrganizationUnitGetChildrenDto input)
         {
             var origanizationUnitChildren = await OrganizationUnitManager.FindChildrenAsync(input.Id, input.Recursive);
 
@@ -78,21 +78,21 @@ namespace LINGYUN.Abp.Identity
                 ObjectMapper.Map<List<OrganizationUnit>, List<OrganizationUnitDto>>(origanizationUnitChildren));
         }
 
-        public virtual async Task<OrganizationUnitDto> GetAsync(Guid id)
+        public async virtual Task<OrganizationUnitDto> GetAsync(Guid id)
         {
             var origanizationUnit = await OrganizationUnitRepository.FindAsync(id);
 
             return ObjectMapper.Map<OrganizationUnit, OrganizationUnitDto>(origanizationUnit);
         }
 
-        public virtual async Task<OrganizationUnitDto> GetLastChildOrNullAsync(Guid? parentId)
+        public async virtual Task<OrganizationUnitDto> GetLastChildOrNullAsync(Guid? parentId)
         {
             var origanizationUnitLastChildren = await OrganizationUnitManager.GetLastChildOrNullAsync(parentId);
 
             return ObjectMapper.Map<OrganizationUnit, OrganizationUnitDto>(origanizationUnitLastChildren);
         }
 
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetAllListAsync()
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetAllListAsync()
         {
             var origanizationUnits = await OrganizationUnitRepository.GetListAsync(false);
 
@@ -100,7 +100,7 @@ namespace LINGYUN.Abp.Identity
                 ObjectMapper.Map<List<OrganizationUnit>, List<OrganizationUnitDto>>(origanizationUnits));
         }
 
-        public virtual async Task<PagedResultDto<OrganizationUnitDto>> GetListAsync(OrganizationUnitGetByPagedDto input)
+        public async virtual Task<PagedResultDto<OrganizationUnitDto>> GetListAsync(OrganizationUnitGetByPagedDto input)
         {
             var origanizationUnitCount = await OrganizationUnitRepository.GetCountAsync();
             var origanizationUnits = await OrganizationUnitRepository
@@ -111,14 +111,14 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageRoles)]
-        public virtual async Task<ListResultDto<string>> GetRoleNamesAsync(Guid id)
+        public async virtual Task<ListResultDto<string>> GetRoleNamesAsync(Guid id)
         {
             var inOrignizationUnitRoleNames = await UserRepository.GetRoleNamesInOrganizationUnitAsync(id);
             return new ListResultDto<string>(inOrignizationUnitRoleNames);
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageRoles)]
-        public virtual async Task<PagedResultDto<IdentityRoleDto>> GetUnaddedRolesAsync(Guid id, OrganizationUnitGetUnaddedRoleByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityRoleDto>> GetUnaddedRolesAsync(Guid id, OrganizationUnitGetUnaddedRoleByPagedDto input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
 
@@ -135,7 +135,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageRoles)]
-        public virtual async Task<PagedResultDto<IdentityRoleDto>> GetRolesAsync(Guid id, PagedAndSortedResultRequestDto input)
+        public async virtual Task<PagedResultDto<IdentityRoleDto>> GetRolesAsync(Guid id, PagedAndSortedResultRequestDto input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
 
@@ -153,7 +153,7 @@ namespace LINGYUN.Abp.Identity
 
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageUsers)]
-        public virtual async Task<PagedResultDto<IdentityUserDto>> GetUnaddedUsersAsync(Guid id, OrganizationUnitGetUnaddedUserByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityUserDto>> GetUnaddedUsersAsync(Guid id, OrganizationUnitGetUnaddedUserByPagedDto input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
 
@@ -169,7 +169,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageUsers)]
-        public virtual async Task<PagedResultDto<IdentityUserDto>> GetUsersAsync(Guid id, GetIdentityUsersInput input)
+        public async virtual Task<PagedResultDto<IdentityUserDto>> GetUsersAsync(Guid id, GetIdentityUsersInput input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
 
@@ -185,13 +185,13 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.Update)]
-        public virtual async Task MoveAsync(Guid id, OrganizationUnitMoveDto input)
+        public async virtual Task MoveAsync(Guid id, OrganizationUnitMoveDto input)
         {
             await OrganizationUnitManager.MoveAsync(id, input.ParentId);
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.Update)]
-        public virtual async Task<OrganizationUnitDto> UpdateAsync(Guid id, OrganizationUnitUpdateDto input)
+        public async virtual Task<OrganizationUnitDto> UpdateAsync(Guid id, OrganizationUnitUpdateDto input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
             origanizationUnit.DisplayName = input.DisplayName;
@@ -204,7 +204,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageUsers)]
-        public virtual async Task AddUsersAsync(Guid id, OrganizationUnitAddUserDto input)
+        public async virtual Task AddUsersAsync(Guid id, OrganizationUnitAddUserDto input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
             var users = await UserRepository.GetListByIdListAsync(input.UserIds, includeDetails: true);
@@ -219,7 +219,7 @@ namespace LINGYUN.Abp.Identity
         }
 
         [Authorize(IdentityPermissions.OrganizationUnits.ManageRoles)]
-        public virtual async Task AddRolesAsync(Guid id, OrganizationUnitAddRoleDto input)
+        public async virtual Task AddRolesAsync(Guid id, OrganizationUnitAddRoleDto input)
         {
             var origanizationUnit = await OrganizationUnitRepository.GetAsync(id);
 

aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/Microsoft/AspNetCore/Identity/PhoneNumberUserValidator.cs

@@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Identity
                 : await base.ValidateAsync(manager, user);
         }
 
-        protected virtual async Task ValidatePhoneNumberAsync(UserManager<IdentityUser> manager, IdentityUser user, ICollection<IdentityError> errors)
+        protected async virtual Task ValidatePhoneNumberAsync(UserManager<IdentityUser> manager, IdentityUser user, ICollection<IdentityError> errors)
         {
             var phoneNumber = await manager.GetPhoneNumberAsync(user);
             if (phoneNumber.IsNullOrWhiteSpace())

aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/EfCoreIdentityRoleRepository.cs

@@ -19,7 +19,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
         {
         }
 
-        public virtual async Task<List<IdentityRole>> GetListByIdListAsync(
+        public async virtual Task<List<IdentityRole>> GetListByIdListAsync(
             List<Guid> roleIds,
             bool includeDetails = false,
             CancellationToken cancellationToken = default
@@ -30,7 +30,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
+        public async virtual Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
             Guid id, 
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -44,7 +44,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
             return await query.ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
+        public async virtual Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
             IEnumerable<string> roleNames,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -59,7 +59,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
             return await query.ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityRole>> GetRolesInOrganizationsListAsync(
+        public async virtual Task<List<IdentityRole>> GetRolesInOrganizationsListAsync(
             List<Guid> organizationUnitIds, 
             CancellationToken cancellationToken = default)
         {
@@ -70,7 +70,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
             return await query.ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityRole>> GetRolesInOrganizationUnitAsync(
+        public async virtual Task<List<IdentityRole>> GetRolesInOrganizationUnitAsync(
             Guid organizationUnitId, 
             CancellationToken cancellationToken = default)
         {
@@ -81,7 +81,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
             return await query.ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityRole>> GetRolesInOrganizationUnitWithChildrenAsync(
+        public async virtual Task<List<IdentityRole>> GetRolesInOrganizationUnitWithChildrenAsync(
             string code, 
             CancellationToken cancellationToken = default)
         {

aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@@ -20,7 +20,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
         {
         }
 
-        public virtual async Task<bool> IsPhoneNumberUedAsync(
+        public async virtual Task<bool> IsPhoneNumberUedAsync(
             string phoneNumber,
             CancellationToken cancellationToken = default)
         {
@@ -29,7 +29,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                     GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<bool> IsPhoneNumberConfirmedAsync(
+        public async virtual Task<bool> IsPhoneNumberConfirmedAsync(
             string phoneNumber,
             CancellationToken cancellationToken = default)
         {
@@ -38,7 +38,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                     GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<bool> IsNormalizedEmailConfirmedAsync(
+        public async virtual Task<bool> IsNormalizedEmailConfirmedAsync(
            string normalizedEmail,
            CancellationToken cancellationToken = default)
         {
@@ -47,7 +47,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                     GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<IdentityUser> FindByPhoneNumberAsync(
+        public async virtual Task<IdentityUser> FindByPhoneNumberAsync(
             string phoneNumber,
             bool isConfirmed = true,
             bool includeDetails = false,
@@ -58,7 +58,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityUser>> GetListByIdListAsync(
+        public async virtual Task<List<IdentityUser>> GetListByIdListAsync(
             List<Guid> userIds,
             bool includeDetails = false,
             CancellationToken cancellationToken = default
@@ -69,7 +69,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
+        public async virtual Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
             Guid id,
             string filter = null,
             bool includeDetails = false,
@@ -111,7 +111,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<long> GetUsersInOrganizationUnitCountAsync(
+        public async virtual Task<long> GetUsersInOrganizationUnitCountAsync(
             Guid organizationUnitId,
             string filter = null,
             CancellationToken cancellationToken = default
@@ -130,7 +130,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .LongCountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationUnitAsync(
+        public async virtual Task<List<IdentityUser>> GetUsersInOrganizationUnitAsync(
             Guid organizationUnitId,
             string filter = null,
             int skipCount = 1,
@@ -152,7 +152,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<long> GetUsersInOrganizationsListCountAsync(
+        public async virtual Task<long> GetUsersInOrganizationsListCountAsync(
             List<Guid> organizationUnitIds,
             string filter = null,
             CancellationToken cancellationToken = default
@@ -171,7 +171,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .LongCountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationsListAsync(
+        public async virtual Task<List<IdentityUser>> GetUsersInOrganizationsListAsync(
             List<Guid> organizationUnitIds,
             string filter = null,
             int skipCount = 1,
@@ -193,7 +193,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<long> GetUsersInOrganizationUnitWithChildrenCountAsync(
+        public async virtual Task<long> GetUsersInOrganizationUnitWithChildrenCountAsync(
             string code,
             string filter = null,
             CancellationToken cancellationToken = default
@@ -213,7 +213,7 @@ namespace LINGYUN.Abp.Identity.EntityFrameworkCore
                 .LongCountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<IdentityUser>> GetUsersInOrganizationUnitWithChildrenAsync(
+        public async virtual Task<List<IdentityUser>> GetUsersInOrganizationUnitWithChildrenAsync(
             string code,
             string filter = null,
             int skipCount = 1,

aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityClaimTypeController.cs

@@ -21,41 +21,41 @@ namespace LINGYUN.Abp.Identity
         }
 
         [HttpPost]
-        public virtual async Task<IdentityClaimTypeDto> CreateAsync(IdentityClaimTypeCreateDto input)
+        public async virtual Task<IdentityClaimTypeDto> CreateAsync(IdentityClaimTypeCreateDto input)
         {
             return await IdentityClaimTypeAppService.CreateAsync(input);
         }
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await IdentityClaimTypeAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("actived-list")]
-        public virtual async Task<ListResultDto<IdentityClaimTypeDto>> GetAllListAsync()
+        public async virtual Task<ListResultDto<IdentityClaimTypeDto>> GetAllListAsync()
         {
             return await IdentityClaimTypeAppService.GetAllListAsync();
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<IdentityClaimTypeDto> GetAsync(Guid id)
+        public async virtual Task<IdentityClaimTypeDto> GetAsync(Guid id)
         {
             return await IdentityClaimTypeAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<IdentityClaimTypeDto>> GetListAsync(IdentityClaimTypeGetByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityClaimTypeDto>> GetListAsync(IdentityClaimTypeGetByPagedDto input)
         {
             return await IdentityClaimTypeAppService.GetListAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual async Task<IdentityClaimTypeDto> UpdateAsync(Guid id, IdentityClaimTypeUpdateDto input)
+        public async virtual Task<IdentityClaimTypeDto> UpdateAsync(Guid id, IdentityClaimTypeUpdateDto input)
         {
             return await IdentityClaimTypeAppService.UpdateAsync(id, input);
         }

aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityRoleController.cs

@@ -25,21 +25,21 @@ namespace LINGYUN.Abp.Identity
 
         [HttpGet]
         [Route("{id}/organization-units")]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
         {
             return await RoleAppService.GetOrganizationUnitsAsync(id);
         }
 
         [HttpPut]
         [Route("{id}/organization-units")]
-        public virtual async Task SetOrganizationUnitsAsync(Guid id, IdentityRoleAddOrRemoveOrganizationUnitDto input)
+        public async virtual Task SetOrganizationUnitsAsync(Guid id, IdentityRoleAddOrRemoveOrganizationUnitDto input)
         {
             await RoleAppService.SetOrganizationUnitsAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}/organization-units/{ouId}")]
-        public virtual async Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
+        public async virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
         {
             await RoleAppService.RemoveOrganizationUnitsAsync(id, ouId);
         }
@@ -50,28 +50,28 @@ namespace LINGYUN.Abp.Identity
 
         [HttpGet]
         [Route("{id}/claims")]
-        public virtual async Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
+        public async virtual Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
         {
             return await RoleAppService.GetClaimsAsync(id);
         }
 
         [HttpPost]
         [Route("{id}/claims")]
-        public virtual async Task AddClaimAsync(Guid id, IdentityRoleClaimCreateDto input)
+        public async virtual Task AddClaimAsync(Guid id, IdentityRoleClaimCreateDto input)
         {
             await RoleAppService.AddClaimAsync(id, input);
         }
 
         [HttpPut]
         [Route("{id}/claims")]
-        public virtual async Task UpdateClaimAsync(Guid id, IdentityRoleClaimUpdateDto input)
+        public async virtual Task UpdateClaimAsync(Guid id, IdentityRoleClaimUpdateDto input)
         {
             await RoleAppService.UpdateClaimAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}/claims")]
-        public virtual async Task DeleteClaimAsync(Guid id, IdentityRoleClaimDeleteDto input)
+        public async virtual Task DeleteClaimAsync(Guid id, IdentityRoleClaimDeleteDto input)
         {
             await RoleAppService.DeleteClaimAsync(id, input);
         }

aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityUserController.cs

@@ -25,21 +25,21 @@ namespace LINGYUN.Abp.Identity
 
         [HttpGet]
         [Route("{id}/organization-units")]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetOrganizationUnitsAsync(Guid id)
         {
             return await UserAppService.GetOrganizationUnitsAsync(id);
         }
 
         [HttpPut]
         [Route("{id}/organization-units")]
-        public virtual async Task SetOrganizationUnitsAsync(Guid id, IdentityUserOrganizationUnitUpdateDto input)
+        public async virtual Task SetOrganizationUnitsAsync(Guid id, IdentityUserOrganizationUnitUpdateDto input)
         {
             await UserAppService.SetOrganizationUnitsAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}/organization-units/{ouId}")]
-        public virtual async Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
+        public async virtual Task RemoveOrganizationUnitsAsync(Guid id, Guid ouId)
         {
             await UserAppService.RemoveOrganizationUnitsAsync(id, ouId);
         }
@@ -50,28 +50,28 @@ namespace LINGYUN.Abp.Identity
 
         [HttpGet]
         [Route("{id}/claims")]
-        public virtual async Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
+        public async virtual Task<ListResultDto<IdentityClaimDto>> GetClaimsAsync(Guid id)
         {
             return await UserAppService.GetClaimsAsync(id);
         }
 
         [HttpPost]
         [Route("{id}/claims")]
-        public virtual async Task AddClaimAsync(Guid id, IdentityUserClaimCreateDto input)
+        public async virtual Task AddClaimAsync(Guid id, IdentityUserClaimCreateDto input)
         {
             await UserAppService.AddClaimAsync(id, input);
         }
 
         [HttpPut]
         [Route("{id}/claims")]
-        public virtual async Task UpdateClaimAsync(Guid id, IdentityUserClaimUpdateDto input)
+        public async virtual Task UpdateClaimAsync(Guid id, IdentityUserClaimUpdateDto input)
         {
             await UserAppService.UpdateClaimAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}/claims")]
-        public virtual async Task DeleteClaimAsync(Guid id, IdentityUserClaimDeleteDto input)
+        public async virtual Task DeleteClaimAsync(Guid id, IdentityUserClaimDeleteDto input)
         {
             await UserAppService.DeleteClaimAsync(id, input);
         }
@@ -87,21 +87,21 @@ namespace LINGYUN.Abp.Identity
 
         [HttpPut]
         [Route("change-two-factor")]
-        public virtual async Task ChangeTwoFactorEnabledAsync(Guid id, TwoFactorEnabledDto input)
+        public async virtual Task ChangeTwoFactorEnabledAsync(Guid id, TwoFactorEnabledDto input)
         {
             await UserAppService.ChangeTwoFactorEnabledAsync(id, input);
         }
 
         [HttpPut]
         [Route("{id}/lock/{seconds}")]
-        public virtual async Task LockAsync(Guid id, int seconds)
+        public async virtual Task LockAsync(Guid id, int seconds)
         {
             await UserAppService.LockAsync(id, seconds);
         }
 
         [HttpPut]
         [Route("{id}/unlock")]
-        public virtual async Task UnLockAsync(Guid id)
+        public async virtual Task UnLockAsync(Guid id)
         {
             await UserAppService.UnLockAsync(id);
         }

aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/OrganizationUnitController.cs

@@ -23,118 +23,118 @@ namespace LINGYUN.Abp.Identity
         }
 
         [HttpPost]
-        public virtual async Task<OrganizationUnitDto> CreateAsync(OrganizationUnitCreateDto input)
+        public async virtual Task<OrganizationUnitDto> CreateAsync(OrganizationUnitCreateDto input)
         {
             return await OrganizationUnitAppService.CreateAsync(input);
         }
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await OrganizationUnitAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("find-children")]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> FindChildrenAsync(OrganizationUnitGetChildrenDto input)
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> FindChildrenAsync(OrganizationUnitGetChildrenDto input)
         {
             return await OrganizationUnitAppService.FindChildrenAsync(input);
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<OrganizationUnitDto> GetAsync(Guid id)
+        public async virtual Task<OrganizationUnitDto> GetAsync(Guid id)
         {
             return await OrganizationUnitAppService.GetAsync(id);
         }
 
         [HttpGet]
         [Route("root-node")]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetRootAsync()
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetRootAsync()
         {
             return await OrganizationUnitAppService.GetRootAsync();
         }
 
         [HttpGet]
         [Route("last-children")]
-        public virtual async Task<OrganizationUnitDto> GetLastChildOrNullAsync(Guid? parentId)
+        public async virtual Task<OrganizationUnitDto> GetLastChildOrNullAsync(Guid? parentId)
         {
             return await OrganizationUnitAppService.GetLastChildOrNullAsync(parentId);
         }
 
         [HttpGet]
         [Route("all")]
-        public virtual async Task<ListResultDto<OrganizationUnitDto>> GetAllListAsync()
+        public async virtual Task<ListResultDto<OrganizationUnitDto>> GetAllListAsync()
         {
             return await OrganizationUnitAppService.GetAllListAsync();
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<OrganizationUnitDto>> GetListAsync(OrganizationUnitGetByPagedDto input)
+        public async virtual Task<PagedResultDto<OrganizationUnitDto>> GetListAsync(OrganizationUnitGetByPagedDto input)
         {
             return await OrganizationUnitAppService.GetListAsync(input);
         }
 
         [HttpGet]
         [Route("{id}/role-names")]
-        public virtual async Task<ListResultDto<string>> GetRoleNamesAsync(Guid id)
+        public async virtual Task<ListResultDto<string>> GetRoleNamesAsync(Guid id)
         {
             return await OrganizationUnitAppService.GetRoleNamesAsync(id);
         }
 
         [HttpGet]
         [Route("{id}/unadded-roles")]
-        public virtual async Task<PagedResultDto<IdentityRoleDto>> GetUnaddedRolesAsync(Guid id, OrganizationUnitGetUnaddedRoleByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityRoleDto>> GetUnaddedRolesAsync(Guid id, OrganizationUnitGetUnaddedRoleByPagedDto input)
         {
             return await OrganizationUnitAppService.GetUnaddedRolesAsync(id, input);
         }
 
         [HttpGet]
         [Route("{id}/roles")]
-        public virtual async Task<PagedResultDto<IdentityRoleDto>> GetRolesAsync(Guid id, PagedAndSortedResultRequestDto input)
+        public async virtual Task<PagedResultDto<IdentityRoleDto>> GetRolesAsync(Guid id, PagedAndSortedResultRequestDto input)
         {
             return await OrganizationUnitAppService.GetRolesAsync(id, input);
         }
 
         [HttpGet]
         [Route("{id}/unadded-users")]
-        public virtual async Task<PagedResultDto<IdentityUserDto>> GetUnaddedUsersAsync(Guid id, OrganizationUnitGetUnaddedUserByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityUserDto>> GetUnaddedUsersAsync(Guid id, OrganizationUnitGetUnaddedUserByPagedDto input)
         {
             return await OrganizationUnitAppService.GetUnaddedUsersAsync(id, input);
         }
 
         [HttpGet]
         [Route("{id}/users")]
-        public virtual async Task<PagedResultDto<IdentityUserDto>> GetUsersAsync(Guid id, GetIdentityUsersInput input)
+        public async virtual Task<PagedResultDto<IdentityUserDto>> GetUsersAsync(Guid id, GetIdentityUsersInput input)
         {
             return await OrganizationUnitAppService.GetUsersAsync(id, input);
         }
 
         [HttpPost]
         [Route("{id}/users")]
-        public virtual async Task AddUsersAsync(Guid id, OrganizationUnitAddUserDto input)
+        public async virtual Task AddUsersAsync(Guid id, OrganizationUnitAddUserDto input)
         {
             await OrganizationUnitAppService.AddUsersAsync(id, input);
         }
 
         [HttpPost]
         [Route("{id}/roles")]
-        public virtual async Task AddRolesAsync(Guid id, OrganizationUnitAddRoleDto input)
+        public async virtual Task AddRolesAsync(Guid id, OrganizationUnitAddRoleDto input)
         {
             await OrganizationUnitAppService.AddRolesAsync(id, input);
         }
 
         [HttpPut]
         [Route("{id}/move")]
-        public virtual async Task MoveAsync(Guid id, OrganizationUnitMoveDto input)
+        public async virtual Task MoveAsync(Guid id, OrganizationUnitMoveDto input)
         {
             await OrganizationUnitAppService.MoveAsync(id, input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual async Task<OrganizationUnitDto> UpdateAsync(Guid id, OrganizationUnitUpdateDto input)
+        public async virtual Task<OrganizationUnitDto> UpdateAsync(Guid id, OrganizationUnitUpdateDto input)
         {
             return await OrganizationUnitAppService.UpdateAsync(id, input);
         }

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

@@ -71,7 +71,7 @@ namespace LINGYUN.Abp.PermissionManagement.Identity
             return await base.IsGrantedAsync(permissionName, providerName, providerKey);
         }
 
-        protected virtual async Task<string[]> GetUserRolesAsync(Guid userId)
+        protected async virtual Task<string[]> GetUserRolesAsync(Guid userId)
         {
             // 通过工作单元来缓存用户角色,防止多次查询
             if (CurrentUnitOfWork != null)

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/AbpIdentityServerAppServiceBase.cs

@@ -13,7 +13,7 @@ namespace LINGYUN.Abp.IdentityServer
             LocalizationResource = typeof(AbpIdentityServerResource);
         }
 
-        protected virtual async Task<bool> IsGrantAsync(string policy)
+        protected async virtual Task<bool> IsGrantAsync(string policy)
         {
             return await PermissionChecker.IsGrantedAsync(policy);
         }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/ApiResources/ApiResourceAppService.cs

@@ -22,14 +22,14 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
             ApiResourceRepository = apiResourceRepository;
         }
 
-        public virtual async Task<ApiResourceDto> GetAsync(Guid id)
+        public async virtual Task<ApiResourceDto> GetAsync(Guid id)
         {
             var apiResource = await ApiResourceRepository.GetAsync(id);
 
             return ObjectMapper.Map<ApiResource, ApiResourceDto>(apiResource);
         }
 
-        public virtual async Task<PagedResultDto<ApiResourceDto>> GetListAsync(ApiResourceGetByPagedInputDto input)
+        public async virtual Task<PagedResultDto<ApiResourceDto>> GetListAsync(ApiResourceGetByPagedInputDto input)
         {
             var apiResources = await ApiResourceRepository.GetListAsync(input.Sorting,
                 input.SkipCount, input.MaxResultCount,
@@ -42,7 +42,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
         }
 
         [Authorize(AbpIdentityServerPermissions.ApiResources.Create)]
-        public virtual async Task<ApiResourceDto> CreateAsync(ApiResourceCreateDto input)
+        public async virtual Task<ApiResourceDto> CreateAsync(ApiResourceCreateDto input)
         {
             var apiResourceExists = await ApiResourceRepository.CheckNameExistAsync(input.Name);
             if (apiResourceExists)
@@ -65,7 +65,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
         }
 
         [Authorize(AbpIdentityServerPermissions.ApiResources.Update)]
-        public virtual async Task<ApiResourceDto> UpdateAsync(Guid id, ApiResourceUpdateDto input)
+        public async virtual Task<ApiResourceDto> UpdateAsync(Guid id, ApiResourceUpdateDto input)
         {
             var apiResource = await ApiResourceRepository.GetAsync(id);
 
@@ -79,7 +79,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
         }
 
         [Authorize(AbpIdentityServerPermissions.ApiResources.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             var apiResource = await ApiResourceRepository.GetAsync(id);
             await ApiResourceRepository.DeleteAsync(apiResource);
@@ -87,7 +87,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        protected virtual async Task UpdateApiResourceByInputAsync(ApiResource apiResource, ApiResourceCreateOrUpdateDto input)
+        protected async virtual Task UpdateApiResourceByInputAsync(ApiResource apiResource, ApiResourceCreateOrUpdateDto input)
         {
             apiResource.ShowInDiscoveryDocument = input.ShowInDiscoveryDocument;
             apiResource.Enabled = input.Enabled;

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/ApiScopes/ApiScopeAppService.cs

@@ -21,7 +21,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
         }
 
         [Authorize(AbpIdentityServerPermissions.ApiScopes.Create)]
-        public virtual async Task<ApiScopeDto> CreateAsync(ApiScopeCreateDto input)
+        public async virtual Task<ApiScopeDto> CreateAsync(ApiScopeCreateDto input)
         {
             if (await ApiScopeRepository.CheckNameExistAsync(input.Name))
             {
@@ -47,7 +47,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
         }
 
         [Authorize(AbpIdentityServerPermissions.ApiScopes.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             var apiScope = await ApiScopeRepository.GetAsync(id);
 
@@ -56,14 +56,14 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        public virtual async Task<ApiScopeDto> GetAsync(Guid id)
+        public async virtual Task<ApiScopeDto> GetAsync(Guid id)
         {
             var apiScope = await ApiScopeRepository.GetAsync(id);
 
             return ObjectMapper.Map<ApiScope, ApiScopeDto>(apiScope);
         }
 
-        public virtual async Task<PagedResultDto<ApiScopeDto>> GetListAsync(GetApiScopeInput input)
+        public async virtual Task<PagedResultDto<ApiScopeDto>> GetListAsync(GetApiScopeInput input)
         {
             var totalCount = await ApiScopeRepository
                 .GetCountAsync(input.Filter);
@@ -79,7 +79,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
         }
 
         [Authorize(AbpIdentityServerPermissions.ApiScopes.Update)]
-        public virtual async Task<ApiScopeDto> UpdateAsync(Guid id, ApiScopeUpdateDto input)
+        public async virtual Task<ApiScopeDto> UpdateAsync(Guid id, ApiScopeUpdateDto input)
         {
             var apiScope = await ApiScopeRepository.GetAsync(id);
 
@@ -91,7 +91,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
             return ObjectMapper.Map<ApiScope, ApiScopeDto>(apiScope);
         }
 
-        protected virtual async Task UpdateApiScopeByInputAsync(ApiScope apiScope, ApiScopeCreateOrUpdateDto input)
+        protected async virtual Task UpdateApiScopeByInputAsync(ApiScope apiScope, ApiScopeCreateOrUpdateDto input)
         {
             if (!string.Equals(apiScope.Description, input.Description, StringComparison.InvariantCultureIgnoreCase))
             {

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/Clients/ClientAppService.cs

@@ -32,7 +32,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         }
 
         [Authorize(AbpIdentityServerPermissions.Clients.Create)]
-        public virtual async Task<ClientDto> CreateAsync(ClientCreateDto clientCreate)
+        public async virtual Task<ClientDto> CreateAsync(ClientCreateDto clientCreate)
         {
             var clientIdExists = await ClientRepository.CheckClientIdExistAsync(clientCreate.ClientId);
             if(clientIdExists)
@@ -57,7 +57,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         }
 
         [Authorize(AbpIdentityServerPermissions.Clients.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             var client = await ClientRepository.GetAsync(id);
             await ClientRepository.DeleteAsync(client);
@@ -65,14 +65,14 @@ namespace LINGYUN.Abp.IdentityServer.Clients
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        public virtual async Task<ClientDto> GetAsync(Guid id)
+        public async virtual Task<ClientDto> GetAsync(Guid id)
         {
             var client = await ClientRepository.GetAsync(id);
 
             return ObjectMapper.Map<Client, ClientDto>(client);
         }
 
-        public virtual async Task<PagedResultDto<ClientDto>> GetListAsync(ClientGetByPagedDto input)
+        public async virtual Task<PagedResultDto<ClientDto>> GetListAsync(ClientGetByPagedDto input)
         {
             var clients = await ClientRepository.GetListAsync(input.Sorting,
                 input.SkipCount, input.MaxResultCount,
@@ -85,7 +85,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         }
 
         [Authorize(AbpIdentityServerPermissions.Clients.Update)]
-        public virtual async Task<ClientDto> UpdateAsync(Guid id, ClientUpdateDto input)
+        public async virtual Task<ClientDto> UpdateAsync(Guid id, ClientUpdateDto input)
         {
             var client = await ClientRepository.GetAsync(id);
 
@@ -333,7 +333,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         /// <param name="input"></param>
         /// <returns></returns>
         [Authorize(AbpIdentityServerPermissions.Clients.Clone)]
-        public virtual async Task<ClientDto> CloneAsync(Guid id, ClientCloneDto input)
+        public async virtual Task<ClientDto> CloneAsync(Guid id, ClientCloneDto input)
         {
             var clientIdExists = await ClientRepository.CheckClientIdExistAsync(input.ClientId);
             if (clientIdExists)
@@ -458,7 +458,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         /// 查询可用的Api资源
         /// </summary>
         /// <returns></returns>
-        public virtual async Task<ListResultDto<string>> GetAssignableApiResourcesAsync()
+        public async virtual Task<ListResultDto<string>> GetAssignableApiResourcesAsync()
         {
             var resourceNames = await ApiResourceRepository.GetNamesAsync();
 
@@ -468,7 +468,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         /// 查询可用的身份资源
         /// </summary>
         /// <returns></returns>
-        public virtual async Task<ListResultDto<string>> GetAssignableIdentityResourcesAsync()
+        public async virtual Task<ListResultDto<string>> GetAssignableIdentityResourcesAsync()
         {
             var resourceNames = await IdentityResourceRepository.GetNamesAsync();
 
@@ -478,7 +478,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         /// 查询所有不重复的跨域地址
         /// </summary>
         /// <returns></returns>
-        public virtual async Task<ListResultDto<string>> GetAllDistinctAllowedCorsOriginsAsync()
+        public async virtual Task<ListResultDto<string>> GetAllDistinctAllowedCorsOriginsAsync()
         {
             var corsOrigins = await ClientRepository.GetAllDistinctAllowedCorsOriginsAsync();
 

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/Grants/PersistedGrantAppService.cs

@@ -19,7 +19,7 @@ namespace LINGYUN.Abp.IdentityServer.Grants
         }
 
         [Authorize(AbpIdentityServerPermissions.Grants.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             var persistedGrant = await PersistentGrantRepository.GetAsync(id);
 
@@ -27,14 +27,14 @@ namespace LINGYUN.Abp.IdentityServer.Grants
             await CurrentUnitOfWork.SaveChangesAsync();
         }
 
-        public virtual async Task<PersistedGrantDto> GetAsync(Guid id)
+        public async virtual Task<PersistedGrantDto> GetAsync(Guid id)
         {
             var persistedGrant = await PersistentGrantRepository.GetAsync(id);
 
             return ObjectMapper.Map<PersistedGrant, PersistedGrantDto>(persistedGrant);
         }
 
-        public virtual async Task<PagedResultDto<PersistedGrantDto>> GetListAsync(GetPersistedGrantInput input)
+        public async virtual Task<PagedResultDto<PersistedGrantDto>> GetListAsync(GetPersistedGrantInput input)
         {
             var persistenGrantCount = await PersistentGrantRepository
                 .GetCountAsync(

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN/Abp/IdentityServer/IdentityResources/IdentityResourceAppService.cs

@@ -20,14 +20,14 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
             IdentityResourceRepository = identityResourceRepository;
         }
 
-        public virtual async Task<IdentityResourceDto> GetAsync(Guid id)
+        public async virtual Task<IdentityResourceDto> GetAsync(Guid id)
         {
             var identityResource = await IdentityResourceRepository.GetAsync(id);
 
             return ObjectMapper.Map<IdentityResource, IdentityResourceDto>(identityResource);
         }
 
-        public virtual async Task<PagedResultDto<IdentityResourceDto>> GetListAsync(IdentityResourceGetByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityResourceDto>> GetListAsync(IdentityResourceGetByPagedDto input)
         {
             var identityResources = await IdentityResourceRepository.GetListAsync(input.Sorting,
                 input.SkipCount, input.MaxResultCount,
@@ -39,7 +39,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
         }
 
         [Authorize(AbpIdentityServerPermissions.IdentityResources.Create)]
-        public virtual async Task<IdentityResourceDto> CreateAsync(IdentityResourceCreateOrUpdateDto input)
+        public async virtual Task<IdentityResourceDto> CreateAsync(IdentityResourceCreateOrUpdateDto input)
         {
             var identityResourceExists = await IdentityResourceRepository.CheckNameExistAsync(input.Name);
             if (identityResourceExists)
@@ -59,7 +59,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
         }
 
         [Authorize(AbpIdentityServerPermissions.IdentityResources.Update)]
-        public virtual async Task<IdentityResourceDto> UpdateAsync(Guid id, IdentityResourceCreateOrUpdateDto input)
+        public async virtual Task<IdentityResourceDto> UpdateAsync(Guid id, IdentityResourceCreateOrUpdateDto input)
         {
             var identityResource = await IdentityResourceRepository.GetAsync(id);
             await UpdateApiResourceByInputAsync(identityResource, input);
@@ -71,12 +71,12 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
         }
 
         [Authorize(AbpIdentityServerPermissions.IdentityResources.Delete)]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await IdentityResourceRepository.DeleteAsync(id);
         }
 
-        protected virtual async Task UpdateApiResourceByInputAsync(IdentityResource identityResource, IdentityResourceCreateOrUpdateDto input)
+        protected async virtual Task UpdateApiResourceByInputAsync(IdentityResource identityResource, IdentityResourceCreateOrUpdateDto input)
         {
             if (!string.Equals(identityResource.Name, input.Name, StringComparison.InvariantCultureIgnoreCase))
             {

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN/Abp/IdentityServer/IdentityResources/CustomIdentityResourceDataSeeder.cs

@@ -26,7 +26,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
             Options = options.Value;
         }
 
-        public virtual async Task CreateCustomResourcesAsync()
+        public async virtual Task CreateCustomResourcesAsync()
         {
             foreach (var resource in Options.Resources)
             {
@@ -39,7 +39,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
             }
         }
 
-        protected virtual async Task AddIdentityResourceIfNotExistsAsync(IdentityServer4.Models.IdentityResource resource)
+        protected async virtual Task AddIdentityResourceIfNotExistsAsync(IdentityServer4.Models.IdentityResource resource)
         {
             if (await IdentityResourceRepository.CheckNameExistAsync(resource.Name))
             {
@@ -54,7 +54,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
             );
         }
 
-        protected virtual async Task AddClaimTypeIfNotExistsAsync(string claimType)
+        protected async virtual Task AddClaimTypeIfNotExistsAsync(string claimType)
         {
             if (await ClaimTypeRepository.AnyAsync(claimType))
             {

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/ApiResources/EfCoreApiResourceRepository.cs

@@ -24,7 +24,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
         {
         }
 
-        public virtual async Task<List<string>> GetNamesAsync(CancellationToken cancellationToken = default)
+        public async virtual Task<List<string>> GetNamesAsync(CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync())
                 .Select(x => x.Name)

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/Grants/EfCorePersistentGrantRepository.cs

@@ -25,7 +25,7 @@ namespace LINGYUN.Abp.IdentityServer.Grants
         {
         }
 
-        public virtual async Task<long> GetCountAsync(string subjectId = null, string filter = null, CancellationToken cancellation = default)
+        public async virtual Task<long> GetCountAsync(string subjectId = null, string filter = null, CancellationToken cancellation = default)
         {
             return await (await GetDbSetAsync())
                 .WhereIf(!subjectId.IsNullOrWhiteSpace(), x => x.SubjectId.Equals(subjectId))
@@ -34,7 +34,7 @@ namespace LINGYUN.Abp.IdentityServer.Grants
                 .LongCountAsync(GetCancellationToken(cancellation));
         }
 
-        public virtual async Task<List<PersistedGrant>> GetListAsync(string subjectId = null, string filter = null, string sorting = "CreationTime", int skipCount = 1, int maxResultCount = 10, CancellationToken cancellation = default)
+        public async virtual Task<List<PersistedGrant>> GetListAsync(string subjectId = null, string filter = null, string sorting = "CreationTime", int skipCount = 1, int maxResultCount = 10, CancellationToken cancellation = default)
         {
             return await (await GetDbSetAsync())
                 .WhereIf(!subjectId.IsNullOrWhiteSpace(), x => x.SubjectId.Equals(subjectId))

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN/Abp/IdentityServer/IdentityResources/EfCoreIdentityResourceRepository.cs

@@ -24,7 +24,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
         {
         }
 
-        public virtual async Task<List<string>> GetNamesAsync(CancellationToken cancellationToken = default)
+        public async virtual Task<List<string>> GetNamesAsync(CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync())
                    .Select(x => x.Name)

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/ApiResources/ApiResourceController.cs

@@ -21,33 +21,33 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<ApiResourceDto> GetAsync(Guid id)
+        public async virtual Task<ApiResourceDto> GetAsync(Guid id)
         {
             return await ApiResourceAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<ApiResourceDto>> GetListAsync(ApiResourceGetByPagedInputDto input)
+        public async virtual Task<PagedResultDto<ApiResourceDto>> GetListAsync(ApiResourceGetByPagedInputDto input)
         {
             return await ApiResourceAppService.GetListAsync(input);
         }
 
         [HttpPost]
-        public virtual async Task<ApiResourceDto> CreateAsync(ApiResourceCreateDto input)
+        public async virtual Task<ApiResourceDto> CreateAsync(ApiResourceCreateDto input)
         {
             return await ApiResourceAppService.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual async Task<ApiResourceDto> UpdateAsync(Guid id, ApiResourceUpdateDto input)
+        public async virtual Task<ApiResourceDto> UpdateAsync(Guid id, ApiResourceUpdateDto input)
         {
             return await ApiResourceAppService.UpdateAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await ApiResourceAppService.DeleteAsync(id);
         }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/ApiScopes/ApiScopeController.cs

@@ -21,34 +21,34 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
         }
 
         [HttpPost]
-        public virtual async Task<ApiScopeDto> CreateAsync(ApiScopeCreateDto input)
+        public async virtual Task<ApiScopeDto> CreateAsync(ApiScopeCreateDto input)
         {
             return await ApiScopeAppService.CreateAsync(input);
         }
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await ApiScopeAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<ApiScopeDto> GetAsync(Guid id)
+        public async virtual Task<ApiScopeDto> GetAsync(Guid id)
         {
             return await ApiScopeAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<ApiScopeDto>> GetListAsync(GetApiScopeInput input)
+        public async virtual Task<PagedResultDto<ApiScopeDto>> GetListAsync(GetApiScopeInput input)
         {
             return await ApiScopeAppService.GetListAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual async Task<ApiScopeDto> UpdateAsync(Guid id, ApiScopeUpdateDto input)
+        public async virtual Task<ApiScopeDto> UpdateAsync(Guid id, ApiScopeUpdateDto input)
         {
             return await ApiScopeAppService.UpdateAsync(id, input);
         }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/Clients/ClientController.cs

@@ -19,62 +19,62 @@ namespace LINGYUN.Abp.IdentityServer.Clients
         }
 
         [HttpPost]
-        public virtual async Task<ClientDto> CreateAsync(ClientCreateDto input)
+        public async virtual Task<ClientDto> CreateAsync(ClientCreateDto input)
         {
             return await ClientAppService.CreateAsync(input);
         }
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await ClientAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<ClientDto> GetAsync(Guid id)
+        public async virtual Task<ClientDto> GetAsync(Guid id)
         {
             return await ClientAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<ClientDto>> GetListAsync(ClientGetByPagedDto input)
+        public async virtual Task<PagedResultDto<ClientDto>> GetListAsync(ClientGetByPagedDto input)
         {
             return await ClientAppService.GetListAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual async Task<ClientDto> UpdateAsync(Guid id, ClientUpdateDto input)
+        public async virtual Task<ClientDto> UpdateAsync(Guid id, ClientUpdateDto input)
         {
             return await ClientAppService.UpdateAsync(id, input);
         }
 
         [HttpPost]
         [Route("{id}/clone")]
-        public virtual async Task<ClientDto> CloneAsync(Guid id, ClientCloneDto input)
+        public async virtual Task<ClientDto> CloneAsync(Guid id, ClientCloneDto input)
         {
             return await ClientAppService.CloneAsync(id, input);
         }
 
         [HttpGet]
         [Route("assignable-api-resources")]
-        public virtual async Task<ListResultDto<string>> GetAssignableApiResourcesAsync()
+        public async virtual Task<ListResultDto<string>> GetAssignableApiResourcesAsync()
         {
             return await ClientAppService.GetAssignableApiResourcesAsync();
         }
 
         [HttpGet]
         [Route("assignable-identity-resources")]
-        public virtual async Task<ListResultDto<string>> GetAssignableIdentityResourcesAsync()
+        public async virtual Task<ListResultDto<string>> GetAssignableIdentityResourcesAsync()
         {
             return await ClientAppService.GetAssignableIdentityResourcesAsync();
         }
 
         [HttpGet]
         [Route("distinct-cors-origins")]
-        public virtual async Task<ListResultDto<string>> GetAllDistinctAllowedCorsOriginsAsync()
+        public async virtual Task<ListResultDto<string>> GetAllDistinctAllowedCorsOriginsAsync()
         {
             return await ClientAppService.GetAllDistinctAllowedCorsOriginsAsync();
         }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/Grants/PersistedGrantController.cs

@@ -22,20 +22,20 @@ namespace LINGYUN.Abp.IdentityServer.Grants
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await PersistedGrantAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<PersistedGrantDto> GetAsync(Guid id)
+        public async virtual Task<PersistedGrantDto> GetAsync(Guid id)
         {
             return await PersistedGrantAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<PersistedGrantDto>> GetListAsync(GetPersistedGrantInput input)
+        public async virtual Task<PagedResultDto<PersistedGrantDto>> GetListAsync(GetPersistedGrantInput input)
         {
             return await PersistedGrantAppService.GetListAsync(input);
         }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/IdentityResources/IdentityResourceController.cs

@@ -21,33 +21,33 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
 
         [HttpGet]
         [Route("{id}")]
-        public virtual async Task<IdentityResourceDto> GetAsync(Guid id)
+        public async virtual Task<IdentityResourceDto> GetAsync(Guid id)
         {
             return await IdentityResourceAppService.GetAsync(id);
         }
 
         [HttpGet]
-        public virtual async Task<PagedResultDto<IdentityResourceDto>> GetListAsync(IdentityResourceGetByPagedDto input)
+        public async virtual Task<PagedResultDto<IdentityResourceDto>> GetListAsync(IdentityResourceGetByPagedDto input)
         {
             return await IdentityResourceAppService.GetListAsync(input);
         }
 
         [HttpPost]
-        public virtual async Task<IdentityResourceDto> CreateAsync(IdentityResourceCreateOrUpdateDto input)
+        public async virtual Task<IdentityResourceDto> CreateAsync(IdentityResourceCreateOrUpdateDto input)
         {
             return await IdentityResourceAppService.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual async Task<IdentityResourceDto> UpdateAsync(Guid id, IdentityResourceCreateOrUpdateDto input)
+        public async virtual Task<IdentityResourceDto> UpdateAsync(Guid id, IdentityResourceCreateOrUpdateDto input)
         {
             return await IdentityResourceAppService.UpdateAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}")]
-        public virtual async Task DeleteAsync(Guid id)
+        public async virtual Task DeleteAsync(Guid id)
         {
             await IdentityResourceAppService.DeleteAsync(id);
         }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.LinkUser/LINGYUN/Abp/IdentityServer/LinkUser/LinkUserGrantValidator.cs

@@ -53,7 +53,7 @@ public class LinkUserGrantValidator : IExtensionGrantValidator
     }
 
     [UnitOfWork]
-    public virtual async Task ValidateAsync(ExtensionGrantValidationContext context)
+    public async virtual Task ValidateAsync(ExtensionGrantValidationContext context)
     {
         var accessToken = context.Request.Raw["access_token"];
         if (accessToken.IsNullOrWhiteSpace())

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/SmsValidator/SmsTokenGrantValidator.cs

@@ -10,15 +10,15 @@ using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Volo.Abp.Identity;
+using Volo.Abp.Identity;
-using Volo.Abp.IdentityServer;
+using Volo.Abp.IdentityServer;
 using Volo.Abp.IdentityServer.Localization;
 using Volo.Abp.Security.Claims;
 using Volo.Abp.Uow;
 using IdentityResource = Volo.Abp.Identity.Localization.IdentityResource;
 using IdentityUser = Volo.Abp.Identity.IdentityUser;
-using IIdentityUserRepository = LINGYUN.Abp.Identity.IIdentityUserRepository;
+using IIdentityUserRepository = LINGYUN.Abp.Identity.IIdentityUserRepository;
-
+
 namespace LINGYUN.Abp.IdentityServer.SmsValidator
 {
     public class SmsTokenGrantValidator : IExtensionGrantValidator
@@ -120,66 +120,66 @@ namespace LINGYUN.Abp.IdentityServer.SmsValidator
             await SetSuccessResultAsync(context, currentUser);
         }
 
-        protected virtual async Task SetSuccessResultAsync(ExtensionGrantValidationContext context, IdentityUser user)
+        protected async virtual Task SetSuccessResultAsync(ExtensionGrantValidationContext context, IdentityUser user)
-        {
+        {
-            var sub = await UserManager.GetUserIdAsync(user);
+            var sub = await UserManager.GetUserIdAsync(user);
-
+
-            Logger.LogInformation("Credentials validated for username: {username}", user.UserName);
+            Logger.LogInformation("Credentials validated for username: {username}", user.UserName);
-
+
-            var additionalClaims = new List<Claim>();
+            var additionalClaims = new List<Claim>();
-
+
-            await AddCustomClaimsAsync(additionalClaims, user, context);
+            await AddCustomClaimsAsync(additionalClaims, user, context);
-
+
-            context.Result = new GrantValidationResult(
+            context.Result = new GrantValidationResult(
-                sub,
+                sub,
-                OidcConstants.AuthenticationMethods.ConfirmationBySms,
+                OidcConstants.AuthenticationMethods.ConfirmationBySms,
-                additionalClaims.ToArray()
+                additionalClaims.ToArray()
-            );
+            );
-
+
-            await SaveSecurityLogAsync(
+            await SaveSecurityLogAsync(
-                context,
+                context,
-                user,
+                user,
-                IdentityServerSecurityLogActionConsts.LoginSucceeded);
+                IdentityServerSecurityLogActionConsts.LoginSucceeded);
-        }
+        }
-
+
-        protected virtual async Task SaveSecurityLogAsync(
+        protected async virtual Task SaveSecurityLogAsync(
-            ExtensionGrantValidationContext context,
+            ExtensionGrantValidationContext context,
-            IdentityUser user,
+            IdentityUser user,
-            string action)
+            string action)
-        {
+        {
-            var logContext = new IdentitySecurityLogContext
+            var logContext = new IdentitySecurityLogContext
-            {
+            {
-                Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
+                Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
-                Action = action,
+                Action = action,
-                UserName = user.UserName,
+                UserName = user.UserName,
-                ClientId = await FindClientIdAsync(context)
+                ClientId = await FindClientIdAsync(context)
-            };
+            };
-            logContext.WithProperty("GrantType", GrantType);
+            logContext.WithProperty("GrantType", GrantType);
-
+
-            await IdentitySecurityLogManager.SaveAsync(logContext);
+            await IdentitySecurityLogManager.SaveAsync(logContext);
-        }
+        }
-
+
-        protected virtual Task<string> FindClientIdAsync(ExtensionGrantValidationContext context)
+        protected virtual Task<string> FindClientIdAsync(ExtensionGrantValidationContext context)
-        {
+        {
-            return Task.FromResult(context.Request?.Client?.ClientId);
+            return Task.FromResult(context.Request?.Client?.ClientId);
-        }
+        }
-
+
-        protected virtual Task AddCustomClaimsAsync(
+        protected virtual Task AddCustomClaimsAsync(
-            List<Claim> customClaims,
+            List<Claim> customClaims,
-            IdentityUser user,
+            IdentityUser user,
-            ExtensionGrantValidationContext context)
+            ExtensionGrantValidationContext context)
-        {
+        {
-            if (user.TenantId.HasValue)
+            if (user.TenantId.HasValue)
-            {
+            {
-                customClaims.Add(
+                customClaims.Add(
-                    new Claim(
+                    new Claim(
-                        AbpClaimTypes.TenantId,
+                        AbpClaimTypes.TenantId,
-                        user.TenantId?.ToString()
+                        user.TenantId?.ToString()
-                    )
+                    )
-                );
+                );
-            }
+            }
-
+
-            return Task.CompletedTask;
+            return Task.CompletedTask;
         }
     }
 }

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat/LINGYUN/Abp/IdentityServer/WeChat/WeChatGrantValidator.cs

@@ -159,7 +159,7 @@ namespace LINGYUN.Abp.IdentityServer.WeChat
             return Task.FromResult(true);
         }
 
-        protected virtual async Task SetSuccessResultAsync(ExtensionGrantValidationContext context, IdentityUser user, WeChatOpenId wechatOpenId)
+        protected async virtual Task SetSuccessResultAsync(ExtensionGrantValidationContext context, IdentityUser user, WeChatOpenId wechatOpenId)
         {
             var sub = await UserManager.GetUserIdAsync(user);
 
@@ -182,7 +182,7 @@ namespace LINGYUN.Abp.IdentityServer.WeChat
                 IdentityServerSecurityLogActionConsts.LoginSucceeded);
         }
 
-        protected virtual async Task SaveSecurityLogAsync(
+        protected async virtual Task SaveSecurityLogAsync(
             ExtensionGrantValidationContext context,
             IdentityUser user,
             WeChatOpenId wechatOpenId,

aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat/LINGYUN/Abp/IdentityServer/WeChat/WeChatResourceDataSeeder.cs

@@ -24,7 +24,7 @@ namespace LINGYUN.Abp.IdentityServer
             ClaimTypeRepository = claimTypeRepository;
         }
 
-        public virtual async Task CreateStandardResourcesAsync()
+        public async virtual Task CreateStandardResourcesAsync()
         {
             var wechatClaimTypes = new string[]
             {
@@ -52,7 +52,7 @@ namespace LINGYUN.Abp.IdentityServer
             await AddIdentityResourceIfNotExistsAsync(wechatResource);
         }
 
-        protected virtual async Task AddIdentityResourceIfNotExistsAsync(IdentityServer4.Models.IdentityResource resource)
+        protected async virtual Task AddIdentityResourceIfNotExistsAsync(IdentityServer4.Models.IdentityResource resource)
         {
             if (await IdentityResourceRepository.CheckNameExistAsync(resource.Name))
             {
@@ -67,7 +67,7 @@ namespace LINGYUN.Abp.IdentityServer
             );
         }
 
-        protected virtual async Task AddClaimTypeIfNotExistsAsync(string claimType)
+        protected async virtual Task AddClaimTypeIfNotExistsAsync(string claimType)
         {
             if (await ClaimTypeRepository.AnyAsync(claimType))
             {

aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageAppService.cs

@@ -16,7 +16,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
             _languageProvider = languageProvider;
         }
 
-        public virtual async Task<ListResultDto<LanguageDto>> GetListAsync()
+        public async virtual Task<ListResultDto<LanguageDto>> GetListAsync()
         {
             var languages = await _languageProvider.GetLanguagesAsync();
 

aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs

@@ -49,7 +49,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
         /// <param name="id">时间类型或者转换为timestamp都可以查询</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public virtual async Task<LogInfo> GetAsync(
+        public async virtual Task<LogInfo> GetAsync(
             string id,
             CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -126,7 +126,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
             return _objectMapper.Map<SerilogInfo, LogInfo>(response.Documents.FirstOrDefault());
         }
 
-        public virtual async Task<long> GetCountAsync(
+        public async virtual Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             Microsoft.Extensions.Logging.LogLevel? level = null,
@@ -189,7 +189,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
         /// <param name="includeDetails"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public virtual async Task<List<LogInfo>> GetListAsync(
+        public async virtual Task<List<LogInfo>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,

aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN/Abp/LocalizationManagement/LocalizationSynchronizer.cs

@@ -21,17 +21,17 @@ namespace LINGYUN.Abp.LocalizationManagement
             _eventBus = eventBus;
         }
         
-        public virtual async Task HandleEventAsync(EntityCreatedEventData<Text> eventData)
+        public async virtual Task HandleEventAsync(EntityCreatedEventData<Text> eventData)
         {
             await HandleEventAsync(BuildResetEventData(eventData.Entity));
         }
 
-        public virtual async Task HandleEventAsync(EntityUpdatedEventData<Text> eventData)
+        public async virtual Task HandleEventAsync(EntityUpdatedEventData<Text> eventData)
         {
             await HandleEventAsync(BuildResetEventData(eventData.Entity));
         }
 
-        public virtual async Task HandleEventAsync(EntityDeletedEventData<Text> eventData)
+        public async virtual Task HandleEventAsync(EntityDeletedEventData<Text> eventData)
         {
             var data = BuildResetEventData(eventData.Entity);
             data.IsDeleted = true;

aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN/Abp/LocalizationManagement/EntityFrameworkCore/EfCoreLanguageRepository.cs

@@ -17,7 +17,7 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
         {
         }
 
-        public virtual async Task<Language> FindByCultureNameAsync(
+        public async virtual Task<Language> FindByCultureNameAsync(
             string cultureName,
             CancellationToken cancellationToken = default)
         {
@@ -25,7 +25,7 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<Language>> GetActivedListAsync(CancellationToken cancellationToken = default)
+        public async virtual Task<List<Language>> GetActivedListAsync(CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync()).Where(x => x.Enable)
                 .ToListAsync(GetCancellationToken(cancellationToken));

aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN/Abp/LocalizationManagement/EntityFrameworkCore/EfCoreResourceRepository.cs

@@ -16,14 +16,14 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
         {
         }
 
-        public virtual async Task<bool> ExistsAsync(
+        public async virtual Task<bool> ExistsAsync(
             string name, 
             CancellationToken cancellationToken = default)
         {
             return await (await GetDbSetAsync()).AnyAsync(x => x.Name.Equals(name));
         }
 
-        public virtual async Task<Resource> FindByNameAsync(
+        public async virtual Task<Resource> FindByNameAsync(
             string name, 
             CancellationToken cancellationToken = default)
         {

aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN/Abp/LocalizationManagement/EntityFrameworkCore/EfCoreTextRepository.cs

@@ -18,7 +18,7 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
         {
         }
 
-        public virtual async Task<Text> GetByCultureKeyAsync(
+        public async virtual Task<Text> GetByCultureKeyAsync(
             string resourceName,
             string cultureName,
             string key,
@@ -30,7 +30,7 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<int> GetDifferenceCountAsync(
+        public async virtual Task<int> GetDifferenceCountAsync(
             string cultureName,
             string targetCultureName,
             string resourceName = null,
@@ -47,16 +47,16 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
                 .CountAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<Text>> GetListAsync(
+        public async virtual Task<List<Text>> GetListAsync(
-            string resourceName = null,
+            string resourceName = null,
             string cultureName = null,
             CancellationToken cancellationToken = default)
         {
             //var languages = (await GetDbContextAsync()).Set<Language>();
             //var resources = (IQueryable<Resource>)(await GetDbContextAsync()).Set<Resource>();
-            //if (!resourceName.IsNullOrWhiteSpace())
+            //if (!resourceName.IsNullOrWhiteSpace())
-            //{
+            //{
-            //    resources = resources.Where(x => x.Name.Equals(resourceName));
+            //    resources = resources.Where(x => x.Name.Equals(resourceName));
             //}
 
             //var texts = await GetDbSetAsync();
@@ -76,7 +76,7 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public virtual async Task<List<TextDifference>> GetDifferencePagedListAsync(
+        public async virtual Task<List<TextDifference>> GetDifferencePagedListAsync(
             string cultureName,
             string targetCultureName,
             string resourceName = null,
@@ -98,7 +98,7 @@ namespace LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        protected virtual async Task<IQueryable<TextDifference>> BuildTextDifferenceQueryAsync(
+        protected async virtual Task<IQueryable<TextDifference>> BuildTextDifferenceQueryAsync(
             string cultureName,
             string targetCultureName,
             string resourceName = null,