From bbcfc15098c27bc65a4798c9f31c1bdab5f86078 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@163.com>
Date: Wed, 21 Aug 2019 15:28:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20Lock=20=E9=A1=B5=E9=9D=A2Post?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Controllers/AccountController.cs | 12 +++++++++++-
 Bootstrap.Admin/Views/Account/Lock.cshtml        |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Bootstrap.Admin/Controllers/AccountController.cs b/Bootstrap.Admin/Controllers/AccountController.cs
index b0bd08dd..5b67ce28 100644
--- a/Bootstrap.Admin/Controllers/AccountController.cs
+++ b/Bootstrap.Admin/Controllers/AccountController.cs
@@ -21,13 +21,15 @@ namespace Bootstrap.Admin.Controllers
     [AutoValidateAntiforgeryToken]
     public class AccountController : Controller
     {
-
         /// <summary>
         /// 系统锁屏界面
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
         public async Task<ActionResult> Lock()
         {
+            if (!User.Identity.IsAuthenticated) return Login();
+
             var user = UserHelper.RetrieveUserByUserName(User.Identity.Name);
             await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
             var urlReferrer = Request.Headers["Referer"].FirstOrDefault();
@@ -37,6 +39,14 @@ namespace Bootstrap.Admin.Controllers
             });
         }
 
+        /// <summary>
+        /// 系统锁屏界面
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [IgnoreAntiforgeryToken]
+        public Task<IActionResult> Lock([FromServices]IOnlineUsers onlineUserSvr, [FromServices]IIPLocatorProvider ipLocator, string userName, string password) => Login(onlineUserSvr, ipLocator, userName, password, string.Empty);
+
         /// <summary>
         /// 系统登录方法
         /// </summary>
diff --git a/Bootstrap.Admin/Views/Account/Lock.cshtml b/Bootstrap.Admin/Views/Account/Lock.cshtml
index d42ff613..bf14632a 100644
--- a/Bootstrap.Admin/Views/Account/Lock.cshtml
+++ b/Bootstrap.Admin/Views/Account/Lock.cshtml
@@ -30,7 +30,7 @@
         <img alt="lock avatar" src="@Url.Content(Model.Icon)" />
         <h1>@Model.DisplayName</h1>
         <span class="locked">系统已锁定</span>
-        <form role="form" class="form-inline justify-content-center" method="post" autocomplete="off" action="~/Account/Login?ReturnUrl=@Model.ReturnUrl">
+        <form role="form" class="form-inline justify-content-center" method="post" autocomplete="off" action="~/Account/Lock?ReturnUrl=@Model.ReturnUrl">
             <input type="hidden" name="username" value="@Model.UserName" />
             <div class="form-group">
                 <div class="input-group">