lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-07 14:18:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
looly 2021-12-29 07:22:10 +08:00
parent ce504c2a3e
commit ff3dc01f04
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,11 +3,12 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.7.19 (2021-12-25) # 5.7.19 (2021-12-29)
### 🐣新特性 ### 🐣新特性
### 🐞Bug修复 ### 🐞Bug修复
* 【http 】 HttpUtil重定向次数失效问题（issue#I4O28Q@Gitee） * 【http 】 HttpUtil重定向次数失效问题（issue#I4O28Q@Gitee）
* 【core 】 修复UrlPath空白path多/问题（issue#I49KAL@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.7.18 (2021-12-25) # 5.7.18 (2021-12-25)

15
hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java
View File

@ -105,9 +105,11 @@ public class UrlPath {
} }
path = fixPath(path); path = fixPath(path);
final List<String> split = StrUtil.split(path, '/'); if(StrUtil.isNotEmpty(path)){
for (String seg : split) { final List<String> split = StrUtil.split(path, '/');
addInternal(URLDecoder.decodeForPath(seg, charset), false); for (String seg : split) {
addInternal(URLDecoder.decodeForPath(seg, charset), false);
}
} }
} }
@ -132,9 +134,14 @@ public class UrlPath {
// 在此处的Path部分特指host之后的部分，即不包含第一部分 // 在此处的Path部分特指host之后的部分，即不包含第一部分
builder.append(CharUtil.SLASH).append(RFC3986.SEGMENT_NZ_NC.encode(segment, charset)); builder.append(CharUtil.SLASH).append(RFC3986.SEGMENT_NZ_NC.encode(segment, charset));
} }
if (withEngTag || StrUtil.isEmpty(builder)) { if (StrUtil.isEmpty(builder)) {
// 空白追加是保证以/开头
builder.append(CharUtil.SLASH);
}else if (withEngTag && false == StrUtil.endWith(builder, CharUtil.SLASH)) {
// 尾部没有/则追加，否则不追加
builder.append(CharUtil.SLASH); builder.append(CharUtil.SLASH);
} }
return builder.toString(); return builder.toString();
} }

18
hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
View File

@ -320,4 +320,22 @@ public class UrlBuilderTest {
final UrlBuilder builder = UrlBuilder.ofHttp(url); final UrlBuilder builder = UrlBuilder.ofHttp(url);
Assert.assertEquals(url, builder.toString()); Assert.assertEquals(url, builder.toString());
} }
@Test
public void fragmentTest(){
// https://gitee.com/dromara/hutool/issues/I49KAL#note_8060874
String url = "https://www.hutool.cn/#/a/b?timestamp=1640391380204";
final UrlBuilder builder = UrlBuilder.ofHttp(url);
Assert.assertEquals(url, builder.toString());
}
@Test
public void fragmentAppendParamTest(){
// https://gitee.com/dromara/hutool/issues/I49KAL#note_8060874
String url = "https://www.hutool.cn/#/a/b";
final UrlBuilder builder = UrlBuilder.ofHttp(url);
builder.setFragment(builder.getFragment() + "?timestamp=1640391380204");
Assert.assertEquals("https://www.hutool.cn/#/a/b?timestamp=1640391380204", builder.toString());
}
} }