From 4bfdfba5031b4ffb4907e176b3b5034dce646ed2 Mon Sep 17 00:00:00 2001 From: yubao Date: Sat, 31 Mar 2018 14:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.Mvc/Controllers/LoginController.cs | 18 +++-- OpenAuth.Mvc/Views/FlowInstances/Index.cshtml | 65 ++++++++++--------- OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml | 23 ++++--- OpenAuth.Mvc/Views/Forms/index.cshtml | 23 ++++--- OpenAuth.Mvc/Views/OrgManager/Index.cshtml | 40 +++++++----- OpenAuth.Mvc/Views/RoleManager/Index.cshtml | 34 ++++++---- OpenAuth.Mvc/Views/UserManager/Index.cshtml | 43 +++++++----- OpenAuth.Mvc/userJs/flowInstances.js | 1 + OpenAuth.Mvc/userJs/flowSchemes.js | 2 +- OpenAuth.Mvc/userJs/forms.js | 1 + OpenAuth.Mvc/userJs/login.js | 9 ++- OpenAuth.Mvc/userJs/orgs.js | 1 + OpenAuth.Mvc/userJs/roles.js | 1 + OpenAuth.Mvc/userJs/users.js | 2 + 14 files changed, 157 insertions(+), 106 deletions(-) diff --git a/OpenAuth.Mvc/Controllers/LoginController.cs b/OpenAuth.Mvc/Controllers/LoginController.cs index 29948afc..ae281c5b 100644 --- a/OpenAuth.Mvc/Controllers/LoginController.cs +++ b/OpenAuth.Mvc/Controllers/LoginController.cs @@ -34,8 +34,6 @@ namespace OpenAuth.Mvc.Controllers }; Response.Cookies.Add(cookie); resp.Result = "/home/index"; - ///拿掉地址栏Token，因为特别不安全。 - ///小王，xxx系统的地址是多少。。。然后账号就 } else { @@ -53,34 +51,34 @@ namespace OpenAuth.Mvc.Controllers /// /// 开发者登录 /// - public ActionResult LoginByDev() + public string LoginByDev() { + var resp = new Response(); try { var result = AuthUtil.Login(_appKey, "System", "123456"); if (result.Code == 200) { - var cookie = new HttpCookie("Token", result.Token) { Expires = DateTime.Now.AddDays(10) }; Response.Cookies.Add(cookie); - return Redirect("/home/index"); - ///拿掉地址栏Token，因为特别不安全。 - ///小王，xxx系统的地址是多少。。。然后账号就 } else { - return RedirectToAction("Index", "Login"); - + resp.Code = 500; + resp.Message = result.Message; } } catch (Exception e) { - return RedirectToAction("Index", "Login"); + resp.Code = 500; + resp.Message = e.Message; } + + return JsonHelper.Instance.Serialize(resp); } public ActionResult Logout() diff --git a/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml index dd1b0e41..87f9aa57 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml @@ -6,37 +6,44 @@ @Html.Action("MenuHeader", "Home") -
- - - - - - - - - - - - - - - - -
主键Id是否完成实例名称实例编号当前节点名称创建时间创建用户实例备注
+
+
+
    +
+
+
+ + + + + + + + + + + + + + + +
主键Id是否完成实例名称实例编号当前节点名称创建时间创建用户实例备注
- + +
+ diff --git a/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml b/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml index b896358f..e8ed51c8 100644 --- a/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml +++ b/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml @@ -6,12 +6,17 @@ @Html.Action("MenuHeader", "Home") -
-
    - - +
    +
    +
      +
    +
    +
    +
    + @@ -27,9 +32,11 @@ - -
    主键Id
    + + +
    + diff --git a/OpenAuth.Mvc/Views/Forms/index.cshtml b/OpenAuth.Mvc/Views/Forms/index.cshtml index 796d7787..e5b59f76 100644 --- a/OpenAuth.Mvc/Views/Forms/index.cshtml +++ b/OpenAuth.Mvc/Views/Forms/index.cshtml @@ -6,12 +6,17 @@ @Html.Action("MenuHeader", "Home") -
    - - - + +
    +
    +
      +
      +
      +
      + @@ -25,9 +30,11 @@ - -
      表单模板Id修改时间
      + + +
      + diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml index 6aa999a8..bc290206 100644 --- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml @@ -6,23 +6,29 @@ @Html.Action("MenuHeader", "Home") -
      - - - - - - - - - - - - - -
      组织名称层级ID父节点名称排序号ID
      +
      +
      +
        +
      +
      +
      + + + + + + + + + + + + +
      组织名称层级ID父节点名称排序号ID
      +
      diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml index b63ecf85..b7b123f2 100644 --- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml @@ -6,21 +6,27 @@ @Html.Action("MenuHeader", "Home") -
      -
        - - - - - - - - - -
        角色名称所属部门
        +
        +
        +
          +
          +
          + + + + + + + + + +
          角色名称所属部门
          +
          + diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index 483513bf..55b7679f 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -6,24 +6,31 @@ @Html.Action("MenuHeader", "Home") -
          -
            - - - - - - - - - - - - -
            账号用户名所属部门创建时间ID
            -
            +
            +
            +
              +
            +
            +
            + + + + + + + + + + + + +
            账号用户名所属部门创建时间ID
            +
            +
            + diff --git a/OpenAuth.Mvc/userJs/flowInstances.js b/OpenAuth.Mvc/userJs/flowInstances.js index 7de00f1d..1145316c 100644 --- a/OpenAuth.Mvc/userJs/flowInstances.js +++ b/OpenAuth.Mvc/userJs/flowInstances.js @@ -59,6 +59,7 @@ reload: load } }(); + $("#tree").height($("div.layui-table-view").height()); //添加（编辑）对话框 var editDlg = function () { diff --git a/OpenAuth.Mvc/userJs/flowSchemes.js b/OpenAuth.Mvc/userJs/flowSchemes.js index d81952ff..7d2618f8 100644 --- a/OpenAuth.Mvc/userJs/flowSchemes.js +++ b/OpenAuth.Mvc/userJs/flowSchemes.js @@ -60,7 +60,7 @@ reload: load } }(); - + $("#tree").height($("div.layui-table-view").height()); //添加（编辑）对话框 var editDlg = function () { diff --git a/OpenAuth.Mvc/userJs/forms.js b/OpenAuth.Mvc/userJs/forms.js index 4fe15b68..af149b79 100644 --- a/OpenAuth.Mvc/userJs/forms.js +++ b/OpenAuth.Mvc/userJs/forms.js @@ -62,6 +62,7 @@ reload: load } }(); + $("#tree").height($("div.layui-table-view").height()); //添加（编辑）对话框 var editDlg = function() { diff --git a/OpenAuth.Mvc/userJs/login.js b/OpenAuth.Mvc/userJs/login.js index 2ed27ad3..77c51024 100644 --- a/OpenAuth.Mvc/userJs/login.js +++ b/OpenAuth.Mvc/userJs/login.js @@ -92,7 +92,14 @@ layui.config({ //登录按钮事件 form.on("submit(login)", function (data) { - window.location.href = "/Login/LoginByDev"; + $.getJSON("/Login/LoginByDev", + function(data) { + if (data.Code == 200) { + window.location.href = "/Home/Index"; + } else { + layer.msg(data.Message); + } + }); return false; }) }) diff --git a/OpenAuth.Mvc/userJs/orgs.js b/OpenAuth.Mvc/userJs/orgs.js index 5a98329c..bc5b9671 100644 --- a/OpenAuth.Mvc/userJs/orgs.js +++ b/OpenAuth.Mvc/userJs/orgs.js @@ -59,6 +59,7 @@ layui.config({ reload: load } }(); + $("#tree").height($("div.layui-table-view").height()); //添加（编辑）对话框 var editDlg = function() { diff --git a/OpenAuth.Mvc/userJs/roles.js b/OpenAuth.Mvc/userJs/roles.js index a8e5df68..c3934ad4 100644 --- a/OpenAuth.Mvc/userJs/roles.js +++ b/OpenAuth.Mvc/userJs/roles.js @@ -59,6 +59,7 @@ layui.config({ reload: load } }(); + $("#tree").height($("div.layui-table-view").height()); //添加（编辑）对话框 var editDlg = function() { diff --git a/OpenAuth.Mvc/userJs/users.js b/OpenAuth.Mvc/userJs/users.js index 96407bfb..3ba0cead 100644 --- a/OpenAuth.Mvc/userJs/users.js +++ b/OpenAuth.Mvc/userJs/users.js @@ -60,6 +60,8 @@ layui.config({ } }(); + $("#tree").height( $("div.layui-table-view").height()); + //添加（编辑）对话框 var editDlg = function() { var vm = new Vue({