Merge branch 'release' into test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java

@@ -289,6 +289,9 @@ public class BaseServiceConfig{
     @Value("${order.push.po.url:}")
     private String poUrl;
 
+    @Value("${order.push.po.ecKey:}")
+    private String ecKey;
+
     /**
      * 调用山能PO username
      */

order-management-common/src/main/java/com/dxhy/order/utils/HttpUtils.java

@@ -78,6 +78,16 @@ public class HttpUtils {
         log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
         return body;
     }
+
+    public static String sendPoWithHead(String url, String request,String userName,String password,Map<String, String> header) {
+        long startTime = System.currentTimeMillis();
+        HttpRequest httpRequest = new HttpRequest(url);
+        httpRequest.basicAuth(userName,password);
+        String body = httpRequest.addHeaders(header).body(request).timeout(300000).execute().body();
+        long endTime = System.currentTimeMillis();
+        log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime);
+        return body;
+    }
     /**
      * 上传文件
      *

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java

@@ -441,7 +441,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                             result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword());
                         } else if (OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isNotBlank(pushInfo.getByzd1())
                                 && pushInfo.getByzd1().equals(orderProcessInfo.getXtly())) {
-                            result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword());
+                            Map map = Maps.newHashMap();
+                            map.put("ec-key",baseServiceConfig.getEcKey());
+                            result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map);
                         }
                     } else {
                         result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap);