'commit'

src/main/java/com/dsideal/sso/Controller/WebLoginController.java

@@ -41,14 +41,6 @@ public class WebLoginController extends Controller {
      * 接入统一认证的系统，跳转到统一认证的地址
      */
     public void login(String redirect_url) {
-        Map<String, String> loginMap = SsoLoginHelper.loginCheck(getRequest());
-        if (loginMap != null) {
-            if (!redirect_url.contains("?")) {
-                redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString());
-            } else {
-                redirect301(redirect_url + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString());
-            }
-        } else {
         //检查重定向地址是不是有效
         if (lm.getSystemByRedirectUrl(redirect_url) == null) {
             JSONObject resultJson = new JSONObject();
@@ -57,6 +49,16 @@ public class WebLoginController extends Controller {
             renderJson(resultJson);
             return;
         }
+
+        Map<String, String> loginMap = SsoLoginHelper.loginCheck(getRequest());
+        if (loginMap != null) {
+            if (!redirect_url.contains("?")) {
+                redirect301(redirect_url + "?" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString());
+            } else {
+                redirect301(redirect_url + "&" + PropKit.get("sso.sessionid") + "=" + loginMap.get("session_id").toString());
+            }
+        } else {
+
             redirect_url = CommonUtil.handleRedirectUrlParas(redirect_url);
             redirect("/html/login.html?redirect_url=" + redirect_url);
         }