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