diff --git a/ReportService/Controllers/HomeController.cs b/ReportService/Controllers/HomeController.cs index 7cd1a85..781aad8 100644 --- a/ReportService/Controllers/HomeController.cs +++ b/ReportService/Controllers/HomeController.cs @@ -1,14 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; +using System.Diagnostics; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using ReportService.Models; -using System.IO; -using Microsoft.AspNetCore.Hosting; -using System.Text.Json.Serialization; namespace ReportService.Controllers { @@ -27,10 +20,7 @@ namespace ReportService.Controllers reportName ??= ""; Response.Cookies.Append("_userCK",$"{{\"uid\":\"{uid}\",\"un\":\"{un}\"}}"); Response.Cookies.Append("_initReport",reportName); - return View(); - } - - public IActionResult Privacy() { + this._logger.LogInformation($"Home_Index:uid:{uid}:un:{un}"); return View(); } diff --git a/ReportService/Controllers/api/ReportApiController.cs b/ReportService/Controllers/api/ReportApiController.cs index e6c305b..3ba79a1 100644 --- a/ReportService/Controllers/api/ReportApiController.cs +++ b/ReportService/Controllers/api/ReportApiController.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore.Internal; using Microsoft.Extensions.Logging; using ReportService.Database; @@ -11,10 +12,9 @@ namespace ReportService.Controllers.api [Route("api/[Controller]/[Action]")] public class ReportApiController:Controller { - private readonly ILogger _logger; - public IWebHostEnvironment Env { get; private set; } public RSDbContext Db { get; set; } + public ILogger Logger { get; set; } /// /// 报表存放位置 @@ -25,8 +25,8 @@ namespace ReportService.Controllers.api } } - public ReportApiController(ILogger logger,IWebHostEnvironment env,RSDbContext db) { - this._logger = logger; + public ReportApiController(ILogger logger,IWebHostEnvironment env,RSDbContext db) { + this.Logger = logger; this.Env = env; this.Db = db; } @@ -45,6 +45,7 @@ namespace ReportService.Controllers.api } result.Add(file.Name.Substring(0,file.Name.IndexOf('.'))); } + this.Logger.LogInformation($"GetReportFiles:{string.Join(',',result.ToArray())}"); return result; } /// @@ -56,6 +57,7 @@ namespace ReportService.Controllers.api var htmlFile = Path.Combine(this.ReportPath,fileName + ".html"); using(var fr = System.IO.File.OpenRead(htmlFile)) { using(var sr = new StreamReader(fr)) { + this.Logger.LogInformation($"GetHtml:{fileName}"); return Content(sr.ReadToEnd()); } } @@ -70,6 +72,7 @@ namespace ReportService.Controllers.api var htmlFile = Path.Combine(this.ReportPath,fileName + ".rpt.html"); using(var fr = System.IO.File.OpenRead(htmlFile)) { using(var sr = new StreamReader(fr)) { + this.Logger.LogInformation($"GetPrint:{fileName}"); return Content(sr.ReadToEnd(),"text/html; charset=utf-8"); } } @@ -82,6 +85,7 @@ namespace ReportService.Controllers.api /// json对象 public object GetResult(string sql) { var result = this.Db.SqlJsonQuery(sql); + this.Logger.LogInformation($"GetResult:\n{sql}\n{result}"); return Content(result,"application/json; charset=utf-8"); } diff --git a/ReportService/Program.cs b/ReportService/Program.cs index 8ca5095..3f83087 100644 --- a/ReportService/Program.cs +++ b/ReportService/Program.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; +using NLog.Web; namespace ReportService { @@ -20,6 +15,7 @@ namespace ReportService .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseWindowsService(); + .UseWindowsService() + .UseNLog(); } } diff --git a/ReportService/ReportService.csproj b/ReportService/ReportService.csproj index 486b260..16b0f27 100644 --- a/ReportService/ReportService.csproj +++ b/ReportService/ReportService.csproj @@ -19,5 +19,6 @@ + diff --git a/ReportService/Views/Home/Privacy.cshtml b/ReportService/Views/Home/Privacy.cshtml deleted file mode 100644 index 2479fb7..0000000 --- a/ReportService/Views/Home/Privacy.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Privacy Policy"; -} -

@ViewData["Title"]

- -

Use this page to detail your site's privacy policy.

diff --git a/ReportService/nlog.config b/ReportService/nlog.config new file mode 100644 index 0000000..2239d65 --- /dev/null +++ b/ReportService/nlog.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ReportService/wwwroot/report/报表1.rpt.html b/ReportService/wwwroot/report/报表1.rpt.html index e71eb0e..3f09b0a 100644 --- a/ReportService/wwwroot/report/报表1.rpt.html +++ b/ReportService/wwwroot/report/报表1.rpt.html @@ -12,21 +12,24 @@ -
+
- - - - - + + + + + + + +
姓名年龄性别登录用户编号登录用户名报表1
姓名年龄性别登录用户编号登录用户名