diff --git a/swagger/run.go b/swagger/run.go index b98ef27..00df246 100644 --- a/swagger/run.go +++ b/swagger/run.go @@ -140,7 +140,7 @@ func generatePathParameterConfig(swaggerInfo *define.Swagger, pathConfig *define if _, exist := hasDealTable[namePath[0]]; !exist { hasDealTable[namePath[0]] = true generateParam := &define.SwaggerPathConfigParameter{ - Type: itemParamInput.Type, + Type: wrapper.TernaryOperator.String(realParamName == "jsonBody", "object", wrapper.String(itemParamInput.Type)).Value(), Description: itemParamInput.Description, Name: realParamName, In: itemParamInput.In, @@ -184,6 +184,8 @@ func generatePathParameterConfig(swaggerInfo *define.Swagger, pathConfig *define // // Date : 14:06 2024/4/22 func generateParameterDefinitions(swaggerInfo *define.Swagger, uri string, parentPath string, subPath string, paramConfig *define.SwaggerParameterInput) { + uri = strings.TrimLeft(uri, "/") + parentPath = strings.TrimLeft(parentPath, "/") if nil == swaggerInfo.Definitions { swaggerInfo.Definitions = map[string]*define.SwaggerDefinition{} } @@ -208,20 +210,14 @@ func generateParameterDefinitions(swaggerInfo *define.Swagger, uri string, paren Properties: make(map[string]*define.SwaggerDefinitionProperty), } } - swaggerInfo.Definitions[parentPath].Type = paramConfig.Type + swaggerInfo.Definitions[parentPath].Type = "object" if paramConfig.Required { swaggerInfo.Definitions[parentPath].Required = append(swaggerInfo.Definitions[parentPath].Required, paramConfig.Name) } - if len(parentPath) > 0 { - swaggerInfo.Definitions[parentPath].Properties[paramConfig.Name] = &define.SwaggerDefinitionProperty{ - Description: paramConfig.Description, - Type: paramConfig.Type, - } - if paramConfig.Required { - swaggerInfo.Definitions[parentPath].Required = append(swaggerInfo.Definitions[parentPath].Required, paramConfig.Name) - } + swaggerInfo.Definitions[parentPath].Properties[paramConfig.Name] = &define.SwaggerDefinitionProperty{ + Description: paramConfig.Description, + Type: paramConfig.Type, } - return } if len(parentPath) == 0 {