improve map slice converting for package gconv

container/gvar/gvar_struct.go

@@ -25,12 +25,12 @@ func (v *Var) StructDeep(pointer interface{}, mapping ...map[string]string) erro
 }
 
 // Structs converts and returns <v> as given struct slice.
-func (v *Var) Structs(pointer interface{}, mapping ...map[string]string) (err error) {
+func (v *Var) Structs(pointer interface{}, mapping ...map[string]string) error {
 	return gconv.Structs(v.Val(), pointer, mapping...)
 }
 
 // StructsDeep converts and returns <v> as given struct slice recursively.
-func (v *Var) StructsDeep(pointer interface{}, mapping ...map[string]string) (err error) {
+func (v *Var) StructsDeep(pointer interface{}, mapping ...map[string]string) error {
 	return gconv.StructsDeep(v.Val(), pointer, mapping...)
 }
 
@@ -38,7 +38,7 @@ func (v *Var) StructsDeep(pointer interface{}, mapping ...map[string]string) (er
 // <pointer> to implement the converting.
 // It calls function Struct if <pointer> is type of *struct/**struct to do the converting.
 // It calls function Structs if <pointer> is type of *[]struct/*[]*struct to do the converting.
-func (v *Var) Scan(pointer interface{}, mapping ...map[string]string) (err error) {
+func (v *Var) Scan(pointer interface{}, mapping ...map[string]string) error {
 	return gconv.Scan(v.Val(), pointer, mapping...)
 }
 
@@ -46,6 +46,6 @@ func (v *Var) Scan(pointer interface{}, mapping ...map[string]string) (err error
 // parameter <pointer> to implement the converting.
 // It calls function StructDeep if <pointer> is type of *struct/**struct to do the converting.
 // It calls function StructsDeep if <pointer> is type of *[]struct/*[]*struct to do the converting.
-func (v *Var) ScanDeep(pointer interface{}, mapping ...map[string]string) (err error) {
+func (v *Var) ScanDeep(pointer interface{}, mapping ...map[string]string) error {
 	return gconv.ScanDeep(v.Val(), pointer, mapping...)
 }

util/gconv/gconv_map.go

@@ -37,6 +37,8 @@ func MapDeep(value interface{}, tags ...string) map[string]interface{} {
 
 // doMapConvert implements the map converting.
 // It automatically checks and converts json string to map if <value> is string/[]byte.
+//
+// TODO completely implement the recursive converting for all types.
 func doMapConvert(value interface{}, recursive bool, tags ...string) map[string]interface{} {
 	if value == nil {
 		return nil

util/gconv/gconv_slice.go

@@ -7,6 +7,7 @@
 package gconv
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/gogf/gf/errors/gerror"
@@ -38,9 +39,33 @@ func Maps(value interface{}, tags ...string) []map[string]interface{} {
 	if value == nil {
 		return nil
 	}
-	if r, ok := value.([]map[string]interface{}); ok {
+	switch r := value.(type) {
+	case string:
+		list := make([]map[string]interface{}, 0)
+		if len(r) > 0 && r[0] == '[' && r[len(r)-1] == ']' {
+			if err := json.Unmarshal([]byte(r), &list); err != nil {
+				return nil
+			}
+			return list
+		} else {
+			return nil
+		}
+
+	case []byte:
+		list := make([]map[string]interface{}, 0)
+		if len(r) > 0 && r[0] == '[' && r[len(r)-1] == ']' {
+			if err := json.Unmarshal(r, &list); err != nil {
+				return nil
+			}
+			return list
+		} else {
+			return nil
+		}
+
+	case []map[string]interface{}:
 		return r
-	} else {
+
+	default:
 		array := Interfaces(value)
 		if len(array) == 0 {
 			return nil
@@ -54,13 +79,39 @@ func Maps(value interface{}, tags ...string) []map[string]interface{} {
 }
 
 // MapsDeep converts <i> to []map[string]interface{} recursively.
+//
+// TODO completely implement the recursive converting for all types.
 func MapsDeep(value interface{}, tags ...string) []map[string]interface{} {
 	if value == nil {
 		return nil
 	}
-	if r, ok := value.([]map[string]interface{}); ok {
+	switch r := value.(type) {
+	case string:
+		list := make([]map[string]interface{}, 0)
+		if len(r) > 0 && r[0] == '[' && r[len(r)-1] == ']' {
+			if err := json.Unmarshal([]byte(r), &list); err != nil {
+				return nil
+			}
+			return list
+		} else {
+			return nil
+		}
+
+	case []byte:
+		list := make([]map[string]interface{}, 0)
+		if len(r) > 0 && r[0] == '[' && r[len(r)-1] == ']' {
+			if err := json.Unmarshal(r, &list); err != nil {
+				return nil
+			}
+			return list
+		} else {
+			return nil
+		}
+
+	case []map[string]interface{}:
 		return r
-	} else {
+
+	default:
 		array := Interfaces(value)
 		if len(array) == 0 {
 			return nil
@@ -110,6 +161,7 @@ func doStructs(params interface{}, pointer interface{}, deep bool, mapping ...ma
 			return fmt.Errorf("pointer should be type of pointer, but got: %v", kind)
 		}
 	}
+	params = Maps(params)
 	var (
 		reflectValue = reflect.ValueOf(params)
 		reflectKind  = reflectValue.Kind()

util/gconv/gconv_z_unit_map_test.go

@@ -55,7 +55,7 @@ func Test_Map_Slice(t *testing.T) {
 	})
 }
 
-func Test_Maps(t *testing.T) {
+func Test_Maps_Basic(t *testing.T) {
 	params := g.Slice{
 		g.Map{"id": 100, "name": "john"},
 		g.Map{"id": 200, "name": "smith"},
@@ -68,6 +68,16 @@ func Test_Maps(t *testing.T) {
 	})
 }
 
+func Test_Maps_JsonStr(t *testing.T) {
+	jsonStr := `[{"id":100, "name":"john"},{"id":200, "name":"smith"}]`
+	gtest.C(t, func(t *gtest.T) {
+		list := gconv.Maps(jsonStr)
+		t.Assert(len(list), 2)
+		t.Assert(list[0]["id"], 100)
+		t.Assert(list[1]["id"], 200)
+	})
+}
+
 func Test_Map_StructWithGConvTag(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		type User struct {

util/gconv/gconv_z_unit_scan_test.go

@@ -75,3 +75,51 @@ func Test_Scan(t *testing.T) {
 		})
 	})
 }
+
+func Test_ScanStr(t *testing.T) {
+	type User struct {
+		Uid   int
+		Name  string
+		Pass1 string `gconv:"password1"`
+		Pass2 string `gconv:"password2"`
+	}
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			user   = new(User)
+			params = `{"uid":1,"name":"john", "pass1":"123","pass2":"456"}`
+		)
+		err := gconv.Scan(params, user)
+		t.Assert(err, nil)
+		t.Assert(user, &User{
+			Uid:   1,
+			Name:  "john",
+			Pass1: "123",
+			Pass2: "456",
+		})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			users  []User
+			params = `[
+{"uid":1,"name":"john1", "pass1":"111","pass2":"222"},
+{"uid":2,"name":"john2", "pass1":"333","pass2":"444"}
+]`
+		)
+		err := gconv.Scan(params, &users)
+		t.Assert(err, nil)
+		t.Assert(users, g.Slice{
+			&User{
+				Uid:   1,
+				Name:  "john1",
+				Pass1: "111",
+				Pass2: "222",
+			},
+			&User{
+				Uid:   2,
+				Name:  "john2",
+				Pass1: "333",
+				Pass2: "444",
+			},
+		})
+	})
+}

util/gconv/gconv_z_unit_slice_test.go

@@ -25,7 +25,6 @@ func Test_Slice(t *testing.T) {
 	})
 }
 
-// 私有属性不会进行转换
 func Test_Slice_PrivateAttribute(t *testing.T) {
 	type User struct {
 		Id   int