From 642b74edfc58b97e6993aa6467bb21075a767ef8 Mon Sep 17 00:00:00 2001 From: Argo Zhang <5196060@qq.com> Date: Tue, 5 Mar 2019 14:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E5=BC=B9=E5=87=BA=E6=A1=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=8E=9F=E5=9B=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20#IS7V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/RegisterController.cs | 2 +- .../Controllers/Api/UsersController.cs | 3 +++ Bootstrap.Admin/Views/Account/Login.cshtml | 4 ++-- Bootstrap.Admin/Views/Admin/Users.cshtml | 6 +++++- Bootstrap.Admin/wwwroot/js/users.js | 13 ++++++++++++- Bootstrap.DataAccess/Helper/UserHelper.cs | 7 +++++++ Bootstrap.DataAccess/ResetUsers.cs | 9 +++++++++ UnitTest/Bootstrap.Admin/Api/UsersTest.cs | 3 +++ UnitTest/Bootstrap.DataAccess/ResetUserTest.cs | 17 +++++++++++++++++ 9 files changed, 59 insertions(+), 5 deletions(-) diff --git a/Bootstrap.Admin/Controllers/Api/RegisterController.cs b/Bootstrap.Admin/Controllers/Api/RegisterController.cs index 156ea7a3..1ff40ca5 100644 --- a/Bootstrap.Admin/Controllers/Api/RegisterController.cs +++ b/Bootstrap.Admin/Controllers/Api/RegisterController.cs @@ -45,7 +45,7 @@ namespace Bootstrap.Admin.Controllers.Api } /// - /// + /// 重置密码调用 /// /// /// diff --git a/Bootstrap.Admin/Controllers/Api/UsersController.cs b/Bootstrap.Admin/Controllers/Api/UsersController.cs index 431dc87c..4f3121fc 100644 --- a/Bootstrap.Admin/Controllers/Api/UsersController.cs +++ b/Bootstrap.Admin/Controllers/Api/UsersController.cs @@ -75,6 +75,9 @@ namespace Bootstrap.Admin.Controllers.Api case "group": ret = UserHelper.RetrievesByGroupId(id); break; + case "reset": + ret = UserHelper.RetrieveResetReasonsByUserName(id).Select(u => new { u.Key, u.Value }); + break; } return ret; } diff --git a/Bootstrap.Admin/Views/Account/Login.cshtml b/Bootstrap.Admin/Views/Account/Login.cshtml index 03b2b5d0..89db252c 100644 --- a/Bootstrap.Admin/Views/Account/Login.cshtml +++ b/Bootstrap.Admin/Views/Account/Login.cshtml @@ -162,7 +162,7 @@ - +
@@ -178,7 +178,7 @@
- +
diff --git a/Bootstrap.Admin/Views/Admin/Users.cshtml b/Bootstrap.Admin/Views/Admin/Users.cshtml index b9b334c8..a2e0ab84 100644 --- a/Bootstrap.Admin/Views/Admin/Users.cshtml +++ b/Bootstrap.Admin/Views/Admin/Users.cshtml @@ -80,7 +80,7 @@
-
+
@@ -89,6 +89,10 @@
+
+ + +
diff --git a/Bootstrap.Admin/wwwroot/js/users.js b/Bootstrap.Admin/wwwroot/js/users.js index a351c495..517795ad 100644 --- a/Bootstrap.Admin/wwwroot/js/users.js +++ b/Bootstrap.Admin/wwwroot/js/users.js @@ -7,6 +7,7 @@ var $dialogGroupForm = $('#groupForm'); var $dialogReset = $('#dialogReset'); var $dialogResetHeader = $('#myResetModalLabel'); + var $resetReason = $('#resetReason'); var $table = $('table'); $table.lgbTable({ @@ -102,7 +103,17 @@ $table.bootstrapTable('uncheckAll'); $table.bootstrapTable('check', index); $dialogResetHeader.text($.format("{0} - 重置密码窗口", row.UserName)); - $dialogReset.modal('show'); + $.bc({ + id: row.UserName, url: User.url, method: 'post', query: { type: "reset" }, callback: function (result) { + if ($.isArray(result)) { + var reason = result.map(function (v, index) { + return $.format("{0}: {1}", v.Key, v.Value); + }).join('\n'); + $resetReason.text(reason); + $dialogReset.modal('show'); + } + } + }); } } } diff --git a/Bootstrap.DataAccess/Helper/UserHelper.cs b/Bootstrap.DataAccess/Helper/UserHelper.cs index 7d124a64..0cee2cb0 100644 --- a/Bootstrap.DataAccess/Helper/UserHelper.cs +++ b/Bootstrap.DataAccess/Helper/UserHelper.cs @@ -247,5 +247,12 @@ namespace Bootstrap.DataAccess /// /// public static ResetUser RetrieveResetUserByUserName(string userName) => DbContextManager.Create().RetrieveUserByUserName(userName); + + /// + /// 通过登录账户获得重置密码原因 + /// + /// + /// + public static IEnumerable> RetrieveResetReasonsByUserName(string userName) => DbContextManager.Create().RetrieveResetReasonsByUserName(userName); } } diff --git a/Bootstrap.DataAccess/ResetUsers.cs b/Bootstrap.DataAccess/ResetUsers.cs index 4b3b3d58..9a76cc7d 100644 --- a/Bootstrap.DataAccess/ResetUsers.cs +++ b/Bootstrap.DataAccess/ResetUsers.cs @@ -1,5 +1,7 @@ using PetaPoco; using System; +using System.Collections.Generic; +using System.Linq; namespace Bootstrap.DataAccess { @@ -58,5 +60,12 @@ namespace Bootstrap.DataAccess /// /// public virtual void DeleteByUserName(string userName) => DbManager.Create().Delete("where UserName = @0", userName); + + /// + /// + /// + /// + /// + public virtual IEnumerable> RetrieveResetReasonsByUserName(string userName) => DbManager.Create().Fetch("where UserName = @0 order by ResetTime desc", userName).Select(user => new KeyValuePair(user.ResetTime, user.Reason)); } } diff --git a/UnitTest/Bootstrap.Admin/Api/UsersTest.cs b/UnitTest/Bootstrap.Admin/Api/UsersTest.cs index c3936c2c..4fa39932 100644 --- a/UnitTest/Bootstrap.Admin/Api/UsersTest.cs +++ b/UnitTest/Bootstrap.Admin/Api/UsersTest.cs @@ -59,6 +59,9 @@ namespace Bootstrap.Admin.Api var gid = new Group().Retrieves().Where(r => r.GroupName == "Admin").First().Id; ret = await Client.PostAsJsonAsync>($"{gid}?type=group", string.Empty); Assert.NotNull(ret); + + ret = await Client.PostAsJsonAsync>("UnitTest?type=reset", string.Empty); + Assert.NotNull(ret); } [Fact] diff --git a/UnitTest/Bootstrap.DataAccess/ResetUserTest.cs b/UnitTest/Bootstrap.DataAccess/ResetUserTest.cs index b2597544..1024e62c 100644 --- a/UnitTest/Bootstrap.DataAccess/ResetUserTest.cs +++ b/UnitTest/Bootstrap.DataAccess/ResetUserTest.cs @@ -57,5 +57,22 @@ namespace Bootstrap.DataAccess var count = db.ExecuteScalar("select count(Id) from ResetUsers"); Assert.Equal(0, count); } + + [Fact] + public void RetrieveResetReasonsByUserName_Ok() + { + var resetUser = new ResetUser() + { + UserName = "UnitTest", + Reason = "UnitTest", + DisplayName = "UnitTest", + ResetTime = DateTime.Now + }; + var db = DbManager.Create(); + db.Save(resetUser); + + var reasons = resetUser.RetrieveResetReasonsByUserName(resetUser.UserName); + Assert.NotEmpty(reasons); + } } }