Merge branch 'dev_v2.0.1' into release_v2.0.1

merge

cas/src/main/java/com/qmth/teachcloud/cas/api/OpenApiController.java

@@ -164,24 +164,6 @@ public class OpenApiController {
                     response.sendRedirect(com.qmth.teachcloud.cas.util.gdpu.Constants.CAS_LOGIN_URL);
                 }
                 break;
-            case SXMU:
-                redirectParams = sxmuCasUtil.zxzkLogin(schoolCode);
-                if (Objects.nonNull(redirectParams)) {
-                    commonService.redirectLogic(FunctionalTypeEnum.HOME.name(), redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
-                } else {
-                    response.setHeader(SystemConstant.ACCESS_CONTROL_ALLOW_ORIGIN, SystemConstant.PATH_MATCH);
-                    response.sendRedirect(com.qmth.teachcloud.cas.util.sxmu.Constants.CAS_LOGIN_URL);
-                }
-                break;
-            case BJWLXY:
-                redirectParams = bjwlxyCasUtil.zxzkLogin(schoolCode);
-                if (Objects.nonNull(redirectParams)) {
-                    commonService.redirectLogic(FunctionalTypeEnum.HOME.name(), redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
-                } else {
-                    response.setHeader(SystemConstant.ACCESS_CONTROL_ALLOW_ORIGIN, SystemConstant.PATH_MATCH);
-                    response.sendRedirect(com.qmth.teachcloud.cas.util.bjwlxy.Constants.CAS_LOGIN_URL);
-                }
-                break;
             default:
                 break;
         }

cas/src/main/java/com/qmth/teachcloud/cas/util/BjwlxyCasUtil.java

@@ -11,7 +11,6 @@ import com.qmth.teachcloud.exchange.common.service.AuthInfoService;
 import com.qmth.teachcloud.exchange.common.service.CommonCacheService;
 import com.qmth.teachcloud.exchange.common.util.HttpUtil;
 import com.qmth.teachcloud.exchange.common.util.ServletUtil;
-import net.psctech.sso.filter.LoginFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -155,23 +154,23 @@ public class BjwlxyCasUtil {
         }
     }
 
-    /**
-     * 知学登录
-     *
-     * @param schoolCode
-     * @return
-     * @throws IOException
-     */
-    public RedirectParams zxzkLogin(String schoolCode) throws IOException {
-        String logoutUrl = null;
-        HttpSession session = ServletUtil.getSession();
-        String userName = "";
-        Object object = session.getAttribute(LoginFilter.CONST_CAS_USERNAME);
-        RedirectParams redirectParams = null;
-        if (object != null) {
-            userName = object.toString();
-            redirectParams = new RedirectParams(userName, schoolCode, logoutUrl, null);
-        }
-        return redirectParams;
-    }
+//    /**
+//     * 知学登录
+//     *
+//     * @param schoolCode
+//     * @return
+//     * @throws IOException
+//     */
+//    public RedirectParams zxzkLogin(String schoolCode) throws IOException {
+//        String logoutUrl = null;
+//        HttpSession session = ServletUtil.getSession();
+//        String userName = "";
+//        Object object = session.getAttribute(LoginFilter.CONST_CAS_USERNAME);
+//        RedirectParams redirectParams = null;
+//        if (object != null) {
+//            userName = object.toString();
+//            redirectParams = new RedirectParams(userName, schoolCode, logoutUrl, null);
+//        }
+//        return redirectParams;
+//    }
 }

cas/src/main/java/com/qmth/teachcloud/cas/util/SxmuCasUtil.java

@@ -11,7 +11,6 @@ import com.qmth.teachcloud.exchange.common.service.AuthInfoService;
 import com.qmth.teachcloud.exchange.common.service.CommonCacheService;
 import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
 import com.qmth.teachcloud.exchange.common.util.ServletUtil;
-import net.psctech.sso.filter.LoginFilter;
 import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -124,23 +123,23 @@ public class SxmuCasUtil {
         }
     }
 
-    /**
-     * 知学登录
-     *
-     * @param schoolCode
-     * @return
-     * @throws IOException
-     */
-    public RedirectParams zxzkLogin(String schoolCode) throws IOException {
-        String logoutUrl = null;
-        HttpSession session = ServletUtil.getSession();
-        String userName = "";
-        Object object = session.getAttribute(LoginFilter.CONST_CAS_USERNAME);
-        RedirectParams redirectParams = null;
-        if (object != null) {
-            userName = object.toString();
-            redirectParams = new RedirectParams(userName, schoolCode, logoutUrl, null);
-        }
-        return redirectParams;
-    }
+//    /**
+//     * 知学登录
+//     *
+//     * @param schoolCode
+//     * @return
+//     * @throws IOException
+//     */
+//    public RedirectParams zxzkLogin(String schoolCode) throws IOException {
+//        String logoutUrl = null;
+//        HttpSession session = ServletUtil.getSession();
+//        String userName = "";
+//        Object object = session.getAttribute(LoginFilter.CONST_CAS_USERNAME);
+//        RedirectParams redirectParams = null;
+//        if (object != null) {
+//            userName = object.toString();
+//            redirectParams = new RedirectParams(userName, schoolCode, logoutUrl, null);
+//        }
+//        return redirectParams;
+//    }
 }

cas/src/main/java/com/qmth/teachcloud/cas/util/bjwlxy/Constants.java

@@ -3,7 +3,7 @@ package com.qmth.teachcloud.cas.util.bjwlxy;
 public interface Constants {
 
     // CAS根地址
-    String CAS_BASE_PATH = "https://cas.bjwlxy.cn";
+//    String CAS_BASE_PATH = "https://cas.bjwlxy.cn";
 
     // CAS登录地址
     String CAS_LOGIN_URL = "/lyuapServer/login";