util/reflect: fix StructFields

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

util/reflect/struct.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
+	"time"
 )
 
 // ErrInvalidParam specifies invalid url query params
@@ -233,10 +234,30 @@ func StructFields(src interface{}) ([]StructField, error) {
 			continue
 		}
 
+		switch val.Interface().(type) {
+		case time.Time, *time.Time:
+			fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name})
+			continue
+		case time.Duration, *time.Duration:
+			fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name})
+			continue
+		}
+
 		switch val.Kind() {
-		// case timeKind:
+		case reflect.Ptr:
-		// fmt.Printf("GGG\n")
+			//	if !val.IsValid()
-		// fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name})
+			if reflect.Indirect(val).Kind() == reflect.Struct {
+				infields, err := StructFields(val.Interface())
+				if err != nil {
+					return nil, err
+				}
+				for _, infield := range infields {
+					infield.Path = fmt.Sprintf("%s.%s", fld.Name, infield.Path)
+					fields = append(fields, infield)
+				}
+			} else {
+				fields = append(fields, StructField{Field: fld, Value: val, Path: fld.Name})
+			}
 		case reflect.Struct:
 			infields, err := StructFields(val.Interface())
 			if err != nil {

util/reflect/struct_test.go

@@ -4,10 +4,31 @@ import (
 	"net/url"
 	"reflect"
 	"testing"
+	"time"
 
 	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
+func TestStructfields(t *testing.T) {
+	type Config struct {
+		Wait     time.Duration
+		Time     time.Time
+		Metadata map[string]int
+		Broker   string
+		Addr     []string
+		Verbose  bool
+		Nested   *Config
+	}
+	cfg := &Config{Nested: &Config{}}
+	fields, err := rutil.StructFields(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(fields) != 13 {
+		t.Fatalf("invalid fields number: %v", fields)
+	}
+}
+
 func TestSetFieldByPath(t *testing.T) {
 	type NestedStr struct {
 		BBB string `json:"bbb"`