doc: add doc for BetweenSeconds

Co-authored-by: leitao <leitao@kezaihui.com>

README.md

@@ -25,7 +25,7 @@ English | [简体中文](./README_zh-CN.md)
 
 -   👏 Comprehensive, efficient and reusable.
 -   💪 500+ go util functions, support string, slice, datetime, net, crypt...
--   💅 Only depend on the go standard library.
+-   💅 Only depends on two kinds of libraries: go standard library and golang.org/x.
 -   🌍 Unit test for every exported function.
 
 ## Installation

README_zh-CN.md

@@ -22,10 +22,10 @@
 
 ## 特性
 
--   👏 全面、高效、可复用
+-   👏 全面、高效、可复用。
 -   💪 500+常用 go 工具函数，支持 string、slice、datetime、net、crypt...
--   💅 只依赖 go 标准库
--   🌍 所有导出函数单元测试覆盖率 100%
+-   💅 只依赖 go 标准库和 golang.org/x。
+-   🌍 所有导出函数单元测试覆盖率100%。
 
 ## 安装
 

datetime/datetime.go

@@ -230,3 +230,10 @@ func EndOfYear(t time.Time) time.Time {
 func IsLeapYear(year int) bool {
 	return year%4 == 0 && (year%100 != 0 || year%400 == 0)
 }
+
+// BetweenSeconds returns the number of seconds between two times.
+// Play: todo
+func BetweenSeconds(t1 time.Time, t2 time.Time) int64 {
+	index := t2.Unix() - t1.Unix()
+	return index
+}

datetime/datetime_example_test.go

@@ -353,3 +353,19 @@ func ExampleIsLeapYear() {
 	// true
 	// false
 }
+
+func ExampleBetweenSeconds() {
+	today := time.Now()
+	tomorrow := AddDay(today, 1)
+	yesterday := AddDay(today, -1)
+
+	result1 := BetweenSeconds(today, tomorrow)
+	result2 := BetweenSeconds(today, yesterday)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+
+	// Output:
+	// 86400
+	// -86400
+}

datetime/datetime_test.go

@@ -20,6 +20,20 @@ func TestAddYear(t *testing.T) {
 	assert.Equal(float64(-8760), diff2.Hours())
 }
 
+func TestBetweenSeconds(t *testing.T) {
+	assert := internal.NewAssert(t, "TestBetweenSeconds")
+
+	today := time.Now()
+	tomorrow := AddDay(today, 1)
+	yesterday := AddDay(today, -1)
+
+	result1 := BetweenSeconds(today, tomorrow)
+	result2 := BetweenSeconds(today, yesterday)
+
+	assert.Equal(int64(86400), result1)
+	assert.Equal(int64(-86400), result2)
+}
+
 func TestAddDay(t *testing.T) {
 	assert := internal.NewAssert(t, "TestAddDay")
 

docs/datetime.md

@@ -55,6 +55,7 @@ import (
 -   [ToFormatForTpl](#ToFormatForTpl)
 -   [ToIso8601](#ToIso8601)
 -   [IsLeapYear](#IsLeapYear)
+-   [BetweenSeconds](#BetweenSeconds)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -1136,3 +1137,41 @@ func main() {
     // false
 }
 ```
+
+
+### <span id="BetweenSeconds">BetweenSeconds</span>
+
+<p>Return the number of seconds between two times.</p>
+
+<b>Signature:</b>
+
+```go
+func BetweenSeconds(t1 time.Time, t2 time.Time) int64
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/datetime"
+)
+
+func main() {
+    today := time.Now()
+	tomorrow := AddDay(today, 1)
+	yesterday := AddDay(today, -1)
+
+	result1 := datetime.BetweenSeconds(today, tomorrow)
+	result2 := datetime.BetweenSeconds(today, yesterday)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+
+	// Output:
+	// 86400
+	// -86400
+}
+```

docs/datetime_zh-CN.md

@@ -54,6 +54,8 @@ import (
 -   [ToFormatForTpl](#ToFormatForTpl)
 -   [ToIso8601](#ToIso8601)
 -   [IsLeapYear](#IsLeapYear)
+-   [BetweenSeconds](#BetweenSeconds)
+
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -1135,3 +1137,40 @@ func main() {
     // false
 }
 ```
+
+### <span id="BetweenSeconds">BetweenSeconds</span>
+
+<p>返回两个时间的间隔秒数。</p>
+
+<b>函数签名:</b>
+
+```go
+func BetweenSeconds(t1 time.Time, t2 time.Time) int64
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/datetime"
+)
+
+func main() {
+    today := time.Now()
+	tomorrow := AddDay(today, 1)
+	yesterday := AddDay(today, -1)
+
+	result1 := datetime.BetweenSeconds(today, tomorrow)
+	result2 := datetime.BetweenSeconds(today, yesterday)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+
+	// Output:
+	// 86400
+	// -86400
+}
+```

docs/mathutil.md

@@ -42,6 +42,8 @@ import (
 -   [IsPrime](#IsPrime)
 -   [GCD](#GCD)
 -   [LCM](#LCM)
+-   [Cos](#Cos)
+-   [Sin](#Sin)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -366,17 +368,17 @@ import (
 
 func main() {
     result1 := mathutil.Percent(1, 2, 2)
-	result2 := mathutil.Percent(0.1, 0.3, 2)
-	result3 := mathutil.Percent(-30305, 408420, 2)
+    result2 := mathutil.Percent(0.1, 0.3, 2)
+    result3 := mathutil.Percent(-30305, 408420, 2)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
 
-	// Output:
-	// 50
-	// 33.33
-	// -7.42
+    // Output:
+    // 50
+    // 33.33
+    // -7.42
 }
 ```
 
@@ -602,7 +604,6 @@ func main() {
 }
 ```
 
-
 ### <span id="RadianToAngle">RadianToAngle</span>
 
 <p>Converts radian value to angle value.</p>
@@ -669,7 +670,6 @@ func main() {
 }
 ```
 
-
 ### <span id="IsPrime">IsPrime</span>
 
 <p>Checks if number is prime number.</p>
@@ -692,20 +692,20 @@ import (
 
 func main() {
     result1 := mathutil.IsPrime(-1)
-	result2 := mathutil.IsPrime(0)
-	result3 := mathutil.IsPrime(1)
-	result4 := mathutil.IsPrime(2)
+    result2 := mathutil.IsPrime(0)
+    result3 := mathutil.IsPrime(1)
+    result4 := mathutil.IsPrime(2)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
-	fmt.Println(result4)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
 
-	// Output:
-	// false
-	// false
-	// false
-	// true
+    // Output:
+    // false
+    // false
+    // false
+    // true
 }
 ```
 
@@ -731,27 +731,26 @@ import (
 
 func main() {
     result1 := mathutil.GCD(1, 1)
-	result2 := mathutil.GCD(1, -1)
-	result3 := mathutil.GCD(-1, 1)
-	result4 := mathutil.GCD(-1, -1)
-	result5 := mathutil.GCD(3, 6, 9)
+    result2 := mathutil.GCD(1, -1)
+    result3 := mathutil.GCD(-1, 1)
+    result4 := mathutil.GCD(-1, -1)
+    result5 := mathutil.GCD(3, 6, 9)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
-	fmt.Println(result4)
-	fmt.Println(result5)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
+    fmt.Println(result5)
 
-	// Output:
-	// 1
-	// 1
-	// -1
-	// -1
-	// 3
+    // Output:
+    // 1
+    // 1
+    // -1
+    // -1
+    // 3
 }
 ```
 
-
 ### <span id="LCM">LCM</span>
 
 <p>Return Least Common Multiple (LCM) of integers.</p>
@@ -774,16 +773,102 @@ import (
 
 func main() {
     result1 := mathutil.LCM(1, 1)
-	result2 := mathutil.LCM(1, 2)
-	result3 := mathutil.LCM(3, 6, 9)
+    result2 := mathutil.LCM(1, 2)
+    result3 := mathutil.LCM(3, 6, 9)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
 
-	// Output:
-	// 1
-	// 2
-	// 18
+    // Output:
+    // 1
+    // 2
+    // 18
+}
+```
+
+
+### <span id="Cos">Cos</span>
+
+<p>Returns the cosine of the radian argument.</p>
+
+<b>Signature:</b>
+
+```go
+func Cos(radian float64, precision ...int) float64
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/mathutil"
+)
+
+func main() {
+    result1 := mathutil.Cos(0)
+    result2 := mathutil.Cos(90)
+    result3 := mathutil.Cos(180)
+    result4 := mathutil.Cos(math.Pi)
+    result5 := mathutil.Cos(math.Pi / 2)
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
+    fmt.Println(result5)
+
+    // Output:
+    // 1
+    // -0.447
+    // -0.598
+    // -1
+    // 0
+}
+```
+
+
+### <span id="Sin">Sin</span>
+
+<p>Returns the sine of the radian argument.</p>
+
+<b>Signature:</b>
+
+```go
+func Sin(radian float64, precision ...int) float64
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/mathutil"
+)
+
+func main() {
+    result1 := mathutil.Sin(0)
+    result2 := mathutil.Sin(90)
+    result3 := mathutil.Sin(180)
+    result4 := mathutil.Sin(math.Pi)
+    result5 := mathutil.Sin(math.Pi / 2)
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
+    fmt.Println(result5)
+
+    // Output:
+    // 0
+    // 0.894
+    // -0.801
+    // 0
+    // 1
 }
 ```

docs/mathutil_zh-CN.md

@@ -42,6 +42,8 @@ import (
 -   [IsPrime](#IsPrime)
 -   [GCD](#GCD)
 -   [LCM](#LCM)
+-   [Cos](#Cos)
+-   [Sin](#Sin)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -366,17 +368,17 @@ import (
 
 func main() {
     result1 := mathutil.Percent(1, 2, 2)
-	result2 := mathutil.Percent(0.1, 0.3, 2)
-	result3 := mathutil.Percent(-30305, 408420, 2)
+    result2 := mathutil.Percent(0.1, 0.3, 2)
+    result3 := mathutil.Percent(-30305, 408420, 2)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
 
-	// Output:
-	// 50
-	// 33.33
-	// -7.42
+    // Output:
+    // 50
+    // 33.33
+    // -7.42
 }
 ```
 
@@ -668,8 +670,6 @@ func main() {
 }
 ```
 
-
-
 ### <span id="IsPrime">IsPrime</span>
 
 <p>判断质数。</p>
@@ -692,20 +692,20 @@ import (
 
 func main() {
     result1 := mathutil.IsPrime(-1)
-	result2 := mathutil.IsPrime(0)
-	result3 := mathutil.IsPrime(1)
-	result4 := mathutil.IsPrime(2)
+    result2 := mathutil.IsPrime(0)
+    result3 := mathutil.IsPrime(1)
+    result4 := mathutil.IsPrime(2)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
-	fmt.Println(result4)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
 
-	// Output:
-	// false
-	// false
-	// false
-	// true
+    // Output:
+    // false
+    // false
+    // false
+    // true
 }
 ```
 
@@ -731,27 +731,26 @@ import (
 
 func main() {
     result1 := mathutil.GCD(1, 1)
-	result2 := mathutil.GCD(1, -1)
-	result3 := mathutil.GCD(-1, 1)
-	result4 := mathutil.GCD(-1, -1)
-	result5 := mathutil.GCD(3, 6, 9)
+    result2 := mathutil.GCD(1, -1)
+    result3 := mathutil.GCD(-1, 1)
+    result4 := mathutil.GCD(-1, -1)
+    result5 := mathutil.GCD(3, 6, 9)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
-	fmt.Println(result4)
-	fmt.Println(result5)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
+    fmt.Println(result5)
 
-	// Output:
-	// 1
-	// 1
-	// -1
-	// -1
-	// 3
+    // Output:
+    // 1
+    // 1
+    // -1
+    // -1
+    // 3
 }
 ```
 
-
 ### <span id="LCM">LCM</span>
 
 <p>计算最小公倍数。</p>
@@ -774,16 +773,102 @@ import (
 
 func main() {
     result1 := mathutil.LCM(1, 1)
-	result2 := mathutil.LCM(1, 2)
-	result3 := mathutil.LCM(3, 6, 9)
+    result2 := mathutil.LCM(1, 2)
+    result3 := mathutil.LCM(3, 6, 9)
 
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
 
-	// Output:
-	// 1
-	// 2
-	// 18
+    // Output:
+    // 1
+    // 2
+    // 18
+}
+```
+
+
+### <span id="Cos">Cos</span>
+
+<p>计算弧度的余弦值</p>
+
+<b>函数签名:</b>
+
+```go
+func Cos(radian float64, precision ...int) float64
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/mathutil"
+)
+
+func main() {
+    result1 := mathutil.Cos(0)
+    result2 := mathutil.Cos(90)
+    result3 := mathutil.Cos(180)
+    result4 := mathutil.Cos(math.Pi)
+    result5 := mathutil.Cos(math.Pi / 2)
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
+    fmt.Println(result5)
+
+    // Output:
+    // 1
+    // -0.447
+    // -0.598
+    // -1
+    // 0
+}
+```
+
+
+### <span id="Sin">Sin</span>
+
+<p>计算弧度的正弦值</p>
+
+<b>函数签名:</b>
+
+```go
+func Sin(radian float64, precision ...int) float64
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/mathutil"
+)
+
+func main() {
+    result1 := mathutil.Sin(0)
+    result2 := mathutil.Sin(90)
+    result3 := mathutil.Sin(180)
+    result4 := mathutil.Sin(math.Pi)
+    result5 := mathutil.Sin(math.Pi / 2)
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)
+    fmt.Println(result5)
+
+    // Output:
+    // 0
+    // 0.894
+    // -0.801
+    // 0
+    // 1
 }
 ```

docs/netutil.md

@@ -620,9 +620,9 @@ func main() {
 }
 ```
 
-### <span id="HttpGet">HttpGet (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpGet">HttpGet</span>
 
-<p>Send http get request.</p>
+<p>Send http get request. (Deprecated: use SendRequest for replacement)</p>
 
 <b>Signature:</b>
 
@@ -662,9 +662,9 @@ func main() {
 }
 ```
 
-### <span id="HttpPost">HttpPost (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpPost">HttpPost</span>
 
-<p>Send http post request.</p>
+<p>Send http post request.(Deprecated: use SendRequest for replacement)</p>
 
 <b>Signature:</b>
 
@@ -692,28 +692,26 @@ import (
 func main() {
     url := "https://jsonplaceholder.typicode.com/todos"
     header := map[string]string{
-        "Content-Type": "application/json",
+        "Content-Type": "application/x-www-form-urlencoded",
     }
-    type Todo struct {
-        UserId int    `json:"userId"`
-        Title  string `json:"title"`
-    }
-    todo := Todo{1, "TestAddToDo"}
-    bodyParams, _ := json.Marshal(todo)
+    
+    postData := url.Values{}
+	postData.Add("userId", "1")
+	postData.Add("title", "TestToDo")
 
-    resp, err := netutil.HttpPost(url, header, nil, bodyParams)
-    if err != nil {
-        log.Fatal(err)
-    }
+    resp, err := netutil.HttpPost(apiUrl, header, nil, postData)
+	if err != nil {
+		log.Fatal(err)
+	}
 
     body, _ := ioutil.ReadAll(resp.Body)
     fmt.Println(body)
 }
 ```
 
-### <span id="HttpPut">HttpPut (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpPut">HttpPut</span>
 
-<p>Send http put request.</p>
+<p>Send http put request. (Deprecated: use SendRequest for replacement)</p>
 
 <b>Signature:</b>
 
@@ -761,9 +759,9 @@ func main() {
 }
 ```
 
-### <span id="HttpDelete">HttpDelete (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpDelete">HttpDelete</span>
 
-<p>Send http delete request.</p>
+<p>Send http delete request. (Deprecated: use SendRequest for replacement)</p>
 
 <b>Signature:</b>
 
@@ -800,9 +798,9 @@ func main() {
 }
 ```
 
-### <span id="HttpPatch">HttpPatch (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpPatch">HttpPatch</span>
 
-<p>Send http patch request.</p>
+<p>Send http patch request. (Deprecated: use SendRequest for replacement)</p>
 
 <b>Signature:</b>
 

docs/netutil_zh-CN.md

@@ -622,9 +622,9 @@ func main() {
 }
 ```
 
-### <span id="HttpGet">HttpGet (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpGet">HttpGet</span>
 
-<p>发送http get请求</p>
+<p>发送http get请求。(已废弃:使用SendRequest)</p>
 
 <b>函数签名:</b>
 
@@ -664,9 +664,9 @@ func main() {
 }
 ```
 
-### <span id="HttpPost">HttpPost (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpPost">HttpPost</span>
 
-<p>发送http post请求</p>
+<p>发送http post请求。(已废弃:使用SendRequest)</p>
 
 <b>函数签名:</b>
 
@@ -694,28 +694,26 @@ import (
 func main() {
     url := "https://jsonplaceholder.typicode.com/todos"
     header := map[string]string{
-        "Content-Type": "application/json",
+        "Content-Type": "application/x-www-form-urlencoded",
     }
-    type Todo struct {
-        UserId int    `json:"userId"`
-        Title  string `json:"title"`
-    }
-    todo := Todo{1, "TestAddToDo"}
-    bodyParams, _ := json.Marshal(todo)
+    
+    postData := url.Values{}
+	postData.Add("userId", "1")
+	postData.Add("title", "TestToDo")
 
-    resp, err := netutil.HttpPost(url, header, nil, bodyParams)
-    if err != nil {
-        log.Fatal(err)
-    }
+    resp, err := netutil.HttpPost(apiUrl, header, nil, postData)
+	if err != nil {
+		log.Fatal(err)
+	}
 
     body, _ := ioutil.ReadAll(resp.Body)
     fmt.Println(body)
 }
 ```
 
-### <span id="HttpPut">HttpPut (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpPut">HttpPut</span>
 
-<p>发送http put请求</p>
+<p>发送http put请求。(已废弃:使用SendRequest)</p>
 
 <b>函数签名:</b>
 
@@ -763,9 +761,9 @@ func main() {
 }
 ```
 
-### <span id="HttpDelete">HttpDelete (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpDelete">HttpDelete</span>
 
-<p>发送http delete请求</p>
+<p>发送http delete请求。(已废弃:使用SendRequest)</p>
 
 <b>函数签名:</b>
 
@@ -802,9 +800,9 @@ func main() {
 }
 ```
 
-### <span id="HttpPatch">HttpPatch (Deprecated: use SendRequest for replacement)</span>
+### <span id="HttpPatch">HttpPatch</span>
 
-<p>发送http patch请求</p>
+<p>发送http patch请求。(已废弃:使用SendRequest)</p>
 
 <b>函数签名:</b>
 

docs/strutil.md

@@ -55,6 +55,7 @@ import (
 -   [ReplaceWithMap](#ReplaceWithMap)
 -   [Trim](#Trim)
 -   [SplitAndTrim](#SplitAndTrim)
+-   [HideString](#HideString)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -1246,7 +1247,6 @@ func main() {
 }
 ```
 
-
 ### <span id="SplitAndTrim">SplitAndTrim</span>
 
 <p>Splits string `str` by a string `delimiter` to a slice, and calls Trim to every element of slice. It ignores the elements which are empty after Trim.</p>
@@ -1279,3 +1279,42 @@ func main() {
 	// [a b c d 1]
 }
 ```
+
+### <span id="HideString">HideString</span>
+
+<p>HideString hide some chars in source string with param `replaceChar`. replace range is origin[start : end]. [start, end).</p>
+
+<b>Signature:</b>
+
+```go
+func HideString(origin string, start, end int, replaceChar string) string
+```
+
+<b>Example:</b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/strutil"
+)
+
+func main() {
+    str := "13242658976"
+
+	result1 := strutil.HideString(str, 3, 3, "*")
+	result2 := strutil.HideString(str, 3, 4, "*")
+	result3 := strutil.HideString(str, 3, 7, "*")
+	result4 := strutil.HideString(str, 7, 11, "*")
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+	fmt.Println(result4)
+
+	// Output:
+	// 13242658976
+	// 132*2658976
+	// 132****8976
+	// 1324265****
+}
+```

docs/strutil_zh-CN.md

@@ -55,6 +55,7 @@ import (
 -   [ReplaceWithMap](#ReplaceWithMap)
 -   [Trim](#Trim)
 -   [SplitAndTrim](#SplitAndTrim)
+-   [HideString](#HideString)
 
 <div STYLE="page-break-after: always;"></div>
 
@@ -1279,3 +1280,43 @@ func main() {
 	// [a b c d 1]
 }
 ```
+
+
+### <span id="HideString">HideString</span>
+
+<p>使用参数`replaceChar`隐藏源字符串中的一些字符。替换范围是 origin[start : end]。</p>
+
+<b>函数签名:</b>
+
+```go
+func HideString(origin string, start, end int, replaceChar string) string
+```
+
+<b>示例:</b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/strutil"
+)
+
+func main() {
+    str := "13242658976"
+
+	result1 := strutil.HideString(str, 3, 3, "*")
+	result2 := strutil.HideString(str, 3, 4, "*")
+	result3 := strutil.HideString(str, 3, 7, "*")
+	result4 := strutil.HideString(str, 7, 11, "*")
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+	fmt.Println(result4)
+
+	// Output:
+	// 13242658976
+	// 132*2658976
+	// 132****8976
+	// 1324265****
+}
+```

mathutil/mathutil.go

@@ -301,3 +301,25 @@ func lcm[T constraints.Integer](a, b T) T {
 	}
 	return a * b / gcd(a, b)
 }
+
+// Cos returns the cosine of the radian argument.
+// Play: todo
+func Cos(radian float64, precision ...int) float64 {
+	t := 1.0 / (2.0 * math.Pi)
+	radian *= t
+	radian -= 0.25 + math.Floor(radian+0.25)
+	radian *= 16.0 * (math.Abs(radian) - 0.5)
+	radian += 0.225 * radian * (math.Abs(radian) - 1.0)
+
+	if len(precision) == 1 {
+		return TruncRound(radian, precision[0])
+	}
+
+	return TruncRound(radian, 3)
+}
+
+// Cos returns the sine of the radian argument.
+// Play: todo
+func Sin(radian float64, precision ...int) float64 {
+	return Cos((math.Pi / 2) - radian)
+}

mathutil/mathutil_exmaple_test.go

@@ -320,3 +320,45 @@ func ExampleLCM() {
 	// 2
 	// 18
 }
+
+func ExampleCos() {
+	result1 := Cos(0)
+	result2 := Cos(90)
+	result3 := Cos(180)
+	result4 := Cos(math.Pi)
+	result5 := Cos(math.Pi / 2)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+	fmt.Println(result4)
+	fmt.Println(result5)
+
+	// Output:
+	// 1
+	// -0.447
+	// -0.598
+	// -1
+	// 0
+}
+
+func ExampleSin() {
+	result1 := Sin(0)
+	result2 := Sin(90)
+	result3 := Sin(180)
+	result4 := Sin(math.Pi)
+	result5 := Sin(math.Pi / 2)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+	fmt.Println(result4)
+	fmt.Println(result5)
+
+	// Output:
+	// 0
+	// 0.894
+	// -0.801
+	// 0
+	// 1
+}

mathutil/mathutil_test.go

@@ -249,3 +249,23 @@ func TestLCM(t *testing.T) {
 	assert.Equal(2, LCM(1, 2))
 	assert.Equal(18, LCM(3, 6, 9))
 }
+
+func TestCos(t *testing.T) {
+	assert := internal.NewAssert(t, "TestCos")
+
+	assert.EqualValues(1, Cos(0))
+	assert.EqualValues(-0.447, Cos(90))
+	assert.EqualValues(-0.598, Cos(180))
+	assert.EqualValues(-1, Cos(math.Pi))
+	assert.EqualValues(0, Cos(math.Pi/2))
+}
+
+func TestSin(t *testing.T) {
+	assert := internal.NewAssert(t, "TestSin")
+
+	assert.EqualValues(0, Sin(0))
+	assert.EqualValues(0.894, Sin(90))
+	assert.EqualValues(-0.801, Sin(180))
+	assert.EqualValues(0, Sin(math.Pi))
+	assert.EqualValues(1, Sin(math.Pi/2))
+}

netutil/http_test.go

@@ -49,8 +49,8 @@ func TestHttpPost(t *testing.T) {
 func TestHttpPostFormData(t *testing.T) {
 	apiUrl := "https://jsonplaceholder.typicode.com/todos"
 	header := map[string]string{
-		// "Content-Type": "application/x-www-form-urlencoded",
-		"Content-Type": "multipart/form-data",
+		"Content-Type": "application/x-www-form-urlencoded",
+		// "Content-Type": "multipart/form-data",
 	}
 
 	postData := url.Values{}
@@ -61,7 +61,7 @@ func TestHttpPostFormData(t *testing.T) {
 	// postData["userId"] = "1"
 	// postData["title"] = "title"
 
-	resp, err := HttpPost(apiUrl, header, postData, nil)
+	resp, err := HttpPost(apiUrl, header, nil, postData)
 	if err != nil {
 		log.Fatal(err)
 	}

netutil/net_internal.go

@@ -3,7 +3,9 @@ package netutil
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
@@ -72,52 +74,34 @@ func setHeaderAndQueryParam(req *http.Request, reqUrl string, header, queryParam
 }
 
 func setHeaderAndQueryAndBody(req *http.Request, reqUrl string, header, queryParam, body any) error {
-	err := setHeader(req, header)
-	if err != nil {
+	if err := setHeader(req, header); err != nil {
+		return err
+	} else if err = setQueryParam(req, reqUrl, queryParam); err != nil {
+		return err
+	} else if err = setBodyByte(req, body); err != nil {
 		return err
 	}
-	err = setQueryParam(req, reqUrl, queryParam)
-	if err != nil {
-		return err
-	}
-	if strings.Contains(req.Header.Get("Content-Type"), "multipart/form-data") || req.Header.Get("Content-Type") == "application/x-www-form-urlencoded" {
-		if formData, ok := queryParam.(url.Values); ok {
-			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)
-	}
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
 func setHeader(req *http.Request, header any) error {
-	if header != nil {
-		switch v := header.(type) {
-		case map[string]string:
-			for k := range v {
-				req.Header.Add(k, v[k])
-			}
-		case http.Header:
-			for k, vv := range v {
-				for _, vvv := range vv {
-					req.Header.Add(k, vvv)
-				}
-			}
-		default:
-			return errors.New("header params type should be http.Header or map[string]string")
+	if header == nil {
+		return nil
+	}
+
+	switch v := header.(type) {
+	case map[string]string:
+		for k := range v {
+			req.Header.Add(k, v[k])
 		}
+	case http.Header:
+		for k, vv := range v {
+			for _, vvv := range vv {
+				req.Header.Add(k, vvv)
+			}
+		}
+	default:
+		return errors.New("header params type should be http.Header or map[string]string")
 	}
 
 	if host := req.Header.Get("Host"); host != "" {
@@ -137,19 +121,21 @@ func setUrl(req *http.Request, reqUrl string) error {
 }
 
 func setQueryParam(req *http.Request, reqUrl string, queryParam any) error {
+	if queryParam == nil {
+		return nil
+	}
+
 	var values url.Values
-	if queryParam != nil {
-		switch v := queryParam.(type) {
-		case map[string]string:
-			values = url.Values{}
-			for k := range v {
-				values.Set(k, v[k])
-			}
-		case url.Values:
-			values = v
-		default:
-			return errors.New("query string params type should be url.Values or map[string]string")
+	switch v := queryParam.(type) {
+	case map[string]string:
+		values = url.Values{}
+		for k := range v {
+			values.Set(k, v[k])
 		}
+	case url.Values:
+		values = v
+	default:
+		return errors.New("query string params type should be url.Values or map[string]string")
 	}
 
 	// set url
@@ -170,14 +156,36 @@ func setQueryParam(req *http.Request, reqUrl string, queryParam any) error {
 }
 
 func setBodyByte(req *http.Request, body any) error {
-	if body != nil {
-		switch b := body.(type) {
-		case []byte:
-			req.Body = io.NopCloser(bytes.NewReader(b))
-			req.ContentLength = int64(len(b))
-		default:
-			return errors.New("body type should be []byte")
+	if body == nil {
+		return nil
+	}
+	var bodyReader *bytes.Reader
+	switch b := body.(type) {
+	case io.Reader:
+		buf := bytes.NewBuffer(nil)
+		if _, err := io.Copy(buf, b); err != nil {
+			return err
 		}
+		req.Body = ioutil.NopCloser(buf)
+		req.ContentLength = int64(buf.Len())
+	case []byte:
+		bodyReader = bytes.NewReader(b)
+		req.Body = ioutil.NopCloser(bodyReader)
+		req.ContentLength = int64(bodyReader.Len())
+	case map[string]interface{}:
+		values := url.Values{}
+		for k := range b {
+			values.Set(k, fmt.Sprintf("%v", b[k]))
+		}
+		bodyReader = bytes.NewReader([]byte(values.Encode()))
+		req.Body = ioutil.NopCloser(bodyReader)
+		req.ContentLength = int64(bodyReader.Len())
+	case url.Values:
+		bodyReader = bytes.NewReader([]byte(b.Encode()))
+		req.Body = ioutil.NopCloser(bodyReader)
+		req.ContentLength = int64(bodyReader.Len())
+	default:
+		return fmt.Errorf("invalid body type: %T", b)
 	}
 	return nil
 }

strutil/string.go

@@ -501,3 +501,30 @@ func Trim(str string, characterMask ...string) string {
 
 	return strings.Trim(str, trimChars)
 }
+
+// HideString hide some chars in source string with param `replaceChar`.
+// replace range is origin[start : end]. [start, end)
+// Play: todo
+func HideString(origin string, start, end int, replaceChar string) string {
+	size := len(origin)
+
+	if start > size-1 || start < 0 || end < 0 || start > end {
+		return origin
+	}
+
+	if end > size {
+		end = size
+	}
+
+	if replaceChar == "" {
+		return origin
+	}
+
+	startStr := origin[0:start]
+	endStr := origin[end:size]
+
+	replaceSize := end - start
+	replaceStr := strings.Repeat(replaceChar, replaceSize)
+
+	return startStr + replaceStr + endStr
+}

strutil/string_example_test.go

@@ -571,3 +571,23 @@ func ExampleSplitAndTrim() {
 	// [a b c d $1]
 	// [a b c d 1]
 }
+
+func ExampleHideString() {
+	str := "13242658976"
+
+	result1 := HideString(str, 3, 3, "*")
+	result2 := HideString(str, 3, 4, "*")
+	result3 := HideString(str, 3, 7, "*")
+	result4 := HideString(str, 7, 11, "*")
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+	fmt.Println(result4)
+
+	// Output:
+	// 13242658976
+	// 132*2658976
+	// 132****8976
+	// 1324265****
+}

strutil/string_test.go

@@ -432,3 +432,21 @@ func TestSplitAndTrim(t *testing.T) {
 	assert.Equal([]string{"a", "b", "c", "d", "$1"}, result1)
 	assert.Equal([]string{"a", "b", "c", "d", "1"}, result2)
 }
+
+func TestHideString(t *testing.T) {
+	assert := internal.NewAssert(t, "TestTrim")
+
+	str := "13242658976"
+
+	assert.Equal("13242658976", HideString(str, 0, -1, "*"))
+	assert.Equal("13242658976", HideString(str, 0, 0, "*"))
+	assert.Equal("****2658976", HideString(str, 0, 4, "*"))
+
+	assert.Equal("13242658976", HideString(str, 3, 3, "*"))
+	assert.Equal("132*2658976", HideString(str, 3, 4, "*"))
+	assert.Equal("132****8976", HideString(str, 3, 7, "*"))
+	assert.Equal("1324265****", HideString(str, 7, 11, "*"))
+
+	assert.Equal("1324265****", HideString(str, 7, 100, "*"))
+	assert.Equal("13242658976", HideString(str, 100, 100, "*"))
+}