From 0ecc3393eee49cdb388ade278a3c940c85f9505d Mon Sep 17 00:00:00 2001
From: duandazhi <ab601026460@163.com>
Date: Tue, 6 Apr 2021 12:30:57 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81Idcard=20add=20age=202=E3=80=81DateUt?=
 =?UTF-8?q?il=20wtb=20add=20comment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/date/DateUtil.java    |  4 ++--
 .../src/main/java/cn/hutool/core/util/IdcardUtil.java  | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
index 9557a241e..c9de48257 100644
--- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
@@ -41,8 +41,8 @@ public class DateUtil extends CalendarUtil {
 	 */
 	private final static String[] wtb = { //
 			"sun", "mon", "tue", "wed", "thu", "fri", "sat", // 星期
-			"jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec", //
-			"gmt", "ut", "utc", "est", "edt", "cst", "cdt", "mst", "mdt", "pst", "pdt"//
+			"jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec", // 月份
+			"gmt", "ut", "utc", "est", "edt", "cst", "cdt", "mst", "mdt", "pst", "pdt"// 时间标准
 	};
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
index 296dcd787..67bbf8e22 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
@@ -662,6 +662,7 @@ public class IdcardUtil {
 		private final String cityCode;
 		private final DateTime birthDate;
 		private final Integer gender;
+		private final int age;
 
 		/**
 		 * 构造
@@ -673,6 +674,7 @@ public class IdcardUtil {
 			this.cityCode = IdcardUtil.getCityCodeByIdCard(idcard);
 			this.birthDate = IdcardUtil.getBirthDate(idcard);
 			this.gender = IdcardUtil.getGenderByIdCard(idcard);
+			this.age = IdcardUtil.getAgeByIdCard(idcard);
 		}
 
 		/**
@@ -720,6 +722,14 @@ public class IdcardUtil {
 			return this.gender;
 		}
 
+		/**
+		 * 获取年龄
+		 * @return 年龄
+		 */
+		public int getAge() {
+			return age;
+		}
+
 		@Override
 		public String toString() {
 			return "Idcard{" +