From f42afdf023e8ff0e59e11a0f657c090a596c30b8 Mon Sep 17 00:00:00 2001
From: Argo Windows <argo@163.com>
Date: Thu, 31 Oct 2019 17:21:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=8E=92=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E6=B3=A8=E5=85=A5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Startup.cs   | 20 +++++++++++---------
 src/client/Bootstrap.Client/Startup.cs |  8 +++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Startup.cs b/src/admin/Bootstrap.Admin/Startup.cs
index e23a0c57..037c7cca 100644
--- a/src/admin/Bootstrap.Admin/Startup.cs
+++ b/src/admin/Bootstrap.Admin/Startup.cs
@@ -53,26 +53,23 @@ namespace Bootstrap.Admin
             });
             services.AddLogging(logging => logging.AddFileLogger().AddDBLogger(ExceptionsHelper.Log));
             services.AddCors();
+            services.AddResponseCompression();
+
             services.AddCacheManager();
             services.AddDbAdapter();
             services.AddIPLocator(DictHelper.ConfigIPLocator);
             services.AddOnlineUsers();
             services.AddSignalR().AddJsonProtocol(op => op.PayloadSerializerOptions.AddDefaultConverters());
             services.AddSignalRExceptionFilterHandler<SignalRHub>(async (client, ex) => await client.SendMessageBody(ex).ConfigureAwait(false));
-            services.AddResponseCompression();
             services.AddBootstrapAdminAuthentication(Configuration).AddGitee(OAuthHelper.Configure).AddGitHub(OAuthHelper.Configure);
             services.AddAuthorization(options => options.DefaultPolicy = new AuthorizationPolicyBuilder().RequireBootstrapAdminAuthorizate().Build());
-            services.AddSwagger();
             services.AddButtonAuthorization(MenuHelper.AuthorizateButtons);
             services.AddBootstrapAdminBackgroundTask();
             services.AddHttpClient<GiteeHttpClient>();
             services.AddAdminHealthChecks();
-            services.AddControllersWithViews(options =>
-            {
-                options.Filters.Add<BootstrapAdminAuthorizeFilter>();
-                options.Filters.Add<ExceptionFilter>();
-                options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
-            }).AddJsonOptions(op => op.JsonSerializerOptions.AddDefaultConverters());
+            services.AddSMSProvider();
+
+            services.AddSwagger();
             services.AddApiVersioning(option =>
             {
                 option.DefaultApiVersion = new ApiVersion(1, 0);
@@ -80,7 +77,12 @@ namespace Bootstrap.Admin
                 option.AssumeDefaultVersionWhenUnspecified = true;
                 option.ApiVersionReader = ApiVersionReader.Combine(new HeaderApiVersionReader("api-version"), new QueryStringApiVersionReader("api-version"));
             });
-            services.AddSMSProvider();
+            services.AddControllersWithViews(options =>
+            {
+                options.Filters.Add<BootstrapAdminAuthorizeFilter>();
+                options.Filters.Add<ExceptionFilter>();
+                options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
+            }).AddJsonOptions(op => op.JsonSerializerOptions.AddDefaultConverters());
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/src/client/Bootstrap.Client/Startup.cs b/src/client/Bootstrap.Client/Startup.cs
index 17aa1aa0..cb6334fc 100644
--- a/src/client/Bootstrap.Client/Startup.cs
+++ b/src/client/Bootstrap.Client/Startup.cs
@@ -45,22 +45,24 @@ namespace Bootstrap.Client
                 options.CheckConsentNeeded = context => true;
                 options.MinimumSameSitePolicy = SameSiteMode.None;
             });
-            services.AddCors();
             services.AddLogging(builder => builder.AddFileLogger());
+            services.AddCors();
+            services.AddResponseCompression();
+
             services.AddCacheManager();
             services.AddDbAdapter();
             services.AddBootstrapHttpClient();
             services.AddIPLocator(DictHelper.ConfigIPLocator);
             services.AddOnlineUsers();
-            services.AddResponseCompression();
+            services.AddAutoPublish();
             services.AddBootstrapAdminAuthentication(Configuration);
             services.AddAuthorization(options => options.DefaultPolicy = new AuthorizationPolicyBuilder().RequireBootstrapAdminAuthorizate().Build());
+
             services.AddControllersWithViews(options =>
             {
                 options.Filters.Add<BootstrapAdminAuthorizeFilter>();
                 options.Filters.Add<ExceptionFilter>();
             }).AddJsonOptions(op => op.JsonSerializerOptions.AddDefaultConverters());
-            services.AddAutoPublish();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.