ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复UrlBuilder中参数中包括"://"判断错误问题

Browse Source
This commit is contained in:
Looly 2022-12-27 19:41:52 +08:00
parent 7ee9b163c4
commit b78657f67f
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -22,7 +22,8 @@
* 【db 】 修复NamedSql中in没有判断大小写问题（issue#2792@Github） * 【db 】 修复NamedSql中in没有判断大小写问题（issue#2792@Github）
* 【core 】 修复ZIP bomb漏洞（issue#2797@Github） * 【core 】 修复ZIP bomb漏洞（issue#2797@Github）
* 【core 】 修复JSONXMLSerializer将Json转为XML时，遇到嵌套需要递归情况时会丢失contentKeys问题（pr#903@Gitee） * 【core 】 修复JSONXMLSerializer将Json转为XML时，遇到嵌套需要递归情况时会丢失contentKeys问题（pr#903@Gitee）
* 【core 】 修复通过jdbcurl创建SimpleDataSource报NullPointException（pr#900@Gitee） * 【db 】 修复使用mariadb通过jdbcurl创建SimpleDataSource报NullPointException（pr#900@Gitee）
* 【core 】 修复UrlBuilder中参数中包括"://"判断错误问题（pr#898@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

2
README-EN.md
View File

@ -41,7 +41,7 @@
<br/> <br/>
<p align="center"> <p align="center">
<a href="https://qm.qq.com/cgi-bin/qm/qr?k=QtsqXLkHpLjE99tkre19j6pjPMhSay1a&jump_from=webapi"> <a href="https://qm.qq.com/cgi-bin/qm/qr?k=QtsqXLkHpLjE99tkre19j6pjPMhSay1a&jump_from=webapi">
<img src="https://img.shields.io/badge/QQ%E7%BE%A4%E2%91%A5-715292493-orange"/></a> <img src="https://img.shields.io/badge/QQ%E7%BE%A4%E2%91%A6-715292493-orange"/></a>
</p> </p>
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
README.md
View File

@ -41,7 +41,7 @@
<br/> <br/>
<p align="center"> <p align="center">
<a href="https://qm.qq.com/cgi-bin/qm/qr?k=QtsqXLkHpLjE99tkre19j6pjPMhSay1a&jump_from=webapi"> <a href="https://qm.qq.com/cgi-bin/qm/qr?k=QtsqXLkHpLjE99tkre19j6pjPMhSay1a&jump_from=webapi">
<img src="https://img.shields.io/badge/QQ%E7%BE%A4%E2%91%A5-715292493-orange"/></a> <img src="https://img.shields.io/badge/QQ%E7%BE%A4%E2%91%A6-715292493-orange"/></a>
</p> </p>
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

6
hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java
View File

@ -108,8 +108,10 @@ public final class UrlBuilder implements Builder<String> {
*/ */
public static UrlBuilder ofHttp(String httpUrl, Charset charset) { public static UrlBuilder ofHttp(String httpUrl, Charset charset) {
Assert.notBlank(httpUrl, "Http url must be not blank!"); Assert.notBlank(httpUrl, "Http url must be not blank!");
if (!httpUrl.startsWith("http://")&&!httpUrl.startsWith("https://")) { httpUrl = StrUtil.trimStart(httpUrl);
httpUrl = "http://" + httpUrl.trim(); // issue#I66CIR
if(false == StrUtil.startWithAnyIgnoreCase(httpUrl, "http://", "https://")){
httpUrl = "http://" + httpUrl;
} }
return of(httpUrl, charset); return of(httpUrl, charset);
} }