|
@@ -72,7 +72,7 @@ public class SecurityController {
|
|
|
if (cross) {
|
|
if (cross) {
|
|
|
request.getSession().setAttribute(SSOConfig.SSOReferer, returnUrl);
|
|
request.getSession().setAttribute(SSOConfig.SSOReferer, returnUrl);
|
|
|
// 跨域情况,需要再次询问账户中心
|
|
// 跨域情况,需要再次询问账户中心
|
|
|
- returnUrl = "/SSRProxy/logoutProxy";
|
|
|
|
|
|
|
+ returnUrl = request.getContextPath() + "/logout/proxy";
|
|
|
}
|
|
}
|
|
|
return new ModelMap("content", returnUrl);
|
|
return new ModelMap("content", returnUrl);
|
|
|
}
|
|
}
|
|
@@ -99,7 +99,7 @@ public class SecurityController {
|
|
|
boolean cross = SSOHelper.isCrossDomain(request);
|
|
boolean cross = SSOHelper.isCrossDomain(request);
|
|
|
if (cross) {
|
|
if (cross) {
|
|
|
// 跨域代理界面
|
|
// 跨域代理界面
|
|
|
- redirectUrl = "/SSRProxy/loginProxy";
|
|
|
|
|
|
|
+ redirectUrl = request.getContextPath() + "/login/proxy";
|
|
|
}
|
|
}
|
|
|
return new ModelMap("content", redirectUrl);
|
|
return new ModelMap("content", redirectUrl);
|
|
|
}
|
|
}
|
|
@@ -183,6 +183,7 @@ public class SecurityController {
|
|
|
SystemSession.setUser(user);
|
|
SystemSession.setUser(user);
|
|
|
log(request, user);
|
|
log(request, user);
|
|
|
}
|
|
}
|
|
|
|
|
+ returnUrl = returnUrl.toString().contains("10.10.0.10") ? "/" : returnUrl;
|
|
|
return new ModelMap("returnUrl", "/");
|
|
return new ModelMap("returnUrl", "/");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|