diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d0db712e..0a7707cbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ ### 🐞Bug修复 * 【core 】 修复RadixUtil.decode非static问题(issue#I3YPEH@Gitee) * 【core 】 修复EqualsBuilder数组判断问题(pr#1694@Github) +* 【setting】 修复Props中Charset对象无法序列化的问题(pr#1694@Github) +* 【db 】 修复PageResult首页判断逻辑问题(issue#1699@Github) ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PageUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PageUtil.java index d56e95234..6fcb73bce 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/PageUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/PageUtil.java @@ -31,7 +31,7 @@ public class PageUtil { * * @param customFirstPageNo 自定义的首页页码,为0或者1 */ - public static void setFirstPageNo(int customFirstPageNo) { + synchronized public static void setFirstPageNo(int customFirstPageNo) { firstPageNo = customFirstPageNo; } diff --git a/hutool-db/src/main/java/cn/hutool/db/PageResult.java b/hutool-db/src/main/java/cn/hutool/db/PageResult.java index 097fc2945..3a0bd208f 100644 --- a/hutool-db/src/main/java/cn/hutool/db/PageResult.java +++ b/hutool-db/src/main/java/cn/hutool/db/PageResult.java @@ -16,7 +16,7 @@ public class PageResult extends ArrayList { public static final int DEFAULT_PAGE_SIZE = Page.DEFAULT_PAGE_SIZE; /** - * 页码,0表示第一页 + * 页码,{@link PageUtil#getFirstPageNo()}表示第一页 */ private int page; /** @@ -142,7 +142,7 @@ public class PageResult extends ArrayList { * @return 是否第一页 */ public boolean isFirst() { - return this.page == 0; + return this.page == PageUtil.getFirstPageNo(); } /** diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java index 20d5d00bb..17ff59e81 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java @@ -67,9 +67,10 @@ public final class Props extends Properties implements BasicTypeGetter, private URL propertiesFileUrl; private WatchMonitor watchMonitor; /** - * properties文件编码 + * properties文件编码
+ * issue#1701,此属性不能被序列化,故忽略序列化 */ - private Charset charset = CharsetUtil.CHARSET_ISO_8859_1; + private transient Charset charset = CharsetUtil.CHARSET_ISO_8859_1; // ----------------------------------------------------------------------- 私有属性 end /**