From 7aa4d3c417a289c30ebf2e33bcadd255fdbf89cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Tue, 18 Feb 2025 17:04:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dget=E7=B1=BB=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8C=BF=E5=90=8D=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/generate.go b/generate.go index b1cdf44..08fa1b3 100644 --- a/generate.go +++ b/generate.go @@ -329,6 +329,7 @@ func (g *Generate) ParseReadConfigParam(requestCfg *define.UriBaseConfig, baseRe if inputType.Field(i).Anonymous { // 匿名字段, 直接对齐到当前的父级 g.ParseReadConfigParam(requestCfg, baseReqCfg, inputType.Field(i).Type) + continue } propertyName := ParseStructFieldTag.GetParamName(inputType.Field(i)) if propertyName == "-" { @@ -496,15 +497,16 @@ func (g *Generate) AddComponentsSchema(rootSchemaName string, pkgPath string, in // 结构体 if inputType.Kind() == reflect.Struct { for i := 0; i < inputType.NumField(); i++ { + propertyName := ParseStructFieldTag.GetParamName(inputType.Field(i)) + if propertyName == "-" { + continue + } + if inputType.Field(i).Anonymous { // 处理匿名字段 g.handleAnonymousField(schemaName, inputType.Field(i)) continue } - propertyName := ParseStructFieldTag.GetParamName(inputType.Field(i)) - if propertyName == "-" { - continue - } if inputType.Field(i).Type.Kind() == reflect.Ptr { // 处理指针 if inputType.Field(i).Type.Elem().Kind() == reflect.Struct { @@ -605,15 +607,15 @@ func (g *Generate) handleAnonymousField(schemaName string, field reflect.StructF handleType = handleType.Elem() } for i := 0; i < handleType.NumField(); i++ { - if handleType.Field(i).Anonymous { + itemField := handleType.Field(i) + if itemField.Anonymous { // 递归处理多层嵌套匿名字段 - g.handleAnonymousField(schemaName, handleType.Field(i)) + g.handleAnonymousField(schemaName, itemField) continue } else { - itemField := handleType.Field(i) baseConvertType, isBaseType := g.realBaseType2SwaggerType(itemField.Type.String()) if !isBaseType { - g.AddComponentsSchema(schemaName, itemField.Type.PkgPath(), itemField.Type) + g.AddComponentsSchema(schemaName, handleType.Field(i).Type.PkgPath(), handleType.Field(i).Type) continue } else { paramName := ParseStructFieldTag.GetParamName(itemField) @@ -621,8 +623,8 @@ func (g *Generate) handleAnonymousField(schemaName string, field reflect.StructF Type: baseConvertType, Format: itemField.Type.String(), Enum: ValidateRule.Enum(itemField), - Default: ParseStructFieldTag.GetDefaultValue(itemField), - Description: ParseStructFieldTag.GetParamDesc(itemField), + Default: ParseStructFieldTag.GetDefaultValue(handleType.Field(i)), + Description: ParseStructFieldTag.GetParamDesc(handleType.Field(i)), } if ValidateRule.IsRequired(itemField) { g.docData.Components.Schemas[schemaName].Required = append(g.docData.Components.Schemas[schemaName].Required, paramName)