diff --git a/src/PearAdmin.AbpTemplate.Core/AbpTemplateCoreConsts.cs b/src/PearAdmin.AbpTemplate.Core/AbpTemplateCoreConsts.cs index ea67543b00577b3a43b68889b8afc5fa3104f449..f3453e7a197811774dfb8ed65d6840b461e997c5 100644 --- a/src/PearAdmin.AbpTemplate.Core/AbpTemplateCoreConsts.cs +++ b/src/PearAdmin.AbpTemplate.Core/AbpTemplateCoreConsts.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using Abp.Reflection.Extensions; @@ -13,7 +13,6 @@ namespace PearAdmin.AbpTemplate public const string LocalizationSourceName = "zh-Hans"; public const string ConnectionStringName = "Default"; public const string RedisConnectionStringName = "Redis"; - public const string DefaultCurrentEnviroment = "Development"; public const bool MultiTenancyEnabled = true; public const bool AllowTenantsToChangeEmailSettings = false; diff --git a/src/PearAdmin.AbpTemplate.EntityFrameworkCore/EntityFrameworkCore/AbpTemplateDbContextFactory.cs b/src/PearAdmin.AbpTemplate.EntityFrameworkCore/EntityFrameworkCore/AbpTemplateDbContextFactory.cs index 2905d8c09922147fa72f5504c2e14bc3065dd826..da36b7b60ec1861ec0356826da53606cc3d5f4d7 100644 --- a/src/PearAdmin.AbpTemplate.EntityFrameworkCore/EntityFrameworkCore/AbpTemplateDbContextFactory.cs +++ b/src/PearAdmin.AbpTemplate.EntityFrameworkCore/EntityFrameworkCore/AbpTemplateDbContextFactory.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using System; +using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using Microsoft.Extensions.Configuration; using PearAdmin.AbpTemplate.Configuration; @@ -14,17 +15,11 @@ namespace PearAdmin.AbpTemplate.EntityFrameworkCore { public AbpTemplateDbContext CreateDbContext(string[] args) { - var currentEnvironment = GetCurrentEnvironment(args); var builder = new DbContextOptionsBuilder(); - var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder(), currentEnvironment); + var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder(), Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"), addUserSecrets: true); AbpTemplateDbContextConfigurer.Configure(builder, configuration.GetConnectionString(AbpTemplateCoreConsts.ConnectionStringName)); return new AbpTemplateDbContext(builder.Options); } - - public string GetCurrentEnvironment(string[] args) - { - return AbpTemplateCoreConsts.DefaultCurrentEnviroment; - } } -} +} \ No newline at end of file