From ad62dbb4737fe8c17023502dc183cbe5533d0378 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 22:20:21 +0800 Subject: [PATCH] feat: upgrade wrapper --- request/wrapper.go | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/request/wrapper.go b/request/wrapper.go index c4f7d89..cd14a1e 100644 --- a/request/wrapper.go +++ b/request/wrapper.go @@ -12,10 +12,10 @@ import ( "sync" "git.zhangdeman.cn/zhangdeman/trace" + "git.zhangdeman.cn/zhangdeman/wrapper/op_ternary" "git.zhangdeman.cn/zhangdeman/gin/define" "git.zhangdeman.cn/zhangdeman/gin/request/parse_body" - "git.zhangdeman.cn/zhangdeman/wrapper" "github.com/gin-gonic/gin" ) @@ -27,23 +27,15 @@ type wrapperHandle struct { } // GetHeader 读取header -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 21:22 2023/12/25 func (wh *wrapperHandle) GetHeader(ctx *gin.Context, headerKey string, defaultVal string) string { if nil == ctx { return defaultVal } val := ctx.GetHeader(headerKey) - return wrapper.TernaryOperator.String(len(val) > 0, wrapper.String(val), wrapper.String(defaultVal)).Value() + return op_ternary.BaseType[string](len(val) > 0, val, defaultVal) } // GetCookie 读取cookie -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 21:23 2023/12/25 func (wh *wrapperHandle) GetCookie(ctx *gin.Context, cookieName string, defaultVal string) string { if nil == ctx { return "" @@ -52,14 +44,10 @@ func (wh *wrapperHandle) GetCookie(ctx *gin.Context, cookieName string, defaultV if nil != err { return defaultVal } - return wrapper.TernaryOperator.String(len(val) > 0, wrapper.String(val), wrapper.String(defaultVal)).Value() + return op_ternary.BaseType[string](len(val) > 0, val, defaultVal) } // GetUri 获取请求URI -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 15:13 2023/12/29 func (wh *wrapperHandle) GetUri(ctx *gin.Context, defaultVal string) string { if nil != ctx && nil != ctx.Request && nil != ctx.Request.URL { return ctx.Request.URL.Path @@ -68,10 +56,6 @@ func (wh *wrapperHandle) GetUri(ctx *gin.Context, defaultVal string) string { } // GetScheme 获取scheme -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 16:16 2024/1/2 func (wh *wrapperHandle) GetScheme(ctx *gin.Context, defaultVal string) string { if nil != ctx && nil != ctx.Request && nil != ctx.Request.URL { return ctx.Request.URL.Scheme @@ -80,10 +64,6 @@ func (wh *wrapperHandle) GetScheme(ctx *gin.Context, defaultVal string) string { } // ParseQuery 获取query参数 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 16:03 2024/1/2 func (wh *wrapperHandle) ParseQuery(ctx *gin.Context) map[string]string { query := make(map[string]string) if nil != ctx && nil != ctx.Request && nil != ctx.Request.URL { @@ -100,10 +80,6 @@ func (wh *wrapperHandle) ParseQuery(ctx *gin.Context) map[string]string { } // GetMethod 获取请求方法 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 15:19 2024/1/2 func (wh *wrapperHandle) GetMethod(ctx *gin.Context) string { if nil != ctx && nil != ctx.Request { return ctx.Request.Method @@ -112,16 +88,12 @@ func (wh *wrapperHandle) GetMethod(ctx *gin.Context) string { } // GetContentType 获取请求方式 -// -// Author : go_developer@163.com<白茶清欢> -// -// Date : 15:24 2023/12/29 func (wh *wrapperHandle) GetContentType(ctx *gin.Context, defaultVal string) string { if nil == ctx { return defaultVal } - contentType := strings.ToLower(ctx.ContentType()) - return wrapper.TernaryOperator.String(len(contentType) > 0, wrapper.String(contentType), wrapper.String(defaultVal)).Value() + contentTypeValue := strings.ToLower(ctx.ContentType()) + return op_ternary.BaseType[string](len(contentTypeValue) > 0, contentTypeValue, defaultVal) } // GetDomain 获取请求Domain