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

Merge branch 'dromara:v5-dev' into v5-dev

Browse Source
This commit is contained in:
wang fl 2022-10-14 09:58:18 +08:00 committed by GitHub
commit 924f6c226d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,7 +3,7 @@
-------------------------------------------------------------------------------------------------------------
# 5.8.9.M1 (2022-10-12)
# 5.8.9.M1 (2022-10-13)
### 🐣新特性
* 【core 】 DateUtil增加isLastDayOfMonth、getLastDayOfMonth方法（pr#824@Gitee）
@ -11,6 +11,7 @@
* 【core 】 CharUtil.isBlank添加Hangul Filler字符（issue#I5UGSQ@Gitee）
* 【poi 】 优化合并单元格读取（issue#I5UJZ1@Gitee）
* 【extra 】 增加QLExpress支持（issue#2653@Github）
* 【core 】 UrlBuilder增加getPortWithDefault方法（pr#835@Gitee）
### 🐞Bug修复
* 【poi 】 修复ExcelReader读取只有标题行报错问题（issue#I5U1JA@Gitee）

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

@ -291,6 +291,20 @@ public final class UrlBuilder implements Builder<String> {
return port;
}
/**
* 获取端口，如果未自定义返回协议默认端口
*
* @return 端口
*/
public int getPortWithDefault() {
int port = getPort();
if (port > 0) {
return port;
}
URL url = this.toURL();
return url.getDefaultPort();
}
/**
* 设置端口，默认-1
*

4
hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
View File

@ -2667,7 +2667,7 @@ public class PrimitiveArrayUtil {
return array;
}
// ---------------------------------------------------------------------- shuffle
// ---------------------------------------------------------------------- swap
/**
* 交换数组中两个位置的值
@ -2821,6 +2821,8 @@ public class PrimitiveArrayUtil {
return array;
}
// ---------------------------------------------------------------------- asc and desc
/**
* 检查数组是否升序，即array[i] &lt;= array[i+1]，若传入空数组，则返回false
*

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

@ -16,8 +16,10 @@ public class UrlBuilderTest {
@Test
public void buildTest() {
final String buildUrl = UrlBuilder.of().setHost("www.hutool.cn").build();
UrlBuilder builder = UrlBuilder.of();
final String buildUrl = builder.setHost("www.hutool.cn").build();
Assert.assertEquals("http://www.hutool.cn/", buildUrl);
Assert.assertEquals(buildUrl, 80, builder.getPortWithDefault());
}
@Test
@ -26,9 +28,11 @@ public class UrlBuilderTest {
String buildUrl = UrlBuilder.of().setScheme("http").setHost("192.168.1.1").setPort(8080).setWithEndTag(false).build();
Assert.assertEquals("http://192.168.1.1:8080", buildUrl);
buildUrl = UrlBuilder.of().setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
UrlBuilder urlBuilder = UrlBuilder.of();
buildUrl = urlBuilder.setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
.setWithEndTag(false).build();
Assert.assertEquals("http://192.168.1.1:8080?url=http://192.168.1.1/test/1", buildUrl);
Assert.assertEquals(buildUrl, 8080, urlBuilder.getPortWithDefault());
}
@Test