Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

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

                             //CacheHelper.Insert(token, Dic, 1440, System.Web.Caching.CacheItemPriority.NotRemovable, onRemove);
                             //放入redis缓存
                             //RedisHelper.StringSet(token,Dic.ToJson(),new TimeSpan(336,0,0));
-                            RedisHelper.StringSet(CommonHelper.MD5(token), dt.Rows[0]["F_UserCode"].ToString(), new TimeSpan(336, 0, 0));
+                            //RedisHelper.StringSet(CommonHelper.MD5(token), dt.Rows[0]["F_UserCode"].ToString(), new TimeSpan(336, 0, 0));
 
                             return Success("登录成功", new
                             {
                             //CacheHelper.Insert(token, Dic, 1440, System.Web.Caching.CacheItemPriority.NotRemovable);
                             //放入redis缓存
                             //RedisHelper.StringSet(token, Dic.ToJson(), new TimeSpan(24, 0, 0));
-                            RedisHelper.StringSet(CommonHelper.MD5(token), "1", new TimeSpan(336, 0, 0));
+                            //RedisHelper.StringSet(CommonHelper.MD5(token), "1", new TimeSpan(336, 0, 0));
                             return Success("登录成功", new
                             {
                                 token = token

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

                 context.Response.Write(new AjaxResult { state = ResultTypes.error.ToString(), message = "非法输入！" }.ToJson());
                 context.Response.End();
             }
+
+            var log = LogFactory.GetLogger(this.GetType().ToString());
             if (Configs.GetValue("IsLog").ToString() == "1")
             {
-                var log = LogFactory.GetLogger(this.GetType().ToString());
                 log.Debug(Params.ToJson());
             }
 
             }
             try
             {
-                ////获取缓存
-                //var dict = CacheHelper.Get(token);
-                //获取redis缓存
-                var dict = RedisHelper.StringGet(CommonHelper.MD5(token));
+                //////获取缓存
+                ////var dict = CacheHelper.Get(token);
+                ////获取redis缓存
+                //var dict = RedisHelper.StringGet(CommonHelper.MD5(token));
                 
-                if (dict == null)
-                {
-                    //log.Debug(Params.ToJson());
-                    return;
-                }
+                //if (dict == null)
+                //{
+                //    //log.Debug(Params.ToJson());
+                //    return;
+                //}
                 Dictionary<string, string> userData = null;
                 //获取FormsAuthenticationTicket对象
                 FormsAuthenticationTicket ticket = FormsAuthentication.Decrypt(token);
-                if (ticket != null && string.IsNullOrEmpty(ticket.UserData) == false)
-                    userData = (new JavaScriptSerializer()).Deserialize<Dictionary<string, string>>(ticket.UserData); //还原用户数据
-                if (ticket != null && userData != null)
-                    context.User = new FormsPrincipal<Dictionary<string, string>>(ticket, userData);//重新给context.User赋值。
-
+                if (ticket != null)
+                {
+                    if (!ticket.Expired)
+                    {
+                        if (!string.IsNullOrEmpty(ticket.UserData))
+                            userData = (new JavaScriptSerializer()).Deserialize<Dictionary<string, string>>(ticket.UserData); //还原用户数据
+                        if (userData != null)
+                            context.User = new FormsPrincipal<Dictionary<string, string>>(ticket, userData);//重新给context.User赋值。
+                    }
+                    //log.Debug(ticket.ToJson());
+                }
                 //var obj = new { UserCode = userData["F_UserCode"], Params = Params };
                 //log.Debug(Params.ToJson());
 
             }
-            catch {
+            catch (Exception ex){
                 /* 有异常也不要抛出，防止攻击者试探。 */
-                //log.Debug(Params.ToJson());
+                log.Debug(ex.ToString());
             }
         }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/FormsPrincipal.cs

 
             // 2. 创建一个FormsAuthenticationTicket，它包含登录名以及额外的用户数据。
             FormsAuthenticationTicket ticket = new FormsAuthenticationTicket(
-                2, loginName, DateTime.Now, DateTime.Now.AddDays(1), true, data);
+                2, loginName, DateTime.Now, DateTime.Now.AddDays(8), true, data);
 
 
             // 3. 加密Ticket，变成一个加密的字符串。