release v1.3.1

README.md

@@ -3,8 +3,8 @@
 
 <br/>
 
-![Go version](https://img.shields.io/badge/go-%3E%3D1.16<recommend>-9cf)
+![Go version](https://img.shields.io/badge/go-v1.16-9cf)
-[![Release](https://img.shields.io/badge/release-1.2.9-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-1.3.1-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)
@@ -73,6 +73,7 @@ import "github.com/duke-git/lancet/convertor"
 - [ToBool](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToBool)
 - [ToBytes](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToBytes)
 - [ToChar](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToChar)
+- [ToChannel](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToChannel)
 - [ToInt](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToInt)
 - [ToJson](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToJson)
 - [ToString](https://github.com/duke-git/lancet/blob/main/docs/convertor.md#ToString)
@@ -228,11 +229,14 @@ import "github.com/duke-git/lancet/netutil"
 
 #### Function list:
 - [ConvertMapToQueryString](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#ConvertMapToQueryString)
+- [EncodeUrl](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#EncodeUrl)
 - [GetInternalIp](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetInternalIp)
 - [GetIps](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetIps)
 - [GetMacAddrs](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetMacAddrs)
 - [GetPublicIpInfo](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetPublicIpInfo)
+- [GetRequestPublicIp](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetRequestPublicIp)
 - [IsPublicIP](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#IsPublicIP)
+- [IsInternalIP](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#IsInternalIP)
 - [HttpGet](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#HttpGet)
 - [HttpDelete](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#HttpDelete)
 - [HttpPost](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#HttpPost)
@@ -272,6 +276,7 @@ import "github.com/duke-git/lancet/slice"
 ```
 
 #### Function list:
+- [AppendIfAbsent](https://github.com/duke-git/lancet/blob/main/docs/slice.md#AppendIfAbsent)
 - [Contain](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Contain)
 - [ContainSubSlice](https://github.com/duke-git/lancet/blob/main/docs/slice.md#ContainSubSlice)
 - [Chunk](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Chunk)
@@ -304,6 +309,8 @@ import "github.com/duke-git/lancet/slice"
 - [SortByField](https://github.com/duke-git/lancet/blob/main/docs/slice.md#SortByField)
 - [Some](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Some)
 - [StringSlice](https://github.com/duke-git/lancet/blob/main/docs/slice.md#StringSlice)
+- [ToSlice](https://github.com/duke-git/lancet/blob/main/docs/slice.md#ToSlice)
+- [ToSlicePointer](https://github.com/duke-git/lancet/blob/main/docs/slice.md#ToSlice)
 - [Unique](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Unique)
 - [UniqueBy](https://github.com/duke-git/lancet/blob/main/docs/slice.md#UniqueBy)
 - [Union](https://github.com/duke-git/lancet/blob/main/docs/slice.md#Union)
@@ -351,6 +358,7 @@ import "github.com/duke-git/lancet/system"
 - [RemoveOsEnv](https://github.com/duke-git/lancet/blob/main/docs/system.md#RemoveOsEnv)
 - [CompareOsEnv](https://github.com/duke-git/lancet/blob/main/docs/system.md#CompareOsEnv)
 - [ExecCommand](https://github.com/duke-git/lancet/blob/main/docs/system.md#ExecCommand)
+- [GetOsBits](https://github.com/duke-git/lancet/blob/main/docs/system.md#GetOsBits)
 
 ### 13. Validator package contains some functions for data validation.
 

README_zh-CN.md

@@ -3,8 +3,8 @@
 
 <br/>
 
-![Go version](https://img.shields.io/badge/go-%3E%3D1.16<recommend>-9cf)
+![Go version](https://img.shields.io/badge/go-v1.16-9cf)
-[![Release](https://img.shields.io/badge/release-1.3.0-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-1.3.1-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)
@@ -73,6 +73,7 @@ import "github.com/duke-git/lancet/convertor"
 - [ToBool](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToBool)
 - [ToBytes](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToBytes)
 - [ToChar](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToChar)
+- [ToChannel](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToChannel)
 - [ToInt](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToInt)
 - [ToJson](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToJson)
 - [ToString](https://github.com/duke-git/lancet/blob/main/docs/convertor_zh-CN.md#ToString)
@@ -226,11 +227,14 @@ import "github.com/duke-git/lancet/netutil"
 
 #### 函数列表:
 - [ConvertMapToQueryString](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#ConvertMapToQueryString)
+- [EncodeUrl](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#EncodeUrl)
 - [GetInternalIp](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#GetInternalIp)
 - [GetIps](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetIps)
 - [GetMacAddrs](https://github.com/duke-git/lancet/blob/main/docs/netutil.md#GetMacAddrs)
 - [GetPublicIpInfo](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#GetPublicIpInfo)
+- [GetRequestPublicIp](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#GetRequestPublicIp)
 - [IsPublicIP](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#IsPublicIP)
+- [IsInternalIP](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#IsInternalIP)
 - [HttpGet](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#HttpGet)
 - [HttpDelete](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#HttpDelete)
 - [HttpPost](https://github.com/duke-git/lancet/blob/main/docs/netutil_zh-CN.md#HttpPost)
@@ -270,6 +274,7 @@ import "github.com/duke-git/lancet/slice"
 ```
 
 #### 函数列表:
+- [AppendIfAbsent](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#AppendIfAbsent)
 - [Contain](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Contain)
 - [ContainSubSlice](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#ContainSubSlice)
 - [Chunk](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Chunk)
@@ -302,6 +307,8 @@ import "github.com/duke-git/lancet/slice"
 - [SortByField](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#SortByField)
 - [Some](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Some)
 - [StringSlice](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#StringSlice)
+- [ToSlice](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#ToSlice)
+- [ToSlicePointer](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#ToSlice)
 - [Unique](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Unique)
 - [UniqueBy](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#UniqueBy)
 - [Union](https://github.com/duke-git/lancet/blob/main/docs/slice_zh-CN.md#Union)
@@ -351,6 +358,7 @@ import "github.com/duke-git/lancet/system"
 - [RemoveOsEnv](https://github.com/duke-git/lancet/blob/main/docs/system_zh-CN.md#RemoveOsEnv)
 - [CompareOsEnv](https://github.com/duke-git/lancet/blob/main/docs/system_zh-CN.md#CompareOsEnv)
 - [ExecCommand](https://github.com/duke-git/lancet/blob/main/docs/system_zh-CN.md#ExecCommand)
+- [GetOsBits](https://github.com/duke-git/lancet/blob/main/docs/system_zh-CN.md#GetOsBits)
 
 ### 14. validator验证器包，包含常用字符串格式验证函数。
 

convertor/convertor.go

@@ -229,3 +229,17 @@ func ColorRGBToHex(red, green, blue int) string {
 
 	return "#" + r + g + b
 }
+
+// ToChannel convert a array of elements to a read-only channels
+func ToChannel(array []interface{}) <-chan interface{} {
+	ch := make(chan interface{})
+
+	go func() {
+		for _, item := range array {
+			ch <- item
+		}
+		close(ch)
+	}()
+
+	return ch
+}

convertor/convertor_test.go

@@ -178,3 +178,20 @@ func TestColorRGBToHex(t *testing.T) {
 	assert := internal.NewAssert(t, "TestColorRGBToHex")
 	assert.Equal(expected, colorHex)
 }
+
+func TestToChannel(t *testing.T) {
+	assert := internal.NewAssert(t, "TestToChannel")
+
+	ch := ToChannel([]interface{}{1, 2, 3})
+	val1, _ := <-ch
+	assert.Equal(1, val1)
+
+	val2, _ := <-ch
+	assert.Equal(2, val2)
+
+	val3, _ := <-ch
+	assert.Equal(3, val3)
+
+	_, ok := <-ch
+	assert.Equal(false, ok)
+}

cryptor/aes.go

@@ -54,14 +54,18 @@ func AesEcbDecrypt(encrypted, key []byte) []byte {
 // AesCbcEncrypt encrypt data with key use AES CBC algorithm
 // len(key) should be 16, 24 or 32
 func AesCbcEncrypt(data, key []byte) []byte {
-	// len(key) should be 16, 24 or 32
 	block, _ := aes.NewCipher(key)
-	blockSize := block.BlockSize()
+	data = pkcs7Padding(data, block.BlockSize())
-	data = pkcs7Padding(data, blockSize)
+
-	blockMode := cipher.NewCBCEncrypter(block, key[:blockSize])
+	encrypted := make([]byte, aes.BlockSize+len(data))
+	iv := encrypted[:aes.BlockSize]
+	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
+		panic(err)
+	}
+
+	mode := cipher.NewCBCEncrypter(block, iv)
+	mode.CryptBlocks(encrypted[aes.BlockSize:], data)
 
-	encrypted := make([]byte, len(data))
-	blockMode.CryptBlocks(encrypted, data)
 	return encrypted
 }
 
@@ -69,12 +73,14 @@ func AesCbcEncrypt(data, key []byte) []byte {
 // len(key) should be 16, 24 or 32
 func AesCbcDecrypt(encrypted, key []byte) []byte {
 	block, _ := aes.NewCipher(key)
-	blockSize := block.BlockSize()
-	blockMode := cipher.NewCBCDecrypter(block, key[:blockSize])
 
-	decrypted := make([]byte, len(encrypted))
+	iv := encrypted[:aes.BlockSize]
-	blockMode.CryptBlocks(decrypted, encrypted)
+	encrypted = encrypted[aes.BlockSize:]
-	decrypted = pkcs7UnPadding(decrypted)
+
+	mode := cipher.NewCBCDecrypter(block, iv)
+	mode.CryptBlocks(encrypted, encrypted)
+
+	decrypted := pkcs7UnPadding(encrypted)
 	return decrypted
 }
 

cryptor/des.go

@@ -55,12 +55,16 @@ func DesEcbDecrypt(encrypted, key []byte) []byte {
 // len(key) should be 8
 func DesCbcEncrypt(data, key []byte) []byte {
 	block, _ := des.NewCipher(key)
-	blockSize := block.BlockSize()
+	data = pkcs7Padding(data, block.BlockSize())
-	data = pkcs7Padding(data, blockSize)
-	blockMode := cipher.NewCBCEncrypter(block, key[:blockSize])
 
-	encrypted := make([]byte, len(data))
+	encrypted := make([]byte, des.BlockSize+len(data))
-	blockMode.CryptBlocks(encrypted, data)
+	iv := encrypted[:des.BlockSize]
+	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
+		panic(err)
+	}
+
+	mode := cipher.NewCBCEncrypter(block, iv)
+	mode.CryptBlocks(encrypted[des.BlockSize:], data)
 
 	return encrypted
 }
@@ -69,13 +73,14 @@ func DesCbcEncrypt(data, key []byte) []byte {
 // len(key) should be 8
 func DesCbcDecrypt(encrypted, key []byte) []byte {
 	block, _ := des.NewCipher(key)
-	blockSize := block.BlockSize()
-	blockMode := cipher.NewCBCDecrypter(block, key[:blockSize])
 
-	decrypted := make([]byte, len(encrypted))
+	iv := encrypted[:des.BlockSize]
-	blockMode.CryptBlocks(decrypted, encrypted)
+	encrypted = encrypted[des.BlockSize:]
-	decrypted = pkcs7UnPadding(decrypted)
 
+	mode := cipher.NewCBCDecrypter(block, iv)
+	mode.CryptBlocks(encrypted, encrypted)
+
+	decrypted := pkcs7UnPadding(encrypted)
 	return decrypted
 }
 

docs/convertor.md

@@ -24,6 +24,7 @@ import (
 - [ToBool](#ToBool)
 - [ToBytes](#ToBytes)
 - [ToChar](#ToChar)
+- [ToChannel](#ToChannel)
 - [ToInt](#ToInt)
 - [ToJson](#ToJson)
 - [ToString](#ToString)
@@ -191,6 +192,43 @@ func main() {
 ```
 
 
+### <span id="ToChannel">ToChannel</span>
+
+<p>Convert a collection of elements to a read-only channels.</p>
+
+<b>Signature:</b>
+
+```go
+func ToChannel(array []interface{}) <-chan interface{}
+```
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/convertor"
+)
+
+func main() {
+    ch := convertor.ToChannel([]int{1, 2, 3})
+
+    val1, _ := <-ch
+    fmt.Println(val1) //1
+
+    val2, _ := <-ch
+    fmt.Println(val2) //2
+
+    val3, _ := <-ch
+    fmt.Println(val3) //3
+
+    _, ok := <-ch
+    fmt.Println(ok) //false
+}
+```
+
+
 
 ### <span id="ToFloat">ToFloat</span>
 

docs/convertor_zh-CN.md

@@ -26,6 +26,7 @@ import (
 - [ToBool](#ToBool)
 - [ToBytes](#ToBytes)
 - [ToChar](#ToChar)
+- [ToChannel](#ToChannel)
 - [ToInt](#ToInt)
 - [ToJson](#ToJson)
 - [ToString](#ToString)
@@ -194,6 +195,44 @@ func main() {
 
 
 
+### <span id="ToChannel">ToChannel</span>
+
+<p>将切片转为只读channel</p>
+
+<b>函数签名:</b>
+
+```go
+func ToChannel(array []interface{}) <-chan interface{}
+```
+<b>例子:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/convertor"
+)
+
+func main() {
+    ch := convertor.ToChannel([]int{1, 2, 3})
+
+    val1, _ := <-ch
+    fmt.Println(val1) //1
+
+    val2, _ := <-ch
+    fmt.Println(val2) //2
+
+    val3, _ := <-ch
+    fmt.Println(val3) //3
+
+    _, ok := <-ch
+    fmt.Println(ok) //false
+}
+```
+
+
+
 ### <span id="ToFloat">ToFloat</span>
 
 <p>将interface转成float64类型，如果参数无法转换，会返回0和error</p>

docs/netutil.md

@@ -22,16 +22,19 @@ import (
 
 ## Index
 - [ConvertMapToQueryString](#ConvertMapToQueryString)
+- [EncodeUrl](#EncodeUrl)
 - [GetInternalIp](#GetInternalIp)
 - [GetIps](#GetIps)
 - [GetMacAddrs](#GetMacAddrs)
 - [GetPublicIpInfo](#GetPublicIpInfo)
+- [GetRequestPublicIp](#GetRequestPublicIp)
 - [IsPublicIP](#IsPublicIP)
+
+- [IsInternalIP](#IsInternalIP)
 - [HttpGet](#HttpGet)
 - [HttpDelete](#HttpDelete)
 - [HttpPost](#HttpPost)
 - [HttpPut](#HttpPut)
-
 - [HttpPatch](#HttpPatch)
 - [ParseHttpResponse](#ParseHttpResponse)
 
@@ -72,6 +75,35 @@ func main() {
 
 
 
+### <span id="EncodeUrl">EncodeUrl</span>
+<p>Encode url query string values.</p>
+
+<b>Signature:</b>
+
+```go
+func EncodeUrl(urlStr string) (string, error)
+```
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/netutil"
+)
+
+func main() {
+	urlAddr := "http://www.lancet.com?a=1&b=[2]"
+	encodedUrl, err := netutil.EncodeUrl(urlAddr)
+	if err != nil {
+		fmt.Println(err)
+	}
+	fmt.Println(encodedUrl) //http://www.lancet.com?a=1&b=%5B2%5D
+}
+```
+
+
 ### <span id="GetInternalIp">GetInternalIp</span>
 <p>Get internal ip information.</p>
 
@@ -198,6 +230,48 @@ func main() {
 ```
 
 
+### <span id="GetRequestPublicIp">GetRequestPublicIp</span>
+<p>Get http request public ip.</p>
+
+<b>Signature:</b>
+
+```go
+func GetRequestPublicIp(req *http.Request) string
+```
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/netutil"
+)
+
+func main() {
+	ip := "36.112.24.10"
+
+	request1 := http.Request{
+		Method: "GET",
+		Header: http.Header{
+			"X-Forwarded-For": {ip},
+		},
+	}
+	publicIp1 := netutil.GetRequestPublicIp(&request1)
+	fmt.Println(publicIp1) //36.112.24.10
+
+	request2 := http.Request{
+		Method: "GET",
+		Header: http.Header{
+			"X-Real-Ip": {ip},
+		},
+	}
+	publicIp2 := netutil.GetRequestPublicIp(&request2)
+	fmt.Println(publicIp2) //36.112.24.10
+}
+```
+
+
 
 ### <span id="IsPublicIP">IsPublicIP</span>
 <p>Checks if a ip is public or not.</p>
@@ -229,6 +303,36 @@ func main() {
 
 
 
+### <span id="IsInternalIP">IsInternalIP</span>
+<p>Checks if an ip is intranet or not.</p>
+
+<b>Signature:</b>
+
+```go
+func IsInternalIP(IP net.IP) bool
+```
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+	"net"
+    "github.com/duke-git/lancet/v2/netutil"
+)
+
+func main() {
+	ip1 := net.ParseIP("127.0.0.1")
+	ip2 := net.ParseIP("36.112.24.10")
+
+	fmt.Println(netutil.IsInternalIP(ip1)) //true
+	fmt.Println(netutil.IsInternalIP(ip2)) //false
+}
+```
+
+
+
 
 ### <span id="HttpGet">HttpGet</span>
 <p>Send http get request.</p>

docs/netutil_zh-CN.md

@@ -22,16 +22,19 @@ import (
 
 ## 目录
 - [ConvertMapToQueryString](#ConvertMapToQueryString)
+- [EncodeUrl](#EncodeUrl)
 - [GetInternalIp](#GetInternalIp)
 - [GetIps](#GetIps)
 - [GetMacAddrs](#GetMacAddrs)
 - [GetPublicIpInfo](#GetPublicIpInfo)
+- [GetRequestPublicIp](#GetRequestPublicIp)
+
 - [IsPublicIP](#IsPublicIP)
+- [IsInternalIP](#IsInternalIP)
 - [HttpGet](#HttpGet)
 - [HttpDelete](#HttpDelete)
 - [HttpPost](#HttpPost)
 - [HttpPut](#HttpPut)
-
 - [HttpPatch](#HttpPatch)
 - [ParseHttpResponse](#ParseHttpResponse)
 
@@ -72,6 +75,36 @@ func main() {
 
 
 
+### <span id="EncodeUrl">EncodeUrl</span>
+<p>编码url query string的值</p>
+
+<b>函数签名:</b>
+
+```go
+func EncodeUrl(urlStr string) (string, error)
+```
+<b>例子:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/netutil"
+)
+
+func main() {
+	urlAddr := "http://www.lancet.com?a=1&b=[2]"
+	encodedUrl, err := netutil.EncodeUrl(urlAddr)
+	if err != nil {
+		fmt.Println(err)
+	}
+	fmt.Println(encodedUrl) //http://www.lancet.com?a=1&b=%5B2%5D
+}
+```
+
+
+
 ### <span id="GetInternalIp">GetInternalIp</span>
 <p>获取内部ip</p>
 
@@ -198,6 +231,49 @@ func main() {
 
 
 
+### <span id="GetRequestPublicIp">GetRequestPublicIp</span>
+<p>获取http请求ip</p>
+
+<b>函数签名:</b>
+
+```go
+func GetRequestPublicIp(req *http.Request) string
+```
+<b>例子:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/netutil"
+)
+
+func main() {
+	ip := "36.112.24.10"
+
+	request1 := http.Request{
+		Method: "GET",
+		Header: http.Header{
+			"X-Forwarded-For": {ip},
+		},
+	}
+	publicIp1 := netutil.GetRequestPublicIp(&request1)
+	fmt.Println(publicIp1) //36.112.24.10
+
+	request2 := http.Request{
+		Method: "GET",
+		Header: http.Header{
+			"X-Real-Ip": {ip},
+		},
+	}
+	publicIp2 := netutil.GetRequestPublicIp(&request2)
+	fmt.Println(publicIp2) //36.112.24.10
+}
+```
+
+
+
 ### <span id="IsPublicIP">IsPublicIP</span>
 <p>判断ip是否是公共ip</p>
 
@@ -228,6 +304,35 @@ func main() {
 
 
 
+### <span id="IsInternalIP">IsInternalIP</span>
+<p>判断ip是否是局域网ip.</p>
+
+<b>函数签名:</b>
+
+```go
+func IsInternalIP(IP net.IP) bool
+```
+<b>例子:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+	"net"
+    "github.com/duke-git/lancet/netutil"
+)
+
+func main() {
+	ip1 := net.ParseIP("127.0.0.1")
+	ip2 := net.ParseIP("36.112.24.10")
+
+	fmt.Println(netutil.IsInternalIP(ip1)) //true
+	fmt.Println(netutil.IsInternalIP(ip2)) //false
+}
+```
+
+
 
 ### <span id="HttpGet">HttpGet</span>
 <p>发送http get请求</p>

docs/slice.md

@@ -20,6 +20,7 @@ import (
 <div STYLE="page-break-after: always;"></div>
 
 ## Index
+- [AppendIfAbsent](#AppendIfAbsent)
 - [Contain](#Contain)
 - [ContainSubSlice](#ContainSubSlice)
 - [Chunk](#Chunk)
@@ -53,6 +54,8 @@ import (
 - [SortByField](#SortByField)
 - [Some](#Some)
 - [StringSlice](#StringSlice)
+- [ToSlice](#ToSlice)
+- [ToSlicePointer](#ToSlicePointer)
 - [Unique](#Unique)
 - [UniqueBy](#UniqueBy)
 - [Union](#Union)
@@ -66,6 +69,35 @@ import (
 ## Note:
 1. param which type is interface{} in below functions should be slice.
 
+
+
+### <span id="AppendIfAbsent">AppendIfAbsent</span>
+<p>If slice doesn't contain the value, append it to the slice.</p>
+
+<b>Signature:</b>
+
+```go
+func AppendIfAbsent(slice interface{}, value interface{}) interface{}
+```
+<b>Example:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/slice"
+)
+
+func main() {
+	strs := []string{"a", "b"}
+	res1 := slice.AppendIfAbsent(strs, "a")
+	fmt.Println(res1) //[]string{"a", "b"}
+
+	res2 := slice.AppendIfAbsent(strs, "cannot")
+	fmt.Println(res2"}
+}
+```
+
+
 ### <span id="Contain">Contain</span>
 <p>Check if the value is in the slice or not. iterableType param can be string, map or slice.</p>
 
@@ -974,6 +1006,55 @@ func main() {
 
 
 
+### <span id="ToSlice">ToSlice</span>
+<p>Returns a slices of a variable parameter transformation</p>
+
+<b>Signature:</b>
+
+```go
+func ToSlice(value ...interface{}) interface{}
+```
+<b>Example:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/slice"
+)
+
+func main() {
+	res := slice.ToSlice("a", "b")
+	fmt.Println(res) //{"a", "b"}
+}
+```
+
+
+
+### <span id="ToSlicePointer">ToSlicePointer</span>
+<p>Returns a pointer to the slices of a variable parameter transformation</p>
+
+<b>Signature:</b>
+
+```go
+func ToSlicePointer(value ...interface{}) []*interface{}
+```
+<b>Example:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/slice"
+)
+
+func main() {
+	str1 := "a"
+	str2 := "b"
+	res := slice.ToSlicePointer(str1, str2)
+	fmt.Println(res) // res -> []*string{&str1, &str2}
+}
+```
+
+
 
 ### <span id="Unique">Unique</span>
 <p>Remove duplicate elements in slice.</p>

docs/slice_zh-CN.md

@@ -20,6 +20,7 @@ import (
 <div STYLE="page-break-after: always;"></div>
 
 ## 目录
+- [AppendIfAbsent](#AppendIfAbsent)
 - [Contain](#Contain)
 - [ContainSubSlice](#ContainSubSlice)
 - [Chunk](#Chunk)
@@ -53,6 +54,8 @@ import (
 - [SortByField](#SortByField)
 - [Some](#Some)
 - [StringSlice](#StringSlice)
+- [ToSlice](#ToSlice)
+- [ToSlicePointer](#ToSlicePointer)
 - [Unique](#Unique)
 - [UniqueBy](#UniqueBy)
 - [Union](#Union)
@@ -63,6 +66,34 @@ import (
 
 ## 文档
 
+### <span id="AppendIfAbsent">AppendIfAbsent</span>
+<p>当前切片中不包含值时，将该值追加到切片中</p>
+
+<b>函数签名:</b>
+
+```go
+func AppendIfAbsent(slice interface{}, value interface{}) interface{}
+```
+<b>例子:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/slice"
+)
+
+func main() {
+	strs := []string{"a", "b"}
+	res1 := slice.AppendIfAbsent(strs, "a")
+	fmt.Println(res1) //[]string{"a", "b"}
+
+	res2 := slice.AppendIfAbsent(strs, "cannot")
+	fmt.Println(res2"}
+}
+```
+
+
+
 ### <span id="Contain">Contain</span>
 <p>判断slice是否包含value</p>
 
@@ -974,6 +1005,55 @@ func main() {
 
 
 
+### <span id="ToSlice">ToSlice</span>
+<p>将可变参数转为切片</p>
+
+<b>函数签名:</b>
+
+```go
+func ToSlice(value ...interface{}) interface{}
+```
+<b>例子:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	res := slice.ToSlice("a", "b")
+	fmt.Println(res) //{"a", "b"}
+}
+```
+
+
+
+### <span id="ToSlicePointer">ToSlicePointer</span>
+<p>将可变参数转为指针切片</p>
+
+<b>函数签名:</b>
+
+```go
+func ToSlicePointer(value ...interface{}) []*interface{}
+```
+<b>例子:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/v2/slice"
+)
+
+func main() {
+	str1 := "a"
+	str2 := "b"
+	res := slice.ToSlicePointer(str1, str2)
+	fmt.Println(res) // res -> []*string{&str1, &str2}
+}
+```
+
+
 
 ### <span id="Unique">Unique</span>
 <p>删除切片中的重复元素</p>

docs/system.md

@@ -28,6 +28,7 @@ import (
 - [RemoveOsEnv](#RemoveOsEnv)
 - [CompareOsEnv](#CompareOsEnv)
 - [ExecCommand](#ExecCommand)
+- [GetOsBits](#GetOsBits)
   
 
 <div STYLE="page-break-after: always;"></div>
@@ -235,7 +236,27 @@ func main() {
 
 
 
-
+### <span id="GetOsBits">GetOsBits</span>
+<p>获取当前操作系统位数，返回32或64</p>
+
+<b>函数签名:</b>
+
+```go
+func GetOsBits() int
+```
+<b>例子:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/system"
+)
+
+func main() {
+	osBit := system.GetOsBits()
+	fmt.Println(osBit) 
+}
+```
 
 
 

docs/system_zh-CN.md

@@ -28,6 +28,7 @@ import (
 - [RemoveOsEnv](#RemoveOsEnv)
 - [CompareOsEnv](#CompareOsEnv)
 - [ExecCommand](#ExecCommand)
+- [GetOsBits](#GetOsBits)
   
 
 <div STYLE="page-break-after: always;"></div>
@@ -235,7 +236,27 @@ func main() {
 
 
 
-
+### <span id="GetOsBits">GetOsBits</span>
+<p>Get current os bits, 32bit or 64bit. return 32 or 64</p>
+
+<b>Signature:</b>
+
+```go
+func GetOsBits() int
+```
+<b>Example:</b>
+
+```go
+import (
+	"fmt"
+	"github.com/duke-git/lancet/system"
+)
+
+func main() {
+	osBit := system.GetOsBits()
+	fmt.Println(osBit) 
+}
+```
 
 
 

netutil/http.go

@@ -6,8 +6,8 @@
 // HttpGet, HttpPost, HttpDelete, HttpPut, HttpPatch, function param `url` is required.
 // HttpGet, HttpPost, HttpDelete, HttpPut, HttpPatch, function param `params` is variable, the order is:
 // params[0] is header which type should be http.Header or map[string]string,
-// params[1] is query param which type should be url.Values or map[string]interface{}, when content-type header is
+// params[1] is query string param which type should be url.Values or map[string]string, when content-type header is
-// multipart/form-data or application/x-www-form-urlencoded must pass url.Values params
+// multipart/form-data or application/x-www-form-urlencoded
 // params[2] is post body which type should be []byte.
 // params[3] is http client which type should be http.Client.
 package netutil

netutil/net.go

@@ -5,6 +5,8 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
+	"net/url"
+	"strings"
 )
 
 // GetInternalIp return internal ipv4
@@ -47,6 +49,26 @@ func GetPublicIpInfo() (*PublicIpInfo, error) {
 	return &ip, nil
 }
 
+// GetRequestPublicIp return the requested public ip
+func GetRequestPublicIp(req *http.Request) string {
+	var ip string
+	for _, ip = range strings.Split(req.Header.Get("X-Forwarded-For"), ",") {
+		if ip = strings.TrimSpace(ip); ip != "" && !IsInternalIP(net.ParseIP(ip)) {
+			return ip
+		}
+	}
+
+	if ip = strings.TrimSpace(req.Header.Get("X-Real-Ip")); ip != "" && !IsInternalIP(net.ParseIP(ip)) {
+		return ip
+	}
+
+	if ip, _, _ = net.SplitHostPort(req.RemoteAddr); !IsInternalIP(net.ParseIP(ip)) {
+		return ip
+	}
+
+	return ip
+}
+
 // GetIps return all ipv4 of system
 func GetIps() []string {
 	var ips []string
@@ -122,3 +144,29 @@ func IsPublicIP(IP net.IP) bool {
 	}
 	return false
 }
+
+// IsInternalIP verify an ip is intranet or not
+func IsInternalIP(IP net.IP) bool {
+	if IP.IsLoopback() {
+		return true
+	}
+	if ip4 := IP.To4(); ip4 != nil {
+		return ip4[0] == 10 ||
+			(ip4[0] == 172 && ip4[1] >= 16 && ip4[1] <= 31) ||
+			(ip4[0] == 169 && ip4[1] == 254) ||
+			(ip4[0] == 192 && ip4[1] == 168)
+	}
+	return false
+}
+
+// EncodeUrl encode url
+func EncodeUrl(urlStr string) (string, error) {
+	URL, err := url.Parse(urlStr)
+	if err != nil {
+		return "", err
+	}
+
+	URL.RawQuery = URL.Query().Encode()
+
+	return URL.String(), nil
+}

netutil/net_internal.go

@@ -82,9 +82,18 @@ func setHeaderAndQueryAndBody(req *http.Request, reqUrl string, header, queryPar
 	if err != nil {
 		return err
 	}
-	if req.Header.Get("Content-Type") == "multipart/form-data" || req.Header.Get("Content-Type") == "application/x-www-form-urlencoded" {
+	if strings.Contains(req.Header.Get("Content-Type"), "multipart/form-data") || req.Header.Get("Content-Type") == "application/x-www-form-urlencoded" {
-		formData := queryParam.(url.Values)
+		if formData, ok := queryParam.(url.Values); ok {
-		err = setBodyByte(req, []byte(formData.Encode()))
+			err = setBodyByte(req, []byte(formData.Encode()))
+		}
+		if formData, ok := queryParam.(map[string]string); ok {
+			postData := url.Values{}
+			for k, v := range formData {
+				postData.Set(k, v)
+			}
+			err = setBodyByte(req, []byte(postData.Encode()))
+		}
+
 	} else {
 		err = setBodyByte(req, body)
 	}

slice/slice.go

@@ -641,7 +641,6 @@ func InsertByIndex(slice interface{}, index int, value interface{}) (interface{}
 		return slice, errors.New("InvalidSliceIndex")
 	}
 
-	// value is slice
 	vv := reflect.ValueOf(value)
 	if vv.Kind() == reflect.Slice {
 		if reflect.TypeOf(slice).Elem() != reflect.TypeOf(value).Elem() {
@@ -651,7 +650,6 @@ func InsertByIndex(slice interface{}, index int, value interface{}) (interface{}
 		return v.Interface(), nil
 	}
 
-	// value is not slice
 	if reflect.TypeOf(slice).Elem() != reflect.TypeOf(value) {
 		return slice, errors.New("InvalidValueType")
 	}
@@ -709,21 +707,8 @@ func Unique(slice interface{}) interface{} {
 	for i := 0; i < len(temp); i++ {
 		res.Index(i).Set(reflect.ValueOf(temp[i]))
 	}
+
 	return res.Interface()
-
-	// if use map filter, the result slice element order is random, not same as origin slice
-	//mp := make(map[interface{}]bool)
-	//for i := 0; i < sv.Len(); i++ {
-	//	v := sv.Index(i).Interface()
-	//	mp[v] = true
-	//}
-	//
-	//var res []interface{}
-	//for k := range mp {
-	//	res = append(res, mp[k])
-	//}
-	//return res
-
 }
 
 // UniqueBy call iteratee func with every item of slice, then remove duplicated.
@@ -732,11 +717,6 @@ func UniqueBy(slice, iteratee interface{}) interface{} {
 	sv := sliceValue(slice)
 	fn := functionValue(iteratee)
 
-	// elemType := sv.Type().Elem()
-	// if !checkCallbackFuncSignature2(fn, elemType, elemType) {
-	// 	panic("iteratee function signature should be of type func(" + elemType.String() + ")" + elemType.String())
-	// }
-
 	if sv.Len() == 0 {
 		return slice
 	}
@@ -955,3 +935,36 @@ func LastIndexOf(slice, value interface{}) int {
 
 	return -1
 }
+
+// ToSlicePointer returns a pointer to the slices of a variable parameter transformation
+func ToSlicePointer(value ...interface{}) []*interface{} {
+	out := make([]*interface{}, len(value))
+	for i := range value {
+		out[i] = &value[i]
+	}
+
+	return out
+}
+
+// ToSlice returns a slices of a variable parameter transformation
+func ToSlice(value ...interface{}) interface{} {
+	rv := reflect.ValueOf(value)
+	out := reflect.MakeSlice(rv.Type(), len(value), len(value))
+	for i := range value {
+		out.Index(i).Set(reflect.ValueOf(value[i]))
+	}
+	return out.Interface()
+}
+
+// AppendIfAbsent only absent append the value
+func AppendIfAbsent(slice interface{}, value interface{}) interface{} {
+	sv := sliceValue(slice)
+	out := reflect.MakeSlice(sv.Type(), sv.Len(), sv.Len())
+	for i := 0; i < sv.Len(); i++ {
+		out.Index(i).Set(sv.Index(i))
+	}
+	if !Contain(slice, value) {
+		out = reflect.Append(out, reflect.ValueOf(value))
+	}
+	return out.Interface()
+}

slice/slice_test.go

@@ -592,3 +592,35 @@ func TestLastIndexOf(t *testing.T) {
 	assert.Equal(1, LastIndexOf(arr, "a"))
 	assert.Equal(-1, LastIndexOf(arr, "d"))
 }
+
+func TestToSlice(t *testing.T) {
+	assert := internal.NewAssert(t, "TestToSlice")
+
+	str1 := "a"
+	str2 := "b"
+	out1 := ToSlice(str1)
+	out2 := ToSlice(str1, str2)
+
+	assert.Equal([]string{"a"}, StringSlice(out1))
+	assert.Equal([]string{"a", "b"}, StringSlice(out2))
+}
+
+func TestToSlicePointer(t *testing.T) {
+	assert := internal.NewAssert(t, "TestToSlicePointer")
+
+	var str1 interface{}
+	str1 = "a"
+	var str2 interface{}
+	str2 = "b"
+
+	assert.Equal([]*interface{}{&str1}, ToSlicePointer(str1))
+	assert.Equal([]*interface{}{&str1, &str2}, ToSlicePointer(str1, str2))
+}
+
+func TestAppendIfAbsent(t *testing.T) {
+	assert := internal.NewAssert(t, "TestToAppendIfAbsent")
+
+	str1 := []string{"a", "b"}
+	assert.Equal([]string{"a", "b"}, AppendIfAbsent(str1, "a"))
+	assert.Equal([]string{"a", "b", "c"}, AppendIfAbsent(str1, "c"))
+}

system/os.go

@@ -70,3 +70,9 @@ func ExecCommand(command string) (stdout, stderr string, err error) {
 
 	return
 }
+
+// GetOsBits get this system bits 32bit or 64bit
+// return bit int (32/64)
+func GetOsBits() int {
+	return 32 << (^uint(0) >> 63)
+}

system/os_test.go

@@ -60,3 +60,13 @@ func TestExecCommand(t *testing.T) {
 		assert.IsNotNil(err)
 	}
 }
+
+func TestGetOsBits(t *testing.T) {
+	osBits := GetOsBits()
+	switch osBits {
+	case 32, 64:
+		t.Logf("os is %d", osBits)
+	default:
+		t.Error("os is not 32 or 64 bits")
+	}
+}