Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
优化界面阅读、导航操作、优化详情页,高亮显示错误信息
  • Loading branch information
lianggx committed Nov 29, 2019
1 parent 62f021f commit e412f1a
Show file tree
Hide file tree
Showing 41 changed files with 24,891 additions and 8,867 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@
"runtime": {
"lib/netstandard1.3/System.Threading.ThreadPool.dll": {
"assemblyVersion": "4.0.11.0",
"fileVersion": "4.6.24705.1"
"fileVersion": "4.6.24702.1"
}
}
},
Expand Down Expand Up @@ -1511,7 +1511,7 @@
"runtime.native.System.Net.Security/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-ARfgeRYF2AnYIcqEvy9VE0agN/3zexMMPtcegq1THpOMS63rIGMi706vCo6pbv9Xzw4qhdX1Gu1zyLZHj2WtLA==",
"sha512": "sha512-zjSIBdddAnHaNrPk1b5ILBgTR9Sdwi+EAC+24tRV3qVq4xdij7mx6wR4XbbLa9t92zbnfT9D0S9LFp876dfeEQ==",
"path": "runtime.native.system.net.security/4.3.0",
"hashPath": "runtime.native.system.net.security.4.3.0.nupkg.sha512"
},
Expand Down Expand Up @@ -1756,7 +1756,7 @@
"System.Net.NameResolution/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==",
"sha512": "sha512-UyodRGthX/86+QYdo4ACZ2XONj5Ec045YVwElpA891N8+/T0QaF+R8VEO8jn3yeumho4/WfYrRfk7TkluRynsw==",
"path": "system.net.nameresolution/4.3.0",
"hashPath": "system.net.nameresolution.4.3.0.nupkg.sha512"
},
Expand Down Expand Up @@ -1889,7 +1889,7 @@
"System.Security.Claims/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-P/+BR/2lnc4PNDHt/TPBAWHVMLMRHsyYZbU1NphW4HIWzCggz8mJbTQQ3MKljFE7LS3WagmVFuBgoLcFzYXlkA==",
"sha512": "sha512-n/MC2TCXDjHjOdU8UQnWhM9FgE5e++z8m6HW4xrum+jV/ZH0SuCYQt/hyPyJiDODo3grEWOVzhW29mAL7VpAiA==",
"path": "system.security.claims/4.3.0",
"hashPath": "system.security.claims.4.3.0.nupkg.sha512"
},
Expand Down Expand Up @@ -1945,14 +1945,14 @@
"System.Security.Principal/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-I1tkfQlAoMM2URscUtpcRo/hX0jinXx6a/KUtEQoz3owaYwl3qwsO8cbzYVVnjxrzxjHo3nJC+62uolgeGIS9A==",
"sha512": "sha512-xfm+bWtDSCgnbHJVpZIPqBcsq9zeTq9yXIz8Bjgw15QeNqqbq8Bq3foFfdJch/Z1horX/qJj4bP6bx2aG0XU9g==",
"path": "system.security.principal/4.3.0",
"hashPath": "system.security.principal.4.3.0.nupkg.sha512"
},
"System.Security.Principal.Windows/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-HVL1rvqYtnRCxFsYag/2le/ZfKLK4yMw79+s6FmKXbSCNN0JeAhrYxnRAHFoWRa0dEojsDcbBSpH3l22QxAVyw==",
"sha512": "sha512-ZEGSd3zUKgPl791nTMIp5pXQ9KyMhPsyKf011fp3J0Q16K8w7I4AWXj7dzsS8jeBqtEN1zampREG1g9EZNijbQ==",
"path": "system.security.principal.windows/4.3.0",
"hashPath": "system.security.principal.windows.4.3.0.nupkg.sha512"
},
Expand Down Expand Up @@ -2008,7 +2008,7 @@
"System.Threading.ThreadPool/4.3.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==",
"sha512": "sha512-575wMrVtWOgxHlyHqSH3PUbN4RyMWSFfSipCvK3vmCrt1Q6GGRPKbs3mSwJnHrZVy4L91S9HeLr7VVEdKQaXSQ==",
"path": "system.threading.threadpool/4.3.0",
"hashPath": "system.threading.threadpool.4.3.0.nupkg.sha512"
},
Expand Down
17 changes: 16 additions & 1 deletion src/TomatoLog.Server/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
using TomatoLog.Common.Interface;
using TomatoLog.Server.Models;
using TomatoLog.Server.ViewModels;
using System.Collections.Generic;
using TomatoLog.Common.Utilities;
using Newtonsoft.Json;

namespace TomatoLog.Server.Controllers
{
Expand All @@ -31,6 +34,19 @@ public async Task<IActionResult> Index()
return View();
}

public async Task<IActionResult> Labels([FromQuery]string proj)
{
ViewBag.Proj = proj;
var labels = await logWriter.GetLabels(proj);
List<FileDesc> list = new List<FileDesc>();
labels.ForEach(s =>
{
var obj = JsonConvert.DeserializeObject<FileDesc>(s);
list.Add(obj);
});
return View(list);
}

public async Task<IActionResult> Detail([FromQuery]MessageViewModel model)
{
ViewBag.Message = model;
Expand All @@ -39,7 +55,6 @@ public async Task<IActionResult> Detail([FromQuery]MessageViewModel model)
return View(result);
}


[HttpPost]
public IActionResult Detail([FromForm]string[] fields, [FromForm]MessageViewModel model)
{
Expand Down
3 changes: 2 additions & 1 deletion src/TomatoLog.Server/TomatoLog.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<PackageLicenseUrl>https://github.com/lianggx/TomatoLog/blob/master/LICENSE</PackageLicenseUrl>
<Version>1.0.3</Version>
<Version>1.1.0</Version>
<Authors>lianggx</Authors>
<Product>TomatoLog</Product>
<PackageProjectUrl>https://github.com/lianggx/TomatoLog</PackageProjectUrl>
Expand All @@ -18,6 +18,7 @@
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
<PackageReference Include="CSRedisCore" Version="3.0.60" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
<Watch Include="..\**\*.cs" />
</ItemGroup>
Expand Down
7 changes: 3 additions & 4 deletions src/TomatoLog.Server/Views/Config/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
}

<div class="container">
<div id="saveTips" class="alert alert-success hidden text-center">
<div id="saveTips" class="alert alert-success invisible text-center">
<strong>Success!</strong>
</div>
<h2>Report Config</h2>
<h2 id="tipsMessage" class="p-3 mb-2 bg-success text-white" data-placement="top"></h2>
<h2>Global Config</h2>
<div class="panel panel-info">
<form class="form-group" action="/Config/Setting" method="post">
<div class="panel-heading bg-info">
Expand Down Expand Up @@ -92,7 +91,7 @@
{
<script type="text/javascript">
$(document).ready(function () {
$("#saveTips").removeClass("hidden");
$("#saveTips").removeClass("invisible");
var alertClose = setTimeout(function () {
$("#saveTips").slideUp();
}, 500);
Expand Down
12 changes: 7 additions & 5 deletions src/TomatoLog.Server/Views/Home/Contact.cshtml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@{
ViewData["Title"] = "Contact US";
}

<h2>Contact US</h2>
<address>
Move to <a href="https://github.com/lianggx/TomatoLog" target="_blank">GitHub</a> report issue
</address>
<div class="jumbotron">
<h1 class="display-4">Contact US</h1>
<p class="lead">lianggx@foxmail.com</p>
<hr class="my-4">
<p>Click on the link below to contact us.</p>
<a class="btn btn-primary btn-lg" href="https://github.com/lianggx/TomatoLog" role="button" target="_blank">github.com</a>
</div>
Loading

0 comments on commit e412f1a

Please sign in to comment.