From ee48b651a89a36cb4428d6a9a790306fe97dd217 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, 23 Apr 2024 13:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DjsonBody=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- swagger/run.go | 6 +++--- swagger/run_test.go | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/swagger/run.go b/swagger/run.go index 0e04688..730d08d 100644 --- a/swagger/run.go +++ b/swagger/run.go @@ -137,8 +137,8 @@ func generatePathParameterConfig(swaggerInfo *define.Swagger, pathConfig *define parentPath = pathConfig.Uri + ".jsonBody" } generateParameterDefinitions(swaggerInfo, pathConfig.Uri, parentPath, itemParamInput.Name, itemParamInput) - if _, exist := hasDealTable[namePath[0]]; !exist { - hasDealTable[namePath[0]] = true + if _, exist := hasDealTable[realParamName]; !exist { + hasDealTable[realParamName] = true generateParam := &define.SwaggerPathConfigParameter{ Type: wrapper.TernaryOperator.String(realParamName == "jsonBody", "", wrapper.String(itemParamInput.Type)).Value(), Description: wrapper.TernaryOperator.String(realParamName == "jsonBody", "参数结构", wrapper.String(itemParamInput.Description)).Value(), @@ -216,7 +216,7 @@ func generateParameterDefinitions(swaggerInfo *define.Swagger, uri string, paren } swaggerInfo.Definitions[parentPath].Properties[paramConfig.Name] = &define.SwaggerDefinitionProperty{ Description: paramConfig.Description, - Type: paramConfig.Type, + Type: util.GetSwaggerType(paramConfig.Type), } return } diff --git a/swagger/run_test.go b/swagger/run_test.go index 94ebbce..d9e3287 100644 --- a/swagger/run_test.go +++ b/swagger/run_test.go @@ -43,7 +43,7 @@ func TestGenerate(t *testing.T) { ContentType: consts.MimeTypeJson, Summary: "测试接口", Description: "测试接口", - TagList: []string{"test"}, + TagList: []string{"测试接口生成"}, ParameterList: []*define.SwaggerParameterInput{ &define.SwaggerParameterInput{ Type: consts.DataTypeString, @@ -53,6 +53,14 @@ func TestGenerate(t *testing.T) { Required: true, EnumList: []interface{}{"zhang", "de", "man"}, }, + &define.SwaggerParameterInput{ + Type: consts.DataTypeInt, + Description: "年龄", + Name: "age", + In: "body", + Required: true, + EnumList: []interface{}{18, 19, 20}, + }, }, ResponseList: []*define.SwaggerResponseInput{ &define.SwaggerResponseInput{