支付
This commit is contained in:
@@ -214,8 +214,8 @@ public class MyUserController {
|
|||||||
if (user.getPassword() == null) {
|
if (user.getPassword() == null) {
|
||||||
return R.error(500,"当前未设置密码,请使用验证码登录!");
|
return R.error(500,"当前未设置密码,请使用验证码登录!");
|
||||||
}
|
}
|
||||||
// if (MD5Utils.getSaltverifyMD5(password,user.getPassword())){
|
if (MD5Utils.getSaltverifyMD5(password,user.getPassword())){
|
||||||
if(true){
|
// if(true){
|
||||||
R r = sysUserTokenService.createToken(user.getId());
|
R r = sysUserTokenService.createToken(user.getId());
|
||||||
return R.ok("登陆成功!").put("userInfo",user).put("token",r);
|
return R.ok("登陆成功!").put("userInfo",user).put("token",r);
|
||||||
}else {
|
}else {
|
||||||
|
|||||||
@@ -73,9 +73,9 @@ public class SysLoginController extends AbstractController {
|
|||||||
SysUserEntity user = sysUserService.queryByUserName(form.getUsername());
|
SysUserEntity user = sysUserService.queryByUserName(form.getUsername());
|
||||||
|
|
||||||
//账号不存在、密码错误
|
//账号不存在、密码错误
|
||||||
// if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
|
if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
|
||||||
// return R.error("账号或密码不正确");
|
return R.error("账号或密码不正确");
|
||||||
// }
|
}
|
||||||
|
|
||||||
//账号锁定
|
//账号锁定
|
||||||
if(user.getStatus() == 0){
|
if(user.getStatus() == 0){
|
||||||
|
|||||||
Reference in New Issue
Block a user