From 48aa43a04f8d8a0964d9d8a206e329f400fd5b89 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 07 八月 2023 18:10:04 +0800
Subject: [PATCH] 1.移出班组功能，单独关联人员 2.用户清单取消指定班组 3.生产开报工增加扫码后选择设备 4.用户清单导入取消班组 5.erp订单查询、订单下达 mes工单查询、报废补单增加销售订单号
---
VueWebApi/Tools/ChannelActionFilterAttribute.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/VueWebApi/Tools/ChannelActionFilterAttribute.cs b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
index 87cd867..04dca50 100644
--- a/VueWebApi/Tools/ChannelActionFilterAttribute.cs
+++ b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
@@ -24,23 +24,25 @@
/// 璇锋眰鎺ュ彛涔嬪墠娓犻亾杩囨护
/// </summary>
/// <param name="actionContext"></param>
- public override void OnActionExecuting(HttpActionContext actionContext)
+ public override void OnActionExecuting(HttpActionContext actionContext)
{
try
{
- var User = HttpContext.Current.Session["User"].ToString();
- User loginUser = JsonConvert.DeserializeObject<User>(User);
+ var rediskey = HttpContext.Current.Request.Cookies["rediskey"].Value.ToString();
+ var guid = HttpContext.Current.Request.Cookies["guid"].Value.ToString();
+ //var rediskey = HttpContext.Current.Request.Headers["rediskey"].ToString();
+ //var guid = HttpContext.Current.Request.Headers["guid"].ToString();
base.OnActionExecuting(actionContext);
//濡傛灉瀛樺湪
- if (redis.Get<User>("LoginUserIDPC" + loginUser.userid, 0).userid.ToString() != "")
+ if (redis.Get<User>(rediskey, 0).userid.ToString() != "")
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>("LoginUserIDPC" + loginUser.userid, 0);
+ User r_loginUser = redis.Get<User>(rediskey, 0);
//濡傛灉session涓殑鐢ㄦ埛guid鍜宺edis涓殑鐢ㄦ埛guid鍖归厤
- if (r_loginUser.guid.Equals(loginUser.guid))
+ if (r_loginUser.guid.Equals(guid))
{
//閲嶇疆杩囨湡鏃堕棿
- redis.Set<User>("LoginUserIDPC" + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
+ redis.KeyExpire(rediskey, redis.secondsTimeOut);
}
else
{
@@ -62,7 +64,7 @@
mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
}
-
- }
+
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3