shiyang / regional-platform

Download as
Browse Code »

Commit d1b55a17df12e8f658736ad7b0986c14032987fd

Authored by rui.zhang
1 parent 774dffff11
Exists in master and in 1 other branch nobuildprocess

platform permission 

login model move login center

Showing 5 changed files with 12 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ d1b55a1
... ... @@ -120,7 +120,7 @@
120 120  
121 121  
122 122 //获取登录用户
123   - LoginContext loginState = (LoginContext) request.getAttribute("loginState");
  123 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
124 124 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
125 125  
126 126 if (null == name || null == orgId || null == users) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ d1b55a1
... ... @@ -129,7 +129,7 @@
129 129 @RequestParam(value = "shortCode") String shortCode) {
130 130  
131 131 //获取登录用户
132   - LoginContext loginState = (LoginContext) request.getAttribute("loginState");
  132 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
133 133 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
134 134  
135 135 if (type == null || StringUtils.isBlank(name) || null == users) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ d1b55a1
... ... @@ -106,7 +106,7 @@
106 106 @RequestParam(value = "shortCode")String shortCode) {
107 107  
108 108 //获取登录用户
109   - LoginContext loginState = (LoginContext) request.getAttribute("loginState");
  109 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
110 110 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
111 111  
112 112 if (type == null || StringUtils.isBlank(name) || null == users) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ d1b55a1
... ... @@ -253,7 +253,7 @@
253 253  
254 254  
255 255 //获取登录用户
256   - LoginContext loginState = (LoginContext) request.getAttribute("loginState");
  256 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
257 257 Users user = usersService.getUsersByLoginCenterId(loginState.getId());
258 258  
259 259  
... ... @@ -510,8 +510,8 @@
510 510 return;
511 511 }
512 512 //获取登录用户
513   - LoginContext loginState = (LoginContext) request.getAttribute("loginState");
514   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  513 + LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
  514 + Users users = usersService.getUsersByLoginCenterId(loginContext.getId());
515 515  
516 516 if (null != users) {
517 517 //修改前的密码
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java View file @ d1b55a1
... ... @@ -68,18 +68,18 @@
68 68 if (StringUtils.isEmpty(token)) {
69 69 throw new ParameterException();
70 70 }
71   - LoginContext loginState = LoginUtil.checkLoginState(token);
72   - if(!loginState.isLogin()) {
  71 + LoginContext loginContext = LoginUtil.checkLoginState(token);
  72 + if(!loginContext.isLogin()) {
73 73 throw new TokenException();
74 74 }
75   - Users users = usersService.getUsersByLoginCenterId(loginState.getId());
  75 + Users users = usersService.getUsersByLoginCenterId(loginContext.getId());
76 76 if(null == users) {
77 77 throw new TokenException();
78 78 }
79   - httpServletRequest.setAttribute("loginState", loginState);
80   - LogUtil.tokenInfo( " userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod());
  79 + httpServletRequest.setAttribute("loginContext", loginContext);
  80 + LogUtil.tokenInfo(" userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod());
81 81  
82   - return loginState.isLogin();
  82 + return loginContext.isLogin();
83 83 }
84 84 /**
85 85 * This implementation is empty.