unistack-org/micro-client-http
4
0
Fork 1
Code Issues 3 Pull Requests Packages Projects Releases 61 Wiki Activity

add additional wrappers support #66

Merged
vtolstov merged 20 commits from wrappers into v3 2022-03-10 12:30:10 +03:00
Conversation 1 Commits 20 Files Changed 5 +27 -10
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 147c2d756e - Show all commits

37
util.go
View File

@ -147,11 +147,11 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
switch val.Type().Kind() { switch val.Type().Kind() {
case reflect.Slice: case reflect.Slice:
for idx := 0; idx < val.Len(); idx++ { for idx := 0; idx < val.Len(); idx++ {
values.Add(t.name, fmt.Sprintf("%v", val.Index(idx).Interface())) values.Add(t.name, getParam(val.Index(idx)))
} }
fieldsmapskip[t.name] = struct{}{} fieldsmapskip[t.name] = struct{}{}
default: default:
fieldsmap[t.name] = fmt.Sprintf("%v", val.Interface()) fieldsmap[t.name] = getParam(val)
} }
} else if (body == "*" || body == t.name) && method != http.MethodGet { } else if (body == "*" || body == t.name) && method != http.MethodGet {
if tnmsg.Field(i).CanSet() { if tnmsg.Field(i).CanSet() {
@ -160,10 +160,10 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
} else { } else {
if val.Type().Kind() == reflect.Slice { if val.Type().Kind() == reflect.Slice {
for idx := 0; idx < val.Len(); idx++ { for idx := 0; idx < val.Len(); idx++ {
values.Add(t.name, fmt.Sprintf("%v", val.Index(idx).Interface())) values.Add(t.name, getParam(val.Index(idx)))
} }
} else { } else {
values.Add(t.name, fmt.Sprintf("%v", val.Interface())) values.Add(t.name, getParam(val))
} }
} }
} }
@ -216,12 +216,6 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
_, _ = b.WriteString(values.Encode()) _, _ = b.WriteString(values.Encode())
} }
/*
if err = rutil.ZeroFieldByPath(nmsg, k); err != nil {
return nil, errors.BadRequest("go.micro.client", err.Error())
}
*/
if rutil.IsZero(nmsg) { if rutil.IsZero(nmsg) {
return b.String(), nil, nil return b.String(), nil, nil
} }
@ -324,3 +318,26 @@ type tag struct {
key string key string
name string name string
} }
func getParam(val reflect.Value) string {
var v string
switch val.Kind() {
case reflect.Ptr:
switch reflect.Indirect(val).Type().String() {
case
"wrapperspb.BoolValue",
"wrapperspb.BytesValue",
"wrapperspb.DoubleValue",
"wrapperspb.FloatValue",
"wrapperspb.Int32Value", "wrapperspb.Int64Value",
"wrapperspb.StringValue",
"wrapperspb.UInt32Value", "wrapperspb.UInt64Value":
if eva := reflect.Indirect(val).FieldByName("Value"); eva.IsValid() {
v = getParam(eva)
}
}
default:
v = fmt.Sprintf("%v", val.Interface())
}
return v
}