修改报错信息

commons/src/main/java/com/jzg/commons/entity/quote/vo/image/InsuranceImageVo.java

@@ -52,18 +52,27 @@ public class InsuranceImageVo {
 
         @Serial
         private static final long serialVersionUID = -8193683303365881496L;
+
+        /**
+         * 批次号
+         */
+        private String batchNum;
+
         /**
          * 影像唯一id
          */
         private String imageId;
+
         /**
          * 影像名称
          */
         private String imageName;
+
         /**
          * 影像base64 影像类型
          */
         private String imageBase64Str;
+
         /**
          * 影像大小
          */

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/component/BoHaiCrawlerRequestComponent.java

@@ -189,7 +189,7 @@ public class BoHaiCrawlerRequestComponent {
                     boHaiCrawlerEncryptionRequest.setMd5(md5Value);
 
                     CrawlerRequestUrlStandard standard = (CrawlerRequestUrlStandard) urlOrStandard;
-                    ResponseEntity<String> encryptedResponse = requestComponent.objectPost2(
+                    ResponseEntity<String> encryptedResponse = requestComponent.objectPost(
                             standard.getRequestUrl(boHaiCrawlerProperties.getBaseUrl2()),
                             boHaiCrawlerEncryptionRequest,
                             String.class,
@@ -221,7 +221,7 @@ public class BoHaiCrawlerRequestComponent {
                 // 文件上传
                 case FILE_UPLOAD:
                     String url = (String) urlOrStandard;
-                    ResponseEntity<String> uploadResponse = requestComponent.objectPostForUpload(
+                    ResponseEntity<String> uploadResponse = requestComponent.objectPost(
                             url,
                             request,
                             String.class,

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/crawler/service/impl/BoHaiCrawlerRequestImpl.java

@@ -695,6 +695,11 @@ public class BoHaiCrawlerRequestImpl implements BoHaiCrawlerRequest {
         }
     }
 
+    @Override
+    public void queryClauseData(ClauseDataVo clauseDataVo) {
+
+    }
+
     /**
      * 构建支付凭证查询请求对象
      * @param orderNo 订单号

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;
 
 
 /**
@@ -73,6 +74,23 @@ public class RequestComponent {
         return webClient;
     }
 
+    /**
+     * 创建无SSL的WebClient
+     *
+     * @return WebClient
+     */
+    private WebClient selectNoSSLWebClient() {
+        try {
+            if (webClientConfig != null) {
+                return webClientConfig.clientBuilder();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("创建安全WebClient失败，使用默认WebClient", e);
+        }
+        return webClient;
+    }
+
     /**
      * 从URL中提取域名
      *
@@ -271,6 +289,107 @@ public class RequestComponent {
         }
     }
 
+    /**
+     * 发送post请求，返回的content-type：text/json;charset=UTF-8
+     *
+     * @param url           请求地址
+     * @param body          请求体
+     * @param responseClass 响应类
+     * @param headers       请求头
+     * @param <Response>    响应实体
+     * @return <Response> ResponseEntity<Response> 响应
+     */
+    public <Response> ResponseEntity<Response> post2(String url, String body, Class<Response> responseClass, HttpHeaders headers) {
+        body = Optional.ofNullable(body).orElse("");
+        log.info("URL的值：{}，body的值：{}", url, body);
+        WebClient webClient = selectNoSSLWebClient();
+        try {
+            // 先获取原始响应字符串
+            Mono<String> responseMono = webClient.post()
+                    .uri(url)
+                    .headers(setHeaders(headers))
+                    .header(HttpHeaders.ACCEPT, "application/json,text/html,text/json,*/*")
+                    .header(HttpHeaders.ACCEPT_LANGUAGE, "zh-CN,zh;q=0.9")
+                    .header(HttpHeaders.CACHE_CONTROL, "no-cache")
+                    .body(BodyInserters.fromValue(body))
+                    .retrieve()
+                    .bodyToMono(String.class);
+
+            // 处理响应：过滤非法字符并解析JSON
+            Mono<Response> resultMono = responseMono.flatMap(rawResponse -> {
+                // 过滤非法字符
+                String filteredResponse = filterIllegalCharacters(rawResponse);
+                try {
+                    // 使用FastJSON手动解析JSON
+                    Response result = JSON.parseObject(filteredResponse, responseClass);
+                    return Mono.just(result);
+                } catch (Exception e) {
+                    // 如果JSON解析失败，抛出异常
+                    return Mono.error(new WebClientResponseException(
+                            500,
+                            "JSON parsing failed after filtering: " + e.getMessage(),
+                            HttpHeaders.EMPTY,
+                            filteredResponse.getBytes(StandardCharsets.UTF_8),
+                            null
+                    ));
+                }
+            });
+            // 等待结果并构建ResponseEntity
+            Response result = resultMono.block();
+            HttpHeaders responseHeaders = new HttpHeaders();
+            responseHeaders.setContentType(MediaType.APPLICATION_JSON);
+            // 获取原始响应状态码
+            ResponseEntity<String> rawResponse = webClient.post()
+                    .uri(url)
+                    .headers(setHeaders(headers))
+                    .header(HttpHeaders.ACCEPT, "application/json,text/html,text/json,*/*")
+                    .header(HttpHeaders.ACCEPT_LANGUAGE, "zh-CN,zh;q=0.9")
+                    .header(HttpHeaders.CACHE_CONTROL, "no-cache")
+                    .body(BodyInserters.fromValue(body))
+                    .retrieve()
+                    .toEntity(String.class)
+                    .block();
+
+            int statusCode = rawResponse != null ? rawResponse.getStatusCode().value() : 200;
+            return ResponseEntity.status(statusCode).headers(responseHeaders).body(result);
+        } catch (WebClientResponseException e) {
+            e.printStackTrace();
+            throw e;
+        } catch (Exception e) {
+            // 处理其他异常
+            throw new WebClientResponseException(
+                    500,
+                    "Request failed: " + e.getMessage(),
+                    HttpHeaders.EMPTY,
+                    e.getMessage().getBytes(StandardCharsets.UTF_8),
+                    null
+            );
+        }
+    }
+
+
+    /**
+     * 构造post请求
+     *
+     * @param url
+     * @param body
+     * @param responseClass
+     * @param headers
+     * @param <Response>
+     * @return ResponseEntity<Response>
+     */
+    public <Response> ResponseEntity<Response> postWithMono(String url, String body, Class<Response> responseClass, HttpHeaders headers) {
+        WebClient webClient = selectNoSSLWebClient();
+        return webClient.post()
+                .uri(url)
+                .contentType(MediaType.APPLICATION_JSON)
+                .headers(setHeaders(headers))
+                .bodyValue(body)
+                .retrieve()
+                .toEntity(responseClass)
+                .block();
+    }
+
     /**
      * gbk
      *
@@ -648,4 +767,28 @@ public class RequestComponent {
                 .block();
     }
 
+    /**
+     * 过滤JSON字符串中的非法控制字符
+     * 只允许 \r, \n, \t 等标准空白字符
+     *
+     * @param jsonStr 原始JSON字符串
+     * @return String 过滤后的JSON字符串
+     */
+    private String filterIllegalCharacters(String jsonStr) {
+        if (jsonStr == null) {
+            return null;
+        }
+        // 正则表达式匹配非法控制字符（除了 \r, \n, \t 之外的所有控制字符）
+        // ASCII 0-31 除了 9(\t), 10(\n), 13(\r) 之外的所有控制字符
+        Pattern pattern = Pattern.compile("[\\u0000-\\u0008\\u000b\\u000c\\u000e-\\u001f]");
+        String filtered = pattern.matcher(jsonStr).replaceAll("");
+
+        if (!jsonStr.equals(filtered)) {
+            log.warn("过滤掉了 {} 个非法控制字符", jsonStr.length() - filtered.length());
+            log.debug("过滤前: {}", jsonStr);
+            log.debug("过滤后: {}", filtered);
+        }
+        return filtered;
+    }
+
 }

tenant/insurance/quotation-taishan/src/main/java/com/jzg/quotation/taishan/crawler/service/impl/TaiShanCrawlerRequestImpl.java

@@ -251,6 +251,11 @@ public class TaiShanCrawlerRequestImpl implements TaiShanCrawlerRequest {
         }
     }
 
+    @Override
+    public void queryClauseData(ClauseDataVo clauseDataVo) {
+
+    }
+
     /**
      * 获取支付链接
      *

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinApiRequestImpl.java

@@ -27,6 +27,7 @@ import com.jzg.quotation.zijin.api.entity.request.*;
 import com.jzg.quotation.zijin.api.entity.response.*;
 import com.jzg.quotation.zijin.api.service.ZiJinApiRequest;
 import com.jzg.quotation.zijin.api.service.ZiJinOrderService;
+import com.jzg.quotation.zijin.crawler.service.ZiJinCrawlerOrderService;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
 
     private final PlatformClient platformClient;
 
+
     // 重复投保次数
     private static final int REPEAT_NUMBER = 3;
 
@@ -159,7 +161,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
     public void queryClauseData(ClauseDataVo clauseDataVo) {
         // 获取订单信息
         OrderBase orderBase = clauseDataVo.getOrder();
-        ZiJinApiOrder ziJinApiOrder = ziJinCrawlerOrderService.getById(orderBase.getOrdersNo());
+        ZiJinApiOrder ziJinApiOrder = ziJinOrderService.getById(orderBase.getOrdersNo());
         // 配置信息
         ZiJinApiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZiJinApiConfigureParameters.class, orderBase
                 .getAttributionInformationVo()

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/component/ZiJinCrawlerRequestComponent.java

@@ -409,7 +409,7 @@ public class ZiJinCrawlerRequestComponent {
 
         String jsonString = JSON.toJSONString(ziJinCrawlerQueryCarPolicyListRequest);
         log.info("ziJinCrawlerQueryCarPolicyListRequest请求参数的值：{}", jsonString);
-        ResponseEntity<ZiJinCrawlerQueryCarPolicyListResponse> responseEntity = requestComponent.postWithMono(RequestUrl.QUERY_CAR_POLICY_LIST.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerQueryCarPolicyListResponse.class, httpHeaders);
+        ResponseEntity<ZiJinCrawlerQueryCarPolicyListResponse> responseEntity = requestComponent.post(RequestUrl.QUERY_CAR_POLICY_LIST.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerQueryCarPolicyListResponse.class, httpHeaders);
         return responseEntity.getBody();
     }
 

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerRequestImpl.java

@@ -321,6 +321,11 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
         }
     }
 
+    @Override
+    public void queryClauseData(ClauseDataVo clauseDataVo) {
+
+    }
+
     /**
      * 查询订单状态
      *
@@ -338,8 +343,8 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             // 设置请求参数
             ziJinCrawlerQueryOrderStatusRequest.setOrderStatus(new String[]{});
             ziJinCrawlerQueryOrderStatusRequest.setOrderNo(ziJinCrawlerOrder.getOrderNo());
-            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeBegin(orderStatusVo.getOrder().getUpdateTimeBegin());
-            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeEnd(orderStatusVo.getOrder().getUpdateTimeEnd());
+            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeBegin("");
+            ziJinCrawlerQueryOrderStatusRequest.setUpdateTimeEnd("");
             ziJinCrawlerQueryOrderStatusRequest.setPageNum(1);
             ziJinCrawlerQueryOrderStatusRequest.setPageSize(10);
             ziJinCrawlerQueryOrderStatusRequest.setProductCodeList(new String[]{});