From 9d00b796d85ba39fd950603b3112ea08c299df70 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Sat, 4 Jul 2020 10:40:26 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=20=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=AD=E0=B9=88=E0=B8=B2=E0=B8=99=20configuration=20?= =?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=20=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9E?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B9=80=E0=B8=AD=E0=B8=81=20=E0=B8=97?= =?UTF-8?q?=E0=B8=B3=20=E0=B9=80=E0=B8=9E=E0=B8=B7=E0=B8=AD=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1=E0=B8=81=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20jasper=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=99=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=82?= =?UTF-8?q?=E0=B8=B6=E0=B9=89=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Startup.cs | 10 +--------- Utils/MyDatabase.cs | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Startup.cs b/Startup.cs index db04e2b..afe543d 100644 --- a/Startup.cs +++ b/Startup.cs @@ -52,15 +52,7 @@ 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 connectionString = MyHelper.GetConfig(Configuration, "connectionStrings:mainDBConnectionString"); string SiteInformation_appsite = MyHelper.GetConfig(Configuration, "SiteInformation:appsite"); string SiteInformation_apisite = MyHelper.GetConfig(Configuration, "SiteInformation:apisite"); diff --git a/Utils/MyDatabase.cs b/Utils/MyDatabase.cs index 09c7761..05454ce 100644 --- a/Utils/MyDatabase.cs +++ b/Utils/MyDatabase.cs @@ -23,15 +23,7 @@ namespace TTSW.Utils { System.Data.DataSet ds = new DataSet(); - 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("externalDBConnectionString"); + string connectionString = MyHelper.GetConfig(Configuration, "connectionStrings:externalDBConnectionString"); ; using (NpgsqlConnection conn = new NpgsqlConnection(connectionString)) using (NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn))