improve

tea/tea.go

@@ -565,19 +565,55 @@ func ToMap(args ...interface{}) map[string]interface{} {
 		case map[string]interface{}:
 			arg := obj.(map[string]interface{})
 			for key, value := range arg {
-				if value != "" {
+				if value != nil {
 					finalArg[key] = value
 				}
 			}
-		default:
-			byt, _ := json.Marshal(obj)
+		case string:
+			str := obj.(string)
+			arg := make(map[string]interface{})
+			err := json.Unmarshal([]byte(str), &arg)
+			if err == nil {
+				for key, value := range arg {
+					if value != nil {
+						finalArg[key] = value
+					}
+				}
+			}
+			tmp := make(map[string]string)
+			err = json.Unmarshal([]byte(str), &tmp)
+			if err == nil {
+				for key, value := range arg {
+					if value != "" {
+						finalArg[key] = value
+					}
+				}
+			}
+		case []byte:
+			byt := obj.([]byte)
 			arg := make(map[string]interface{})
 			err := json.Unmarshal(byt, &arg)
-			if err != nil {
-				return finalArg
+			if err == nil {
+				for key, value := range arg {
+					if value != nil {
+						finalArg[key] = value
+					}
+				}
 			}
-			for key, value := range arg {
-				if value != "" {
+			tmp := make(map[string]string)
+			err = json.Unmarshal(byt, &tmp)
+			if err == nil {
+				for key, value := range arg {
+					if value != "" {
+						finalArg[key] = value
+					}
+				}
+			}
+		default:
+			val := reflect.ValueOf(obj)
+			res := structToMap(val)
+			for key, value := range res {
+				if value != nil {
 					finalArg[key] = value
 				}
 			}
@@ -587,6 +623,42 @@ func ToMap(args ...interface{}) map[string]interface{} {
 	return finalArg
 }
 
+func structToMap(dataValue reflect.Value) map[string]interface{} {
+	out := make(map[string]interface{})
+	if !dataValue.IsValid() {
+		return out
+	}
+	if dataValue.Kind().String() == "ptr" {
+		dataValue = dataValue.Elem()
+	}
+	dataType := dataValue.Type()
+	if dataType.Kind().String() != "struct" {
+		return out
+	}
+	for i := 0; i < dataType.NumField(); i++ {
+		field := dataType.Field(i)
+		name, containsNameTag := field.Tag.Lookup("json")
+		if !containsNameTag {
+			name = field.Name
+		}
+		if field.Type.Kind().String() == "struct" || (field.Type.Kind().String() == "ptr" && field.Type.Elem().Kind().String() == "struct") {
+			if dataValue.FieldByName(field.Name).IsValid() && !dataValue.FieldByName(field.Name).IsNil() {
+				out[name] = structToMap(dataValue.FieldByName(field.Name))
+			}
+		} else if field.Type.Kind().String() == "ptr" {
+			if dataValue.FieldByName(field.Name).Elem().IsValid() {
+				out[name] = dataValue.FieldByName(field.Name).Elem().Interface()
+			}
+		} else {
+			if dataValue.FieldByName(field.Name).IsValid() {
+				out[name] = dataValue.FieldByName(field.Name).Interface()
+			}
+		}
+
+	}
+	return out
+}
+
 func Retryable(err error) bool {
 	if err == nil {
 		return false

tea/tea_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -199,6 +200,12 @@ func TestMerge(t *testing.T) {
 	utils.AssertEqual(t, map[string]string{}, result)
 }
 
+type Test struct {
+	Msg  *string
+	Cast *CastError
+	Body io.Reader
+}
+
 func TestToMap(t *testing.T) {
 	in := map[string]string{
 		"tea": "test",
@@ -206,14 +213,23 @@ func TestToMap(t *testing.T) {
 	validMap := map[string]interface{}{
 		"valid": "test",
 	}
-	valid := &CastError{
-		Message: "tea",
+	valid := &Test{
+		Body: strings.NewReader("test"),
+		Msg:  String("tea"),
+		Cast: &CastError{
+			Message: "message",
+		},
 	}
-
+	validStr := `{"test":"ok"}`
+	validStr1 := `{"test":"ok","num":1}`
 	invalidStr := "sdfdg"
-	result := ToMap(in, validMap, valid, invalidStr)
+	result := ToMap(in, validMap, valid, validStr, validStr1, []byte(validStr), []byte(validStr1), invalidStr, 10)
+	body := result["Body"].(io.Reader)
+	byt, err := ioutil.ReadAll(body)
+	utils.AssertNil(t, err)
 	utils.AssertEqual(t, "test", result["tea"])
 	utils.AssertEqual(t, "test", result["valid"])
+	utils.AssertEqual(t, "test", string(byt))
 
 	result = ToMap(nil)
 	utils.AssertEqual(t, map[string]interface{}{}, result)