diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index 7a41e74..b854962 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.7 + 2.14.8 4.0.0 pay-java-wx diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java index 3170155..8de33ec 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayService.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.stream.Collectors; import org.apache.http.HttpEntity; +import org.apache.http.message.BasicHeader; import static com.egzosn.pay.wx.api.WxConst.OUT_TRADE_NO; import static com.egzosn.pay.wx.api.WxConst.SANDBOXNEW; @@ -41,6 +42,7 @@ import com.egzosn.pay.common.bean.TransferOrder; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.common.http.HttpStringEntity; import com.egzosn.pay.common.http.ResponseEntity; import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.DateUtils; @@ -334,6 +336,18 @@ public class WxPayService extends BasePayService implements return RSA2.sign(content, privateKey, characterEncoding); } + /** + * http 实体 钩子 + * + * @param entity 实体 + * @return 返回处理后的实体 + */ + @Override + public HttpStringEntity hookHttpEntity(HttpStringEntity entity) { + entity.addHeader(new BasicHeader(WxConst.WECHATPAY_SERIAL, payConfigStorage.getCertEnvironment().getPlatformSerialNumber())); + return entity; + } + /** * 将请求参数或者请求流转化为 Map * diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java index d4bc919..71d6abb 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java @@ -120,17 +120,7 @@ public class WxProfitSharingService extends WxPayService implements ProfitSharin return getAssistService().doExecute(parameters, order); } - /** - * http 实体 钩子 - * - * @param entity 实体 - * @return 返回处理后的实体 - */ - @Override - public HttpStringEntity hookHttpEntity(HttpStringEntity entity) { - entity.addHeader(new BasicHeader(WxConst.WECHATPAY_SERIAL, payConfigStorage.getCertEnvironment().getPlatformSerialNumber())); - return entity; - } + /** * 返回创建的订单信息 diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/WxConst.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/WxConst.java index bbd311d..f8d274d 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/WxConst.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/WxConst.java @@ -39,7 +39,7 @@ public final class WxConst { public static final String TYPE = "type"; public static final String ACCOUNT = "account"; public static final String NAME = "name"; - public static final String RELATION_TYPE = "relationType"; + public static final String RELATION_TYPE = "relation_type"; public static final String CUSTOM_RELATION = "customRelation"; public static final String DESCRIPTION = "description"; public static final String BILL_DATE = "bill_date";