fix: fix failed unit test

* fix: 修改 README_zh-CN.md datetime 重复 IsLeapYear问题

* fix: 修改 README_zh-CN.md 18. slice 回到目录

* fix(validator): [IsChineseIdNum] fix 身份证效验 新增 省份、生日、效验码效验，修改ContainLower/IsNumber 注释错误

* fix(validator): [IsChineseIdNum] fix 修改测试

---------

Co-authored-by: dengjiaxiang <19181730103@189.cn>
Co-authored-by: dengrandpa <dengrandpapa@outlook.com>

README.md

@@ -4,7 +4,7 @@
 <br/>
 
 ![Go version](https://img.shields.io/badge/go-%3E%3Dv1.18-9cf)
-[![Release](https://img.shields.io/badge/release-2.2.7-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-2.2.8-green.svg)](https://github.com/duke-git/lancet/releases)
 [![GoDoc](https://godoc.org/github.com/duke-git/lancet/v2?status.svg)](https://pkg.go.dev/github.com/duke-git/lancet/v2)
 [![Go Report Card](https://goreportcard.com/badge/github.com/duke-git/lancet/v2)](https://goreportcard.com/report/github.com/duke-git/lancet/v2)
 [![test](https://github.com/duke-git/lancet/actions/workflows/codecov.yml/badge.svg?branch=main&event=push)](https://github.com/duke-git/lancet/actions/workflows/codecov.yml)
@@ -1097,6 +1097,12 @@ import "github.com/duke-git/lancet/v2/random"
 -   **<big>RandUniqueIntSlice</big>** : generate a slice of random int of length n that do not repeat.
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/en/api/packages/random.md#RandUniqueIntSlice)]
     [[play](https://go.dev/play/p/uBkRSOz73Ec)]
+-   **<big>RandSymbolChar</big>** : Generate a random symbol char of specified length.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/en/api/packages/random.md#RandSymbolChar)]
+-   **<big>RandFloat</big>** : Generate a random float64 number between [min, max) with specific precision.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/en/api/packages/random.md#RandFloat)]
+-   **<big>RandFloats</big>** : Generate a slice of random float64 numbers of length n that do not repeat.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/en/api/packages/random.md#RandFloats)]
 
 <h3 id="retry"> 17. Retry package is for executing a function repeatedly until it was successful or canceled by the context. &nbsp; &nbsp; &nbsp; &nbsp;<a href="#index">index</a></h3>
 
@@ -1340,6 +1346,8 @@ import "github.com/duke-git/lancet/v2/slice"
 -   **<big>Partition</big>** : partition all slice elements with the evaluation of the given predicate functions.
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/en/api/packages/slice.md#Partition)]
     [[play](https://go.dev/play/p/lkQ3Ri2NQhV)]
+-   **<big>Random</big>** : get a random item of slice, return its index, when slice is empty, return -1. 
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/en/api/packages/slice.md#Random)]
 
 <h3 id="stream"> 19. Stream package implements a sequence of elements supporting sequential and operations. this package is an experiment to explore if stream in go can work as the way java does. its function is very limited. &nbsp; &nbsp; &nbsp; &nbsp;<a href="#index">index</a></h3>
 

README_zh-CN.md

@@ -4,7 +4,7 @@
 <br/>
 
 ![Go version](https://img.shields.io/badge/go-%3E%3Dv1.18-9cf)
-[![Release](https://img.shields.io/badge/release-2.2.7-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-2.2.8-green.svg)](https://github.com/duke-git/lancet/releases)
 [![GoDoc](https://godoc.org/github.com/duke-git/lancet/v2?status.svg)](https://pkg.go.dev/github.com/duke-git/lancet/v2)
 [![Go Report Card](https://goreportcard.com/badge/github.com/duke-git/lancet/v2)](https://goreportcard.com/report/github.com/duke-git/lancet/v2)
 [![test](https://github.com/duke-git/lancet/actions/workflows/codecov.yml/badge.svg?branch=main&event=push)](https://github.com/duke-git/lancet/actions/workflows/codecov.yml)
@@ -572,9 +572,6 @@ import "github.com/duke-git/lancet/v2/datetime"
 -   **<big>IsLeapYear</big>** :验证是否是闰年。
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/datetime.md#IsLeapYear)]
     [[play](https://go.dev/play/p/xS1eS2ejGew)]
--   **<big>IsLeapYear</big>** : check if param `year` is leap year or not.
-    [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/datetime.md#IsLeapYear)]
-    [[play](https://go.dev/play/p/xS1eS2ejGew)]
 -   **<big>BetweenSeconds</big>** : 返回两个时间的间隔秒数。
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/datetime.md#BetweenSeconds)]
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/datetime.md#BetweenSeconds)]
@@ -1101,6 +1098,14 @@ import "github.com/duke-git/lancet/v2/random"
 -   **<big>RandUniqueIntSlice</big>** : 生成一个不重复的长度为 n 的随机 int 切片。
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/random.md#RandUniqueIntSlice)]
     [[play](https://go.dev/play/p/uBkRSOz73Ec)]
+-   **<big>RandSymbolChar</big>** : 生成给定长度的随机符号字符串。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/random.md#RandSymbolChar)]
+    [[play](https://go.dev/play/p/uBkRSOz73Ec)]
+-   **<big>RandFloat</big>** : 生成随机float64数字，可以指定范围和精度。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/random.md#RandFloat)]
+    [[play](https://go.dev/play/p/uBkRSOz73Ec)]
+-   **<big>RandFloats</big>** : 生成随机float64数字切片，可以指定长度，范围和精度.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/random.md#RandFloats)]
 
 <h3 id="retry"> 17. retry 重试执行函数直到函数运行成功或被 context cancel。&nbsp; &nbsp; &nbsp; &nbsp;<a href="#index">回到目录</a></h3>
 
@@ -1126,7 +1131,7 @@ import "github.com/duke-git/lancet/v2/retry"
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/retry.md#RetryTimes)]
     [[play](https://go.dev/play/p/ssfVeU2SwLO)]
 
-<h3 id="slice"> 18. slice 包含操作切片的方法集合。&nbsp; &nbsp; &nbsp; &nbsp; [回到目录](#index)
+<h3 id="slice"> 18. slice 包含操作切片的方法集合。&nbsp; &nbsp; &nbsp; &nbsp; <a href="#index">回到目录</a></h3>
 
 ```go
 import "github.com/duke-git/lancet/v2/slice"
@@ -1344,6 +1349,9 @@ import "github.com/duke-git/lancet/v2/slice"
 -   **<big>Partition</big>** : 根据给定的predicate判断函数分组切片元素。
     [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/slice.md#Partition)]
     [[play](https://go.dev/play/p/lkQ3Ri2NQhV)]
+-   **<big>Random</big>** : 随机返回切片中元素以及下标, 当切片长度为0时返回下标-1。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/api/packages/slice.md#Random)]
+
 
 <h3 id="stream"> 19. stream 流，该包仅验证简单的 stream 实现，功能有限。&nbsp; &nbsp; &nbsp; &nbsp;<a href="#index">回到目录</a></h3>
 

docs/api/packages/random.md

@@ -29,8 +29,11 @@ import (
 -   [RandLower](#RandLower)
 -   [RandNumeral](#RandNumeral)
 -   [RandNumeralOrLetter](#RandNumeralOrLetter)
+-   [RandSymbolChar](#RandSymbolChar)
 -   [UUIdV4](#UUIdV4)
 -   [RandUniqueIntSlice](#RandUniqueIntSlice)
+-   [RandFloat](#RandFloat)
+-   [RandFloats](#RandFloats)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -218,6 +221,32 @@ func main() {
 }
 ```
 
+### <span id="RandSymbolChar">RandSymbolChar</span>
+
+<p>生成给定长度的随机符号字符串. 符号字符包括: !@#$%^&*()_+-=[]{}|;':\",./<>?。</p>
+
+<b>函数签名:</b>
+
+```go
+func RandSymbolChar(length int) string
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/random"
+)
+
+func main() {
+    randStr := random.RandSymbolChar(6)
+    fmt.Println(randStr) //@#(_")
+}
+```
+
 ### <span id="UUIdV4">UUIdV4</span>
 
 <p>生成UUID v4字符串</p>
@@ -272,3 +301,55 @@ func main() {
     fmt.Println(result) //[0 4 7 1 5] (random)
 }
 ```
+
+### <span id="RandFloat">RandFloat</span>
+
+<p>生成随机float64数字，可以指定范围和精度。</p>
+
+<b>函数签名:</b>
+
+```go
+func RandFloat(min, max float64, precision int) float64
+```
+
+<b>实例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/random"
+)
+
+func main() {
+    floatNumber := random.RandFloat(1.0, 5.0, 2)
+    fmt.Println(floatNumber) //2.14 (random number)
+}
+```
+
+### <span id="RandFloats">RandFloats</span>
+
+<p>生成随机float64数字切片，指定长度，范围和精度.</p>
+
+<b>函数签名:</b>
+
+```go
+func RandFloats(n int, min, max float64, precision int) []float64
+```
+
+<b>实例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/random"
+)
+
+func main() {
+    floatNumbers := random.RandFloats(5, 1.0, 5.0, 2)
+    fmt.Println(floatNumber) //[3.42 3.99 1.3 2.38 4.23] (random)
+}
+```

docs/api/packages/slice.md

@@ -2488,4 +2488,35 @@ func main() {
 	// [[2 4] [1 3 5]]
 	// [[1 2] [3 4] [5]]
 }
+```
+
+
+### <span id="Random">Random</span>
+
+<p>随机返回切片中元素以及下标, 当切片长度为0时返回下标-1</p>
+
+<b>函数签名:</b>
+
+```go
+func Random[T any](slice []T) (val T, idx int)
+```
+
+<b>示例:<span style="float:right;display:inline-block;">[运行](TODO)</span></b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	nums := []int{1, 2, 3, 4, 5}
+
+	val, idx := slice.Random(nums)
+	if idx >= 0 && idx < len(nums) && slice.Contain(nums, val) {
+		fmt.Println("okk")
+	}
+	// Output:
+	// okk
+}
 ```

docs/en/api/packages/random.md

@@ -29,8 +29,11 @@ import (
 -   [RandLower](#RandLower)
 -   [RandNumeral](#RandNumeral)
 -   [RandNumeralOrLetter](#RandNumeralOrLetter)
+-   [RandSymbolChar](#RandSymbolChar)
 -   [UUIdV4](#UUIdV4)
 -   [RandUniqueIntSlice](#RandUniqueIntSlice)
+-   [RandFloat](#RandFloat)
+-   [RandFloats](#RandFloats)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -218,6 +221,32 @@ func main() {
 }
 ```
 
+### <span id="RandSymbolChar">RandSymbolChar</span>
+
+<p>Generate a random symbol char of specified length. Symbol chars: !@#$%^&*()_+-=[]{}|;':\",./<>?.</p>
+
+<b>Signature:</b>
+
+```go
+func RandSymbolChar(length int) string
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/random"
+)
+
+func main() {
+    randStr := random.RandSymbolChar(6)
+    fmt.Println(randStr) //@#(_")
+}
+```
+
 ### <span id="UUIdV4">UUIdV4</span>
 
 <p>Generate a random UUID of version 4 according to RFC 4122.</p>
@@ -273,3 +302,55 @@ func main() {
     fmt.Println(result) //[0 4 7 1 5] (random)
 }
 ```
+
+### <span id="RandFloat">RandFloat</span>
+
+<p>Generate a random float64 number between [min, max) with specific precision.</p>
+
+<b>Signature:</b>
+
+```go
+func RandFloat(min, max float64, precision int) float64
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/random"
+)
+
+func main() {
+    floatNumber := random.RandFloat(1.0, 5.0, 2)
+    fmt.Println(floatNumber) //2.14 (random number)
+}
+```
+
+### <span id="RandFloats">RandFloats</span>
+
+<p>Generate a slice of random float64 numbers of length n that do not repeat.</p>
+
+<b>Signature:</b>
+
+```go
+func RandFloats(n int, min, max float64, precision int) []float64
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/random"
+)
+
+func main() {
+    floatNumbers := random.RandFloats(5, 1.0, 5.0, 2)
+    fmt.Println(floatNumber) //[3.42 3.99 1.3 2.38 4.23] (random)
+}
+```

docs/en/api/packages/slice.md

@@ -2486,4 +2486,34 @@ func main() {
 	// [[2 4] [1 3 5]]
 	// [[1 2] [3 4] [5]]
 }
+```
+
+### <span id="Random">Random</span>
+
+<p>Random get a random item of slice, return idx=-1 when slice is empty. </p>
+
+<b>Signature:</b>
+
+```go
+func Random[T any](slice []T) (val T, idx int)
+```
+
+<b>Example:<span style="float:right;display:inline-block;">[Run](TODO)</span></b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	nums := []int{1, 2, 3, 4, 5}
+
+	val, idx := slice.Random(nums)
+	if idx >= 0 && idx < len(nums) && slice.Contain(nums, val) {
+		fmt.Println("okk")
+	}
+	// Output:
+	// okk
+}
 ```

random/random.go

@@ -10,6 +10,8 @@ import (
 	"io"
 	"math/rand"
 	"time"
+
+	"github.com/duke-git/lancet/v2/mathutil"
 )
 
 const (
@@ -17,13 +19,14 @@ const (
 	LowwerLetters = "abcdefghijklmnopqrstuvwxyz"
 	UpperLetters  = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	Letters       = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	SymbolChars   = "!@#$%^&*()_+-=[]{}|;':\",./<>?"
 )
 
 func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
-// RandInt generate random int between min and max, maybe min,  not be max.
+// RandInt generate random int between [min, max).
 // Play: https://go.dev/play/p/pXyyAAI5YxD
 func RandInt(min, max int) int {
 	if min == max {
@@ -37,6 +40,22 @@ func RandInt(min, max int) int {
 	return rand.Intn(max-min) + min
 }
 
+// RandFloat generate random float64 number between [min, max) with specific precision.
+// Play: todo
+func RandFloat(min, max float64, precision int) float64 {
+	if min == max {
+		return min
+	}
+
+	if max < min {
+		min, max = max, min
+	}
+
+	n := rand.Float64()*(max-min) + min
+
+	return mathutil.RoundToFloat(n, precision)
+}
+
 // RandBytes generate random byte slice.
 // Play: https://go.dev/play/p/EkiLESeXf8d
 func RandBytes(length int) []byte {
@@ -52,19 +71,19 @@ func RandBytes(length int) []byte {
 	return b
 }
 
-// RandString generate random string of specified length.
+// RandString generate random alpha string of specified length.
 // Play: https://go.dev/play/p/W2xvRUXA7Mi
 func RandString(length int) string {
 	return random(Letters, length)
 }
 
-// RandUpper generate a random upper case string.
+// RandUpper generate a random upper case string of specified length.
 // Play: https://go.dev/play/p/29QfOh0DVuh
 func RandUpper(length int) string {
 	return random(UpperLetters, length)
 }
 
-// RandLower generate a random lower case string.
+// RandLower generate a random lower case string of specified length.
 // Play: https://go.dev/play/p/XJtZ471cmtI
 func RandLower(length int) string {
 	return random(LowwerLetters, length)
@@ -76,12 +95,19 @@ func RandNumeral(length int) string {
 	return random(Numeral, length)
 }
 
-// RandNumeralOrLetter generate a random numeral or letter string.
+// RandNumeralOrLetter generate a random numeral or alpha string of specified length.
 // Play: https://go.dev/play/p/19CEQvpx2jD
 func RandNumeralOrLetter(length int) string {
 	return random(Numeral+Letters, length)
 }
 
+// RandSymbolChar generate a random symbol char of specified length.
+// symbol chars: !@#$%^&*()_+-=[]{}|;':\",./<>?.
+// Play: todo
+func RandSymbolChar(length int) string {
+	return random(SymbolChars, length)
+}
+
 // random generate a random string based on given string range.
 func random(s string, length int) string {
 	b := make([]byte, length)
@@ -136,3 +162,21 @@ func RandUniqueIntSlice(n, min, max int) []int {
 
 	return nums
 }
+
+// RandFloats generate a slice of random float64 numbers of length n that do not repeat.
+// Play: todo
+func RandFloats(n int, min, max float64, precision int) []float64 {
+	nums := make([]float64, n)
+	used := make(map[float64]struct{}, n)
+	for i := 0; i < n; {
+		r := RandFloat(min, max, precision)
+		if _, use := used[r]; use {
+			continue
+		}
+		used[r] = struct{}{}
+		nums[i] = r
+		i++
+	}
+
+	return nums
+}

random/random_example_test.go

@@ -3,6 +3,7 @@ package random
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 )
 
 func ExampleRandInt() {
@@ -134,3 +135,53 @@ func ExampleRandUniqueIntSlice() {
 	// Output:
 	// ok
 }
+
+func ExampleRandSymbolChar() {
+	pattern := `^[\W|_]+$`
+	reg := regexp.MustCompile(pattern)
+
+	s := RandSymbolChar(6)
+
+	result1 := reg.MatchString(s)
+	result2 := len(s)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+
+	// Output:
+	// true
+	// 6
+}
+
+func ExampleRandFloat() {
+	pattern := `^[\d{1}.\d{2}]+$`
+	reg := regexp.MustCompile(pattern)
+
+	num := RandFloat(1.0, 5.0, 2)
+
+	// check num is a random float in [1.0, 5.0)
+	result1 := num >= 1.0 && num < 5.0
+	result2 := reg.MatchString(strconv.FormatFloat(num, 'f', -1, 64))
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+
+	// Output:
+	// true
+	// true
+}
+
+func ExampleRandFloats() {
+	isInRange := true
+	numbers := RandFloats(5, 1.0, 5.0, 2)
+	for _, n := range numbers {
+		isInRange = (n >= 1.0 && n < 5.0)
+	}
+
+	fmt.Println(isInRange)
+	fmt.Println(len(numbers))
+
+	// Output:
+	// true
+	// 5
+}

random/random_test.go

@@ -154,3 +154,45 @@ func hasDuplicate(arr []int) bool {
 	}
 	return false
 }
+
+func TestRandSymbolChar(t *testing.T) {
+	t.Parallel()
+
+	pattern := `^[\W|_]+$`
+	reg := regexp.MustCompile(pattern)
+
+	symbolChars := RandSymbolChar(10)
+
+	assert := internal.NewAssert(t, "TestRandSymbolChar")
+	assert.Equal(10, len(symbolChars))
+	assert.Equal(true, reg.MatchString(symbolChars))
+}
+
+func TestRandFloat(t *testing.T) {
+	t.Parallel()
+
+	assert := internal.NewAssert(t, "TestRandFloat")
+
+	r1 := RandFloat(1.1, 10.1, 2)
+	assert.GreaterOrEqual(r1, 1.1)
+	assert.Less(r1, 10.1)
+
+	r2 := RandFloat(1.1, 1.1, 2)
+	assert.Equal(1.1, r2)
+
+	r3 := RandFloat(10.1, 1.1, 2)
+	assert.GreaterOrEqual(r1, 1.1)
+	assert.Less(r3, 10.1)
+}
+
+func TestRandFloats(t *testing.T) {
+	t.Parallel()
+	assert := internal.NewAssert(t, "TestRandFloats")
+
+	numbers := RandFloats(5, 1.0, 5.0, 2)
+	for _, n := range numbers {
+		assert.Equal(true, (n >= 1.0 && n < 5.0))
+	}
+
+	assert.Equal(len(numbers), 5)
+}

slice/slice.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/duke-git/lancet/v2/random"
 	"golang.org/x/exp/constraints"
 )
 
@@ -1229,3 +1230,14 @@ func Partition[T any](slice []T, predicates ...func(item T) bool) [][]T {
 
 	return result
 }
+
+// Random get a random item of slice, return idx=-1 when slice is empty
+// Play: todo
+func Random[T any](slice []T) (val T, idx int) {
+	if len(slice) == 0 {
+		return val, -1
+	}
+
+	idx = random.RandInt(0, len(slice))
+	return slice[idx], idx
+}

slice/slice_example_test.go

@@ -1063,3 +1063,14 @@ func ExamplePartition() {
 	// [[2 4] [1 3 5]]
 	// [[1 2] [3 4] [5]]
 }
+
+func ExampleRandom() {
+	nums := []int{1, 2, 3, 4, 5}
+
+	val, idx := Random(nums)
+	if idx >= 0 && idx < len(nums) && Contain(nums, val) {
+		fmt.Println("okk")
+	}
+	// Output:
+	// okk
+}

slice/slice_test.go

@@ -1185,3 +1185,28 @@ func TestPartition(t *testing.T) {
 	assert.Equal([][]int{{2, 4}, {1, 3, 5}}, Partition([]int{1, 2, 3, 4, 5}, func(n int) bool { return n%2 == 0 }))
 	assert.Equal([][]int{{1, 2}, {3, 4}, {5}}, Partition([]int{1, 2, 3, 4, 5}, func(n int) bool { return n == 1 || n == 2 }, func(n int) bool { return n == 2 || n == 3 || n == 4 }))
 }
+
+func TestRandom(t *testing.T) {
+	t.Parallel()
+	assert := internal.NewAssert(t, "TestRandom")
+
+	var arr []int
+	var val, idx int
+
+	_, idx = Random(arr)
+	assert.Equal(-1, idx)
+
+	arr = []int{}
+	_, idx = Random(arr)
+	assert.Equal(-1, idx)
+
+	arr = []int{1}
+	val, idx = Random(arr)
+	assert.Equal(0, idx)
+	assert.Equal(arr[idx], val)
+
+	arr = []int{1, 2, 3}
+	val, idx = Random(arr)
+	assert.Greater(len(arr), idx)
+	assert.Equal(arr[idx], val)
+}

validator/validator.go

@@ -6,12 +6,14 @@ package validator
 
 import (
 	"encoding/json"
+	"fmt"
 	"net"
 	"net/url"
 	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 	"unicode"
 )
 
@@ -21,10 +23,10 @@ var (
 	numberRegexMatcher     *regexp.Regexp = regexp.MustCompile(`\d`)
 	intStrMatcher          *regexp.Regexp = regexp.MustCompile(`^[\+-]?\d+$`)
 	urlMatcher             *regexp.Regexp = regexp.MustCompile(`^((ftp|http|https?):\/\/)?(\S+(:\S*)?@)?((([1-9]\d?|1\d\d|2[01]\d|22[0-3])(\.(1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.([0-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(([a-zA-Z0-9]+([-\.][a-zA-Z0-9]+)*)|((www\.)?))?(([a-z\x{00a1}-\x{ffff}0-9]+-?-?)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.([a-z\x{00a1}-\x{ffff}]{2,}))?))(:(\d{1,5}))?((\/|\?|#)[^\s]*)?$`)
-	dnsMatcher             *regexp.Regexp = regexp.MustCompile(`^[a-zA-Z]([a-zA-Z0-9\-]+[\.]?)*[a-zA-Z0-9]$`)
+	dnsMatcher             *regexp.Regexp = regexp.MustCompile(`^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$`)
 	emailMatcher           *regexp.Regexp = regexp.MustCompile(`\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*`)
 	chineseMobileMatcher   *regexp.Regexp = regexp.MustCompile(`^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$`)
-	chineseIdMatcher       *regexp.Regexp = regexp.MustCompile(`^[1-9]\d{5}(18|19|20|21|22)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$`)
+	chineseIdMatcher       *regexp.Regexp = regexp.MustCompile(`^(\d{17})([0-9]|X|x)$`)
 	chineseMatcher         *regexp.Regexp = regexp.MustCompile("[\u4e00-\u9fa5]")
 	chinesePhoneMatcher    *regexp.Regexp = regexp.MustCompile(`\d{3}-\d{8}|\d{4}-\d{7}|\d{4}-\d{8}`)
 	creditCardMatcher      *regexp.Regexp = regexp.MustCompile(`^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|(222[1-9]|22[3-9][0-9]|2[3-6][0-9]{2}|27[01][0-9]|2720)[0-9]{12}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\d{3})\\d{11}|6[27][0-9]{14})$`)
@@ -39,6 +41,52 @@ var (
 	chinaUnionPay          *regexp.Regexp = regexp.MustCompile(`^62[0-9]{14,17}$`)
 )
 
+var (
+	// Identity card formula
+	factor = [17]int{7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2}
+	// ID verification bit
+	verifyStr = [11]string{"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"}
+	// Starting year of ID card
+	birthStartYear = 1900
+	// Province code
+	provinceKv = map[string]struct{}{
+		"11": {},
+		"12": {},
+		"13": {},
+		"14": {},
+		"15": {},
+		"21": {},
+		"22": {},
+		"23": {},
+		"31": {},
+		"32": {},
+		"33": {},
+		"34": {},
+		"35": {},
+		"36": {},
+		"37": {},
+		"41": {},
+		"42": {},
+		"43": {},
+		"44": {},
+		"45": {},
+		"46": {},
+		"50": {},
+		"51": {},
+		"52": {},
+		"53": {},
+		"54": {},
+		"61": {},
+		"62": {},
+		"63": {},
+		"64": {},
+		"65": {},
+		//"71": {},
+		//"81": {},
+		//"82": {},
+	}
+)
+
 // IsAlpha checks if the string contains only letters (a-zA-Z).
 // Play: https://go.dev/play/p/7Q5sGOz2izQ
 func IsAlpha(str string) bool {
@@ -120,7 +168,7 @@ func ContainLetter(str string) bool {
 	return letterRegexMatcher.MatchString(str)
 }
 
-// ContainLetter check if the string contain at least one number.
+// ContainNumber check if the string contain at least one number.
 func ContainNumber(input string) bool {
 	return numberRegexMatcher.MatchString(input)
 }
@@ -228,7 +276,32 @@ func IsChineseMobile(mobileNum string) bool {
 // IsChineseIdNum check if the string is chinese id card.
 // Play: https://go.dev/play/p/d8EWhl2UGDF
 func IsChineseIdNum(id string) bool {
-	return chineseIdMatcher.MatchString(id)
+	// All characters should be numbers, and the last digit can be either x or X
+	if !chineseIdMatcher.MatchString(id) {
+		return false
+	}
+
+	// Verify province codes and complete all province codes according to GB/T2260
+	_, ok := provinceKv[id[0:2]]
+	if !ok {
+		return false
+	}
+
+	// Verify birthday, must be greater than birthStartYear and less than the current year
+	birthStr := fmt.Sprintf("%s-%s-%s", id[6:10], id[10:12], id[12:14])
+	birthday, err := time.Parse("2006-01-02", birthStr)
+	if err != nil || birthday.After(time.Now()) || birthday.Year() < birthStartYear {
+		return false
+	}
+
+	// Verification code
+	sum := 0
+	for i, c := range id[:17] {
+		v, _ := strconv.Atoi(string(c))
+		sum += v * factor[i]
+	}
+
+	return verifyStr[sum%11] == strings.ToUpper(id[17:18])
 }
 
 // ContainChinese check if the string contain mandarin chinese.
@@ -384,7 +457,7 @@ func IsGBK(data []byte) bool {
 	return true
 }
 
-// IsNumberStr check if the value is number(integer, float) or not.
+// IsNumber check if the value is number(integer, float) or not.
 // Play: https://go.dev/play/p/mdJHOAvtsvF
 func IsNumber(v any) bool {
 	return IsInt(v) || IsFloat(v)

validator/validator_example_test.go

@@ -154,7 +154,7 @@ func ExampleIsChineseMobile() {
 }
 
 func ExampleIsChineseIdNum() {
-	result1 := IsChineseIdNum("210911192105130715")
+	result1 := IsChineseIdNum("210911192105130714")
 	result2 := IsChineseIdNum("123456")
 
 	fmt.Println(result1)
@@ -200,7 +200,7 @@ func ExampleIsDns() {
 
 	// Output:
 	// true
-	// false
+	// true
 	// false
 }
 

validator/validator_test.go

@@ -271,7 +271,11 @@ func TestIsDns(t *testing.T) {
 	assert := internal.NewAssert(t, "TestIsDns")
 
 	assert.Equal(true, IsDns("abc.com"))
-	assert.Equal(false, IsDns("a.b.com"))
+	assert.Equal(true, IsDns("123.cn"))
+	assert.Equal(true, IsDns("a.b.com"))
+
+	assert.Equal(false, IsDns("a.b.c"))
+	assert.Equal(false, IsDns("a@b.com"))
 	assert.Equal(false, IsDns("http://abc.com"))
 }
 
@@ -320,10 +324,13 @@ func TestIsChineseIdNum(t *testing.T) {
 
 	assert := internal.NewAssert(t, "TestIsChineseIdNum")
 
-	assert.Equal(true, IsChineseIdNum("210911192105130715"))
-	assert.Equal(true, IsChineseIdNum("21091119210513071X"))
-	assert.Equal(true, IsChineseIdNum("21091119210513071x"))
+	assert.Equal(true, IsChineseIdNum("210911192105130714"))
+	assert.Equal(true, IsChineseIdNum("11010519491231002X"))
+	assert.Equal(true, IsChineseIdNum("11010519491231002x"))
 	assert.Equal(false, IsChineseIdNum("123456"))
+	assert.Equal(false, IsChineseIdNum("990911192105130714"))
+	assert.Equal(false, IsChineseIdNum("990911189905130714"))
+	assert.Equal(false, IsChineseIdNum("210911222205130714"))
 }
 
 func TestIsCreditCard(t *testing.T) {