From 22550f9ac063e57daf0a9cb16cc89af297bfc70f 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, 25 Feb 2025 22:21:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=A3=E6=9E=90openapi?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=9A=84=E6=96=B9=E6=B3=95,=20=E5=BE=85?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- define/openapi.go | 2 +- generate.go | 4 ++-- parser.go | 37 +++++++++++++++++++------------------ parser_test.go | 7 ------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/define/openapi.go b/define/openapi.go index 1337eeb..52bd43f 100644 --- a/define/openapi.go +++ b/define/openapi.go @@ -227,7 +227,7 @@ type RequestBody struct { // Date : 17:21 2024/7/19 type Media struct { Schema *Schema `json:"schema,omitempty"` // 定义此媒体类型的结构。 - Example string `json:"example,omitempty"` // 媒体类型的示例。示例对象应该符合此媒体类型的格式， 这里指定的example对象 object is mutually exclusive of the examples object. 而且如果引用的schema也包含示例，在这里指定的example值将会覆盖schema提供的示例。 + Example map[string]any `json:"example,omitempty"` // 媒体类型的示例。示例对象应该符合此媒体类型的格式， 这里指定的example对象 object is mutually exclusive of the examples object. 而且如果引用的schema也包含示例，在这里指定的example值将会覆盖schema提供的示例。 Examples map[string]*Example `json:"examples,omitempty"` // 媒体类型的示例，每个媒体对象的值都应该匹配它对应的媒体类型的格式。 The examples object is mutually exclusive of the example object. 而且如果引用的schema也包含示例，在这里指定的example值将会覆盖schema提供的示例。 Encoding map[string]*Encoding `json:"encoding,omitempty"` // 属性名与编码信息的映射。每个属性名必须存在于schema属性的key中，当媒体类型等于multipart或application/x-www-form-urlencoded时，编码对象信息仅适用于requestBody。 } diff --git a/generate.go b/generate.go index 5c2f56b..fa4351f 100644 --- a/generate.go +++ b/generate.go @@ -207,7 +207,7 @@ func (g *Generate) AddApiFromInAndOut(uriPrefix string, paramType reflect.Type, Schema: &define.Schema{ Ref: g.getSchemaRef(paramSchemaName), }, - Example: "", + Example: nil, Examples: nil, Encoding: nil, } @@ -220,7 +220,7 @@ func (g *Generate) AddApiFromInAndOut(uriPrefix string, paramType reflect.Type, Schema: &define.Schema{ Ref: g.getSchemaRef(resultSchemaName), }, - Example: "", + Example: nil, Examples: nil, Encoding: nil, } diff --git a/parser.go b/parser.go index 327fe9f..5cd81a9 100644 --- a/parser.go +++ b/parser.go @@ -8,34 +8,35 @@ package api_doc import ( + "errors" "git.zhangdeman.cn/gateway/api-doc/define" "git.zhangdeman.cn/zhangdeman/serialize" - "github.com/tidwall/gjson" - "strings" ) -// Parse 解析swagger文档 +// ParseOpenapi3 解析openapi文档 // // Author : go_developer@163.com<白茶清欢> // -// Date : 16:54 2024/12/23 -func Parse(docUrl string) (*define.DocParseResult, error) { +// Date : 21:02 2025/2/25 +func ParseOpenapi3(docUrl string, docContent string) (*define.OpenapiDoc, error) { var ( - err error - docContent []byte + docRes define.OpenapiDoc + err error + docByte []byte ) - if docContent, err = serialize.File.ReadFromRemote(docUrl); nil != err { + if len(docContent) < 2 { + if len(docUrl) == 0 { + return nil, errors.New("doc url and doc content all empty") + } + if docByte, err = serialize.File.ReadFromRemote(docUrl); nil != err { + return nil, err + } + } else { + docByte = []byte(docContent) + } + if err = serialize.JSON.UnmarshalWithNumber(docByte, &docRes); nil != err { return nil, err } - swaggerVersion := gjson.GetBytes(docContent, "swagger").String() - if "" == swaggerVersion || !strings.HasPrefix(swaggerVersion, "2.") { - // 未指定swagger版本或swagger版本3.x - return ParseOpenapi3(docContent) - } - return ParseSwagger2(docContent) -} - -func ParseOpenapi3(docContent []byte) (*define.DocParseResult, error) { - return nil, nil + return &docRes, nil } diff --git a/parser_test.go b/parser_test.go index ff7cfca..529c13a 100644 --- a/parser_test.go +++ b/parser_test.go @@ -11,7 +11,6 @@ import ( "encoding/json" "fmt" "git.zhangdeman.cn/gateway/api-doc/define" - "git.zhangdeman.cn/zhangdeman/serialize" "reflect" "testing" ) @@ -95,9 +94,3 @@ func Test_parser_Openapi3(t *testing.T) { byteData, _ := json.Marshal(g.docData) fmt.Println(string(byteData)) } - -func TestParseForSwagger(t *testing.T) { - docUrl := "https://git.zhangdeman.cn/swagger.v1.json" - res, _ := Parse(docUrl) - serialize.JSON.ConsoleOutput(res) -}