From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/Controllers/LoginController.cs | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index a22b43a..89aced1 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -19,7 +19,7 @@
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
ToMessage mes = new ToMessage();
- RedisHelper redis = new RedisHelper();
+ RedisCommon redis = new RedisCommon();
//鑾峰彇浼佷笟閰嶇疆Enterprise
private static readonly string Enterprise = AppSetting.GetAppSetting("Enterprise");
@@ -73,36 +73,36 @@
User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
//濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
- if (redis.Get<User>(ms.rediskey, 0) == null)
+ if (redis.GetStringKey<User>(ms.rediskey) == null)
{
//鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(ms.rediskey, ms, redis.secondsTimeOut, 0);
+ redis.SetStringKey<User>(ms.rediskey, ms, TimeSpan.FromSeconds(redis.secondsTimeOut));
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>(ms.rediskey, 0);
+ User r_loginUser = redis.GetStringKey<User>(ms.rediskey);
//濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
if ((r_loginUser.rediskey).Equals(loginUser.rediskey))
{
mes.data = ms.token.ToString();
mes.code = "302";
- mes.Message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
+ mes.message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
}
else
{
//閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(loginUser.rediskey, loginUser, redis.secondsTimeOut, 0);
+ redis.SetStringKey<User>(loginUser.rediskey, loginUser, TimeSpan.FromSeconds(redis.secondsTimeOut));
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -110,7 +110,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
@@ -150,26 +150,26 @@
}
});
bool aa = DapperHelper.DoTransaction(list);
- redis.Remove(us.rediskey, 0);//鍒犻櫎redis
- redis.Set<User>(us.rediskey, us, redis.secondsTimeOut, 0);//鍐欏叆redis
+ redis.KeyDelete(us.rediskey);//鍒犻櫎redis
+ redis.SetStringKey<User>(us.rediskey, us, TimeSpan.FromSeconds(redis.secondsTimeOut));//鍐欏叆redis
}
else
{
- redis.Remove(us.rediskey, 0);//鍒犻櫎redis
- redis.Set<User>(us.rediskey, us, redis.secondsTimeOut, 0);//鍐欏叆redis
+ redis.KeyDelete(us.rediskey);//鍒犻櫎redis
+ redis.SetStringKey<User>(us.rediskey, us, TimeSpan.FromSeconds(redis.secondsTimeOut));//鍐欏叆redis
}
//鍐欏叆鏃ュ織
LogHelper.DbOperateLog(us.usercode, "寮哄埗涓嬬嚎", "琚己鍒朵笅绾夸簡", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "寮哄埗涓嬬嚎鎴愬姛!";
+ mes.message = "寮哄埗涓嬬嚎鎴愬姛!";
mes.data = null;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return Json(mes);
@@ -198,7 +198,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return Json(mes);
}
@@ -288,35 +288,35 @@
User loginUser = JsonConvert.DeserializeObject<User>(JsonConvert.SerializeObject(ms));
//濡傛灉redis鐧诲綍鐢ㄦ埛涓笉瀛樺湪褰撳墠鐢ㄦ埛
- if (redis.Get<User>(ms.rediskey, 0) == null)
+ if (redis.GetStringKey<User>(ms.rediskey) == null)
{
//鍐欏叆redis(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(ms.rediskey, ms, redis.secondsTimeOut, 0);
+ redis.SetStringKey<User>(ms.rediskey, ms, TimeSpan.FromSeconds(redis.secondsTimeOut));
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
{
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
- User r_loginUser = redis.Get<User>(ms.rediskey, 0);
+ User r_loginUser = redis.GetStringKey<User>(ms.rediskey);
//濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
if ((r_loginUser.rediskey).Equals(loginUser.rediskey))
{
- redis.Remove(loginUser.rediskey, 0);//鍒犻櫎redis
- redis.Set<User>(loginUser.rediskey, ms, redis.secondsTimeOut, 0);//鍐欏叆redis
+ redis.KeyDelete(loginUser.rediskey);//鍒犻櫎redis
+ redis.SetStringKey<User>(loginUser.rediskey, ms, TimeSpan.FromSeconds(redis.secondsTimeOut));//鍐欏叆redis
}
else
{
//閲嶇疆杩囨湡鏃堕棿(娉ㄦ剰锛歳edis绫婚噷闈㈢殑澶辨晥鏃堕棿蹇呴』鍦╧ey鍒涘缓瀹屾垚涔嬪悗鎵嶇敓鏁�)
- redis.Set<User>(loginUser.rediskey, loginUser, redis.secondsTimeOut, 0);
+ redis.SetStringKey<User>(loginUser.rediskey, loginUser, TimeSpan.FromSeconds(redis.secondsTimeOut));
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -324,7 +324,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
@@ -369,5 +369,19 @@
//return mes.ResponseMess(mes);
}
#endregion
+
+ #region[App鐗堟湰鍗囩骇鎺ュ彛]
+ /// <summary>
+ /// App鐗堟湰鍗囩骇鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "AppUpgrade")]
+ [HttpPost]
+ public JsonResult AppUpgrade()
+ {
+ mes = LoginBLL.AppUpgrade();
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3