From b6d912e6b4605a28cb296fa437d8ee87bdbb27d3 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Fri, 18 Mar 2022 10:00:10 +0800 Subject: [PATCH] fix(saas): Redirects the correct tenant management path --- apps/vue/src/api/saas/model/tenantModel.ts | 13 +++++++ apps/vue/src/api/saas/tenant.ts | 16 ++++----- .../components/TenantConnectionModal.vue | 6 ++-- .../saas/tenant/components/TenantModal.vue | 6 ++-- .../saas/tenant/components/TenantTable.vue | 12 +++---- .../src/views/saas/tenant/datas/ModalData.ts | 33 +++++++++++++++++- .../src/views/saas/tenant/datas/TableData.ts | 9 ++++- .../views/saas/tenant/hooks/useTenantTable.ts | 2 +- .../Abp/Saas/Localization/Resources/en.json | 1 + .../Saas/Localization/Resources/zh-Hans.json | 1 + ...UN.Abp.TenantManagement.Application.csproj | 1 - ...INGYUN.Abp.TenantManagement.HttpApi.csproj | 4 --- ...BackendAdminHttpApiHostModule.Configure.cs | 12 +++++++ .../BackendAdminHttpApiHostModule.cs | 1 + .../ocelot.Development.json | 4 +-- .../ocelot.backendadmin.json | 34 +++++++++---------- 16 files changed, 107 insertions(+), 48 deletions(-) diff --git a/apps/vue/src/api/saas/model/tenantModel.ts b/apps/vue/src/api/saas/model/tenantModel.ts index 467c5df76..cf709a8d4 100644 --- a/apps/vue/src/api/saas/model/tenantModel.ts +++ b/apps/vue/src/api/saas/model/tenantModel.ts @@ -9,6 +9,11 @@ import { export interface Tenant extends AuditedEntityDto { id: string; name: string; + editionId?: string; + editionName?: string; + isActive: boolean; + enableTime?: Date; + disableTime?: Date; } export interface TenantConnectionString { @@ -20,10 +25,18 @@ export interface CreateTenant { name: string; adminEmailAddress: string; adminPassword: string; + editionId?: string; + isActive: boolean; + enableTime?: Date; + disableTime?: Date; } export interface UpdateTenant { name: string; + editionId?: string; + isActive: boolean; + enableTime?: Date; + disableTime?: Date; } export interface GetTenantPagedRequest extends PagedAndSortedResultRequestDto { diff --git a/apps/vue/src/api/saas/tenant.ts b/apps/vue/src/api/saas/tenant.ts index a32c88f21..74d3821bb 100644 --- a/apps/vue/src/api/saas/tenant.ts +++ b/apps/vue/src/api/saas/tenant.ts @@ -12,14 +12,14 @@ import { format } from '/@/utils/strings'; /** 与 multi-tenancy中不同,此为管理tenant api */ enum Api { - Create = '/api/tenant-management/tenants', - DeleteById = '/api/tenant-management/tenants/{id}', - GetById = '/api/tenant-management/tenants/{id}', - GetList = '/api/tenant-management/tenants', - Update = '/api/tenant-management/tenants/{id}', - GetConnectionStrings = '/api/tenant-management/tenants/{id}/connection-string', - SetConnectionString = '/api/tenant-management/tenants/{id}/connection-string', - DeleteConnectionString = '/api/tenant-management/tenants/{id}/connection-string/{name}', + Create = '/api/saas/tenants', + DeleteById = '/api/saas/tenants/{id}', + GetById = '/api/saas/tenants/{id}', + GetList = '/api/saas/tenants', + Update = '/api/saas/tenants/{id}', + GetConnectionStrings = '/api/saas/tenants/{id}/connection-string', + SetConnectionString = '/api/saas/tenants/{id}/connection-string', + DeleteConnectionString = '/api/saas/tenants/{id}/connection-string/{name}', } export const getById = (id: string) => { diff --git a/apps/vue/src/views/saas/tenant/components/TenantConnectionModal.vue b/apps/vue/src/views/saas/tenant/components/TenantConnectionModal.vue index 12ac85576..7bcbf41c5 100644 --- a/apps/vue/src/views/saas/tenant/components/TenantConnectionModal.vue +++ b/apps/vue/src/views/saas/tenant/components/TenantConnectionModal.vue @@ -10,7 +10,7 @@