From 44c9b1b39841b9dfcaa08f86bc78f2306b6e1ad5 Mon Sep 17 00:00:00 2001 From: Savorboard Date: Sat, 28 Oct 2017 13:47:54 +0800 Subject: [PATCH] refactoring --- .../Dashboard/Pages/HomePage.generated.cs | 2 +- .../Dashboard/Pages/LayoutPage.generated.cs | 2 +- .../Dashboard/Pages/NodePage.generated.cs | 2 +- .../Pages/PublishedPage.generated.cs | 2 +- .../Dashboard/Pages/ReceivedPage.generated.cs | 2 +- .../Pages/SubscriberPage.generated.cs | 2 +- .../Dashboard/Pages/_BlockMetric.generated.cs | 2 +- .../Dashboard/Pages/_Breadcrumbs.generated.cs | 2 +- .../Pages/_InlineMetric.generated.cs | 2 +- .../Dashboard/Pages/_Navigation.generated.cs | 2 +- .../Dashboard/Pages/_Paginator.generated.cs | 2 +- .../Pages/_PerPageSelector.generated.cs | 2 +- .../Dashboard/Pages/_SidebarMenu.generated.cs | 2 +- src/DotNetCore.CAP/Dashboard/RazorPage.cs | 23 ++++++++++--------- 14 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs index 74a5087..d9b3137 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/HomePage.generated.cs @@ -61,7 +61,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs index 5677e12..374062b 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/LayoutPage.generated.cs @@ -50,7 +50,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/NodePage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/NodePage.generated.cs index bbd85bc..9b205b1 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/NodePage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/NodePage.generated.cs @@ -33,7 +33,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.generated.cs index 667154b..9514d49 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/PublishedPage.generated.cs @@ -56,7 +56,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.generated.cs index fb955a8..77e480e 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/ReceivedPage.generated.cs @@ -56,7 +56,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.generated.cs index 9e1aa78..ebec86b 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.generated.cs @@ -45,7 +45,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs index e8ad9cc..e29de0b 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_BlockMetric.generated.cs @@ -33,7 +33,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.generated.cs index 8e10a8a..ce63c17 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Breadcrumbs.generated.cs @@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs index e6f9833..1f9fcd3 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_InlineMetric.generated.cs @@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs index 4f08933..273d9eb 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Navigation.generated.cs @@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.generated.cs index 020372e..21fdf9c 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_Paginator.generated.cs @@ -33,7 +33,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.generated.cs index 57428c5..931ab0d 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_PerPageSelector.generated.cs @@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.generated.cs b/src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.generated.cs index 98cd08f..ca8e4ce 100644 --- a/src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.generated.cs +++ b/src/DotNetCore.CAP/Dashboard/Pages/_SidebarMenu.generated.cs @@ -27,7 +27,7 @@ namespace DotNetCore.CAP.Dashboard.Pages { #line hidden - public override void Execute() + protected override void Execute() { diff --git a/src/DotNetCore.CAP/Dashboard/RazorPage.cs b/src/DotNetCore.CAP/Dashboard/RazorPage.cs index a78960c..93b3425 100644 --- a/src/DotNetCore.CAP/Dashboard/RazorPage.cs +++ b/src/DotNetCore.CAP/Dashboard/RazorPage.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Net; using System.Text; using DotNetCore.CAP.Dashboard.Monitoring; +using DotNetCore.CAP.Internal; using DotNetCore.CAP.NodeDiscovery; using Microsoft.Extensions.DependencyInjection; @@ -20,16 +21,16 @@ namespace DotNetCore.CAP.Dashboard Html = new HtmlHelper(this); } - public RazorPage Layout { get; protected set; } - public HtmlHelper Html { get; } + protected RazorPage Layout { get; set; } + protected HtmlHelper Html { get; } public UrlHelper Url { get; private set; } - public IStorage Storage { get; internal set; } - public string AppPath { get; internal set; } - public string NodeName { get; internal set; } + protected IStorage Storage { get; set; } + protected string AppPath { get; set; } + protected string NodeName { get; set; } - public int StatsPollingInterval { get; internal set; } - public Stopwatch GenerationTime { get; private set; } + protected int StatsPollingInterval { get; set; } + protected Stopwatch GenerationTime { get; private set; } public StatisticsDto Statistics { @@ -40,16 +41,16 @@ namespace DotNetCore.CAP.Dashboard } } - protected DashboardRequest Request { private get; set; } - protected DashboardResponse Response { private get; set; } + private DashboardRequest Request { get; set; } + private DashboardResponse Response { get; set; } internal IServiceProvider RequestServices { get; private set; } public string RequestPath => Request.Path; /// - public abstract void Execute(); + protected abstract void Execute(); - public string Query(string key) + protected string Query(string key) { return Request.GetQuery(key); }