fix #3245

database/gdb/gdb_func.go

@@ -68,7 +68,7 @@ var (
  quoteWordReg = regexp.MustCompile(`^[a-zA-Z0-9\-_]+$`)
 
  // structTagPriority tags for struct converting for orm field mapping.
- structTagPriority = append([]string{OrmTagForStruct}, gconv.StructTagPriority...)
+ structTagPriority = append([]string{OrmTagForStruct}, gstructs.StructTagPriority...)
 )
 
 // WithDB injects given db object into context and returns a new context.

net/ghttp/ghttp_request_param.go

@@ -30,9 +30,9 @@ import (
 )
 
 const (
- parseTypeRequest = 0
- parseTypeQuery = 1
- parseTypeForm = 2
+ parseTypeRequest = iota
+ parseTypeQuery
+ parseTypeForm
 )
 
 var (

net/ghttp/ghttp_request_param_request.go

@@ -186,6 +186,7 @@ func (r *Request) doGetRequestStruct(pointer interface{}, mapping ...map[string]
  if err = r.mergeInTagStructValue(data, pointer); err != nil {
  return data, nil
  }
+
  return data, gconv.Struct(data, pointer, mapping...)
 }
 
@@ -262,7 +263,7 @@ func (r *Request) mergeInTagStructValue(data map[string]interface{}, pointer int
  if tagValue := field.TagIn(); tagValue != "" {
  switch tagValue {
  case goai.ParameterInHeader:
- foundHeaderKey, foundHeaderValue := gutil.MapPossibleItemByKey(headerMap, field.Name())
+ foundHeaderKey, foundHeaderValue := gutil.MapPossibleItemByKey(headerMap, field.PriorityName())
  if foundHeaderKey != "" {
  foundKey, foundValue = gutil.MapPossibleItemByKey(data, foundHeaderKey)
  if foundKey == "" {
@@ -274,7 +275,7 @@ func (r *Request) mergeInTagStructValue(data map[string]interface{}, pointer int
  }
  }
  case goai.ParameterInCookie:
- foundCookieKey, foundCookieValue := gutil.MapPossibleItemByKey(cookieMap, field.Name())
+ foundCookieKey, foundCookieValue := gutil.MapPossibleItemByKey(cookieMap, field.PriorityName())
  if foundCookieKey != "" {
  foundKey, foundValue = gutil.MapPossibleItemByKey(data, foundCookieKey)
  if foundKey == "" {

net/ghttp/ghttp_z_unit_issue_test.go

@@ -524,3 +524,47 @@ func Test_Issue2457(t *testing.T) {
  t.Assert(c.GetContent(ctx, "/list"), `{"code":0,"message":"","data":{"Code":100,"Data":{"Title":"title","Content":"hello"},"Msg":""}}`)
  })
 }
+
+// https:/gogf/gf/issues/3245
+type Issue3245Req struct {
+ g.Meta `path:"/hello" method:"get"`
+ Name string `p:"nickname" json:"name"`
+ XHeaderName string `p:"Header-Name" in:"header" json:"X-Header-Name"`
+ XHeaderAge uint8 `p:"Header-Age" in:"cookie" json:"X-Header-Age"`
+}
+type Issue3245Res struct {
+ Reply any
+}
+
+type Issue3245V1 struct{}
+
+func (Issue3245V1) Hello(ctx context.Context, req *Issue3245Req) (res *Issue3245Res, err error) {
+ res = &Issue3245Res{
+ Reply: req,
+ }
+ return
+}
+
+func Test_Issue3245(t *testing.T) {
+ gtest.C(t, func(t *gtest.T) {
+ s := g.Server(guid.S())
+ s.Use(ghttp.MiddlewareHandlerResponse)
+ s.Group("/", func(group *ghttp.RouterGroup) {
+ group.Bind(
+ new(Issue3245V1),
+ )
+ })
+ s.SetDumpRouterMap(false)
+ s.Start()
+ defer s.Shutdown()
+ time.Sleep(100 * time.Millisecond)
+
+ c := g.Client()
+ c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort()))
+ c.SetHeader("Header-Name", "oldme")
+ c.SetCookie("Header-Age", "25")
+
+ expect := `{"code":0,"message":"","data":{"Reply":{"name":"oldme","X-Header-Name":"oldme","X-Header-Age":25}}}`
+ t.Assert(c.GetContent(ctx, "/hello?nickname=oldme"), expect)
+ })
+}

net/goai/goai_parameter_ref.go

@@ -16,7 +16,6 @@ import (
  "github.com/gogf/gf/v2/internal/json"
  "github.com/gogf/gf/v2/os/gstructs"
  "github.com/gogf/gf/v2/text/gstr"
- "github.com/gogf/gf/v2/util/gconv"
 )
 
 // Parameters is specified by OpenAPI/Swagger 3.0 standard.
@@ -30,14 +29,8 @@ type ParameterRef struct {
 func (oai *OpenApiV3) newParameterRefWithStructMethod(field gstructs.Field, path, method string) (*ParameterRef, error) {
  var (
  tagMap = field.TagMap()
- fieldName = field.Name()
+ fieldName = field.PriorityName()
  )
- for _, tagName := range gconv.StructTagPriority {
- if tagValue := field.Tag(tagName); tagValue != "" {
- fieldName = tagValue
- break
- }
- }
  fieldName = gstr.Split(gstr.Trim(fieldName), ",")[0]
  if fieldName == "" {
  fieldName = field.Name()

net/goai/goai_shema.go

@@ -183,13 +183,7 @@ func (oai *OpenApiV3) structToSchema(object interface{}) (*Schema, error) {
  if !gstr.IsLetterUpper(structField.Name()[0]) {
  continue
  }
- var fieldName = structField.Name()
- for _, tagName := range gconv.StructTagPriority {
- if tagValue := structField.Tag(tagName); tagValue != "" {
- fieldName = tagValue
- break
- }
- }
+ var fieldName = structField.PriorityName()
  fieldName = gstr.Split(gstr.Trim(fieldName), ",")[0]
  if fieldName == "" {
  fieldName = structField.Name()

os/gstructs/gstructs.go

@@ -61,9 +61,9 @@ type FieldMapInput struct {
 type RecursiveOption int
 
 const (
- RecursiveOptionNone RecursiveOption = 0 // No recursively retrieving fields as map if the field is an embedded struct.
- RecursiveOptionEmbedded RecursiveOption = 1 // Recursively retrieving fields as map if the field is an embedded struct.
- RecursiveOptionEmbeddedNoTag RecursiveOption = 2 // Recursively retrieving fields as map if the field is an embedded struct and the field has no tag.
+ RecursiveOptionNone RecursiveOption = iota // No recursively retrieving fields as map if the field is an embedded struct.
+ RecursiveOptionEmbedded   // Recursively retrieving fields as map if the field is an embedded struct.
+ RecursiveOptionEmbeddedNoTag   // Recursively retrieving fields as map if the field is an embedded struct and the field has no tag.
 )
 
 // Fields retrieves and returns the fields of `pointer` as slice.

os/gstructs/gstructs_field.go

@@ -121,3 +121,16 @@ func (f *Field) IsEmpty() bool {
 func (f *Field) IsNil(traceSource ...bool) bool {
  return empty.IsNil(f.Value, traceSource...)
 }
+
+// PriorityName returns tag name first in StructTagPriority
+// Then returns Name if it doesn't have a tag name anything.
+func (f *Field) PriorityName() string {
+ var name = f.Name()
+ for _, tagName := range StructTagPriority {
+ if tagValue := f.Tag(tagName); tagValue != "" {
+ name = tagValue
+ break
+ }
+ }
+ return name
+}

os/gstructs/gstructs_tag.go

@@ -15,6 +15,13 @@ import (
  "github.com/gogf/gf/v2/util/gtag"
 )
 
+// StructTagPriority defines the default priority tags for Map*/Struct* functions.
+// Note that, the `gconv/param` tags are used by old version of package.
+// It is strongly recommended using short tag `c/p` instead in the future.
+var StructTagPriority = []string{
+ gtag.GConv, gtag.Param, gtag.GConvShort, gtag.ParamShort, gtag.Json,
+}
+
 // ParseTag parses tag string into map.
 // For example:
 // ParseTag(`v:"required" p:"id" d:"1"`) => map[v:required p:id d:1].

os/gstructs/gstructs_z_unit_test.go

@@ -212,6 +212,26 @@ func Test_Fields_WithEmbedded_Filter(t *testing.T) {
  })
 }
 
+func Test_Fields_PriorityName(t *testing.T) {
+ gtest.C(t, func(t *gtest.T) {
+ type User struct {
+ Name string `gconv:"name_gconv" c:"name_c"`
+ Age uint `p:"name_p" param:"age_param"`
+ Pass string `json:"pass_json"`
+ IsMen bool
+ }
+ var user *User
+ fields, _ := gstructs.Fields(gstructs.FieldsInput{
+ Pointer: user,
+ RecursiveOption: 0,
+ })
+ t.Assert(fields[0].PriorityName(), "name_gconv")
+ t.Assert(fields[1].PriorityName(), "age_param")
+ t.Assert(fields[2].PriorityName(), "pass_json")
+ t.Assert(fields[3].PriorityName(), "IsMen")
+ })
+}
+
 func Test_FieldMap(t *testing.T) {
  gtest.C(t, func(t *gtest.T) {
  type User struct {

util/gconv/gconv.go

@@ -23,7 +23,6 @@ import (
  "github.com/gogf/gf/v2/internal/json"
  "github.com/gogf/gf/v2/internal/reflection"
  "github.com/gogf/gf/v2/os/gtime"
- "github.com/gogf/gf/v2/util/gtag"
 )
 
 var (
@@ -35,13 +34,6 @@ var (
  "off": {},
  "false": {},
  }
-
- // StructTagPriority defines the default priority tags for Map*/Struct* functions.
- // Note that, the `gconv/param` tags are used by old version of package.
- // It is strongly recommended using short tag `c/p` instead in the future.
- StructTagPriority = []string{
- gtag.GConv, gtag.Param, gtag.GConvShort, gtag.ParamShort, gtag.Json,
- }
 )
 
 // Byte converts `any` to byte.

util/gconv/gconv_map.go

@@ -13,6 +13,7 @@ import (
  "github.com/gogf/gf/v2/internal/empty"
  "github.com/gogf/gf/v2/internal/json"
  "github.com/gogf/gf/v2/internal/utils"
+ "github.com/gogf/gf/v2/os/gstructs"
 )
 
 type recursiveType string
@@ -72,7 +73,7 @@ func doMapConvert(value interface{}, recursive recursiveType, mustMapReturn bool
 
  var (
  usedOption = getUsedMapOption(option...)
- newTags = StructTagPriority
+ newTags = gstructs.StructTagPriority
  )
  if usedOption.Deep {
  recursive = recursiveTypeTrue
@@ -81,9 +82,9 @@ func doMapConvert(value interface{}, recursive recursiveType, mustMapReturn bool
  case 0:
  // No need handling.
  case 1:
- newTags = append(strings.Split(usedOption.Tags[0], ","), StructTagPriority...)
+ newTags = append(strings.Split(usedOption.Tags[0], ","), gstructs.StructTagPriority...)
  default:
- newTags = append(usedOption.Tags, StructTagPriority...)
+ newTags = append(usedOption.Tags, gstructs.StructTagPriority...)
  }
  // Assert the common combination of types, and finally it uses reflection.
  dataMap := make(map[string]interface{})

util/gconv/gconv_struct.go

@@ -271,9 +271,9 @@ func doStruct(params interface{}, pointer interface{}, paramKeyToAttrMap map[str
  priorityTagArray []string
  )
  if priorityTag != "" {
- priorityTagArray = append(utils.SplitAndTrim(priorityTag, ","), StructTagPriority...)
+ priorityTagArray = append(utils.SplitAndTrim(priorityTag, ","), gstructs.StructTagPriority...)
  } else {
- priorityTagArray = StructTagPriority
+ priorityTagArray = gstructs.StructTagPriority
  }
  tagToAttrNameMap, err := gstructs.TagMapName(pointerElemReflectValue, priorityTagArray)
  if err != nil {