diff --git a/aspnet-core/LINGYUN.MicroService.All.slnx b/aspnet-core/LINGYUN.MicroService.All.slnx index 60c1adda7..add8c3936 100644 --- a/aspnet-core/LINGYUN.MicroService.All.slnx +++ b/aspnet-core/LINGYUN.MicroService.All.slnx @@ -99,10 +99,6 @@ - - - - diff --git a/aspnet-core/LINGYUN.MicroService.Aspire.slnx b/aspnet-core/LINGYUN.MicroService.Aspire.slnx index 809d5d087..374089f9c 100644 --- a/aspnet-core/LINGYUN.MicroService.Aspire.slnx +++ b/aspnet-core/LINGYUN.MicroService.Aspire.slnx @@ -84,10 +84,6 @@ - - - - diff --git a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/System/Text/Json/JsonElementExtensions.cs b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/System/Text/Json/JsonElementExtensions.cs index 615562f2e..a6e443270 100644 --- a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/System/Text/Json/JsonElementExtensions.cs +++ b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/System/Text/Json/JsonElementExtensions.cs @@ -13,11 +13,11 @@ internal static class JsonElementExtensions { var result = new List(); - if (json.TryGetProperty(key, out JsonElement property) && property.ValueKind == JsonValueKind.Array) + if (json.TryGetProperty(key, out var property) && property.ValueKind == JsonValueKind.Array) { foreach (var jsonProp in property.EnumerateArray()) { - result.Add(jsonProp.GetString()); + result.Add(jsonProp.GetString()!); } } @@ -26,18 +26,18 @@ internal static class JsonElementExtensions public static string GetRootString(this JsonDocument json, string key, string defaultValue = "") { - if (json.RootElement.TryGetProperty(key, out JsonElement property)) + if (json.RootElement.TryGetProperty(key, out var property)) { - return property.GetString(); + return property.GetString()!; } return defaultValue; } public static string GetString(this JsonElement json, string key, string defaultValue = "") { - if (json.TryGetProperty(key, out JsonElement property)) + if (json.TryGetProperty(key, out var property)) { - return property.GetString(); + return property.GetString()!; } return defaultValue; } diff --git a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/System/Text/Json/JsonElementExtensions.cs b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/System/Text/Json/JsonElementExtensions.cs index 653a868ac..9efe5cb2a 100644 --- a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/System/Text/Json/JsonElementExtensions.cs +++ b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/System/Text/Json/JsonElementExtensions.cs @@ -13,11 +13,11 @@ namespace System.Text.Json { var result = new List(); - if (json.TryGetProperty(key, out JsonElement property) && property.ValueKind == JsonValueKind.Array) + if (json.TryGetProperty(key, out var property) && property.ValueKind == JsonValueKind.Array) { foreach (var jsonProp in property.EnumerateArray()) { - result.Add(jsonProp.GetString()); + result.Add(jsonProp.GetString()!); } } @@ -26,25 +26,25 @@ namespace System.Text.Json public static string GetRootString(this JsonDocument json, string key, string defaultValue = "") { - if (json.RootElement.TryGetProperty(key, out JsonElement property)) + if (json.RootElement.TryGetProperty(key, out var property)) { - return property.GetString(); + return property.GetString() ?? defaultValue; } return defaultValue; } public static string GetString(this JsonElement json, string key, string defaultValue = "") { - if (json.TryGetProperty(key, out JsonElement property)) + if (json.TryGetProperty(key, out var property)) { - return property.GetString(); + return property.GetString() ?? defaultValue; } return defaultValue; } public static int GetRootInt32(this JsonDocument json, string key, int defaultValue = 0) { - if (json.RootElement.TryGetProperty(key, out JsonElement property) && property.TryGetInt32(out int value)) + if (json.RootElement.TryGetProperty(key, out var property) && property.TryGetInt32(out var value)) { return value; } @@ -53,7 +53,7 @@ namespace System.Text.Json public static int GetInt32(this JsonElement json, string key, int defaultValue = 0) { - if (json.TryGetProperty(key, out JsonElement property) && property.TryGetInt32(out int value)) + if (json.TryGetProperty(key, out var property) && property.TryGetInt32(out var value)) { return value; } diff --git a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs index 12fadff37..6a48eefe9 100644 --- a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs +++ b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs @@ -40,7 +40,7 @@ public class AliyunSettingAppService : ApplicationService, IAliyunSettingAppServ return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null); } - protected async virtual Task GetAllForProviderAsync(string providerName, string providerKey) + protected async virtual Task GetAllForProviderAsync(string providerName, string? providerKey = null) { var settingGroups = new SettingGroupResult(); @@ -59,7 +59,7 @@ public class AliyunSettingAppService : ApplicationService, IAliyunSettingAppServ await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RegionId, providerName, providerKey), ValueType.Option, providerName) - .AddOptions(GetAvailableRegionOptions()); + ?.AddOptions(GetAvailableRegionOptions()); ramSetting.AddDetail( await SettingDefinitionManager.GetAsync(AliyunSettingNames.Authorization.AccessKeyId), StringLocalizerFactory, diff --git a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs index d6c8e0fae..388e373c9 100644 --- a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs +++ b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs @@ -42,7 +42,7 @@ public abstract class DynamicQueryableAppService : Applicat var dynamicParamter = new DynamicParamterDto { Name = propertyInfo.Name, - Type = propertyInfo.PropertyType.FullName, + Type = propertyInfo.PropertyType.FullName!, Description = localizedProp.Value ?? propertyInfo.Name, JavaScriptType = propertyTypeMap.JavaScriptType, AvailableComparator = propertyTypeMap.AvailableComparator @@ -120,7 +120,7 @@ public abstract class DynamicQueryableAppService : Applicat if (propertyType.IsNullableType()) { isNullableType = true; - propertyType = propertyType.GetGenericArguments().FirstOrDefault(); + propertyType = propertyType.GetGenericArguments().First(); } if (typeof(Enum).IsAssignableFrom(propertyType)) diff --git a/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN/Abp/Rules/RulesEngine/WorkflowsResolver.cs b/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN/Abp/Rules/RulesEngine/WorkflowsResolver.cs index 4637a9aaa..c21d3e51b 100644 --- a/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN/Abp/Rules/RulesEngine/WorkflowsResolver.cs +++ b/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN/Abp/Rules/RulesEngine/WorkflowsResolver.cs @@ -43,7 +43,7 @@ public class WorkflowsResolver : IWorkflowsResolver, ITransientDependency if (context.HasResolved()) { - result.Workflows.AddRange(context.Workflows); + result.Workflows.AddRange(context.Workflows!); if (!_options.MergingWorkflows) { diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN/Abp/WeChat/Official/Senparc/WeChatOfficialMessageHandler.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN/Abp/WeChat/Official/Senparc/WeChatOfficialMessageHandler.cs index ae852cd49..e537ae0ed 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN/Abp/WeChat/Official/Senparc/WeChatOfficialMessageHandler.cs +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN/Abp/WeChat/Official/Senparc/WeChatOfficialMessageHandler.cs @@ -15,8 +15,8 @@ public class WeChatOfficialMessageHandler : MessageHandler [JsonProperty("ticket")] [JsonPropertyName("ticket")] - public string Ticket { get; set; } + public string Ticket { get; set; } = default!; /// /// 凭证的有效时间（秒） /// diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/System/WeChatWorkResponseDeserializeExtensions.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/System/WeChatWorkResponseDeserializeExtensions.cs index 58f15b505..2cacf84c4 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/System/WeChatWorkResponseDeserializeExtensions.cs +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/System/WeChatWorkResponseDeserializeExtensions.cs @@ -6,6 +6,6 @@ internal static class WeChatWorkResponseDeserializeExtensions { public static T DeserializeObject(this string responseContent) where T : WeChatWorkResponse { - return JsonConvert.DeserializeObject(responseContent); + return JsonConvert.DeserializeObject(responseContent)!; } } diff --git a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/RealtimeMessageDbMigrationEventHandler.cs b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/RealtimeMessageDbMigrationEventHandler.cs index 33e12ebf6..b155cc7a5 100644 --- a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/RealtimeMessageDbMigrationEventHandler.cs +++ b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/RealtimeMessageDbMigrationEventHandler.cs @@ -68,7 +68,7 @@ public class RealtimeMessageDbMigrationEventHandler : EfCoreDatabaseMigrationEve new NotificationTemplate( TenantNotificationNames.NewTenantRegistered, formUser: adminEmailAddress, - data: new Dictionary + data: new Dictionary { { "name", eventData.Name }, { "email", adminEmailAddress }, diff --git a/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/TaskServiceDataSeeder.cs b/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/TaskServiceDataSeeder.cs index 6f941860c..d41324f3d 100644 --- a/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/TaskServiceDataSeeder.cs +++ b/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/TaskServiceDataSeeder.cs @@ -91,7 +91,7 @@ public class TaskServiceDataSeeder : ITransientDependency Source = JobSource.System, LockTimeOut = Options.JobFetchLockTimeOut, TenantId = tenantId, - Type = typeof(BackgroundPollingJob).AssemblyQualifiedName, + Type = typeof(BackgroundPollingJob).AssemblyQualifiedName!, }; } @@ -112,7 +112,7 @@ public class TaskServiceDataSeeder : ITransientDependency Priority = JobPriority.High, Source = JobSource.System, TenantId = tenantId, - Type = typeof(BackgroundCleaningJob).AssemblyQualifiedName, + Type = typeof(BackgroundCleaningJob).AssemblyQualifiedName!, }; } @@ -134,7 +134,7 @@ public class TaskServiceDataSeeder : ITransientDependency Priority = JobPriority.High, Source = JobSource.System, TenantId = tenantId, - Type = typeof(BackgroundCheckingJob).AssemblyQualifiedName, + Type = typeof(BackgroundCheckingJob).AssemblyQualifiedName!, }; } } diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MySecurityLogAppService.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MySecurityLogAppService.cs index 86478f180..377cba7f8 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MySecurityLogAppService.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MySecurityLogAppService.cs @@ -20,7 +20,7 @@ public class MySecurityLogAppService : AccountApplicationServiceBase, IMySecurit { var securityLog = await SecurityLogManager.GetAsync(id, includeDetails: true); - return ObjectMapper.Map(securityLog); + return ObjectMapper.Map(securityLog!); } public async virtual Task> GetListAsync(SecurityLogGetListInput input) diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerLoginModel.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerLoginModel.cs index fe4528428..9ec614354 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerLoginModel.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerLoginModel.cs @@ -274,7 +274,7 @@ namespace LINGYUN.Abp.Account.Web.IdentityServer.Pages.Account SetTenantCookies(qrCodeInfo.TenantId); using (CurrentTenant.Change(qrCodeInfo.TenantId)) { - var user = await UserManager.FindByIdAsync(qrCodeInfo.UserId); + var user = await UserManager.FindByIdAsync(qrCodeInfo.UserId!); if (user == null) { // TODO: 用户验证无效? diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/ViewModels/Authorize/AuthorizeViewModel.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/ViewModels/Authorize/AuthorizeViewModel.cs index af88869b0..038836003 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/ViewModels/Authorize/AuthorizeViewModel.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web.OpenIddict/ViewModels/Authorize/AuthorizeViewModel.cs @@ -10,7 +10,7 @@ public class AuthorizeViewModel [HiddenInput] public string? Scope { get; set; } - public List? AvailableScopes { get; set; } + public List AvailableScopes { get; set; } = new List(); } public class ScopeItemViewModel diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/LinkLogged.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/LinkLogged.cshtml.cs index 654d2c1fd..dd85fa403 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/LinkLogged.cshtml.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/LinkLogged.cshtml.cs @@ -27,7 +27,7 @@ public class LinkLoggedModel : AccountPageModel [BindProperty(SupportsGet = true)] public Guid? LinkTenantId { get; set; } - public string? LinkTenantAndUserName { get; set; } + public string LinkTenantAndUserName { get; set; } = default!; protected ICurrentPrincipalAccessor CurrentPrincipalAccessor => LazyServiceProvider.LazyGetRequiredService(); public IIdentityLinkUserAppService IdentityLinkUserAppService => LazyServiceProvider.LazyGetRequiredService(); @@ -47,7 +47,7 @@ public class LinkLoggedModel : AccountPageModel } LinkTenantAndUserName = !validLinkUser.LinkTenantName.IsNullOrWhiteSpace() ? $"{validLinkUser.LinkTenantName}\\{validLinkUser.LinkUserName}" - : validLinkUser.LinkUserName; + : validLinkUser.LinkUserName!; return Page(); } @@ -90,7 +90,7 @@ public class LinkLoggedModel : AccountPageModel return Page(); } - public virtual Task GetReturnUrlAsync(string returnUrl, string returnUrlHash) + public virtual Task GetReturnUrlAsync(string returnUrl, string? returnUrlHash = null) { return base.GetRedirectUrlAsync(returnUrl, returnUrlHash); } diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml.cs index 0f02e907b..323780385 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/Login.cshtml.cs @@ -322,7 +322,7 @@ public class LoginModel : AccountPageModel SetTenantCookies(qrCodeInfo.TenantId); using (CurrentTenant.Change(qrCodeInfo.TenantId)) { - var user = await UserManager.FindByIdAsync(qrCodeInfo.UserId); + var user = await UserManager.FindByIdAsync(qrCodeInfo.UserId!); if (user == null) { // TODO: û֤Ч? @@ -669,7 +669,7 @@ public class LoginModel : AccountPageModel #region LinkUser - public async virtual Task GetWithoutLinkReturnUrlAsync(string returnUrl, string returnUrlHash) + public async virtual Task GetWithoutLinkReturnUrlAsync(string returnUrl, string? returnUrlHash = null) { var redirectUrl = await base.GetRedirectUrlAsync(returnUrl, returnUrlHash); diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml index 86c228904..cd7443628 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml @@ -17,7 +17,7 @@
@L["SendVerifyCode"]
- + @L["Login"] diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml index c2990e066..bd578ad0c 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml @@ -18,7 +18,7 @@ @L["VerifyAuthenticatorCode"] - + @L["Login"] diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml index c91abeb42..54e1ae23f 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml @@ -21,7 +21,7 @@
@L["VerifyAuthenticatorCode"]
- + @L["ReSendVerifyCode"] diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN/Abp/CachingManagement/CacheKeysDto.cs b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN/Abp/CachingManagement/CacheKeysDto.cs index ed5521b7c..399b8815e 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN/Abp/CachingManagement/CacheKeysDto.cs +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN/Abp/CachingManagement/CacheKeysDto.cs @@ -4,7 +4,7 @@ namespace LINGYUN.Abp.CachingManagement; public class CacheKeysDto { - public string NextMarker { get; set; } = default!; + public string? NextMarker { get; set; } public List Keys { get; set; } = new List(); } diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN/Abp/CachingManagement/CacheAppService.cs b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN/Abp/CachingManagement/CacheAppService.cs index d64ac28d1..8abdd5342 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN/Abp/CachingManagement/CacheAppService.cs +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN/Abp/CachingManagement/CacheAppService.cs @@ -67,7 +67,7 @@ public class CacheAppService : ApplicationService, ICacheAppService sldExpr = input.SlidingExpiration.Value - Clock.Now; } - await CacheManager.SetAsync(input.Key, input.Value, absExpir, sldExpr); + await CacheManager.SetAsync(input.Key, input.Value ?? "", absExpir, sldExpr); } [Authorize(CachingManagementPermissionNames.Cache.Refresh)] diff --git a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/EntityTypeInfoAppService.cs b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/EntityTypeInfoAppService.cs index 6f9d9ed9d..e8ebb9ec9 100644 --- a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/EntityTypeInfoAppService.cs +++ b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/EntityTypeInfoAppService.cs @@ -57,8 +57,8 @@ public class EntityTypeInfoAppService : DataProtectionManagementApplicationServi return expression .AndIf(Input.IsAuditEnabled.HasValue, x => x.IsAuditEnabled == Input.IsAuditEnabled) - .AndIf(!Input.Filter.IsNullOrWhiteSpace(), x => x.Name.Contains(Input.Filter) || - x.DisplayName.Contains(Input.Filter) || x.TypeFullName.Contains(Input.Filter)); + .AndIf(!Input.Filter.IsNullOrWhiteSpace(), x => x.Name.Contains(Input.Filter!) || + x.DisplayName.Contains(Input.Filter!) || x.TypeFullName.Contains(Input.Filter!)); } } } diff --git a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/OrganizationUnitEntityRuleAppService.cs b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/OrganizationUnitEntityRuleAppService.cs index 95f31fdfb..2178b2983 100644 --- a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/OrganizationUnitEntityRuleAppService.cs +++ b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/OrganizationUnitEntityRuleAppService.cs @@ -31,7 +31,7 @@ public class OrganizationUnitEntityRuleAppService : DataProtectionManagementAppl { var entityTypeInfo = await _entityTypeInfoRepository.GetAsync(input.EntityTypeId); var entityRule = await _organizationUnitEntityRuleRepository.FindEntityRuleAsync(input.OrgCode, entityTypeInfo.TypeFullName, input.Operation); - return ObjectMapper.Map(entityRule); + return ObjectMapper.Map(entityRule!); } [Authorize(DataProtectionManagementPermissionNames.OrganizationUnitEntityRule.Create)] diff --git a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/RoleEntityRuleAppService.cs b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/RoleEntityRuleAppService.cs index b4b26bb4d..d74dfa106 100644 --- a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/RoleEntityRuleAppService.cs +++ b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/RoleEntityRuleAppService.cs @@ -31,7 +31,7 @@ public class RoleEntityRuleAppService : DataProtectionManagementApplicationServi { var entityTypeInfo = await _entityTypeInfoRepository.GetAsync(input.EntityTypeId); var entityRule = await _roleEntityRuleRepository.FindEntityRuleAsync(input.RoleName, entityTypeInfo.TypeFullName, input.Operation); - return ObjectMapper.Map(entityRule); + return ObjectMapper.Map(entityRule!); } [Authorize(DataProtectionManagementPermissionNames.RoleEntityRule.Create)] diff --git a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/SubjectStrategyAppService.cs b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/SubjectStrategyAppService.cs index b31d5a748..ed20bfa4d 100644 --- a/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/SubjectStrategyAppService.cs +++ b/aspnet-core/modules/data-protection/LINGYUN.Abp.DataProtectionManagement.Application/LINGYUN/Abp/DataProtectionManagement/SubjectStrategyAppService.cs @@ -23,7 +23,7 @@ public class SubjectStrategyAppService : DataProtectionManagementApplicationServ { var subjectStrategy = await _repository.FindBySubjectAsync(input.SubjectName, input.SubjectId); - return ObjectMapper.Map(subjectStrategy); + return ObjectMapper.Map(subjectStrategy!); } [Authorize(DataProtectionManagementPermissionNames.SubjectStrategy.Change)] diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN/Abp/Elsa/EntityFrameworkCore/MySql/AbpElsaEntityFrameworkCoreMySqlModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN/Abp/Elsa/EntityFrameworkCore/MySql/AbpElsaEntityFrameworkCoreMySqlModule.cs index d015d4a46..b7ecc4930 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN/Abp/Elsa/EntityFrameworkCore/MySql/AbpElsaEntityFrameworkCoreMySqlModule.cs +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN/Abp/Elsa/EntityFrameworkCore/MySql/AbpElsaEntityFrameworkCoreMySqlModule.cs @@ -45,9 +45,11 @@ public class AbpElsaEntityFrameworkCoreMySqlModule : AbpModule var configuration = context.ServiceProvider.GetRequiredService(); if (configuration.GetValue("Elsa:Features:DefaultPersistence:EntityFrameworkCore:MySql:Enabled")) { - await context.ServiceProvider - .GetService() - ?.InstallAsync(); + var sqlInstaller = context.ServiceProvider.GetService(); + if (sqlInstaller != null) + { + await sqlInstaller.InstallAsync(); + } } } } diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/AbpElsaEntityFrameworkCorePostgreSqlModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/AbpElsaEntityFrameworkCorePostgreSqlModule.cs index f78ea8c73..c8123e721 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/AbpElsaEntityFrameworkCorePostgreSqlModule.cs +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/AbpElsaEntityFrameworkCorePostgreSqlModule.cs @@ -45,9 +45,11 @@ public class AbpElsaEntityFrameworkCorePostgreSqlModule : AbpModule var configuration = context.ServiceProvider.GetRequiredService(); if (configuration.GetValue("Elsa:Features:DefaultPersistence:EntityFrameworkCore:PostgreSql:Enabled")) { - await context.ServiceProvider - .GetService() - ?.InstallAsync(); + var sqlInstaller = context.ServiceProvider.GetService(); + if (sqlInstaller != null) + { + await sqlInstaller.InstallAsync(); + } } } } diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/Migrations/PostgreSqlElsaDataBaseInstaller.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/Migrations/PostgreSqlElsaDataBaseInstaller.cs index 5e0b3f442..0c8aea612 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/Migrations/PostgreSqlElsaDataBaseInstaller.cs +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.PostgreSql/LINGYUN/Abp/Elsa/EntityFrameworkCore/PostgreSql/Migrations/PostgreSqlElsaDataBaseInstaller.cs @@ -48,7 +48,7 @@ public class PostgreSqlElsaDataBaseInstaller : IElsaDataBaseInstaller, ITransien var builder = new NpgsqlConnectionStringBuilder(connectionString); - var dataBaseName = await CreateDataBaseIfNotExists(builder.Database, builder); + var dataBaseName = await CreateDataBaseIfNotExists(builder.Database!, builder); builder.Database = dataBaseName; diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.SqlServer/LINGYUN/Abp/Elsa/EntityFrameworkCore/SqlServer/AbpElsaEntityFrameworkCoreSqlServerModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.SqlServer/LINGYUN/Abp/Elsa/EntityFrameworkCore/SqlServer/AbpElsaEntityFrameworkCoreSqlServerModule.cs index 4b172c6d4..3d13105d7 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.SqlServer/LINGYUN/Abp/Elsa/EntityFrameworkCore/SqlServer/AbpElsaEntityFrameworkCoreSqlServerModule.cs +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.SqlServer/LINGYUN/Abp/Elsa/EntityFrameworkCore/SqlServer/AbpElsaEntityFrameworkCoreSqlServerModule.cs @@ -45,9 +45,11 @@ public class AbpElsaEntityFrameworkCoreSqlServerModule : AbpModule var configuration = context.ServiceProvider.GetRequiredService(); if (configuration.GetValue("Elsa:Features:DefaultPersistence:EntityFrameworkCore:SqlServer:Enabled")) { - await context.ServiceProvider - .GetService() - ?.InstallAsync(); + var sqlInstaller = context.ServiceProvider.GetService(); + if (sqlInstaller != null) + { + await sqlInstaller.InstallAsync(); + } } } } diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN/Abp/Identity/OrganizaztionUnits/OrganizaztionUnitDynamicClaimsPrincipalContributorCache.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN/Abp/Identity/OrganizaztionUnits/OrganizaztionUnitDynamicClaimsPrincipalContributorCache.cs index 5975b0a7b..3a106a9c2 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN/Abp/Identity/OrganizaztionUnits/OrganizaztionUnitDynamicClaimsPrincipalContributorCache.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN/Abp/Identity/OrganizaztionUnits/OrganizaztionUnitDynamicClaimsPrincipalContributorCache.cs @@ -59,15 +59,19 @@ public class OrganizaztionUnitDynamicClaimsPrincipalContributorCache : IdentityD var userRoles = cacheItems.Claims .FindAll(x => x.Type == AbpClaimTypes.Role) + .Where(x => !x.Value.IsNullOrWhiteSpace()) .Select(x => x.Value) .Distinct(); - var roleOus = await IdentityRoleRepository.GetOrganizationUnitsAsync(userRoles); - foreach (var roleOu in roleOus) + if (userRoles != null) { - if (!cacheItems.Claims.Any(x => x.Type == AbpOrganizationUnitClaimTypes.OrganizationUnit && x.Value == roleOu.Code)) + var roleOus = await IdentityRoleRepository.GetOrganizationUnitsAsync(userRoles!); + foreach (var roleOu in roleOus) { - cacheItems.Claims.Add(new AbpDynamicClaim(AbpOrganizationUnitClaimTypes.OrganizationUnit, roleOu.Code)); + if (!cacheItems.Claims.Any(x => x.Type == AbpOrganizationUnitClaimTypes.OrganizationUnit && x.Value == roleOu.Code)) + { + cacheItems.Claims.Add(new AbpDynamicClaim(AbpOrganizationUnitClaimTypes.OrganizationUnit, roleOu.Code)); + } } } diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/IdentitySessionCacheItem.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/IdentitySessionCacheItem.cs index f2a8683a3..8fab3bdac 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/IdentitySessionCacheItem.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Session/LINGYUN/Abp/Identity/Session/IdentitySessionCacheItem.cs @@ -53,7 +53,7 @@ public class IdentitySessionCacheItem public IdentitySessionCacheItem( string device, - string deviceInfo, + string? deviceInfo, Guid userId, string sessionId, string? clientId, diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Applications/OpenIddictApplicationAppService.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Applications/OpenIddictApplicationAppService.cs index d009cf3af..2f86e4ab1 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Applications/OpenIddictApplicationAppService.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Applications/OpenIddictApplicationAppService.cs @@ -28,7 +28,7 @@ public class OpenIddictApplicationAppService : OpenIddictApplicationServiceBase, { var application = await _applicationRepository.GetAsync(id); - return application.ToDto(JsonSerializer); + return application.ToDto(JsonSerializer)!; } public async virtual Task> GetListAsync(OpenIddictApplicationGetListInput input) @@ -37,7 +37,7 @@ public class OpenIddictApplicationAppService : OpenIddictApplicationServiceBase, var entites = await _applicationRepository.GetListAsync(input.Sorting, input.SkipCount, input.MaxResultCount, input.Filter); return new PagedResultDto(totalCount, - entites.Select(entity => entity.ToDto(JsonSerializer)).ToList()); + entites.Select(entity => entity.ToDto(JsonSerializer)!).ToList()); } [Authorize(AbpOpenIddictPermissions.Applications.Create)] @@ -60,7 +60,7 @@ public class OpenIddictApplicationAppService : OpenIddictApplicationServiceBase, application = await _applicationRepository.FindByClientIdAsync(input.ClientId); - return application.ToDto(JsonSerializer); + return application.ToDto(JsonSerializer)!; } [Authorize(AbpOpenIddictPermissions.Applications.Update)] @@ -90,7 +90,7 @@ public class OpenIddictApplicationAppService : OpenIddictApplicationServiceBase, application = await _applicationRepository.GetAsync(id); - return application.ToDto(JsonSerializer); + return application.ToDto(JsonSerializer)!; } [Authorize(AbpOpenIddictPermissions.Applications.Delete)] diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationAppService.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationAppService.cs index 815804b50..1fd26882b 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationAppService.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN/Abp/OpenIddict/Authorizations/OpenIddictAuthorizationAppService.cs @@ -91,6 +91,6 @@ public class OpenIddictAuthorizationAppService : OpenIddictApplicationServiceBas var entites = await AsyncExecuter.ToListAsync(queryable); return new PagedResultDto(totalCount, - entites.Select(entity => entity.ToDto(JsonSerializer)).ToList()); + entites.Select(entity => entity.ToDto(JsonSerializer)!).ToList()); } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs index b9d6e0d88..71fb7ed5b 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs @@ -47,8 +47,8 @@ public class SmsTokenExtensionGrant : ITokenExtensionGrant return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme); } - var phoneToken = phoneTokenParam.Value.ToString(); - var phoneNumber = phoneNumberParam.Value.ToString(); + var phoneToken = phoneTokenParam.Value.ToString()!; + var phoneNumber = phoneNumberParam.Value.ToString()!; await identityOptions.SetAsync(); diff --git a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin5/LINGYUN/Abp/UI/Navigation/VueVbenAdmin5/VueVbenAdmin5StandardMenuConverter.cs b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin5/LINGYUN/Abp/UI/Navigation/VueVbenAdmin5/VueVbenAdmin5StandardMenuConverter.cs index e7081f3f3..738854d1d 100644 --- a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin5/LINGYUN/Abp/UI/Navigation/VueVbenAdmin5/VueVbenAdmin5StandardMenuConverter.cs +++ b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin5/LINGYUN/Abp/UI/Navigation/VueVbenAdmin5/VueVbenAdmin5StandardMenuConverter.cs @@ -20,7 +20,7 @@ public class VueVbenAdmin5StandardMenuConverter : IStandardMenuConverter, ISingl if (menu.ExtraProperties.TryGetValue("icon", out var icon)) { - standardMenu.Icon = icon.ToString(); + standardMenu.Icon = icon?.ToString(); } return standardMenu; diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/MyFriendAppService.cs b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/MyFriendAppService.cs index d39d00a65..d85e299a4 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/MyFriendAppService.cs +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/MyFriendAppService.cs @@ -28,7 +28,7 @@ public class MyFriendAppService : ApplicationService, IMyFriendAppService public async virtual Task GetAsync(Guid friendId) { - return await FriendStore.GetMemberAsync(CurrentTenant.Id, CurrentUser.GetId(), friendId); + return (await FriendStore.GetMemberAsync(CurrentTenant.Id, CurrentUser.GetId(), friendId))!; } public async virtual Task CreateAsync(MyFriendCreateDto input) diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN/Abp/ExceptionHandling/Notifications/AbpNotificationsExceptionSubscriber.cs b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN/Abp/ExceptionHandling/Notifications/AbpNotificationsExceptionSubscriber.cs index 42ee51bc5..a16bdc908 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN/Abp/ExceptionHandling/Notifications/AbpNotificationsExceptionSubscriber.cs +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN/Abp/ExceptionHandling/Notifications/AbpNotificationsExceptionSubscriber.cs @@ -29,7 +29,7 @@ public class AbpNotificationsExceptionSubscriber : AbpExceptionSubscriberBase new NotificationTemplate( NotificationsCommonNotificationNames.ExceptionHandling, formUser: "System", - data: new Dictionary + data: new Dictionary { { "header", "An application exception has occurred" }, { "footer", $"Copyright to LY Colin © {DateTime.Now.Year}" }, diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Groups/NotificationGroupDefinitionAppService.cs b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Groups/NotificationGroupDefinitionAppService.cs index c48978bb7..c392dc17e 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Groups/NotificationGroupDefinitionAppService.cs +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Groups/NotificationGroupDefinitionAppService.cs @@ -136,7 +136,7 @@ public class NotificationGroupDefinitionAppService : AbpNotificationsApplication } } - protected async virtual Task FindByNameAsync(string name) + protected async virtual Task FindByNameAsync(string name) { var definitionRecord = await _definitionGroupRecordRepository.FindByNameAsync(name); diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Notifications/NotificationDefinitionAppService.cs b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Notifications/NotificationDefinitionAppService.cs index b7a1d09ef..ecddbef2f 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Notifications/NotificationDefinitionAppService.cs +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN/Abp/Notifications/Definitions/Notifications/NotificationDefinitionAppService.cs @@ -179,7 +179,7 @@ public class NotificationDefinitionAppService : AbpNotificationsApplicationServi } } - protected async virtual Task FindRecordByNameAsync(string name) + protected async virtual Task FindRecordByNameAsync(string name) { return await _definitionRecordRepository.FindByNameAsync(name); } diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/DynamicNotificationDefinitionInMemoryCache.cs b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/DynamicNotificationDefinitionInMemoryCache.cs index 8a2eca380..f31611afa 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/DynamicNotificationDefinitionInMemoryCache.cs +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN/Abp/Notifications/DynamicNotificationDefinitionInMemoryCache.cs @@ -47,14 +47,20 @@ public class DynamicNotificationDefinitionInMemoryCache : IDynamicNotificationDe foreach (var notificationGroupRecord in notificationGroupRecords) { + ILocalizableString? displayName = null; + if (!notificationGroupRecord.DisplayName.IsNullOrWhiteSpace()) + { + displayName = LocalizableStringSerializer.Deserialize(notificationGroupRecord.DisplayName); + } ILocalizableString? description = null; if (!notificationGroupRecord.Description.IsNullOrWhiteSpace()) { description = LocalizableStringSerializer.Deserialize(notificationGroupRecord.Description); } + var notificationGroup = context.AddGroup( notificationGroupRecord.Name, - LocalizableStringSerializer.Deserialize(notificationGroupRecord.DisplayName), + displayName, description, notificationGroupRecord.AllowSubscriptionToClients ); diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ActionRecord.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ActionRecord.cs index c543e835c..fef2eb7b7 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ActionRecord.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ActionRecord.cs @@ -9,7 +9,7 @@ namespace LINGYUN.Abp.RulesEngineManagement; public class ActionRecord : Entity, IMultiTenant, IHasExtraProperties { public virtual Guid? TenantId { get; protected set; } - public virtual string Name { get; protected set; } + public virtual string Name { get; protected set; } = default!; public virtual ExtraPropertyDictionary ExtraProperties { get; protected set; } protected ActionRecord() { diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IRuleRecordRepository.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IRuleRecordRepository.cs index e23235663..9e713927f 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IRuleRecordRepository.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IRuleRecordRepository.cs @@ -13,10 +13,10 @@ public interface IRuleRecordRepository : IRepository Task> GetParamsAsync( Guid ruleId, CancellationToken cancellationToken = default); - Task GetSuccessActionAsync( + Task GetSuccessActionAsync( Guid ruleId, CancellationToken cancellationToken = default); - Task GetFailureActionAsync( + Task GetFailureActionAsync( Guid ruleId, CancellationToken cancellationToken = default); } diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IWorkflowRecordRepository.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IWorkflowRecordRepository.cs index 18b9e05be..a34e1197b 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IWorkflowRecordRepository.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/IWorkflowRecordRepository.cs @@ -7,7 +7,7 @@ using Volo.Abp.Domain.Repositories; namespace LINGYUN.Abp.RulesEngineManagement; public interface IWorkflowRecordRepository : IRepository { - Task FindByNameAsync( + Task FindByNameAsync( string name, CancellationToken cancellationToken = default); diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ParamRecord.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ParamRecord.cs index 3aa30c953..ad967e2b6 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ParamRecord.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/ParamRecord.cs @@ -7,8 +7,8 @@ namespace LINGYUN.Abp.RulesEngineManagement; public class ParamRecord : Entity, IMultiTenant { public virtual Guid? TenantId { get; protected set; } - public virtual string Name { get; protected set; } - public virtual string Expression { get; protected set; } + public virtual string Name { get; protected set; } = default!; + public virtual string Expression { get; protected set; } = default!; protected ParamRecord() { diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RuleRecord.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RuleRecord.cs index 8109f20c0..2f10b5e7c 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RuleRecord.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RuleRecord.cs @@ -13,16 +13,16 @@ public class RuleRecord : AuditedAggregateRoot, IMultiTenant public virtual Guid? TenantId { get; protected set; } public virtual Guid? ParentId { get; protected set; } public virtual bool Enabled { get; set; } - public virtual string Name { get; protected set; } - public virtual string Operator { get; protected set; } - public virtual string ErrorMessage { get; protected set; } + public virtual string Name { get; protected set; } = default!; + public virtual string? Operator { get; protected set; } + public virtual string ErrorMessage { get; protected set; } = default!; public virtual RuleExpressionType RuleExpressionType { get; set; } - public virtual string InjectWorkflows { get; set; } - public virtual string Expression { get; protected set; } - public virtual string SuccessEvent { get; set; } - public virtual ICollection LocalParams { get; protected set; } - public virtual RuleActionRecord OnSuccess { get; protected set; } - public virtual RuleActionRecord OnFailure { get; protected set; } + public virtual string? InjectWorkflows { get; set; } + public virtual string Expression { get; protected set; } = default!; + public virtual string? SuccessEvent { get; set; } + public virtual ICollection LocalParams { get; protected set; } = default!; + public virtual RuleActionRecord OnSuccess { get; protected set; } = default!; + public virtual RuleActionRecord OnFailure { get; protected set; } = default!; protected RuleRecord() { ExtraProperties = new ExtraPropertyDictionary(); @@ -34,7 +34,7 @@ public class RuleRecord : AuditedAggregateRoot, IMultiTenant string name, string errorMessage, string expression, - string @operator = null, + string? @operator = null, Guid? parentId = null, Guid? tenantId = null) : base(id) diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RulesEngineManagementDbPropertites.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RulesEngineManagementDbPropertites.cs index 28ccacbb4..14ea11bcd 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RulesEngineManagementDbPropertites.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/RulesEngineManagementDbPropertites.cs @@ -5,7 +5,7 @@ public static class RulesEngineManagementDbPropertites { public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix + "RulesEngine"; - public static string DbSchema { get; set; } = AbpCommonDbProperties.DbSchema; + public static string? DbSchema { get; set; } = AbpCommonDbProperties.DbSchema; public const string ConnectionStringName = "RulesEngineManagement"; diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowRecord.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowRecord.cs index 36755abab..f82a03eac 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowRecord.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowRecord.cs @@ -11,11 +11,11 @@ namespace LINGYUN.Abp.RulesEngineManagement; public class WorkflowRecord : AuditedAggregateRoot, IMultiTenant { public virtual Guid? TenantId { get; protected set; } - public virtual string Name { get; protected set; } - public virtual string TypeFullName { get; protected set; } - public virtual string InjectWorkflows { get; protected set; } - public virtual ICollection GlobalParams { get; protected set; } - public virtual ICollection Rules { get; protected set; } + public virtual string Name { get; protected set; } = default!; + public virtual string TypeFullName { get; protected set; } = default!; + public virtual string? InjectWorkflows { get; protected set; } + public virtual ICollection GlobalParams { get; protected set; } = default!; + public virtual ICollection Rules { get; protected set; } = default!; protected WorkflowRecord() { ExtraProperties = new ExtraPropertyDictionary(); @@ -26,7 +26,7 @@ public class WorkflowRecord : AuditedAggregateRoot, IMultiTenant Guid id, string name, string typeFullName, - string injectWorkflows = null, + string? injectWorkflows = null, Guid? tenantId = null) : base(id) { diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs index 9477275ba..f57176134 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs @@ -27,9 +27,13 @@ public class WorkflowStore : IWorkflowStore, ITransientDependency RuleRepository = ruleRepository; } - public async virtual Task GetWorkflowAsync(string workflowName, CancellationToken cancellationToken = default) + public async virtual Task GetWorkflowAsync(string workflowName, CancellationToken cancellationToken = default) { var workflowRecord = await WorkflowRepository.FindByNameAsync(workflowName, cancellationToken); + if (workflowRecord == null) + { + return null; + } var workflow = await MapToWorkflow(workflowRecord); @@ -44,7 +48,7 @@ public class WorkflowStore : IWorkflowStore, ITransientDependency async (cache) => { var workflows = new List(); - var workflowRecords = await WorkflowRepository.GetListAsync(inputType.FullName, cancellationToken); + var workflowRecords = await WorkflowRepository.GetListAsync(inputType.FullName!, cancellationToken); foreach (var workflowRecord in workflowRecords) { @@ -57,7 +61,7 @@ public class WorkflowStore : IWorkflowStore, ITransientDependency return workflows; }); - return workflows; + return workflows!; } protected async virtual Task MapToWorkflow(WorkflowRecord workflowRecord) diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreRuleRecordRepository.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreRuleRecordRepository.cs index 1b1820b47..56aedacf1 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreRuleRecordRepository.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreRuleRecordRepository.cs @@ -23,7 +23,7 @@ public class EfCoreRuleRecordRepository : EfCoreRepository GetFailureActionAsync(Guid ruleId, CancellationToken cancellationToken = default) + public async virtual Task GetFailureActionAsync(Guid ruleId, CancellationToken cancellationToken = default) { var dbContext = await GetDbContextAsync(); @@ -51,7 +51,7 @@ public class EfCoreRuleRecordRepository : EfCoreRepository GetSuccessActionAsync(Guid ruleId, CancellationToken cancellationToken = default) + public async virtual Task GetSuccessActionAsync(Guid ruleId, CancellationToken cancellationToken = default) { var dbContext = await GetDbContextAsync(); diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreWorkflowRecordRepository.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreWorkflowRecordRepository.cs index 075108f04..401724688 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreWorkflowRecordRepository.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/EfCoreWorkflowRecordRepository.cs @@ -16,7 +16,7 @@ public class EfCoreWorkflowRecordRepository : EfCoreRepository FindByNameAsync(string name, CancellationToken cancellationToken = default) + public async virtual Task FindByNameAsync(string name, CancellationToken cancellationToken = default) { return await (await GetDbSetAsync()) .Where(x => x.Name == name) diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/RulesEngineManagementDbContextModelCreatingExtensions.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/RulesEngineManagementDbContextModelCreatingExtensions.cs index 0352df02b..ca50d08fe 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/RulesEngineManagementDbContextModelCreatingExtensions.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN/Abp/RulesEngineManagement/EntityFrameworkCore/RulesEngineManagementDbContextModelCreatingExtensions.cs @@ -1,128 +1,128 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Volo.Abp; -using Volo.Abp.EntityFrameworkCore.Modeling; - -namespace LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore; - -public static class RulesEngineManagementDbContextModelCreatingExtensions -{ - public static void ConfigureRulesEngineManagement( - this ModelBuilder builder) - { - Check.NotNull(builder, nameof(builder)); - - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Actions", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.Property(t => t.Name) - .HasMaxLength(ActionRecordConsts.MaxNameLength) +using Volo.Abp.EntityFrameworkCore.Modeling; + +namespace LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore; + +public static class RulesEngineManagementDbContextModelCreatingExtensions +{ + public static void ConfigureRulesEngineManagement( + this ModelBuilder builder) + { + Check.NotNull(builder, nameof(builder)); + + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Actions", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.Property(t => t.Name) + .HasMaxLength(ActionRecordConsts.MaxNameLength) + .IsRequired(); + + b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Params", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.Property(t => t.Name) + .HasMaxLength(ParamRecordConsts.MaxNameLength) + .IsRequired(); + b.Property(t => t.Expression) + .HasMaxLength(ParamRecordConsts.MaxExpressionLength) + .IsRequired(); + + b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Rules", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.Property(t => t.Name) + .HasMaxLength(RuleRecordConsts.MaxNameLength) + .IsRequired(); + b.Property(t => t.Expression) + .HasMaxLength(RuleRecordConsts.MaxExpressionLength) .IsRequired(); + b.Property(t => t.ErrorMessage) + .HasMaxLength(RuleRecordConsts.MaxErrorMessageLength) + .IsRequired(); + + b.Property(t => t.Operator) + .HasMaxLength(RuleRecordConsts.MaxOperatorLength); + b.Property(t => t.InjectWorkflows) + .HasMaxLength(RuleRecordConsts.MaxInjectWorkflowsLength); + b.Property(t => t.SuccessEvent) + .HasMaxLength(RuleRecordConsts.MaxSuccessEventLength); + + b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Workflows", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); - b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Params", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.Property(t => t.Name) - .HasMaxLength(ParamRecordConsts.MaxNameLength) - .IsRequired(); - b.Property(t => t.Expression) - .HasMaxLength(ParamRecordConsts.MaxExpressionLength) + b.Property(t => t.Name) + .HasMaxLength(WorkflowRecordConsts.MaxNameLength) .IsRequired(); + b.Property(t => t.TypeFullName) + .HasMaxLength(WorkflowRecordConsts.MaxTypeFullNameLength) + .IsRequired(); + + b.Property(t => t.InjectWorkflows) + .HasMaxLength(WorkflowRecordConsts.MaxInjectWorkflowsLength); + + b.HasIndex(u => u.TypeFullName); + b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "RuleActions", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "RuleParams", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "WorkflowParams", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.ApplyObjectExtensionMappings(); + }); + builder.Entity(b => + { + b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "WorkflowRules", RulesEngineManagementDbPropertites.DbSchema); + + b.ConfigureByConvention(); + + b.ApplyObjectExtensionMappings(); + }); - b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Rules", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.Property(t => t.Name) - .HasMaxLength(RuleRecordConsts.MaxNameLength) - .IsRequired(); - b.Property(t => t.Expression) - .HasMaxLength(RuleRecordConsts.MaxExpressionLength) - .IsRequired(); - b.Property(t => t.ErrorMessage) - .HasMaxLength(RuleRecordConsts.MaxErrorMessageLength) - .IsRequired(); - - b.Property(t => t.Operator) - .HasMaxLength(RuleRecordConsts.MaxOperatorLength); - b.Property(t => t.InjectWorkflows) - .HasMaxLength(RuleRecordConsts.MaxInjectWorkflowsLength); - b.Property(t => t.SuccessEvent) - .HasMaxLength(RuleRecordConsts.MaxSuccessEventLength); - - b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "Workflows", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.Property(t => t.Name) - .HasMaxLength(WorkflowRecordConsts.MaxNameLength) - .IsRequired(); - b.Property(t => t.TypeFullName) - .HasMaxLength(WorkflowRecordConsts.MaxTypeFullNameLength) - .IsRequired(); - - b.Property(t => t.InjectWorkflows) - .HasMaxLength(WorkflowRecordConsts.MaxInjectWorkflowsLength); - - b.HasIndex(u => u.TypeFullName); - b.HasIndex(u => new { u.TenantId, u.Name }).IsUnique(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "RuleActions", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "RuleParams", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "WorkflowParams", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.ApplyObjectExtensionMappings(); - }); - builder.Entity(b => - { - b.ToTable(RulesEngineManagementDbPropertites.DbTablePrefix + "WorkflowRules", RulesEngineManagementDbPropertites.DbSchema); - - b.ConfigureByConvention(); - - b.ApplyObjectExtensionMappings(); - }); - - builder.TryConfigureObjectExtensions(); - } -} + builder.TryConfigureObjectExtensions(); + } +} diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingDefinitionEqualityComparer.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingDefinitionEqualityComparer.cs index 862d3fe79..b52f20ab7 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingDefinitionEqualityComparer.cs +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingDefinitionEqualityComparer.cs @@ -4,9 +4,9 @@ using Volo.Abp.Settings; namespace LINGYUN.Abp.SettingManagement; public class SettingDefinitionEqualityComparer : EqualityComparer { - public override bool Equals(SettingDefinition x, SettingDefinition y) + public override bool Equals(SettingDefinition? x, SettingDefinition? y) { - return x.Name == y.Name; + return x?.Name == y?.Name; } public override int GetHashCode(SettingDefinition obj) diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN/Abp/Elasticsearch/Jobs/ExpiredIndicesCleanupJob.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN/Abp/Elasticsearch/Jobs/ExpiredIndicesCleanupJob.cs index 3500ea0b6..8a24c5773 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN/Abp/Elasticsearch/Jobs/ExpiredIndicesCleanupJob.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN/Abp/Elasticsearch/Jobs/ExpiredIndicesCleanupJob.cs @@ -61,7 +61,7 @@ public class ExpiredIndicesCleanupJob : IJobRunnable { indexResponse.TryGetOriginalException(out var originalException); indexResponse.TryGetElasticsearchServerError(out var elasticsearchServerError); - throw new AbpJobExecutionException(GetType(), elasticsearchServerError?.ToString(), originalException); + throw new AbpJobExecutionException(GetType(), elasticsearchServerError!.ToString(), originalException); } foreach (var index in indexResponse.Indices) @@ -85,7 +85,7 @@ public class ExpiredIndicesCleanupJob : IJobRunnable { delResponse.TryGetOriginalException(out var originalException); delResponse.TryGetElasticsearchServerError(out var elasticsearchServerError); - throw new AbpJobExecutionException(GetType(), elasticsearchServerError?.ToString(), originalException); + throw new AbpJobExecutionException(GetType(), elasticsearchServerError!.ToString(), originalException); } } diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobDefinitionDto.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobDefinitionDto.cs index 58acc7a46..b76313a86 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobDefinitionDto.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobDefinitionDto.cs @@ -4,11 +4,11 @@ namespace LINGYUN.Abp.TaskManagement; public class BackgroundJobDefinitionDto { - public string Name { get; set; } + public string Name { get; set; } = default!; - public string DisplayName { get; set; } + public string DisplayName { get; set; } = default!; - public string Description { get; set; } + public string? Description { get; set; } public List Paramters { get; set; } = new List(); } diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobInfoDto.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobInfoDto.cs index 6bf0022d6..ddda740c5 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobInfoDto.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN/Abp/TaskManagement/BackgroundJobInfoDto.cs @@ -8,7 +8,7 @@ namespace LINGYUN.Abp.TaskManagement; public class BackgroundJobInfoDto : ExtensibleAuditedEntityDto, IHasConcurrencyStamp { - public string ConcurrencyStamp { get; set; } + public string ConcurrencyStamp { get; set; } = default!; /// /// 任务名称 /// diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN/Abp/Webhooks/ClientProxies/ClientProxiesWebhookPublisher.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN/Abp/Webhooks/ClientProxies/ClientProxiesWebhookPublisher.cs index 71f880505..b1fb0cbb8 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN/Abp/Webhooks/ClientProxies/ClientProxiesWebhookPublisher.cs +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN/Abp/Webhooks/ClientProxies/ClientProxiesWebhookPublisher.cs @@ -20,7 +20,7 @@ public class ClientProxiesWebhookPublisher : IWebhookPublisher, ITransientDepend PublishAppService = publishAppService; } - public async virtual Task PublishAsync(string webhookName, object data, bool sendExactSameData = false, WebhookHeader headers = null) + public async virtual Task PublishAsync(string webhookName, object data, bool sendExactSameData = false, WebhookHeader? headers = null) { var input = new WebhookPublishInput { @@ -40,7 +40,7 @@ public class ClientProxiesWebhookPublisher : IWebhookPublisher, ITransientDepend await PublishAsync(input); } - public async virtual Task PublishAsync(string webhookName, object data, Guid? tenantId, bool sendExactSameData = false, WebhookHeader headers = null) + public async virtual Task PublishAsync(string webhookName, object data, Guid? tenantId, bool sendExactSameData = false, WebhookHeader? headers = null) { var input = new WebhookPublishInput { @@ -64,7 +64,7 @@ public class ClientProxiesWebhookPublisher : IWebhookPublisher, ITransientDepend await PublishAsync(input); } - public async virtual Task PublishAsync(Guid?[] tenantIds, string webhookName, object data, bool sendExactSameData = false, WebhookHeader headers = null) + public async virtual Task PublishAsync(Guid?[] tenantIds, string webhookName, object data, bool sendExactSameData = false, WebhookHeader? headers = null) { var input = new WebhookPublishInput { diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN/Abp/WebhooksManagement/WebhookDefinitionSerializer.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN/Abp/WebhooksManagement/WebhookDefinitionSerializer.cs index 8595d06f1..34133bcd4 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN/Abp/WebhooksManagement/WebhookDefinitionSerializer.cs +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN/Abp/WebhooksManagement/WebhookDefinitionSerializer.cs @@ -50,10 +50,16 @@ public class WebhookDefinitionSerializer : IWebhookDefinitionSerializer, ITransi { using (CultureHelper.Use(CultureInfo.InvariantCulture)) { + var displayName = webhookGroup.Name; + if (webhookGroup.DisplayName != null) + { + displayName = LocalizableStringSerializer.Serialize(webhookGroup.DisplayName)!; + } + var webhookGroupRecord = new WebhookGroupDefinitionRecord( GuidGenerator.Create(), webhookGroup.Name, - LocalizableStringSerializer.Serialize(webhookGroup.DisplayName)! + displayName ); foreach (var property in webhookGroup.Properties) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/GlobalUsings.cs b/aspnet-core/services/LY.MicroService.Applications.Single/GlobalUsings.cs index 983906ffd..10f1a3045 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/GlobalUsings.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/GlobalUsings.cs @@ -135,8 +135,6 @@ global using LINGYUN.Platform; global using LINGYUN.Platform.EntityFrameworkCore; global using LINGYUN.Platform.HttpApi; global using LINGYUN.Platform.Localization; -global using LINGYUN.Platform.Settings.VueVbenAdmin; -global using LINGYUN.Platform.Theme.VueVbenAdmin; global using LY.MicroService.Applications.Single.Bundling; global using LY.MicroService.Applications.Single.EntityFrameworkCore.MySql; global using LY.MicroService.Applications.Single.EntityFrameworkCore.PostgreSql; diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj index a37bdd7e8..81e194097 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj @@ -85,7 +85,6 @@ - diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs index b6018f153..13cee7f30 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -3,7 +3,6 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.BackgroundTasks.DistributedLocking; -using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Data.DbMigrator; @@ -79,7 +78,6 @@ namespace LY.MicroService.RealtimeMessage; typeof(AbpIdentityWeChatWorkModule), typeof(AbpBackgroundTasksQuartzModule), typeof(AbpBackgroundTasksDistributedLockingModule), - typeof(AbpBackgroundTasksExceptionHandlingModule), typeof(TaskManagementEntityFrameworkCoreModule), typeof(AbpMessageServiceEntityFrameworkCoreModule), typeof(AbpNotificationsEntityFrameworkCoreModule), diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj index 3a2e66356..8f961e343 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj @@ -62,7 +62,6 @@ - diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs index 5c08ad696..07baef6b6 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs @@ -3,7 +3,6 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.BackgroundTasks.DistributedLocking; -using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.Jobs; using LINGYUN.Abp.BackgroundTasks.Notifications; using LINGYUN.Abp.BackgroundTasks.Quartz; @@ -63,7 +62,6 @@ namespace LY.MicroService.TaskManagement; typeof(AbpBackgroundTasksJobsModule), typeof(AbpBackgroundTasksQuartzModule), typeof(AbpBackgroundTasksDistributedLockingModule), - typeof(AbpBackgroundTasksExceptionHandlingModule), typeof(AbpBackgroundTasksNotificationsModule), typeof(AbpElasticsearchJobsModule), typeof(AbpIdentityJobsModule), diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj index 537dfbebf..e5babebad 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj @@ -68,7 +68,6 @@ - diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs index 47c1cf392..c650f4247 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs @@ -3,7 +3,6 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.BackgroundTasks.DistributedLocking; -using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.Claims.Mapping; using LINGYUN.Abp.Dapr.Client.Wrapper; @@ -60,7 +59,6 @@ namespace LY.MicroService.WebhooksManagement; typeof(AbpWebhooksEventBusModule), typeof(AbpBackgroundTasksQuartzModule), typeof(AbpBackgroundTasksDistributedLockingModule), - typeof(AbpBackgroundTasksExceptionHandlingModule), typeof(AbpQuartzMySqlInstallerModule), typeof(TaskManagementEntityFrameworkCoreModule), typeof(AbpSaasEntityFrameworkCoreModule), diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj index ee8e5a726..49d3ab7ca 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj @@ -74,7 +74,6 @@ - diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs index 6746ccf4e..5f3194e9d 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs @@ -3,7 +3,6 @@ using LINGYUN.Abp.AspNetCore.Mvc.Wrapper; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Authorization.OrganizationUnits; using LINGYUN.Abp.BackgroundTasks.DistributedLocking; -using LINGYUN.Abp.BackgroundTasks.ExceptionHandling; using LINGYUN.Abp.BackgroundTasks.Quartz; using LINGYUN.Abp.BlobStoring.BlobManagement; using LINGYUN.Abp.Claims.Mapping; @@ -63,7 +62,6 @@ namespace LY.MicroService.WorkflowManagement; typeof(AbpAspNetCoreMultiTenancyModule), typeof(AbpBackgroundTasksQuartzModule), typeof(AbpBackgroundTasksDistributedLockingModule), - typeof(AbpBackgroundTasksExceptionHandlingModule), typeof(AbpQuartzMySqlInstallerModule), typeof(TaskManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule),