lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-06-06 08:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.14.2

Browse Source
This commit is contained in:
egzosn
2021-10-06 17:14:59 +08:00
parent 5d47e3e0fa
commit 9c02712ae9
23 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -21,7 +21,7 @@
<dependency>
<groupId>com.egzosn</groupId>
<artifactId>{module-name}</artifactId>
<version>2.14.1-b</version>
<version>2.14.2</version>
</dependency>
```

2
pay-java-ali/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-ali</artifactId>

2
pay-java-baidu/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-baidu</artifactId>

3
pay-java-common/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -30,7 +30,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<!-- / log4j -->

6
pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java
View File

@@ -5,8 +5,10 @@ import java.util.Map;
/**
* 关闭订单
* @author Egan
* @email egan@egzosn.com
* @date 2021/10/6
* <pre>
* email egan@egzosn.com
* date 2021/10/6
* </pre>
*/
public class CloseOrder implements Order {

2
pay-java-demo/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>

2
pay-java-fuiou/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-fuiou</artifactId>

2
pay-java-payoneer/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-payoneer</artifactId>

2
pay-java-paypal/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pay-java-union/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pay-java-web-support/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

2
pay-java-wx-youdian/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-wx-youdian</artifactId>

2
pay-java-wx/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-wx</artifactId>

2
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java
View File

@@ -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 请求实体

1
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java
View File

@@ -69,7 +69,6 @@ public class WxCombinePayService extends WxPayService {
*
* @param parameters 订单参数
* @param order 订单信息
* @return 订单参数
*/
public void initNotifyUrl(Map<String, Object> parameters, Order order) {
OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl());

3
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java
View File

@@ -52,7 +52,6 @@ public class WxParameterStructure {
*
* @param parameters 订单参数
* @param order 支付订单
* @return 订单参数
*/
public void loadSettleInfo(Map<String, Object> 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<String, Object> 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<String, Object> parameters) {
if (null == parameters) {

1
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java
View File

@@ -53,6 +53,7 @@ public interface WxPayAssistService {
* 构建请求实体
* 这里也做签名处理
*
* @param url url
* @param body 请求内容体
* @param method 请求方法
* @return 请求实体

6
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java
View File

@@ -8,8 +8,10 @@ import com.egzosn.pay.wx.v3.utils.WxConst;
/**
* 微信合单关闭订单
* @author Egan
* @email egan@egzosn.com
* @date 2021/10/6
* <pre>
* email egan@egzosn.com
* date 2021/10/6
* </pre>
*/
public class CombineCloseOrder extends CloseOrder {

2
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java
View File

@@ -113,7 +113,7 @@ public class WxPayMessage extends PayMessage {
* 退款状态，枚举值：
* SUCCESS：退款成功
* CLOSE：退款关闭
* ABNORMAL：退款异常，退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往【商户平台—>交易中心】，手动处理此笔退款
* ABNORMAL: 退款异常，退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往【商户平台—交易中心】，手动处理此笔退款
* 示例值：SUCCESS
*/
@JSONField(name = "refund_status")

6
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java
View File

@@ -7,8 +7,10 @@ import com.alibaba.fastjson.annotation.JSONField;
/**
* 优惠功能
*
* @author felord.cn
* @since 1.0.0.RELEASE
* <pre>
* email egan@egzosn.com
* date 2021/10/6
* </pre>
*/
public class PromotionDetail {

18
pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java
View File

@@ -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 {

2
pay-java-yiji/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

10
pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>com.egzosn</groupId>
<artifactId>pay-java-parent</artifactId>
<packaging>pom</packaging>
<version>2.14.2-SNAPSHOT</version>
<version>2.14.2</version>
<name>Pay Java - Parent</name>
<description>Pay Java Parent</description>
@@ -70,7 +70,7 @@
<properties>
<pay.version>2.14.2-SNAPSHOT</pay.version>
<pay.version>2.14.2</pay.version>
<httpmime.version>4.5.4</httpmime.version>
<log4j.version>1.2.17</log4j.version>
<fastjson.version>1.2.73</fastjson.version>
@@ -110,9 +110,9 @@
<!-- log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<!-- / log4j -->