diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 63cbd84..ca6baf7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -115,7 +115,7 @@ public class UsersController extends BaseController { return; } - String key =LoginUtil.login(account,code, typeId, token); + String key =LoginUtil.login(account, code, typeId, token); if(null != key) { Map result = new HashMap<>(); result.put("token", key); @@ -158,16 +158,51 @@ public class UsersController extends BaseController { /** - * 获取 AMS 用户登录信息(用户、最后登录时间) + * 获取 登录用户信息(用户、最后登录时间) */ - @RequestMapping(value = "/status/sign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8") + @RequestMapping(value = "/users/currentUser", method = RequestMethod.GET) @TokenRequired - public void usersLoginMsg(HttpServletResponse response) { + public void usersLoginMsg(HttpServletResponse response, HttpServletRequest request) { + LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); + Users users = null; + if(null != loginContext) { + users = usersService.getUsers(loginContext.getId()); + } + UserRoleMapsQuery query = new UserRoleMapsQuery(); + query.setUserId(users.getId()); + query.setYn(YnEnums.YES.getId()); + List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); + List roles = new ArrayList<>(); + for(UserRoleMaps roleMaps : userRoleMapses) { + roles.add(rolesService.getRoles(roleMaps.getRoleId())); + } + Map map = new HashMap<>(); + map.put("user", users); + map.put("roles", roles); + ResultUtils.buildSuccessResultAndWrite(response, map); } + /** + * 获取 用户角色信息 + */ + @RequestMapping(value = "/users/userRole/{id}", method = RequestMethod.GET) + @TokenRequired + public void userRole(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id) { + UserRoleMapsQuery query = new UserRoleMapsQuery(); + query.setUserId(id); + query.setYn(YnEnums.YES.getId()); + List userRoleMapses = userRoleMapsService.queryUserRoleMaps(query); + List roles = new ArrayList<>(); + for(UserRoleMaps roleMaps : userRoleMapses) { + roles.add(rolesService.getRoles(roleMaps.getRoleId())); + } + + ResultUtils.buildSuccessResultAndWrite(response, roles); + } + /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java index ae14ab7..f30c38b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java @@ -20,6 +20,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.annotation.Annotation; +import java.util.Date; /** * 验证token拦截器 @@ -76,7 +77,13 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { if(null == users) { throw new TokenException(); } + loginContext.setId(users.getId()); + loginContext.setToken(token); httpServletRequest.setAttribute("loginContext", loginContext); + Users users1 = new Users(); + users1.setId(users.getId()); + users1.setLastLoginTime(new Date()); + usersService.updateUsers(users1); LogUtil.tokenInfo(" userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod()); return loginContext.isLogin();