|  |  | @ -161,12 +161,16 @@ public class LoginController extends BaseController { | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (authAdmin == null) { |  |  |  |         if (authAdmin == null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); |  |  |  |             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         if (PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())) | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 || loginRequest.getPassword().equals(authAdmin.getPassWord()) | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 || (loginRequest.getPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))) | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         ) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         } else { | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) { |  |  |  |             if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); |  |  |  |                 throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  | //        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
 |  |  |  |         } | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | //            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //        }
 |  |  |  |  | 
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         if (authAdmin.getUserFlag() == 0) { |  |  |  |         if (authAdmin.getUserFlag() == 0) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用!"); |  |  |  |             throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用!"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
	
		
		
			
				
					|  |  | 
 |