From 6451f15ed6ef2626bc5aaa760b034540ccc22d73 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 19 Sep 2022 16:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Program.cs | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs
index 866d33353..635eaab2b 100644
--- a/IRaCIS.Core.API/Program.cs
+++ b/IRaCIS.Core.API/Program.cs
@@ -19,22 +19,33 @@ namespace IRaCIS.Core.API
         {
             try
             {
-                var index = Array.IndexOf(args, "--env");
-                var environment = index > -1
-                     ? args[index + 1]
-                     : "Development";
+                //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
+                var config = new ConfigurationBuilder()
+                            .AddEnvironmentVariables()
+                            .Build();
+
+                var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
+
+                if (string.IsNullOrWhiteSpace(enviromentName))
+                {
+
+                    var index = Array.IndexOf(args, "--env");
+                     enviromentName = index > -1
+                         ? args[index + 1]
+                         : "Development";
+                }
 
                 //Dicom 浏览
                 //ImageManager.SetImplementation(WinFormsImageManager.Instance);
 
                 var host = CreateHostBuilder(args)
-                    .UseEnvironment(environment) //命令行传入环境
+                    .UseEnvironment(enviromentName) //命令行传入环境
                     .ConfigureAppConfiguration((hostContext, config) =>
                     {
 
                         //Console.WriteLine(hostContext.HostingEnvironment.EnvironmentName);                
                         config.AddJsonFile("appsettings.json", false, true)
-                                  .AddJsonFile($"appsettings.{environment}.json", false, true);
+                                  .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
                     })
                     .Build();
 
@@ -46,7 +57,7 @@ namespace IRaCIS.Core.API
                 
 
                 //// Serilog 
-                SerilogExtension.AddSerilogSetup(environment, host.Services);
+                SerilogExtension.AddSerilogSetup(enviromentName, host.Services);
 
                 //缓存项目的状态  匿名化数据
                 await InitCache(host);
@@ -55,7 +66,7 @@ namespace IRaCIS.Core.API
 
                 host.Run();
 
-                Log.Logger.Warning($"当前环境：{environment}");
+                Log.Logger.Warning($"当前环境：{enviromentName}");
 
             }
             catch (Exception e)