lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-06-28 13:34:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix body length bug

Browse Source
This commit is contained in:
Looly 2019-08-20 10:42:29 +08:00
parent 576abb5cc6
commit 2f44d68e0b
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
### 新特性 ### 新特性
### Bug修复 ### Bug修复
* 【http】 修复HttpRquest中body方法长度计算问题（issue#I10UPG@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

6
hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
View File

@ -630,9 +630,10 @@ public class HttpRequest extends HttpBase<HttpRequest> {
* @return this * @return this
*/ */
public HttpRequest body(String body, String contentType) { public HttpRequest body(String body, String contentType) {
body(StrUtil.bytes(body, this.charset)); byte[] bytes = StrUtil.bytes(body, this.charset);
body(bytes);
this.form = null; // 当使用body时，停止form的使用 this.form = null; // 当使用body时，停止form的使用
contentLength((null != body ? body.length() : 0)); contentLength(bytes.length);
if (null != contentType) { if (null != contentType) {
// Content-Type自定义设置 // Content-Type自定义设置
@ -675,6 +676,7 @@ public class HttpRequest extends HttpBase<HttpRequest> {
* @return this * @return this
*/ */
public HttpRequest body(byte[] bodyBytes) { public HttpRequest body(byte[] bodyBytes) {
Assert.notNull(bodyBytes, "Body must be not null !");
this.bodyBytes = bodyBytes; this.bodyBytes = bodyBytes;
return this; return this;
} }

8
hutool-poi/src/test/java/cn/hutool/poi/excel/test/ExcelWriteTest.java
View File

@ -124,7 +124,7 @@ public class ExcelWriteTest {
} }
@Test @Test
@Ignore // @Ignore
public void mergeTest2() { public void mergeTest2() {
Map<String, Object> row1 = new LinkedHashMap<>(); Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("姓名", "张三"); row1.put("姓名", "张三");
@ -143,13 +143,9 @@ public class ExcelWriteTest {
ArrayList<Map<String, Object>> rows = CollUtil.newArrayList(row1, row2); ArrayList<Map<String, Object>> rows = CollUtil.newArrayList(row1, row2);
// 通过工具类创建writer // 通过工具类创建writer
ExcelWriter writer = ExcelUtil.getWriter("e:/writeMapTest.xlsx"); ExcelWriter writer = ExcelUtil.getWriter("f:/test/writeMapTest.xlsx");
// 合并单元格后的标题行，使用默认标题样式 // 合并单元格后的标题行，使用默认标题样式
try {
writer.merge(row1.size() - 1, "一班成绩单"); writer.merge(row1.size() - 1, "一班成绩单");
} catch (Exception e) {
e.printStackTrace();
}
// 一次性写出内容，使用默认样式，强制输出标题 // 一次性写出内容，使用默认样式，强制输出标题
writer.write(rows, true); writer.write(rows, true);