|
|
@@ -162,10 +162,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
@Override
|
|
|
protected boolean onAuthenticateFailed(HttpServletRequest request, HttpServletResponse response) {
|
|
|
SystemSession.clear();
|
|
|
- String manageToken = request.getParameter(TOKEN_PARAM);
|
|
|
+ String typeParam = request.getParameter(TYPE_PARAM);
|
|
|
User user;
|
|
|
- if (null != manageToken) {
|
|
|
- user = getUserByAccessToken(request, manageToken);
|
|
|
+ if (null != typeParam && MANAGER.equals(typeParam)) {
|
|
|
+ user = getUserByAccessToken(request);
|
|
|
if (user != null) {
|
|
|
user.setIp(AgentUtils.getIp(request));
|
|
|
request.getSession().setAttribute("user", user);
|
|
|
@@ -302,10 +302,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
@Override
|
|
|
protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
|
|
|
// 设置管理平台访问优先级最高
|
|
|
- String manageToken = request.getParameter(TOKEN_PARAM);
|
|
|
+ String typeParam = request.getParameter(TYPE_PARAM);
|
|
|
User user;
|
|
|
- if (null != manageToken) {
|
|
|
- user = getUserByAccessToken(request, manageToken);
|
|
|
+ if (null != typeParam && MANAGER.equals(typeParam)) {
|
|
|
+ user = getUserByAccessToken(request);
|
|
|
if (user != null) {
|
|
|
user.setIp(AgentUtils.getIp(request));
|
|
|
request.getSession().setAttribute("user", user);
|
|
|
@@ -483,9 +483,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
*
|
|
|
* @param request
|
|
|
*/
|
|
|
- private User getUserByAccessToken(HttpServletRequest request, String token) {
|
|
|
+ private User getUserByAccessToken(HttpServletRequest request) {
|
|
|
// 发现有采用access_token方式
|
|
|
// 清除上一次访问的数据
|
|
|
+ String token = request.getParameter(TOKEN_PARAM);
|
|
|
SystemSession.clear();
|
|
|
Object sUser = request.getSession().getAttribute("user");
|
|
|
User user = null;
|