Merge branch 'main' into v2

convertor/convertor.go

@@ -253,10 +253,11 @@ func StructToMap(value any) (map[string]any, error) {
 	for i := 0; i < fieldNum; i++ {
 		name := t.Field(i).Name
 		tag := t.Field(i).Tag.Get("json")
-		if regex.MatchString(name) && tag != "" {
+		if tag == "" || strings.HasPrefix(tag, "-") || !regex.MatchString(name) {
-			//result[name] = v.Field(i).Interface()
+			continue
-			result[tag] = v.Field(i).Interface()
 		}
+		tag = strings.Split(tag, ",")[0]
+		result[tag] = v.Field(i).Interface()
 	}
 
 	return result, nil

convertor/convertor_test.go

@@ -180,18 +180,37 @@ func TestToMap(t *testing.T) {
 func TestStructToMap(t *testing.T) {
 	assert := internal.NewAssert(t, "TestStructToMap")
 
-	type People struct {
+	t.Run("StructToMap", func(t *testing.T) {
-		Name string `json:"name"`
+		type People struct {
-		age  int
+			Name string `json:"name"`
-	}
+			age  int
-	p := People{
+		}
-		"test",
+		p := People{
-		100,
+			"test",
-	}
+			100,
-	pm, _ := StructToMap(p)
+		}
+		pm, _ := StructToMap(p)
+		var expected = map[string]any{"name": "test"}
+		assert.Equal(expected, pm)
+	})
 
-	expected := map[string]any{"name": "test"}
+	t.Run("StructToMapWithJsonAttr", func(t *testing.T) {
-	assert.Equal(expected, pm)
+		type People struct {
+			Name  string `json:"name,omitempty"` // json tag with attribute
+			Phone string `json:"phone"`          // json tag without attribute
+			Sex   string `json:"-"`              // ignore
+			age   int    // no tag
+		}
+		p := People{
+			"test",
+			"1111",
+			"male",
+			100,
+		}
+		pm, _ := StructToMap(p)
+		var expected = map[string]any{"name": "test", "phone": "1111"}
+		assert.Equal(expected, pm)
+	})
 }
 
 func TestMapToSlice(t *testing.T) {

retry/retry_example_test.go

@@ -19,15 +19,11 @@ func ExampleContext() {
 		return errors.New("error occurs")
 	}
 
-	err := Retry(increaseNumber,
+	Retry(increaseNumber,
 		RetryDuration(time.Microsecond*50),
 		Context(ctx),
 	)
 
-	if err != nil {
-		return
-	}
-
 	fmt.Println(number)
 
 	// Output: