release v1.2.5

README.md

@@ -4,7 +4,7 @@
 <br/>
 
 ![Go version](https://img.shields.io/badge/go-%3E%3D1.16<recommend>-9cf)
-[![Release](https://img.shields.io/badge/release-1.2.4-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-1.2.5-green.svg)](https://github.com/duke-git/lancet/releases)
 [![GoDoc](https://godoc.org/github.com//duke-git/lancet?status.svg)](https://pkg.go.dev/github.com/duke-git/lancet)
 [![Go Report Card](https://goreportcard.com/badge/github.com/duke-git/lancet)](https://goreportcard.com/report/github.com/duke-git/lancet)
 [![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)
@@ -24,7 +24,7 @@ English | [简体中文](./README_zh-CN.md)
 ## Feature
 
 - 👏 Comprehensive, efficient and reusable.
-- 💪 170+ common go util functions, support string, slice, datetime, net, crypt...
+- 💪 180+ go util functions, support string, slice, datetime, net, crypt...
 - 💅 Only depend on the go standard library.
 - 🌍 Unit test for every exported function.
 
@@ -137,9 +137,9 @@ import "github.com/duke-git/lancet/datetime"
 - [EndOfMinute](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfMinute)
 - [EndOfHour](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfHour)
 - [EndOfDay](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfDay)
-- [EndOfWeek](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BeginOfWeek)
-- [EndOfMonth](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BeginOfMonth)
-- [EndOfYear](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BeginOfYear)
+- [EndOfWeek](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfWeek)
+- [EndOfMonth](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfMonth)
+- [EndOfYear](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfYear)
 - [GetNowDate](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#GetNowDate)
 - [GetNowTime](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#GetNowTime)
 - [GetNowDateTime](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#GetNowDateTime)

README_zh-CN.md

@@ -4,7 +4,7 @@
 <br/>
 
 ![Go version](https://img.shields.io/badge/go-%3E%3D1.16<recommend>-9cf)
-[![Release](https://img.shields.io/badge/release-1.2.4-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-1.2.5-green.svg)](https://github.com/duke-git/lancet/releases)
 [![GoDoc](https://godoc.org/github.com//duke-git/lancet?status.svg)](https://pkg.go.dev/github.com/duke-git/lancet)
 [![Go Report Card](https://goreportcard.com/badge/github.com/duke-git/lancet)](https://goreportcard.com/report/github.com/duke-git/lancet)
 [![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)
@@ -24,7 +24,7 @@
 ## 特性
 
 - 👏 全面、高效、可复用
-- 💪 170+常用go工具函数，支持string、slice、datetime、net、crypt...
+- 💪 180+常用go工具函数，支持string、slice、datetime、net、crypt...
 - 💅 只依赖go标准库
 - 🌍 所有导出函数单元测试覆盖率100%
 
@@ -137,9 +137,9 @@ import "github.com/duke-git/lancet/datetime"
 - [EndOfMinute](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfMinute)
 - [EndOfHour](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfHour)
 - [EndOfDay](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfDay)
-- [EndOfWeek](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BeginOfWeek)
-- [EndOfMonth](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BeginOfMonth)
-- [EndOfYear](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BeginOfYear)
+- [EndOfWeek](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfWeek)
+- [EndOfMonth](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfMonth)
+- [EndOfYear](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#EndOfYear)
 - [GetNowDate](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.md#GetNowDate)
 - [GetNowTime](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.md#GetNowTime)
 - [GetNowDateTime](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.md#GetNowDateTime)

docs/datetime.md

@@ -32,9 +32,9 @@ import (
 - [EndOfMinute](#EndOfMinute)
 - [EndOfHour](#EndOfHour)
 - [EndOfDay](#EndOfDay)
-- [EndOfWeek](#BeginOfWeek)
-- [EndOfMonth](#BeginOfMonth)
-- [EndOfYear](#BeginOfYear)
+- [EndOfWeek](#EndOfWeek)
+- [EndOfMonth](#EndOfMonth)
+- [EndOfYear](#EndOfYear)
 - [GetNowDate](#GetNowDate)
 - [GetNowTime](#GetNowTime)
 - [GetNowDateTime](#GetNowDateTime)
@@ -263,7 +263,7 @@ func main() {
 
 
 
-### <span id="BeginOfMonth">BeginOfWeek</span>
+### <span id="BeginOfMonth">BeginOfMonth</span>
 <p>Return beginning time of month</p>
 
 <b>Signature:</b>

docs/datetime_zh-CN.md

@@ -22,12 +22,24 @@ import (
 - [AddDay](#AddDay)
 - [AddHour](#AddHour)
 - [AddMinute](#AddMinute)
+- [BeginOfMinute](#BeginOfMinute)
+- [BeginOfHour](#BeginOfHour)
+- [BeginOfDay](#BeginOfDay)
+- [BeginOfWeek](#BeginOfWeek)
+- [BeginOfMonth](#BeginOfMonth)
+- [BeginOfYear](#BeginOfYear)
+
+- [EndOfMinute](#EndOfMinute)
+- [EndOfHour](#EndOfHour)
+- [EndOfDay](#EndOfDay)
+- [EndOfWeek](#EndOfWeek)
+- [EndOfMonth](#EndOfMonth)
+- [EndOfYear](#EndOfYear)
 - [GetNowDate](#GetNowDate)
 - [GetNowTime](#GetNowTime)
 - [GetNowDateTime](#GetNowDateTime)
 - [GetZeroHourTimestamp](#GetZeroHourTimestamp)
 - [GetNightTimestamp](#GetNightTimestamp)
-
 - [FormatTimeToStr](#FormatTimeToStr)
 - [FormatStrToTime](#FormatStrToTime)
 
@@ -250,7 +262,7 @@ func main() {
 
 
 
-### <span id="BeginOfMonth">BeginOfWeek</span>
+### <span id="BeginOfMonth">BeginOfMonth</span>
 <p>返回指定时间的当月开始时间</p>
 
 <b>函数签名:</b>

docs/function.md

@@ -26,7 +26,6 @@ import (
 - [Compose](#Compose)
 - [Debounced](#Debounced)
 - [Delay](#Delay)
-- [Delay](#Delay)
 - [Watcher](#Watcher)
 
 <div STYLE="page-break-after: always;"></div>

docs/function_zh-CN.md

@@ -26,7 +26,6 @@ import (
 - [Compose](#Compose)
 - [Debounced](#Debounced)
 - [Delay](#Delay)
-- [Delay](#Delay)
 - [Watcher](#Watcher)
 
 <div STYLE="page-break-after: always;"></div>

docs/random.md

@@ -23,6 +23,7 @@ import (
 - [RandBytes](#RandBytes)
 - [RandInt](#RandInt)
 - [RandString](#RandString)
+- [UUIdV4](#UUIdV4)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -105,3 +106,33 @@ func main() {
 ```
 
 
+
+
+### <span id="UUIdV4">UUIdV4</span>
+<p>Generate a random UUID of version 4 according to RFC 4122.</p>
+
+<b>Signature:</b>
+
+```go
+func UUIdV4() (string, error)
+```
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/random"
+)
+
+func main() {
+	uuid, err := random.UUIdV4()
+    if err != nil {
+        return
+    }
+	fmt.Println(uuid)
+}
+```
+
+

docs/random_zh-CN.md

@@ -23,6 +23,8 @@ import (
 - [RandBytes](#RandBytes)
 - [RandInt](#RandInt)
 - [RandString](#RandString)
+- [UUIdV4](#UUIdV4)
+
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -105,3 +107,32 @@ func main() {
 ```
 
 
+
+### <span id="UUIdV4">UUIdV4</span>
+<p>生成UUID v4字符串</p>
+
+<b>函数签名:</b>
+
+```go
+func UUIdV4() (string, error)
+```
+<b>例子:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/random"
+)
+
+func main() {
+	uuid, err := random.UUIdV4()
+    if err != nil {
+        return
+    }
+	fmt.Println(uuid)
+}
+```
+
+

function/function.go

@@ -13,6 +13,7 @@ import (
 func After(n int, fn interface{}) func(args ...interface{}) []reflect.Value {
 	// Catch programming error while constructing the closure
 	mustBeFunction(fn)
+	
 	return func(args ...interface{}) []reflect.Value {
 		n--
 		if n < 1 {
@@ -66,12 +67,18 @@ func Compose(fnList ...func(...interface{}) interface{}) func(...interface{}) in
 
 // Delay make the function execution after delayed time
 func Delay(delay time.Duration, fn interface{}, args ...interface{}) {
+	// Catch programming error while constructing the closure
+	mustBeFunction(fn)
+
 	time.Sleep(delay)
 	invokeFunc(fn, args...)
 }
 
 // Debounced creates a debounced function that delays invoking fn until after wait duration have elapsed since the last time the debounced function was invoked.
 func Debounced(fn func(), duration time.Duration) func() {
+	// Catch programming error while constructing the closure
+	mustBeFunction(fn)
+
 	timer := time.NewTimer(duration)
 	timer.Stop()
 
@@ -91,6 +98,7 @@ func Debounced(fn func(), duration time.Duration) func() {
 func Schedule(d time.Duration, fn interface{}, args ...interface{}) chan bool {
 	// Catch programming error while constructing the closure
 	mustBeFunction(fn)
+
 	quit := make(chan bool)
 	go func() {
 		for {

netutil/net_internal.go

@@ -157,16 +157,13 @@ func setQueryParam(req *http.Request, reqUrl string, queryParam interface{}) err
 
 func setBodyByte(req *http.Request, body interface{}) error {
 	if body != nil {
-		var bodyByte []byte
-		if body != nil {
-			switch v := body.(type) {
-			case []byte:
-				bodyByte = v
-			default:
-				return errors.New("body type should be []byte")
-			}
+		switch b := body.(type) {
+		case []byte:
+			req.Body = ioutil.NopCloser(bytes.NewReader(b))
+			req.ContentLength = int64(len(b))
+		default:
+			return errors.New("body type should be []byte")
 		}
-		req.Body = ioutil.NopCloser(bytes.NewReader(bodyByte))
 	}
 	return nil
 }

random/random.go

@@ -6,6 +6,7 @@ package random
 
 import (
 	crand "crypto/rand"
+	"fmt"
 	"io"
 	"math/rand"
 	"time"
@@ -48,3 +49,18 @@ func RandBytes(length int) []byte {
 	}
 	return b
 }
+
+// UUIdV4 generate a random UUID of version 4 according to RFC 4122
+func UUIdV4() (string, error) {
+	uuid := make([]byte, 16)
+
+	n, err := io.ReadFull(crand.Reader, uuid)
+	if n != len(uuid) || err != nil {
+		return "", err
+	}
+
+	uuid[8] = uuid[8]&^0xc0 | 0x80
+	uuid[6] = uuid[6]&^0xf0 | 0x40
+
+	return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:]), nil
+}

random/random_test.go

@@ -47,3 +47,16 @@ func TestRandBytes(t *testing.T) {
 
 	assert.Equal([]byte{}, RandBytes(0))
 }
+
+func TestUUIdV4(t *testing.T) {
+	assert := internal.NewAssert(t, "TestUUIdV4")
+
+	uuid, err := UUIdV4()
+	if err != nil {
+		t.Log(err)
+		t.Fail()
+	}
+
+	isUUiDV4 := regexp.MustCompile(`^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$`)
+	assert.Equal(true, isUUiDV4.MatchString(uuid))
+}