lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2026-02-09 09:16:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4216 from zouzanyan/v5-dev-zouzanyan

Browse Source 
HttpUtil类 bug修复
This commit is contained in:
Golden Looly
2026-01-18 18:47:42 +08:00
committed by GitHub
parent a32fac8760 5c236d04e1
commit 2ba1b4d649
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.StreamProgress; import cn.hutool.core.io.StreamProgress;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.net.RFC3986; import cn.hutool.core.net.RFC3986;
import cn.hutool.core.net.url.UrlQuery; import cn.hutool.core.net.url.UrlQuery;
@@ -580,9 +581,11 @@ public class HttpUtil {
} }
// 以&结尾则去除之 // 以&结尾则去除之
int lastIndex = builder.length() - 1; if (!builder.isEmpty()) {
if ('&' == builder.charAt(lastIndex)) { int lastIndex = builder.length() - 1;
builder.delTo(lastIndex); if ('&' == builder.charAt(lastIndex)) {
builder.delTo(lastIndex);
}
} }
return builder.toString(); return builder.toString();
} }
@@ -883,6 +886,8 @@ public class HttpUtil {
* @since 5.4.6 * @since 5.4.6
*/ */
public static String buildBasicAuth(String username, String password, Charset charset) { public static String buildBasicAuth(String username, String password, Charset charset) {
Assert.notNull(username, "username must not be null");
Assert.notNull(password, "password must not be null");
final String data = username.concat(":").concat(password); final String data = username.concat(":").concat(password);
return "Basic " + Base64.encode(data, charset); return "Basic " + Base64.encode(data, charset);
} }

6
hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
View File

@@ -327,6 +327,12 @@ public class HttpUtilTest {
assertEquals("", encodeResult); assertEquals("", encodeResult);
} }
@Test
public void normalizEampersandParamsTest() {
final String encodeResult = HttpUtil.normalizeParams("&", CharsetUtil.CHARSET_UTF_8);
assertEquals("", encodeResult);
}
@Test @Test
public void getMimeTypeTest() { public void getMimeTypeTest() {
final String mimeType = HttpUtil.getMimeType("aaa.aaa"); final String mimeType = HttpUtil.getMimeType("aaa.aaa");