diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Editions/Dto/EditionCreateOrUpdateBase.cs b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Editions/Dto/EditionCreateOrUpdateBase.cs index 3a114691d..8dc15002c 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Editions/Dto/EditionCreateOrUpdateBase.cs +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Editions/Dto/EditionCreateOrUpdateBase.cs @@ -8,5 +8,6 @@ public abstract class EditionCreateOrUpdateBase : ExtensibleObject { [Required] [DynamicStringLength(typeof(EditionConsts), nameof(EditionConsts.MaxDisplayNameLength))] + [Display(Name = "EditionName")] public string DisplayName { get; set; } } diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantCreateOrUpdateBase.cs b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantCreateOrUpdateBase.cs index cdcff54cb..f6a65c570 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantCreateOrUpdateBase.cs +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantCreateOrUpdateBase.cs @@ -15,4 +15,8 @@ public abstract class TenantCreateOrUpdateBase : ExtensibleObject public bool IsActive { get; set; } = true; public Guid? EditionId { get; set; } + + public DateTime? EnableTime { get; set; } + + public DateTime? DisableTime { get; set; } } \ No newline at end of file diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Editions/EditionAppService.cs b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Editions/EditionAppService.cs index 0fe455926..81fcdd12e 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Editions/EditionAppService.cs +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Editions/EditionAppService.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.ObjectExtending; +using Volo.Abp.Data; namespace LINGYUN.Abp.Saas.Editions; @@ -74,7 +75,7 @@ public class EditionAppService : AbpSaasAppServiceBase, IEditionAppService { await EditionManager.ChangeDisplayNameAsync(edition, input.DisplayName); } - + edition.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); input.MapExtraPropertiesTo(edition); await EditionRepository.UpdateAsync(edition); diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Tenants/TenantAppService.cs b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Tenants/TenantAppService.cs index 123bcfb12..452d10b86 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Tenants/TenantAppService.cs +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Tenants/TenantAppService.cs @@ -8,6 +8,8 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.EventBus.Distributed; using Volo.Abp.ObjectExtending; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Data; namespace LINGYUN.Abp.Saas.Tenants; @@ -71,6 +73,8 @@ public class TenantAppService : AbpSaasAppServiceBase, ITenantAppService var tenant = await TenantManager.CreateAsync(input.Name); tenant.IsActive = input.IsActive; tenant.EditionId = input.EditionId; + tenant.SetEnableTime(input.EnableTime); + tenant.SetDisableTime(input.DisableTime); input.MapExtraPropertiesTo(tenant); if (!input.UseSharedDatabase && !input.DefaultConnectionString.IsNullOrWhiteSpace()) @@ -110,6 +114,9 @@ public class TenantAppService : AbpSaasAppServiceBase, ITenantAppService tenant.IsActive = input.IsActive; tenant.EditionId = input.EditionId; + tenant.SetEnableTime(input.EnableTime); + tenant.SetDisableTime(input.DisableTime); + tenant.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); input.MapExtraPropertiesTo(tenant); await TenantRepository.UpdateAsync(tenant); 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 3dd7f19ed..e4e53490e 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 @@ -23,6 +23,9 @@ "DisplayName:UseSharedDatabase": "Use the Shared Database", "DisplayName:Name": "Name", "DisplayName:Value": "Value", + "DisplayName:IsActive": "Active", + "DisplayName:EnableTime": "Enable Time", + "DisplayName:DisableTime": "Disable Time", "ManageHostFeatures": "Manage Host features", "Permission:EditionManagement": "Edition management", "Permission:TenantManagement": "Tenant management", 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 0afa2203a..44fa5ec8c 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 @@ -23,6 +23,9 @@ "DisplayName:UseSharedDatabase": "使用共享数据库", "DisplayName:Name": "名称", "DisplayName:Value": "值", + "DisplayName:IsActive": "启用", + "DisplayName:EnableTime": "启用时间", + "DisplayName:DisableTime": "禁用时间", "ManageHostFeatures": "管理Host特性", "Permission:EditionManagement": "版本管理", "Permission:TenantManagement": "租户管理",