@@ -80,7 +59,6 @@
* 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 static void closeQuietly(Closeable closeable) {
if (closeable != null) {
closeable.close();
}
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
// ignore
}
}
@@ -316,8 +293,7 @@ public static void closeQuietly(Socket sock) {
if (sock != null) {
try {
sock.close();
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
// ignored
}
}
@@ -350,8 +326,7 @@ public static void closeQuietly(Selector selector) {
if (selector != null) {
try {
selector.close();
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
// ignored
}
}
@@ -384,8 +359,7 @@ public static void closeQuietly(ServerSocket sock) {
if (sock != null) {
try {
sock.close();
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
// ignored
}
}
@@ -409,7 +383,6 @@ public static void closeQuietly(ServerSocket sock) {
*
* @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 static byte[] toByteArray(URL url) throws IOException {
URLConnection conn = url.openConnection();
try {
return IOUtils.toByteArray(conn);
- }
- finally {
+ } finally {
close(conn);
}
}
@@ -631,8 +603,7 @@ public static byte[] toByteArray(URLConnection urlConn) throws IOException {
InputStream inputStream = urlConn.getInputStream();
try {
return IOUtils.toByteArray(inputStream);
- }
- finally {
+ } finally {
inputStream.close();
}
}
@@ -864,8 +835,7 @@ public static String toString(URL url, Charset encoding) throws IOException {
InputStream inputStream = url.openStream();
try {
return toString(inputStream, encoding);
- }
- finally {
+ } finally {
inputStream.close();
}
}
@@ -2252,7 +2222,7 @@ public static void skipFully(Reader input, long toSkip) throws IOException {
* @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 static int read(Reader input, char[] buffer) throws IOException {
* @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 static int read(InputStream input, byte[] buffer) throws IOException {
* @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 static void readFully(Reader input, char[] buffer) throws IOException {
* @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 79c68053..e8444984 100644
--- a/pay-java-demo/pom.xml
+++ b/pay-java-demo/pom.xml
@@ -5,7 +5,7 @@
* 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 45ce907e..28b4f3da 100644
--- a/pay-java-yiji/pom.xml
+++ b/pay-java-yiji/pom.xml
@@ -5,7 +5,7 @@