|
|
@@ -2,7 +2,11 @@ package com.uas.platform.b2b.filter;
|
|
|
|
|
|
import com.uas.platform.b2b.dao.ResourceItemDao;
|
|
|
import com.uas.platform.b2b.manage.service.AccessTokenService;
|
|
|
-import com.uas.platform.b2b.model.*;
|
|
|
+import com.uas.platform.b2b.model.Enterprise;
|
|
|
+import com.uas.platform.b2b.model.ResourceItem;
|
|
|
+import com.uas.platform.b2b.model.Role;
|
|
|
+import com.uas.platform.b2b.model.SigninLog;
|
|
|
+import com.uas.platform.b2b.model.User;
|
|
|
import com.uas.platform.b2b.service.EnterpriseService;
|
|
|
import com.uas.platform.b2b.service.RoleService;
|
|
|
import com.uas.platform.b2b.service.SigninLogService;
|
|
|
@@ -40,9 +44,15 @@ import org.springframework.util.StringUtils;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.PrintWriter;
|
|
|
-import java.util.*;
|
|
|
+import java.io.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Collection;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.HashSet;
|
|
|
+import java.util.Iterator;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
|
|
|
/**
|
|
|
* 访问拦截
|
|
|
@@ -191,8 +201,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
*/
|
|
|
private String getLoginPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
|
|
|
// 引用页面
|
|
|
- String refererSymbol = "Referer";
|
|
|
- request.getSession().setAttribute(SSOConfig.SSOReferer, request.getHeader(refererSymbol));
|
|
|
+ String referSymbol = "Referer";
|
|
|
+ request.getSession().setAttribute(SSOConfig.SSOReferer, request.getHeader(referSymbol));
|
|
|
SSOHelper.clearLogin(request, response);
|
|
|
String redirectUrl = (SSOHelper.getRedirectLoginUrl(request, conf.getB2b()));
|
|
|
return redirectUrl;
|
|
|
@@ -392,6 +402,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
String token = request.getParameter(tokenParam);
|
|
|
// 发现有采用access_token方式
|
|
|
if (token != null) {
|
|
|
+ // 清除上一次访问的数据
|
|
|
+ SystemSession.clear();
|
|
|
Object sUser = request.getSession().getAttribute("user");
|
|
|
User user = null;
|
|
|
if (sUser != null) {
|