|
@@ -136,8 +136,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
|
|
|
@Override
|
|
@Override
|
|
|
protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
|
|
protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
|
|
|
User user = (User) request.getSession().getAttribute("user");
|
|
User user = (User) request.getSession().getAttribute("user");
|
|
|
- if (user == null) {
|
|
|
|
|
- SSOToken token = SSOHelper.attrToken(request);
|
|
|
|
|
|
|
+ SSOToken token = SSOHelper.attrToken(request);
|
|
|
|
|
+ // cookie变化的情况下,session可能还未变化
|
|
|
|
|
+ if (user == null || (user.getUserTel() != null && !token.getUid().equals(user.getUserTel()))) {
|
|
|
user = getUserByToken(token);
|
|
user = getUserByToken(token);
|
|
|
if (user != null) {
|
|
if (user != null) {
|
|
|
user.setIp(AgentUtils.getIp(request));
|
|
user.setIp(AgentUtils.getIp(request));
|