0.2.2

README.md

@@ -8,7 +8,7 @@
 
 ## 项目状态
 
-当前版本`0.2.1`为测试版本。请商户的专业技术人员在使用时注意系统和软件的正确性和兼容性，以及带来的风险。
+当前版本`0.2.2`为测试版本。请商户的专业技术人员在使用时注意系统和软件的正确性和兼容性，以及带来的风险。
 
 ## 环境要求
 
@@ -23,7 +23,7 @@
 在你的`build.gradle`文件中加入如下的依赖
 
 ```groovy
-implementation 'com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.1'
+implementation 'com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.2'
 ```
 
 ### Maven
@@ -33,7 +33,7 @@ implementation 'com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.1'
 <dependency>
     <groupId>com.github.wechatpay-apiv3</groupId>
     <artifactId>wechatpay-apache-httpclient</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.2</version>
 </dependency>
 ```
 
@@ -94,7 +94,7 @@ httpPost.addHeader("Content-type","application/json; charset=utf-8");
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 ObjectMapper objectMapper = new ObjectMapper();
 
-ObjectNode rootNode = mapper.createObjectNode();
+ObjectNode rootNode = objectMapper.createObjectNode();
 rootNode.put("mchid","1900009191")
         .put("appid", "wxd678efh567hg6787")
         .put("description", "Image形象店-深圳腾大-QQ公仔")
@@ -105,7 +105,7 @@ rootNode.putObject("amount")
 rootNode.putObject("payer")
         .put("openid", "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o");
 
-mapper.writeValue(bos, rootNode);
+objectMapper.writeValue(bos, rootNode);
 
 httpPost.setEntity(new StringEntity(bos.toString("UTF-8")));
 CloseableHttpResponse response = httpClient.execute(httpPost);
@@ -137,10 +137,10 @@ httpPost.addHeader("Content-type","application/json; charset=utf-8");
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 ObjectMapper objectMapper = new ObjectMapper();
 
-ObjectNode rootNode = mapper.createObjectNode();
+ObjectNode rootNode = objectMapper.createObjectNode();
 rootNode.put("mchid","1900009191");
 
-mapper.writeValue(bos, rootNode);
+objectMapper.writeValue(bos, rootNode);
 
 httpPost.setEntity(new StringEntity(bos.toString("UTF-8")));
 CloseableHttpResponse response = httpClient.execute(httpPost);

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.github.wechatpay-apiv3'
-version '0.2.1'
+version '0.2.2'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

src/main/java/com/wechat/pay/contrib/apache/httpclient/SignatureExec.java

@@ -45,7 +45,7 @@ protected void convertToRepeatableRequestEntity(HttpRequestWrapper request) thro
   @Override
   public CloseableHttpResponse execute(HttpRoute route, HttpRequestWrapper request,
       HttpClientContext context, HttpExecutionAware execAware) throws IOException, HttpException {
-    if (request.getURI().getHost().endsWith(".mch.weixin.qq.com")) {
+    if (request.getTarget().getHostName().endsWith(".mch.weixin.qq.com")) {
       return executeWithSignature(route, request, context, execAware);
     } else {
       return mainExec.execute(route, request, context, execAware);

src/main/java/com/wechat/pay/contrib/apache/httpclient/auth/WechatPay2Credentials.java

@@ -1,94 +1,94 @@
-package com.wechat.pay.contrib.apache.httpclient.auth;
-
-import com.wechat.pay.contrib.apache.httpclient.Credentials;
-import com.wechat.pay.contrib.apache.httpclient.WechatPayUploadHttpPost;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
-
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WechatPay2Credentials implements Credentials {
-  private static final Logger log = LoggerFactory.getLogger(WechatPay2Credentials.class);
-
-  private static final String SYMBOLS =
-      "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  private static final SecureRandom RANDOM = new SecureRandom();
-  protected String merchantId;
-  protected Signer signer;
-
-  public WechatPay2Credentials(String merchantId, Signer signer) {
-    this.merchantId = merchantId;
-    this.signer = signer;
-  }
-
-  public String getMerchantId() {
-    return merchantId;
-  }
-
-  protected long generateTimestamp() {
-    return System.currentTimeMillis() / 1000;
-  }
-
-  protected String generateNonceStr() {
-    char[] nonceChars = new char[32];
-    for (int index = 0; index < nonceChars.length; ++index) {
-      nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
-    }
-    return new String(nonceChars);
-  }
-
-  @Override
-  public final String getSchema() {
-    return "WECHATPAY2-SHA256-RSA2048";
-  }
-
-  @Override
-  public final String getToken(HttpRequestWrapper request) throws IOException {
-    String nonceStr = generateNonceStr();
-    long timestamp = generateTimestamp();
-
-    String message = buildMessage(nonceStr, timestamp, request);
-    log.debug("authorization message=[{}]", message);
-
-    Signer.SignatureResult signature = signer.sign(message.getBytes(StandardCharsets.UTF_8));
-
-    String token = "mchid=\"" + getMerchantId() + "\","
-        + "nonce_str=\"" + nonceStr + "\","
-        + "timestamp=\"" + timestamp + "\","
-        + "serial_no=\"" + signature.certificateSerialNumber + "\","
-        + "signature=\"" + signature.sign + "\"";
-    log.debug("authorization token=[{}]", token);
-
-    return token;
-  }
-
-  protected final String buildMessage(String nonce, long timestamp, HttpRequestWrapper request)
-      throws IOException {
-    URI uri = request.getURI();
-    String canonicalUrl = uri.getRawPath();
-    if (uri.getQuery() != null) {
-      canonicalUrl += "?" + uri.getRawQuery();
-    }
-
-    String body = "";
-    // PATCH,POST,PUT
-    if (request.getOriginal() instanceof WechatPayUploadHttpPost) {
-      body = ((WechatPayUploadHttpPost) request.getOriginal()).getMeta();
-    } else if (request instanceof HttpEntityEnclosingRequest) {
-      body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity());
-    }
-
-    return request.getRequestLine().getMethod() + "\n"
-        + canonicalUrl + "\n"
-        + timestamp + "\n"
-        + nonce + "\n"
-        + body + "\n";
-  }
-
-}
+package com.wechat.pay.contrib.apache.httpclient.auth;
+
+import com.wechat.pay.contrib.apache.httpclient.Credentials;
+import com.wechat.pay.contrib.apache.httpclient.WechatPayUploadHttpPost;
+import org.apache.http.HttpEntityEnclosingRequest;
+import org.apache.http.client.methods.HttpRequestWrapper;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+
+public class WechatPay2Credentials implements Credentials {
+  private static final Logger log = LoggerFactory.getLogger(WechatPay2Credentials.class);
+
+  private static final String SYMBOLS =
+      "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  private static final SecureRandom RANDOM = new SecureRandom();
+  protected String merchantId;
+  protected Signer signer;
+
+  public WechatPay2Credentials(String merchantId, Signer signer) {
+    this.merchantId = merchantId;
+    this.signer = signer;
+  }
+
+  public String getMerchantId() {
+    return merchantId;
+  }
+
+  protected long generateTimestamp() {
+    return System.currentTimeMillis() / 1000;
+  }
+
+  protected String generateNonceStr() {
+    char[] nonceChars = new char[32];
+    for (int index = 0; index < nonceChars.length; ++index) {
+      nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+    }
+    return new String(nonceChars);
+  }
+
+  @Override
+  public final String getSchema() {
+    return "WECHATPAY2-SHA256-RSA2048";
+  }
+
+  @Override
+  public final String getToken(HttpRequestWrapper request) throws IOException {
+    String nonceStr = generateNonceStr();
+    long timestamp = generateTimestamp();
+
+    String message = buildMessage(nonceStr, timestamp, request);
+    log.debug("authorization message=[{}]", message);
+
+    Signer.SignatureResult signature = signer.sign(message.getBytes(StandardCharsets.UTF_8));
+
+    String token = "mchid=\"" + getMerchantId() + "\","
+        + "nonce_str=\"" + nonceStr + "\","
+        + "timestamp=\"" + timestamp + "\","
+        + "serial_no=\"" + signature.certificateSerialNumber + "\","
+        + "signature=\"" + signature.sign + "\"";
+    log.debug("authorization token=[{}]", token);
+
+    return token;
+  }
+
+  protected final String buildMessage(String nonce, long timestamp, HttpRequestWrapper request)
+      throws IOException {
+    URI uri = request.getURI();
+    String canonicalUrl = uri.getRawPath();
+    if (uri.getQuery() != null) {
+      canonicalUrl += "?" + uri.getRawQuery();
+    }
+
+    String body = "";
+    // PATCH,POST,PUT
+    if (request.getOriginal() instanceof WechatPayUploadHttpPost) {
+      body = ((WechatPayUploadHttpPost) request.getOriginal()).getMeta();
+    } else if (request instanceof HttpEntityEnclosingRequest) {
+      body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity(), StandardCharsets.UTF_8);
+    }
+
+    return request.getRequestLine().getMethod() + "\n"
+        + canonicalUrl + "\n"
+        + timestamp + "\n"
+        + nonce + "\n"
+        + body + "\n";
+  }
+
+}