diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index 2a57c32..becac43 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -120,7 +120,7 @@ public class DepartmentsController extends BaseController { //获取登录用户 - LoginContext loginState = (LoginContext) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsersByLoginCenterId(loginState.getId()); if (null == name || null == orgId || null == users) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 3477c33..f27f5b1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -129,7 +129,7 @@ public class OrganizationController extends BaseController { @RequestParam(value = "shortCode") String shortCode) { //获取登录用户 - LoginContext loginState = (LoginContext) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsersByLoginCenterId(loginState.getId()); if (type == null || StringUtils.isBlank(name) || null == users) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index d369818..f843d4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -106,7 +106,7 @@ public class RolesController extends BaseController { @RequestParam(value = "shortCode")String shortCode) { //获取登录用户 - LoginContext loginState = (LoginContext) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsersByLoginCenterId(loginState.getId()); if (type == null || StringUtils.isBlank(name) || null == users) { 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 b4e323c..7d1b61a 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 @@ -253,7 +253,7 @@ public class UsersController extends BaseController { //获取登录用户 - LoginContext loginState = (LoginContext) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users user = usersService.getUsersByLoginCenterId(loginState.getId()); @@ -510,8 +510,8 @@ public class UsersController extends BaseController { return; } //获取登录用户 - LoginContext loginState = (LoginContext) request.getAttribute("loginState"); - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); + Users users = usersService.getUsersByLoginCenterId(loginContext.getId()); if (null != users) { //修改前的密码 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 339a6ce..ae14ab7 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 @@ -68,18 +68,18 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { if (StringUtils.isEmpty(token)) { throw new ParameterException(); } - LoginContext loginState = LoginUtil.checkLoginState(token); - if(!loginState.isLogin()) { + LoginContext loginContext = LoginUtil.checkLoginState(token); + if(!loginContext.isLogin()) { throw new TokenException(); } - Users users = usersService.getUsersByLoginCenterId(loginState.getId()); + Users users = usersService.getUsersByLoginCenterId(loginContext.getId()); if(null == users) { throw new TokenException(); } - httpServletRequest.setAttribute("loginState", loginState); - LogUtil.tokenInfo( " userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod()); + httpServletRequest.setAttribute("loginContext", loginContext); + LogUtil.tokenInfo(" userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod()); - return loginState.isLogin(); + return loginContext.isLogin(); } /** * This implementation is empty.