lywsvip/pay-java-parent
1
0
Fork 0
mirror of https://gitee.com/egzosn/pay-java-parent.git synced 2026-05-07 19:46:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.13.3

Browse Source
This commit is contained in:
egzosn
2020-12-01 22:42:52 +08:00
parent 7e05435b1f
commit fc60b4553e
17 changed files with 42 additions and 70 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.13.2</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-baidu</artifactId>

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

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

60
pay-java-common/src/main/java/com/egzosn/pay/common/util/IOUtils.java
View File

@@ -16,29 +16,10 @@
*/
package com.egzosn.pay.common.util;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.CharArrayWriter;
import java.io.Closeable;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.HttpURLConnection;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import org.apache.commons.codec.Charsets;
import java.io.*;
import java.net.*;
import java.nio.channels.Selector;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
@@ -46,8 +27,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.commons.codec.Charsets;
/**
* General IO stream manipulation utilities.
* <p>
@@ -80,7 +59,6 @@ import org.apache.commons.codec.Charsets;
* Origin of code: Excalibur.
*
* @version $Id: IOUtils.java 1326636 2012-04-16 14:54:53Z ggregory $
*
*/
public class IOUtils {
// NOTE: This class is focussed on InputStream, OutputStream, Reader and
@@ -283,8 +261,7 @@ public class IOUtils {
if (closeable != null) {
closeable.close();
}
}
catch (IOException ioe) {
} catch (IOException ioe) {
// ignore
}
}
@@ -316,8 +293,7 @@ public class IOUtils {
if (sock != null) {
try {
sock.close();
}
catch (IOException ioe) {
} catch (IOException ioe) {
// ignored
}
}
@@ -350,8 +326,7 @@ public class IOUtils {
if (selector != null) {
try {
selector.close();
}
catch (IOException ioe) {
} catch (IOException ioe) {
// ignored
}
}
@@ -384,8 +359,7 @@ public class IOUtils {
if (sock != null) {
try {
sock.close();
}
catch (IOException ioe) {
} catch (IOException ioe) {
// ignored
}
}
@@ -409,7 +383,6 @@ public class IOUtils {
*
* @param input Stream to be fully buffered.
* @return A fully buffered stream.
* @throws IOException if an I/O error occurs
* @since 2.0
*/
public static InputStream toBufferedInputStream(InputStream input) {
@@ -612,8 +585,7 @@ public class IOUtils {
URLConnection conn = url.openConnection();
try {
return IOUtils.toByteArray(conn);
}
finally {
} finally {
close(conn);
}
}
@@ -631,8 +603,7 @@ public class IOUtils {
InputStream inputStream = urlConn.getInputStream();
try {
return IOUtils.toByteArray(inputStream);
}
finally {
} finally {
inputStream.close();
}
}
@@ -864,8 +835,7 @@ public class IOUtils {
InputStream inputStream = url.openStream();
try {
return toString(inputStream, encoding);
}
finally {
} finally {
inputStream.close();
}
}
@@ -2252,7 +2222,7 @@ public class IOUtils {
* @param input where to read input from
* @param buffer destination
* @param offset inital offset into buffer
* @param length length to read, must be >= 0
* @param length length to read, must
* @return actual length read; may be less than requested if EOF was reached
* @throws IOException if a read error occurs
* @since 2.2
@@ -2298,7 +2268,7 @@ public class IOUtils {
* @param input where to read input from
* @param buffer destination
* @param offset inital offset into buffer
* @param length length to read, must be >= 0
* @param length length to read,
* @return actual length read; may be less than requested if EOF was reached
* @throws IOException if a read error occurs
* @since 2.2
@@ -2344,7 +2314,7 @@ public class IOUtils {
* @param input where to read input from
* @param buffer destination
* @param offset inital offset into buffer
* @param length length to read, must be >= 0
* @param length length to read, must
* @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
* @throws EOFException if the number of characters read was incorrect
@@ -2383,7 +2353,7 @@ public class IOUtils {
* @param input where to read input from
* @param buffer destination
* @param offset inital offset into buffer
* @param length length to read, must be >= 0
* @param length length to read
* @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
* @throws EOFException if the number of bytes read was incorrect

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

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.13.3-SNAPSHOT</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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.13.3-SNAPSHOT</version>
<version>2.13.3</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.13.3-SNAPSHOT</version>
<version>2.13.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pay-java-wx</artifactId>

8
pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java
View File

@@ -4,12 +4,12 @@ import java.util.Date;
import java.util.Map;
/**
* @description:账单接口
* 账单接口
* @author: faymanwang
* @email: 1057438332@qq.com
* @time: 2020/7/31 11:21
* email: 1057438332@qq.com
* time: 2020/7/31 11:21
*/
public interface WxBillService {
public Map<String, Object> downloadbill(Date billDate, String billType, String path);
Map<String, Object> downloadbill(Date billDate, String billType, String path);
}

5
pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
View File

@@ -626,8 +626,9 @@ public class WxPayService extends BasePayService<WxPayConfigStorage> implements
/**
* GZIP解压缩
*
* @param input
* @return
* @param input 输入流账单
* @return 解压后输入流
* @throws IOException IOException
*/
public static InputStream uncompress(InputStream input) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();

11
pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxRefundResult.java
View File

@@ -11,9 +11,10 @@ import com.egzosn.pay.common.bean.CurType;
/**
* 微信退款结果
* @author Egan
* <pre></pre>
* <pre>
* email egzosn@gmail.com
* date 2020/8/16 21:29
* </pre>
*/
public class WxRefundResult extends BaseRefundResult {
@@ -123,7 +124,7 @@ public class WxRefundResult extends BaseRefundResult {
private BigDecimal refundFee;
/**
* 应结退款金额
* 去掉非充值代金券退款金额后的退款金额，退款金额=申请退款金额-非充值代金券退款金额，退款金额<=申请退款金额
* 去掉非充值代金券退款金额后的退款金额，退款金额=申请退款金额-非充值代金券退款金额，退款金额&lt;=申请退款金额
*/
@JSONField(name = "settlement_refund_fee")
private BigDecimal settlementRefundFee;
@@ -135,7 +136,7 @@ public class WxRefundResult extends BaseRefundResult {
private BigDecimal totalFee;
/**
* 应结订单金额
* 去掉非充值代金券金额后的订单总金额，应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
* 去掉非充值代金券金额后的订单总金额，应结订单金额=订单金额-非充值代金券金额，应结订单金额&lt;=订单金额。
*/
@JSONField(name = "settlement_total_fee")
private BigDecimal settlementTotalFee;
@@ -176,13 +177,13 @@ public class WxRefundResult extends BaseRefundResult {
private String couponType0;
/**
* 代金券退款总金额
* 代金券退款金额<=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
* 代金券退款金额&lt;=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
*/
@JSONField(name = "coupon_refund_fee")
private BigDecimal couponRefundFee;
/**
* 单个代金券退款金额
* 代金券退款金额<=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
* 代金券退款金额&lt;=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
* 这里只接收0的，其余请自行获取
*/
@JSONField(name = "coupon_refund_fee_0")

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

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

4
pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>com.egzosn</groupId>
<artifactId>pay-java-parent</artifactId>
<packaging>pom</packaging>
<version>2.13.3-SNAPSHOT</version>
<version>2.13.3</version>
<name>Pay Java - Parent</name>
<description>Pay Java Parent</description>
@@ -64,7 +64,7 @@
<properties>
<pay.version>2.13.3-SNAPSHOT</pay.version>
<pay.version>2.13.3</pay.version>
<httpmime.version>4.5.4</httpmime.version>
<log4j.version>1.2.17</log4j.version>
<fastjson.version>1.2.73</fastjson.version>