From 1e96ca1c123f8bf36fad4a9fc35713a1b1b5d908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B3=B0=E5=9B=9E=E8=B7=AF=E8=BD=AC?=
 <9496107+PeakLoopTurn@user.noreply.gitee.com>
Date: Sun, 25 Jul 2021 15:19:23 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=81=E7=A7=BB=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=A4=84=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E5=B0=B1?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=8C=E4=B8=8D=E5=BF=85=E5=86=99=E6=AD=BBDevelopme?=
 =?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbpTemplateCoreConsts.cs                        |  3 +--
 .../AbpTemplateDbContextFactory.cs                  | 13 ++++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/PearAdmin.AbpTemplate.Core/AbpTemplateCoreConsts.cs b/src/PearAdmin.AbpTemplate.Core/AbpTemplateCoreConsts.cs
index ea67543..f3453e7 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 2905d8c..da36b7b 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<AbpTemplateDbContext>();
-            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
-- 
Gitee