Skip to content

Commit 5e96692

Browse files
egzosnegzosn
committed
2.14.1
1 parent 7de62e4 commit 5e96692

File tree

62 files changed

+107
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+107
-101
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>com.egzosn</groupId>
2323
<artifactId>{module-name}</artifactId>
24-
<version>2.13.3-b1</version>
24+
<version>2.14.1</version>
2525
</dependency>
2626

2727
```

‎pay-java-ali/README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
1111
aliPayConfigStorage.setPid("合作者id");
12-
aliPayConfigStorage.setAppid("应用id");
12+
aliPayConfigStorage.setAppId("应用id");
13+
// aliPayConfigStorage.setAppAuthToken("ISV代商户代用，指定appAuthToken");
1314
aliPayConfigStorage.setKeyPublic("支付宝公钥");
1415
aliPayConfigStorage.setKeyPrivate("应用私钥");
1516
aliPayConfigStorage.setNotifyUrl("异步回调地址");
@@ -27,7 +28,8 @@
2728

2829
AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
2930
aliPayConfigStorage.setPid("合作者id");
30-
aliPayConfigStorage.setAppid("应用id");
31+
aliPayConfigStorage.setAppId("应用id");
32+
// aliPayConfigStorage.setAppAuthToken("ISV代商户代用，指定appAuthToken");
3133
aliPayConfigStorage.setKeyPrivate("应用私钥");
3234
//设置为证书方式
3335
aliPayConfigStorage.setCertSign(true);

‎pay-java-ali/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>pay-java-parent</artifactId>
77
<groupId>com.egzosn</groupId>
8-
<version>2.13.4-SNAPSHOT</version>
8+
<version>2.14.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>pay-java-ali</artifactId>

‎pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ private Map<String, Object> setExpirationTime(Map<String, Object> bizContent, Pa
301301
*/
302302
private Map<String, Object> getPublicParameters(TransactionType transactionType) {
303303
Map<String, Object> orderInfo = new TreeMap<>();
304-
orderInfo.put("app_id", payConfigStorage.getAppid());
304+
orderInfo.put("app_id", payConfigStorage.getAppId());
305305
orderInfo.put("method", transactionType.getMethod());
306306
orderInfo.put("charset", payConfigStorage.getInputCharset());
307307
orderInfo.put("timestamp", DateUtils.format(new Date()));

‎pay-java-ali/src/main/java/com/egzosn/pay/ali/utils/AntCertificationUtil.java

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public class AntCertificationUtil {
5454
*
5555
* @param certContent 需要验证的目标证书或者证书链
5656
* @param rootCertContent 可信根证书列表
57+
* @return 是否校验成功
5758
*/
5859
public static boolean isTrusted(String certContent, String rootCertContent) {
5960
X509Certificate[] certificates;

‎pay-java-ali/src/test/java/PayTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static void main(String[] args) {
5050

5151
AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
5252
aliPayConfigStorage.setPid("合作者id");
53-
aliPayConfigStorage.setAppid("应用id");
53+
aliPayConfigStorage.setAppId("应用id");
5454
//普通公钥方式与证书公钥方式为两者取其一的方式
5555
keyPublic(aliPayConfigStorage);
5656
// certKeyPublic(aliPayConfigStorage);

‎pay-java-baidu/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>pay-java-parent</artifactId>
77
<groupId>com.egzosn</groupId>
8-
<version>2.13.4-SNAPSHOT</version>
8+
<version>2.14.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>pay-java-baidu</artifactId>

‎pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public Map<String, Object> getUseQueryPay() {
112112
String appKey = payConfigStorage.getAppKey();
113113
Map<String, Object> result = new HashMap<>();
114114
result.put(APP_KEY, appKey);
115-
result.put(APP_ID, payConfigStorage.getAppid());
115+
result.put(APP_ID, payConfigStorage.getAppId());
116116
return result;
117117
}
118118

‎pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public String getBizRefundBatchId() {
5454

5555
/**
5656
* 业务方退款批次id，退款业务流水唯一编号，发起部分退款时必传
57+
* @param bizRefundBatchId 业务方退款批次id
5758
*/
5859
public void setBizRefundBatchId(String bizRefundBatchId) {
5960
setRefundNo(bizRefundBatchId);

‎pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class BaiduPayServiceTest {
1313
@Test
1414
public void orderInfo() {
1515
BaiduPayConfigStorage configStorage = new BaiduPayConfigStorage();
16-
configStorage.setAppid("APP ID");
16+
configStorage.setAppId("APP ID");
1717
configStorage.setAppKey("APP KEY");
1818
configStorage.setDealId("DEAL ID");
1919
configStorage.setKeyPublic("KEY PUBLIC");

‎pay-java-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>pay-java-parent</artifactId>
77
<groupId>com.egzosn</groupId>
8-
<version>2.13.4-SNAPSHOT</version>
8+
<version>2.14.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>

‎pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* 支付基础配置存储
99
*
10-
* @author: egan
10+
* @author egan
1111
* <pre>
1212
* email [email protected]
1313
* date 2017/3/5 20:33

‎pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/**
3232
* 支付基础服务
3333
*
34-
* @author: egan
34+
* @author egan
3535
* <pre>
3636
* email [email protected]
3737
* date 2017/3/5 20:36

‎pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
/**
2323
* 回调，可用于类型转换
24-
* @author: egan
24+
* @author egan
2525
* <pre>
2626
* email [email protected]
2727
* date 2017/3/7 18:55

‎pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
/**
44
* 账单类型
55
* @author Egan
6-
* @email [email protected]
7-
* @date 2021/2/22
6+
* <pre>
7+
* email [email protected]
8+
* date 2021/2/22
9+
* </pre>
810
*/
911
public interface BillType {
1012
/**

‎pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.egzosn.pay.common.bean;
1919

2020
/**
21-
* @author: egan
21+
* @author egan
2222
* <pre>
2323
* email [email protected]
2424
* date 2017/2/7 9:52

‎pay-java-common/src/main/java/com/egzosn/pay/common/bean/SignType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* 签名类型
88
*
9-
* @author: egan
9+
* @author egan
1010
* <pre>
1111
* email [email protected]
1212
* date 2019/12/08 13:30

‎pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.egzosn.pay.common.bean.PayOutMessage;
66

77
/**
8-
* @author: egan
8+
* @author egan
99
* <pre>
1010
* email [email protected]
1111
* date 2017/1/13 14:30

‎pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/**
2121
* 支付异常
22-
* @author: egan
22+
* @author egan
2323
* <pre>
2424
* email [email protected]
2525
* date 2017/3/7 12:32

‎pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/**
4040
* 一个HTTP请求的客户端
4141
*
42-
* @author: egan
42+
* @author egan
4343
* <pre>
4444
* email [email protected]
4545
* date 2017/3/4 17:56

‎pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
/**
99
* HTTP 配置
10-
* @author: egan
10+
* @author egan
1111
* <pre>
1212
* email [email protected]
1313
* date 2017/3/3 20:48

‎pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
/**
3838
* http请求工具
39-
* @author: egan
39+
* @author egan
4040
* <code>
4141
* email [email protected] <br>
4242
* date 2017/3/3 21:33

‎pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static JSONObject toJSONObject(byte[] content) {
125125
*/
126126
public static <T> T toBean(String content, Class<T> clazz) {
127127

128-
if (null == content || "".equals(content)) {
128+
if (StringUtils.isEmpty(content)) {
129129
return null;
130130
}
131131
try (InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"))) {
@@ -207,9 +207,8 @@ public static Document newDocument() throws ParserConfigurationException {
207207
* @param clazz 需要转化的类
208208
* @param <T> 类型
209209
* @return 对应的对象
210-
* @throws IOException xml io转化异常
211210
*/
212-
public static <T> T inputStream2Bean(InputStream in, Class<T> clazz) throws IOException {
211+
public static <T> T inputStream2Bean(InputStream in, Class<T> clazz) {
213212
JSON json = toJSONObject(in);
214213
return json.toJavaObject(clazz);
215214
}
@@ -220,7 +219,7 @@ public static <T> T inputStream2Bean(InputStream in, Class<T> clazz) throws IOEx
220219
* @return 整理完成的参数集
221220
* @throws IOException xml io转化异常
222221
*/
223-
public static Map inputStream2Map(InputStream in, Map m) throws IOException {
222+
public static Map<String, Object> inputStream2Map(InputStream in, Map<String, Object> m) throws IOException {
224223
if (null == m) {
225224
m = new JSONObject();
226225
}
@@ -351,10 +350,10 @@ public static void map2Xml(Map<String, Object> data, Document document, org.w3c.
351350
private static void object2Xml(Object value, Document document, org.w3c.dom.Element element) {
352351

353352
if (value instanceof Map) {
354-
map2Xml((Map) value, document, element);
353+
map2Xml((Map<String, Object>) value, document, element);
355354
}
356355
else if (value instanceof List) {
357-
List vs = (List) value;
356+
List<Object> vs = (List<Object>) value;
358357
for (Object v : vs) {
359358
object2Xml(v, document, element);
360359
}

‎pay-java-demo/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum PayType implements BasePayType {
2222
public PayService getPayService(ApyAccount apyAccount) {
2323
AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
2424
aliPayConfigStorage.setPid(apyAccount.getPartner());
25-
aliPayConfigStorage.setAppid(apyAccount.getAppid());
25+
aliPayConfigStorage.setAppId(apyAccount.getAppid());
2626
aliPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
2727
aliPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey());
2828
aliPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl());
@@ -49,7 +49,7 @@ public enum PayType implements BasePayType {
4949
wxPayConfigStorage.setMchId(apyAccount.getPartner());
5050
wxPayConfigStorage.setAppSecret(apyAccount.getPublicKey());
5151
wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
52-
wxPayConfigStorage.setAppid(apyAccount.getAppid());
52+
wxPayConfigStorage.setAppId(apyAccount.getAppid());
5353
wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey());
5454
wxPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl());
5555
wxPayConfigStorage.setSignType(apyAccount.getSignType());

‎pay-java-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>pay-java-parent</artifactId>
77
<groupId>com.egzosn</groupId>
8-
<version>2.13.4-SNAPSHOT</version>
8+
<version>2.14.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>war</packaging>

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/**
4040
* 发起支付入口
4141
*
42-
* @author: egan
42+
* @author egan
4343
* email [email protected]
4444
* date 2016/11/18 0:25
4545
*/
@@ -81,7 +81,8 @@ private static void certKeyPublic(AliPayConfigStorage aliPayConfigStorage) {
8181
public void init() {
8282
AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
8383
aliPayConfigStorage.setPid("2088102169916436");
84-
aliPayConfigStorage.setAppid("2016080400165436");
84+
aliPayConfigStorage.setAppId("2016080400165436");
85+
// aliPayConfigStorage.setAppAuthToken("ISV代商户代用，指定appAuthToken");
8586
//普通公钥方式与证书公钥方式为两者取其一的方式
8687
keyPublic(aliPayConfigStorage);
8788
aliPayConfigStorage.setKeyPrivate("MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKroe/8h5vC4L6T+B2WdXiVwGsMvUKgb2XsKix6VY3m2wcf6tyzpNRDCNykbIwGtaeo7FshN+qZxdXHLiIam9goYncBit/8ojfLGy2gLxO/PXfzGxYGs0KsDZ+ryVPPmE34ZZ8jiJpR0ygzCFl8pN3QJPJRGTJn5+FTT9EF/9zyZAgMBAAECgYAktngcYC35u7cQXDk+jMVyiVhWYU2ULxdSpPspgLGzrZyG1saOcTIi/XVX8Spd6+B6nmLQeF/FbU3rOeuD8U2clzul2Z2YMbJ0FYay9oVZFfp5gTEFpFRTVfzqUaZQBIjJe/xHL9kQVqc5xHlE/LVA27/Kx3dbC35Y7B4EVBDYAQJBAOhsX8ZreWLKPhXiXHTyLmNKhOHJc+0tFH7Ktise/0rNspojU7o9prOatKpNylp9v6kux7migcMRdVUWWiVe+4ECQQC8PqsuEz7B0yqirQchRg1DbHjh64bw9Kj82EN1/NzOUd53tP9tg+SO97EzsibK1F7tOcuwqsa7n2aY48mQ+y0ZAkBndA2xcRcnvOOjtAz5VO8G7R12rse181HjGfG6AeMadbKg30aeaGCyIxN1loiSfNR5xsPJwibGIBg81mUrqzqBAkB+K6rkaPXJR9XtzvdWb/N3235yPkDlw7Z4MiOVM3RzvR/VMDV7m8lXoeDde2zQyeMOMYy6ztwA6WgE1bhGOnQRAkEAouUBv1sVdSBlsexX15qphOmAevzYrpufKgJIRLFWQxroXMS7FTesj+f+FmGrpPCxIde1dqJ8lqYLTyJmbzMPYw==");

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/FuiouPayController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* 发起支付入口
2222
*
23-
* @author: egan
23+
* @author egan
2424
* email [email protected]
2525
* date 2016/11/18 0:25
2626
*/

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
/**
4747
* 发起支付入口
4848
*
49-
* @author: egan
49+
* @author egan
5050
* email [email protected]
5151
* date 2016/11/18 0:25
5252
*/

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* 发起支付入口
2828
*
29-
* @author: egan
29+
* @author egan
3030
* email [email protected]
3131
* date 2018/05/06 10:30
3232
*/

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalV2PayController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* 发起支付入口
2929
*
30-
* @author: egan
30+
* @author egan
3131
* email [email protected]
3232
* date 2018/05/06 10:30
3333
*/

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* 银联相关
3434
*
35-
* @author: egan
35+
* @author egan
3636
* email [email protected]
3737
* date 2016/11/18 0:25
3838
*/

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* 发起支付入口
2626
*
27-
* @author: egan
27+
* @author egan
2828
* email [email protected]
2929
* date 2016/11/18 0:25
3030
*/
@@ -42,7 +42,7 @@ public class WxPayController {
4242
@PostConstruct
4343
public void init() {
4444
WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
45-
wxPayConfigStorage.setAppid("公众账号ID");
45+
wxPayConfigStorage.setAppId("公众账号ID");
4646

4747
wxPayConfigStorage.setMchId("合作者id（商户号）");
4848
//以下两个参数在 服务商版模式中必填--------

0 commit comments

Comments
 (0)