diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index 12eccaa0..acf898d6 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -86,6 +86,9 @@ + + + @@ -128,7 +131,9 @@ - + + + diff --git a/OpenAuth.Mvc/js/users.js b/OpenAuth.Mvc/js/users.js index cbb2bc0d..5045e098 100644 --- a/OpenAuth.Mvc/js/users.js +++ b/OpenAuth.Mvc/js/users.js @@ -95,7 +95,7 @@ layui.config({ add: function() { //寮瑰嚭娣诲姞 update = false; show({ - Id: '00000000-0000-0000-0000-000000000000' + Id: '' }); }, update: function(data) { //寮瑰嚭缂栬緫妗 @@ -110,34 +110,41 @@ layui.config({ var data = obj.data; if (obj.event === 'detail') { //鏌ョ湅 layer.msg('ID锛' + data.Id + ' 鐨勬煡鐪嬫搷浣'); - } else if (obj.event === 'del') { //鍒犻櫎 - openauth.del("/UserManager/Delete", data.Id, obj.del); - } else if (obj.event === 'edit') { //缂栬緫 - editDlg.update(data); - } + } }); //鐩戝惉椤甸潰涓绘寜閽搷浣 var active = { - del: function () { //鎵归噺鍒犻櫎 + btnDel: function () { //鎵归噺鍒犻櫎 var checkStatus = table.checkStatus('mainList') , data = checkStatus.data; - openauth.del("/UserManager/Delete", data.map(function (e) { return e.Id; }), mainList); + openauth.del("/UserManager/Delete", + data.map(function (e) { return e.Id; }), + mainList); } - , addData: function () { //娣诲姞 + , btnAdd: function () { //娣诲姞 editDlg.add(); } + , btnEdit: function () { //缂栬緫 + var checkStatus = table.checkStatus('mainList') + , data = checkStatus.data; + if (data.length != 1) { + layer.msg("璇烽夋嫨缂栬緫鐨勮锛屼笖鍚屾椂鍙兘缂栬緫涓琛"); + return; + } + editDlg.update(data[0]); + } + , search: function () { //鎼滅储 mainList({ key: $('#key').val() }); } - , refresh: function() { + , btnRefresh: function() { mainList(); } - - , assignModule: function () { + , btnAccessModule: function () { var index = layer.open({ - title: "鍒嗛厤妯″潡鑿滃崟", + title: "涓虹敤鎴峰垎閰嶆ā鍧", type: 2, content: "newsAdd.html", success: function(layero, index) { diff --git a/OpenAuth.UnitTest/TestUser.cs b/OpenAuth.UnitTest/TestUser.cs index dbd76956..47e4e285 100644 --- a/OpenAuth.UnitTest/TestUser.cs +++ b/OpenAuth.UnitTest/TestUser.cs @@ -1,6 +1,7 @@ 锘縰sing System; using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenAuth.App; +using OpenAuth.App.Request; using OpenAuth.App.ViewModel; namespace OpenAuth.UnitTest @@ -45,7 +46,13 @@ namespace OpenAuth.UnitTest [TestMethod] public void GetUser() { - var users = _app.Load("990cb229-cc18-41f3-8e2b-13f0f0110798", 2, 30); + var request = new QueryUserListReq + { + orgId = "990cb229-cc18-41f3-8e2b-13f0f0110798", + page = 2, + limit = 30 + }; + var users = _app.Load(request); Console.WriteLine(users.total); } diff --git a/OpenAuth.WebApi/Areas/SSO/Views/Login/Index.cshtml b/OpenAuth.WebApi/Areas/SSO/Views/Login/Index.cshtml index e1a1a597..04927765 100644 --- a/OpenAuth.WebApi/Areas/SSO/Views/Login/Index.cshtml +++ b/OpenAuth.WebApi/Areas/SSO/Views/Login/Index.cshtml @@ -8,7 +8,7 @@ - OpenAuth.net缁熶竴鐧婚檰鎺堟潈涓績 + OpenAuth.net缁熶竴鐧诲綍鎺堟潈涓績 diff --git a/OpenAuth.WebTest/Views/Home/Index.cshtml b/OpenAuth.WebTest/Views/Home/Index.cshtml index 6b94ecbf..1688fe99 100644 --- a/OpenAuth.WebTest/Views/Home/Index.cshtml +++ b/OpenAuth.WebTest/Views/Home/Index.cshtml @@ -17,7 +17,7 @@

@ViewBag.CurrentUser.User.Account ,鎮ㄥソ锛

-

鍥犱负浣跨敤浜哠SO锛屾墍浠ユ偍鍙互鐩存帴杩涘叆OpenAuth.Net锛岃屼笉鐢ㄩ噸澶嶇櫥闄

+

鍥犱负浣跨敤浜哠SO锛屾墍浠ユ偍鍙互鐩存帴杩涘叆OpenAuth.Net锛岃屼笉鐢ㄩ噸澶嶇櫥褰

鐩存帴杩涘叆OpenAuth.Net 娉ㄩ攢 diff --git a/OpenAuth.WebTest/Views/Login/Index.cshtml b/OpenAuth.WebTest/Views/Login/Index.cshtml index 5873a1b2..9d7cd48a 100644 --- a/OpenAuth.WebTest/Views/Login/Index.cshtml +++ b/OpenAuth.WebTest/Views/Login/Index.cshtml @@ -4,7 +4,7 @@ ViewBag.Title = "title"; } -

OpenAuth.net娴嬭瘯绔欑偣鐧婚檰

+

OpenAuth.net娴嬭瘯绔欑偣鐧诲綍

@if (Model != null && !Model.Success) @@ -34,8 +34,8 @@ - - 鎴栬呬娇鐢∣penAuth.net绗笁鏂圭櫥闄嗗姛鑳 + + 鎴栬呬娇鐢∣penAuth.net绗笁鏂圭櫥褰曞姛鑳