ปรับปรุง การอ่าน configuration ให้รับกับ ที่พี่เอก ทำ เพือแก้บัก รายงาน jasper รันไม่ขึ้น

This commit is contained in:
Nakorn Rientrakrunchai
2020-07-04 10:40:26 +07:00
parent c293ef770d
commit 9d00b796d8
2 changed files with 2 additions and 18 deletions

View File

@@ -52,15 +52,7 @@ namespace Test01
// Test jenkins // Test jenkins
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST"); string connectionString = MyHelper.GetConfig(Configuration, "connectionStrings:mainDBConnectionString");
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 SiteInformation_appsite = MyHelper.GetConfig(Configuration, "SiteInformation:appsite"); string SiteInformation_appsite = MyHelper.GetConfig(Configuration, "SiteInformation:appsite");
string SiteInformation_apisite = MyHelper.GetConfig(Configuration, "SiteInformation:apisite"); string SiteInformation_apisite = MyHelper.GetConfig(Configuration, "SiteInformation:apisite");

View File

@@ -23,15 +23,7 @@ namespace TTSW.Utils
{ {
System.Data.DataSet ds = new DataSet(); System.Data.DataSet ds = new DataSet();
var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST"); string connectionString = MyHelper.GetConfig(Configuration, "connectionStrings:externalDBConnectionString"); ;
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");
using (NpgsqlConnection conn = new NpgsqlConnection(connectionString)) using (NpgsqlConnection conn = new NpgsqlConnection(connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn)) using (NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn))