Skip to content

Commit 6816c7a

Browse files
author
1877682825@qq.com
committed
area update
1 parent 7e720b0 commit 6816c7a

File tree

16 files changed

+31
-96
lines changed

16 files changed

+31
-96
lines changed

‎ant.mgr/Infrastructure/Infrastructure/CodeGen/CrudTemplete/Controller.tpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ namespace ant.mgr.core.Controllers
2626
/// 进入{{ModelName}}页面
2727
/// </summary>
2828
/// <returns></returns>
29-
public ActionResult {{ModelClassName}}()
29+
[API("页面访问")]
30+
public ActionResult {{ModelClassName}}()
3031
{
3132
return View();
3233
}

‎ant.mgr/mgr.core/Areas/Admin/Controllers/AccountController.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public ActionResult Login(string returnUrl)
4545
/// </summary>
4646
/// <returns></returns>
4747
[AuthorizeFilter]
48+
[API("用户信息页面访问")]
4849
public async Task<ActionResult> UserDetail()
4950
{
5051
var currentUser = await AccountRespository.GetUserInfo(UserToken);
@@ -145,6 +146,7 @@ public async Task<JsonResult> LogOn([FromForm] LogOnVM info)
145146
/// </summary>
146147
/// <returns></returns>
147148
[AuthorizeFilter]
149+
[API("用户列表页面访问")]
148150
public ActionResult UserList()
149151
{
150152
return View();

‎ant.mgr/mgr.core/Areas/Admin/Controllers/CommonController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ public ActionResult CodeGenDown([FromForm] CodeGenVm model)
113113
/// </summary>
114114
/// <returns></returns>
115115
[AuthorizeFilter]
116+
[API("代码生成页面访问")]
116117
public ActionResult CodeGen()
117118
{
118119
return View();

‎ant.mgr/mgr.core/Areas/Admin/Controllers/ErrorController.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@ public ActionResult Http403(string userInfo)
3636
return View();
3737
}
3838

39-
public ActionResult NoPower(string acionInfo)
40-
{
41-
ViewBag.ActionInfo = acionInfo;
42-
return View();
43-
}
4439

4540
/// <summary>
4641
/// 未登录
4742
/// </summary>
4843
public ActionResult NoLogin()
4944
{
50-
return RedirectToAction("Login", "Account");
45+
return RedirectToAction("Login", "Account",new {area="Admin"});
5146
}
5247

5348
/// <summary>

‎ant.mgr/mgr.core/Areas/Admin/Controllers/HomeController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public ActionResult Index()
4848
/// 获取所有的Menu
4949
/// </summary>
5050
/// <returns></returns>
51+
[API("菜单页面访问")]
5152
public ActionResult MenuList()
5253
{
5354
return View();

‎ant.mgr/mgr.core/Areas/Admin/Controllers/RoleController.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ public RoleController(IRoleRespository _roleRespository)
2222
RoleRespository = _roleRespository;
2323
}
2424

25+
[API("角色页面访问")]
2526
public ViewResult RoleList()
2627
{
2728
return View();
2829
}
29-
30+
[API("权限页面访问")]
3031
public ViewResult RoleAction()
3132
{
3233
return View();

‎ant.mgr/mgr.core/Areas/Admin/Filter/AuthorizeFilterAttribute.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ public override void OnActionExecuting(ActionExecutingContext filterContext)
109109
//检查当前用户是否有访问当前menu的权限
110110
var currentUrl = currentContext.controllerName + "/" + currentContext.actionName;
111111

112+
if (!string.IsNullOrEmpty(currentContext.area))
113+
{
114+
currentUrl = currentContext.area + "/" + currentUrl;
115+
}
112116

113117
//检查是否是上帝模式//
114118
if (GlobalSetting.GoldList.Contains(systemUser.Eid))
@@ -137,6 +141,10 @@ public override void OnActionExecuting(ActionExecutingContext filterContext)
137141
if (s1.Count < 2) return;
138142
var s2 = s1.Take(2).Reverse().ToList();
139143
currentUrl = s2[0] + "/" + s2[1];
144+
if (!string.IsNullOrEmpty(currentContext.area))
145+
{
146+
currentUrl = currentContext.area + "/" + currentUrl;
147+
}
140148
menuTid = MenuRespository.HaveMenuPermission(currentUrl, systemUser.MenuRights);
141149
}
142150
}

‎ant.mgr/mgr.core/Areas/Admin/Filter/BaseFilterAttribute.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ public filterContextInfo(ActionExecutingContext filterContext)
113113
//获取ACTION 名称
114114
actionName = filterContext.RouteData.Values["action"].ToString();
115115

116+
117+
area = filterContext.RouteData.Values["area"]?.ToString();
118+
116119
#endregion 获取链接中的字符
117120
}
118121

@@ -132,5 +135,6 @@ public filterContextInfo(ActionExecutingContext filterContext)
132135
/// 获取ACTION 名称
133136
/// </summary>
134137
public string actionName { get; set; }
138+
public string area { get; set; }
135139
}
136140
}

‎ant.mgr/mgr.core/Areas/Admin/Views/Error/Http404.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="error-desc">
2323
抱歉，页面好像去火星了~
2424
<br />您可以返回主页看看
25-
<br /><a href="@Url.Page("/Home/Index", new { area = "Admin" })" class="btn btn-primary m-t">主页</a>
25+
<br /><a href="~/Admin/Home/Index" class="btn btn-primary m-t">主页</a>
2626
</div>
2727
</div>
2828

‎ant.mgr/mgr.core/Areas/Admin/Views/Error/Http4041.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="error-desc">
2323
抱歉，页面好像去火星了~
2424
<br />您可以返回主页看看
25-
<br /><a href="@Url.Page("/Home/Index", new { area = "Admin" })" class="btn btn-primary m-t">主页</a>
25+
<br /><a href="~/Admin/Home/Index" class="btn btn-primary m-t">主页</a>
2626
</div>
2727
</div>
2828

0 commit comments

Comments
 (0)