提交 eb33c3e3 编写于 作者: zhouweidong's avatar zhouweidong

还原

上级 7421491f
......@@ -63,11 +63,11 @@ public class ClientAuthenticationResource
public ResponseEntity<AuthenticationInfo> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
userDetailsService.resetByUsername(authorizationLogin.getUsername());
AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
// if(user.getPermissionList()==null)
// {
// setUserPermission(user);
// setUserOrgInfo(user);
// }
if(user.getPermissionList()==null)
{
setUserPermission(user);
setUserOrgInfo(user);
}
final String token = jwtTokenUtil.generateToken(user);
// 返回 token
return ResponseEntity.ok().body(new AuthenticationInfo(token,user));
......@@ -77,11 +77,11 @@ public class ClientAuthenticationResource
public ResponseEntity<AuthenticationUser> uaalogin(@Validated @RequestBody AuthorizationLogin authorizationLogin){
userDetailsService.resetByUsername(authorizationLogin.getUsername());
AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
// if(user.getPermissionList()==null)
// {
// setUserPermission(user);
// setUserOrgInfo(user);
// }
if(user.getPermissionList()==null)
{
setUserPermission(user);
setUserOrgInfo(user);
}
return ResponseEntity.ok().body(user);
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册