From a5a7537e53cc5a773361fb6add4dd132fdde463b Mon Sep 17 00:00:00 2001
From: liuxing7954 <467677527@qq.com>
Date: Sun, 1 Dec 2019 23:12:06 +0800
Subject: [PATCH 1/3] Update CronPattern.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修改api说明
---
.../src/main/java/cn/hutool/cron/pattern/CronPattern.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
index 4d355024b..a0e11407b 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
@@ -71,7 +71,7 @@ import cn.hutool.cron.pattern.parser.YearValueParser;
*
* - 5 * * * *:每个点钟的5分执行,00:05,01:05……
* - * * * * *:每分钟执行
- * - */2 * * * *:每两小时执行
+ * - */2 * * * *:每两分钟执行
* - * 12 * * *:12点的每分钟执行
* - 59 11 * * 1,2:每周一和周二的11:59执行
* - 3-18/5 * * * *:3~18分,每5分钟执行一次,即0:03, 0:08, 0:13, 0:18, 1:03, 1:08……
From 13e17a93590e7d763f6e643d281fd5a8668f0513 Mon Sep 17 00:00:00 2001
From: Golden Looly
Date: Mon, 2 Dec 2019 17:39:49 +0800
Subject: [PATCH 2/3] Revert "Update CronPattern.java"
---
.../src/main/java/cn/hutool/cron/pattern/CronPattern.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
index a0e11407b..4d355024b 100644
--- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
+++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPattern.java
@@ -71,7 +71,7 @@ import cn.hutool.cron.pattern.parser.YearValueParser;
*
* - 5 * * * *:每个点钟的5分执行,00:05,01:05……
* - * * * * *:每分钟执行
- * - */2 * * * *:每两分钟执行
+ * - */2 * * * *:每两小时执行
* - * 12 * * *:12点的每分钟执行
* - 59 11 * * 1,2:每周一和周二的11:59执行
* - 3-18/5 * * * *:3~18分,每5分钟执行一次,即0:03, 0:08, 0:13, 0:18, 1:03, 1:08……
From f0bee70fe3a7739ef7b1c6023af3bf821a211fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E9=A1=BA?=
<21408788+w-a-n-g-s-h-u-n@users.noreply.github.com>
Date: Thu, 5 Dec 2019 17:13:22 +0800
Subject: [PATCH 3/3] Update NumberUtil.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
添加NumberUtil.min(BigDecimal... numberArray)、NumberUtil.max(BigDecimal... numberArray)
---
.../java/cn/hutool/core/util/NumberUtil.java | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
index 139774d68..0bc0c6bbe 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/NumberUtil.java
@@ -1757,6 +1757,18 @@ public class NumberUtil {
return ArrayUtil.min(numberArray);
}
+ /**
+ * 取最小值
+ *
+ * @param numberArray 数字数组
+ * @return 最小值
+ * @see ArrayUtil#min(BigDecimal...)
+ * @since 5.0.8
+ */
+ public static BigDecimal min(BigDecimal... numberArray) {
+ return ArrayUtil.min(numberArray);
+ }
+
/**
* 取最大值
*
@@ -1830,6 +1842,18 @@ public class NumberUtil {
return ArrayUtil.max(numberArray);
}
+ /**
+ * 取最大值
+ *
+ * @param numberArray 数字数组
+ * @return 最大值
+ * @see ArrayUtil#max(BigDecimal...)
+ * @since 5.0.8
+ */
+ public static BigDecimal max(BigDecimal... numberArray) {
+ return ArrayUtil.max(numberArray);
+ }
+
/**
* 数字转字符串
* 调用{@link Number#toString()},并去除尾小数点儿后多余的0