cas

cas/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.cas.exchange</groupId>
     <artifactId>cas-exchange</artifactId>
-    <version>2.0.0.3</version>
+    <version>2.0.0.4</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>2.0.0.3</version>
+        <version>2.0.0.4</version>
     </parent>
 
     <dependencies>

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

@@ -11,6 +11,7 @@ import com.qmth.teachcloud.cas.util.supwisdom.CasUtils;
 import com.qmth.teachcloud.cas.util.sxufe.Constants;
 import com.qmth.teachcloud.exchange.common.bean.params.RedirectParams;
 import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
+import com.qmth.teachcloud.exchange.common.enums.FunctionalTypeEnum;
 import com.qmth.teachcloud.exchange.common.enums.SchoolCodeEnum;
 import com.qmth.teachcloud.exchange.common.service.CommonService;
 import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
@@ -68,7 +69,8 @@ public class OpenApiController {
                                @ApiParam(value = "系统参数") @RequestParam(required = false) String state,
                                @ApiParam(value = "用户类型") @RequestParam(required = false) String userType,
                                @ApiParam(value = "员工工号") @RequestParam(required = false) String employeeNo,
-                               @ApiParam(value = "返回url") @RequestParam(required = false) String returnUrl) throws IOException {
+                               @ApiParam(value = "返回url") @RequestParam(required = false) String returnUrl,
+                               @ApiParam(value = "功能类型") @RequestParam(defaultValue = "HOME") String functionalType) throws IOException {
         RedirectParams redirectParams = null;
         switch (SchoolCodeEnum.valueOf(schoolCode.toUpperCase())) {
             case XJTU:
@@ -87,7 +89,7 @@ public class OpenApiController {
                 break;
         }
         if (Objects.nonNull(redirectParams)) {
-            commonService.redirectLogic(redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
+            commonService.redirectLogic(functionalType, redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
         }
     }
 
@@ -127,7 +129,7 @@ public class OpenApiController {
             case CDUT:
                 redirectParams = cdutCasUtil.zxzkLogin(schoolCode);
                 if (Objects.nonNull(redirectParams)) {
-                    commonService.redirectLogic(redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
+                    commonService.redirectLogic(FunctionalTypeEnum.HOME.name(), redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
                 } else {
                     String loginUrl = CasUtils.getLoginUrl(request);
                     response.sendRedirect(loginUrl);
@@ -136,7 +138,7 @@ public class OpenApiController {
             case SXUFE:
                 redirectParams = sxufeCasUtil.zxzkLogin(schoolCode);
                 if (Objects.nonNull(redirectParams)) {
-                    commonService.redirectLogic(redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
+                    commonService.redirectLogic(FunctionalTypeEnum.HOME.name(), redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
                 } else {
                     response.setHeader("Access-Control-Allow-Origin", SystemConstant.PATH_MATCH);
                     response.sendRedirect(Constants.CAS_LOGIN_URL);
@@ -145,7 +147,7 @@ public class OpenApiController {
             case GDPU:
                 redirectParams = gdpuCasUtil.zxzkLogin(schoolCode);
                 if (Objects.nonNull(redirectParams)) {
-                    commonService.redirectLogic(redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
+                    commonService.redirectLogic(FunctionalTypeEnum.HOME.name(), redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
                 } else {
                     response.setHeader("Access-Control-Allow-Origin", SystemConstant.PATH_MATCH);
                     response.sendRedirect(com.qmth.teachcloud.cas.util.gdpu.Constants.CAS_LOGIN_URL);
@@ -171,7 +173,7 @@ public class OpenApiController {
                 break;
         }
         if (Objects.nonNull(redirectParams)) {
-            commonService.redirectLogic(redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
+            commonService.redirectLogic(FunctionalTypeEnum.HOME.name(), redirectParams.getEmployeeNo(), redirectParams.getSchoolCode(), redirectParams.getReturnUrl(), Objects.nonNull(redirectParams.getOpenParams()) ? JacksonUtil.parseJson(redirectParams.getOpenParams()) : null);
         }
     }
 }

eds/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.eds.exchange</groupId>
     <artifactId>eds-exchange</artifactId>
-    <version>2.0.0.3</version>
+    <version>2.0.0.4</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>2.0.0.3</version>
+        <version>2.0.0.4</version>
     </parent>
 
     <dependencies>

eds/src/main/java/com/qmth/teachcloud/eds/utils/gdpu/JdbcUtil.java

@@ -6,7 +6,7 @@ import java.util.List;
 public class JdbcUtil {
 
     // MySQL8.0以下版本 - JDBC驱动名及数据库URL
-    static final String JDBC_DRIVER = "com.mysql.jdbc.Driver";
+    static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";
     // test为数据库名,?后面这句很重要,设置useSSl=false
     static final String DB_URL = "jdbc:mysql://dexchange.gdpu.edu.cn:3306/ZNKSPT?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC&useUnicode=true&characterEncoding=utf8";
 //    static final String DB_URL = "jdbc:mysql://localhost:3306/exchange-2.0.0?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC&useUnicode=true&characterEncoding=utf8";

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.exchange.service</groupId>
     <artifactId>teachcloud-exchange-service</artifactId>
-    <version>2.0.0.3</version>
+    <version>2.0.0.4</version>
     <packaging>pom</packaging>
 
     <modules>

teachcloud-exchange-common/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.exchange.common</groupId>
     <artifactId>teachcloud-exchange-common</artifactId>
-    <version>2.0.0.3</version>
+    <version>2.0.0.4</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>2.0.0.3</version>
+        <version>2.0.0.4</version>
     </parent>
 
     <dependencies>

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/params/OpenParams.java

@@ -27,6 +27,8 @@ public class OpenParams implements Serializable {
 
     @ApiModelProperty("结果")
     private String result;
+    @ApiModelProperty("功能类型")
+    private String functionalType;
 
     public OpenParams(String name, String roleName, String orgName, String deptName, String result) {
         this.name = name;
@@ -79,4 +81,12 @@ public class OpenParams implements Serializable {
     public void setOrgName(String orgName) {
         this.orgName = orgName;
     }
+
+    public String getFunctionalType() {
+        return functionalType;
+    }
+
+    public void setFunctionalType(String functionalType) {
+        this.functionalType = functionalType;
+    }
 }

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/contant/SystemConstant.java

@@ -55,6 +55,7 @@ public class SystemConstant {
     public static final String UPDATE_TIME = "updateTime";
     public static final String SESSION = "session:";
     public static final String USER = "account";
+    public static final String FUNCTIONAL_TYPE = "functionalType";
     public static final String SCHOOL_ID = "schoolId";
     public static final String SCHOOL = "school";
     public static final String RETURN_URL = "returnUrl";

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/enums/FunctionalTypeEnum.java

@@ -0,0 +1,38 @@
+package com.qmth.teachcloud.exchange.common.enums;
+
+import java.util.Objects;
+
+/**
+ * 单点登录跳转功能类型
+ */
+public enum FunctionalTypeEnum {
+    HOME("首页"),
+
+    APPLY_MANAGE("入库申请"),
+    PAPER_MANAGE("卷库查询");
+
+    FunctionalTypeEnum(String title) {
+        this.title = title;
+    }
+
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param value
+     * @return
+     */
+    public static String convertToName(String value) {
+        for (FunctionalTypeEnum e : FunctionalTypeEnum.values()) {
+            if (Objects.equals(value.trim(), e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+}

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/service/CommonService.java

@@ -20,5 +20,5 @@ public interface CommonService {
      * @param params
      * @throws IOException
      */
-    public void redirectLogic(String account, String schoolCode, String returnUrl, String params) throws IOException;
+    public void redirectLogic(String functionalType, String account, String schoolCode, String returnUrl, String params) throws IOException;
 }

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/service/impl/CommonServiceImpl.java

@@ -13,6 +13,7 @@ import com.qmth.teachcloud.exchange.common.service.CommonService;
 import com.qmth.teachcloud.exchange.common.util.Base64Util;
 import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
 import com.qmth.teachcloud.exchange.common.util.ServletUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -56,7 +57,7 @@ public class CommonServiceImpl implements CommonService {
      * @throws IOException
      */
     @Override
-    public void redirectLogic(String account, String schoolCode, String returnUrl, String params) throws IOException {
+    public void redirectLogic(String functionalType, String account, String schoolCode, String returnUrl, String params) throws IOException {
         log.info("公用跳转接口进来了,account:{},schoolCode:{},returnUrl:{},params:{}", account, schoolCode, returnUrl, params);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolCode);
         Optional.ofNullable(basicSchool).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学校信息不存在"));
@@ -90,7 +91,8 @@ public class CommonServiceImpl implements CommonService {
                 .add(teachcloudLoginUrl)
                 .add(SystemConstant.GET_UNKNOWN).add(SystemConstant.HEADER_TIME).add(SystemConstant.GET_EQUAL).add(String.valueOf(timestamp))
                 .add(SystemConstant.GET_SYMBOL).add(SystemConstant.SIGNATURE).add(SystemConstant.GET_EQUAL).add(Base64Util.encode(signature.getBytes(StandardCharsets.UTF_8)))
-                .add(SystemConstant.GET_SYMBOL).add(SystemConstant.USER).add(SystemConstant.GET_EQUAL).add(URLEncoder.encode(account, SystemConstant.CHARSET_NAME));
+                .add(SystemConstant.GET_SYMBOL).add(SystemConstant.USER).add(SystemConstant.GET_EQUAL).add(URLEncoder.encode(account, SystemConstant.CHARSET_NAME))
+                .add(SystemConstant.GET_SYMBOL).add(SystemConstant.FUNCTIONAL_TYPE).add(SystemConstant.GET_EQUAL).add(URLEncoder.encode(functionalType, SystemConstant.CHARSET_NAME));
 
         if (Objects.nonNull(returnUrl) && !Objects.equals(returnUrl, "")) {
             stringJoiner = stringJoiner.add(SystemConstant.GET_SYMBOL).add(SystemConstant.RETURN_URL).add(SystemConstant.GET_EQUAL).add(URLEncoder.encode(returnUrl, SystemConstant.CHARSET_NAME));
@@ -102,7 +104,7 @@ public class CommonServiceImpl implements CommonService {
         }
 //        String redirectUrl = URLEncoder.encode(stringJoiner.toString(), SystemConstant.CHARSET);
 //        log.info("path:{},timestamp:{},account:{},signature:{},redirectUrl:{},redirectUrl_urlencode:{}", path, timestamp, account, signature, stringJoiner.toString(), redirectUrl);
-        log.info("path:{},timestamp:{},account:{},signature:{}, redirectUrl:{}", SystemConstant.CAS_VUE_LOGIN_PATH, timestamp, account, signature, stringJoiner.toString());
+        log.info("path:{},timestamp:{},account:{},functionalType:{},signature:{}, redirectUrl:{}", SystemConstant.CAS_VUE_LOGIN_PATH, timestamp, account,functionalType, signature, stringJoiner.toString());
 
         HttpServletResponse response = ServletUtil.getResponse();
         response.setHeader("Access-Control-Allow-Origin", SystemConstant.PATH_MATCH);