|
|
@@ -285,7 +285,7 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
|
|
|
|
|
|
// 个人用户,跳转至个人用户提示页面
|
|
|
if (user.getEnterprise() == null) {
|
|
|
- return sendRedirectPersonal(response);
|
|
|
+ return sendRedirectPersonal(request, response);
|
|
|
}
|
|
|
|
|
|
// 记录日志
|
|
|
@@ -350,11 +350,20 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
|
|
|
* 跳转至个人用户提示页面
|
|
|
* @param response
|
|
|
*/
|
|
|
- private boolean sendRedirectPersonal(HttpServletResponse response) {
|
|
|
- try {
|
|
|
- response.sendRedirect("/error_personal");
|
|
|
- } catch (IOException e) {
|
|
|
- e.printStackTrace();
|
|
|
+ private boolean sendRedirectPersonal(HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ if (!isRedirectAble(request)) {
|
|
|
+ setResponseAuthorized(response, false);
|
|
|
+ try {
|
|
|
+ printJson(response, new ModelMap("loginUrl", "/error_personal"));
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ try {
|
|
|
+ response.sendRedirect("/error_personal");
|
|
|
+ } catch (IOException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
return false;
|
|
|
}
|