Skip to content

Commit 3d8746e

Browse files
committed
fix: 兼容通知头继承构建器
1 parent 579c7f6 commit 3d8746e

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.github.binarywang.wxpay.bean.ecommerce;
22

33
import lombok.AllArgsConstructor;
4-
import lombok.Builder;
54
import lombok.Data;
65
import lombok.NoArgsConstructor;
6+
import lombok.experimental.SuperBuilder;
77

88
import java.io.Serializable;
99

@@ -14,22 +14,12 @@
1414
* @author cloudX
1515
*/
1616
@Data
17-
@Builder
17+
@SuperBuilder
1818
@NoArgsConstructor
1919
@AllArgsConstructor
2020
@Deprecated
2121
public class SignatureHeader extends com.github.binarywang.wxpay.bean.notify.SignatureHeader implements Serializable {
2222
private static final long serialVersionUID = -6958015499416059949L;
23-
/**
24-
* 时间戳
25-
*/
26-
private String timeStamp;
27-
28-
/**
29-
* 随机串
30-
*/
31-
private String nonce;
32-
3323
/**
3424
* 已签名字符串
3525
*/

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.github.binarywang.wxpay.bean.notify;
22

33
import lombok.AllArgsConstructor;
4-
import lombok.Builder;
54
import lombok.Data;
65
import lombok.NoArgsConstructor;
6+
import lombok.experimental.SuperBuilder;
77

88
import java.io.Serializable;
99

@@ -14,7 +14,7 @@
1414
* @author thinstar
1515
*/
1616
@Data
17-
@Builder
17+
@SuperBuilder
1818
@NoArgsConstructor
1919
@AllArgsConstructor
2020
public class SignatureHeader implements Serializable {

‎weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/LegacyEcommerceApiCompatibilityTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ public void shouldKeepLegacyRefundAndWithdrawNotificationSignatures() throws Exc
2929
@Test
3030
public void shouldMakeLegacyHeaderMoreSpecificAndPreserveSignatureFields() {
3131
com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader legacyHeader =
32-
new com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader();
33-
legacyHeader.setTimeStamp("timestamp");
34-
legacyHeader.setNonce("nonce");
35-
legacyHeader.setSigned("signed");
36-
legacyHeader.setSerialNo("serial-no");
32+
com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.builder()
33+
.timeStamp("timestamp")
34+
.nonce("nonce")
35+
.signed("signed")
36+
.serialNo("serial-no")
37+
.build();
3738

3839
Assert.assertTrue(com.github.binarywang.wxpay.bean.notify.SignatureHeader.class
3940
.isAssignableFrom(legacyHeader.getClass()));

0 commit comments

Comments
 (0)