Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1

Merged
merged 4 commits into from
Sep 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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 {

/**
Expand All @@ -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);
}
}

/**
* 创建临时文件.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -43,7 +43,7 @@ public static class Date implements Serializable {
private String type;

@SerializedName("s_timestamp")
private Double timestamp;
private String timestamp;
}

@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@Data
@NoArgsConstructor
public class ApplymentsStatusResult implements Serializable {
private static final long serialVersionUID = 1488464536143984732L;
/**
* <pre>
* 字段名:申请状态
Expand Down
Loading