优化注释和README

Author: lianup

README.md

@@ -64,10 +64,10 @@ WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
 // ... 接下来，你仍然可以通过builder设置各种参数，来配置你的HttpClient
 
 // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签
-HttpClient httpClient = builder.build();
+CloseableHttpClient httpClient = builder.build();
 
 // 后面跟使用Apache HttpClient一样
-HttpResponse response = httpClient.execute(...);
+ClosableHttpResponse response = httpClient.execute(...);
 ```
 
 参数说明：
@@ -200,10 +200,10 @@ WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
 // ... 接下来，你仍然可以通过builder设置各种参数，来配置你的HttpClient
 
 // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
-HttpClient httpClient = builder.build();
+CloseableHttpClient httpClient = builder.build();
 
 // 后面跟使用Apache HttpClient一样
-HttpResponse response = httpClient.execute(...);
+CloseableHttpResponse response = httpClient.execute(...);
 ```
 
 ### 风险

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

@@ -32,7 +32,7 @@
 
 /**
  * 在原有CertificatesVerifier基础上，增加自动更新证书功能
- * 该类已废弃，请使用 ScheduledUpdateCertificatesVerifier
+ * 该类已废弃，请使用ScheduledUpdateCertificatesVerifier
  *
  * @author xy-peng
  */

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

@@ -76,7 +76,7 @@ public X509Certificate getValidCertificate() {
     public X509Certificate getLatestCertificate() {
         X509Certificate latestCert = null;
         for (X509Certificate x509Cert : certificates.values()) {
-            // 若 latestCert 为空或 x509Cert 的证书有效开始时间在 latestCert 之后，则更新 latestCert
+            // 若latestCert为空或x509Cert的证书有效开始时间在latestCert之后，则更新latestCert
             if (latestCert == null || x509Cert.getNotBefore().after(latestCert.getNotBefore())) {
                 latestCert = x509Cert;
             }

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

@@ -6,7 +6,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * 在原有 CertificatesVerifier 基础上，增加定时更新证书功能（默认1小时）
+ * 在原有CertificatesVerifier基础上，增加定时更新证书功能（默认1小时）
  */
 public class ScheduledUpdateCertificatesVerifier implements Verifier {
 
@@ -30,7 +30,7 @@ public ScheduledUpdateCertificatesVerifier(Credentials credentials, byte[] apiv3
      */
     public void initCertManager(Credentials credentials, byte[] apiv3Key) {
         if (credentials == null || apiv3Key.length == 0) {
-            throw new IllegalArgumentException("credentials 或 apiv3Key 为空");
+            throw new IllegalArgumentException("credentials或apiv3Key为空");
         }
         certManagerSingleton.init(credentials, apiv3Key, UPDATE_INTERVAL_MINUTE);
     }
@@ -43,7 +43,7 @@ public X509Certificate getLatestCertificate() {
     @Override
     public boolean verify(String serialNumber, byte[] message, String signature) {
         if (serialNumber.isEmpty() || message.length == 0 || signature.isEmpty()) {
-            throw new IllegalArgumentException("serialNumber 或 message 或 signature 为空");
+            throw new IllegalArgumentException("serialNumber或message或signature为空");
         }
         if (lock.tryLock()) {
             try {
@@ -68,7 +68,7 @@ public X509Certificate getValidCertificate() {
 
 
     /**
-     * 停止定时更新，停止无法再重新启动
+     * 停止定时更新，停止后无法再重新启动
      */
     public void stopScheduledUpdate() {
         certManagerSingleton.close();

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

@@ -10,7 +10,7 @@ public interface Verifier {
     boolean verify(String serialNumber, byte[] message, String signature);
 
     /**
-     * 该方法已废弃，请使用 getLatestCertificate 代替
+     * 该方法已废弃，请使用getLatestCertificate代替
      */
     @Deprecated
     X509Certificate getValidCertificate();

src/main/java/com/wechat/pay/contrib/apache/httpclient/cert/CertManagerSingleton.java

@@ -36,11 +36,11 @@ public class CertManagerSingleton {
      * 证书下载地址
      */
     private static final String CERT_DOWNLOAD_PATH = "https://api.mch.weixin.qq.com/v3/certificates";
-    private static final String SCHEDULE_UPDATE_CERT_THREAD_NAME = "schedule_update_cert_thread";
+    private static final String SCHEDULE_UPDATE_CERT_THREAD_NAME = "scheduled_update_cert_thread";
     private volatile static CertManagerSingleton instance = null;
     private byte[] apiV3Key;
     /**
-     * 平台证书 map
+     * 平台证书map
      */
     private ConcurrentHashMap<BigInteger, X509Certificate> certificates;
     private Credentials credentials;
@@ -77,7 +77,7 @@ public static CertManagerSingleton getInstance() {
      */
     public synchronized void init(Credentials credentials, byte[] apiV3Key, long minutesInterval) {
         if (credentials == null || apiV3Key.length == 0 || minutesInterval == 0) {
-            throw new IllegalArgumentException("credentials 或 apiV3Key 或 minutesInterval 为空");
+            throw new IllegalArgumentException("credentials或apiV3Key或minutesInterval为空");
         }
         if (this.credentials == null || this.apiV3Key.length == 0 || this.executor == null
                 || this.certificates == null) {
@@ -109,7 +109,7 @@ public synchronized void init(Credentials credentials, byte[] apiV3Key, long min
      */
     public void close() {
         if (executor == null) {
-            throw new IllegalStateException("请先调用 init 方法初始化实例");
+            throw new IllegalStateException("请先调用init方法初始化实例");
         }
         try {
             executor.shutdownNow();
@@ -123,7 +123,7 @@ public void close() {
      */
     public Map<BigInteger, X509Certificate> getCertificates() {
         if (certificates == null) {
-            throw new IllegalStateException("请先调用 init 方法初始化实例");
+            throw new IllegalStateException("请先调用init方法初始化实例");
         }
         return certificates;
     }
@@ -135,11 +135,11 @@ public Map<BigInteger, X509Certificate> getCertificates() {
      */
     public X509Certificate getLatestCertificate() {
         if (certificates == null) {
-            throw new IllegalStateException("请先调用 init 方法初始化实例");
+            throw new IllegalStateException("请先调用init方法初始化实例");
         }
         X509Certificate latestCert = null;
         for (X509Certificate x509Cert : certificates.values()) {
-            // 若 latestCert 为空或 x509Cert 的证书有效开始时间在 latestCert 之后，则更新 latestCert
+            // 若latestCert为空或x509Cert的证书有效开始时间在latestCert之后，则更新latestCert
             if (latestCert == null || x509Cert.getNotBefore().after(latestCert.getNotBefore())) {
                 latestCert = x509Cert;
             }