add StructToJSONTagtringMap

xurwxj · Jun 16, 2021 · f70b74a · f70b74a
1 parent 2732206
commit f70b74a
Showing 1 changed file with 37 additions and 4 deletions.
diff --git a/base/convert.go b/base/convert.go
@@ -59,10 +59,9 @@ func StructSliceToJSONTagMap(items interface{}) ([]interface{}, error) {
 }
 
 // StructToJSONTagMap convert struct to map by struct's json tag
-func StructToJSONTagMap(item interface{}) map[string]interface{} {
-	res := map[string]interface{}{}
+func StructToJSONTagMap(item interface{}) (res map[string]interface{}) {
 	if item == nil {
-		return res
+		return
 	}
 	v := reflect.TypeOf(item)
 	reflectValue := reflect.ValueOf(item)
@@ -71,6 +70,9 @@ func StructToJSONTagMap(item interface{}) map[string]interface{} {
 	if v.Kind() == reflect.Ptr {
 		v = v.Elem()
 	}
+	if res == nil {
+		res = make(map[string]interface{})
+	}
 	for i := 0; i < v.NumField(); i++ {
 		tag := v.Field(i).Tag.Get("json")
 		if tag != "" && tag != "-" {
@@ -88,7 +90,38 @@ func StructToJSONTagMap(item interface{}) map[string]interface{} {
 			}
 		}
 	}
-	return res
+	return
+}
+
+// StructToJSONTagtringMap convert struct to string map by struct's json tag
+func StructToJSONTagtringMap(item interface{}) (res map[string]string) {
+	if item == nil {
+		return
+	}
+	v := reflect.TypeOf(item)
+	reflectValue := reflect.ValueOf(item)
+	reflectValue = reflect.Indirect(reflectValue)
+
+	if v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+	if res == nil {
+		res = make(map[string]string)
+	}
+	for i := 0; i < v.NumField(); i++ {
+		tag := v.Field(i).Tag.Get("json")
+		if tag != "" && tag != "-" {
+			field := reflectValue.Field(i).String()
+			if v.Field(i).Type.Kind() == reflect.String {
+				res[tag] = field
+			} else {
+				res = nil
+			}
+		} else {
+			res = nil
+		}
+	}
+	return
 }
 
 // StructToFormMap decodes an object into a map,