Skip to content

Commit 5f93925

Browse files
committed
完善注释
1 parent 1f736ad commit 5f93925

File tree

7 files changed

+14
-47
lines changed

7 files changed

+14
-47
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public WechatPayHttpClientBuilder withWechatPay(List<X509Certificate> certificat
5353

5454
/**
5555
* Please use {@link #withWechatPay(List)} instead
56+
*
57+
* @param certificates 平台证书list
58+
* @return 具有验证器的builder
5659
*/
5760
@SuppressWarnings("SpellCheckingInspection")
5861
@Deprecated

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ protected void autoUpdateCert() throws IOException, GeneralSecurityException {
129129
}
130130
}
131131

132-
/**
133-
* 反序列化证书并解密
134-
*/
135132
protected List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
136133
throws GeneralSecurityException, IOException {
137134
AesUtil aesUtil = new AesUtil(apiV3Key);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ public ScheduledUpdateCertificatesVerifier(Credentials credentials, byte[] apiv3
2222
verifier = new CertificatesVerifier(certManagerSingleton.getCertificates());
2323
}
2424

25-
/**
26-
* 初始化平台证书管理器
27-
*
28-
* @param credentials
29-
* @param apiv3Key
30-
*/
3125
public void initCertManager(Credentials credentials, byte[] apiv3Key) {
3226
if (credentials == null || apiv3Key.length == 0) {
3327
throw new IllegalArgumentException("credentials或apiv3Key为空");

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ public interface Verifier {
1111

1212
/**
1313
* 该方法已废弃,请使用getLatestCertificate代替
14+
*
15+
* @return 合法证书
1416
*/
1517
@Deprecated
1618
X509Certificate getValidCertificate();
1719

18-
/**
19-
* 获取最新的证书
20-
*
21-
* @return
22-
*/
2320
X509Certificate getLatestCertificate();
2421

2522
}

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

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ public class CertManagerSingleton {
5252
private CertManagerSingleton() {
5353
}
5454

55-
/**
56-
* 获取平台证书管理器实例
57-
*
58-
* @return
59-
*/
6055
public static CertManagerSingleton getInstance() {
6156
if (instance == null) {
6257
synchronized (CertManagerSingleton.class) {
@@ -71,9 +66,9 @@ public static CertManagerSingleton getInstance() {
7166
/**
7267
* 初始化平台证书管理器实例,在使用前需先调用该方法
7368
*
74-
* @param credentials
75-
* @param apiV3Key
76-
* @param minutesInterval
69+
* @param credentials 认证器
70+
* @param apiV3Key APIv3密钥
71+
* @param minutesInterval 定时更新间隔时间
7772
*/
7873
public synchronized void init(Credentials credentials, byte[] apiV3Key, long minutesInterval) {
7974
if (credentials == null || apiV3Key.length == 0 || minutesInterval == 0) {
@@ -118,21 +113,13 @@ public void close() {
118113
}
119114
}
120115

121-
/**
122-
* 获取平台证书 map
123-
*/
124116
public Map<BigInteger, X509Certificate> getCertificates() {
125117
if (certificates == null) {
126118
throw new IllegalStateException("请先调用init方法初始化实例");
127119
}
128120
return certificates;
129121
}
130122

131-
/**
132-
* 获取最新的证书
133-
*
134-
* @return
135-
*/
136123
public X509Certificate getLatestCertificate() {
137124
if (certificates == null) {
138125
throw new IllegalStateException("请先调用init方法初始化实例");
@@ -147,11 +134,6 @@ public X509Certificate getLatestCertificate() {
147134
return latestCert;
148135
}
149136

150-
/**
151-
* 下载和更新证书
152-
*
153-
* @param verifier
154-
*/
155137
private synchronized void downloadAndUpdateCert(Verifier verifier) {
156138
try (CloseableHttpClient httpClient = WechatPayHttpClientBuilder.create()
157139
.withCredentials(credentials)
@@ -180,16 +162,10 @@ private synchronized void downloadAndUpdateCert(Verifier verifier) {
180162
}
181163
}
182164

183-
/**
184-
* 初始化平台证书 map
185-
*/
186165
private void initCertificates() {
187166
downloadAndUpdateCert(null);
188167
}
189168

190-
/**
191-
* 更新平台证书 map
192-
*/
193169
private void updateCertificates() {
194170
Verifier verifier = null;
195171
if (!certificates.isEmpty()) {

src/main/java/com/wechat/pay/contrib/apache/httpclient/constant/WechatPayHttpHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 微信支付HTTP请求头相关常量
55
*
66
* @author Eric.Lee
7-
* @date 2021/10/29
7+
* Date: 2021/10/29
88
*/
99
public final class WechatPayHttpHeaders {
1010

src/main/java/com/wechat/pay/contrib/apache/httpclient/util/CertSerializeUtil.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public class CertSerializeUtil {
1919
/**
2020
* 反序列化证书并解密
2121
*
22-
* @param apiV3Key
23-
* @param body
24-
* @return
25-
* @throws GeneralSecurityException
26-
* @throws IOException
22+
* @param apiV3Key APIv3密钥
23+
* @param body 下载证书的请求返回体
24+
* @return 证书list
25+
* @throws GeneralSecurityException 当证书过期或尚未生效时
26+
* @throws IOException 当body不合法时
2727
*/
2828
public static Map<BigInteger, X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
2929
throws GeneralSecurityException, IOException {

0 commit comments

Comments
 (0)