|
@@ -50,7 +50,7 @@ public class UserAuthRestController {
|
|
accountType = LoginType.COMMON_LOGIN_NAME.name();
|
|
accountType = LoginType.COMMON_LOGIN_NAME.name();
|
|
}
|
|
}
|
|
Result<UserInfo> result = userAuthService.login(account, password, accountType, rootOrgId, domain);
|
|
Result<UserInfo> result = userAuthService.login(account, password, accountType, rootOrgId, domain);
|
|
- /*if (result.isSuccess()) {
|
|
|
|
|
|
+ /*if (result.isSuccess()) {
|
|
//获取当前登录用户信息
|
|
//获取当前登录用户信息
|
|
UserInfo userInfo = result.getData();
|
|
UserInfo userInfo = result.getData();
|
|
//封装原始登录信息
|
|
//封装原始登录信息
|
|
@@ -74,7 +74,7 @@ public class UserAuthRestController {
|
|
@ApiOperation(value = "获取用户信息接口")
|
|
@ApiOperation(value = "获取用户信息接口")
|
|
@RequestMapping(value = "/user/info", method = {RequestMethod.GET, RequestMethod.POST})
|
|
@RequestMapping(value = "/user/info", method = {RequestMethod.GET, RequestMethod.POST})
|
|
public Result getUserInfo(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
|
|
public Result getUserInfo(@RequestHeader String key, @RequestHeader String token, HttpServletRequest request) throws Exception {
|
|
- //String loginToken = (String) request.getAttribute("loginToken");
|
|
|
|
|
|
+ //token = (String) request.getAttribute("loginToken");
|
|
return userAuthService.getUserInfo(key, token);
|
|
return userAuthService.getUserInfo(key, token);
|
|
}
|
|
}
|
|
|
|
|