diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj index eee53a49..2b84cace 100644 --- a/Bootstrap.Admin/Bootstrap.Admin.csproj +++ b/Bootstrap.Admin/Bootstrap.Admin.csproj @@ -14,7 +14,7 @@ - + diff --git a/Bootstrap.Admin/Controllers/Api/TasksController.cs b/Bootstrap.Admin/Controllers/Api/TasksController.cs index 3ad24a8f..50530465 100644 --- a/Bootstrap.Admin/Controllers/Api/TasksController.cs +++ b/Bootstrap.Admin/Controllers/Api/TasksController.cs @@ -1,5 +1,6 @@ using Longbow.Tasks; using Microsoft.AspNetCore.Mvc; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -20,8 +21,12 @@ namespace Bootstrap.Admin.Controllers.Api [HttpGet] public IEnumerable Get() { - TaskServicesManager.GetOrAdd("测试任务", token => Task.Delay(1000), TriggerBuilder.WithCronExpression("*/5 * * * * *")); - return TaskServicesManager.ToList().Select(s => new { s.Name, s.Enabled, s.Status, s.LastRuntime, s.CreatedTime, s.NextRuntime, Triggers = s.Triggers.Count, s.LastRunResult, TriggerExpression = s.Triggers.FirstOrDefault().ToString() }); + TaskServicesManager.GetOrAdd("单次任务", token => Task.Delay(1000)); + TaskServicesManager.GetOrAdd("周期任务", token => Task.Delay(1000), TriggerBuilder.Build(Cron.Secondly(5))); + TaskServicesManager.GetOrAdd("超时任务", token => Task.Delay(2000), TriggerBuilder.Default.WithTimeout(1000).WithInterval(1000).WithRepeatCount(2).Build()); + TaskServicesManager.GetOrAdd("故障任务", token => throw new Exception("故障任务")); + TaskServicesManager.GetOrAdd("取消任务", token => Task.Delay(1000)).Triggers.First().Enabled = false; + return TaskServicesManager.ToList().Select(s => new { s.Name, Status = s.Status.ToString(), s.LastRuntime, s.CreatedTime, s.NextRuntime, LastRunResult = s.Triggers.First().LastResult.ToString(), TriggerExpression = s.Triggers.FirstOrDefault().ToString() }).OrderBy(s => s.Name); } } } diff --git a/Bootstrap.Admin/Controllers/Api/TasksLogController.cs b/Bootstrap.Admin/Controllers/Api/TasksLogController.cs index 5c504dda..400724c3 100644 --- a/Bootstrap.Admin/Controllers/Api/TasksLogController.cs +++ b/Bootstrap.Admin/Controllers/Api/TasksLogController.cs @@ -2,6 +2,7 @@ using Longbow.Web.SignalR; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; +using System.Linq; namespace Bootstrap.Admin.Controllers.Api { @@ -22,12 +23,11 @@ namespace Bootstrap.Admin.Controllers.Api public bool Get([FromQuery]string name, [FromServices]IHubContext hub) { var sche = TaskServicesManager.GetOrAdd(name); - sche.Triggers[0].RegisterPulseCallback(async t => + sche.Triggers.First().PulseCallback = async t => { - var success = t.Cancelled ? "Cancelled" : "Success"; - var result = $"{t.Scheduler.LastRuntime.Value.DateTime}: Trigger({t.GetType().Name}) Run({success}) NextRuntime: {t.NextRuntime.Value.DateTime} Elapsed: {t.LastRunElapsedTime.Seconds}s"; + var result = $"{{\"name\": \"{name}\", \"msg\": \"{sche.LastRuntime}: Trigger({t.GetType().Name}) Run({t.LastResult}) NextRuntime: {sche.NextRuntime} Elapsed: {t.LastRunElapsedTime.Seconds}s\"}}"; await SignalRManager.SendTaskLog(hub.Clients.All, result); - }); + }; return true; } } diff --git a/Bootstrap.Admin/Views/Admin/Tasks.cshtml b/Bootstrap.Admin/Views/Admin/Tasks.cshtml index d2efcd1c..fb143b80 100644 --- a/Bootstrap.Admin/Views/Admin/Tasks.cshtml +++ b/Bootstrap.Admin/Views/Admin/Tasks.cshtml @@ -33,14 +33,14 @@

var trigger = TriggerBuilder.Default.WithInterval(TimeSpan.FromSeconds(5)).WithRepeatCount(2).WithStartTime(DateTimeOffset.Now.AddMinutes(1)).Build(); -
+
TaskServicesManager.GetOrAdd("测试任务", token => Task.Delay(1000), trigger);

3. Cron表达式任务 (间隔 5 秒循环执行任务)

- TaskServicesManager.GetOrAdd("Cron表达式任务", token => Task.Delay(1000), TriggerBuilder.WithCronExpression("*/5 * * * * *")); + TaskServicesManager.GetOrAdd("Cron表达式任务", token => Task.Delay(1000), TriggerBuilder.Build("*/5 * * * * *"));

@@ -86,9 +86,11 @@
+
+ 自动滚屏 "; var content = ""; - if (value === "0") { + if (value === "Ready") { content = $.format(template, 'info', 'fa', '未开始'); } - else if (value === "1") { + else if (value === "Running") { content = $.format(template, 'success', 'play-circle', '运行中'); } - else if (value === "2") { - content = $.format(template, 'primary', 'stop-circle', '已停止'); - } - else if (value === "3") { + else if (value === "Disabled") { content = $.format(template, 'danger', 'times-circle', '已禁用'); } return content; }; - var enabledFormatter = function (value) { - var template = ""; - return $.format(template, value ? 'on' : 'off'); + var resultFormatter = function (value) { + var template = ""; + var content = ""; + if (value === "Success") { + content = $.format(template, 'success', '成功'); + } + else if (value === "Error") { + content = $.format(template, 'danger', '故障'); + } + else if (value === "Cancelled") { + content = $.format(template, 'info', '取消'); + } + else if (value === "Timeout") { + content = $.format(template, 'warning', '超时'); + } + return content; }; + $('.card-body table').lgbTable({ url: Tasks.url, dataBinder: { @@ -31,6 +42,7 @@ } }, smartTable: { + sidePagination: "client", sortName: 'CreateTime', sortOrder: 'desc', queryParams: function (params) { return $.extend(params, { operateType: $("#txt_operate_type").val(), OperateTimeStart: $("#txt_operate_start").val(), OperateTimeEnd: $("#txt_operate_end").val() }); }, @@ -40,7 +52,7 @@ { title: "上次执行时间", field: "LastRuntime", sortable: true }, { title: "下次执行时间", field: "NextRuntime", sortable: true }, { title: "触发条件", field: "TriggerExpression", sortable: false }, - { title: "是否启用", field: "Enabled", sortable: true, formatter: enabledFormatter }, + { title: "执行结果", field: "LastRunResult", sortable: false, align: 'center', formatter: resultFormatter }, { title: "状态", field: "Status", sortable: true, align: 'center', width: 106, formatter: stateFormatter } ], editButtons: { @@ -53,23 +65,29 @@ $('#dialogLog').modal('show').on('hide.bs.modal', function () { // close hub if ($taskMsg.hub) $taskMsg.hub.stop(); - $taskMsg.html(''); + $taskMsg.html('
'); }); - var lastMsg = ""; + // var lastMsg = ""; // open hub $taskMsg.notifi({ url: 'NotiHub', method: 'taskRev', callback: function (result) { - if (lastMsg === result) return; - lastMsg = result; - while (this.children().length > 50) { - this.children().first().remove(); + var content = this.children(); + while (content.children().length > 50) { + content.children().first().remove(); } + var data = JSON.parse(result); + if (data.name !== row.Name) return; + + result = data.msg; result = result.replace("Run(Cancelled)", "Run(Cancelled)"); result = result.replace("Run(Success)", "Run(Success)"); - this.append('
' + result + '
'); + content.append('
' + result + '
'); + + // auto scroll + if ($autoScroll.find('i').hasClass(check[0])) this.scrollTop(content.height()); }, onclose: function (error) { console.log(error); @@ -80,4 +98,13 @@ } } }); + + var $autoScroll = $('#dialogLog').find('.modal-footer > a.btn'); + var check = ["fa-check-square-o", "fa-square-o"]; + $autoScroll.on('click', function () { + var $this = $(this).find('i'); + + if ($this.hasClass(check[0])) $this.addClass(check[1]).removeClass(check[0]); + else $this.addClass(check[0]).removeClass(check[1]); + }); }); \ No newline at end of file diff --git a/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj b/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj index eeec2539..568e4f4e 100644 --- a/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj +++ b/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj @@ -5,7 +5,7 @@ - + diff --git a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj index 90f8f19d..c8f0b0c4 100644 --- a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj +++ b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj @@ -5,7 +5,7 @@ - + diff --git a/UnitTest/Bootstrap.Admin/Api/TasksTest.cs b/UnitTest/Bootstrap.Admin/Api/TasksTest.cs index d8459e59..f7c828f4 100644 --- a/UnitTest/Bootstrap.Admin/Api/TasksTest.cs +++ b/UnitTest/Bootstrap.Admin/Api/TasksTest.cs @@ -15,7 +15,7 @@ namespace Bootstrap.Admin.Api.SqlServer Assert.NotNull(resp); // receive log - var recv = await Client.GetAsJsonAsync("/api/TasksLog?name=测试任务"); + var recv = await Client.GetAsJsonAsync("/api/TasksLog?name=周期任务"); Assert.True(recv); // for test SignalRManager.SendTaskLog