lxm_library_java/WxJava
1
0
Fork 0
mirror of synced 2025-12-18 13:58:11 +08:00
Code Issues Projects Releases Wiki Activity

🎨 #1671 优化微信支付回调通知验证签名的代码

Browse Source
This commit is contained in:
Binary Wang
2020-07-16 17:33:36 +08:00
parent 7c0a38e1a0
commit 56a271c11c
2 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
View File

@@ -62,8 +62,8 @@ public interface WxMpApiUrl {
*/ */
DEVICE_TRANSMSG(API_DEFAULT_HOST_URL, "/device/transmsg"); DEVICE_TRANSMSG(API_DEFAULT_HOST_URL, "/device/transmsg");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -131,8 +131,8 @@ public interface WxMpApiUrl {
*/ */
CLEAR_QUOTA_URL(API_DEFAULT_HOST_URL, "/cgi-bin/clear_quota"); CLEAR_QUOTA_URL(API_DEFAULT_HOST_URL, "/cgi-bin/clear_quota");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -159,8 +159,8 @@ public interface WxMpApiUrl {
*/ */
WECHAT_AD_LEADS_GET(API_DEFAULT_HOST_URL, "/marketing/wechat_ad_leads/get"); WECHAT_AD_LEADS_GET(API_DEFAULT_HOST_URL, "/marketing/wechat_ad_leads/get");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -308,8 +308,8 @@ public interface WxMpApiUrl {
*/ */
TEMPLATE_DEL_PRIVATE_TEMPLATE(API_DEFAULT_HOST_URL, "/cgi-bin/template/del_private_template"); TEMPLATE_DEL_PRIVATE_TEMPLATE(API_DEFAULT_HOST_URL, "/cgi-bin/template/del_private_template");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -332,8 +332,8 @@ public interface WxMpApiUrl {
*/ */
BATCHUNBLACKLIST(API_DEFAULT_HOST_URL, "/cgi-bin/tags/members/batchunblacklist"); BATCHUNBLACKLIST(API_DEFAULT_HOST_URL, "/cgi-bin/tags/members/batchunblacklist");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -402,8 +402,8 @@ public interface WxMpApiUrl {
*/ */
BIZWIFI_SHOP_UPDATE(API_DEFAULT_HOST_URL, "/bizwifi/shop/update"); BIZWIFI_SHOP_UPDATE(API_DEFAULT_HOST_URL, "/bizwifi/shop/update");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -493,8 +493,8 @@ public interface WxMpApiUrl {
*/ */
FILE_COMM(API_DEFAULT_HOST_URL, "/cv/ocr/comm"); FILE_COMM(API_DEFAULT_HOST_URL, "/cv/ocr/comm");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -603,8 +603,8 @@ public interface WxMpApiUrl {
CARD_USER_CARD_LIST(API_DEFAULT_HOST_URL, "/card/user/getcardlist"), CARD_USER_CARD_LIST(API_DEFAULT_HOST_URL, "/card/user/getcardlist"),
; ;
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -683,8 +683,8 @@ public interface WxMpApiUrl {
*/ */
GET_INTERFACE_SUMMARY_HOUR(API_DEFAULT_HOST_URL, "/datacube/getinterfacesummaryhour"); GET_INTERFACE_SUMMARY_HOUR(API_DEFAULT_HOST_URL, "/datacube/getinterfacesummaryhour");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -755,8 +755,8 @@ public interface WxMpApiUrl {
*/ */
CUSTOM_TYPING(API_DEFAULT_HOST_URL, "/cgi-bin/message/custom/typing"); CUSTOM_TYPING(API_DEFAULT_HOST_URL, "/cgi-bin/message/custom/typing");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -809,8 +809,8 @@ public interface WxMpApiUrl {
*/ */
MESSAGE_MASS_GET_URL(API_DEFAULT_HOST_URL, "/cgi-bin/message/mass/get"); MESSAGE_MASS_GET_URL(API_DEFAULT_HOST_URL, "/cgi-bin/message/mass/get");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -865,8 +865,8 @@ public interface WxMpApiUrl {
*/ */
MATERIAL_BATCHGET_URL(API_DEFAULT_HOST_URL, "/cgi-bin/material/batchget_material"); MATERIAL_BATCHGET_URL(API_DEFAULT_HOST_URL, "/cgi-bin/material/batchget_material");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -910,8 +910,8 @@ public interface WxMpApiUrl {
*/ */
MEMBER_CARD_ACTIVATE_TEMP_INFO(API_DEFAULT_HOST_URL, "/card/membercard/activatetempinfo/get"); MEMBER_CARD_ACTIVATE_TEMP_INFO(API_DEFAULT_HOST_URL, "/card/membercard/activatetempinfo/get");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -946,8 +946,8 @@ public interface WxMpApiUrl {
*/ */
POI_ADD_URL(API_DEFAULT_HOST_URL, "/cgi-bin/poi/addpoi"); POI_ADD_URL(API_DEFAULT_HOST_URL, "/cgi-bin/poi/addpoi");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -978,8 +978,8 @@ public interface WxMpApiUrl {
*/ */
USER_CHANGE_OPENID_URL(API_DEFAULT_HOST_URL, "/cgi-bin/changeopenid"); USER_CHANGE_OPENID_URL(API_DEFAULT_HOST_URL, "/cgi-bin/changeopenid");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -1029,8 +1029,8 @@ public interface WxMpApiUrl {
*/ */
REPLY_DELETE(API_DEFAULT_HOST_URL, "/cgi-bin/comment/reply/delete"); REPLY_DELETE(API_DEFAULT_HOST_URL, "/cgi-bin/comment/reply/delete");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -1070,8 +1070,8 @@ public interface WxMpApiUrl {
*/ */
FILE_AI_CROP(API_DEFAULT_HOST_URL, "/cv/img/aicrop?ratios=%s"); FILE_AI_CROP(API_DEFAULT_HOST_URL, "/cv/img/aicrop?ratios=%s");
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {
@@ -1145,8 +1145,8 @@ public interface WxMpApiUrl {
*/ */
GET_PAY_MCH_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=get_pay_mch"), GET_PAY_MCH_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=get_pay_mch"),
; ;
private String prefix; private final String prefix;
private String path; private final String path;
@Override @Override
public String getUrl(WxMpConfigStorage config) { public String getUrl(WxMpConfigStorage config) {

12
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
View File

@@ -190,10 +190,16 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
try { try {
log.debug("微信支付异步通知请求参数：{}", xmlData); log.debug("微信支付异步通知请求参数：{}", xmlData);
WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData); WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
if (result.getSignType() != null) { if (signType == null) {
// 如果解析的通知对象中signType有值，则使用它进行验签 if (result.getSignType() != null) {
signType = result.getSignType(); // 如果解析的通知对象中signType有值，则使用它进行验签
signType = result.getSignType();
} else if (this.getConfig().getSignType() != null) {
// 如果配置中signType有值，则使用它进行验签
signType = this.getConfig().getSignType();
}
} }
log.debug("微信支付异步通知请求解析后的对象：{}", result); log.debug("微信支付异步通知请求解析后的对象：{}", result);
result.checkResult(this, signType, false); result.checkResult(this, signType, false);
return result; return result;