修改导入逻辑遇到调用金融用户中心问题

src/main/java/cn/quantgroup/customer/config/http/security/WebSecurityConfig.java

@@ -33,7 +33,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        //String allowedRoutes = "/test/**,/error/**,/user/login";
+        String allowedRoutes = "/test/**,/error/**,/repay/**,/channel/**,/order/**,/operate/sys/**,/user/**,/work_order/**,/vcc/**,/transactionReceiptRecord/**";
         String[] allowedRoutesArr = allowedRoutes.split(",");
         http.httpBasic().and()
                 .authorizeRequests()

src/main/java/cn/quantgroup/customer/rest/TransactionReceiptRecordRest.java

@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletRequest;

src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java

@@ -42,6 +42,8 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import javax.persistence.criteria.Predicate;
 import javax.servlet.http.HttpServletRequest;
@@ -421,14 +423,9 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
                     log.info("需要签章得pdf路径:"+maxExportBatchNo+"/交易凭证/"+directory+"/"+pdfFileName);
                     filePathList.add(map);
                     //调用合同中心进行签章
-                    getHeaders(request);
-                    String accessToken = request.getHeader("Access-Token");
-                    String authToken = request.getHeader("X-Auth-Token");
-                    log.info("exportZipFile request.getParameter:"+request.getParameter("Access-Token"));
-                    log.info("exportZipFile request.getHeaderNames():"+request.getHeaderNames());
-                    log.info("exportZipFile authToken:"+authToken);
-                    log.info("exportZipFile accessToken:"+accessToken);
-                    //restContract(filePathList,emailList,accessToken);
+                    HttpServletRequest requestAttr = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                    String accessToken = requestAttr.getHeader("Access-Token");
+                    restContract(filePathList,emailList,accessToken);
                 }
             } catch (Exception e) {
                 sftpUtil.logout();
@@ -531,7 +528,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         String url = contractUrl + "/contract/batch/sign";
         Map<String, String> header = Maps.newHashMap();
         header.put("Content-type", "application/json");
-        header.put("Access-Token",accessToken);
+        header.put("Access-Token", accessToken);
         log.info("contractUrl /contract/batch/sign 调用签章接口 accessToken,"+accessToken);
         log.info("contractUrl /contract/batch/sign 调用签章接口 begin,"+filePathList);
         String contractResult = httpService.post(url, header, filePathList);
@@ -676,34 +673,34 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             for(TransactionReceiptRecord record :transactionReceiptRecordList){
                 try{
                     //调用天津自牧用户中心接口
-                    Map param = Maps.newHashMap();
-                    param.put("userIds",record.getUserId());
-                    String userUrl = userSysUrl + "/api/sync/listByUserIds";
-                    //String userUrl = "http://passportapi-test7.liangkebang.net/api/sync/listByUserIds";
-                    log.info("TransactionReceiptRecordServiceImpl updateTransactionRecordsStatus 调用用户中心 begin"+param);
-                    String userResult = httpService.get(userUrl, param);
-                    log.info("TransactionReceiptRecordServiceImpl userResult ="+userResult);
-                    if (StringUtils.isEmpty(userResult)) {
-                        record.setImportStatus(2);
-                        record.setExportStatus(2);
-                        failList.add(record);
-                        continue;
-                    }
-                    //对比拿到的
-                    JSONObject userJsonObject = JSONObject.parseObject(userResult);
-                    String dataStr = userJsonObject.getString("data");
-                    JSONArray userArray = JSONArray.parseArray(dataStr);
-                    if(userArray.size()<=0){
-                        record.setImportStatus(2);
-                        record.setExportStatus(2);
-                        failList.add(record);
-                        continue;
-                    }
-                    JSONObject object= (JSONObject) userArray.get(0);
-                    String userName = object.getString("name");
-                    log.info("TransactionReceiptRecordServiceImpl updateTransactionRecordsStatus 调用用户中心 end");
+//                    Map param = Maps.newHashMap();
+//                    param.put("userIds",record.getUserId());
+//                    String userUrl = userSysUrl + "/api/sync/listByUserIds";
+//                    //String userUrl = "http://passportapi-test7.liangkebang.net/api/sync/listByUserIds";
+//                    log.info("TransactionReceiptRecordServiceImpl updateTransactionRecordsStatus 调用用户中心 begin"+param);
+//                    String userResult = httpService.get(userUrl, param);
+//                    log.info("TransactionReceiptRecordServiceImpl userResult ="+userResult);
+//                    if (StringUtils.isEmpty(userResult)) {
+//                        record.setImportStatus(2);
+//                        record.setExportStatus(2);
+//                        failList.add(record);
+//                        continue;
+//                    }
+//                    //对比拿到的
+//                    JSONObject userJsonObject = JSONObject.parseObject(userResult);
+//                    String dataStr = userJsonObject.getString("data");
+//                    JSONArray userArray = JSONArray.parseArray(dataStr);
+//                    if(userArray.size()<=0){
+//                        record.setImportStatus(2);
+//                        record.setExportStatus(2);
+//                        failList.add(record);
+//                        continue;
+//                    }
+//                    JSONObject object= (JSONObject) userArray.get(0);
+//                    String userName = object.getString("name");
+//                    log.info("TransactionReceiptRecordServiceImpl updateTransactionRecordsStatus 调用用户中心 end");
                     log.info("TransactionReceiptRecordServiceImpl updateTransactionRecordsStatus 调用商城接口 begin");
-                    if(StringUtils.isNotBlank(userName) && userName.equals(record.getUserName())){
+                    if(StringUtils.isNotBlank(record.getUserName())){
                         Map<String, String> header = Maps.newHashMap();
                         header.put("Content-type", "application/json");
                         header.put("qg-tenant-id", "560761");