Merge branch 'dev'

# Conflicts:
#	Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
This commit is contained in:
Argo Zhang 2019-04-14 16:41:16 +08:00
commit 545ec499e7
3 changed files with 4 additions and 4 deletions

View File

@ -12,12 +12,12 @@
sortOrder: 'desc',
queryParams: function (params) { return $.extend(params, { StartTime: $("#txt_operate_start").val(), EndTime: $("#txt_operate_end").val() }); },
columns: [
{ title: "记录时间", field: "LogTime", sortable: true },
{ title: "请求网址", field: "ErrorPage", sortable: true },
{ title: "用户名", field: "UserId", sortable: true },
{ title: "IP", field: "UserIp", sortable: true },
{ title: "异常类型", field: "ExceptionType", sortable: false },
{ title: "异常描述", field: "Message", sortable: false },
{ title: "记录时间", field: "LogTime", sortable: true }
{ title: "异常描述", field: "Message", sortable: false }
],
exportOptions: {
fileName: "程序异常数据"

View File

@ -14,7 +14,7 @@
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.1.0" />
<PackageReference Include="Longbow.Cache" Version="2.2.7" />
<PackageReference Include="Longbow.Data" Version="2.2.8" />
<PackageReference Include="Longbow.Web" Version="2.2.9" />
<PackageReference Include="Longbow.Web" Version="2.2.10" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" />
</ItemGroup>

View File

@ -14,7 +14,7 @@
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.1.0" />
<PackageReference Include="Longbow.Data" Version="2.2.8" />
<PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" />
<PackageReference Include="Longbow.Web" Version="2.2.9" />
<PackageReference Include="Longbow.Web" Version="2.2.10" />
<PackageReference Include="Longbow.Cache" Version="2.2.7" />
<PackageReference Include="Longbow" Version="2.2.9" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" />