新增版本分支

xjtu-exchange/src/main/java/com/qmth/xjtu/api/OpenApiController.java

@@ -110,7 +110,7 @@ public class OpenApiController {
         String signature = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, LOGIN_BEFORE_XJU_LOGIC_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
 
         String callResult = HttpUtil.postJson(strs[0] + LOGIN_BEFORE_XJU_LOGIC_API, JacksonUtil.parseJson(employeeNo), signature, timestamp);
-        String schoolCodeParam = null;
+//        String schoolCodeParam = null;
         if (!StringUtils.isBlank(callResult)) {
             log.info("callbackResult:{}", JacksonUtil.parseJson(callResult));
             Result result = JSON.parseObject(callResult, Result.class);
@@ -123,11 +123,11 @@ public class OpenApiController {
 //                if (sysuserList.size() >= 2) {
 //                    throw ExceptionResultEnum.ERROR.exception("查询到有多个用户");
 //                }
-                String schoolId = String.valueOf(sysuserList.get(0).get("schoolId"));
-                Optional.ofNullable(schoolId).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("学校id为空"));
-                BasicSchool basicSchoolMap = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CACHE, schoolId);
-                Optional.ofNullable(basicSchoolMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("学校id:" + schoolId + ",学校不存在"));
-                schoolCodeParam = basicSchoolMap.getCode();
+//                String schoolId = String.valueOf(sysuserList.get(0).get("schoolId"));
+//                Optional.ofNullable(schoolId).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("学校id为空"));
+//                BasicSchool basicSchoolMap = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CACHE, schoolId);
+//                Optional.ofNullable(basicSchoolMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("学校id:" + schoolId + ",学校不存在"));
+//                schoolCodeParam = basicSchoolMap.getCode();
             } else {
                 throw ExceptionResultEnum.ERROR.exception("调用知学知考西交大登录前查找账号接口失败");
             }
@@ -197,7 +197,7 @@ public class OpenApiController {
             throw ExceptionResultEnum.ERROR.exception("gSessionId为空");
         }
 
-        commonService.redirectLogic(employeeNo, schoolCodeParam, returnUrl, Objects.nonNull(openParams) ? JacksonUtil.parseJson(openParams) : null);
+        commonService.redirectLogic(employeeNo, SCHOOL_CODE, returnUrl, Objects.nonNull(openParams) ? JacksonUtil.parseJson(openParams) : null);
     }
 
     @ApiOperation(value = "西安交通大学cas鉴权退出接口")