From 2d341f048774acc669d1b7cb83ea49db35d8fbea Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Thu, 18 Apr 2019 14:41:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=9A=E6=95=B0=E6=8D=AE=E5=BA=93=E5=BC=82=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A8=E5=A2=9E=E5=8A=A0Category=E5=88=97=20link=20?=
 =?UTF-8?q?#IVGWL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Issue
https://gitee.com/LongbowEnterprise/dashboard/issues?id=IVGWL
#Comment
追加上一个提交 commit:26eeb8c
---
 Bootstrap.Admin/BootstrapAdmin.db | Bin 90112 -> 94208 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Bootstrap.Admin/BootstrapAdmin.db b/Bootstrap.Admin/BootstrapAdmin.db
index 46aab3308334e6200d1658425ce4523b29ee2c33..c76dddca83981bc8edea357930993696e7a3e67e 100644
GIT binary patch
delta 570
zcmZoTz}oPDb%L}YF9QREI21Di>B|#!j2U?w6SgKWE|iz&iD%$uzQMqs#=DMt0+$iT
zclM=hd3+_Trpz~ZN_k2*3kvLEss}3iBW`WY*vwgyn3R)RT$qztl3H9+nv$6xUy_<z
z5RXq-+&ReAF~n6N#L>yeRRM=y4K4)*PZtGGzYrZD%dw!qB|kSYGtVzEH&r2|-ZcU&
z>{?WmUlfp-4itilgche30kxrU3*cPWisaOSlFa<Pkjest9^cgBVq`OdOA?c_Ly8iU
z5lVdW(?c?WHv5J8a%nb2ZNH_=*vg^67r-DUuBgb^k_`4P)bu7Z33jlk`D8v8!|8FV
zj8eQP?w@SPB+jJ(cRPrirvP<$m}8K$hhva}hN*$34n(j(0WN503KYcjgo2-c2+(Oh
zJ~|4>enApO^V0N#s*JM2&WR<d>G?$pWr;<}8Hq(8E2pp3Wjw$rzCBNmagyO?g@gzE
IlNAIM0INf-Q~&?~

delta 97
zcmZp8z}j$tb%L}Y4+8^(7!bq2`H4Elj697ATN4-;%FFTvFmN;9VBk;VUB?s8J%P)J
u<2(COwmiNPR#WC1n*{}SF>k-2%-GJcnT6#e<MaSMMp;I&?Rk2PlMDe#WEge;


From 2740fb706258a9819ebb15d7c81618e958bdb2fc Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Tue, 23 Apr 2019 13:54:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(#IVQOR):=20=E8=A1=8C=E4=B8=BA=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=9C=AC=E5=9C=B0=E5=8A=A0=E8=BD=BD=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Issue
https://gitee.com/LongbowEnterprise/dashboard/issues?id=IVQOR
#Comment
close #IVQOR
---
 Bootstrap.Admin/wwwroot/js/login.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bootstrap.Admin/wwwroot/js/login.js b/Bootstrap.Admin/wwwroot/js/login.js
index f2581b3f..aa1b05ad 100644
--- a/Bootstrap.Admin/wwwroot/js/login.js
+++ b/Bootstrap.Admin/wwwroot/js/login.js
@@ -96,7 +96,8 @@
         width: $.capWidth(),
         height: $.capHeight(),
         localImages: function () {
-            return '../../lib/captcha/images/Pic' + Math.round(Math.random() * 4) + '.jpg';
+            var base = $('#pathBase').attr('href');
+            return base + 'lib/captcha/images/Pic' + Math.round(Math.random() * 4) + '.jpg';
         },
         setSrc: function () {
             return $imgUrl.val() + 'Pic' + Math.round(Math.random() * 136) + '.jpg';

From d4d536e9b6c585153dd6e77f80314856dd76c8e4 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Tue, 23 Apr 2019 18:46:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(#IVRNQ):=20=E5=A2=9E=E5=8A=A0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Issue
https://gitee.com/LongbowEnterprise/dashboard/issues?id=IVRNQ

#Comment
close #IVRNQ
---
 .../Controllers/AccountController.cs          |  4 +--
 Bootstrap.Admin/Models/LoginModel.cs          | 13 +++++++---
 Bootstrap.Admin/Views/Account/Login.cshtml    |  8 ++++++
 .../wwwroot/css/login-responsive.css          | 14 ++++++----
 Bootstrap.Admin/wwwroot/css/login.css         | 26 +++++++++----------
 5 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/Bootstrap.Admin/Controllers/AccountController.cs b/Bootstrap.Admin/Controllers/AccountController.cs
index 93dccc9b..f267a050 100644
--- a/Bootstrap.Admin/Controllers/AccountController.cs
+++ b/Bootstrap.Admin/Controllers/AccountController.cs
@@ -56,8 +56,8 @@ namespace Bootstrap.Admin.Controllers
                 // redirect origin url
                 var originUrl = Request.Query[CookieAuthenticationDefaults.ReturnUrlParameter].FirstOrDefault() ?? "~/Home/Index";
                 return Redirect(originUrl);
-            }
-            return View("Login", new LoginModel());
+            }
+            return View("Login", new LoginModel() { AuthFailed = true });
         }
 
         /// <summary>
diff --git a/Bootstrap.Admin/Models/LoginModel.cs b/Bootstrap.Admin/Models/LoginModel.cs
index af634097..51927862 100644
--- a/Bootstrap.Admin/Models/LoginModel.cs
+++ b/Bootstrap.Admin/Models/LoginModel.cs
@@ -14,10 +14,15 @@ namespace Bootstrap.Admin.Models
         {
             ImageLibUrl = DictHelper.RetrieveImagesLibUrl();
         }
-
-        /// <summary>
-        /// 验证码图床地址
-        /// </summary>
+
+        /// <summary>
+        /// 验证码图床地址
+        /// </summary>
         public string ImageLibUrl { get; protected set; }
+
+        /// <summary>
+        /// 是否登录认证失败
+        /// </summary>
+        public bool AuthFailed { get; set; }
     }
 }
diff --git a/Bootstrap.Admin/Views/Account/Login.cshtml b/Bootstrap.Admin/Views/Account/Login.cshtml
index 1d13da13..170de7f6 100644
--- a/Bootstrap.Admin/Views/Account/Login.cshtml
+++ b/Bootstrap.Admin/Views/Account/Login.cshtml
@@ -46,6 +46,14 @@
     <form id="login" method="post" class="form-signin">
         <h2 class="form-signin-heading">@Model.Title</h2>
         <div class="login-wrap" data-toggle="LgbValidate" data-valid-button="button[type='submit']">
+            @if (Model.AuthFailed)
+            {
+                <div class="alert alert-danger">用户名或密码错误！</div>
+            }
+            else
+            {
+                <div class="alert alert-success">请输入用户名与密码</div>
+            }
             <div class="form-group">
                 <div class="input-group">
                     <div class="input-group-prepend">
diff --git a/Bootstrap.Admin/wwwroot/css/login-responsive.css b/Bootstrap.Admin/wwwroot/css/login-responsive.css
index 2270eb48..bfa54065 100644
--- a/Bootstrap.Admin/wwwroot/css/login-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/login-responsive.css
@@ -31,17 +31,21 @@
 
     .login-wrap {
         padding: 0;
-        margin: 36px 0 0 370px;
+        margin: 12px 0 0 370px;
         width: 280px;
     }
 
     .slidercaptcha {
-        top: -254px;
+        top: -282px;
         left: -15px;
     }
 
-    .slidercaptcha, .slidercaptcha.forgot {
-        width: 310px;
-        height: 280px;
+        .slidercaptcha, .slidercaptcha.forgot {
+            width: 310px;
+            height: 280px;
+        }
+
+    .form-signin .form-group {
+        margin-bottom: 0.75rem;
     }
 }
diff --git a/Bootstrap.Admin/wwwroot/css/login.css b/Bootstrap.Admin/wwwroot/css/login.css
index 28328ef2..e3a24297 100644
--- a/Bootstrap.Admin/wwwroot/css/login.css
+++ b/Bootstrap.Admin/wwwroot/css/login.css
@@ -14,7 +14,7 @@
 
 .login-wrap {
     padding: 20px;
-    height: 270px;
+    height: 330px;
 }
 
     .login-wrap .rememberPwd {
@@ -87,16 +87,16 @@
             color: #fff;
         }
 
-.slidercaptcha.forgot {
-    position: absolute;
-    left: auto;
-    right: 14px;
-    bottom: 14px;
-    top: auto;
-    margin: 0;
-    width: 274px;
-}
+    .slidercaptcha.forgot {
+        position: absolute;
+        left: auto;
+        right: 14px;
+        bottom: 14px;
+        top: auto;
+        margin: 0;
+        width: 274px;
+    }
 
-.slidercaptcha.reg {
-    bottom: 60px;
-}
\ No newline at end of file
+    .slidercaptcha.reg {
+        bottom: 60px;
+    }