Browse Source

perfect: 为了调试加入日志

suntg 6 years ago
parent
commit
c61fd40269

+ 1 - 1
src/main/java/com/uas/platform/b2b/filter/B2bAbstractSSOInterceptor.java

@@ -29,7 +29,7 @@ public abstract class B2bAbstractSSOInterceptor extends HandlerInterceptorAdapte
     }
     }
 
 
     private final boolean authenticate(HttpServletRequest request, HttpServletResponse response) throws IOException {
     private final boolean authenticate(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        SSOToken token = (SSOToken)SSOHelper.getToken(request);
+        SSOToken token = SSOHelper.getToken(request);
         if (token == null) {
         if (token == null) {
             return this.onAuthenticateFailed(request, response);
             return this.onAuthenticateFailed(request, response);
         } else {
         } else {

+ 15 - 6
src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -285,7 +285,7 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
 
 
 		// 个人用户,跳转至个人用户提示页面
 		// 个人用户,跳转至个人用户提示页面
 		if (user.getEnterprise() == null) {
 		if (user.getEnterprise() == null) {
-			return sendRedirectPersonal(response);
+			return sendRedirectPersonal(request, response);
 		}
 		}
 
 
 		// 记录日志
 		// 记录日志
@@ -350,11 +350,20 @@ public class SSOInterceptor extends B2bAbstractSSOInterceptor {
 	 * 跳转至个人用户提示页面
 	 * 跳转至个人用户提示页面
 	 * @param response
 	 * @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;
 		return false;
 	}
 	}