From 7bf811aa57f6da1cf9524186d03e30c2b165b66a Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 10 Sep 2020 12:45:40 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/util/fs/FileUtils.java      | 13 ++++++++++-
 .../cp/bean/oa/applydata/ContentValue.java    |  6 ++---
 .../ecommerce/ApplymentsStatusResult.java     |  1 +
 .../CombineTransactionsNotifyResult.java      |  1 +
 .../ecommerce/CombineTransactionsRequest.java |  1 +
 .../wxpay/bean/ecommerce/NotifyResponse.java  |  2 +-
 .../PartnerTransactionsNotifyResult.java      |  2 +-
 .../ecommerce/PartnerTransactionsRequest.java |  2 +-
 .../wxpay/bean/ecommerce/SignatureHeader.java |  2 +-
 .../bean/ecommerce/TransactionsResult.java    |  2 +-
 .../bean/ecommerce/enums/TradeTypeEnum.java   | 22 ++++++++++++++-----
 11 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
index a00c9cbad..d60f5cedd 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
@@ -1,11 +1,16 @@
 package me.chanjar.weixin.common.util.fs;
 
+import org.apache.commons.io.IOUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.Base64;
 
+import static org.apache.commons.io.FileUtils.openOutputStream;
+
 public class FileUtils {
 
   /**
@@ -20,10 +25,16 @@ public class FileUtils {
     File resultFile = File.createTempFile(name, '.' + ext, tmpDirFile);
 
     resultFile.deleteOnExit();
-    org.apache.commons.io.FileUtils.copyToFile(inputStream, resultFile);
+    copyToFile(inputStream, resultFile);
     return resultFile;
   }
 
+  private static void copyToFile(final InputStream source, final File destination) throws IOException {
+    try (InputStream in = source; OutputStream out = openOutputStream(destination)) {
+      IOUtils.copy(in, out);
+    }
+  }
+
   /**
    * 创建临时文件.
    *
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
index 54e19a4bf..19c023192 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
@@ -18,10 +18,10 @@ public class ContentValue implements Serializable {
   private String text;
 
   @SerializedName("new_number")
-  private Double newNumber;
+  private String newNumber;
 
   @SerializedName("new_money")
-  private Double newMoney;
+  private String newMoney;
 
   private ContentValue.Date date;
 
@@ -43,7 +43,7 @@ public class ContentValue implements Serializable {
     private String type;
 
     @SerializedName("s_timestamp")
-    private Double timestamp;
+    private String timestamp;
   }
 
   @Data
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
index b3704d652..a12c3d4a8 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
@@ -14,6 +14,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 public class ApplymentsStatusResult implements Serializable {
+  private static final long serialVersionUID = 1488464536143984732L;
   /**
    * <pre>
    * 字段名：申请状态
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
index 889b835af..0f0196a8c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
@@ -17,6 +17,7 @@ import java.util.List;
 @NoArgsConstructor
 public class CombineTransactionsNotifyResult implements Serializable {
 
+  private static final long serialVersionUID = -4710926828683593250L;
   /**
    * 源数据
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
index 61fac62ea..9cc0d4b33 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
@@ -16,6 +16,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 public class CombineTransactionsRequest implements Serializable {
+  private static final long serialVersionUID = -1242741645939606441L;
   /**
    * <pre>
    * 字段名：合单商户appid
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java
index c4f0a387e..4db416bdd 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 public class NotifyResponse implements Serializable {
-
+  private static final long serialVersionUID = 341873114458149365L;
   @SerializedName(value = "id")
   private String id;
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
index 77f3aa3bc..abb4bfe73 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 public class PartnerTransactionsNotifyResult implements Serializable {
-
+  private static final long serialVersionUID = -6602962275015706689L;
   /**
    * 源数据
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java
index a324b616b..b1ace4d57 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java
@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 public class PartnerTransactionsRequest implements Serializable {
-
+  private static final long serialVersionUID = -1550405819444680465L;
   /**
    * <pre>
    * 字段名：服务商公众号ID
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
index 1becb23b4..bd50ac89d 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 public class SignatureHeader implements Serializable {
-
+  private static final long serialVersionUID = -6958015499416059949L;
   /**
    * 时间戳
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
index 99ba866cf..12a22ead7 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
@@ -16,7 +16,7 @@ import java.security.PrivateKey;
 @Data
 @NoArgsConstructor
 public class TransactionsResult implements Serializable {
-
+  private static final long serialVersionUID = 1760592667519950149L;
   /**
    * <pre>
    * 字段名：预支付交易会话标识 （APP支付、JSAPI支付 会返回）
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
index 7c54925b6..e8bd5ccba 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
@@ -9,12 +9,22 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum TradeTypeEnum {
-
-  APP("/v3/combine-transactions/app","/v3/pay/partner/transactions/app"),
-  JSAPI("/v3/combine-transactions/jsapi","/v3/pay/partner/transactions/jsapi"),
-  NATIVE("/v3/combine-transactions/native","/v3/pay/partner/transactions/native"),
-  MWEB("/v3/combine-transactions/h5","/v3/pay/partner/transactions/h5")
-  ;
+  /**
+   * APP
+   */
+  APP("/v3/combine-transactions/app", "/v3/pay/partner/transactions/app"),
+  /**
+   * JSAPI
+   */
+  JSAPI("/v3/combine-transactions/jsapi", "/v3/pay/partner/transactions/jsapi"),
+  /**
+   * NATIVE
+   */
+  NATIVE("/v3/combine-transactions/native", "/v3/pay/partner/transactions/native"),
+  /**
+   * MWEB
+   */
+  MWEB("/v3/combine-transactions/h5", "/v3/pay/partner/transactions/h5");
 
   /**
    * 合单url