jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 774dffff113eee98cb979d6194948b6b7fd50fe4

Authored by rui.zhang
1 parent 75f68f7e1e
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

platform permission 

login model move login center

Showing 8 changed files with 67 additions and 100 deletions

platform-common/src/main/java/com/lyms/platform/common/base/LoginContext.java View file @ 774dfff
  1 +package com.lyms.platform.common.base;
  2 +
  3 +/**
  4 + * Created by Zhang.Rui on 2016/3/28.
  5 + */
  6 +public class LoginContext {
  7 + private String token;
  8 + private Integer id;
  9 + private Integer errorcode;
  10 + private String errormsg;
  11 +
  12 + public String getToken() {
  13 + return token;
  14 + }
  15 +
  16 + public void setToken(String token) {
  17 + this.token = token;
  18 + }
  19 +
  20 + public Integer getErrorcode() {
  21 + return errorcode;
  22 + }
  23 +
  24 + public void setErrorcode(Integer errorcode) {
  25 + this.errorcode = errorcode;
  26 + }
  27 +
  28 + public String getErrormsg() {
  29 + return errormsg;
  30 + }
  31 +
  32 + public void setErrormsg(String errormsg) {
  33 + this.errormsg = errormsg;
  34 + }
  35 +
  36 +
  37 +
  38 + public Integer getId() {
  39 + return id;
  40 + }
  41 +
  42 + public void setId(Integer id) {
  43 + this.id = id;
  44 + }
  45 +
  46 + public boolean isLogin() {
  47 + return 0 == this.errorcode ? true : false;
  48 + }
  49 +}
platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java View file @ 774dfff
1   -package com.lyms.platform.common.base;
2   -
3   -/**
4   - * Created by Zhang.Rui on 2016/3/28.
5   - */
6   -public class LoginState {
7   - private String token;
8   - private Integer id;
9   - private Integer errorcode;
10   - private String errormsg;
11   -
12   - public String getToken() {
13   - return token;
14   - }
15   -
16   - public void setToken(String token) {
17   - this.token = token;
18   - }
19   -
20   - public Integer getErrorcode() {
21   - return errorcode;
22   - }
23   -
24   - public void setErrorcode(Integer errorcode) {
25   - this.errorcode = errorcode;
26   - }
27   -
28   - public String getErrormsg() {
29   - return errormsg;
30   - }
31   -
32   - public void setErrormsg(String errormsg) {
33   - this.errormsg = errormsg;
34   - }
35   -
36   -
37   -
38   - public Integer getId() {
39   - return id;
40   - }
41   -
42   - public void setId(Integer id) {
43   - this.id = id;
44   - }
45   -
46   - public boolean isLogin() {
47   - return 0 == this.errorcode ? true : false;
48   - }
49   -}
platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java View file @ 774dfff
1 1 package com.lyms.platform.common.utils;
2 2  
3   -import com.lyms.platform.common.base.LoginState;
4   -import jdk.nashorn.internal.runtime.regexp.joni.Regex;
5   -import org.apache.commons.digester.RegexMatcher;
  3 +import com.lyms.platform.common.base.LoginContext;
6 4 import org.apache.commons.httpclient.HttpClient;
7 5 import org.apache.commons.httpclient.NameValuePair;
8 6 import org.apache.commons.httpclient.methods.GetMethod;
9 7 import org.apache.commons.httpclient.methods.PostMethod;
10   -import org.apache.commons.httpclient.params.HttpMethodParams;
11   -import org.springframework.beans.factory.annotation.Value;
12 8  
13 9 import java.security.MessageDigest;
14 10 import java.security.NoSuchAlgorithmException;
15   -import java.util.ArrayList;
16   -import java.util.HashMap;
17   -import java.util.List;
18   -import java.util.Map;
19   -import java.util.regex.Matcher;
20   -import java.util.regex.Pattern;
21 11  
22 12 public class LoginUtil {
23 13  
... ... @@ -36,7 +26,7 @@
36 26 String result = new String(post.getResponseBodyAsString());
37 27 post.releaseConnection();
38 28 if(200 == statusCode) {
39   - LoginState loginState = JsonUtil.str2Obj(result, LoginState.class);
  29 + LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
40 30 return loginState.getId();
41 31 }
42 32 } catch (Exception e) {
... ... @@ -63,7 +53,7 @@
63 53  
64 54 post.releaseConnection();
65 55 if(200 == statusCode) {
66   - LoginState loginState = JsonUtil.str2Obj(result, LoginState.class);
  56 + LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
67 57 if(0 == loginState.getErrorcode()) {
68 58 return loginState.getToken();
69 59 }
... ... @@ -86,7 +76,7 @@
86 76 String result = new String(get.getResponseBodyAsString());
87 77 get.releaseConnection();
88 78 if(200 == statusCode) {
89   - LoginState loginState = JsonUtil.str2Obj(result, LoginState.class);
  79 + LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
90 80 if(0 == loginState.getErrorcode()) {
91 81 return true;
92 82 }
... ... @@ -98,8 +88,8 @@
98 88 }
99 89  
100 90  
101   - public static LoginState checkLoginState(String token) {
102   - LoginState loginState = new LoginState();
  91 + public static LoginContext checkLoginState(String token) {
  92 + LoginContext loginState = new LoginContext();
103 93 HttpClient client = new HttpClient();
104 94 String query = "?token=" + token ;
105 95 GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/check.action" + query);
... ... @@ -110,7 +100,7 @@
110 100 String result = new String(get.getResponseBodyAsString());
111 101 get.releaseConnection();
112 102 if(200 == statusCode) {
113   - loginState = JsonUtil.str2Obj(result, LoginState.class);
  103 + loginState = JsonUtil.str2Obj(result, LoginContext.class);
114 104 return loginState;
115 105 }
116 106 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 774dfff
... ... @@ -3,12 +3,8 @@
3 3  
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6   -import com.lyms.platform.common.base.ContextHolder;
7   -import com.lyms.platform.common.base.LoginState;
8   -import com.lyms.platform.common.base.PlatformContext;
9   -import com.lyms.platform.common.constants.ErrorCodeConstants;
  6 +import com.lyms.platform.common.base.LoginContext;
10 7 import com.lyms.platform.common.enums.YnEnums;
11   -import com.lyms.platform.common.result.BaseListResponse;
12 8 import com.lyms.platform.common.utils.ResultUtils;
13 9 import com.lyms.platform.permission.model.*;
14 10 import com.lyms.platform.permission.service.*;
... ... @@ -124,7 +120,7 @@
124 120  
125 121  
126 122 //获取登录用户
127   - LoginState loginState = (LoginState) request.getAttribute("loginState");
  123 + LoginContext loginState = (LoginContext) request.getAttribute("loginState");
128 124 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
129 125  
130 126 if (null == name || null == orgId || null == users) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 774dfff
... ... @@ -3,13 +3,9 @@
3 3  
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6   -import com.lyms.platform.common.base.ContextHolder;
7   -import com.lyms.platform.common.base.LoginState;
8   -import com.lyms.platform.common.base.PlatformContext;
  6 +import com.lyms.platform.common.base.LoginContext;
9 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
10 8 import com.lyms.platform.common.enums.YnEnums;
11   -import com.lyms.platform.common.result.BaseListResponse;
12   -import com.lyms.platform.common.result.BaseResponse;
13 9 import com.lyms.platform.common.utils.ResultUtils;
14 10 import com.lyms.platform.permission.model.Organization;
15 11 import com.lyms.platform.permission.model.OrganizationQuery;
... ... @@ -133,7 +129,7 @@
133 129 @RequestParam(value = "shortCode") String shortCode) {
134 130  
135 131 //获取登录用户
136   - LoginState loginState = (LoginState) request.getAttribute("loginState");
  132 + LoginContext loginState = (LoginContext) request.getAttribute("loginState");
137 133 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
138 134  
139 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 @ 774dfff
... ... @@ -3,14 +3,9 @@
3 3  
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6   -import com.lyms.platform.common.base.ContextHolder;
7   -import com.lyms.platform.common.base.LoginState;
8   -import com.lyms.platform.common.base.PlatformContext;
9   -import com.lyms.platform.common.constants.ConstantInterface;
  6 +import com.lyms.platform.common.base.LoginContext;
10 7 import com.lyms.platform.common.enums.YnEnums;
11 8 import com.lyms.platform.common.exception.BusinessException;
12   -import com.lyms.platform.common.result.BaseListResponse;
13   -import com.lyms.platform.common.utils.JsonUtil;
14 9 import com.lyms.platform.common.utils.ResultUtils;
15 10 import com.lyms.platform.permission.model.*;
16 11 import com.lyms.platform.permission.service.*;
... ... @@ -111,7 +106,7 @@
111 106 @RequestParam(value = "shortCode")String shortCode) {
112 107  
113 108 //获取登录用户
114   - LoginState loginState = (LoginState) request.getAttribute("loginState");
  109 + LoginContext loginState = (LoginContext) request.getAttribute("loginState");
115 110 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
116 111  
117 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 @ 774dfff
... ... @@ -3,18 +3,13 @@
3 3  
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6   -import com.lyms.platform.common.base.ContextHolder;
7   -import com.lyms.platform.common.base.LoginState;
8   -import com.lyms.platform.common.base.PlatformContext;
9   -import com.lyms.platform.common.cache.redis.RedisUtils;
  6 +import com.lyms.platform.common.base.LoginContext;
10 7 import com.lyms.platform.common.constants.ConstantInterface;
11 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
12   -import com.lyms.platform.common.constants.TimeConstants;
13 9 import com.lyms.platform.common.enums.YnEnums;
14 10 import com.lyms.platform.common.utils.*;
15 11 import com.lyms.platform.permission.model.*;
16 12 import com.lyms.platform.permission.service.*;
17   -import org.apache.commons.collections.CollectionUtils;
18 13 import org.apache.commons.lang.StringUtils;
19 14 import org.springframework.beans.factory.annotation.Autowired;
20 15 import org.springframework.beans.factory.annotation.Value;
... ... @@ -24,7 +19,6 @@
24 19  
25 20 import javax.servlet.http.HttpServletRequest;
26 21 import javax.servlet.http.HttpServletResponse;
27   -import java.text.MessageFormat;
28 22 import java.util.*;
29 23  
30 24 /**
... ... @@ -259,7 +253,7 @@
259 253  
260 254  
261 255 //获取登录用户
262   - LoginState loginState = (LoginState) request.getAttribute("loginState");
  256 + LoginContext loginState = (LoginContext) request.getAttribute("loginState");
263 257 Users user = usersService.getUsersByLoginCenterId(loginState.getId());
264 258  
265 259  
... ... @@ -516,7 +510,7 @@
516 510 return;
517 511 }
518 512 //获取登录用户
519   - LoginState loginState = (LoginState) request.getAttribute("loginState");
  513 + LoginContext loginState = (LoginContext) request.getAttribute("loginState");
520 514 Users users = usersService.getUsersByLoginCenterId(loginState.getId());
521 515  
522 516 if (null != users) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java View file @ 774dfff
... ... @@ -4,15 +4,12 @@
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6 6 import com.lyms.platform.common.base.ContextHolder;
7   -import com.lyms.platform.common.base.LoginState;
8   -import com.lyms.platform.common.base.PlatformContext;
  7 +import com.lyms.platform.common.base.LoginContext;
9 8 import com.lyms.platform.common.exception.ParameterException;
10 9 import com.lyms.platform.common.exception.TokenException;
11 10 import com.lyms.platform.common.utils.LogUtil;
12 11 import com.lyms.platform.common.utils.LoginUtil;
13   -import com.lyms.platform.common.utils.TokenUtils;
14 12 import com.lyms.platform.permission.model.Users;
15   -import com.lyms.platform.permission.model.UsersQuery;
16 13 import com.lyms.platform.permission.service.TokenService;
17 14 import com.lyms.platform.permission.service.UsersService;
18 15 import org.apache.commons.lang.StringUtils;
... ... @@ -23,7 +20,6 @@
23 20 import javax.servlet.http.HttpServletRequest;
24 21 import javax.servlet.http.HttpServletResponse;
25 22 import java.lang.annotation.Annotation;
26   -import java.util.List;
27 23  
28 24 /**
29 25 * 验证token拦截器
... ... @@ -72,7 +68,7 @@
72 68 if (StringUtils.isEmpty(token)) {
73 69 throw new ParameterException();
74 70 }
75   - LoginState loginState = LoginUtil.checkLoginState(token);
  71 + LoginContext loginState = LoginUtil.checkLoginState(token);
76 72 if(!loginState.isLogin()) {
77 73 throw new TokenException();
78 74 }