diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/AbpSaasDomainSharedModule.cs b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/AbpSaasDomainSharedModule.cs index 5eb90db36..08622ae4c 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/AbpSaasDomainSharedModule.cs +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/AbpSaasDomainSharedModule.cs @@ -29,8 +29,6 @@ public class AbpSaasDomainSharedModule : AbpModule options.MapCodeNamespace(AbpSaasErrorCodes.Namespace, typeof(AbpSaasResource)); // 见租户管理模块 options.MapCodeNamespace("Volo.AbpIo.MultiTenancy", typeof(AbpSaasResource)); - // 版本模块引用 - options.MapCodeNamespace("LINGYUN.Abp.MultiTenancy.Editions", typeof(AbpSaasResource)); }); } } diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/en.json b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/en.json index 2ef8c2bb4..f3757db4c 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/en.json +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/en.json @@ -5,7 +5,6 @@ "Saas:020001": "Unable to create duplicate tenants {Name}!", "Volo.AbpIo.MultiTenancy:010001": "The tenant is unavailable or restricted!", "Volo.AbpIo.MultiTenancy:010002": "Tenant unavailable!", - "LINGYUN.Abp.MultiTenancy.Editions:010001": "Version unavailable or restricted!", "Menu:Saas": "Saas", "Editions": "Editions", "NewEdition": "New edition", diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json index d91ea3408..d358fdf14 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json @@ -5,7 +5,6 @@ "Saas:020001": "已经存在名为 {Name} 的租户!", "Volo.AbpIo.MultiTenancy:010001": "租户不可用或受限制!", "Volo.AbpIo.MultiTenancy:010002": "租户不可用!", - "LINGYUN.Abp.MultiTenancy.Editions:010001": "版本不可用或受限制!", "Menu:Saas": "Saas", "Editions": "版本", "NewEdition": "新版本", diff --git a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN/Abp/MultiTenancy/Editions/EditionConfigurationProvider.cs b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN/Abp/MultiTenancy/Editions/EditionConfigurationProvider.cs index 46d4943ae..5e9edee60 100644 --- a/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN/Abp/MultiTenancy/Editions/EditionConfigurationProvider.cs +++ b/aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN/Abp/MultiTenancy/Editions/EditionConfigurationProvider.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Volo.Abp; using Volo.Abp.DependencyInjection; namespace LINGYUN.Abp.MultiTenancy.Editions; @@ -20,18 +19,12 @@ public class EditionConfigurationProvider : IEditionConfigurationProvider, ITran if (tenantId.HasValue) { var editionInfo = await EditionStore.FindByTenantAsync(tenantId.Value); - if (editionInfo == null) + if (editionInfo != null) { - throw new BusinessException( - code: "LINGYUN.Abp.MultiTenancy.Editions:010001", - message: "Edition not found!", - details: "There is no edition with the tenant: " + tenantId - ); + edition = new EditionConfiguration( + editionInfo.Id, + editionInfo.DisplayName); } - - edition = new EditionConfiguration( - editionInfo.Id, - editionInfo.DisplayName); } return edition;