Jelajahi Sumber

西安交通大学新增退出接口

wangliang 2 tahun lalu
induk
melakukan
3f731802ce

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

@@ -1,5 +1,6 @@
 package com.qmth.teachcloud.exchange.common.service.impl;
 package com.qmth.teachcloud.exchange.common.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
 import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
@@ -21,6 +22,7 @@ import java.io.IOException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
 import java.util.Objects;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.StringJoiner;
 
 
 /**
 /**
@@ -63,17 +65,17 @@ public class CommonServiceImpl implements CommonService {
         }
         }
 //        accountUser = URLDecoder.decode(accountUser, SystemConstant.CHARSET_NAME);
 //        accountUser = URLDecoder.decode(accountUser, SystemConstant.CHARSET_NAME);
 
 
-//        QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
-//        basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, schoolCode);
-//        BasicSchool basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
-//        Optional.ofNullable(basicSchool).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学校信息不存在"));
+        QueryWrapper<BasicSchool> basicSchoolQueryWrapper = new QueryWrapper<>();
+        basicSchoolQueryWrapper.lambda().eq(BasicSchool::getCode, schoolCode);
+        BasicSchool basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
+        Optional.ofNullable(basicSchool).orElseThrow(() -> ExceptionResultEnum.PARAMS_ERROR.exception("学校信息不存在"));
 
 
-        //TODO 测试用 start
-        BasicSchool basicSchool = new BasicSchool();
-        basicSchool.setCode(schoolCode);
-        basicSchool.setAccessKey("caabd6ddde7d4b0ca98cfd2109f14d95");
-        basicSchool.setAccessSecret("3KiuJE1Qgjh5tV23ODQFtxuzchAtcLZQ");
-        //TODO 测试用 end
+//        //TODO 测试用 start
+//        BasicSchool basicSchool = new BasicSchool();
+//        basicSchool.setCode(schoolCode);
+//        basicSchool.setAccessKey("caabd6ddde7d4b0ca98cfd2109f14d95");
+//        basicSchool.setAccessSecret("3KiuJE1Qgjh5tV23ODQFtxuzchAtcLZQ");
+//        //TODO 测试用 end
 
 
         if (teachcloudLoginUrl.contains(SystemConstant.PATH_MATCH)) {
         if (teachcloudLoginUrl.contains(SystemConstant.PATH_MATCH)) {
             teachcloudLoginUrl = teachcloudLoginUrl.replace(SystemConstant.PATH_MATCH, basicSchool.getCode());
             teachcloudLoginUrl = teachcloudLoginUrl.replace(SystemConstant.PATH_MATCH, basicSchool.getCode());

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

@@ -154,6 +154,7 @@ public class OpenApiController {
         if (Objects.isNull(gSessionId) || Objects.equals(gSessionId, "")) {
         if (Objects.isNull(gSessionId) || Objects.equals(gSessionId, "")) {
             throw ExceptionResultEnum.PARAMS_ERROR.exception("sessionId为空");
             throw ExceptionResultEnum.PARAMS_ERROR.exception("sessionId为空");
         }
         }
+        authInfoService.appHasExpired(schoolCode);
         Map<String, Object> logoutParams = new LinkedHashMap<>();
         Map<String, Object> logoutParams = new LinkedHashMap<>();
         logoutParams.put("gSessionId", gSessionId);
         logoutParams.put("gSessionId", gSessionId);
         String logoutResult = HttpUtil.post(LOGOUT_URL, logoutParams, null);
         String logoutResult = HttpUtil.post(LOGOUT_URL, logoutParams, null);

+ 3 - 4
xjtu-exchange/src/main/resources/application-offline.properties

@@ -70,10 +70,9 @@ spring.jackson.time-zone=GMT+8
 com.qmth.logging.root-level=info
 com.qmth.logging.root-level=info
 com.qmth.logging.file-path=/Users/king/Downloads/xjtu-exchange.log
 com.qmth.logging.file-path=/Users/king/Downloads/xjtu-exchange.log
 
 
-com.qmth.solar.access-key=918d0878ee7944beb448980b011ff804
-com.qmth.solar.access-secret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
-#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
+#com.qmth.solar.access-key=918d0878ee7944beb448980b011ff804
+#com.qmth.solar.access-secret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
+com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
 
 cas.config.teachcloudPrintLoginUrl=http://192.168.10.138/#/login-open
 cas.config.teachcloudPrintLoginUrl=http://192.168.10.138/#/login-open
-#cas.config.teachcloudPrintLoginUrl=http://192.168.10.99:8056/#/login-open
 cas.config.logoutUrl=https://127.0.0.1:7111/api/open/authentication/logout
 cas.config.logoutUrl=https://127.0.0.1:7111/api/open/authentication/logout