zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

change test

Browse Source
This commit is contained in:
Looly
2020-12-02 22:21:21 +08:00
parent cc43e39515
commit 6c76e9258b
10 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java
View File

@@ -1,6 +1,7 @@
package cn.hutool.core.io;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjectUtil;
import java.io.IOException;
import java.io.OutputStream;
@@ -90,7 +91,7 @@ public class FastByteArrayOutputStream extends OutputStream {
@Override
public String toString() {
return new String(toByteArray());
return toString(CharsetUtil.defaultCharset());
}
/**
@@ -104,11 +105,12 @@ public class FastByteArrayOutputStream extends OutputStream {
/**
* 转为字符串
* @param charset 编码
* @param charset 编码,null表示默认编码
* @return 字符串
*/
public String toString(Charset charset) {
return new String(toByteArray(), charset);
return new String(toByteArray(),
ObjectUtil.defaultIfNull(charset, CharsetUtil.defaultCharset()));
}
}

3
hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartFormData.java
View File

@@ -2,7 +2,6 @@ package cn.hutool.core.net.multipart;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.map.multi.ListValueMap;
import java.io.IOException;
@@ -78,7 +77,7 @@ public class MultipartFormData {
putFile(header.formFieldName, newFile);
} else {
// 标准表单项
putParameter(header.formFieldName, IoUtil.read(input, charset));
putParameter(header.formFieldName, input.readString(charset));
}
input.skipBytes(1);

17
hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartRequestInputStream.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.core.net.multipart;
import cn.hutool.core.io.FastByteArrayOutputStream;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -144,7 +146,20 @@ public class MultipartRequestInputStream extends BufferedInputStream {
// ---------------------------------------------------------------- copy
/**
* 全部字节流复制到out
* 读取字节流，直到下一个boundary
*
* @param charset 编码，null表示系统默认编码
* @return 读取的字符串
* @throws IOException 读取异常
*/
public String readString(Charset charset) throws IOException {
final FastByteArrayOutputStream out = new FastByteArrayOutputStream();
copy(out);
return out.toString(charset);
}
/**
* 字节流复制到out，直到下一个boundary
*
* @param out 输出流
* @return 复制的字节数