| Wms/Model/ModelDto/SysDto/UserDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.BLL/SysServer/UserInforServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/WMS.IBLL/ISysServer/IUserInforServer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Wms/Wms/Controllers/WeatherForecastController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Wms/Model/ModelDto/SysDto/UserDto.cs
New file @@ -0,0 +1,24 @@ using System; using System.Collections.Generic; using System.Text; namespace Model.ModelDto.SysDto { /// <summary> /// 用户dto /// </summary> public class UserDto { /// <summary> /// 用户token /// </summary> public string Token { get; set; } /// <summary> /// 真实姓名 /// </summary> public string RealName { get; set; } } } Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -35,8 +35,10 @@ } public async Task<int> LoginAdmin(string loginName, string loginPwd) public async Task<UserInfoDto> LoginAdmin(string loginName, string loginPwd) { UserInfoDto userDto = new UserInfoDto(); //查询密码已错误次数 string pwdErrNumSql = $@"select PwdErrNum from SysUserInfor where UserName='{loginName}'"; int pwdErrNum = Db.Ado.GetInt(pwdErrNumSql); @@ -59,11 +61,16 @@ //最后登陆时间 await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync(); return modUser.Id; userDto.Id = modUser.Id; userDto.RealName = modUser.RealName; return userDto; } else //当前账号被禁用 { return 0; userDto.Id = 0; userDto.RealName = ""; return userDto; } } else //账号密码不正确或没有此账号 @@ -72,7 +79,9 @@ string addErrNumSql = $@"update SysUserInfor set PwdErrNum+=1 where UserName='{loginName}'"; int addErrNum = Db.Ado.ExecuteCommand(addErrNumSql); return -1; userDto.Id = -1; userDto.RealName = ""; return userDto; } } else//锁定账号 @@ -80,7 +89,10 @@ //账号改为停用 string uptUserStatusSql = $@"update SysUserInfor set Status=1 where UserName='{loginName}'"; int uptUserStatus = Db.Ado.ExecuteCommand(uptUserStatusSql); return -2; userDto.Id = -2; userDto.RealName = ""; return userDto; } } Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
@@ -9,7 +9,7 @@ { public interface IUserInforServer { Task<int> LoginAdmin(string loginName, string loginPwd); Task<UserInfoDto> LoginAdmin(string loginName, string loginPwd); /// <summary> /// 获取用户角色信息 Wms/Wms/Controllers/WeatherForecastController.cs
@@ -7,6 +7,7 @@ using WMS.IBLL.ISysServer; using Wms.Tools; using Utility; using Model.ModelDto.SysDto; namespace Wms.Controllers { @@ -53,23 +54,28 @@ /// <param name="model">登录名</param> /// <returns></returns> [HttpPost] public async Task<string> Login(LoginVm model) public async Task<UserDto> Login(LoginVm model) { if (ModelState.IsValid) { var userId = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd); var user = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd); UserDto dto = new UserDto(); if (userId != -1 && userId != -2) // if (user.Id != -1 && user.Id != -2) // { if (userId != 0) //正确返回 if (user.Id != 0) //正确返回 { Dictionary<string, string> keyValuePairs = new Dictionary<string, string> { {"loginID", userId.ToString()}, {"loginID", user.Id.ToString()}, {"LoginName", model.LoginName} }; var tnToken = tokenHelper.CreateToken(keyValuePairs); return tnToken.TokenStr; dto.Token = tnToken.TokenStr; dto.RealName = user.RealName; return dto; } else //当前账号被禁用 { @@ -77,7 +83,7 @@ throw Oops.Bah("当前账号已被禁用"); } } else if (userId == -1) //账号密码错误 else if (user.Id == -1) //账号密码错误 { throw Oops.Bah("当前账号或密码错误"); }