From 868ee89556232f017fc83d7aee3e6924084f0004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Mon, 13 Oct 2025 23:20:01 +0800 Subject: [PATCH] upgrade: update wrapper --- generate.go | 4 ++-- go.mod | 2 +- go.sum | 2 ++ swagger/run.go | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/generate.go b/generate.go index 8d2aa3c..38cb01d 100644 --- a/generate.go +++ b/generate.go @@ -123,7 +123,7 @@ func (g *Generate) AddApiFromInAndOut(uriPrefix string, paramType reflect.Type, // 接口文档初始化 cfg := g.getApiDocBaseCfg(baseCfg, paramType) - if op_array.Has(*op_array.ArrayType[string](g.readMethodList), baseCfg.Method) >= 0 { + if op_array.ArrayType[string](g.readMethodList).Has(baseCfg.Method) >= 0 { cfg.RequestBody = nil // get类请求没有request body // 参数解析 g.ParseReadConfigParam(baseCfg, cfg, paramType) @@ -743,7 +743,7 @@ func (g *Generate) parseBaseUriConfig(uriPrefix string, paramType reflect.Type) res.Deprecated = deprecated == "1" || deprecated == "true" requestContentType := strings.TrimSpace(metaField.Tag.Get(define.TagContentType)) if len(requestContentType) == 0 { - if op_array.Has(*op_array.ArrayType[string](g.readMethodList), res.Method) >= 0 { + if op_array.ArrayType[string](g.readMethodList).Has(res.Method) >= 0 { // get类请求 requestContentType = consts.MimeTypeXWWWFormUrlencoded } else { diff --git a/go.mod b/go.mod index c1c1796..5430dba 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.24.1 require ( git.zhangdeman.cn/zhangdeman/consts v0.0.0-20250916024308-d378e6c57772 git.zhangdeman.cn/zhangdeman/serialize v0.0.0-20251013044511-86c1a4a3a9dd - git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20251013094128-d57d32b103be + git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20251013151543-78605e0253dc github.com/gin-gonic/gin v1.11.0 github.com/go-webtools/knife4go v1.0.4 github.com/swaggo/files v1.0.1 diff --git a/go.sum b/go.sum index 515798a..85710be 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,8 @@ git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20250321102712-1cbfbe959740 h1:zPUoy git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20250321102712-1cbfbe959740/go.mod h1:1ct92dbVc49pmXusA/iGfcQUJzcYmJ+cjAhgc3sDv1I= git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20251013094128-d57d32b103be h1:mlmXacZHRKxmFmFKNFYRjZJ8+z2+QW3CH8L7AzoMTcQ= git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20251013094128-d57d32b103be/go.mod h1:mBvTwcdqHRF3QIkAh92j/JRhru2LzyJ2LBqolxjzzKE= +git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20251013151543-78605e0253dc h1:nZKJKhj6YJMLw0CBg7Bh5bxHMKp+pzwvzhPWTXNQVFE= +git.zhangdeman.cn/zhangdeman/wrapper v0.0.0-20251013151543-78605e0253dc/go.mod h1:mBvTwcdqHRF3QIkAh92j/JRhru2LzyJ2LBqolxjzzKE= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= diff --git a/swagger/run.go b/swagger/run.go index f5608e9..2d7cbcf 100644 --- a/swagger/run.go +++ b/swagger/run.go @@ -385,7 +385,7 @@ func setGlobalMapDefinition(swaggerInfo *define.Swagger, dataType string) { // // Date : 15:46 2024/4/25 func isGlobalMapType(dataType string) bool { - return op_array.Has(*op_array.ArrayType[string]([]string{ + return op_array.ArrayType[string]([]string{ consts.DataTypeMapAnyAny.String(), consts.DataTypeMapStrUint.String(), consts.DataTypeMapStrInt.String(), @@ -393,7 +393,7 @@ func isGlobalMapType(dataType string) bool { consts.DataTypeMapStrFloat.String(), consts.DataTypeMapStrBool.String(), consts.DataTypeMapStrAny.String(), - }), dataType) >= 0 + }).Has(dataType) >= 0 } // initAnyDefinition 初始化一个definition