Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/ins/controller/InsAlltrustApiController.java

@@ -170,20 +170,30 @@ public class InsAlltrustApiController {
     }
 
 
+//    /**
+//     * 获取地区 通过身份证地址
+//     */
+//    @ApiOperation(value = "永诚API方式 - 身份证地址获取地区")
+//    @PostMapping("/addressGainArea")
+//    public HttpResult syncAccidentInsure(String address) {
+//        Map<String, String> ownerMap = insYongchengApiService.gainRegionCode(address);
+//
+//        if (null == ownerMap) {
+//            throw new SystemException("地区获取失败，请检查参数是否正确。");
+//
+//        }
+//
+//        return HttpResult.ok(ownerMap);
+//    }
+
     /**
-     * 获取地区 通过身份证地址
+     * 手动补传回调
      */
-    @ApiOperation(value = "永诚API方式 - 身份证地址获取地区")
-    @PostMapping("/addressGainArea")
-    public HttpResult syncAccidentInsure(String address) {
-        Map<String, String> ownerMap = insYongchengApiService.gainRegionCode(address);
-
-        if (null == ownerMap) {
-            throw new SystemException("地区获取失败，请检查参数是否正确。");
-
-        }
-
-        return HttpResult.ok(ownerMap);
+    @ApiOperation(value = "永诚API方式 - 同步保司订单状态")
+    @GetMapping("/syncInsOrderStatus")
+    public HttpResult syncInsOrderStatus() {
+        insYongchengApiService.callbackAnOrder();
+        return HttpResult.ok();
     }
 
 

src/main/java/com/ydtech/modules/ins/model/vo/RiskInfoVo.java

@@ -23,6 +23,7 @@ public class RiskInfoVo {
     @CheckDateTime(message = "起保日期的正确格式为yyyy-MM-dd HH:mm:ss")
     private String endDate;
 
+    //注释添加 是否即使起保 1:是即使  空为否   lig 2023-10-07
     private String instantFlag;
 
     public double getAmount() {
@@ -72,4 +73,4 @@ public class RiskInfoVo {
     public void setInstantFlag(String instantFlag) {
         this.instantFlag = instantFlag;
     }
-}
+}

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -283,19 +283,20 @@ public class YcBuildData {
 
 
         //交强险出险字符串
-        StringBuffer ciSB = new StringBuffer("交强险-");
+        StringBuffer ciSB = new StringBuffer("交强险-【无法获取】");
         //商业险出险字符串
-        StringBuffer biSB = new StringBuffer("商业险-");
-        if (null != rd.getVehicleAdjust()) {
-            //交强险过往出险记录
-            String jQRecordDanger = StringUtils.toString(rd.getVehicleAdjust().getJQRecordDanger(),"");
-            ciSB.append("交强险过往出险记录：");
-            ciSB.append(jQRecordDanger);
-        }
+        StringBuffer biSB = new StringBuffer();
+//        if (null != rd.getVehicleAdjust()) {
+//            //交强险过往出险记录
+//            String jQRecordDanger = StringUtils.toString(rd.getVehicleAdjust().getJQRecordDanger(),"");
+//            ciSB.append("交强险过往出险记录：");
+//            ciSB.append(jQRecordDanger);
+//        }
 
         if (null != rd.getPrmCoef()) {
             //商业险   连续承保期间出险次数
             int nClaimTimes = StringUtils.toInt(rd.getPrmCoef().getNClaimTimes());
+            biSB.append(",商业险-");
             biSB.append("连续承保期间出险次数：");
             biSB.append(nClaimTimes);
 
@@ -305,7 +306,7 @@ public class YcBuildData {
         }
 
         //出险信息
-        quoteRespVo.setAccidentInfoStr(String.format("%s , %s", ciSB.toString(), biSB.toString()));
+        quoteRespVo.setAccidentInfoStr(String.format("%s%s", ciSB.toString(), biSB.toString()));
 
         //平台返回信息
         if (null != rd.getTfiWarnList()) {

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -156,8 +156,6 @@ public class Ruote {
      * @date: 2023年02月08日 0008
      */
     public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, YcConfigureParameters ycConfigureParameters, InsAlltrustRequestApiComponents apiComponents, AccidentalDrivingVo adVo) {
-//    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml, Agent agent, InsAlltrustRequestApiComponents apiComponents, AccidentalDrivingVo adVo) {
-//    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml,Agent agent) {
 
         Ruote m = new Ruote();
         Ruote.RequestLabel requestLabel = new Ruote.RequestLabel();
@@ -177,7 +175,6 @@ public class Ruote {
 
 
 
-
         /**
          * 基本信息 base
          */

src/main/java/com/ydtech/modules/ins/scheduler/InsOrderScheduler.java

@@ -46,25 +46,25 @@ public class InsOrderScheduler {
 
 
 
-//    /**
-//     * 永诚定时任务
-//     * 补传回调
-//     * 每隔300秒执行
-//     * fixedRate / 1000  = 秒
-//     *
-//     * #：0 0/5 7,22 * * ?  7点到22点 每隔5分钟执行
-//     *
-//     */
-////    @Scheduled(fixedRate = 300000)
-////    @Scheduled(cron = "0 0/5 7,22 * * ? ")
-//    @Scheduled(cron = "0 0/5 * * * ?")
-//    public void alltrustCallbackTask() {
-////        logger.info("【定时任务执行 - 永城 - 补传回调】开始时间：" + dateFormat.format(new Date()) + "");
-//
-//        insYongchengApiService.callbackAnOrder();
-//
-////        logger.info("【定时任务执行 - 永城 - 补传回调】结束时间：" + dateFormat.format(new Date())+ "" );
-//    }
+    /**
+     * 永诚定时任务
+     * 补传回调
+     * 每隔300秒执行
+     * fixedRate / 1000  = 秒
+     *
+     * #：0 0/5 7,22 * * ?  7点到22点 每隔5分钟执行
+     *
+     */
+//    @Scheduled(fixedRate = 300000)
+//    @Scheduled(cron = "0 0/5 7,22 * * ? ")
+    @Scheduled(cron = "0 0/5 * * * ?")
+    public void alltrustCallbackTask() {
+//        logger.info("【定时任务执行 - 永城 - 补传回调】开始时间：" + dateFormat.format(new Date()) + "");
+
+        insYongchengApiService.callbackAnOrder();
+
+//        logger.info("【定时任务执行 - 永城 - 补传回调】结束时间：" + dateFormat.format(new Date())+ "" );
+    }
 
 
     /**

src/main/java/com/ydtech/modules/ins/service/InsAlltrustApiService.java

@@ -99,13 +99,13 @@ public interface InsAlltrustApiService {
     HttpResult getPolicyPrintApi(PolicyPrintVo policyPrintVo);
 
 
-    /**
-     * 获取地区编码   通过身份证地址
-     *
-     * @author: lig
-     * @date: 2023年04月12日 0012
-     */
-    Map<String, String> gainRegionCode(String address);
+//    /**
+//     * 获取地区编码   通过身份证地址
+//     *
+//     * @author: lig
+//     * @date: 2023年04月12日 0012
+//     */
+//    Map<String, String> gainRegionCode(String address);
 
 
 //

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -1690,51 +1690,51 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
     }
 
 
-    @Override
-    public Map<String, String> gainRegionCode(String address) {
-
-        log.debug("*********永诚API方式 - 身份证地址解析 参数：" + address);
-        Map<String, String> m = IDCardUtils.addressResolution(address);
-        if (null == m) return null;
-        String city = m.get("city");
-        String district = m.get("district");
-//        if(StringUtils.isNullOrEmpty(district)){
-//            //第二级赋值到第三级
-//            district = city;
+//    @Override
+//    public Map<String, String> gainRegionCode(String address) {
+//
+//        log.debug("*********永诚API方式 - 身份证地址解析 参数：" + address);
+//        Map<String, String> m = IDCardUtils.addressResolution(address);
+//        if (null == m) return null;
+//        String city = m.get("city");
+//        String district = m.get("district");
+////        if(StringUtils.isNullOrEmpty(district)){
+////            //第二级赋值到第三级
+////            district = city;
+////        }
+//
+//        List<InsAlltrustRegion> areaList = new ArrayList<>();
+//        if (StringUtils.isNotEmpty(district)) {
+//            //查询地区
+//            LambdaQueryWrapper<InsAlltrustRegion> lqw = new LambdaQueryWrapper<>();
+//            lqw.eq(InsAlltrustRegion::getArea, district);
+//            areaList = insAlltrustRegionMapper.selectList(lqw);
 //        }
-
-        List<InsAlltrustRegion> areaList = new ArrayList<>();
-        if (StringUtils.isNotEmpty(district)) {
-            //查询地区
-            LambdaQueryWrapper<InsAlltrustRegion> lqw = new LambdaQueryWrapper<>();
-            lqw.eq(InsAlltrustRegion::getArea, district);
-            areaList = insAlltrustRegionMapper.selectList(lqw);
-        }
-
-
-        //如果地区查不到 用城市当地区查
-        if (null == areaList || areaList.size() < 1) {
-            LambdaQueryWrapper<InsAlltrustRegion> cityLqw = new LambdaQueryWrapper<>();
-            cityLqw.eq(InsAlltrustRegion::getArea, city);
-            areaList = insAlltrustRegionMapper.selectList(cityLqw);
-        }
-        //如果地区查不到 用城市当地区查
-        if (null == areaList || areaList.size() < 1) {
-            LambdaQueryWrapper<InsAlltrustRegion> cityLqw = new LambdaQueryWrapper<>();
-            cityLqw.eq(InsAlltrustRegion::getArea, city);
-            areaList = insAlltrustRegionMapper.selectList(cityLqw);
-        }
-
-
-        if (null != areaList && areaList.size() > 0) {
-            Map rMap = new HashMap();
-            rMap.put("provinceCode", areaList.get(0).getProvinceCode());
-            rMap.put("cityCode", areaList.get(0).getCityCode());
-            rMap.put("areaCode", areaList.get(0).getAreaCode());
-            return rMap;
-        }
-        return null;
-    }
+//
+//
+//        //如果地区查不到 用城市当地区查
+//        if (null == areaList || areaList.size() < 1) {
+//            LambdaQueryWrapper<InsAlltrustRegion> cityLqw = new LambdaQueryWrapper<>();
+//            cityLqw.eq(InsAlltrustRegion::getArea, city);
+//            areaList = insAlltrustRegionMapper.selectList(cityLqw);
+//        }
+//        //如果地区查不到 用城市当地区查
+//        if (null == areaList || areaList.size() < 1) {
+//            LambdaQueryWrapper<InsAlltrustRegion> cityLqw = new LambdaQueryWrapper<>();
+//            cityLqw.eq(InsAlltrustRegion::getArea, city);
+//            areaList = insAlltrustRegionMapper.selectList(cityLqw);
+//        }
+//
+//
+//        if (null != areaList && areaList.size() > 0) {
+//            Map rMap = new HashMap();
+//            rMap.put("provinceCode", areaList.get(0).getProvinceCode());
+//            rMap.put("cityCode", areaList.get(0).getCityCode());
+//            rMap.put("areaCode", areaList.get(0).getAreaCode());
+//            return rMap;
+//        }
+//        return null;
+//    }
 
 
     private void buildRegion(Ruote m, BaseQuoteInfoVo yaQuoteInfoVo) {

src/main/java/com/ydtech/modules/order/controller/ZhongMeiOrderApiController.java

@@ -19,10 +19,7 @@ import com.ydtech.modules.order.utils.AESUtilsWithDataBase;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -73,6 +70,7 @@ public class ZhongMeiOrderApiController {
 
     @PostMapping("/getPolicyPrint")
     @ApiOperation(value = "电子保单")
+    @CrossOrigin
     public HttpResult<List<String>> getPolicyPrint(@RequestBody PolicyPrintVo policyPrintVo) {
         return this.zhongMeiOrderApiService.getPolicyPrint(policyPrintVo);
     }

src/main/java/com/ydtech/utils/HttpUtil.java

@@ -110,7 +110,7 @@ public class HttpUtil {
      * @date: 2023年08月14日 0014
      */
     public static String sendPost(String url,String bodyStr,Logger log,String apiName){
-        log.debug(apiName+"请求[post、json、body]参数："+bodyStr);
+        log.debug(apiName+"\n请求[post、json、body]参数："+bodyStr);
         HttpRequest request = HttpRequest.post(url)
                 .header("Content-Type", "application/json")//以json的方式传递
 //　　　　　.header("authorization","Bearer abcdefghijklmnopqrstuvwxyz")
@@ -118,7 +118,7 @@ public class HttpUtil {
 
         HttpResponse response = request.execute();
         String respStr = response.body();
-        log.debug(apiName+"返回[post、json、body]参数："+respStr);
+        log.debug(apiName+"\n返回[post、json、body]参数："+respStr);
 
         return respStr;
     }
@@ -220,6 +220,7 @@ public class HttpUtil {
     public static String sendPostFromFile(Part[] parts,String url){
         HttpClient httpClient = new HttpClient();
         PostMethod postMethod = new PostMethod(url);
+        postMethod.getParams().setContentCharset("UTF-8");
 //        postMethod.setParameter();
 
         String response = "";
@@ -232,6 +233,7 @@ public class HttpUtil {
                 response = postMethod.getResponseBodyAsString();
                 System.out.println("Upload successful. Response: " + response);
                 return response;
+//                return response;
             } else {
                 System.out.println("Upload failed. Status code: " + statusCode);
             }
@@ -282,7 +284,8 @@ public class HttpUtil {
         ;
 
 
-        File file = new File("D:/upload/image/2023/09/12/f27b4fe4e1fd4f2bfa57b5a560dc792d.jpg");
+//        File file = new File("D:/upload/image/2023/09/12/f27b4fe4e1fd4f2bfa57b5a560dc792d.jpg");
+        File file = new File("D:/upload/image/2023/09/25/87b4db2aa2e209b77923238e88088c2d.png");
 
         try {
 
@@ -290,7 +293,8 @@ public class HttpUtil {
 
 
             Part[] parts = { new FilePart("file", file)
-                    ,new StringPart("businessNo","T233075000507000205")
+                    ,new StringPart("businessNo","T233075000507000225")
+//                    ,new StringPart("businessNo","T233075000507000205")
                     ,new StringPart("operatorCode","S3000032")
                     ,new StringPart("comCode","307500A3")
                     ,new StringPart("fileGroup","DZ")

src/main/java/com/ydtech/utils/HttpXmlUtil.java

@@ -41,7 +41,7 @@ public class HttpXmlUtil {
     public static String sendPost(String url, String xmlString) {
         System.out.println("请求参数=" + xmlString);
         System.out.println("请求参数=" + XMLFormat.format(xmlString));
-        Response response;
+        Response response = null;
         String responseString = null;
         try {
 
@@ -66,6 +66,8 @@ public class HttpXmlUtil {
             }
         } catch (Exception e) {
             e.printStackTrace();
+        } finally {
+            response.close();
         }
 
         System.out.println("返回参数=" + responseString);
@@ -89,88 +91,89 @@ public class HttpXmlUtil {
     }
 
 
-    /**
-     * 发送xml请求到server端
-     *
-     * @param url       xml请求数据地址
-     * @param xmlString 发送的xml数据流
-     * @return map   key:requestData  key:responseData
-     */
-    public static InsApiLog sendXmlPost(String url, String xmlString) {
-
-        System.out.println("请求参数=" + xmlString);
-        log.debug("XML请求url:{},请求参数:{}", url, xmlString);
-        InsApiLog lon = new InsApiLog();
-
-        lon.setUrl(url);
-        lon.setRequestData(xmlString);
-        Response response;
-        String responseString = null;
-        try {
-
-            OkHttpClient client = new OkHttpClient.Builder()
-                    .connectTimeout(60, TimeUnit.SECONDS)
-                    .writeTimeout(60, TimeUnit.SECONDS)
-                    .readTimeout(60, TimeUnit.SECONDS)
-                    .build();
-
-            MediaType mediaType = MediaType.parse("text/xml");
-            RequestBody body = RequestBody.create(mediaType, xmlString);
-            Request request = new Request.Builder()
-                    .url(url)
-                    .post(body)
-                    .addHeader("Content-Type", "text/xml")
-                    .addHeader("cache-control", "no-cache")
-                    .build();
-
-            response = client.newCall(request).execute();
-            if (response.isSuccessful()) {
-                responseString = response.body().string();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            lon.setExceptionMsg(e.getMessage());
-            return lon;
-        } finally {
-            System.out.println("返回参数=" + responseString);
-            log.debug("XML返回url:{},响应参数:{}", url, responseString);
-        }
-
-
-        String[] patterns = new String[]{
-                // This will remove empty elements that look like <ElementName/>
-                "\\s*<\\w+/>",
-                // This will remove empty elements that look like <ElementName></ElementName>
-                "\\s*<\\w+></\\w+>",
-                // This will remove empty elements that look like
-                // <ElementName>
-                // </ElementName>
-                "\\s*<\\w+>\n*\\s*</\\w+>"
-        };
-        for (String pattern : patterns) {
-            Matcher matcher = Pattern.compile(pattern).matcher(responseString);
-            responseString = matcher.replaceAll("");
-        }
+//    /**
+//     * 发送xml请求到server端
+//     *
+//     * @param url       xml请求数据地址
+//     * @param xmlString 发送的xml数据流
+//     * @return map   key:requestData  key:responseData
+//     */
+//    public static InsApiLog sendXmlPost(String url, String xmlString) {
+//
+//        System.out.println("请求参数=" + xmlString);
+//        log.debug("XML请求url:{},请求参数:{}", url, xmlString);
+//        InsApiLog lon = new InsApiLog();
+//
+//        lon.setUrl(url);
+//        lon.setRequestData(xmlString);
+//        Response response = null;
+//        String responseString = null;
+//        try {
+//
+//            OkHttpClient client = new OkHttpClient.Builder()
+//                    .connectTimeout(60, TimeUnit.SECONDS)
+//                    .writeTimeout(60, TimeUnit.SECONDS)
+//                    .readTimeout(60, TimeUnit.SECONDS)
+//                    .build();
+//
+//            MediaType mediaType = MediaType.parse("text/xml");
+//            RequestBody body = RequestBody.create(mediaType, xmlString);
+//            Request request = new Request.Builder()
+//                    .url(url)
+//                    .post(body)
+//                    .addHeader("Content-Type", "text/xml")
+//                    .addHeader("cache-control", "no-cache")
+//                    .build();
+//
+//            response = client.newCall(request).execute();
+//            if (response.isSuccessful()) {
+//                responseString = response.body().string();
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            lon.setExceptionMsg(e.getMessage());
+//            return lon;
+//        } finally {
+//            System.out.println("返回参数=" + responseString);
+//            response.close();
+//            log.debug("XML返回url:{},响应参数:{}", url, responseString);
+//        }
+//
+//
+//        String[] patterns = new String[]{
+//                // This will remove empty elements that look like <ElementName/>
+//                "\\s*<\\w+/>",
+//                // This will remove empty elements that look like <ElementName></ElementName>
+//                "\\s*<\\w+></\\w+>",
+//                // This will remove empty elements that look like
+//                // <ElementName>
+//                // </ElementName>
+//                "\\s*<\\w+>\n*\\s*</\\w+>"
+//        };
+//        for (String pattern : patterns) {
+//            Matcher matcher = Pattern.compile(pattern).matcher(responseString);
+//            responseString = matcher.replaceAll("");
+//        }
+//
+//        lon.setResponseData(responseString);
+//        return lon;
+//    }
 
-//        System.out.println("返回参数==" + responseString);
-        lon.setResponseData(responseString);
-        return lon;
-    }
 
     /**
-     * 发送xml请求到server端
+     * 发送xml请求到server端  最新
      *
      * @param url       xml请求数据地址
      * @param xmlString 发送的xml数据流
-     * @return map   key:requestData  key:responseData
+     * @return
      */
     public static String sendXmlPostReq(String url, String xmlString, Logger log,String textHead) {
 
 //        System.out.println("请求参数=" + xmlString);
         if(null != log) log.debug(textHead + "XML请求url:{},\n请求参数:{}", url, xmlString);
 
-        Response response;
         String responseString = null;
+        Response response = null;
         try {
 
             OkHttpClient client = new OkHttpClient.Builder()
@@ -193,28 +196,13 @@ public class HttpXmlUtil {
                 responseString = response.body().string();
             }
 
-            String[] patterns = new String[]{
-                    // This will remove empty elements that look like <ElementName/>
-                    "\\s*<\\w+/>",
-                    // This will remove empty elements that look like <ElementName></ElementName>
-                    "\\s*<\\w+></\\w+>",
-                    // This will remove empty elements that look like
-                    // <ElementName>
-                    // </ElementName>
-                    "\\s*<\\w+>\n*\\s*</\\w+>"
-            };
-            for (String pattern : patterns) {
-                Matcher matcher = Pattern.compile(pattern).matcher(responseString);
-                responseString = matcher.replaceAll("");
-            }
-
-
         } catch (Exception e) {
             e.printStackTrace();
+            log.error(textHead + "请求异常："+e.getMessage() + "，原始返回：" + response);
             throw new SystemException("远程接口请求失败，请联系管理员。");
         } finally {
-            System.out.println("返回参数=" + responseString);
-            if(null != log) log.debug(textHead + "XML返回url:{},\n响应参数:{}", url, responseString);
+            if(null != log) log.debug(textHead + "XML返回url:{},\n响应参数:{}", url, responseString.replaceAll("\n",""));
+            response.close();
         }
 
         return responseString;
@@ -224,42 +212,7 @@ public class HttpXmlUtil {
 
     }
 
-    public static String sendPost2(String url, String xmlString) {
-        System.out.println("请求参数=" + xmlString);
-        //创建httpclient工具对象
-        HttpClient client = new HttpClient();
-        //创建post请求方法
-        PostMethod myPost = new PostMethod(url);
-        //设置请求超时时间
-        client.setConnectionTimeout(3000 * 1000);
-        String responseString = null;
-        try {
-            //设置请求头部类型
-            myPost.setRequestHeader("Content-Type", "text/xml");
-            myPost.setRequestHeader("charset", "utf-8");
-            //设置请求体，即xml文本内容，一种是直接获取xml内容字符串，一种是读取xml文件以流的形式
-            myPost.setRequestBody(xmlString);
-            int statusCode = client.executeMethod(myPost);
-            //只有请求成功200了，才做处理
-            if (statusCode == HttpStatus.SC_OK) {
-                InputStream inputStream = myPost.getResponseBodyAsStream();
-                BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, "utf-8"));
-                StringBuffer stringBuffer = new StringBuffer();
-                String str = "";
-                while ((str = br.readLine()) != null) {
-                    stringBuffer.append(str);
-                }
-                responseString = stringBuffer.toString();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            myPost.releaseConnection();
-        }
-        System.out.println("返回参数=" + responseString);
 
-        return responseString;
-    }
 
 
     //报价返回
@@ -830,10 +783,10 @@ public class HttpXmlUtil {
             "&lt;/packet&gt;</response></ns2:dzbdUrlResponse></S:Body></S:Envelope>";
 
     private static String HHH = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns2:queryVehicleXnyQuotationServiceResponse xmlns:ns2=\"http://newWS.front.app.echannel.ebiz.alltrust.com/\"><response>&lt;?xml version='1.0' encoding='UTF-8'?&gt;\n" +
-            "&lt;responseMessage&gt;\n" +
-            "    &lt;Applicant&gt;\n" +
-            "        &lt;CAppNme&gt;乔佳飞&lt;/CAppNme&gt;\n" +
-            "        &lt;CAreaCde&gt;103132&lt;/CAreaCde&gt;\n" +
+            "&lt;responseMessage&gt;" +
+            "    &lt;Applicant&gt;" +
+            "        &lt;CAppNme&gt;乔佳飞&lt;/CAppNme&gt;" +
+            "        &lt;CAreaCde&gt;103132&lt;/CAreaCde&gt;" +
             "        &lt;CCertfCde&gt;140121198702020677&lt;/CCertfCde&gt;\n" +
             "        &lt;CCertfCls&gt;120001&lt;/CCertfCls&gt;\n" +
             "        &lt;CCity&gt;140100&lt;/CCity&gt;\n" +
@@ -1488,6 +1441,26 @@ public class HttpXmlUtil {
 //        String responseStr = FFF;
 //        String responseStr = GGG;
         String responseStr = HHH;
+        System.err.println("responseStr:"+responseStr.replaceAll("\n",""));
+        String s0 = responseStr.replaceAll("\n","");
+//        System.err.println("responseStrForm:"+s0);
+        String s1 = s0.replaceAll("&lt;","<");
+        System.err.println("responseStrForm:"+s1.replaceAll("&gt;",">"));
+
+        String[] patterns = new String[]{
+                // This will remove empty elements that look like <ElementName/>
+                "\\s*<\\w+/>",
+                // This will remove empty elements that look like <ElementName></ElementName>
+                "\\s*<\\w+></\\w+>",
+                // This will remove empty elements that look like
+                // <ElementName>
+                // </ElementName>
+                "\\s*<\\w+>\n*\\s*</\\w+>"
+        };
+        for (String pattern : patterns) {
+            Matcher matcher = Pattern.compile(pattern).matcher(responseStr);
+//            System.err.println("matcher:"+matcher.replaceAll(""));
+        }
 
         String str = YcBuildData.cleanResponseStr(responseStr);
 

src/main/resources/logback-spring.xml

@@ -106,7 +106,7 @@
     <!-- 永诚日志输出 -->
     <appender name="custom_alltrust" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/sys-alltrust.log</file>
+        <file>${log.path}/alltrust/sys-alltrust.log</file>
         <!--日志文件输出格式-->
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -119,7 +119,7 @@
 
             <!--            <fileNamePattern>${log.path}/sys-alltrust.%d{yyyy-MM-dd}.log</fileNamePattern>-->
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
+                <maxFileSize>50MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
             <maxHistory>30</maxHistory>
@@ -150,7 +150,7 @@
     <!-- 国任日志输出 -->
     <appender name="custom_guoRen" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/sys-guoRen.log</file>
+        <file>${log.path}/guoRen/sys-guoRen.log</file>
         <!--日志文件输出格式-->
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -211,6 +211,7 @@
             <appender-ref ref="file_debug"/>
             <!--报价保险公司-->
             <appender-ref ref="insureInfo"/>
+<!--            <appender-ref ref="custom_guoRen"/>-->
             <!--            <appender-ref ref="custom_alltrust" />-->
         </root>
     </springProfile>