From fc60b4553ef2149c258ee3b3e531bcb7c2a4ac35 Mon Sep 17 00:00:00 2001 From: egzosn Date: Tue, 1 Dec 2020 22:42:52 +0800 Subject: [PATCH] 2.13.3 --- README.md | 2 +- pay-java-ali/pom.xml | 2 +- pay-java-baidu/pom.xml | 2 +- pay-java-common/pom.xml | 2 +- .../com/egzosn/pay/common/util/IOUtils.java | 60 +++++-------------- 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-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- .../com/egzosn/pay/wx/api/WxBillService.java | 8 +-- .../com/egzosn/pay/wx/api/WxPayService.java | 5 +- .../egzosn/pay/wx/bean/WxRefundResult.java | 11 ++-- pay-java-yiji/pom.xml | 2 +- pom.xml | 4 +- 17 files changed, 42 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 576cce4..d904512 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ com.egzosn {module-name} - 2.13.2 + 2.13.3 ``` diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index cda91f0..e48d462 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 pay-java-ali diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml index 5e39ceb..4f4a174 100644 --- a/pay-java-baidu/pom.xml +++ b/pay-java-baidu/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 pay-java-baidu diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index 1c79c00..0adcfa5 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/IOUtils.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/IOUtils.java index 25c6761..9b15a56 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/IOUtils.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/IOUtils.java @@ -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. *

@@ -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 diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index 79c6805..e844498 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 war diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 7d1b18e..32e6b7f 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index 7a79e0c..dcc61df 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index 0fba2f8..f330606 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index abff084..e154945 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index d43cfda..2b218bb 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.13.3-SNAPSHOT + 2.13.3 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index f2dca76..9877cd3 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.3-SNAPSHOT + 2.13.3 4.0.0 pay-java-wx diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java index bf01bbd..eeed364 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java @@ -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 downloadbill(Date billDate, String billType, String path); + Map downloadbill(Date billDate, String billType, String path); } diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 4d9769a..84d3e4c 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -626,8 +626,9 @@ public class WxPayService extends BasePayService implements /** * GZIP解压缩 * - * @param input - * @return + * @param input 输入流账单 + * @return 解压后输入流 + * @throws IOException IOException */ public static InputStream uncompress(InputStream input) throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxRefundResult.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxRefundResult.java index e17c385..ce3ade7 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxRefundResult.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxRefundResult.java @@ -11,9 +11,10 @@ import com.egzosn.pay.common.bean.CurType; /** * 微信退款结果 * @author Egan - * 


+ * 
  * email egzosn@gmail.com
  * date 2020/8/16 21:29
+ * 

  */
 public class WxRefundResult extends BaseRefundResult {
 
@@ -123,7 +124,7 @@ public class WxRefundResult extends BaseRefundResult {
     private BigDecimal refundFee;
     /**
      * 应结退款金额
-     * 去掉非充值代金券退款金额后的退款金额，退款金额=申请退款金额-非充值代金券退款金额，退款金额<=申请退款金额
+     * 去掉非充值代金券退款金额后的退款金额，退款金额=申请退款金额-非充值代金券退款金额，退款金额<=申请退款金额
      */
     @JSONField(name = "settlement_refund_fee")
     private BigDecimal settlementRefundFee;
@@ -135,7 +136,7 @@ public class WxRefundResult extends BaseRefundResult {
     private BigDecimal totalFee;
     /**
      * 应结订单金额
-     * 去掉非充值代金券金额后的订单总金额，应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
+     * 去掉非充值代金券金额后的订单总金额，应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
      */
     @JSONField(name = "settlement_total_fee")
     private BigDecimal settlementTotalFee;
@@ -176,13 +177,13 @@ public class WxRefundResult extends BaseRefundResult {
     private String couponType0;
     /**
      * 代金券退款总金额
-     * 代金券退款金额<=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
+     * 代金券退款金额<=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
      */
     @JSONField(name = "coupon_refund_fee")
     private BigDecimal couponRefundFee;
     /**
      * 单个代金券退款金额
-     * 代金券退款金额<=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
+     * 代金券退款金额<=退款金额，退款金额-代金券或立减优惠退款金额为现金，说明详见代金券或立减优惠
      * 这里只接收0的，其余请自行获取
      */
     @JSONField(name = "coupon_refund_fee_0")
diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml
index 45ce907..28b4f3d 100644
--- a/pay-java-yiji/pom.xml
+++ b/pay-java-yiji/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.3-SNAPSHOT
+        2.13.3
     
     4.0.0
 
diff --git a/pom.xml b/pom.xml
index 4a5dee5..43d418c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     com.egzosn
     pay-java-parent
     pom
-    2.13.3-SNAPSHOT
+    2.13.3
 
     Pay Java - Parent
     Pay Java Parent
@@ -64,7 +64,7 @@
 
 
     
-        2.13.3-SNAPSHOT
+        2.13.3
         4.5.4
         1.2.17
         1.2.73