diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs index 1ec6601..5eb41a2 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs @@ -60,14 +60,14 @@ namespace APT.PF.WebApi.Controllers.Api.FM if (!string.IsNullOrEmpty(request.random)) { var verCode = CsRedisManager.StringGet(SessionKey.VERIFY_CODE + request.random); - //if (verCode == null) - //{ - // return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不存在" }); - //} - //if (request.verificationCode.ToUpper() != verCode.ToUpper()) - //{ - // return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" }); - //} + if (verCode == null) + { + return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不存在" }); + } + if (request.verificationCode.ToUpper() != verCode.ToUpper()) + { + return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" }); + } } } else @@ -301,16 +301,16 @@ namespace APT.PF.WebApi.Controllers.Api.FM else { loginUser = commonService.GetEntity(i => (i.CODE == request.UserName - || i.PHONE == request.UserName) , filter); + || i.PHONE == request.UserName), filter); if (loginUser == null) throw new Exception("用户信息不存在"); - if(loginUser.PASSWORD!= pwdLower&& loginUser.PASSWORD != pwdUpper) + if (loginUser.PASSWORD != pwdLower && loginUser.PASSWORD != pwdUpper) { throw new Exception("用户名或密码错误"); } } //app返回租户 - + loginUser.Tenant = filter.SpecifyTenant; return loginUser; }