ปรับให้ระบบอ่านค่าจาก env ทั้งหมด
This commit is contained in:
@@ -250,10 +250,10 @@ public class MyHelper
|
||||
|
||||
public static WebClient getHttpClient(IConfiguration Configuration)
|
||||
{
|
||||
string mainurl = Configuration["JasperReportServer:MainURL"];
|
||||
string loginurl = Configuration["JasperReportServer:LoginURL"];
|
||||
string username = Configuration["JasperReportServer:username"];
|
||||
string password = Configuration["JasperReportServer:password"];
|
||||
string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL");
|
||||
string loginurl = MyHelper.GetConfig(Configuration, "JasperReportServer:LoginURL");
|
||||
string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username");
|
||||
string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password");
|
||||
|
||||
WebClient httpclient = new WebClient();
|
||||
string login_url = $"{loginurl}?j_username={username}&j_password={password}";
|
||||
@@ -297,4 +297,15 @@ public class MyHelper
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public static string GetConfig(IConfiguration Configuration, string variable)
|
||||
{
|
||||
var env_var = Environment.GetEnvironmentVariable(variable);
|
||||
if (string.IsNullOrEmpty(env_var))
|
||||
{
|
||||
env_var = Environment.GetEnvironmentVariable(variable.Replace(":", "_"));
|
||||
}
|
||||
string var = !string.IsNullOrEmpty(env_var) ? env_var : Configuration[variable];
|
||||
return var;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user