第三方登录
This commit is contained in:
parent
e9ac9d5f99
commit
c9fba53a60
|
@ -217,12 +217,13 @@ public class LoginController extends BaseController {
|
|||
newUser.setUserName(user.getUserName());
|
||||
newUser.setPassword(new BCryptPasswordEncoder().encode(user.getPassword()));
|
||||
newUser.setNickName(user.getNickName());
|
||||
newUser.setOriginalPassword("");
|
||||
newUser.setSuperFlag(1);
|
||||
userService.save(newUser);
|
||||
}
|
||||
LoginForm loginForm = new LoginForm();
|
||||
loginForm.setUsername(user.getUserName());
|
||||
loginForm.setPassword(user.getPassword());
|
||||
loginForm.setPassword(user.getOriginalPassword());
|
||||
return loginForm;
|
||||
}
|
||||
}
|
||||
|
@ -239,7 +240,8 @@ public class LoginController extends BaseController {
|
|||
user.setUserName(userObject.getString("userName"));
|
||||
user.setNickName(userObject.getString("nickName"));
|
||||
|
||||
user.setPassword(userObject.getString("password"));
|
||||
// user.setPassword(userObject.getString("password"));
|
||||
user.setPassword("");
|
||||
|
||||
return user;
|
||||
}
|
||||
|
|
|
@ -46,4 +46,6 @@ public class User implements Serializable {
|
|||
private int superFlag;
|
||||
private String userId;
|
||||
|
||||
private String originalPassword;
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user