修改验证用户

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/App_Start/AuthorizeAttribute.cs

@@ -19,10 +19,30 @@ namespace CallCenterApi.Interface
         /// <param name="filterContext"></param>
         public override void OnAuthorization(AuthorizationContext filterContext)
         {
-            bool isAuth = false;
-          
+            //bool isAuth = false;
             if (filterContext.RequestContext.HttpContext.Request.IsAuthenticated)
             {
+                try
+                {
+                    var us = (FormsPrincipal<Dictionary<string, string>>)filterContext.RequestContext.HttpContext.User;
+
+                    var user= new BLL.T_Sys_UserAccount().GetModel(us.UserData["F_UserCode"]);
+                    if (user == null || user.F_RoleId.ToString() != us.UserData["F_RoleID"])
+                    {
+                        //角色改变时重新登录
+                        filterContext.RequestContext.HttpContext.Response.StatusCode = 200;
+                        filterContext.Result = new ContentResult { Content = new AjaxResult { state = ResultTypes.notoken.ToString(), message = "token无效或过期，请重新登录。" }.ToJson() };
+                        return;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    WriteLog(filterContext, "验证失败：" + ex.ToString());
+                    filterContext.RequestContext.HttpContext.Response.StatusCode = 200;
+                    filterContext.Result = new ContentResult { Content = new AjaxResult { state = ResultTypes.notoken.ToString(), message = "token无效或过期，请重新登录。" }.ToJson() };
+                    return;
+                }
+
                 //var actionDescriptor = filterContext.ActionDescriptor;
                 //var controllerDescriptor = actionDescriptor.ControllerDescriptor;
                 //var controller = controllerDescriptor.ControllerName;
@@ -58,9 +78,9 @@ namespace CallCenterApi.Interface
             }
             else
             {
-                filterContext.HttpContext.Response.StatusCode = 200;
+                filterContext.RequestContext.HttpContext.Response.StatusCode = 200;
                 filterContext.Result = new ContentResult { Content = new AjaxResult { state = ResultTypes.notoken.ToString(), message = "token无效或过期，请重新登录。"}.ToJson() };
-                WriteLog(filterContext);
+                WriteLog(filterContext, "token无效或过期，请重新登录。");
                 return;
             }
 
@@ -78,10 +98,10 @@ namespace CallCenterApi.Interface
             
             //}
         }
-        private void WriteLog(AuthorizationContext filterContext)
+        private void WriteLog(AuthorizationContext filterContext,string error)
         {
             var log = LogFactory.GetLogger(filterContext.Controller.ToString()+"/"+ filterContext.ActionDescriptor.ActionName);
-            log.Error("token无效或过期，请重新登录。");
+            log.Error(error);
         }
 
     }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -102,7 +102,7 @@ namespace CallCenterApi.Interface.Controllers
                             //Dic.Add("F_DeptId", dt.Rows[0]["F_DeptId"].ToString());
                             //Dic.Add("F_UserName", dt.Rows[0]["F_UserName"].ToString());
                             //Dic.Add("F_Telephone", dt.Rows[0]["F_Telephone"].ToString());
-                            //Dic.Add("F_RoleID", dt.Rows[0]["F_RoleID"].ToString());
+                            Dic.Add("F_RoleID", dt.Rows[0]["F_RoleID"].ToString());
                             //Dic.Add("F_SeatFlag", dt.Rows[0]["F_SeatFlag"].ToString());
 
                             //if (dt.Rows[0]["F_GroupId"].ToString() != null)
@@ -274,29 +274,29 @@ namespace CallCenterApi.Interface.Controllers
                             Dictionary<string, string> Dic = new Dictionary<string, string>();
                             Dic.Add("F_UserID", dt.Rows[0]["F_UserId"].ToString());
                             Dic.Add("F_UserCode", dt.Rows[0]["F_UserCode"].ToString());
-                            Dic.Add("F_DeptId", dt.Rows[0]["F_DeptId"].ToString());
-                            Dic.Add("F_UserName", dt.Rows[0]["F_UserName"].ToString());
-                            Dic.Add("F_Telephone", dt.Rows[0]["F_Telephone"].ToString());
+                            //Dic.Add("F_DeptId", dt.Rows[0]["F_DeptId"].ToString());
+                            //Dic.Add("F_UserName", dt.Rows[0]["F_UserName"].ToString());
+                            //Dic.Add("F_Telephone", dt.Rows[0]["F_Telephone"].ToString());
                             Dic.Add("F_RoleID", dt.Rows[0]["F_RoleID"].ToString());
-                            Dic.Add("F_SeatFlag", dt.Rows[0]["F_SeatFlag"].ToString());
+                            //Dic.Add("F_SeatFlag", dt.Rows[0]["F_SeatFlag"].ToString());
 
-                            if (dt.Rows[0]["F_GroupId"].ToString() != null)
-                            {
-                                Dic.Add("F_GroupId", dt.Rows[0]["F_GroupId"].ToString());
-                            }
-                            if (dt.Rows[0]["F_SeatRight"].ToString() != null)
-                            {
-                                Dic.Add("F_SeatRight", dt.Rows[0]["F_SeatRight"].ToString());
-                            }
-                            if (!string.IsNullOrEmpty(login.ExtensionPhone))
-                            {
-                                Dic.Add("F_ExtensionNumber", login.ExtensionPhone);
-                            }
-                            else
-                            {
-                                Dic.Add("F_ExtensionNumber", "");
-                            }
-                            Dic.Add("F_WorkNumber", dt.Rows[0]["F_WorkNumber"].ToString());
+                            //if (dt.Rows[0]["F_GroupId"].ToString() != null)
+                            //{
+                            //    Dic.Add("F_GroupId", dt.Rows[0]["F_GroupId"].ToString());
+                            //}
+                            //if (dt.Rows[0]["F_SeatRight"].ToString() != null)
+                            //{
+                            //    Dic.Add("F_SeatRight", dt.Rows[0]["F_SeatRight"].ToString());
+                            //}
+                            //if (!string.IsNullOrEmpty(login.ExtensionPhone))
+                            //{
+                            //    Dic.Add("F_ExtensionNumber", login.ExtensionPhone);
+                            //}
+                            //else
+                            //{
+                            //    Dic.Add("F_ExtensionNumber", "");
+                            //}
+                            //Dic.Add("F_WorkNumber", dt.Rows[0]["F_WorkNumber"].ToString());
 
                             //CookieUtil.SetCookie("BaseCallCenter_T_User", Dic);
                             //写入登录日志

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -15,6 +15,7 @@ using CallCenterApi.Common;
 
 namespace CallCenterApi.Interface.Controllers.callout
 {
+    [Authority]
     public class CallOutPlanController : BaseController
     {
         private readonly BLL.T_Call_OutTask otBLL = new BLL.T_Call_OutTask();