thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ปรับให้ระบบอ่านค่าจาก env ทั้งหมด

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-06-12 12:15:37 +07:00
parent eea05beb69
commit c293ef770d
96 changed files with 191 additions and 1548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Utils/FileUtil.cs
View File

@@ -45,12 +45,12 @@ namespace TTSW.Utils
}
public static StaticConfigModel GetStaticConfig()
{
StaticConfigModel s = new StaticConfigModel();
StaticConfigModel s = new StaticConfigModel();
string logfile = Configuration["Files:LogFile"];
string rootpath = Configuration["Directories:RootPath"];
string logs = Configuration["Directories:Logs"];
string files = Configuration["Directories:Files"];
string logfile = MyHelper.GetConfig(Configuration, "Files:LogFile");
string rootpath = MyHelper.GetConfig(Configuration, "Directories:RootPath");
string logs = MyHelper.GetConfig(Configuration, "Directories:Logs");
string files = MyHelper.GetConfig(Configuration, "Directories:Files");
if (!Directory.Exists(rootpath)) Directory.CreateDirectory(rootpath);
if (!Directory.Exists(logs)) Directory.CreateDirectory(logs);

19
Utils/MyHelper.cs
View File

@@ -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;
}
}