release v2.2.1

doc: add new function to readme file
doc: add doc for WriteBytesToFile and WriteStringToFile
2026-03-01 00:35:28 +08:00 · 2023-06-01 10:45:32 +08:00 · 2023-06-01 10:44:00 +08:00 · 2023-05-31 17:42:34 +08:00 · 2023-05-31 17:13:06 +08:00 · 2023-05-31 17:06:47 +08:00
17 changed files with 912 additions and 176 deletions
--- a/README.md
+++ b/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.0-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-2.2.1-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)
@@ -38,7 +38,7 @@ English | [简体中文](./README_zh-CN.md)
 go get github.com/duke-git/lancet/v2 // will install latest version of v2.x.x
 ```

-2. <b>For users who use version below go1.18, you should install v1.x.x. The latest of v1.x.x is v1.3.8. </b>
+2. <b>For users who use version below go1.18, you should install v1.x.x. The latest of v1.x.x is v1.3.9. </b>

 ```go
 go get github.com/duke-git/lancet // below go1.18, install latest version of v1.x.x
@@ -491,7 +491,12 @@ import "github.com/duke-git/lancet/v2/datetime"
 -   **<big>IsLeapYear</big>** : check if param `year` is leap year or not.
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#IsLeapYear)]
    [[play](https://go.dev/play/p/xS1eS2ejGew)]
-
+-   **<big>BetweenSeconds</big>** : returns the number of seconds between two times.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#BetweenSeconds)]
+-   **<big>DayOfYear</big>** : returns which day of the year the parameter date `t` is.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#DayOfYear)]
+-   **<big>IsWeekend</big>** : checks if passed time is weekend or not.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime.md#IsWeekend)]

 ### 8. Datastructure package constains some common data structure. eg. list, linklist, stack, queue, set, tree, graph.

@@ -596,6 +601,10 @@ import "github.com/duke-git/lancet/v2/fileutil"
 -   **<big>ReadCsvFile</big>** : read file content into slice.
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/fileutil.md#ReadCsvFile)]
    [[play](https://go.dev/play/p/OExTkhGEd3_u)]
+-   **<big>WriteBytesToFile</big>** : write bytes to target file.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/fileutil.md#WriteBytesToFile)]
+-   **<big>WriteStringToFile</big>** : write string to target file.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/fileutil.md#WriteStringToFile)]

 ### 10. Formatter contains some functions for data formatting.

@@ -803,6 +812,10 @@ import "github.com/duke-git/lancet/v2/mathutil"
 -   **<big>LCM</big>** : return Least Common Multiple (LCM) of integers.
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/mathutil.md#LCM)]
    [[play](https://go.dev/play/p/EjcZxfY7G_g)]
+-   **<big>Cos</big>** : return the cosine of the radian argument.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/mathutil.md#Cos)]
+-   **<big>Sin</big>** : return the sine of the radian argument.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/mathutil.md#Sin)]

 ### 14. Netutil package contains functions to get net information and send http request.

@@ -1292,6 +1305,10 @@ import "github.com/duke-git/lancet/v2/strutil"
 -   **<big>Capitalize</big>** : converts the first character of source string to upper case and the remaining to lower case.
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil.md#Capitalize)]
    [[play](https://go.dev/play/p/2OAjgbmAqHZ)]
+-   **<big>ContainsAll</big>** : return true if target string contains all the substrings.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil.md#ContainsAll)]
+-   **<big>ContainsAny</big>** : return true if target string contains any one of the substrings.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil.md#ContainsAny)]
 -   **<big>IsString</big>** : checks if the parameter value data type is string or not.
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil.md#IsString)]
    [[play](https://go.dev/play/p/IOgq7oF9ERm)]
@@ -1373,6 +1390,8 @@ import "github.com/duke-git/lancet/v2/strutil"
 -   **<big>SplitAndTrim</big>** : splits string `str` by a string `delimiter` to a slice, and calls Trim to every element of slice.
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil.md#SplitAndTrim)]
    [[play](https://go.dev/play/p/ZNL6o4SkYQ7)]
+-   **<big>HideString</big>** : Hide some chars in source string with param `replaceChar`.
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil.md#HideString)]

 ### 21. System package contain some functions about os, runtime, shell command.

--- a/README_zh-CN.md
+++ b/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.0-green.svg)](https://github.com/duke-git/lancet/releases)
+[![Release](https://img.shields.io/badge/release-2.2.1-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)
@@ -37,7 +37,7 @@
 go get github.com/duke-git/lancet/v2 //安装v2最新版本v2.x.x
 ```

-2. <b>使用 go1.18 以下版本的用户，必须安装 v1.x.x。目前最新的 v1 版本是 v1.3.7。</b>
+2. <b>使用 go1.18 以下版本的用户，必须安装 v1.x.x。目前最新的 v1 版本是 v1.3.9。</b>

 ```go
 go get github.com/duke-git/lancet// 使用go1.18以下版本, 必须安装v1.x.x版本
@@ -490,6 +490,15 @@ import "github.com/duke-git/lancet/v2/datetime"
 -   **<big>IsLeapYear</big>** :验证是否是闰年。
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.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/datetime.md#IsLeapYear)]
+    [[play](https://go.dev/play/p/xS1eS2ejGew)]
+-   **<big>BetweenSeconds</big>** : 返回两个时间的间隔秒数。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.md#BetweenSeconds)]
+-   **<big>DayOfYear</big>** : 返回参数日期是一年中的第几天。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.md#DayOfYear)]
+-   **<big>IsWeekend</big>** : 判断日期是否是周末。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/datetime_zh-CN.md#IsWeekend)]

 ### 8. datastructure 包含一些普通的数据结构实现。例如：list, linklist, stack, queue, set, tree, graph.

@@ -594,6 +603,10 @@ import "github.com/duke-git/lancet/v2/fileutil"
 -   **<big>ReadCsvFile</big>** : 读取 csv 文件内容到切片。
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/fileutil_zh-CN.md#ReadCsvFile)]
    [[play](https://go.dev/play/p/OExTkhGEd3_u)]
+-   **<big>WriteBytesToFile</big>** : 将bytes写入文件。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/fileutil_zh-CN.md#WriteBytesToFile)]
+-   **<big>WriteStringToFile</big>** : 将字符串写入文件。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/fileutil_zh-CN.md#WriteStringToFile)]

 ### 10. formatter 格式化器包含一些数据格式化处理方法。

@@ -801,6 +814,10 @@ import "github.com/duke-git/lancet/v2/mathutil"
 -   **<big>LCM</big>** : 求最小公倍数。
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/mathutil_zh-CN.md#LCM)]
    [[play](https://go.dev/play/p/EjcZxfY7G_g)]
+-   **<big>Cos</big>** : 计算弧度的余弦值。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/mathutil_zh-CN.md#Cos)]
+-   **<big>Sin</big>** : 计算弧度的正弦值。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/mathutil_zh-CN.md#Sin)]

 ### 14. netutil 网络包支持获取 ip 地址，发送 http 请求。

@@ -1293,6 +1310,10 @@ import "github.com/duke-git/lancet/v2/strutil"
 -   **<big>Capitalize</big>** : 将字符串的第一个字符转换为大写。
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil_zh-CN.md#Capitalize)]
    [[play](https://go.dev/play/p/2OAjgbmAqHZ)]
+-   **<big>ContainsAll</big>** : 判断字符串是否包括全部给定的子字符串切片。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil_zh-CN.md#ContainsAll)]
+-   **<big>ContainsAny</big>** : 判断字符串是否包括给定的子字符串切片中任意一个子字符串。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil_zh-CN.md#ContainsAny)]
 -   **<big>IsString</big>** : 判断传入参数的数据类型是否为字符串。
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil_zh-CN.md#IsString)]
    [[play](https://go.dev/play/p/IOgq7oF9ERm)]
@@ -1374,6 +1395,8 @@ import "github.com/duke-git/lancet/v2/strutil"
 -   **<big>SplitAndTrim</big>** : 将字符串 str 按字符串 delimiter 拆分为一个切片，并对该数组的每个元素调用 Trim。忽略 Trim 后为空的元素。
    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil_zh-CN.md#SplitAndTrim)]
    [[play](https://go.dev/play/p/ZNL6o4SkYQ7)]
+-   **<big>HideString</big>** : 隐藏源字符串中的一些字符。
+    [[doc](https://github.com/duke-git/lancet/blob/main/docs/strutil_zh-CN.md#HideString)]

 ### 21. system 包含 os, runtime, shell command 的相关函数。

--- a/datetime/datetime.go
+++ b/datetime/datetime.go
@@ -247,3 +247,9 @@ func DayOfYear(t time.Time) int {

 	return int(nowDate.Sub(firstDay).Hours() / 24)
 }
+
+// IsWeekend checks if passed time is weekend or not.
+// Play: todo
+func IsWeekend(t time.Time) bool {
+	return time.Saturday == t.Weekday() || time.Sunday == t.Weekday()
+}
--- a/datetime/datetime_example_test.go
+++ b/datetime/datetime_example_test.go
@@ -389,3 +389,22 @@ func ExampleDayOfYear() {
 	// 1
 	// 0
 }
+
+func ExampleIsWeekend() {
+	date1 := time.Date(2023, 06, 03, 0, 0, 0, 0, time.Local)
+	date2 := time.Date(2023, 06, 04, 0, 0, 0, 0, time.Local)
+	date3 := time.Date(2023, 06, 02, 0, 0, 0, 0, time.Local)
+
+	result1 := IsWeekend(date1)
+	result2 := IsWeekend(date2)
+	result3 := IsWeekend(date3)
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+
+	// Output:
+	// true
+	// true
+	// false
+}
--- a/datetime/datetime_test.go
+++ b/datetime/datetime_test.go
@@ -286,3 +286,19 @@ func TestDayOfYear(t *testing.T) {
 	result3 := DayOfYear(date3)
 	assert.Equal(0, result3)
 }
+
+func TestIsWeekend(t *testing.T) {
+	assert := internal.NewAssert(t, "TestIsWeekend")
+	date := time.Date(2023, 06, 03, 0, 0, 0, 0, time.Local)
+	result := IsWeekend(date)
+	assert.Equal(true, result)
+
+	date1 := time.Date(2023, 06, 04, 0, 0, 0, 0, time.Local)
+	result1 := IsWeekend(date1)
+	assert.Equal(true, result1)
+
+	date2 := time.Date(2023, 06, 02, 0, 0, 0, 0, time.Local)
+	result2 := IsWeekend(date2)
+	assert.Equal(false, result2)
+
+}
--- a/docs/datetime.md
+++ b/docs/datetime.md
@@ -57,6 +57,7 @@ import (
 -   [IsLeapYear](#IsLeapYear)
 -   [BetweenSeconds](#BetweenSeconds)
 -   [DayOfYear](#DayOfYear)
+-   [IsWeekend](#IsWeekend)

 <div STYLE="page-break-after: always;"></div>

@@ -1218,3 +1219,44 @@ func main() {
    // 0
 }
 ```
+
+
+### <span id="IsWeekend">IsWeekend</span>
+
+<p>Checks if passed time is weekend or not.</p>
+
+<b>Signature:</b>
+
+```go
+func IsWeekend(t time.Time) bool
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/datetime"
+)
+
+func main() {
+    date1 := time.Date(2023, 06, 03, 0, 0, 0, 0, time.Local)
+    date2 := time.Date(2023, 06, 04, 0, 0, 0, 0, time.Local)
+    date3 := time.Date(2023, 06, 02, 0, 0, 0, 0, time.Local)
+
+    result1 := datetime.IsWeekend(date1)
+    result2 := datetime.IsWeekend(date2)
+    result3 := datetime.IsWeekend(date3)
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+
+    // Output:
+    // true
+    // true
+    // false
+}
+```
--- a/docs/datetime_zh-CN.md
+++ b/docs/datetime_zh-CN.md
@@ -56,6 +56,7 @@ import (
 -   [IsLeapYear](#IsLeapYear)
 -   [BetweenSeconds](#BetweenSeconds)
 -   [DayOfYear](#DayOfYear)
+-   [IsWeekend](#IsWeekend)


 <div STYLE="page-break-after: always;"></div>
@@ -1216,3 +1217,43 @@ func main() {
    // 0
 }
 ```
+
+### <span id="IsWeekend">IsWeekend</span>
+
+<p>判断日期是否是周末。</p>
+
+<b>函数签名:</b>
+
+```go
+func IsWeekend(t time.Time) bool
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/datetime"
+)
+
+func main() {
+    date1 := time.Date(2023, 06, 03, 0, 0, 0, 0, time.Local)
+    date2 := time.Date(2023, 06, 04, 0, 0, 0, 0, time.Local)
+    date3 := time.Date(2023, 06, 02, 0, 0, 0, 0, time.Local)
+
+    result1 := datetime.IsWeekend(date1)
+    result2 := datetime.IsWeekend(date2)
+    result3 := datetime.IsWeekend(date3)
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+
+    // Output:
+    // true
+    // true
+    // false
+}
+```
--- a/docs/fileutil.md
+++ b/docs/fileutil.md
@@ -43,6 +43,8 @@ import (
 -   [MTime](#MTime)
 -   [Sha](#Sha)
 -   [ReadCsvFile](#ReadCsvFile)
+-   [WriteStringToFile](#WriteStringToFile)
+-   [WriteBytesToFile](#WriteBytesToFile)

 <div STYLE="page-break-after: always;"></div>

@@ -660,3 +662,101 @@ func main() {
    // <nil>
 }
 ```
+
+### <span id="WriteBytesToFile">WriteBytesToFile</span>
+
+<p>Writes bytes to target file.</p>
+
+<b>Signature:</b>
+
+```go
+func WriteBytesToFile(filepath string, content []byte) error
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/fileutil"
+)
+
+func main() {
+    filepath := "./bytes.txt"
+
+    file, err := os.Create(filepath)
+    if err != nil {
+        return
+    }
+
+    defer file.Close()
+
+    err = fileutil.WriteBytesToFile(filepath, []byte("hello"))
+    if err != nil {
+        return
+    }
+
+    content, err := fileutil.ReadFileToString(filepath)
+    if err != nil {
+        return
+    }
+
+    os.Remove(filepath)
+
+    fmt.Println(content)
+
+    // Output:
+    // hello
+}
+```
+
+### <span id="WriteStringToFile">WriteStringToFile</span>
+
+<p>Writes string to target file.</p>
+
+<b>Signature:</b>
+
+```go
+func WriteStringToFile(filepath string, content string, append bool) error
+```
+
+<b>Example:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/fileutil"
+)
+
+func main() {
+    filepath := "./test.txt"
+
+    file, err := os.Create(filepath)
+    if err != nil {
+        return
+    }
+
+    defer file.Close()
+
+    err = fileutil.WriteStringToFile(filepath, "hello", true)
+    if err != nil {
+        return
+    }
+
+    content, err := fileutil.ReadFileToString(filepath)
+    if err != nil {
+        return
+    }
+
+    os.Remove(filepath)
+
+    fmt.Println(content)
+
+    // Output:
+    // hello
+}
+```
--- a/docs/fileutil_zh-CN.md
+++ b/docs/fileutil_zh-CN.md
@@ -43,6 +43,8 @@ import (
 -   [MTime](#MTime)
 -   [Sha](#Sha)
 -   [ReadCsvFile](#ReadCsvFile)
+-   [WriteStringToFile](#WriteStringToFile)
+-   [WriteBytesToFile](#WriteBytesToFile)

 <div STYLE="page-break-after: always;"></div>

@@ -660,3 +662,103 @@ func main() {
    // <nil>
 }
 ```
+
+
+### <span id="WriteBytesToFile">WriteBytesToFile</span>
+
+<p>将bytes写入文件。</p>
+
+<b>函数签名:</b>
+
+```go
+func WriteBytesToFile(filepath string, content []byte) error
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/fileutil"
+)
+
+func main() {
+    filepath := "./bytes.txt"
+
+    file, err := os.Create(filepath)
+    if err != nil {
+        return
+    }
+
+    defer file.Close()
+
+    err = fileutil.WriteBytesToFile(filepath, []byte("hello"))
+    if err != nil {
+        return
+    }
+
+    content, err := fileutil.ReadFileToString(filepath)
+    if err != nil {
+        return
+    }
+
+    os.Remove(filepath)
+
+    fmt.Println(content)
+
+    // Output:
+    // hello
+}
+```
+
+
+### <span id="WriteStringToFile">WriteStringToFile</span>
+
+<p>将字符串写入文件。</p>
+
+<b>函数签名:</b>
+
+```go
+func WriteStringToFile(filepath string, content string, append bool) error
+```
+
+<b>示例:</b>
+
+```go
+package main
+
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/fileutil"
+)
+
+func main() {
+    filepath := "./test.txt"
+
+    file, err := os.Create(filepath)
+    if err != nil {
+        return
+    }
+
+    defer file.Close()
+
+    err = fileutil.WriteStringToFile(filepath, "hello", true)
+    if err != nil {
+        return
+    }
+
+    content, err := fileutil.ReadFileToString(filepath)
+    if err != nil {
+        return
+    }
+
+    os.Remove(filepath)
+
+    fmt.Println(content)
+
+    // Output:
+    // hello
+}
+```
--- a/docs/strutil.md
+++ b/docs/strutil.md
@@ -56,6 +56,8 @@ import (
 -   [Trim](#Trim)
 -   [SplitAndTrim](#SplitAndTrim)
 -   [HideString](#HideString)
+-   [ContainsAll](#ContainsAll)
+-   [ContainsAny](#ContainsAny)

 <div STYLE="page-break-after: always;"></div>

@@ -999,14 +1001,14 @@ import (

 func main() {
    result1 := strutil.StringToBytes("abc")
-	result2 := reflect.DeepEqual(result1, []byte{'a', 'b', 'c'})
+    result2 := reflect.DeepEqual(result1, []byte{'a', 'b', 'c'})

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// [97 98 99]
-	// true
+    // Output:
+    // [97 98 99]
+    // true
 }
 ```

@@ -1030,12 +1032,12 @@ import (

 func main() {
    bytes := []byte{'a', 'b', 'c'}
-	result := strutil.BytesToString(bytes)
+    result := strutil.BytesToString(bytes)

-	fmt.Println(result)
+    fmt.Println(result)

-	// Output:
-	// abc
+    // Output:
+    // abc
 }
 ```

@@ -1059,17 +1061,17 @@ import (

 func main() {
    result1 := strutil.IsBlank("")
-	result2 := strutil.IsBlank("\t\v\f\n")
-	result3 := strutil.IsBlank(" 中文")
+    result2 := strutil.IsBlank("\t\v\f\n")
+    result3 := strutil.IsBlank(" 中文")

-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)

-	// Output:
-	// true
-	// true
-	// false
+    // Output:
+    // true
+    // true
+    // false
 }
 ```

@@ -1093,14 +1095,14 @@ import (

 func main() {
    result1 := strutil.HasPrefixAny("foo bar", []string{"fo", "xyz", "hello"})
-	result2 := strutil.HasPrefixAny("foo bar", []string{"oom", "world"})
+    result2 := strutil.HasPrefixAny("foo bar", []string{"oom", "world"})

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// true
-	// false
+    // Output:
+    // true
+    // false
 }
 ```

@@ -1124,14 +1126,14 @@ import (

 func main() {
    result1 := strutil.HasSuffixAny("foo bar", []string{"bar", "xyz", "hello"})
-	result2 := strutil.HasSuffixAny("foo bar", []string{"oom", "world"})
+    result2 := strutil.HasSuffixAny("foo bar", []string{"oom", "world"})

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// true
-	// false
+    // Output:
+    // true
+    // false
 }
 ```

@@ -1156,24 +1158,24 @@ import (
 func main() {
    str := "foo bar hello world"

-	result1 := strutil.IndexOffset(str, "o", 5)
-	result2 := strutil.IndexOffset(str, "o", 0)
-	result3 := strutil.IndexOffset(str, "d", len(str)-1)
-	result4 := strutil.IndexOffset(str, "d", len(str))
-	result5 := strutil.IndexOffset(str, "f", -1)
+    result1 := strutil.IndexOffset(str, "o", 5)
+    result2 := strutil.IndexOffset(str, "o", 0)
+    result3 := strutil.IndexOffset(str, "d", len(str)-1)
+    result4 := strutil.IndexOffset(str, "d", len(str))
+    result5 := strutil.IndexOffset(str, "f", -1)

-	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:
-	// 12
-	// 1
-	// 18
-	// -1
-	// -1
+    // Output:
+    // 12
+    // 1
+    // 18
+    // -1
+    // -1
 }
 ```

@@ -1197,16 +1199,16 @@ import (

 func main() {
    str := "ac ab ab ac"
-	replaces := map[string]string{
-		"a": "1",
-		"b": "2",
-	}
+    replaces := map[string]string{
+        "a": "1",
+        "b": "2",
+    }

-	result := strutil.ReplaceWithMap(str, replaces)
+    result := strutil.ReplaceWithMap(str, replaces)

-	fmt.Println(result)
-	// Output:
-	// 1c 12 12 1c
+    fmt.Println(result)
+    // Output:
+    // 1c 12 12 1c
 }
 ```

@@ -1231,19 +1233,19 @@ import (
 func main() {
    result1 := strutil.Trim("\nabcd")

-	str := "$ ab	cd $ "
+    str := "$ ab    cd $ "

-	result2 := strutil.Trim(str)
-	result3 := strutil.Trim(str, "$")
+    result2 := strutil.Trim(str)
+    result3 := strutil.Trim(str, "$")

-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)

-	// Output:
-	// abcd
-	// $ ab	cd $
-	// ab	cd
+    // Output:
+    // abcd
+    // $ ab    cd $
+    // ab    cd
 }
 ```

@@ -1268,21 +1270,21 @@ import (
 func main() {
    str := " a,b, c,d,$1 "

-	result1 := strutil.SplitAndTrim(str, ",")
-	result2 := strutil.SplitAndTrim(str, ",", "$")
+    result1 := strutil.SplitAndTrim(str, ",")
+    result2 := strutil.SplitAndTrim(str, ",", "$")

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// [a b c d $1]
-	// [a b c d 1]
+    // Output:
+    // [a b c d $1]
+    // [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>
+<p>Hide some chars in source string with param `replaceChar`. replace range is origin[start : end]. [start, end).</p>

 <b>Signature:</b>

@@ -1301,20 +1303,90 @@ import (
 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, "*")
+    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)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)

-	// Output:
-	// 13242658976
-	// 132*2658976
-	// 132****8976
-	// 1324265****
+    // Output:
+    // 13242658976
+    // 132*2658976
+    // 132****8976
+    // 1324265****
+}
+```
+
+
+### <span id="ContainsAll">ContainsAll</span>
+
+<p>Return true if target string contains all the substrings.</p>
+
+<b>Signature:</b>
+
+```go
+func ContainsAll(str string, substrs []string) bool
+```
+
+<b>Example:</b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/strutil"
+)
+
+func main() {
+    str := "hello world"
+
+    result1 := strutil.ContainsAll(str, []string{"hello", "world"})
+    result2 := strutil.ContainsAll(str, []string{"hello", "abc"})
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+
+    // Output:
+    // true
+    // false
+}
+```
+
+### <span id="ContainsAny">ContainsAny</span>
+
+<p>Return true if target string contains any one of the substrings.</p>
+
+<b>Signature:</b>
+
+```go
+func ContainsAny(str string, substrs []string) bool
+```
+
+<b>Example:</b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/strutil"
+)
+
+func main() {
+    str := "hello world"
+
+    result1 := strutil.ContainsAny(str, []string{"hello", "world"})
+    result2 := strutil.ContainsAny(str, []string{"hello", "abc"})
+    result3 := strutil.ContainsAny(str, []string{"123", "abc"})
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+
+    // Output:
+    // true
+    // true
+    // false
 }
 ```
--- a/docs/strutil_zh-CN.md
+++ b/docs/strutil_zh-CN.md
@@ -56,6 +56,9 @@ import (
 -   [Trim](#Trim)
 -   [SplitAndTrim](#SplitAndTrim)
 -   [HideString](#HideString)
+-   [ContainsAll](#ContainsAll)
+-   [ContainsAny](#ContainsAny)
+

 <div STYLE="page-break-after: always;"></div>

@@ -999,13 +1002,13 @@ import (

 func main() {
    result1 := strutil.StringToBytes("abc")
-	result2 := reflect.DeepEqual(result1, []byte{'a', 'b', 'c'})
+    result2 := reflect.DeepEqual(result1, []byte{'a', 'b', 'c'})

-	fmt.Println(result1)
-	fmt.Println(result2)
-	// Output:
-	// [97 98 99]
-	// true
+    fmt.Println(result1)
+    fmt.Println(result2)
+    // Output:
+    // [97 98 99]
+    // true
 }
 ```

@@ -1029,12 +1032,12 @@ import (

 func main() {
    bytes := []byte{'a', 'b', 'c'}
-	result := strutil.BytesToString(bytes)
+    result := strutil.BytesToString(bytes)

-	fmt.Println(result)
+    fmt.Println(result)

-	// Output:
-	// abc
+    // Output:
+    // abc
 }
 ```

@@ -1058,17 +1061,17 @@ import (

 func main() {
    result1 := strutil.IsBlank("")
-	result2 := strutil.IsBlank("\t\v\f\n")
-	result3 := strutil.IsBlank(" 中文")
+    result2 := strutil.IsBlank("\t\v\f\n")
+    result3 := strutil.IsBlank(" 中文")

-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)

-	// Output:
-	// true
-	// true
-	// false
+    // Output:
+    // true
+    // true
+    // false
 }
 ```

@@ -1092,14 +1095,14 @@ import (

 func main() {
    result1 := strutil.HasPrefixAny("foo bar", []string{"fo", "xyz", "hello"})
-	result2 := strutil.HasPrefixAny("foo bar", []string{"oom", "world"})
+    result2 := strutil.HasPrefixAny("foo bar", []string{"oom", "world"})

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// true
-	// false
+    // Output:
+    // true
+    // false
 }
 ```

@@ -1123,14 +1126,14 @@ import (

 func main() {
    result1 := strutil.HasSuffixAny("foo bar", []string{"bar", "xyz", "hello"})
-	result2 := strutil.HasSuffixAny("foo bar", []string{"oom", "world"})
+    result2 := strutil.HasSuffixAny("foo bar", []string{"oom", "world"})

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// true
-	// false
+    // Output:
+    // true
+    // false
 }
 ```

@@ -1155,24 +1158,24 @@ import (
 func main() {
    str := "foo bar hello world"

-	result1 := strutil.IndexOffset(str, "o", 5)
-	result2 := strutil.IndexOffset(str, "o", 0)
-	result3 := strutil.IndexOffset(str, "d", len(str)-1)
-	result4 := strutil.IndexOffset(str, "d", len(str))
-	result5 := strutil.IndexOffset(str, "f", -1)
+    result1 := strutil.IndexOffset(str, "o", 5)
+    result2 := strutil.IndexOffset(str, "o", 0)
+    result3 := strutil.IndexOffset(str, "d", len(str)-1)
+    result4 := strutil.IndexOffset(str, "d", len(str))
+    result5 := strutil.IndexOffset(str, "f", -1)

-	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:
-	// 12
-	// 1
-	// 18
-	// -1
-	// -1
+    // Output:
+    // 12
+    // 1
+    // 18
+    // -1
+    // -1
 }
 ```

@@ -1197,16 +1200,16 @@ import (

 func main() {
    str := "ac ab ab ac"
-	replaces := map[string]string{
-		"a": "1",
-		"b": "2",
-	}
+    replaces := map[string]string{
+        "a": "1",
+        "b": "2",
+    }

-	result := strutil.ReplaceWithMap(str, replaces)
+    result := strutil.ReplaceWithMap(str, replaces)

-	fmt.Println(result)
-	// Output:
-	// 1c 12 12 1c
+    fmt.Println(result)
+    // Output:
+    // 1c 12 12 1c
 }
 ```

@@ -1231,19 +1234,19 @@ import (
 func main() {
    result1 := strutil.Trim("\nabcd")

-	str := "$ ab	cd $ "
+    str := "$ ab    cd $ "

-	result2 := strutil.Trim(str)
-	result3 := strutil.Trim(str, "$")
+    result2 := strutil.Trim(str)
+    result3 := strutil.Trim(str, "$")

-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)

-	// Output:
-	// abcd
-	// $ ab	cd $
-	// ab	cd
+    // Output:
+    // abcd
+    // $ ab    cd $
+    // ab    cd
 }
 ```

@@ -1269,15 +1272,15 @@ import (
 func main() {
    str := " a,b, c,d,$1 "

-	result1 := strutil.SplitAndTrim(str, ",")
-	result2 := strutil.SplitAndTrim(str, ",", "$")
+    result1 := strutil.SplitAndTrim(str, ",")
+    result2 := strutil.SplitAndTrim(str, ",", "$")

-	fmt.Println(result1)
-	fmt.Println(result2)
+    fmt.Println(result1)
+    fmt.Println(result2)

-	// Output:
-	// [a b c d $1]
-	// [a b c d 1]
+    // Output:
+    // [a b c d $1]
+    // [a b c d 1]
 }
 ```

@@ -1303,20 +1306,89 @@ import (
 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, "*")
+    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)
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+    fmt.Println(result4)

-	// Output:
-	// 13242658976
-	// 132*2658976
-	// 132****8976
-	// 1324265****
+    // Output:
+    // 13242658976
+    // 132*2658976
+    // 132****8976
+    // 1324265****
+}
+```
+
+### <span id="ContainsAll">ContainsAll</span>
+
+<p>判断字符串是否包括全部给定的子字符串切片。</p>
+
+<b>函数签名:</b>
+
+```go
+func ContainsAll(str string, substrs []string) bool
+```
+
+<b>示例:</b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/strutil"
+)
+
+func main() {
+    str := "hello world"
+
+    result1 := strutil.ContainsAll(str, []string{"hello", "world"})
+    result2 := strutil.ContainsAll(str, []string{"hello", "abc"})
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+
+    // Output:
+    // true
+    // false
+}
+```
+
+### <span id="ContainsAny">ContainsAny</span>
+
+<p>判断字符串是否包括给定的子字符串切片中任意一个子字符串。</p>
+
+<b>函数签名:</b>
+
+```go
+func ContainsAny(str string, substrs []string) bool
+```
+
+<b>示例:</b>
+
+```go
+import (
+    "fmt"
+    "github.com/duke-git/lancet/v2/strutil"
+)
+
+func main() {
+    str := "hello world"
+
+    result1 := strutil.ContainsAny(str, []string{"hello", "world"})
+    result2 := strutil.ContainsAny(str, []string{"hello", "abc"})
+    result3 := strutil.ContainsAny(str, []string{"123", "abc"})
+
+    fmt.Println(result1)
+    fmt.Println(result2)
+    fmt.Println(result3)
+
+    // Output:
+    // true
+    // true
+    // false
 }
 ```
--- a/fileutil/file.go
+++ b/fileutil/file.go
@@ -453,3 +453,35 @@ func ReadCsvFile(filepath string) ([][]string, error) {

 	return records, nil
 }
+
+// WriteStringToFile write string to target file.
+// Play: todo
+func WriteStringToFile(filepath string, content string, append bool) error {
+	flag := os.O_RDWR | os.O_CREATE
+	if append {
+		flag = flag | os.O_APPEND
+	}
+
+	f, err := os.OpenFile(filepath, flag, 0644)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	_, err = f.WriteString(content)
+	return err
+}
+
+// WriteBytesToFile write bytes to target file.
+// Play: todo
+func WriteBytesToFile(filepath string, content []byte) error {
+	f, err := os.OpenFile(filepath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		return err
+	}
+
+	defer f.Close()
+
+	_, err = f.Write(content)
+	return err
+}
--- a/fileutil/file_example_test.go
+++ b/fileutil/file_example_test.go
@@ -285,3 +285,59 @@ func ExampleReadCsvFile() {
 	// [[Bob  12  male] [Duke  14  male] [Lucy  16  female]]
 	// <nil>
 }
+
+func ExampleWriteStringToFile() {
+	filepath := "./test.txt"
+
+	file, err := os.Create(filepath)
+	if err != nil {
+		return
+	}
+
+	defer file.Close()
+
+	err = WriteStringToFile(filepath, "hello", true)
+	if err != nil {
+		return
+	}
+
+	content, err := ReadFileToString(filepath)
+	if err != nil {
+		return
+	}
+
+	os.Remove(filepath)
+
+	fmt.Println(content)
+
+	// Output:
+	// hello
+}
+
+func ExampleWriteBytesToFile() {
+	filepath := "./bytes.txt"
+
+	file, err := os.Create(filepath)
+	if err != nil {
+		return
+	}
+
+	defer file.Close()
+
+	err = WriteBytesToFile(filepath, []byte("hello"))
+	if err != nil {
+		return
+	}
+
+	content, err := ReadFileToString(filepath)
+	if err != nil {
+		return
+	}
+
+	os.Remove(filepath)
+
+	fmt.Println(content)
+
+	// Output:
+	// hello
+}
--- a/fileutil/file_test.go
+++ b/fileutil/file_test.go
@@ -296,3 +296,68 @@ func TestReadCsvFile(t *testing.T) {
 	assert.Equal(3, len(content[0]))
 	assert.Equal("Bob", content[0][0])
 }
+
+func TestWriteStringToFile(t *testing.T) {
+	assert := internal.NewAssert(t, "TestWriteStringToFile")
+
+	filepath := "./test.txt"
+
+	file, err := os.Create(filepath)
+	if err != nil {
+		t.Fail()
+	}
+
+	defer file.Close()
+
+	err = WriteStringToFile(filepath, "hello", false)
+	if err != nil {
+		t.Fail()
+	}
+
+	content1, err := ReadFileToString(filepath)
+	if err != nil {
+		t.Fail()
+	}
+
+	err = WriteStringToFile(filepath, " world", true)
+	if err != nil {
+		t.Fail()
+	}
+
+	content2, err := os.ReadFile(filepath)
+	if err != nil {
+		t.Fail()
+	}
+
+	assert.Equal("hello", content1)
+	assert.Equal("hello world", string(content2))
+
+	os.Remove(filepath)
+}
+
+func TestWriteBytesToFile(t *testing.T) {
+	assert := internal.NewAssert(t, "TestWriteBytesToFile")
+
+	filepath := "./bytes.txt"
+
+	file, err := os.Create(filepath)
+	if err != nil {
+		t.Fail()
+	}
+
+	defer file.Close()
+
+	err = WriteBytesToFile(filepath, []byte("hello"))
+	if err != nil {
+		t.Fail()
+	}
+
+	content, err := os.ReadFile(filepath)
+	if err != nil {
+		t.Fail()
+	}
+
+	assert.Equal("hello", string(content))
+
+	os.Remove(filepath)
+}
--- a/strutil/string.go
+++ b/strutil/string.go
@@ -528,3 +528,27 @@ func HideString(origin string, start, end int, replaceChar string) string {

 	return startStr + replaceStr + endStr
 }
+
+// ContainsAll return true if target string contains all the substrs.
+// Play: todo
+func ContainsAll(str string, substrs []string) bool {
+	for _, v := range substrs {
+		if !strings.Contains(str, v) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// ContainsAny return true if target string contains any one of the substrs.
+// Play: todo
+func ContainsAny(str string, substrs []string) bool {
+	for _, v := range substrs {
+		if strings.Contains(str, v) {
+			return true
+		}
+	}
+
+	return false
+}
--- a/strutil/string_example_test.go
+++ b/strutil/string_example_test.go
@@ -591,3 +591,34 @@ func ExampleHideString() {
 	// 132****8976
 	// 1324265****
 }
+
+func ExampleContainsAll() {
+	str := "hello world"
+
+	result1 := ContainsAll(str, []string{"hello", "world"})
+	result2 := ContainsAll(str, []string{"hello", "abc"})
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+
+	// Output:
+	// true
+	// false
+}
+
+func ExampleContainsAny() {
+	str := "hello world"
+
+	result1 := ContainsAny(str, []string{"hello", "world"})
+	result2 := ContainsAny(str, []string{"hello", "abc"})
+	result3 := ContainsAny(str, []string{"123", "abc"})
+
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+
+	// Output:
+	// true
+	// true
+	// false
+}
--- a/strutil/string_test.go
+++ b/strutil/string_test.go
@@ -450,3 +450,19 @@ func TestHideString(t *testing.T) {
 	assert.Equal("1324265****", HideString(str, 7, 100, "*"))
 	assert.Equal("13242658976", HideString(str, 100, 100, "*"))
 }
+
+func TestContainsAll(t *testing.T) {
+	assert := internal.NewAssert(t, "TestContainsAll")
+
+	assert.Equal(true, ContainsAll("hello world", []string{"hello", "world"}))
+	assert.Equal(true, ContainsAll("hello world", []string{""}))
+	assert.Equal(false, ContainsAll("hello world", []string{"hello", "abc"}))
+}
+
+func TestContainsAny(t *testing.T) {
+	assert := internal.NewAssert(t, "TestContainsAny")
+
+	assert.Equal(true, ContainsAny("hello world", []string{"hello", "world"}))
+	assert.Equal(true, ContainsAny("hello world", []string{"hello", "abc"}))
+	assert.Equal(false, ContainsAny("hello world", []string{"123", "abc"}))
+}
Author	SHA1	Message	Date
dudaodong	b787e99528	release v2.2.1	2023-06-01 10:45:32 +08:00
dudaodong	e54c9b2850	doc: add new function to readme file	2023-06-01 10:44:00 +08:00
dudaodong	8944109c4c	doc: add doc for WriteBytesToFile and WriteStringToFile	2023-05-31 17:42:34 +08:00
dudaodong	10e3732f32	feat: add IsWeekend	2023-05-31 17:13:06 +08:00
dudaodong	a415597c6b	Merge branch 'main' into v2	2023-05-31 17:06:47 +08:00
hhhhhxm	69b32fd043	新增判断是否是周末的方法 (#105 ) * 新增判断是否是周末的方法 * 新增判断是否是周末的方法 --------- Co-authored-by: huangxingming <huangxingming@kezaihui.com>	2023-05-31 17:05:20 +08:00
dudaodong	75ed359084	feat: add WriteBytesToFile and WriteStringToFile	2023-05-31 16:56:18 +08:00
dudaodong	2c71b6375c	doc: add doc for ContainsAny and ContainsAll	2023-05-31 15:56:20 +08:00
dudaodong	2894bec80c	feat: add ContainsAll and ContainsAny	2023-05-31 10:51:16 +08:00