|
@@ -11,11 +11,11 @@ import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
|
|
|
import com.wechat.pay.contrib.apache.httpclient.cert.CertificatesManager;
|
|
|
import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
|
|
|
import com.yami.shop.bean.bo.PayInfoBo;
|
|
|
-import com.yami.shop.common.exception.GlobalException;
|
|
|
import com.yami.shop.wx.config.CombinePayUrlEnum;
|
|
|
import com.yami.shop.wx.config.WechatPayServiceConfig;
|
|
|
import com.yami.shop.wx.po.JsapiPayInfoPo;
|
|
|
import com.yami.shop.wx.service.WxProviderService;
|
|
|
+import com.yami.shop.wx.utils.CullenUtils;
|
|
|
import com.yami.shop.wx.utils.OrderUtils;
|
|
|
import com.yami.shop.wx.utils.WechatPayValidator;
|
|
|
import lombok.SneakyThrows;
|
|
@@ -416,10 +416,7 @@ public class WxProviderServiceImpl implements WxProviderService {
|
|
|
log.info("微信回调参数:{}", body);
|
|
|
JSONObject jsonObject = JSONObject.parseObject(body);
|
|
|
WechatPayValidator wechatPayValidator = new WechatPayValidator(getVerifier(), jsonObject.getString("id"), body);
|
|
|
- if (!wechatPayValidator.validate(request)) {
|
|
|
- log.error("通知验签失败");
|
|
|
- throw new GlobalException("回调通知验签失败...");
|
|
|
- }
|
|
|
+ CullenUtils.validateDataThrowException(!wechatPayValidator.validate(request),"回调通知验签失败...");
|
|
|
log.info("通知验签成功");
|
|
|
return jsonObject;
|
|
|
}
|