Fix some bug

realLiangshiwei · Jun 9, 2021 · 75fe55e · 75fe55e
1 parent 2a2821e
commit 75fe55e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 18 deletions.
diff --git a/src/LogDashboard/EmbeddedFiles/LogDashboardEmbeddedFiles.cs b/src/LogDashboard/EmbeddedFiles/LogDashboardEmbeddedFiles.cs
@@ -21,16 +21,15 @@ public class LogDashboardEmbeddedFiles
             {".ttf","application/octet-stream" },
         };
 
-        private static Assembly _assembly;
+        private static readonly Assembly Assembly;
 
         static LogDashboardEmbeddedFiles()
         {
-            _assembly = Assembly.GetExecutingAssembly();
+            Assembly = Assembly.GetExecutingAssembly();
         }
 
         public static async Task IncludeEmbeddedFile(HttpContext context, string path)
         {
-
             context.Response.OnStarting(() =>
             {
                 if (context.Response.StatusCode == (int)HttpStatusCode.OK)
@@ -41,14 +40,20 @@ public static async Task IncludeEmbeddedFile(HttpContext context, string path)
                 return Task.CompletedTask;
             });
 
-            using (var inputStream = _assembly.GetManifestResourceStream($"{LogDashboardConsts.Root}.{path.Substring(1)}"))
+            try
             {
+                using var inputStream = Assembly.GetManifestResourceStream($"{LogDashboardConsts.Root}.{path.Substring(1)}");
                 if (inputStream == null)
                 {
-                    throw new ArgumentException($@"Resource with name {path.Substring(1)} not found in assembly {_assembly}.");
+                    throw new ArgumentException($@"Resource with name {path.Substring(1)} not found in assembly {Assembly}.");
                 }
                 await inputStream.CopyToAsync(context.Response.Body).ConfigureAwait(false);
             }
+            catch (Exception e)
+            {
+                await context.Response.WriteAsync($"{e.StackTrace}");
+            }
+
         }
     }
 }
diff --git a/src/LogDashboard/Extensions/StringArrayExtensions.cs b/src/LogDashboard/Extensions/StringArrayExtensions.cs
@@ -6,7 +6,7 @@ public static string TryGetValue(this string[] array, int index)
         {
             try
             {
-                return array[index].Trim().Replace(',', '.');
+                return array[index].Trim();
             }
             catch
             {

diff --git a/src/LogDashboard/Handle/DashboardHandle.cs b/src/LogDashboard/Handle/DashboardHandle.cs
@@ -100,7 +100,10 @@ private async Task<PagedResultModel<T>> GetPageResult(SearchLogInput input)
 
             expression = expression.AndIf(!string.IsNullOrWhiteSpace(input.Level), () => { return x => x.Level == input.Level; });
 
-            expression = expression.AndIf(!string.IsNullOrWhiteSpace(input.Message), () => { return x => x.Message.Contains(input.Message); });
+            expression = expression.AndIf(!string.IsNullOrWhiteSpace(input.Message), () =>
+            {
+                return x => x.Message.Contains(input.Message) || x.Logger.Contains(input.Message);
+            });
 
             if (input.Unique)
             {

diff --git a/src/LogDashboard/LogDashboard.csproj b/src/LogDashboard/LogDashboard.csproj
@@ -13,7 +13,8 @@
     <Company>liangshiwei</Company>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <LangVersion>8.0</LangVersion>
-    <PackageVersion>1.4.7</PackageVersion>
+    <PackageVersion>1.4.8</PackageVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -59,7 +60,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DapperExtensions.Standard" Version="1.1.0" />

diff --git a/src/LogDashboard/LogDashboardMiddleware.cs b/src/LogDashboard/LogDashboardMiddleware.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Reflection;
@@ -116,12 +117,11 @@ public async Task InvokeAsync(HttpContext httpContext)
                     }
                     else
                     {
-                        // ReSharper disable once PossibleInvalidOperationException
-                        var bytes = new byte[(int)httpContext.Request.ContentLength];
-                        await httpContext.Request.Body.ReadAsync(bytes, 0, (int)httpContext.Request.ContentLength);
-                        string requestJson = Encoding.Default.GetString(bytes);
 
-                        args = JsonConvert.DeserializeObject(requestJson,
+                        using var reader = new StreamReader(httpContext.Request.Body);
+                            var requestJson = await reader.ReadToEndAsync();
+
+                            args = JsonConvert.DeserializeObject(requestJson,
                             method.GetParameters().First().ParameterType);
 
                     }
@@ -134,4 +134,4 @@ public async Task InvokeAsync(HttpContext httpContext)
             await httpContext.Response.WriteAsync(html);
         }
     }
-}
+}
diff --git a/src/LogDashboard/css/bootstrap.min.css b/src/LogDashboard/css/bootstrap.min.css
diff --git a/src/LogDashboard/js/bootstrap.min.js b/src/LogDashboard/js/bootstrap.min.js
diff --git a/src/LogDashboard/js/log.js b/src/LogDashboard/js/log.js
@@ -154,7 +154,7 @@ $(function () {
             hwaccel: false, // Whether to use hardware acceleration
             className: 'spinner', // The CSS class to assign to the spinner
             zIndex: 2e9, // The z-index (defaults to 2000000000)
-            top: 'auto', // Top position relative to parent 
+            top: 'auto', // Top position relative to parent
             left: 'auto' // Left position relative to parent in px
         };
 
@@ -175,6 +175,7 @@ function loadList(page, pageSize) {
     $.ajax({
         method: "post",
         url: mapPath + "/Dashboard/Searchlog",
+        contentType: "application/json",
         data: JSON.stringify(params)
 
     }).done(function (data) {
@@ -203,6 +204,7 @@ function doSearch() {
     $.ajax({
         method: "post",
         url: mapPath + "/Dashboard/Searchlog",
+        contentType: "application/json",
         data: JSON.stringify(searchInput)
 
     }).done(function (data) {
@@ -216,6 +218,7 @@ function requestTrace(id) {
     $.ajax({
         method: "post",
         url: mapPath + "/Dashboard/RequestTrace",
+        contentType: "application/json",
         data: JSON.stringify({ id: id })
 
     }).done(function (data) {
@@ -237,6 +240,7 @@ function logInfo(id, modalId, bodyId) {
     $.ajax({
         method: "post",
         url: mapPath + "/Dashboard/LogInfo",
+        contentType: "application/json",
         data: JSON.stringify(log)
     }).done(function (html) {
         $("#" + bodyId).html(html);
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 try
                 {
-                    return array[index].Trim().Replace(',', '.');
+                    return array[index].Trim();
                 }
                 catch
                 {
@@ Expand Down @@