mirror of
				https://github.com/dromara/RuoYi-Vue-Plus.git
				synced 2025-11-04 16:23:42 +08:00 
			
		
		
		
	update 修复合并异常
This commit is contained in:
		@@ -77,11 +77,6 @@ public class SysLoginService
 | 
				
			|||||||
            asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
 | 
					            asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
 | 
				
			||||||
            throw new UserPasswordNotMatchException();
 | 
					            throw new UserPasswordNotMatchException();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        else
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage(), request);
 | 
					 | 
				
			||||||
            throw new ServiceException(e.getMessage());
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
		asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
 | 
							asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
 | 
				
			||||||
        recordLoginInfo(user.getUserId());
 | 
					        recordLoginInfo(user.getUserId());
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user