From 3b658ebab07f6e8dcce978138b0f17806eae798d Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Sun, 20 Oct 2019 16:47:17 +0800
Subject: ...

---
 .../Controllers/Testing/TestingAuthController.cs   | 32 ++++++++++++++++++++++
 Timeline/Controllers/UserTestController.cs         | 32 ----------------------
 Timeline/Startup.cs                                | 16 +++++++++++
 3 files changed, 48 insertions(+), 32 deletions(-)
 create mode 100644 Timeline/Controllers/Testing/TestingAuthController.cs
 delete mode 100644 Timeline/Controllers/UserTestController.cs

(limited to 'Timeline')

diff --git a/Timeline/Controllers/Testing/TestingAuthController.cs b/Timeline/Controllers/Testing/TestingAuthController.cs
new file mode 100644
index 00000000..488a3cff
--- /dev/null
+++ b/Timeline/Controllers/Testing/TestingAuthController.cs
@@ -0,0 +1,32 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Timeline.Authenticate;
+
+namespace Timeline.Controllers.Testing
+{
+    [Route("testing/auth")]
+    [ApiController]
+    public class TestingAuthController : Controller
+    {
+        [HttpGet("[action]")]
+        [Authorize]
+        public ActionResult Authorize()
+        {
+            return Ok();
+        }
+
+        [HttpGet("[action]")]
+        [UserAuthorize]
+        public new ActionResult User()
+        {
+            return Ok();
+        }
+
+        [HttpGet("[action]")]
+        [AdminAuthorize]
+        public ActionResult Admin()
+        {
+            return Ok();
+        }
+    }
+}
diff --git a/Timeline/Controllers/UserTestController.cs b/Timeline/Controllers/UserTestController.cs
deleted file mode 100644
index 2a5f36a1..00000000
--- a/Timeline/Controllers/UserTestController.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Timeline.Authenticate;
-
-namespace Timeline.Controllers
-{
-    [Route("Test/User")]
-    [ApiController]
-    public class UserTestController : Controller
-    {
-        [HttpGet("[action]")]
-        [Authorize]
-        public ActionResult Authorize()
-        {
-            return Ok();
-        }
-
-        [HttpGet("[action]")]
-        [UserAuthorize]
-        public new ActionResult User()
-        {
-            return Ok();
-        }
-
-        [HttpGet("[action]")]
-        [AdminAuthorize]
-        public ActionResult Admin()
-        {
-            return Ok();
-        }
-    }
-}
diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index 72c9bf32..5718cf05 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -2,9 +2,12 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Generic;
+using System.Globalization;
 using Timeline.Authenticate;
 using Timeline.Configs;
 using Timeline.Entities;
@@ -86,6 +89,19 @@ namespace Timeline
 
             app.UseRouting();
 
+            var supportedCultures = new List<CultureInfo>
+            {
+                new CultureInfo("en"),
+                new CultureInfo("zh")
+            };
+
+            app.UseRequestLocalization(new RequestLocalizationOptions
+            {
+                DefaultRequestCulture = new RequestCulture("en"),
+                SupportedCultures = supportedCultures,
+                SupportedUICultures = supportedCultures
+            });
+
             app.UseCors();
 
             app.UseAuthentication();
-- 
cgit v1.2.3