From 770c681572301c938d7b9adcc60d9aad9d1dd604 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:37:03 +0800
Subject: [PATCH] 1.新增基本资料功能接口(erp车间/部门、erp仓库、erp用户信息) 2.报工接口添加字段入库条码 3.增加末道工序报工后提交入库接口(对接erp) 4.增加生成系统条码接口(自定义)
---
VueWebApi/Tools/ChannelActionFilterAttribute.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/Tools/ChannelActionFilterAttribute.cs b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
index fa4b7e5..23dc87b 100644
--- a/VueWebApi/Tools/ChannelActionFilterAttribute.cs
+++ b/VueWebApi/Tools/ChannelActionFilterAttribute.cs
@@ -1,6 +1,7 @@
锘縰sing Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Linq;
using System.Net;
using System.Net.Http;
@@ -20,6 +21,7 @@
{
ToMessage mes = new ToMessage();
RedisHelper redis = new RedisHelper();
+
/// <summary>
/// 璇锋眰鎺ュ彛涔嬪墠娓犻亾杩囨护
/// </summary>
@@ -28,39 +30,39 @@
{
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();
base.OnActionExecuting(actionContext);
//濡傛灉瀛樺湪
- if (redis.Get<User>("LoginUserID" + loginUser.userid, 0).userid.ToString() != "")
+ if (redis.Get<User>(rediskey, 0).userid.ToString() != "")
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>("LoginUserID" + loginUser.userid, 0);
- //濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
- if (r_loginUser.usercode.Equals(loginUser.usercode))
+ User r_loginUser = redis.Get<User>(rediskey, 0);
+ //濡傛灉session涓殑鐢ㄦ埛guid鍜宺edis涓殑鐢ㄦ埛guid鍖归厤
+ if (r_loginUser.guid.Equals(guid))
{
//閲嶇疆杩囨湡鏃堕棿
- redis.Set<User>("LoginUserID" + loginUser.userid, loginUser, redis.secondsTimeOut, 0);
+ redis.KeyExpire(rediskey, redis.secondsTimeOut);
}
else
{
- mes.code = "300";
+ mes.code = "303";
mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
- actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.Ambiguous, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
+ actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
}
}
else //濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
{
- mes.code = "300";
+ mes.code = "303";
mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
- actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.Ambiguous, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
+ actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
}
}
catch (Exception)
{
- mes.code = "300";
+ mes.code = "303";
mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
- actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.Ambiguous, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
+ actionContext.Response = new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(JsonConvert.SerializeObject(mes), Encoding.GetEncoding("UTF-8"), "application/json") };
}
}
--
Gitblit v1.9.3