From a83f31d39f46cdd442fd0aa5cfdfd4efd89c16c1 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Wed, 4 Mar 2020 08:19:41 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20zd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Program.cs | 4 ++++ Startup.cs | 14 ++++---------- appsettings.Production.json | 12 ++++++------ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Program.cs b/Program.cs index 905bd96..aa66378 100644 --- a/Program.cs +++ b/Program.cs @@ -61,6 +61,10 @@ namespace Test01 public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) + .ConfigureAppConfiguration((hostingContext, config) => + { + config.AddEnvironmentVariables(); + }) .UseStartup() //NLog Config diff --git a/Startup.cs b/Startup.cs index 9643872..aea3949 100644 --- a/Startup.cs +++ b/Startup.cs @@ -52,17 +52,11 @@ namespace Test01 // Test jenkins public void ConfigureServices(IServiceCollection services) { - var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST"); - var DB_PORT = Environment.GetEnvironmentVariable("DB_PORT"); - var DB_NAME = Environment.GetEnvironmentVariable("DB_NAME"); - var DB_USERNAME = Environment.GetEnvironmentVariable("DB_USERNAME"); - var DB_PASSWORD = Environment.GetEnvironmentVariable("DB_PASSWORD"); - var envConnectionString = $"Server={DB_HOST};Port={DB_PORT};Database={DB_NAME};User ID={DB_USERNAME};Password={DB_PASSWORD};"; - - string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("mainDBConnectionString"); - - string idUrl = Configuration["IdentityServer:url"]; + string connectionString = Configuration.GetConnectionString("mainDBConnectionString"); + + + string idUrl = Configuration["IdentityServer:url"]; string apiName = Configuration["IdentityServer:apiName"]; string appsite = Configuration["SiteInformation:appsite"]; diff --git a/appsettings.Production.json b/appsettings.Production.json index 4d20d3b..44ef0d7 100644 --- a/appsettings.Production.json +++ b/appsettings.Production.json @@ -1,7 +1,7 @@ { "connectionStrings": { - "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr;User ID=postgres;Password=project0*;", - "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr;User ID=postgres;Password=project0*;" + "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;", + "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;" }, "IdentityServer": { "url": "", @@ -31,16 +31,16 @@ "LoginURL": "http://tb320.zd.co.th/jasperserver/rest_v2/login", "username": "jasper", "password": "ZdPr0jects", - "reportsite": "/tb320hr" + "reportsite": "/tb320hr_site2" }, "SiteInformation": { "appsite": "/eva", "apisite": "/eva", - "mainsite": "http://tb320dev.zd.co.th", - "modulesite": "http://tb320dev.zd.co.th/menu/evaluation", + "mainsite": "http://tb320.zd.co.th", + "modulesite": "http://tb320.zd.co.th/menu/evaluation", "sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์", "modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน", - "chatsite": "http://chat.rmutto.ac.th" + "chatsite": "" } }