⚡ 简化支付宝回调类. 添加验签方法

ballcat-extends/ballcat-extend-pay-ali/src/main/java/com/hccake/starte/pay/ali/domain/AliPayCallback.java

@@ -1,7 +1,10 @@
 package com.hccake.starte.pay.ali.domain;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.hccake.ballcat.common.util.JsonUtils;
+import com.hccake.starte.pay.ali.AliPay;
 import com.hccake.starte.pay.ali.enums.TradeStatus;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -9,12 +12,16 @@ import java.util.List;
 import java.util.Map;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.Accessors;
 
 /**
  * @author lingting 2021/1/26 13:31
  */
-@NoArgsConstructor
 @Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 public class AliPayCallback {
 
 	/**
@@ -29,82 +36,65 @@ public class AliPayCallback {
 		map.put("fund_bill_list", JsonUtils.toObj(fundBillListStr, List.class));
 		// 覆盖原值
 		callbackParams.put("fund_bill_list", fundBillListStr);
-		return JsonUtils.toObj(JsonUtils.toJson(map), AliPayCallback.class);
+		return JsonUtils.toObj(JsonUtils.toJson(map), AliPayCallback.class).setRaw(callbackParams);
 	}
 
-	@JsonProperty("gmt_create")
+	@SneakyThrows
+	public boolean checkSign(AliPay aliPay) {
+		return aliPay.checkSignV1(getRaw()) || aliPay.checkSignV2(getRaw());
+	}
+
+	@JsonIgnore
+	private Map<String, String> raw;
+
 	private String gmtCreate;
 
-	@JsonProperty("charset")
 	private String charset;
 
-	@JsonProperty("seller_email")
 	private String sellerEmail;
 
-	@JsonProperty("subject")
 	private String subject;
 
-	@JsonProperty("sign")
 	private String sign;
 
-	@JsonProperty("buyer_id")
 	private String buyerId;
 
-	@JsonProperty("invoice_amount")
 	private BigDecimal invoiceAmount;
 
-	@JsonProperty("notify_id")
 	private String notifyId;
 
-	@JsonProperty("fund_bill_list")
 	private List<FundBill> fundBillList;
 
-	@JsonProperty("notify_type")
 	private String notifyType;
 
-	@JsonProperty("trade_status")
 	private TradeStatus tradeStatus;
 
-	@JsonProperty("receipt_amount")
 	private BigDecimal receiptAmount;
 
-	@JsonProperty("app_id")
 	private String appId;
 
-	@JsonProperty("buyer_pay_amount")
 	private BigDecimal buyerPayAmount;
 
-	@JsonProperty("sign_type")
 	private String signType;
 
-	@JsonProperty("seller_id")
 	private String sellerId;
 
-	@JsonProperty("gmt_payment")
 	private String gmtPayment;
 
-	@JsonProperty("notify_time")
 	private String notifyTime;
 
-	@JsonProperty("version")
 	private String version;
 
-	@JsonProperty("out_trade_no")
 	private String outTradeNo;
 
-	@JsonProperty("total_amount")
 	private BigDecimal totalAmount;
 
-	@JsonProperty("trade_no")
 	private String tradeNo;
 
-	@JsonProperty("auth_app_id")
 	private String authAppId;
 
-	@JsonProperty("buyer_logon_id")
 	private String buyerLogonId;
 
-	@JsonProperty("point_amount")
 	private BigDecimal pointAmount;
 
 	@Data

ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/ali/AliController.java

@@ -4,12 +4,16 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import com.hccake.starte.pay.ali.AliPay;
 import com.hccake.starte.pay.ali.domain.AliPayCallback;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author lingting 2021/1/25 15:18
@@ -21,8 +25,6 @@ public class AliController {
 
 	private final AliPay aliPay;
 
-	BigDecimal amount = new BigDecimal("100");
-
 	BigDecimal zero = new BigDecimal("0.01");
 
 	private static final Snowflake snowflake = IdUtil.createSnowflake(1, 1);
@@ -33,10 +35,13 @@ public class AliController {
 	 * @return java.lang.String
 	 * @author lingting 2021-01-26 15:18
 	 */
+	@SneakyThrows
 	@PostMapping
 	public String notice(HttpServletRequest request, @RequestParam Map<String, String> callback) {
 		System.out.println("notice");
 		AliPayCallback of = AliPayCallback.of(callback);
+		System.out.println(of.checkSign(aliPay));
+		aliPay.checkSignV1(of.getRaw());
 		return "success";
 	}