wangming 1 月之前
父节点
当前提交
6b8b2607b6

+ 1 - 1
yami-shop-wx/src/main/java/com/yami/shop/wx/service/WxProviderService.java

@@ -13,5 +13,5 @@ public interface WxProviderService {
 
     String refundOrder(String orderNo);
 
-    JSONObject jsapiNotify(HttpServletRequest request, HttpServletResponse response);
+    JSONObject notifyParse(HttpServletRequest request, HttpServletResponse response);
 }

+ 2 - 4
yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -394,10 +394,8 @@ public class WxProviderServiceImpl implements WxProviderService {
      * @return return
      */
     public CloseableHttpClient httpClient() {
-        String keyPemPath = WxConstants.KEY_PEM_PATH;
-        PrivateKey privateKey = getPrivateKey(keyPemPath);
         WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
-                .withMerchant(WxConstants.SP_MCH_ID, WxConstants.SERIAL_NO, privateKey)
+                .withMerchant(WxConstants.SP_MCH_ID, WxConstants.SERIAL_NO, getPrivateKey(WxConstants.KEY_PEM_PATH))
                 .withValidator(new WechatPay2Validator(getVerifier()));
         // 通过WechatPayHttpClientBuilder构造的HttpClient,会自动的处理签名和验签,并进行证书自动更新
         return builder.build();
@@ -482,7 +480,7 @@ public class WxProviderServiceImpl implements WxProviderService {
 
     private final ReentrantLock lock = new ReentrantLock();
 
-    public JSONObject jsapiNotify(HttpServletRequest request, HttpServletResponse response) {
+    public JSONObject notifyParse(HttpServletRequest request, HttpServletResponse response) {
         JSONObject bodyJson = getNotifyBodyJson(request);
         if (bodyJson == null) {
             return falseMsg(response);