Merge branch 'release' into test

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

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

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

@@ -516,7 +516,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                             result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map);
                         } else if (OrderInfoEnum.SYS_SOURCE_SNYXX.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("authorization",baseServiceConfig.getYxKey());
+                            result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map);
                         }
                     } else {
                         result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap);