Procházet zdrojové kódy

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

duhongyu %!s(int64=4) %!d(string=před) roky
rodič
revize
5e53d7d541

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

149
                             //CacheHelper.Insert(token, Dic, 1440, System.Web.Caching.CacheItemPriority.NotRemovable, onRemove);
149
                             //CacheHelper.Insert(token, Dic, 1440, System.Web.Caching.CacheItemPriority.NotRemovable, onRemove);
150
                             //放入redis缓存
150
                             //放入redis缓存
151
                             //RedisHelper.StringSet(token,Dic.ToJson(),new TimeSpan(336,0,0));
151
                             //RedisHelper.StringSet(token,Dic.ToJson(),new TimeSpan(336,0,0));
152
-                            RedisHelper.StringSet(CommonHelper.MD5(token), dt.Rows[0]["F_UserCode"].ToString(), new TimeSpan(336, 0, 0));
152
+                            //RedisHelper.StringSet(CommonHelper.MD5(token), dt.Rows[0]["F_UserCode"].ToString(), new TimeSpan(336, 0, 0));
153
 
153
 
154
                             return Success("登录成功", new
154
                             return Success("登录成功", new
155
                             {
155
                             {
319
                             //CacheHelper.Insert(token, Dic, 1440, System.Web.Caching.CacheItemPriority.NotRemovable);
319
                             //CacheHelper.Insert(token, Dic, 1440, System.Web.Caching.CacheItemPriority.NotRemovable);
320
                             //放入redis缓存
320
                             //放入redis缓存
321
                             //RedisHelper.StringSet(token, Dic.ToJson(), new TimeSpan(24, 0, 0));
321
                             //RedisHelper.StringSet(token, Dic.ToJson(), new TimeSpan(24, 0, 0));
322
-                            RedisHelper.StringSet(CommonHelper.MD5(token), "1", new TimeSpan(336, 0, 0));
322
+                            //RedisHelper.StringSet(CommonHelper.MD5(token), "1", new TimeSpan(336, 0, 0));
323
                             return Success("登录成功", new
323
                             return Success("登录成功", new
324
                             {
324
                             {
325
                                 token = token
325
                                 token = token

+ 24 - 17
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

73
                 context.Response.Write(new AjaxResult { state = ResultTypes.error.ToString(), message = "非法输入!" }.ToJson());
73
                 context.Response.Write(new AjaxResult { state = ResultTypes.error.ToString(), message = "非法输入!" }.ToJson());
74
                 context.Response.End();
74
                 context.Response.End();
75
             }
75
             }
76
+
77
+            var log = LogFactory.GetLogger(this.GetType().ToString());
76
             if (Configs.GetValue("IsLog").ToString() == "1")
78
             if (Configs.GetValue("IsLog").ToString() == "1")
77
             {
79
             {
78
-                var log = LogFactory.GetLogger(this.GetType().ToString());
79
                 log.Debug(Params.ToJson());
80
                 log.Debug(Params.ToJson());
80
             }
81
             }
81
 
82
 
87
             }
88
             }
88
             try
89
             try
89
             {
90
             {
90
-                ////获取缓存
91
-                //var dict = CacheHelper.Get(token);
92
-                //获取redis缓存
93
-                var dict = RedisHelper.StringGet(CommonHelper.MD5(token));
91
+                //////获取缓存
92
+                ////var dict = CacheHelper.Get(token);
93
+                ////获取redis缓存
94
+                //var dict = RedisHelper.StringGet(CommonHelper.MD5(token));
94
                 
95
                 
95
-                if (dict == null)
96
-                {
97
-                    //log.Debug(Params.ToJson());
98
-                    return;
99
-                }
96
+                //if (dict == null)
97
+                //{
98
+                //    //log.Debug(Params.ToJson());
99
+                //    return;
100
+                //}
100
                 Dictionary<string, string> userData = null;
101
                 Dictionary<string, string> userData = null;
101
                 //获取FormsAuthenticationTicket对象
102
                 //获取FormsAuthenticationTicket对象
102
                 FormsAuthenticationTicket ticket = FormsAuthentication.Decrypt(token);
103
                 FormsAuthenticationTicket ticket = FormsAuthentication.Decrypt(token);
103
-                if (ticket != null && string.IsNullOrEmpty(ticket.UserData) == false)
104
-                    userData = (new JavaScriptSerializer()).Deserialize<Dictionary<string, string>>(ticket.UserData); //还原用户数据
105
-                if (ticket != null && userData != null)
106
-                    context.User = new FormsPrincipal<Dictionary<string, string>>(ticket, userData);//重新给context.User赋值。
107
-
104
+                if (ticket != null)
105
+                {
106
+                    if (!ticket.Expired)
107
+                    {
108
+                        if (!string.IsNullOrEmpty(ticket.UserData))
109
+                            userData = (new JavaScriptSerializer()).Deserialize<Dictionary<string, string>>(ticket.UserData); //还原用户数据
110
+                        if (userData != null)
111
+                            context.User = new FormsPrincipal<Dictionary<string, string>>(ticket, userData);//重新给context.User赋值。
112
+                    }
113
+                    //log.Debug(ticket.ToJson());
114
+                }
108
                 //var obj = new { UserCode = userData["F_UserCode"], Params = Params };
115
                 //var obj = new { UserCode = userData["F_UserCode"], Params = Params };
109
                 //log.Debug(Params.ToJson());
116
                 //log.Debug(Params.ToJson());
110
 
117
 
111
             }
118
             }
112
-            catch {
119
+            catch (Exception ex){
113
                 /* 有异常也不要抛出,防止攻击者试探。 */
120
                 /* 有异常也不要抛出,防止攻击者试探。 */
114
-                //log.Debug(Params.ToJson());
121
+                log.Debug(ex.ToString());
115
             }
122
             }
116
         }
123
         }
117
 
124
 

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/FormsPrincipal.cs

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