From d12e57868edae6f4babf4440b6f2678e58f78ad0 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Wed, 4 Mar 2020 19:05:00 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=83=E0=B8=AB?= =?UTF-8?q?=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=20environment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva01Controllers.cs | 8 +++--- ApiControllers/rep_eva02Controllers.cs | 8 +++--- ApiControllers/rep_eva03Controllers.cs | 8 +++--- ApiControllers/rep_familyControllers.cs | 8 +++--- .../rep_leave_summaryControllers.cs | 8 +++--- ApiControllers/rep_leave_totalControllers.cs | 8 +++--- .../rep_position_salaryControllers.cs | 8 +++--- ApiControllers/rep_samanaControllers.cs | 8 +++--- .../rep_study_historyControllers.cs | 8 +++--- ApiControllers/rep_working_typeControllers.cs | 8 +++--- Program.cs | 15 ++++++++++- Properties/launchSettings.json | 20 +++++++++++++- Startup.cs | 13 ++++++--- Views/Shared/_Layout.cshtml | 27 +++++++------------ Views/Shared/_LayoutDirect.cshtml | 18 ++++++------- .../eva_adjust_postponement_normal.cshtml | 6 ++--- .../eva_adjust_postponement_normal_d.cshtml | 6 ++--- .../eva_adjust_postponement_quota.cshtml | 6 ++--- .../eva_adjust_postponement_quota_d.cshtml | 6 ++--- .../eva_create_evaluation.cshtml | 6 ++--- .../eva_create_evaluation_d.cshtml | 6 ++--- .../eva_create_evaluation_d_summary.cshtml | 6 ++--- ..._create_evaluation_detail_agreement.cshtml | 6 ++--- ...reate_evaluation_detail_agreement_d.cshtml | 6 ++--- ...va_create_evaluation_detail_process.cshtml | 6 ++--- ..._create_evaluation_detail_process_d.cshtml | 6 ++--- ...create_evaluation_detail_process_d2.cshtml | 6 ++--- ...a_create_evaluation_detail_status_d.cshtml | 6 ++--- ...create_evaluation_detail_summary1_d.cshtml | 6 ++--- ...create_evaluation_detail_summary2_d.cshtml | 6 ++--- .../eva_evaluation_group.cshtml | 6 ++--- .../eva_evaluation_group_d.cshtml | 6 ++--- .../eva_evaluation_group_detail.cshtml | 6 ++--- .../eva_level_score.cshtml | 6 ++--- .../eva_level_score_d.cshtml | 6 ++--- .../eva_level_score_basic.cshtml | 6 ++--- .../eva_performance_plan.cshtml | 6 ++--- .../eva_performance_plan_d.cshtml | 6 ++--- .../eva_performance_plan_detail.cshtml | 6 ++--- .../eva_salary_cylinder.cshtml | 6 ++--- .../external_employee.cshtml | 6 ++--- .../external_employee_admin.cshtml | 6 ++--- Views/home/index.cshtml | 6 ++--- Views/home/index_report.cshtml | 4 +-- Views/home/testlogin.cshtml | 6 ++--- Views/rep_eva01View/rep_eva01_report.cshtml | 6 ++--- Views/rep_eva02View/rep_eva02_report.cshtml | 6 ++--- Views/rep_eva03View/rep_eva03_report.cshtml | 6 ++--- Views/rep_familyView/rep_family_report.cshtml | 4 +-- .../rep_leave_summary_report.cshtml | 4 +-- .../rep_leave_total_report.cshtml | 2 +- .../rep_position_salary_report.cshtml | 4 +-- Views/rep_samanaView/rep_samana_report.cshtml | 4 +-- .../rep_study_history_report.cshtml | 4 +-- .../rep_working_type_report.cshtml | 2 +- 55 files changed, 219 insertions(+), 174 deletions(-) diff --git a/ApiControllers/rep_eva01Controllers.cs b/ApiControllers/rep_eva01Controllers.cs index d852284..d181269 100644 --- a/ApiControllers/rep_eva01Controllers.cs +++ b/ApiControllers/rep_eva01Controllers.cs @@ -97,10 +97,10 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; - string username = Configuration["JasperReportServer:username"]; - string password = Configuration["JasperReportServer:password"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); string url = $"{mainurl}{reportsite}/rep_eva01.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_eva02Controllers.cs b/ApiControllers/rep_eva02Controllers.cs index 28e35c6..5a5182a 100644 --- a/ApiControllers/rep_eva02Controllers.cs +++ b/ApiControllers/rep_eva02Controllers.cs @@ -95,10 +95,10 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; - string username = Configuration["JasperReportServer:username"]; - string password = Configuration["JasperReportServer:password"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); string url = $"{mainurl}{reportsite}/rep_eva02.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_eva03Controllers.cs b/ApiControllers/rep_eva03Controllers.cs index 409d4df..195952d 100644 --- a/ApiControllers/rep_eva03Controllers.cs +++ b/ApiControllers/rep_eva03Controllers.cs @@ -94,10 +94,10 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; - string username = Configuration["JasperReportServer:username"]; - string password = Configuration["JasperReportServer:password"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); string url = $"{mainurl}{reportsite}/rep_eva03.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_familyControllers.cs b/ApiControllers/rep_familyControllers.cs index 9e6ec20..f338cf3 100644 --- a/ApiControllers/rep_familyControllers.cs +++ b/ApiControllers/rep_familyControllers.cs @@ -96,10 +96,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_family.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_family.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/ApiControllers/rep_leave_summaryControllers.cs b/ApiControllers/rep_leave_summaryControllers.cs index 0bdd5e2..810cd75 100644 --- a/ApiControllers/rep_leave_summaryControllers.cs +++ b/ApiControllers/rep_leave_summaryControllers.cs @@ -95,10 +95,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_leave_summary.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_leave_summary.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/ApiControllers/rep_leave_totalControllers.cs b/ApiControllers/rep_leave_totalControllers.cs index 7448b1b..9a753f4 100644 --- a/ApiControllers/rep_leave_totalControllers.cs +++ b/ApiControllers/rep_leave_totalControllers.cs @@ -96,10 +96,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_leave_total.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_leave_total.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/ApiControllers/rep_position_salaryControllers.cs b/ApiControllers/rep_position_salaryControllers.cs index 4810bf3..57f5591 100644 --- a/ApiControllers/rep_position_salaryControllers.cs +++ b/ApiControllers/rep_position_salaryControllers.cs @@ -96,10 +96,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_position_salary.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_position_salary.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/ApiControllers/rep_samanaControllers.cs b/ApiControllers/rep_samanaControllers.cs index 88c8e67..a938569 100644 --- a/ApiControllers/rep_samanaControllers.cs +++ b/ApiControllers/rep_samanaControllers.cs @@ -95,10 +95,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_samana.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_samana.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/ApiControllers/rep_study_historyControllers.cs b/ApiControllers/rep_study_historyControllers.cs index 249519e..34e8a2f 100644 --- a/ApiControllers/rep_study_historyControllers.cs +++ b/ApiControllers/rep_study_historyControllers.cs @@ -96,10 +96,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_study_history.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_study_history.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/ApiControllers/rep_working_typeControllers.cs b/ApiControllers/rep_working_typeControllers.cs index ab8a406..ddc5415 100644 --- a/ApiControllers/rep_working_typeControllers.cs +++ b/ApiControllers/rep_working_typeControllers.cs @@ -96,10 +96,12 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - string reportsite = Configuration["JasperReportServer:reportsite"]; + string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); + string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_LoginURL"); + string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); + string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string url = $"{mainurl}{reportsite}/rep_working_type.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; + string url = $"{mainurl}{reportsite}/rep_working_type.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); var stream = new MemoryStream(data); diff --git a/Program.cs b/Program.cs index aa66378..2efaf62 100644 --- a/Program.cs +++ b/Program.cs @@ -25,6 +25,19 @@ namespace Test01 Console.Title = "BKK Application"; + 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"); + string SiteInformation_appsite = Environment.GetEnvironmentVariable("SiteInformation_appsite"); + string SiteInformation_apisite = Environment.GetEnvironmentVariable("SiteInformation_apisite"); + string SiteInformation_mainsite = Environment.GetEnvironmentVariable("SiteInformation_mainsite"); + string SiteInformation_modulesite = Environment.GetEnvironmentVariable("SiteInformation_modulesite"); + string SiteInformation_sitename = Environment.GetEnvironmentVariable("SiteInformation_sitename"); + string SiteInformation_modulename = Environment.GetEnvironmentVariable("SiteInformation_modulename"); + string SiteInformation_chatsite = Environment.GetEnvironmentVariable("SiteInformation_chatsite"); + var host = BuildWebHost(args); var config = new ConfigurationBuilder() @@ -37,7 +50,7 @@ namespace Test01 if (!string.IsNullOrEmpty(enableMigration)) { MigrationData.EnsureMigration(host.Services); - return; + //return; } var enableSeedApplicationDb = Convert.ToBoolean(config.GetSection("EnableSeedApplicationDb").Value); diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json index d52ab76..cee2b04 100644 --- a/Properties/launchSettings.json +++ b/Properties/launchSettings.json @@ -13,7 +13,25 @@ "launchBrowser": true, "launchUrl": "swagger", "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" + "SiteInformation_apisite": "/eva", + "DB_USERNAME": "postgres", + "JasperReportServer_reportsite": "/tb320hr", + "SiteInformation_modulesite": "http://tb320dev.zd.co.th/menu/evaluation", + "DB_NAME": "tb320_hr", + "DB_PORT": "5432", + "DB_PASSWORD": "project0*", + "JasperReportServer_username": "jasper", + "SiteInformation_mainsite": "http://tb320dev.zd.co.th", + "JasperReportServer_password": "ZdPr0jects", + "DB_HOST": "192.168.2.233", + "SiteInformation_modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน", + "SiteInformation_chatsite": "http://chat.rmutto.ac.th", + "ASPNETCORE_ENVIRONMENT": "Development", + "MIGRATION": "true", + "JasperReportServer_MainURL": "http://tb320.zd.co.th/jasperserver/rest_v2/reports", + "JasperReportServer_LoginURL": "http://tb320.zd.co.th/jasperserver/rest_v2/reports", + "SiteInformation_appsite": "/eva", + "SiteInformation_sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์" } }, "Test01": { diff --git a/Startup.cs b/Startup.cs index 866e090..18434df 100644 --- a/Startup.cs +++ b/Startup.cs @@ -62,10 +62,17 @@ namespace Test01 string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("mainDBConnectionString"); + string SiteInformation_appsite = Environment.GetEnvironmentVariable("SiteInformation_appsite"); + string SiteInformation_apisite = Environment.GetEnvironmentVariable("SiteInformation_apisite"); + string SiteInformation_mainsite = Environment.GetEnvironmentVariable("SiteInformation_mainsite"); + string SiteInformation_modulesite = Environment.GetEnvironmentVariable("SiteInformation_modulesite"); + string SiteInformation_sitename = Environment.GetEnvironmentVariable("SiteInformation_sitename"); + string SiteInformation_modulename = Environment.GetEnvironmentVariable("SiteInformation_modulename"); + string SiteInformation_chatsite = Environment.GetEnvironmentVariable("SiteInformation_chatsite"); string idUrl = Configuration["IdentityServer:url"]; - string apiName = Configuration["IdentityServer:apiName"]; - string appsite = Configuration["SiteInformation:appsite"]; + string apiName = SiteInformation_apisite; + string appsite = SiteInformation_appsite; #region Entity Framework services.AddHttpContextAccessor(); @@ -290,7 +297,7 @@ namespace Test01 // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { - string appsite = Configuration["SiteInformation:appsite"]; + string appsite = Environment.GetEnvironmentVariable("SiteInformation_appsite"); #region Error Page if (env.IsDevelopment()) diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index e5056ea..e86241e 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -9,7 +9,7 @@ - @Configuration["SiteInformation:sitename"] + @Environment.GetEnvironmentVariable("SiteInformation_sitename") @@ -77,7 +77,7 @@
- + @@ -90,26 +90,26 @@
@@ -192,8 +185,8 @@ diff --git a/Views/Shared/_LayoutDirect.cshtml b/Views/Shared/_LayoutDirect.cshtml index 1eb3dc6..835ba49 100644 --- a/Views/Shared/_LayoutDirect.cshtml +++ b/Views/Shared/_LayoutDirect.cshtml @@ -6,7 +6,7 @@ - @Configuration["SiteInformation:sitename"] + @Environment.GetEnvironmentVariable("SiteInformation_sitename") @@ -73,7 +73,7 @@
- + @@ -87,26 +87,26 @@