From 107247706d90807d9ddf8a92665698b50f2b57c0 Mon Sep 17 00:00:00 2001 From: cjy Date: Sat, 3 Aug 2024 10:58:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.AdminApi.csproj.user | 7 ++-- .../Sys/Method/TenantApplyService.cs | 36 +++++++++---------- .../DS.WMS.MainApi/DS.WMS.MainApi.csproj.user | 2 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ds-wms-service/DS.WMS.AdminApi/DS.WMS.AdminApi.csproj.user b/ds-wms-service/DS.WMS.AdminApi/DS.WMS.AdminApi.csproj.user index 0d57883d..93bef62e 100644 --- a/ds-wms-service/DS.WMS.AdminApi/DS.WMS.AdminApi.csproj.user +++ b/ds-wms-service/DS.WMS.AdminApi/DS.WMS.AdminApi.csproj.user @@ -1,7 +1,10 @@  - https - D:\Source\Repos\DS8\ds-wms-service\DS.WMS.AdminApi\Properties\PublishProfiles\FolderProfile.pubxml + http + D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.AdminApi\Properties\PublishProfiles\FolderProfile.pubxml + + + ProjectDebugger \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/TenantApplyService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/TenantApplyService.cs index 5fdda4ec..bd7137fa 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/TenantApplyService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/TenantApplyService.cs @@ -271,24 +271,24 @@ public class TenantApplyService : ITenantApplyService await masterDb.Updateable(adminUser).ExecuteCommandAsync(); #endregion - #region 创建租户数据库及基础数初始化 - - - if (!dbScope.IsAnyConnection(tenant.Id)) - { - dbScope.AddConnection(new ConnectionConfig() { - ConfigId = tenant.Id, - ConnectionString = link.Connection, - DbType = link.DbType, - IsAutoCloseConnection = true }); - } - var tenantDb = saasService.GetBizDbScopeById(tenant.Id); - StaticConfig.CodeFirst_MySqlCollate="utf8mb4_0900_ai_ci";//较高版本支持 - //初始化数库 - tenantDb.DbMaintenance.CreateDatabase(); - - //tenantDb.CodeFirst.InitTables(typeof(CodeCountry)); - #endregion + //#region 创建租户数据库及基础数初始化 + + + //if (!dbScope.IsAnyConnection(tenant.Id)) + //{ + // dbScope.AddConnection(new ConnectionConfig() { + // ConfigId = tenant.Id, + // ConnectionString = link.Connection, + // DbType = link.DbType, + // IsAutoCloseConnection = true }); + //} + //var tenantDb = saasService.GetBizDbScopeById(tenant.Id); + //StaticConfig.CodeFirst_MySqlCollate="utf8mb4_0900_ai_ci";//较高版本支持 + ////初始化数库 + //tenantDb.DbMaintenance.CreateDatabase(); + + ////tenantDb.CodeFirst.InitTables(typeof(CodeCountry)); + //#endregion //更新租户申请 apply.AuditStatus = (AuditStatusEnum)(int)req.AuditInfo.Status; diff --git a/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user index 73975b0c..996c16b7 100644 --- a/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user +++ b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user @@ -1,6 +1,6 @@  - D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml + D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file