From 9c02712ae9ea8fc0dd605d962303485ee3af250d Mon Sep 17 00:00:00 2001 From: egzosn Date: Wed, 6 Oct 2021 17:14:59 +0800 Subject: [PATCH] 2.14.2 --- README.md | 2 +- pay-java-ali/pom.xml | 2 +- pay-java-baidu/pom.xml | 2 +- pay-java-common/pom.xml | 3 +-- .../com/egzosn/pay/common/bean/CloseOrder.java | 6 ++++-- pay-java-demo/pom.xml | 2 +- pay-java-fuiou/pom.xml | 2 +- pay-java-payoneer/pom.xml | 2 +- pay-java-paypal/pom.xml | 2 +- pay-java-union/pom.xml | 2 +- pay-java-web-support/pom.xml | 2 +- pay-java-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- .../wx/v3/api/DefaultWxPayAssistService.java | 2 +- .../pay/wx/v3/api/WxCombinePayService.java | 1 - .../pay/wx/v3/api/WxParameterStructure.java | 3 --- .../pay/wx/v3/api/WxPayAssistService.java | 1 + .../wx/v3/bean/combine/CombineCloseOrder.java | 6 ++++-- .../pay/wx/v3/bean/response/WxPayMessage.java | 2 +- .../bean/response/order/PromotionDetail.java | 6 ++++-- .../pay/wx/v3/utils/AntCertificationUtil.java | 18 ++++++++++-------- pay-java-yiji/pom.xml | 2 +- pom.xml | 10 +++++----- 23 files changed, 43 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index bad91f0..ff69992 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ com.egzosn {module-name} - 2.14.1-b + 2.14.2 ``` diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index 7e4683a..7d743ce 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 pay-java-ali diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml index 8861985..7fbb57d 100644 --- a/pay-java-baidu/pom.xml +++ b/pay-java-baidu/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 pay-java-baidu diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index fb24df8..f19fd5b 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 jar @@ -30,7 +30,6 @@ org.slf4j slf4j-api - 1.7.30 diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java index b7e975a..4d50e86 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java @@ -5,8 +5,10 @@ import java.util.Map; /** * 关闭订单 * @author Egan - * @email egan@egzosn.com - * @date 2021/10/6 + * 
+ * email egan@egzosn.com
+ * date 2021/10/6
+ *
*/ public class CloseOrder implements Order { diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index a95cbba..125b476 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 war diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 4ba3acd..8685c30 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index a8e8334..c920ab0 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index ce4d4a7..4e0f8bd 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index c1ca7f9..2a00ed4 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/pay-java-web-support/pom.xml b/pay-java-web-support/pom.xml index 7389396..539f476 100644 --- a/pay-java-web-support/pom.xml +++ b/pay-java-web-support/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 jar diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index e88c55c..8f3827a 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index b0d3669..d9ad6ff 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 pay-java-wx diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java index a6d0e1b..906a529 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java @@ -47,7 +47,6 @@ import com.egzosn.pay.wx.v3.utils.WxConst; * date 2021/8/7 */ public class DefaultWxPayAssistService implements WxPayAssistService { - protected final Logger LOG = LoggerFactory.getLogger(getClass()); private WxPayConfigStorage payConfigStorage; private HttpRequestTemplate requestTemplate; @@ -118,6 +117,7 @@ public class DefaultWxPayAssistService implements WxPayAssistService { * 构建请求实体 * 这里也做签名处理 * + * @param url url * @param body 请求内容体 * @param method 请求方法 * @return 请求实体 diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java index 4c99699..0a19bf0 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java @@ -69,7 +69,6 @@ public class WxCombinePayService extends WxPayService { * * @param parameters 订单参数 * @param order 订单信息 - * @return 订单参数 */ public void initNotifyUrl(Map parameters, Order order) { OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl()); diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java index a0bba61..b949b8b 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java @@ -52,7 +52,6 @@ public class WxParameterStructure { * * @param parameters 订单参数 * @param order 支付订单 - * @return 订单参数 */ public void loadSettleInfo(Map parameters, PayOrder order) { Object profitSharing = order.getAttr("profit_sharing"); @@ -74,7 +73,6 @@ public class WxParameterStructure { * * @param parameters 订单参数 * @param order 订单信息 - * @return 订单参数 */ public void initNotifyUrl(Map parameters, Order order) { OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl()); @@ -95,7 +93,6 @@ public class WxParameterStructure { * 初始化商户相关信息 * * @param parameters 参数信息 - * @return 参数信息 */ public void initPartner(Map parameters) { if (null == parameters) { diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java index 8bf20e9..58bfe74 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java @@ -53,6 +53,7 @@ public interface WxPayAssistService { * 构建请求实体 * 这里也做签名处理 * + * @param url url * @param body 请求内容体 * @param method 请求方法 * @return 请求实体 diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java index cef6267..dfe9c84 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java @@ -8,8 +8,10 @@ import com.egzosn.pay.wx.v3.utils.WxConst; /** * 微信合单关闭订单 * @author Egan - * @email egan@egzosn.com - * @date 2021/10/6 + * 
+ * email egan@egzosn.com
+ * date 2021/10/6
+ *
*/ public class CombineCloseOrder extends CloseOrder { diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java index f02ffc4..e058663 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java @@ -113,7 +113,7 @@ public class WxPayMessage extends PayMessage { * 退款状态，枚举值： * SUCCESS：退款成功 * CLOSE：退款关闭 - * ABNORMAL：退款异常，退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往【商户平台—>交易中心】，手动处理此笔退款 + * ABNORMAL: 退款异常，退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往【商户平台—交易中心】，手动处理此笔退款 * 示例值：SUCCESS */ @JSONField(name = "refund_status") diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java index 697355e..2d6e6e6 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java @@ -7,8 +7,10 @@ import com.alibaba.fastjson.annotation.JSONField; /** * 优惠功能 * - * @author felord.cn - * @since 1.0.0.RELEASE + * 
+ * email egan@egzosn.com
+ * date 2021/10/6
+ *
*/ public class PromotionDetail { diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java index 1807787..2c4cedb 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java @@ -67,9 +67,10 @@ public final class AntCertificationUtil { /** * 装载平台证书 - * @param serialNo 证书序列 + * + * @param serialNo 证书序列 * @param certificateStream 证书流 - * @return + * @return 平台证书 */ public static Certificate loadCertificate(String serialNo, InputStream certificateStream) { try { @@ -127,10 +128,12 @@ public final class AntCertificationUtil { /** * 解密响应体. * - * @param associatedData 相关数据 - * @param nonce 随机串 - * @param cipherText 需要解密的文本 - * @return the string + * @param associatedData 相关数据 + * @param nonce 随机串 + * @param cipherText 需要解密的文本 + * @param secretKey 密钥 + * @param characterEncoding 编码类型 + * @return 解密后的信息 */ public static String decryptToString(String associatedData, String nonce, String cipherText, String secretKey, String characterEncoding) { @@ -153,8 +156,7 @@ public final class AntCertificationUtil { * * @param message the message * @param certificate the certificate - * @return encrypt message - * @since 1.0.6.RELEASE + * @return 加密后的内容 */ public static String encryptToString(String message, Certificate certificate) { try { diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml index 2458fcf..c8e4428 100644 --- a/pay-java-yiji/pom.xml +++ b/pay-java-yiji/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/pom.xml b/pom.xml index a1d07ce..9c6be50 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.14.2-SNAPSHOT + 2.14.2 Pay Java - Parent Pay Java Parent @@ -70,7 +70,7 @@ - 2.14.2-SNAPSHOT + 2.14.2 4.5.4 1.2.17 1.2.73 @@ -110,9 +110,9 @@ - log4j - log4j - ${log4j.version} + org.slf4j + slf4j-api + 1.7.30