From 2264c47cff7ab5ce52d7c158ac0eb941e7b46506 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 31 八月 2022 23:50:53 +0800
Subject: [PATCH] 大岛测试bug修改
---
VueWebApi/Controllers/LoginController.cs | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index 5d31614..5006a59 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -21,15 +21,17 @@
ToMessage mes = new ToMessage();
RedisHelper redis = new RedisHelper();
+ #region[PC鐢ㄦ埛鐧诲綍]
/// <summary>
- /// 鐢ㄦ埛鐧诲綍
+ /// PC鐢ㄦ埛鐧诲綍
/// </summary>
/// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
/// <returns></returns>
[Route(template: "LoginSave")]
[HttpGet]
- public HttpResponseMessage LoginSave(string username, string password)
+ public HttpResponseMessage LoginSave(string username, string password, string usertype)
{
try
{
@@ -38,12 +40,12 @@
{
List<User> mss = new List<User>();
User ms = new User();
- //ms.guid=Guid.NewGuid().ToString();
+ ms.guid = username + password + Guid.NewGuid().ToString();
ms.userid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
ms.usercode = dt.Rows[0]["USERCODE"].ToString();
ms.username = dt.Rows[0]["USERNAME"].ToString();
ms.password = dt.Rows[0]["PASSWORD"].ToString();
- ms.usertype = "PC";
+ ms.usertype = usertype;
mss.Add(ms);
HttpContext.Current.Session.Clear(); //浠庝細璇濈姸鎬侀泦鍚堜腑鍒犻櫎鎵�鏈夌殑閿��
//HttpContext.Current.Session["User"] = JsonConvert.SerializeObject(ms);
@@ -68,7 +70,7 @@
//鑾峰彇redis涓綋鍓嶇敤鎴蜂俊鎭�
User r_loginUser = redis.Get<User>("LoginUserID" + ms.usertype + ms.userid, 0);
//濡傛灉session涓殑鐢ㄦ埛usercode鍜宺edis涓殑鐢ㄦ埛usercode鍖归厤
- if (r_loginUser.usercode.Equals(loginUser.usercode))
+ if ((r_loginUser.usercode + r_loginUser.usertype).Equals(loginUser.usercode + loginUser.usertype))
{
mes.data = ms;
mes.code = "302";
@@ -108,6 +110,7 @@
return mes.ResponseMess(mes);
}
+ #endregion
#region[寮哄埗涓嬬嚎鎺ュ彛]
/// <summary>
@@ -124,7 +127,7 @@
{
try
{
- redis.Remove("LoginUserID"+usertype+ userid, 0); //鍒犻櫎redis
+ redis.Remove("LoginUserID" + usertype + userid, 0); //鍒犻櫎redis
mes.code = "200";
mes.count = 0;
mes.Message = "寮哄埗涓嬬嚎鎴愬姛!";
@@ -141,20 +144,21 @@
}
#endregion
-
#region[鏌ヨ鐧诲綍鑿滃崟]
/// <summary>
- /// 鏌ヨ鍔熻兘鑿滃崟
+ /// 鏌ヨ鐧诲綍鑿滃崟
/// </summary>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ /// <param name="usercode">鐧诲綍鐢ㄦ埛缂栫爜</param>
/// <returns></returns>
[Route(template: "LoginMenu")]
[HttpGet]
- public HttpResponseMessage LoginMenu()
+ public HttpResponseMessage LoginMenu(string usertype, string usercode)
{
try
{
- var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
- mes = LoginBLL.LoginMenu(usercode);
+ //var usercode = HttpContext.Current.Request.Cookies["navTabId"].Value.ToString();
+ mes = LoginBLL.LoginMenu(usercode, usertype);
}
catch (Exception e)
{
@@ -183,9 +187,9 @@
}
#endregion
- #region[鐧诲嚭]
+ #region[PC鐧诲嚭]
/// <summary>
- /// 鐧诲嚭
+ /// PC鐧诲嚭
/// </summary>
/// <param name="userid">鐢ㄦ埛id</param>
/// <param name="usercode">鐢ㄦ埛缂栫爜</param>
@@ -194,11 +198,78 @@
/// <returns></returns>
[Route(template: "LoginOut")]
[HttpPost]
+ [ChannelActionFilter]
public HttpResponseMessage LoginOut(int userid, string usercode, string username, string usertype)
{
mes = LoginBLL.LoginOut(userid, usercode, username, usertype);
return mes.ResponseMess(mes);
}
#endregion
+
+
+ #region[APP鐢ㄦ埛鐧诲綍]
+ /// <summary>
+ /// APP鐢ㄦ埛鐧诲綍
+ /// </summary>
+ /// <param name="username">鐢ㄦ埛缂栫爜</param>
+ /// <param name="password">瀵嗙爜</param>
+ /// <param name="usertype">鎿嶄綔绔被鍨�(PC APP)</param>
+ /// <returns></returns>
+ [Route(template: "LoginAppSave")]
+ [HttpGet]
+ public HttpResponseMessage LoginAppSave(string username, string password, string usertype)
+ {
+ try
+ {
+ DataTable dt = LoginBLL.LoginSearch(username, password);
+ if (dt.Rows.Count > 0)
+ {
+ List<User> mss = new List<User>();
+ User ms = new User();
+ ms.guid = username + password + Guid.NewGuid().ToString();
+ ms.userid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
+ ms.usercode = dt.Rows[0]["USERCODE"].ToString();
+ ms.username = dt.Rows[0]["USERNAME"].ToString();
+ ms.password = dt.Rows[0]["PASSWORD"].ToString();
+ ms.usertype = usertype;
+ mss.Add(ms);
+
+ mes.code = "200";
+ mes.Message = "鐧诲綍鎴愬姛!";
+ mes.data = ms;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "璐﹀彿鎴栧瘑鐮佷笉姝ｇ‘!";
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.Message = e.Message;
+ }
+
+ return mes.ResponseMess(mes);
+ }
+ #endregion
+
+ #region[APP鐧诲嚭]
+ /// <summary>
+ /// APP鐧诲嚭
+ /// </summary>
+ /// <param name="userid">鐢ㄦ埛id</param>
+ /// <param name="usercode">鐢ㄦ埛缂栫爜</param>
+ /// <param name="username">鐢ㄦ埛鍚�</param>
+ /// <param name="usertype">鎿嶄綔绔疨C/APP</param>
+ /// <returns></returns>
+ [Route(template: "LoginAppOut")]
+ [HttpPost]
+ public HttpResponseMessage LoginAppOut(int userid, string usercode, string username, string usertype)
+ {
+ mes = LoginBLL.LoginAppOut(userid, usercode, username, usertype);
+ return mes.ResponseMess(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3