|
|
|
@ -81,8 +81,12 @@ public class LoginController extends BaseController {
|
|
|
|
|
if (authAdmin == null) {
|
|
|
|
|
throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log.info(loginRequest.getPassword());
|
|
|
|
|
log.info(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
|
|
|
|
|
if (PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
|
|
|
|
|
|| loginRequest.getPassword().equals(authAdmin.getPassWord()) || (loginRequest.getPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())))
|
|
|
|
|
|| loginRequest.getPassword().equals(authAdmin.getPassWord())
|
|
|
|
|
|| (loginRequest.getPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())))
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|