新增版本分支

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

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.exchange.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qmth.boot.core.cache.service.CacheService;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
@@ -42,9 +41,6 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     BasicSchoolService basicSchoolService;
 
-    @Resource
-    CacheService cacheService;
-
     @Value("${cas.config.teachcloudPrintLoginUrl}")
     String teachcloudLoginUrl;
 
@@ -71,14 +67,10 @@ public class CommonServiceImpl implements CommonService {
         }
 //        accountUser = URLDecoder.decode(accountUser, SystemConstant.CHARSET_NAME);
 
-        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CODE_CACHE, schoolCode);
-        if (Objects.isNull(basicSchool)) {
-            QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
-            basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, schoolCode);
-            basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
-        }
+        QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
+        basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, schoolCode);
+        BasicSchool basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
         Optional.ofNullable(basicSchool).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学校信息不存在"));
-        cacheService.put(SystemConstant.SCHOOL_CODE_CACHE, schoolCode, basicSchool);
 
         if (teachcloudLoginUrl.contains(SystemConstant.PATH_MATCH)) {
             teachcloudLoginUrl = teachcloudLoginUrl.replace(SystemConstant.PATH_MATCH, basicSchool.getCode());

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.core.cache.service.CacheService;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
@@ -78,9 +77,6 @@ public class OpenApiController {
     @Resource
     BasicSchoolService basicSchoolService;
 
-    @Resource
-    CacheService cacheService;
-
     @ApiOperation(value = "西安交通大学cas鉴权接口")
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
     @RequestMapping(value = "/authentication", method = RequestMethod.GET)
@@ -106,14 +102,10 @@ public class OpenApiController {
             strs[0] = strs[0].replace(SystemConstant.PATH_MATCH, SCHOOL_CODE);
         }
 
-        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CODE_CACHE, SCHOOL_CODE);
-        if (Objects.isNull(basicSchool)) {
-            QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
-            basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, SCHOOL_CODE);
-            basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
-        }
+        QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
+        basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, SCHOOL_CODE);
+        BasicSchool basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
         Optional.ofNullable(basicSchool).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学校信息不存在"));
-        cacheService.put(SystemConstant.SCHOOL_CODE_CACHE, SCHOOL_CODE, basicSchool);
 
         Long timestamp = System.currentTimeMillis();
         String signature = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, LOGIN_BEFORE_XJU_LOGIC_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());