Merge pull request #1 from Wechat-Group/develop

Develop

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 static File createTmpFile(InputStream inputStream, String name, String ex
     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);
+    }
+  }
+
   /**
    * 创建临时文件.
    *

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 static class Date implements Serializable {
     private String type;
 
     @SerializedName("s_timestamp")
-    private Double timestamp;
+    private String timestamp;
   }
 
   @Data

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java

@@ -792,6 +792,18 @@ public static class SalesSceneInfo implements Serializable {
     @SerializedName(value = "store_qr_code")
     private String storeQrCode;
 
+    /**
+     * <pre>
+     * 字段名：小程序AppID
+     * 变量名：mini_program_sub_appid
+     * 是否必填：否
+     * 类型：string(256)
+     * 描述：
+     * </pre>
+     */
+    @SerializedName(value = "mini_program_sub_appid")
+    private String miniProgramSubAppid;
+
   }
 
 }

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java

@@ -14,6 +14,7 @@
 @Data
 @NoArgsConstructor
 public class ApplymentsStatusResult implements Serializable {
+  private static final long serialVersionUID = 1488464536143984732L;
   /**
    * <pre>
    * 字段名：申请状态