go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2024-12-26 20:54:38 +02:00
Code Issues Releases Activity

fix: com patile both map[kratos] and map.kratos for a map type in the query parameters (#3284)

Browse Source 
Co-authored-by: chenyurun01 <chenyurun01@bilibili.com>
This commit is contained in:
ChenYurun 2024-04-16 20:39:13 +08:00 committed by GitHub
parent f715eb0bd8
commit 75711092ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
encoding/form/proto_decode.go
View File

@ -48,11 +48,12 @@ func populateFieldValues(v protoreflect.Message, fieldPath []string, values []st
// ignore unexpected field.
return nil
}
if fd.IsMap() && len(fieldPath) == 2 {
return populateMapField(fd, v.Mutable(fd).Map(), fieldPath, values)
}
if i == len(fieldPath)-1 {
break
}
if fd.Message() == nil || fd.Cardinality() == protoreflect.Repeated {
if fd.IsMap() && len(fieldPath) > 1 {
// post subfield
@ -137,12 +138,7 @@ func populateRepeatedField(fd protoreflect.FieldDescriptor, list protoreflect.Li
}
func populateMapField(fd protoreflect.FieldDescriptor, mp protoreflect.Map, fieldPath []string, values []string) error {
var (
nKey = len(fieldPath) - 1 // post sub key
vKey = len(values) - 1
fieldName = fieldPath[nKey]
)
_, keyName, err := parseURLQueryMapKey(fieldName)
_, keyName, err := parseURLQueryMapKey(strings.Join(fieldPath, fieldSeparater))
if err != nil {
return err
}
@ -150,7 +146,7 @@ func populateMapField(fd protoreflect.FieldDescriptor, mp protoreflect.Map, fiel
if err != nil {
return fmt.Errorf("parsing map key %q: %w", fd.FullName().Name(), err)
}
value, err := parseField(fd.MapValue(), values[vKey])
value, err := parseField(fd.MapValue(), values[len(values)-1])
if err != nil {
return fmt.Errorf("parsing map value %q: %w", fd.FullName().Name(), err)
}
@ -363,7 +359,7 @@ func parseURLQueryMapKey(key string) (string, string, error) {
)
if startIndex < 0 {
//nolint:gomnd
values := strings.SplitN(key, fieldSeparater, 2)
values := strings.Split(key, fieldSeparater)
//nolint:gomnd
if len(values) != 2 {
return "", "", errInvalidFormatMapKey