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

统一资源

上级 39be8e25
...@@ -58,7 +58,7 @@ public class ClientAuthenticationResource ...@@ -58,7 +58,7 @@ public class ClientAuthenticationResource
public ResponseEntity<AuthenticationUser> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){ public ResponseEntity<AuthenticationUser> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
userDetailsService.resetByUsername(authorizationLogin.getUsername()); userDetailsService.resetByUsername(authorizationLogin.getUsername());
AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword()); AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
if(user.getPermisionList()==null) if(user.getPermissionList()==null)
{ {
setUserPermission(user); setUserPermission(user);
setUserOrgInfo(user); setUserOrgInfo(user);
...@@ -72,7 +72,7 @@ public class ClientAuthenticationResource ...@@ -72,7 +72,7 @@ public class ClientAuthenticationResource
public ResponseEntity<AuthenticationUser> loginByUsername(@Validated @RequestBody String username){ public ResponseEntity<AuthenticationUser> loginByUsername(@Validated @RequestBody String username){
//userDetailsService.resetByUsername(authorizationLogin.getUsername()); //userDetailsService.resetByUsername(authorizationLogin.getUsername());
AuthenticationUser user = userDetailsService.loadUserByUsername(username); AuthenticationUser user = userDetailsService.loadUserByUsername(username);
if(user.getPermisionList()==null) if(user.getPermissionList()==null)
{ {
setUserPermission(user); setUserPermission(user);
setUserOrgInfo(user); setUserOrgInfo(user);
...@@ -137,7 +137,7 @@ public class ClientAuthenticationResource ...@@ -137,7 +137,7 @@ public class ClientAuthenticationResource
JSONArray uniRes=getUniRes(uniResList); JSONArray uniRes=getUniRes(uniResList);
permissionObj.put("entities",entities); permissionObj.put("entities",entities);
permissionObj.put("unires",uniRes); permissionObj.put("unires",uniRes);
user.setPermisionList(permissionObj); user.setPermissionList(permissionObj);
} }
/** /**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册