From c2a0a3cad52dbddd13842a54092fc14a91ca966f Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@163.com>
Date: Tue, 1 Oct 2019 14:54:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(#I12X7W):=20=E5=A2=9E=E5=8A=A0=20dotnet=20?=
 =?UTF-8?q?--info=20=E8=BF=90=E8=A1=8C=E6=97=B6=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Comment
comment #I12X7W

#Issue
link #I12X7W
---
 src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj | 2 +-
 src/admin/Bootstrap.Admin/wwwroot/js/healths.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj b/src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj
index b7fd7374..90c96357 100644
--- a/src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj
+++ b/src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
-    <PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.0" />
+    <PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta4" />
     <PackageReference Include="Longbow.Configuration" Version="2.2.7" />
     <PackageReference Include="Longbow.Logging" Version="3.0.0" />
     <PackageReference Include="Longbow.Tasks" Version="2.2.24" />
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/healths.js b/src/admin/Bootstrap.Admin/wwwroot/js/healths.js
index c65bce34..2c2baa3f 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/healths.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/healths.js
@@ -4,7 +4,7 @@
         return healthStatus[value];
     };
 
-    var cate = { "db": "数据库", "file": "组件文件", "mem": "内存", "Gitee": "Gitee 接口", "gc": "垃圾回收器" };
+    var cate = { "db": "数据库", "file": "组件文件", "mem": "内存", "Gitee": "Gitee 接口", "gc": "垃圾回收器", "dotnet-runtime": "运行时" };
     var CategoryFormatter = function (value) {
         return cate[value];
     };
@@ -70,6 +70,7 @@
             {
                 title: "值", field: "value", formatter: function (value, row) {
                     if (row.name === "Exception") value = $.format("<span class='text-danger'>{0}</span>", value);
+                    if (row.name === "dotnet --info") value = value.replace(/\r\n/g, "<br>");
                     return value;
                 }
             }