Browse Source

feat(saas): editiion is not a requirement

pull/518/head
cKey 4 years ago
parent
commit
a4cc77511c
  1. 2
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/AbpSaasDomainSharedModule.cs
  2. 1
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/en.json
  3. 1
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json
  4. 15
      aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN/Abp/MultiTenancy/Editions/EditionConfigurationProvider.cs

2
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(AbpSaasErrorCodes.Namespace, typeof(AbpSaasResource));
// 见租户管理模块 // 见租户管理模块
options.MapCodeNamespace("Volo.AbpIo.MultiTenancy", typeof(AbpSaasResource)); options.MapCodeNamespace("Volo.AbpIo.MultiTenancy", typeof(AbpSaasResource));
// 版本模块引用
options.MapCodeNamespace("LINGYUN.Abp.MultiTenancy.Editions", typeof(AbpSaasResource));
}); });
} }
} }

1
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}!", "Saas:020001": "Unable to create duplicate tenants {Name}!",
"Volo.AbpIo.MultiTenancy:010001": "The tenant is unavailable or restricted!", "Volo.AbpIo.MultiTenancy:010001": "The tenant is unavailable or restricted!",
"Volo.AbpIo.MultiTenancy:010002": "Tenant unavailable!", "Volo.AbpIo.MultiTenancy:010002": "Tenant unavailable!",
"LINGYUN.Abp.MultiTenancy.Editions:010001": "Version unavailable or restricted!",
"Menu:Saas": "Saas", "Menu:Saas": "Saas",
"Editions": "Editions", "Editions": "Editions",
"NewEdition": "New edition", "NewEdition": "New edition",

1
aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json

@ -5,7 +5,6 @@
"Saas:020001": "已经存在名为 {Name} 的租户!", "Saas:020001": "已经存在名为 {Name} 的租户!",
"Volo.AbpIo.MultiTenancy:010001": "租户不可用或受限制!", "Volo.AbpIo.MultiTenancy:010001": "租户不可用或受限制!",
"Volo.AbpIo.MultiTenancy:010002": "租户不可用!", "Volo.AbpIo.MultiTenancy:010002": "租户不可用!",
"LINGYUN.Abp.MultiTenancy.Editions:010001": "版本不可用或受限制!",
"Menu:Saas": "Saas", "Menu:Saas": "Saas",
"Editions": "版本", "Editions": "版本",
"NewEdition": "新版本", "NewEdition": "新版本",

15
aspnet-core/modules/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN/Abp/MultiTenancy/Editions/EditionConfigurationProvider.cs

@ -1,6 +1,5 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace LINGYUN.Abp.MultiTenancy.Editions; namespace LINGYUN.Abp.MultiTenancy.Editions;
@ -20,18 +19,12 @@ public class EditionConfigurationProvider : IEditionConfigurationProvider, ITran
if (tenantId.HasValue) if (tenantId.HasValue)
{ {
var editionInfo = await EditionStore.FindByTenantAsync(tenantId.Value); var editionInfo = await EditionStore.FindByTenantAsync(tenantId.Value);
if (editionInfo == null) if (editionInfo != null)
{ {
throw new BusinessException( edition = new EditionConfiguration(
code: "LINGYUN.Abp.MultiTenancy.Editions:010001", editionInfo.Id,
message: "Edition not found!", editionInfo.DisplayName);
details: "There is no edition with the tenant: " + tenantId
);
} }
edition = new EditionConfiguration(
editionInfo.Id,
editionInfo.DisplayName);
} }
return edition; return edition;

Loading…
Cancel
Save