diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java index 54d16bd9..61726e04 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.coupon; -import com.github.binarywang.wxpay.bean.request.WxPayBaseRequest; +import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.*; import me.chanjar.weixin.common.annotation.Required; @@ -19,7 +19,7 @@ import me.chanjar.weixin.common.annotation.Required; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayCouponInfoQueryRequest extends WxPayBaseRequest { +public class WxPayCouponInfoQueryRequest extends BaseWxPayRequest { /** *
* 字段名:代金券id diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java index f7d91383..90bafc78 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.coupon; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayCouponInfoQueryResult extends WxPayBaseResult { +public class WxPayCouponInfoQueryResult extends BaseWxPayResult { /** ** 字段名:设备号. diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java index 63b891d8..d6d9f73d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.coupon; -import com.github.binarywang.wxpay.bean.request.WxPayBaseRequest; +import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.*; import me.chanjar.weixin.common.annotation.Required; @@ -20,7 +20,7 @@ import me.chanjar.weixin.common.annotation.Required; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayCouponSendRequest extends WxPayBaseRequest { +public class WxPayCouponSendRequest extends BaseWxPayRequest { /** ** 字段名:代金券批次id diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java index fe26342e..314845e4 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.coupon; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayCouponSendResult extends WxPayBaseResult { +public class WxPayCouponSendResult extends BaseWxPayResult { /** ** 字段名:设备号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java index c7b812d8..c7f7cadf 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.coupon; -import com.github.binarywang.wxpay.bean.request.WxPayBaseRequest; +import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.*; import me.chanjar.weixin.common.annotation.Required; @@ -20,7 +20,7 @@ import me.chanjar.weixin.common.annotation.Required; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayCouponStockQueryRequest extends WxPayBaseRequest { +public class WxPayCouponStockQueryRequest extends BaseWxPayRequest { /** ** 字段名:代金券批次id diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java index 2f97618e..c4bbc705 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.coupon; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.AllArgsConstructor; import lombok.Data; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayCouponStockQueryResult extends WxPayBaseResult { +public class WxPayCouponStockQueryResult extends BaseWxPayResult { /** ** 字段名:设备号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java index 8cb94ee0..c9bce250 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.notify; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.github.binarywang.wxpay.converter.WxPayOrderNotifyResultConverter; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -25,7 +25,7 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializable { +public class WxPayOrderNotifyResult extends BaseWxPayResult implements Serializable { private static final long serialVersionUID = 5389718115223345496L; /** diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java index 7006c752..94e8492b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.notify; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.github.binarywang.wxpay.exception.WxPayException; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -31,7 +31,7 @@ import java.security.MessageDigest; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayRefundNotifyResult extends WxPayBaseResult implements Serializable { +public class WxPayRefundNotifyResult extends BaseWxPayResult implements Serializable { private static final long serialVersionUID = 4651725860079259186L; /** @@ -41,7 +41,7 @@ public class WxPayRefundNotifyResult extends WxPayBaseResult implements Serializ * @param mchKey 商户密钥 */ public static WxPayRefundNotifyResult fromXML(String xmlString, String mchKey) throws WxPayException { - WxPayRefundNotifyResult result = WxPayBaseResult.fromXML(xmlString, WxPayRefundNotifyResult.class); + WxPayRefundNotifyResult result = BaseWxPayResult.fromXML(xmlString, WxPayRefundNotifyResult.class); String reqInfoString = result.getReqInfoString(); try { Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java index 6d08136d..01435c32 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxScanPayNotifyResult.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.bean.notify; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor -public class WxScanPayNotifyResult extends WxPayBaseResult implements Serializable { +public class WxScanPayNotifyResult extends BaseWxPayResult implements Serializable { private static final long serialVersionUID = 3381324564266118986L; /** diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java similarity index 99% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java index 7147adfe..805517ee 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java @@ -25,7 +25,7 @@ import static com.github.binarywang.wxpay.constant.WxPayConstants.SignType.ALL_S * @author Binary Wang */ @Data -public abstract class WxPayBaseRequest { +public abstract class BaseWxPayRequest { /** ** 字段名:公众账号ID diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayQueryRequest.java index 5d48bb44..e7b240db 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayQueryRequest.java @@ -26,7 +26,7 @@ import me.chanjar.weixin.common.util.ToStringUtils; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxEntPayQueryRequest extends WxPayBaseRequest { +public class WxEntPayQueryRequest extends BaseWxPayRequest { /** ** 商户订单号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java index ac588aa5..a96402b2 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java @@ -20,7 +20,7 @@ import me.chanjar.weixin.common.util.ToStringUtils; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxEntPayRequest extends WxPayBaseRequest { +public class WxEntPayRequest extends BaseWxPayRequest { /** ** 字段名:公众账号appid diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayAuthcode2OpenidRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayAuthcode2OpenidRequest.java index 1187bf8d..3b156407 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayAuthcode2OpenidRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayAuthcode2OpenidRequest.java @@ -17,7 +17,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayAuthcode2OpenidRequest extends WxPayBaseRequest { +public class WxPayAuthcode2OpenidRequest extends BaseWxPayRequest { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDefaultRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDefaultRequest.java index ff36bfaa..d37ed7ff 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDefaultRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDefaultRequest.java @@ -11,7 +11,7 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; * @author Binary Wang */ @XStreamAlias("xml") -public class WxPayDefaultRequest extends WxPayBaseRequest { +public class WxPayDefaultRequest extends BaseWxPayRequest { @Override protected void checkConstraints() { //do nothing diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java index 6dc7264b..e616224d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java @@ -24,7 +24,7 @@ import java.util.Arrays; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayDownloadBillRequest extends WxPayBaseRequest { +public class WxPayDownloadBillRequest extends BaseWxPayRequest { private static final String[] BILL_TYPES = new String[]{BillType.ALL, BillType.SUCCESS, BillType.REFUND, BillType.RECHARGE_REFUND}; private static final String TAR_TYPE_GZIP = "GZIP"; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java index ed85fe76..b82f58e2 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java @@ -18,7 +18,7 @@ import me.chanjar.weixin.common.annotation.Required; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayMicropayRequest extends WxPayBaseRequest { +public class WxPayMicropayRequest extends BaseWxPayRequest { /** ** 商品描述 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java index 29650537..e430460e 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java @@ -17,7 +17,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayOrderCloseRequest extends WxPayBaseRequest { +public class WxPayOrderCloseRequest extends BaseWxPayRequest { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java index 4342fb95..1de4c681 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java @@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayOrderQueryRequest extends WxPayBaseRequest { +public class WxPayOrderQueryRequest extends BaseWxPayRequest { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java index db681791..5394631b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java @@ -19,7 +19,7 @@ import org.apache.commons.lang3.StringUtils; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayOrderReverseRequest extends WxPayBaseRequest { +public class WxPayOrderReverseRequest extends BaseWxPayRequest { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java index e1117b0b..33e2a212 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java @@ -19,7 +19,7 @@ import me.chanjar.weixin.common.annotation.Required; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayQueryCommentRequest extends WxPayBaseRequest { +public class WxPayQueryCommentRequest extends BaseWxPayRequest { /** ** 字段名:开始时间 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRedpackQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRedpackQueryRequest.java index e7b5f9c1..4bbee5aa 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRedpackQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRedpackQueryRequest.java @@ -23,7 +23,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayRedpackQueryRequest extends WxPayBaseRequest { +public class WxPayRedpackQueryRequest extends BaseWxPayRequest { /** * 商户订单号 * mch_billno diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java index e413377f..4df8a63d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java @@ -18,7 +18,7 @@ import org.apache.commons.lang3.StringUtils; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayRefundQueryRequest extends WxPayBaseRequest { +public class WxPayRefundQueryRequest extends BaseWxPayRequest { /** ** 设备号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java index 43bc51b4..d5510b6c 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java @@ -25,7 +25,7 @@ import java.util.Arrays; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayRefundRequest extends WxPayBaseRequest { +public class WxPayRefundRequest extends BaseWxPayRequest { private static final String[] REFUND_ACCOUNT = new String[]{ RefundAccountSource.RECHARGE_FUNDS, RefundAccountSource.UNSETTLED_FUNDS}; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayReportRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayReportRequest.java index 88532ad2..494ac1f3 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayReportRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayReportRequest.java @@ -24,7 +24,7 @@ import me.chanjar.weixin.common.annotation.Required; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayReportRequest extends WxPayBaseRequest { +public class WxPayReportRequest extends BaseWxPayRequest { /** ** 设备号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.java index bc621fc0..f97ade0c 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.java @@ -15,7 +15,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPaySendRedpackRequest extends WxPayBaseRequest { +public class WxPaySendRedpackRequest extends BaseWxPayRequest { /** * mch_billno * 商户订单号(每个订单号必须唯一) 组成:mch_id+yyyymmdd+10位一天内不能重复的数字。 接口根据商户订单号支持重入,如出现超时可再调用。 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayShorturlRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayShorturlRequest.java index 3cc9302b..87ac4105 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayShorturlRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayShorturlRequest.java @@ -17,7 +17,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayShorturlRequest extends WxPayBaseRequest { +public class WxPayShorturlRequest extends BaseWxPayRequest { /** ** URL链接 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java index c2bc9f45..de299928 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUtils; @NoArgsConstructor @AllArgsConstructor @XStreamAlias("xml") -public class WxPayUnifiedOrderRequest extends WxPayBaseRequest { +public class WxPayUnifiedOrderRequest extends BaseWxPayRequest { /** ** 字段名:设备号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java similarity index 95% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java index 1e0527eb..b238375b 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java @@ -1,7 +1,7 @@ package com.github.binarywang.wxpay.bean.result; import com.github.binarywang.wxpay.exception.WxPayException; -import com.github.binarywang.wxpay.service.impl.WxPayServiceAbstractImpl; +import com.github.binarywang.wxpay.service.impl.BaseWxPayServiceImpl; import com.github.binarywang.wxpay.util.SignUtils; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -38,7 +38,7 @@ import java.util.Map; * @author Binary Wang */ @Data -public abstract class WxPayBaseResult { +public abstract class BaseWxPayResult { /** * 返回状态码 */ @@ -121,7 +121,7 @@ public abstract class WxPayBaseResult { /** * 从xml字符串创建bean对象 */ - public staticT fromXML(String xmlString, Class clz) { + public static T fromXML(String xmlString, Class clz) { XStream xstream = XStreamInitializer.getInstance(); xstream.processAnnotations(clz); T result = (T) xstream.fromXML(xmlString); @@ -219,7 +219,7 @@ public abstract class WxPayBaseResult { * @param signType 签名类型 * @param checkSuccess 是否同时检查结果是否成功 */ - public void checkResult(WxPayServiceAbstractImpl wxPayService, String signType, boolean checkSuccess) throws WxPayException { + public void checkResult(BaseWxPayServiceImpl wxPayService, String signType, boolean checkSuccess) throws WxPayException { //校验返回结果签名 Map map = toMap(); if (getSign() != null && !SignUtils.checkSign(map, signType, wxPayService.getConfig().getMchKey())) { diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayQueryResult.java index b5a0e043..5d0f4c03 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayQueryResult.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxEntPayQueryResult extends WxPayBaseResult { +public class WxEntPayQueryResult extends BaseWxPayResult { /** * 商户订单号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayResult.java index 033f6e96..490d072d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxEntPayResult.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxEntPayResult extends WxPayBaseResult { +public class WxEntPayResult extends BaseWxPayResult { /** * 商户appid diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java index 3f1d53a7..fafcae90 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayAuthcode2OpenidResult.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayAuthcode2OpenidResult extends WxPayBaseResult { +public class WxPayAuthcode2OpenidResult extends BaseWxPayResult { /** * * 用户标识 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java index 8c99c9df..242a30a1 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayCommonResult.java @@ -12,5 +12,5 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; */ @XStreamAlias("xml") -public class WxPayCommonResult extends WxPayBaseResult { +public class WxPayCommonResult extends BaseWxPayResult { } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java index 4f6b04cf..87aad5f4 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayMicropayResult extends WxPayBaseResult { +public class WxPayMicropayResult extends BaseWxPayResult { /** ** 用户标识 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java index 5451c853..a71c8ab7 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderCloseResult.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayOrderCloseResult extends WxPayBaseResult { +public class WxPayOrderCloseResult extends BaseWxPayResult { /** * 业务结果描述 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java index 9da15f5a..671aca97 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java @@ -25,7 +25,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayOrderQueryResult extends WxPayBaseResult { +public class WxPayOrderQueryResult extends BaseWxPayResult { /** *设备号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java index bf36764f..57813992 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderReverseResult.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayOrderReverseResult extends WxPayBaseResult { +public class WxPayOrderReverseResult extends BaseWxPayResult { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java index 84030f17..fb26038f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java @@ -23,7 +23,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayRedpackQueryResult extends WxPayBaseResult { +public class WxPayRedpackQueryResult extends BaseWxPayResult { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java index 1c7b0da4..65514a72 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundQueryResult.java @@ -18,7 +18,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayRefundQueryResult extends WxPayBaseResult { +public class WxPayRefundQueryResult extends BaseWxPayResult { /** ** 字段名:设备号. diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java index 2da31a37..5dde2c90 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRefundResult.java @@ -19,7 +19,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayRefundResult extends WxPayBaseResult implements Serializable { +public class WxPayRefundResult extends BaseWxPayResult implements Serializable { private static final long serialVersionUID = 1L; @XStreamAlias("device_info") diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java index 792e00fd..cf3f9355 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySandboxSignKeyResult.java @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPaySandboxSignKeyResult extends WxPayBaseResult { +public class WxPaySandboxSignKeyResult extends BaseWxPayResult { /** *diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java index 560721f5..2855daef 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java @@ -17,7 +17,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPaySendRedpackResult extends WxPayBaseResult implements Serializable { +public class WxPaySendRedpackResult extends BaseWxPayResult implements Serializable { private static final long serialVersionUID = -4837415036337132073L; @XStreamAlias("mch_billno") diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java index 93e74a0c..1937004f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayShorturlResult.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayShorturlResult extends WxPayBaseResult { +public class WxPayShorturlResult extends BaseWxPayResult { /** ** URL链接 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java index 4f25421f..cf97f75a 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @XStreamAlias("xml") -public class WxPayUnifiedOrderResult extends WxPayBaseResult { +public class WxPayUnifiedOrderResult extends BaseWxPayResult { /** * 微信生成的预支付回话标识,用于后续接口调用中使用,该值有效期为2小时 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java index fe35ed21..0498520a 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java @@ -57,11 +57,11 @@ public class WxPayOrderNotifyResultConverter extends AbstractReflectionConverter @Override protected void marshallField(MarshallingContext context, Object newObj, Field field) { - if (field.getName().equals("couponList")) { + if ("couponList".equals(field.getName())) { return; - } else { - super.marshallField(context, newObj, field); } + + super.marshallField(context, newObj, field); } @Override diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java index 948c7a49..5c7335d1 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/exception/WxPayException.java @@ -1,6 +1,6 @@ package com.github.binarywang.wxpay.exception; -import com.github.binarywang.wxpay.bean.result.WxPayBaseResult; +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; import com.google.common.base.Joiner; /** @@ -60,7 +60,7 @@ public class WxPayException extends Exception { xmlString = builder.xmlString; } - public static WxPayException from(WxPayBaseResult payBaseResult) { + public static WxPayException from(BaseWxPayResult payBaseResult) { return WxPayException.newBuilder() .xmlString(payBaseResult.getXmlString()) .returnMsg(payBaseResult.getReturnMsg()) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java similarity index 92% rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java index d30ac9b5..f3e11d87 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java @@ -11,7 +11,6 @@ import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult; import com.github.binarywang.wxpay.bean.request.*; import com.github.binarywang.wxpay.bean.result.*; import com.github.binarywang.wxpay.config.WxPayConfig; -import com.github.binarywang.wxpay.constant.WxPayConstants; import com.github.binarywang.wxpay.constant.WxPayConstants.BillType; import com.github.binarywang.wxpay.constant.WxPayConstants.SignType; import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType; @@ -21,26 +20,10 @@ import com.github.binarywang.wxpay.util.SignUtils; import com.google.common.base.Joiner; import com.google.common.collect.Maps; import jodd.io.ZipUtil; -import jodd.util.Base64; import org.apache.commons.lang3.StringUtils; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.CredentialsProvider; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.conn.ssl.DefaultHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.net.ssl.SSLContext; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -61,7 +44,7 @@ import static com.github.binarywang.wxpay.constant.WxPayConstants.TarType; * * @author Binary Wang */ -public abstract class WxPayServiceAbstractImpl implements WxPayService { +public abstract class BaseWxPayServiceImpl implements WxPayService { private static final String PAY_BASE_URL = "https://api.mch.weixin.qq.com"; protected final Logger log = LoggerFactory.getLogger(this.getClass()); protected static ThreadLocal*/ -public class WxPayBaseResultTest { +public class BaseWxPayResultTest { @Test public void testGetXmlValue() throws Exception { diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java similarity index 99% rename from weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java rename to weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java index 819cd2d2..0c57d1de 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java @@ -38,7 +38,7 @@ import static org.testng.Assert.*; */ @Test @Guice(modules = ApiTestModule.class) -public class WxPayServiceAbstractImplTest { +public class BaseWxPayServiceImplTest { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @InjectwxApiData = new ThreadLocal<>(); @@ -112,7 +95,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/secapi/pay/refund"; String responseContent = this.post(url, request.toXML(), true); - WxPayRefundResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundResult.class); + WxPayRefundResult result = BaseWxPayResult.fromXML(responseContent, WxPayRefundResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -130,7 +113,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/pay/refundquery"; String responseContent = this.post(url, request.toXML(), false); - WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class); + WxPayRefundQueryResult result = BaseWxPayResult.fromXML(responseContent, WxPayRefundQueryResult.class); result.composeRefundRecords(); result.checkResult(this, request.getSignType(), true); return result; @@ -184,7 +167,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String responseContent = this.post(url, request.toXML(), true); //无需校验,因为没有返回签名信息 - return WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class); + return BaseWxPayResult.fromXML(responseContent, WxPaySendRedpackResult.class); } @Override @@ -196,7 +179,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo"; String responseContent = this.post(url, request.toXML(), true); - WxPayRedpackQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRedpackQueryResult.class); + WxPayRedpackQueryResult result = BaseWxPayResult.fromXML(responseContent, WxPayRedpackQueryResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -214,7 +197,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { throw new WxPayException("无响应结果"); } - WxPayOrderQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderQueryResult.class); + WxPayOrderQueryResult result = BaseWxPayResult.fromXML(responseContent, WxPayOrderQueryResult.class); result.composeCoupons(); result.checkResult(this, request.getSignType(), true); return result; @@ -232,7 +215,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/pay/closeorder"; String responseContent = this.post(url, request.toXML(), false); - WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class); + WxPayOrderCloseResult result = BaseWxPayResult.fromXML(responseContent, WxPayOrderCloseResult.class); result.checkResult(this, request.getSignType(), true); return result; @@ -314,7 +297,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/pay/unifiedorder"; String responseContent = this.post(url, request.toXML(), false); - WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class); + WxPayUnifiedOrderResult result = BaseWxPayResult.fromXML(responseContent, WxPayUnifiedOrderResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -374,7 +357,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/mmpaymkttransfers/promotion/transfers"; String responseContent = this.post(url, request.toXML(), true); - WxEntPayResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayResult.class); + WxEntPayResult result = BaseWxPayResult.fromXML(responseContent, WxEntPayResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -387,7 +370,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gettransferinfo"; String responseContent = this.post(url, request.toXML(), true); - WxEntPayQueryResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayQueryResult.class); + WxEntPayQueryResult result = BaseWxPayResult.fromXML(responseContent, WxEntPayQueryResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -440,7 +423,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/payitil/report"; String responseContent = this.post(url, request.toXML(), false); - WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class); + WxPayCommonResult result = BaseWxPayResult.fromXML(responseContent, WxPayCommonResult.class); result.checkResult(this, request.getSignType(), true); } @@ -466,7 +449,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { } else { responseContent = this.post(url, request.toXML(), false); if (responseContent.startsWith("<")) { - throw WxPayException.from(WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class)); + throw WxPayException.from(BaseWxPayResult.fromXML(responseContent, WxPayCommonResult.class)); } } @@ -492,7 +475,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { return Joiner.on("\n").join(allLines); } catch (ZipException e) { if (e.getMessage().contains("Not in GZIP format")) { - throw WxPayException.from(WxPayBaseResult.fromXML(new String(responseBytes, StandardCharsets.UTF_8), + throw WxPayException.from(BaseWxPayResult.fromXML(new String(responseBytes, StandardCharsets.UTF_8), WxPayCommonResult.class)); } else { this.log.error("解压zip文件出错", e); @@ -584,7 +567,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/pay/micropay"; String responseContent = this.post(url, request.toXML(), false); - WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class); + WxPayMicropayResult result = BaseWxPayResult.fromXML(responseContent, WxPayMicropayResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -595,7 +578,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/secapi/pay/reverse"; String responseContent = this.post(url, request.toXML(), true); - WxPayOrderReverseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderReverseResult.class); + WxPayOrderReverseResult result = BaseWxPayResult.fromXML(responseContent, WxPayOrderReverseResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -606,7 +589,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/tools/shorturl"; String responseContent = this.post(url, request.toXML(), false); - WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class); + WxPayShorturlResult result = BaseWxPayResult.fromXML(responseContent, WxPayShorturlResult.class); result.checkResult(this, request.getSignType(), true); return result.getShortUrl(); } @@ -622,7 +605,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/tools/authcodetoopenid"; String responseContent = this.post(url, request.toXML(), false); - WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class); + WxPayAuthcode2OpenidResult result = BaseWxPayResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class); result.checkResult(this, request.getSignType(), true); return result.getOpenid(); } @@ -639,7 +622,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey"; String responseContent = this.post(url, request.toXML(), false); - WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class); + WxPaySandboxSignKeyResult result = BaseWxPayResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class); result.checkResult(this, request.getSignType(), true); return result.getSandboxSignKey(); } @@ -650,7 +633,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/mmpaymkttransfers/send_coupon"; String responseContent = this.post(url, request.toXML(), true); - WxPayCouponSendResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponSendResult.class); + WxPayCouponSendResult result = BaseWxPayResult.fromXML(responseContent, WxPayCouponSendResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -661,7 +644,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/mmpaymkttransfers/query_coupon_stock"; String responseContent = this.post(url, request.toXML(), false); - WxPayCouponStockQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponStockQueryResult.class); + WxPayCouponStockQueryResult result = BaseWxPayResult.fromXML(responseContent, WxPayCouponStockQueryResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -672,7 +655,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String url = this.getPayBaseUrl() + "/mmpaymkttransfers/querycouponsinfo"; String responseContent = this.post(url, request.toXML(), false); - WxPayCouponInfoQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponInfoQueryResult.class); + WxPayCouponInfoQueryResult result = BaseWxPayResult.fromXML(responseContent, WxPayCouponInfoQueryResult.class); result.checkResult(this, request.getSignType(), true); return result; } @@ -703,7 +686,7 @@ public abstract class WxPayServiceAbstractImpl implements WxPayService { String responseContent = this.post(url, request.toXML(), true); if (responseContent.startsWith("<")) { - throw WxPayException.from(WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class)); + throw WxPayException.from(BaseWxPayResult.fromXML(responseContent, WxPayCommonResult.class)); } return responseContent; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java index dc0a1a06..0d7048ce 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java @@ -31,7 +31,7 @@ import java.nio.charset.StandardCharsets; * * @author Binary Wang */ -public class WxPayServiceApacheHttpImpl extends WxPayServiceAbstractImpl { +public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl { @Override protected byte[] postForBytes(String url, String requestStr, boolean useKey) throws WxPayException { diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java index 3ac29a92..44d0355e 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; * * @author Binary Wang */ -public class WxPayServiceJoddHttpImpl extends WxPayServiceAbstractImpl { +public class WxPayServiceJoddHttpImpl extends BaseWxPayServiceImpl { @Override protected byte[] postForBytes(String url, String requestStr, boolean useKey) throws WxPayException { diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResultTest.java similarity index 98% rename from weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResultTest.java rename to weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResultTest.java index d6a1f7b8..10baf017 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResultTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResultTest.java @@ -11,7 +11,7 @@ import java.util.Map; * @author binarywang(Binary Wang) *