Skip to content

C
CAP
Commit 5cdc1980 authored by Savorboard's avatar Savorboard
Browse files
Options

add resource

parent a82790c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 353 deletions
src/DotNetCore.CAP/Dashboard/Content/resx/Strings.resx
View file @ 5cdc1980
......@@ -144,15 +144,6 @@
<data name="Common_Id" xml:space="preserve">
<value>Id</value>
</data>
<data name="Common_Job" xml:space="preserve">
<value>Job</value>
</data>
<data name="Common_JobExpired" xml:space="preserve">
<value>Job expired.</value>
</data>
<data name="Common_JobStateChanged_Text" xml:space="preserve">
<value>Job's state has been changed while fetching data.</value>
</data>
<data name="Common_LessDetails" xml:space="preserve">
<value>Less details...</value>
</data>
......@@ -192,26 +183,6 @@
<data name="EnqueuedJobsPage_Title" xml:space="preserve">
<value>Enqueued jobs</value>
</data>
<data name="FailedJobsPage_FailedJobsNotExpire_Warning_Html" xml:space="preserve">
<value>&lt;strong&gt;Failed jobs do not become expired&lt;/strong&gt; to allow you to re-queue them without any
time pressure. You should re-queue or delete them manually, or apply &lt;code&gt;AutomaticRetry(OnAttemptsExceeded = AttemptsExceededAction.Delete)&lt;/code&gt;
attribute to delete them automatically.</value>
</data>
<data name="FailedJobsPage_NoJobs" xml:space="preserve">
<value>You have no failed jobs at the moment.</value>
</data>
<data name="FailedJobsPage_Table_Failed" xml:space="preserve">
<value>Failed</value>
</data>
<data name="FailedJobsPage_Title" xml:space="preserve">
<value>Failed Jobs</value>
</data>
<data name="FetchedJobsPage_NoJobs" xml:space="preserve">
<value>The queue is empty.</value>
</data>
<data name="FetchedJobsPage_Title" xml:space="preserve">
<value>Fetched jobs</value>
</data>
<data name="HomePage_HistoryGraph" xml:space="preserve">
<value>History graph</value>
</data>
......@@ -242,36 +213,6 @@
<data name="PerPageSelector_ItemsPerPage" xml:space="preserve">
<value>Items per page</value>
</data>
<data name="ProcessingJobsPage_Aborted" xml:space="preserve">
<value>Looks like the job was aborted</value>
</data>
<data name="ProcessingJobsPage_NoJobs" xml:space="preserve">
<value>No jobs are being processed right now.</value>
</data>
<data name="ProcessingJobsPage_Table_Started" xml:space="preserve">
<value>Started</value>
</data>
<data name="ProcessingJobsPage_Title" xml:space="preserve">
<value>Processing Jobs</value>
</data>
<data name="RetriesPage_NoJobs" xml:space="preserve">
<value>All is OK – you have no retries.</value>
</data>
<data name="RetriesPage_Title" xml:space="preserve">
<value>Retries</value>
</data>
<data name="RetriesPage_Warning_Html" xml:space="preserve">
<value>&lt;h4&gt;Retries are working, but this page can't be displayed&lt;/h4&gt;
&lt;p&gt;
Don't worry, retries are working as expected. Your current job storage does not support
some queries required to show this page. Please try to update your storage or wait until
the full command set is implemented.
&lt;/p&gt;
&lt;p&gt;
Please go to the &lt;a href="{0}"&gt;Scheduled jobs&lt;/a&gt; page to see all the
scheduled jobs including retries.
&lt;/p&gt;</value>
</data>
<data name="ServersPage_NoServers" xml:space="preserve">
<value>There are no active servers. Background tasks will not be processed.</value>
</data>
......@@ -332,27 +273,12 @@
<data name="Metrics_DeletedJobs" xml:space="preserve">
<value>Deleted Jobs</value>
</data>
<data name="Metrics_FailedJobs" xml:space="preserve">
<value>Failed Jobs</value>
</data>
<data name="Metrics_ProcessingJobs" xml:space="preserve">
<value>Processing Jobs</value>
</data>
<data name="Metrics_RecurringJobs" xml:space="preserve">
<value>Recurring Jobs</value>
</data>
<data name="Metrics_Retries" xml:space="preserve">
<value>Retries</value>
</data>
<data name="Metrics_ScheduledJobs" xml:space="preserve">
<value>Scheduled Jobs</value>
</data>
<data name="Metrics_Servers" xml:space="preserve">
<value>Servers</value>
</data>
<data name="Metrics_SucceededJobs" xml:space="preserve">
<value>Succeeded Jobs</value>
</data>
<data name="Metrics_TotalConnections" xml:space="preserve">
<value>Total Connections</value>
</data>
......@@ -434,4 +360,13 @@
<data name="SubscribersPage_Title" xml:space="preserve">
<value>Subscribers</value>
</data>
<data name="Common_Group" xml:space="preserve">
<value>Group</value>
</data>
<data name="Common_Method" xml:space="preserve">
<value>Method</value>
</data>
<data name="Common_Name" xml:space="preserve">
<value>Name</value>
</data>
</root>
\ No newline at end of file
src/DotNetCore.CAP/Dashboard/Content/resx/Strings.zh.resx
View file @ 5cdc1980
......@@ -144,15 +144,6 @@
<data name="Common_Id" xml:space="preserve">
<value>编号</value>
</data>
<data name="Common_Job" xml:space="preserve">
<value>作业</value>
</data>
<data name="Common_JobExpired" xml:space="preserve">
<value>作业过期.</value>
</data>
<data name="Common_JobStateChanged_Text" xml:space="preserve">
<value>作业状态已经发生变化</value>
</data>
<data name="Common_LessDetails" xml:space="preserve">
<value>收起...</value>
</data>
......@@ -192,26 +183,6 @@
<data name="EnqueuedJobsPage_Title" xml:space="preserve">
<value>队列作业</value>
</data>
<data name="FailedJobsPage_FailedJobsNotExpire_Warning_Html" xml:space="preserve">
<value>&lt;strong&gt;Failed jobs do not become expired&lt;/strong&gt; to allow you to re-queue them without any
time pressure. You should re-queue or delete them manually, or apply &lt;code&gt;AutomaticRetry(OnAttemptsExceeded = AttemptsExceededAction.Delete)&lt;/code&gt;
attribute to delete them automatically.</value>
</data>
<data name="FailedJobsPage_NoJobs" xml:space="preserve">
<value>没有失败的作业</value>
</data>
<data name="FailedJobsPage_Table_Failed" xml:space="preserve">
<value>失败</value>
</data>
<data name="FailedJobsPage_Title" xml:space="preserve">
<value>失败的作业</value>
</data>
<data name="FetchedJobsPage_NoJobs" xml:space="preserve">
<value>没有任何作业</value>
</data>
<data name="FetchedJobsPage_Title" xml:space="preserve">
<value>Fetched jobs</value>
</data>
<data name="HomePage_HistoryGraph" xml:space="preserve">
<value>历史图表走势</value>
</data>
......@@ -242,18 +213,6 @@
<data name="PerPageSelector_ItemsPerPage" xml:space="preserve">
<value>每页条数</value>
</data>
<data name="ProcessingJobsPage_Aborted" xml:space="preserve">
<value>作业疑似终止</value>
</data>
<data name="ProcessingJobsPage_NoJobs" xml:space="preserve">
<value>没有立即执行的作业</value>
</data>
<data name="ProcessingJobsPage_Table_Started" xml:space="preserve">
<value>执行</value>
</data>
<data name="ProcessingJobsPage_Title" xml:space="preserve">
<value>执行中作业</value>
</data>
<data name="QueuesPage_NoJobs" xml:space="preserve">
<value>没有作业</value>
</data>
......@@ -272,24 +231,6 @@
<data name="QueuesPage_Title" xml:space="preserve">
<value>队列</value>
</data>
<data name="RetriesPage_NoJobs" xml:space="preserve">
<value>没有重试的作业</value>
</data>
<data name="RetriesPage_Title" xml:space="preserve">
<value>重试</value>
</data>
<data name="RetriesPage_Warning_Html" xml:space="preserve">
<value>&lt;h4&gt;Retries are working, but this page can't be displayed&lt;/h4&gt;
&lt;p&gt;
Don't worry, retries are working as expected. Your current job storage does not support
some queries required to show this page. Please try to update your storage or wait until
the full command set is implemented.
&lt;/p&gt;
&lt;p&gt;
Please go to the &lt;a href="{0}"&gt;Scheduled jobs&lt;/a&gt; page to see all the
scheduled jobs including retries.
&lt;/p&gt;</value>
</data>
<data name="ServersPage_NoServers" xml:space="preserve">
<value>没有活动服务器。后台作业将不会被执行。</value>
</data>
......@@ -350,27 +291,12 @@
<data name="Metrics_DeletedJobs" xml:space="preserve">
<value>删除</value>
</data>
<data name="Metrics_FailedJobs" xml:space="preserve">
<value>失败</value>
</data>
<data name="Metrics_ProcessingJobs" xml:space="preserve">
<value>执行中</value>
</data>
<data name="Metrics_RecurringJobs" xml:space="preserve">
<value>定时</value>
</data>
<data name="Metrics_Retries" xml:space="preserve">
<value>重试</value>
</data>
<data name="Metrics_ScheduledJobs" xml:space="preserve">
<value>计划</value>
</data>
<data name="Metrics_Servers" xml:space="preserve">
<value>服务器</value>
</data>
<data name="Metrics_SucceededJobs" xml:space="preserve">
<value>成功的作业</value>
</data>
<data name="Metrics_TotalConnections" xml:space="preserve">
<value>总连接数</value>
</data>
......@@ -452,4 +378,13 @@
<data name="SubscribersPage_Title" xml:space="preserve">
<value>订阅的消息</value>
</data>
<data name="Common_Group" xml:space="preserve">
<value>分组</value>
</data>
<data name="Common_Method" xml:space="preserve">
<value>方法</value>
</data>
<data name="Common_Name" xml:space="preserve">
<value>名称</value>
</data>
</root>
\ No newline at end of file
src/DotNetCore.CAP/Dashboard/DashboardMetrics.cs
View file @ 5cdc1980
......@@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using DotNetCore.CAP.Dashboard.Resources;
using DotNetCore.CAP.Internal;
using Microsoft.Extensions.DependencyInjection;
namespace DotNetCore.CAP.Dashboard
{
......@@ -63,20 +65,12 @@ namespace DotNetCore.CAP.Dashboard
page =>
{
long retryCount;
using (var connection = page.Storage.GetConnection())
{
var storageConnection = connection as IStorageConnection;
if (storageConnection == null)
{
return null;
}
retryCount =1111;
}
var methodCache = page.RequestServices.GetService<MethodMatcherCache>();
retryCount = methodCache.GetCandidatesMethodsOfGroupNameGrouped().Sum(x => x.Value.Count);
return new Metric(retryCount.ToString("N0"))
{
Style = retryCount > 0 ? MetricStyle.Warning : MetricStyle.Default
Style = retryCount > 0 ? MetricStyle.Default : MetricStyle.Warning
};
});
......
src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.cshtml
View file @ 5cdc1980
......@@ -13,11 +13,12 @@
<div class="row">
<div class="col-md-12">
<h1 class="page-header">订阅列表</h1>
<h1 class="page-header">@Strings.SubscribersPage_Title</h1>
@if (subscribers.Count == 0)
{
<div class="alert alert-warning">
@Strings.ServersPage_NoServers
</div>
}
......@@ -27,9 +28,9 @@
<table class="table">
<thead>
<tr>
<th width="20%">分组</th>
<th width="20%">@Strings.Common_Group</th>
<th>
<table class="table subscribe-table margin-bottom-zero"><tr><td width="40%">名称</td><td>方法</td></tr></table>
<table class="table subscribe-table margin-bottom-zero"><tr><td width="40%">@Strings.Common_Name</td><td>@Strings.Common_Method</td></tr></table>
</th>
</tr>
</thead>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment