1. 永诚日志增加目录整理。

  2. 永诚增加调试请求返回null问题。

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

@@ -104,7 +104,7 @@ public class HttpXmlUtil {
 
         lon.setUrl(url);
         lon.setRequestData(xmlString);
-        Response response;
+        Response response = null;
         String responseString = null;
         try {
 
@@ -133,6 +133,7 @@ public class HttpXmlUtil {
             return lon;
         } finally {
             System.out.println("返回参数=" + responseString);
+            response.close();
             log.debug("XML返回url:{},响应参数:{}", url, responseString);
         }
 
@@ -162,15 +163,15 @@ public class HttpXmlUtil {
      *
      * @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 +194,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);
+            response.close();
         }
 
         return responseString;
@@ -224,42 +210,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 +781,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 +1439,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>