แก้ไขให้รับกับ zd
This commit is contained in:
@@ -61,6 +61,10 @@ namespace Test01
|
|||||||
|
|
||||||
public static IWebHost BuildWebHost(string[] args) =>
|
public static IWebHost BuildWebHost(string[] args) =>
|
||||||
WebHost.CreateDefaultBuilder(args)
|
WebHost.CreateDefaultBuilder(args)
|
||||||
|
.ConfigureAppConfiguration((hostingContext, config) =>
|
||||||
|
{
|
||||||
|
config.AddEnvironmentVariables();
|
||||||
|
})
|
||||||
.UseStartup<Startup>()
|
.UseStartup<Startup>()
|
||||||
|
|
||||||
//NLog Config
|
//NLog Config
|
||||||
|
|||||||
@@ -52,15 +52,9 @@ namespace Test01
|
|||||||
// Test jenkins
|
// Test jenkins
|
||||||
public void ConfigureServices(IServiceCollection services)
|
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 = Configuration.GetConnectionString("mainDBConnectionString");
|
||||||
|
|
||||||
string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("mainDBConnectionString");
|
|
||||||
|
|
||||||
string idUrl = Configuration["IdentityServer:url"];
|
string idUrl = Configuration["IdentityServer:url"];
|
||||||
string apiName = Configuration["IdentityServer:apiName"];
|
string apiName = Configuration["IdentityServer:apiName"];
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"connectionStrings": {
|
"connectionStrings": {
|
||||||
"mainDBConnectionString": "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;User ID=postgres;Password=project0*;"
|
"externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;"
|
||||||
},
|
},
|
||||||
"IdentityServer": {
|
"IdentityServer": {
|
||||||
"url": "",
|
"url": "",
|
||||||
@@ -31,16 +31,16 @@
|
|||||||
"LoginURL": "http://tb320.zd.co.th/jasperserver/rest_v2/login",
|
"LoginURL": "http://tb320.zd.co.th/jasperserver/rest_v2/login",
|
||||||
"username": "jasper",
|
"username": "jasper",
|
||||||
"password": "ZdPr0jects",
|
"password": "ZdPr0jects",
|
||||||
"reportsite": "/tb320hr"
|
"reportsite": "/tb320hr_site2"
|
||||||
},
|
},
|
||||||
"SiteInformation": {
|
"SiteInformation": {
|
||||||
"appsite": "/eva",
|
"appsite": "/eva",
|
||||||
"apisite": "/eva",
|
"apisite": "/eva",
|
||||||
"mainsite": "http://tb320dev.zd.co.th",
|
"mainsite": "http://tb320.zd.co.th",
|
||||||
"modulesite": "http://tb320dev.zd.co.th/menu/evaluation",
|
"modulesite": "http://tb320.zd.co.th/menu/evaluation",
|
||||||
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
||||||
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
||||||
"chatsite": "http://chat.rmutto.ac.th"
|
"chatsite": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user