diff --git a/DOC/核心设计.EAP b/DOC/核心设计.EAP index 58bda3d4..8412a6c6 100644 Binary files a/DOC/核心设计.EAP and b/DOC/核心设计.EAP differ diff --git a/OpenAuth.App/SSO/AuthUtil.cs b/OpenAuth.App/SSO/AuthUtil.cs index 29cb0d60..da8c9fe0 100644 --- a/OpenAuth.App/SSO/AuthUtil.cs +++ b/OpenAuth.App/SSO/AuthUtil.cs @@ -50,7 +50,12 @@ namespace OpenAuth.App.SSO try { var value = _helper.Get(null, requestUri); - return Boolean.Parse(value); + var result = JsonHelper.Instance.Deserialize>(value); + if (result.Code == 200) + { + return result.Result; + } + throw new Exception(result.Message); } catch (Exception ex) { @@ -81,8 +86,13 @@ namespace OpenAuth.App.SSO try { - var value = _helper.Get(null, requestUri); - return value; + var value = _helper.Get(null, requestUri); + var result = JsonHelper.Instance.Deserialize>(value); + if (result.Code == 200) + { + return result.Result; + } + throw new Exception(result.Message); } catch (Exception ex) { @@ -103,8 +113,13 @@ namespace OpenAuth.App.SSO try { - var value = _helper.Get(null, requestUri); - return value; + var value = _helper.Get(null, requestUri); + var result = JsonHelper.Instance.Deserialize>(value); + if (result.Code == 200) + { + return result.Result; + } + throw new Exception(result.Message); } catch (Exception ex) { diff --git a/OpenAuth.Mvc/Controllers/HomeController.cs b/OpenAuth.Mvc/Controllers/HomeController.cs index bf50419e..c1a0412c 100644 --- a/OpenAuth.Mvc/Controllers/HomeController.cs +++ b/OpenAuth.Mvc/Controllers/HomeController.cs @@ -23,29 +23,6 @@ namespace OpenAuth.Mvc.Controllers return View(); } - /// - /// 所有页面按钮控制分部视图 - /// - /// ActionResult. - [ChildActionOnly] - public ActionResult MenuHeader() - { - var sb = new StringBuilder(); - foreach (var element in CurrentModule.Elements) - { - sb.Append(""); - } - ViewBag.Buttons = sb.ToString(); - return View(); - } + } } \ No newline at end of file diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index b9635b2d..319c7974 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -70,6 +70,13 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(menus); } + + public string LoadAuthorizedMenus() + { + return JsonHelper.Instance.Serialize(CurrentModule.Elements); + } + + #region 添加编辑模块 //添加模块 diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 4361e9df..53dcb216 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -623,7 +623,6 @@ - diff --git a/OpenAuth.Mvc/Views/Categories/Index.cshtml b/OpenAuth.Mvc/Views/Categories/Index.cshtml index 7f88d85f..849d8ea2 100644 --- a/OpenAuth.Mvc/Views/Categories/Index.cshtml +++ b/OpenAuth.Mvc/Views/Categories/Index.cshtml @@ -2,8 +2,7 @@ { } -