diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/LoginContext.java b/platform-common/src/main/java/com/lyms/platform/common/base/LoginContext.java new file mode 100644 index 0000000..eeb136d --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/base/LoginContext.java @@ -0,0 +1,49 @@ +package com.lyms.platform.common.base; + +/** + * Created by Zhang.Rui on 2016/3/28. + */ +public class LoginContext { + private String token; + private Integer id; + private Integer errorcode; + private String errormsg; + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public Integer getErrorcode() { + return errorcode; + } + + public void setErrorcode(Integer errorcode) { + this.errorcode = errorcode; + } + + public String getErrormsg() { + return errormsg; + } + + public void setErrormsg(String errormsg) { + this.errormsg = errormsg; + } + + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public boolean isLogin() { + return 0 == this.errorcode ? true : false; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java b/platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java deleted file mode 100644 index cf90a2c..0000000 --- a/platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lyms.platform.common.base; - -/** - * Created by Zhang.Rui on 2016/3/28. - */ -public class LoginState { - private String token; - private Integer id; - private Integer errorcode; - private String errormsg; - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public Integer getErrorcode() { - return errorcode; - } - - public void setErrorcode(Integer errorcode) { - this.errorcode = errorcode; - } - - public String getErrormsg() { - return errormsg; - } - - public void setErrormsg(String errormsg) { - this.errormsg = errormsg; - } - - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public boolean isLogin() { - return 0 == this.errorcode ? true : false; - } -} diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java index a9ff494..0d4acc0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java @@ -1,23 +1,13 @@ package com.lyms.platform.common.utils; -import com.lyms.platform.common.base.LoginState; -import jdk.nashorn.internal.runtime.regexp.joni.Regex; -import org.apache.commons.digester.RegexMatcher; +import com.lyms.platform.common.base.LoginContext; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.httpclient.params.HttpMethodParams; -import org.springframework.beans.factory.annotation.Value; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class LoginUtil { @@ -36,7 +26,7 @@ public class LoginUtil { String result = new String(post.getResponseBodyAsString()); post.releaseConnection(); if(200 == statusCode) { - LoginState loginState = JsonUtil.str2Obj(result, LoginState.class); + LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class); return loginState.getId(); } } catch (Exception e) { @@ -63,7 +53,7 @@ public class LoginUtil { post.releaseConnection(); if(200 == statusCode) { - LoginState loginState = JsonUtil.str2Obj(result, LoginState.class); + LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class); if(0 == loginState.getErrorcode()) { return loginState.getToken(); } @@ -86,7 +76,7 @@ public class LoginUtil { String result = new String(get.getResponseBodyAsString()); get.releaseConnection(); if(200 == statusCode) { - LoginState loginState = JsonUtil.str2Obj(result, LoginState.class); + LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class); if(0 == loginState.getErrorcode()) { return true; } @@ -98,8 +88,8 @@ public class LoginUtil { } - public static LoginState checkLoginState(String token) { - LoginState loginState = new LoginState(); + public static LoginContext checkLoginState(String token) { + LoginContext loginState = new LoginContext(); HttpClient client = new HttpClient(); String query = "?token=" + token ; GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/check.action" + query); @@ -110,7 +100,7 @@ public class LoginUtil { String result = new String(get.getResponseBodyAsString()); get.releaseConnection(); if(200 == statusCode) { - loginState = JsonUtil.str2Obj(result, LoginState.class); + loginState = JsonUtil.str2Obj(result, LoginContext.class); return loginState; } } catch (Exception e) { 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 9440604..2a57c32 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 @@ -3,12 +3,8 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.LoginState; -import com.lyms.platform.common.base.PlatformContext; -import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; @@ -124,7 +120,7 @@ public class DepartmentsController extends BaseController { //获取登录用户 - LoginState loginState = (LoginState) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginState"); 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 57cfd4a..3477c33 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 @@ -3,13 +3,9 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.LoginState; -import com.lyms.platform.common.base.PlatformContext; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -133,7 +129,7 @@ public class OrganizationController extends BaseController { @RequestParam(value = "shortCode") String shortCode) { //获取登录用户 - LoginState loginState = (LoginState) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginState"); 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 85b70a4..d369818 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 @@ -3,14 +3,9 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.LoginState; -import com.lyms.platform.common.base.PlatformContext; -import com.lyms.platform.common.constants.ConstantInterface; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.exception.BusinessException; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; @@ -111,7 +106,7 @@ public class RolesController extends BaseController { @RequestParam(value = "shortCode")String shortCode) { //获取登录用户 - LoginState loginState = (LoginState) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginState"); 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 be6aa2c..b4e323c 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 @@ -3,18 +3,13 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.LoginState; -import com.lyms.platform.common.base.PlatformContext; -import com.lyms.platform.common.cache.redis.RedisUtils; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.constants.TimeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.*; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -24,7 +19,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.MessageFormat; import java.util.*; /** @@ -259,7 +253,7 @@ public class UsersController extends BaseController { //获取登录用户 - LoginState loginState = (LoginState) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginState"); Users user = usersService.getUsersByLoginCenterId(loginState.getId()); @@ -516,7 +510,7 @@ public class UsersController extends BaseController { return; } //获取登录用户 - LoginState loginState = (LoginState) request.getAttribute("loginState"); + LoginContext loginState = (LoginContext) request.getAttribute("loginState"); Users users = usersService.getUsersByLoginCenterId(loginState.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 18ffea1..339a6ce 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 @@ -4,15 +4,12 @@ package com.lyms.platform.operate.web.inteceptor; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.LoginState; -import com.lyms.platform.common.base.PlatformContext; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.exception.ParameterException; import com.lyms.platform.common.exception.TokenException; import com.lyms.platform.common.utils.LogUtil; import com.lyms.platform.common.utils.LoginUtil; -import com.lyms.platform.common.utils.TokenUtils; import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.TokenService; import com.lyms.platform.permission.service.UsersService; import org.apache.commons.lang.StringUtils; @@ -23,7 +20,6 @@ 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.List; /** * 验证token拦截器 @@ -72,7 +68,7 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { if (StringUtils.isEmpty(token)) { throw new ParameterException(); } - LoginState loginState = LoginUtil.checkLoginState(token); + LoginContext loginState = LoginUtil.checkLoginState(token); if(!loginState.isLogin()) { throw new TokenException(); }