feat(0.8.x): 请求封装

Author: huaqi666

common/cmap/cmap.go

@@ -0,0 +1,150 @@
+package cmap
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/pkg/errors"
+	"net/url"
+	"reflect"
+	"strings"
+)
+
+//type Map map[string]interface{}
+type CMap map[string][]string
+
+// Get gets the first value associated with the given key.
+// If there are no values associated with the key, Get returns
+// the empty string. To access multiple values, use the map
+// directly.
+func (v CMap) Get(key string) string {
+	if v == nil {
+		return ""
+	}
+	vs := v[key]
+	if len(vs) == 0 {
+		return ""
+	}
+	return vs[0]
+}
+
+// return Get value and Del key
+func (v CMap) Pop(key string) string {
+	s := v.Get(key)
+	v.Del(key)
+	return s
+}
+
+// Set sets the key to value. It replaces any existing
+// values.
+func (v CMap) Set(key, value string) CMap {
+	v[key] = []string{value}
+	return v
+}
+
+// Add adds the value to key. It appends to any existing
+// values associated with key.
+func (v CMap) Add(key, value string) CMap {
+	v[key] = append(v[key], value)
+	return v
+}
+
+// Del deletes the values associated with key.
+func (v CMap) Del(key string) CMap {
+	delete(v, key)
+	return v
+}
+
+// Obtain get all values associated with the given key.
+func (v CMap) Obtain(key string) []string {
+	if v == nil {
+		return []string{}
+	}
+	return v[key]
+}
+
+// Append set the key to value if it doesn't exists. append if it exists.
+func (v CMap) Append(key, value string) CMap {
+	vs := v.Get(key)
+	if vs == "" || len(strings.Trim(vs, " ")) == 0 {
+		v.Set(key, value)
+		return v
+	}
+	return v.Set(key, vs+value)
+}
+
+// CMap to struct or map[string]string or map[string]interface{} data
+func (v CMap) ToStruct(value interface{}) error {
+	var m = make(map[string]interface{})
+	for k, v := range v {
+		m[k] = v[0]
+	}
+	b, err := json.Marshal(m)
+	if err != nil {
+		return err
+	}
+	t := reflect.TypeOf(value)
+	if t.Kind() == reflect.Ptr {
+		t = t.Elem()
+		if t.Kind() == reflect.Struct || t.Kind() == reflect.Map {
+			err = json.Unmarshal(b, value)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	return errors.New("Type mismatch. Must be a pointer to Map or structure")
+}
+
+func (v CMap) ToValues() url.Values {
+	return url.Values(v)
+}
+
+func (v CMap) ToMap() map[string]interface{} {
+	param := make(map[string]interface{})
+	_ = v.ToStruct(&param)
+	return param
+}
+
+// new a CMap
+func New() CMap {
+	return CMap{}
+}
+
+// new a CMap from url.Values
+func Values(values url.Values) CMap {
+	return CMap(values)
+}
+
+// new a CMap from struct
+func Struct(v interface{}) (values CMap) {
+	values = New()
+	iVal := reflect.ValueOf(v)
+	if iVal.Kind() == reflect.Ptr {
+		iVal = iVal.Elem()
+	}
+	typ := iVal.Type()
+	for i := 0; i < iVal.NumField(); i++ {
+		fi := typ.Field(i)
+		name := fi.Tag.Get("json")
+		if name == "" {
+			name = fi.Name
+		}
+		// add support slice
+		if iVal.Field(i).Kind() == reflect.Slice {
+			var buf bytes.Buffer
+			buf.WriteString("[")
+			iValArr := iVal.Field(i)
+			for j := 0; j < iValArr.Len(); j++ {
+				buf.WriteString(fmt.Sprint(`"`, iValArr.Index(j), `",`))
+			}
+			val := string(buf.Bytes()[:buf.Len()-1])
+			val += "]"
+			values.Set(name, val)
+			continue
+		}
+		values.Set(name, fmt.Sprint(iVal.Field(i)))
+	}
+	return
+}

common/cmap/cmap_test.go

@@ -0,0 +1,22 @@
+package cmap
+
+import "testing"
+
+func TestCMap_ToStruct(t *testing.T) {
+	type Te struct {
+		Name string `json:"name"`
+		ID   string `json:"id"`
+	}
+	var te Te
+	var param = New()
+	param.Add("name", "tea")
+	param.Add("id", "1")
+	err := param.ToStruct(&te)
+	if err != nil {
+		t.Log(err)
+		return
+	}
+	t.Log(te)
+
+	t.Log(CMap{}.Add("id", "1").Set("test", "2"))
+}

jd.go

@@ -83,7 +83,7 @@ type Service interface {
 	// method 请求路由方法
 	// 业务参数
 	// 可通过 Request 方法执行其他未封装的京东联盟API
-	Request(v interface{}, method Method, param map[string]interface{}) error
+	Request(v interface{}, param IParam) error
 
 	// 参数校验
 	CheckRequiredParameters(v interface{}) error
@@ -274,8 +274,16 @@ func (ser *ServiceImpl) Sign(method Method, param map[string]interface{}) (*Para
 	return NewParam(parameter), err
 }
 
-func (ser *ServiceImpl) Request(v interface{}, method Method, param map[string]interface{}) error {
-	p, err := ser.Sign(method, param)
+func (ser *ServiceImpl) Request(v interface{}, param IParam) error {
+	var (
+		method Method
+		params map[string]interface{}
+	)
+
+	method = Method(param.Method())
+	params = param.Params().ToMap()
+
+	p, err := ser.Sign(method, params)
 	if err != nil {
 		log.Error("Sign:", err)
 		return err
@@ -321,8 +329,9 @@ func (ser *ServiceImpl) CheckRequiredParameters(v interface{}) error {
 }
 
 // Deprecated: 使用新接口: Request
-func (ser *ServiceImpl) Do(v interface{}, method Method, param map[string]interface{}) error {
-	return ser.Request(v, method, param)
+func (ser *ServiceImpl) Do(v interface{}, method Method, params map[string]interface{}) error {
+	param := NewTParam(method, params)
+	return ser.Request(v, param)
 }
 
 func (ser *ServiceImpl) GetResult(res Result, err error) ([]byte, error) {