Browse Source

feat(saas): missing change field

pull/518/head
cKey 4 years ago
parent
commit
b74c00554a
  1. 1
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Editions/Dto/EditionCreateOrUpdateBase.cs
  2. 4
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantCreateOrUpdateBase.cs
  3. 3
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Editions/EditionAppService.cs
  4. 7
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN/Abp/Saas/Tenants/TenantAppService.cs
  5. 3
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/en.json
  6. 3
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN/Abp/Saas/Localization/Resources/zh-Hans.json

1
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] [Required]
[DynamicStringLength(typeof(EditionConsts), nameof(EditionConsts.MaxDisplayNameLength))] [DynamicStringLength(typeof(EditionConsts), nameof(EditionConsts.MaxDisplayNameLength))]
[Display(Name = "EditionName")]
public string DisplayName { get; set; } public string DisplayName { get; set; }
} }

4
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 bool IsActive { get; set; } = true;
public Guid? EditionId { get; set; } public Guid? EditionId { get; set; }
public DateTime? EnableTime { get; set; }
public DateTime? DisableTime { get; set; }
} }

3
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 System.Threading.Tasks;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;
using Volo.Abp.Data;
namespace LINGYUN.Abp.Saas.Editions; namespace LINGYUN.Abp.Saas.Editions;
@ -74,7 +75,7 @@ public class EditionAppService : AbpSaasAppServiceBase, IEditionAppService
{ {
await EditionManager.ChangeDisplayNameAsync(edition, input.DisplayName); await EditionManager.ChangeDisplayNameAsync(edition, input.DisplayName);
} }
edition.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(edition); input.MapExtraPropertiesTo(edition);
await EditionRepository.UpdateAsync(edition); await EditionRepository.UpdateAsync(edition);

7
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.Application.Dtos;
using Volo.Abp.EventBus.Distributed; using Volo.Abp.EventBus.Distributed;
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Data;
namespace LINGYUN.Abp.Saas.Tenants; namespace LINGYUN.Abp.Saas.Tenants;
@ -71,6 +73,8 @@ public class TenantAppService : AbpSaasAppServiceBase, ITenantAppService
var tenant = await TenantManager.CreateAsync(input.Name); var tenant = await TenantManager.CreateAsync(input.Name);
tenant.IsActive = input.IsActive; tenant.IsActive = input.IsActive;
tenant.EditionId = input.EditionId; tenant.EditionId = input.EditionId;
tenant.SetEnableTime(input.EnableTime);
tenant.SetDisableTime(input.DisableTime);
input.MapExtraPropertiesTo(tenant); input.MapExtraPropertiesTo(tenant);
if (!input.UseSharedDatabase && !input.DefaultConnectionString.IsNullOrWhiteSpace()) if (!input.UseSharedDatabase && !input.DefaultConnectionString.IsNullOrWhiteSpace())
@ -110,6 +114,9 @@ public class TenantAppService : AbpSaasAppServiceBase, ITenantAppService
tenant.IsActive = input.IsActive; tenant.IsActive = input.IsActive;
tenant.EditionId = input.EditionId; tenant.EditionId = input.EditionId;
tenant.SetEnableTime(input.EnableTime);
tenant.SetDisableTime(input.DisableTime);
tenant.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(tenant); input.MapExtraPropertiesTo(tenant);
await TenantRepository.UpdateAsync(tenant); await TenantRepository.UpdateAsync(tenant);

3
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:UseSharedDatabase": "Use the Shared Database",
"DisplayName:Name": "Name", "DisplayName:Name": "Name",
"DisplayName:Value": "Value", "DisplayName:Value": "Value",
"DisplayName:IsActive": "Active",
"DisplayName:EnableTime": "Enable Time",
"DisplayName:DisableTime": "Disable Time",
"ManageHostFeatures": "Manage Host features", "ManageHostFeatures": "Manage Host features",
"Permission:EditionManagement": "Edition management", "Permission:EditionManagement": "Edition management",
"Permission:TenantManagement": "Tenant management", "Permission:TenantManagement": "Tenant management",

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

@ -23,6 +23,9 @@
"DisplayName:UseSharedDatabase": "使用共享数据库", "DisplayName:UseSharedDatabase": "使用共享数据库",
"DisplayName:Name": "名称", "DisplayName:Name": "名称",
"DisplayName:Value": "值", "DisplayName:Value": "值",
"DisplayName:IsActive": "启用",
"DisplayName:EnableTime": "启用时间",
"DisplayName:DisableTime": "禁用时间",
"ManageHostFeatures": "管理Host特性", "ManageHostFeatures": "管理Host特性",
"Permission:EditionManagement": "版本管理", "Permission:EditionManagement": "版本管理",
"Permission:TenantManagement": "租户管理", "Permission:TenantManagement": "租户管理",

Loading…
Cancel
Save