23456
This commit is contained in:
		
							parent
							
								
									bd11fda0b3
								
							
						
					
					
						commit
						e39522b6d8
					
				@ -60,14 +60,14 @@ namespace APT.PF.WebApi.Controllers.Api.FM
 | 
				
			|||||||
                        if (!string.IsNullOrEmpty(request.random))
 | 
					                        if (!string.IsNullOrEmpty(request.random))
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            var verCode = CsRedisManager.StringGet(SessionKey.VERIFY_CODE + request.random);
 | 
					                            var verCode = CsRedisManager.StringGet(SessionKey.VERIFY_CODE + request.random);
 | 
				
			||||||
                            //if (verCode == null)
 | 
					                            if (verCode == null)
 | 
				
			||||||
                            //{
 | 
					                            {
 | 
				
			||||||
                            //    return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不存在" });
 | 
					                                return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不存在" });
 | 
				
			||||||
                            //}
 | 
					                            }
 | 
				
			||||||
                            //if (request.verificationCode.ToUpper() != verCode.ToUpper())
 | 
					                            if (request.verificationCode.ToUpper() != verCode.ToUpper())
 | 
				
			||||||
                            //{
 | 
					                            {
 | 
				
			||||||
                            //    return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" });
 | 
					                                return BadRequest(new { error = "error VERIFY_CODE ", error_description = "验证码不正确" });
 | 
				
			||||||
                            //}
 | 
					                            }
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    else
 | 
					                    else
 | 
				
			||||||
@ -301,16 +301,16 @@ namespace APT.PF.WebApi.Controllers.Api.FM
 | 
				
			|||||||
            else
 | 
					            else
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                loginUser = commonService.GetEntity<T_FM_USER>(i => (i.CODE == request.UserName
 | 
					                loginUser = commonService.GetEntity<T_FM_USER>(i => (i.CODE == request.UserName
 | 
				
			||||||
           || i.PHONE == request.UserName) , filter);
 | 
					           || i.PHONE == request.UserName), filter);
 | 
				
			||||||
                if (loginUser == null)
 | 
					                if (loginUser == null)
 | 
				
			||||||
                    throw new Exception("用户信息不存在");
 | 
					                    throw new Exception("用户信息不存在");
 | 
				
			||||||
                if(loginUser.PASSWORD!= pwdLower&& loginUser.PASSWORD != pwdUpper)
 | 
					                if (loginUser.PASSWORD != pwdLower && loginUser.PASSWORD != pwdUpper)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    throw new Exception("用户名或密码错误");
 | 
					                    throw new Exception("用户名或密码错误");
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            //app返回租户
 | 
					            //app返回租户
 | 
				
			||||||
            
 | 
					
 | 
				
			||||||
            loginUser.Tenant = filter.SpecifyTenant;
 | 
					            loginUser.Tenant = filter.SpecifyTenant;
 | 
				
			||||||
            return loginUser;
 | 
					            return loginUser;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user