wangliang@qmth.com.cn 4 years ago
parent
commit
d5caa13e98

+ 0 - 1
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CallApiOrgCenterService.java

@@ -17,5 +17,4 @@ public interface CallApiOrgCenterService {
      * @throws IOException 异常
      */
     List<Map> callOrgInfo() throws IOException;
-
 }

+ 9 - 6
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/CallApiOrgCenterServiceImpl.java

@@ -28,17 +28,20 @@ public class CallApiOrgCenterServiceImpl implements CallApiOrgCenterService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<Map> callOrgInfo() throws IOException {
+        List<Map> orgList = null;
+        if ((Objects.isNull(dictionaryConfig.sysDomain().getAccessKey()) || Objects.equals(dictionaryConfig.sysDomain().getAccessKey(), ""))
+                && (Objects.isNull(dictionaryConfig.sysDomain().getAccessSecret()) || Objects.equals(dictionaryConfig.sysDomain().getAccessSecret(), ""))) {
+            return orgList;
+        }
         String url = dictionaryConfig.orgCenterDomain().getUrl() + dictionaryConfig.orgCenterDomain().getOrgQueryApi();
 
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         int pageNumber = 1;
         int pageSize = 100;
 
-        List<Map> orgList = null;
-
-        while (true){
-            params.put("pageNumber",pageNumber);
-            params.put("pageSize",pageSize);
+        while (true) {
+            params.put("pageNumber", pageNumber);
+            params.put("pageSize", pageSize);
             long timestamp = System.currentTimeMillis();
             String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, dictionaryConfig.orgCenterDomain().getOrgQueryApi(), timestamp, dictionaryConfig.sysDomain().getAccessKey(), dictionaryConfig.sysDomain().getAccessSecret());
             String result = HttpUtil.post(url, params, accessToken, timestamp);

+ 4 - 4
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/OrgCenterDataDisposeServiceImpl.java

@@ -15,10 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -37,6 +34,9 @@ public class OrgCenterDataDisposeServiceImpl implements OrgCenterDataDisposeServ
     @Override
     public void updateSchoolInfo() throws IOException {
         List<Map> result = callApiOrgCenterService.callOrgInfo();
+        if (Objects.isNull(result) || result.size() == 0) {
+            return;
+        }
         // 删除原有学校
         List<BasicSchool> basicSchoolList = basicSchoolService.list();
         List<Long> oldIdList = basicSchoolList.stream().map(BasicSchool::getId).collect(Collectors.toList());

+ 3 - 0
teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/WudaOpenApiController.java

@@ -1,5 +1,7 @@
 package com.qmth.teachcloud.report.api;
 
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -31,6 +33,7 @@ public class WudaOpenApiController {
     @ApiOperation(value = "cas鉴权接口")
     @RequestMapping(value = "/authentication", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
+    @Aac(auth = BOOL.FALSE)
     public void authentication(HttpServletRequest request, HttpServletResponse response) throws IOException {
         String uid = request.getRemoteUser();
         if (Objects.isNull(uid)) {