优化

Author: [email protected]

conv_any.go

@@ -138,6 +138,11 @@ func GMap(i interface{}) map[string]interface{} {
 	return toGMap(i)
 }
 
+// SMap 任意类型转 map[string]string
+func SMap(i interface{}) map[string]string {
+	return toSMap(i)
+}
+
 // IMap 任意类型转 map[interface{}]interface{}
 func IMap(i interface{}) map[interface{}]interface{} {
 	return toIMap(i)

conv_base.go

@@ -48,6 +48,8 @@ func toBytes(i interface{}) []byte {
 			}
 		}
 		return toBytes(result)
+	case *Var:
+		return toBytes(value.Val())
 	}
 	if IsNumber(i) {
 		// int 类型无法解析
@@ -116,6 +118,8 @@ func toString(i interface{}) string {
 	case io.Reader:
 		bs, _ := ioutil.ReadAll(value)
 		return string(bs)
+	case *Var:
+		return toString(value.Val())
 	default:
 		if value == nil {
 			return ""
@@ -204,6 +208,8 @@ func toInt64(i interface{}) int64 {
 		return int64(value.Int())
 	case apiInt64:
 		return value.Int64()
+	case *Var:
+		return toInt64(value.Val())
 	default:
 		s := toString(value)
 		base := int64(1)
@@ -291,6 +297,8 @@ func toUint64(i interface{}) uint64 {
 		return uint64(value.Uint())
 	case apiUint64:
 		return value.Uint64()
+	case *Var:
+		return toUint64(value.Val())
 	default:
 		s := toString(value)
 		// HEX 十六进制
@@ -339,6 +347,8 @@ func toFloat64(i interface{}) float64 {
 			return toFloat64(math.Float32frombits(binary.BigEndian.Uint32(padding(value, 4))))
 		}
 		return math.Float64frombits(binary.BigEndian.Uint64(padding(value, 8)))
+	case *Var:
+		return toFloat64(value.Val())
 	default:
 		v, _ := strconv.ParseFloat(toString(i), 64)
 		return v
@@ -357,6 +367,8 @@ func toBool(i interface{}) bool {
 		return emptyMap[strings.ToLower(toString(value))] == nil
 	case apiBool:
 		return value.Bool()
+	case *Var:
+		return toBool(value.Val())
 	default:
 		rv := reflect.ValueOf(i)
 		switch rv.Kind() {
@@ -457,6 +469,13 @@ func toInterfaces(i interface{}) []interface{} {
 		}
 	case apiInterfaces:
 		return value.Interfaces()
+	case *Var:
+		return []interface{}{value.Val()}
+	case []*Var:
+		array = make([]interface{}, len(value))
+		for k, v := range value {
+			array[k] = v.Val()
+		}
 	default:
 		var (
 			rv   = reflect.ValueOf(i)
@@ -490,3 +509,9 @@ func toIMap(i interface{}) map[interface{}]interface{} {
 	_ = json.Unmarshal(Bytes(i), &m)
 	return m
 }
+
+func toSMap(i interface{}) map[string]string {
+	m := make(map[string]string)
+	_ = json.Unmarshal(Bytes(i), &m)
+	return m
+}

conv_init.go

@@ -0,0 +1 @@
+package conv

conv_map.go

@@ -1,7 +1,7 @@
 package conv
 
 import (
-	"github.com/json-iterator/go"
+	json "github.com/json-iterator/go"
 	"regexp"
 	"strings"
 )
@@ -93,7 +93,7 @@ func (this *Map) getList(idx int) *Map {
 }
 
 func (this *Map) getParse() func(data []byte, v interface{}) error {
-	parse := jsoniter.Unmarshal
+	parse := json.Unmarshal
 	switch this.model {
 	case "json":
 	case "xml":

conv_var.go

@@ -258,6 +258,13 @@ func (this *Var) GMap(def ...map[string]interface{}) map[string]interface{} {
 	return GMap(this.Value)
 }
 
+func (this *Var) SMap(def ...map[string]string) map[string]string {
+	if this.IsNil() && len(def) > 0 {
+		return def[0]
+	}
+	return SMap(this.Value)
+}
+
 func (this *Var) IMap(def ...map[interface{}]interface{}) map[interface{}]interface{} {
 	if this.IsNil() && len(def) > 0 {
 		return def[0]

conv_var_extend.go

@@ -46,6 +46,8 @@ type Extend interface {
 	GetHour(key string, def ...int) time.Duration
 	GetErr(key string, def ...error) error
 	GetGMap(key string, def ...map[string]interface{}) map[string]interface{}
+	GetSMap(key string, def ...map[string]string) map[string]string
+	GetIMap(key string, def ...map[interface{}]interface{}) map[interface{}]interface{}
 	GetDMap(key string, def ...interface{}) *Map
 }
 
@@ -229,6 +231,14 @@ func (this *extend) GetGMap(key string, def ...map[string]interface{}) map[strin
 	return this.GetVar(key).GMap(def...)
 }
 
+func (this *extend) GetSMap(key string, def ...map[string]string) map[string]string {
+	return this.GetVar(key).SMap(def...)
+}
+
+func (this *extend) GetIMap(key string, def ...map[interface{}]interface{}) map[interface{}]interface{} {
+	return this.GetVar(key).IMap(def...)
+}
+
 func (this *extend) GetDMap(key string, def ...interface{}) *Map {
 	return this.GetVar(key).DMap(def...)
 }

conv_z_var_test.go

@@ -7,4 +7,8 @@ import (
 func TestNew(t *testing.T) {
 	t.Log(String([]string{"a", "b"}))
 	t.Log(New("0xa0").Int())
+	t.Log(String(New(100)))
+	t.Log(Interfaces([]*Var{
+		New(1), New("s"),
+	}))
 }