Skip to content

Commit 29db0f9

Browse files
egzosnegzosn
committedJul 2, 2022
代码整理
1 parent 739c0cc commit 29db0f9

File tree

25 files changed

+115
-135
lines changed

25 files changed

+115
-135
lines changed
 

‎pay-java-ali/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,7 @@ public Map<String, Object> refundquery(RefundOrder refundOrder) {
628628
* @param billType 账单类型，商户通过接口或商户经开放平台授权后其所属服务商通过接口可以获取以下账单类型：trade、signcustomer；trade指商户基于支付宝交易收单的业务账单；signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单；
629629
* @return 返回支付方下载对账单的结果
630630
*/
631+
@Override
631632
public Map<String, Object> downloadBill(Date billDate, String billType) {
632633

633634
return this.downloadBill(billDate, "trade".equals(billType) ? AliPayBillType.TRADE_DAY : AliPayBillType.SIGNCUSTOMER_DAY);
@@ -640,6 +641,7 @@ public Map<String, Object> downloadBill(Date billDate, String billType) {
640641
* @param billType 账单类型，商户通过接口或商户经开放平台授权后其所属服务商通过接口可以获取以下账单类型：trade、signcustomer；trade指商户基于支付宝交易收单的业务账单；signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单；
641642
* @return 返回支付方下载对账单的结果
642643
*/
644+
@Override
643645
public Map<String, Object> downloadBill(Date billDate, BillType billType) {
644646
//获取公共参数
645647
Map<String, Object> parameters = getPublicParameters(AliTransactionType.DOWNLOADBILL);

‎pay-java-baidu/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ public Map<String, Object> refundquery(RefundOrder refundOrder) {
542542
* @param accessToken 用户token
543543
* @return 对账单
544544
*/
545+
@Override
545546
public Map<String, Object> downloadBill(Date billDate, String accessToken) {
546547
return downloadBill(billDate, new BaiduBillType(accessToken, BaiduTransactionType.DOWNLOAD_ORDER_BILL.name()));
547548
}
@@ -553,6 +554,7 @@ public Map<String, Object> downloadBill(Date billDate, String accessToken) {
553554
* @param billType 账单类型 {@link BaiduBillType}
554555
* @return 返回支付方下载对账单的结果
555556
*/
557+
@Override
556558
public Map<String, Object> downloadBill(Date billDate, BillType billType) {
557559
Map<String, Object> parameters = new HashMap<>();
558560
parameters.put("access_token", billType.getCustom());

‎pay-java-common/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>

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

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.awt.image.BufferedImage;
44
import java.io.InputStream;
55
import java.io.UnsupportedEncodingException;
6+
import java.nio.charset.Charset;
67
import java.util.ArrayList;
78
import java.util.Collections;
89
import java.util.Date;
@@ -11,6 +12,7 @@
1112
import java.util.Map;
1213
import java.util.TreeMap;
1314

15+
import org.apache.http.Consts;
1416
import org.slf4j.Logger;
1517
import org.slf4j.LoggerFactory;
1618

@@ -59,6 +61,7 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
5961
*/
6062
protected List<PayMessageInterceptor<PayMessage, PayService>> interceptors = new ArrayList<PayMessageInterceptor<PayMessage, PayService>>();
6163

64+
private Charset inputCharset = Consts.UTF_8;
6265

6366
/**
6467
* 设置支付配置
@@ -68,6 +71,10 @@ public abstract class BasePayService<PC extends PayConfigStorage> implements Pay
6871
@Override
6972
public BasePayService setPayConfigStorage(PC payConfigStorage) {
7073
this.payConfigStorage = payConfigStorage;
74+
75+
if (StringUtils.isNotEmpty(payConfigStorage.getInputCharset())) {
76+
this.inputCharset = Charset.forName(payConfigStorage.getInputCharset());
77+
}
7178
return this;
7279
}
7380

@@ -94,7 +101,6 @@ public BasePayService setRequestTemplateConfigStorage(HttpConfigStorage configSt
94101
}
95102

96103

97-
98104
public BasePayService(PC payConfigStorage) {
99105
this(payConfigStorage, null);
100106
}
@@ -106,7 +112,6 @@ public BasePayService(PC payConfigStorage, HttpConfigStorage configStorage) {
106112
}
107113

108114

109-
110115
/**
111116
* Generate a Base64 encoded String from user , password
112117
*
@@ -159,11 +164,11 @@ public String createSign(Map<String, Object> content, String characterEncoding)
159164
*/
160165
@Override
161166
public <O extends PayOrder> String toPay(O order) {
162-
if (StringUtils.isNotEmpty(order.getSubject()) && order.getSubject().contains("'")){
163-
order.setSubject(order.getSubject().replace("'",""));
167+
if (StringUtils.isNotEmpty(order.getSubject()) && order.getSubject().contains("'")) {
168+
order.setSubject(order.getSubject().replace("'", ""));
164169
}
165-
if (StringUtils.isNotEmpty(order.getBody()) && order.getBody().contains("'")){
166-
order.setBody(order.getBody().replace("'",""));
170+
if (StringUtils.isNotEmpty(order.getBody()) && order.getBody().contains("'")) {
171+
order.setBody(order.getBody().replace("'", ""));
167172
}
168173
Map<String, Object> orderInfo = orderInfo(order);
169174
return buildRequest(orderInfo, MethodType.POST);
@@ -203,6 +208,7 @@ public <O extends PayOrder> BufferedImage genQrPay(O order) {
203208
public Map<String, Object> getParameter2Map(Map<String, String[]> parameterMap, InputStream is) {
204209
return getNoticeParams(new DefaultNoticeRequest(parameterMap, is)).getBody();
205210
}
211+
206212
/**
207213
* 将请求参数或者请求流转化为 Map
208214
*
@@ -213,22 +219,18 @@ public Map<String, Object> getParameter2Map(Map<String, String[]> parameterMap,
213219
public NoticeParams getNoticeParams(NoticeRequest request) {
214220
final Map<String, String[]> parameterMap = request.getParameterMap();
215221

216-
Map<String, Object> params = new TreeMap<String, Object>();
222+
Map<String, Object> params = new TreeMap<>();
217223
for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
218224
String name = entry.getKey();
219225
String[] values = entry.getValue();
220-
String valueStr = "";
226+
StringBuilder sb = new StringBuilder();
221227
for (int i = 0, len = values.length; i < len; i++) {
222-
valueStr += (i == len - 1) ? values[i] : values[i] + ",";
228+
sb.append(values[i]).append((i == len - 1) ? "" : ',');
223229
}
230+
String valueStr = sb.toString();
224231
if (StringUtils.isNotEmpty(payConfigStorage.getInputCharset()) && !valueStr.matches("\\w+")) {
225-
try {
226-
if (valueStr.equals(new String(valueStr.getBytes("iso8859-1"), "iso8859-1"))) {
227-
valueStr = new String(valueStr.getBytes("iso8859-1"), payConfigStorage.getInputCharset());
228-
}
229-
}
230-
catch (UnsupportedEncodingException e) {
231-
LOG.error("", e);
232+
if (valueStr.equals(new String(valueStr.getBytes(Consts.ISO_8859_1), Consts.ISO_8859_1))) {
233+
valueStr = new String(valueStr.getBytes(Consts.ISO_8859_1), inputCharset);
232234
}
233235
}
234236
params.put(name, valueStr);
@@ -329,9 +331,10 @@ public <T> T refundquery(RefundOrder refundOrder, Callback<T> callback) {
329331
* @return 返回支付方下载对账单的结果
330332
*/
331333
@Override
332-
public Map<String, Object> downloadBill(Date billDate, String billType){
334+
public Map<String, Object> downloadBill(Date billDate, String billType) {
333335
return Collections.emptyMap();
334336
}
337+
335338
/**
336339
* 转账
337340
*
@@ -421,7 +424,6 @@ public void addPayMessageInterceptor(PayMessageInterceptor interceptor) {
421424
}
422425

423426

424-
425427
/**
426428
* 将请求参数或者请求流转化为 Map
427429
*
@@ -432,7 +434,7 @@ public void addPayMessageInterceptor(PayMessageInterceptor interceptor) {
432434
@Deprecated
433435
@Override
434436
public PayOutMessage payBack(Map<String, String[]> parameterMap, InputStream is) {
435-
return payBack(new DefaultNoticeRequest(parameterMap, is));
437+
return payBack(new DefaultNoticeRequest(parameterMap, is));
436438
}
437439

438440
/**
@@ -445,7 +447,7 @@ public PayOutMessage payBack(Map<String, String[]> parameterMap, InputStream is)
445447
public PayOutMessage payBack(NoticeRequest request) {
446448
final NoticeParams noticeParams = getNoticeParams(request);
447449
if (LOG.isDebugEnabled()) {
448-
LOG.debug("回调响应:{}" , JSON.toJSONString(noticeParams));
450+
LOG.debug("回调响应:{}", JSON.toJSONString(noticeParams));
449451
}
450452
if (!verify(noticeParams)) {
451453
return getPayOutMessage("fail", "失败");
@@ -480,26 +482,30 @@ public PayMessage createMessage(Map<String, Object> message) {
480482
* @param orderInfo 订单信息
481483
* @return 处理后订单信息
482484
*/
485+
@Override
483486
public <O extends PayOrder> Map<String, Object> preOrderHandler(Map<String, Object> orderInfo, O payOrder) {
484487
return orderInfo;
485488
}
486489

487490
/**
488491
* 过时
492+
*
489493
* @param parameters 参数map
490-
* @param key key
491-
* @param value 值
494+
* @param key key
495+
* @param value 值
492496
* @return 返回订单参数
493497
*/
494498
@Deprecated
495499
protected Map<String, Object> setParameters(Map<String, Object> parameters, String key, String value) {
496500
return OrderParaStructure.loadParameters(parameters, key, value);
497501
}
502+
498503
/**
499504
* 过时
505+
*
500506
* @param parameters 参数map
501-
* @param key key
502-
* @param order 订单对象
507+
* @param key key
508+
* @param order 订单对象
503509
* @return 返回订单参数
504510
*/
505511
@Deprecated

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ public static JSONObject getParametersToMap(String str) {
146146
boolean isOpen = false;//值里有嵌套
147147
char openName = 0;
148148
if (len > 0) {
149-
for (int i = 0; i < len; i++) {// 遍历整个带解析的字符串
149+
// 遍历整个带解析的字符串
150+
for (int i = 0; i < len; i++) {
150151
curChar = str.charAt(i);// 取当前字符
151152
if (isKey) {// 如果当前生成的是key
152153

@@ -177,7 +178,7 @@ public static JSONObject getParametersToMap(String str) {
177178
}
178179
}
179180
if (curChar == '&' && !isOpen) {// 如果读取到&分割符,同时这个分割符不是值域，这时将map里添加
180-
putKeyValueToMap(temp, isKey, key, map);
181+
putKeyValueToMap(temp, false, key, map);
181182
temp.setLength(0);
182183
isKey = true;
183184
}

‎pay-java-demo/pom.xml

Lines changed: 6 additions & 2 deletions
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>war</packaging>
@@ -84,7 +84,11 @@
8484
<artifactId>jackson-databind</artifactId>
8585
<version>2.9.10.6</version>
8686
</dependency>
87-
87+
<dependency>
88+
<groupId>org.slf4j</groupId>
89+
<artifactId>slf4j-log4j12</artifactId>
90+
<version>1.7.30</version>
91+
</dependency>
8892
</dependencies>
8993

9094
<build>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class WxV3PayController {
4545
private WxPayService service = null;
4646

4747

48-
@PostConstruct //没有证书的情况下注释掉，避免启动报错
48+
// @PostConstruct //没有证书的情况下注释掉，避免启动报错
4949
public void init() {
5050
WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
5151
wxPayConfigStorage.setAppId("wxc7b993ff15a9f26c");

‎pay-java-fuiou/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>pay-java-fuiou</artifactId>

‎pay-java-payoneer/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>pay-java-payoneer</artifactId>

‎pay-java-paypal/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public Map<String, Object> refundquery(RefundOrder refundOrder) {
518518
JSONObject resp = getHttpRequestTemplate().getForObject(getReqUrl(PayPalTransactionType.REFUND_GET), authHeader(), JSONObject.class, refundOrder.getRefundNo());
519519
return resp;
520520
}
521-
521+
@Override
522522
public Map<String, Object> downloadBill(Date billDate, BillType billType) {
523523
return Collections.emptyMap();
524524
}

‎pay-java-union/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ public boolean verify(Map<String, Object> result) {
231231
* @param noticeParams 回调回来的参数集
232232
* @return 签名校验 true通过
233233
*/
234+
@Override
234235
public boolean verify(NoticeParams noticeParams) {
235236
final Map<String, Object> result = noticeParams.getBody();
236237
if (null == result || result.get(SDKConstants.param_signature) == null) {
@@ -719,6 +720,7 @@ public Map<String, Object> refundquery(RefundOrder refundOrder) {
719720
* @param fileType 文件类型 文件类型，一般商户填写00即可
720721
* @return 返回fileContent 请自行将数据落地
721722
*/
723+
@Override
722724
public Map<String, Object> downloadBill(Date billDate, String fileType) {
723725
return downloadBill(billDate, new UnionPayBillType(fileType));
724726
}

‎pay-java-web-support/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>

‎pay-java-wx-youdian/pom.xml

Lines changed: 1 addition & 1 deletion
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.14.4-fix</version>
8+
<version>2.14.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>pay-java-wx-youdian</artifactId>

0 commit comments

Comments
 (0)
Please sign in to comment.