feat: upgrade wrapper

define/context.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	networkUtil "git.zhangdeman.cn/zhangdeman/network/util"
-	"git.zhangdeman.cn/zhangdeman/wrapper"
+	"git.zhangdeman.cn/zhangdeman/wrapper/op_string"
 
 	"git.zhangdeman.cn/zhangdeman/trace"
 	"github.com/gin-gonic/gin"
@@ -40,7 +40,7 @@ func NewContext(ginCtx *gin.Context) *Context {
 		time.Now().UnixNano()/1e6,
 		strings.ReplaceAll(networkUtil.IP.GetHostIP(), ".", ""),
 		strings.ReplaceAll(networkUtil.IP.GetRemoteIP(ginCtx.Request), ".", ""),
-		wrapper.StringFromRandom(32, "").Md5().Value,
+		op_string.Md5(op_string.Random(32, "")),
 	)
 	getRequestID := func(ctx *gin.Context, traceID string) string {
 		requestID := ctx.GetHeader("X-Forward-Request-Id")

define/response.go

@@ -8,9 +8,10 @@
 package define
 
 import (
-	"git.zhangdeman.cn/zhangdeman/consts"
-	"git.zhangdeman.cn/zhangdeman/wrapper"
 	"sync"
+
+	"git.zhangdeman.cn/zhangdeman/consts"
+	"git.zhangdeman.cn/zhangdeman/wrapper/op_ternary"
 )
 
 var (
@@ -58,71 +59,71 @@ func GetHttpHandleConfig() *HttpHandleConfig {
 	return &HttpHandleConfig{
 		EnableExtensionOutput:   inputHttpHandleConfig.EnableExtensionOutput,
 		DisableDebugStackOutput: inputHttpHandleConfig.DisableDebugStackOutput,
-		RequestIDField: wrapper.TernaryOperator.String(
+		RequestIDField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.RequestIDField == "",
 			consts.GinRequestIDField,
-			wrapper.String(inputHttpHandleConfig.RequestIDField),
-		).Value(),
-		TraceIDField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.RequestIDField,
+		),
+		TraceIDField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.TraceIDField == "",
 			consts.GinTraceIDField,
-			wrapper.String(inputHttpHandleConfig.TraceIDField),
-		).Value(),
-		ResponseCodeField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.TraceIDField,
+		),
+		ResponseCodeField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.ResponseCodeField == "",
 			consts.GinResponseCodeField,
-			wrapper.String(inputHttpHandleConfig.ResponseCodeField),
-		).Value(),
-		ResponseMessageField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.ResponseCodeField,
+		),
+		ResponseMessageField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.ResponseMessageField == "",
 			consts.GinResponseMessageField,
-			wrapper.String(inputHttpHandleConfig.ResponseMessageField),
-		).Value(),
-		HandleRequestCostField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.ResponseMessageField,
+		),
+		HandleRequestCostField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.HandleRequestCostField == "",
 			consts.GinHandleRequestCostField,
-			wrapper.String(inputHttpHandleConfig.HandleRequestCostField),
-		).Value(),
-		ResponseDataField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.HandleRequestCostField,
+		),
+		ResponseDataField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.ResponseDataField == "",
 			consts.GinResponseDataField,
-			wrapper.String(inputHttpHandleConfig.ResponseDataField),
-		).Value(),
-		ResponseTraceIDField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.ResponseDataField,
+		),
+		ResponseTraceIDField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.ResponseTraceIDField == "",
 			consts.GinResponseTraceIDField,
-			wrapper.String(inputHttpHandleConfig.ResponseTraceIDField),
-		).Value(),
-		StartRequestTimeField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.ResponseTraceIDField,
+		),
+		StartRequestTimeField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.StartRequestTimeField == "",
 			consts.GinStartRequestTimeField,
-			wrapper.String(inputHttpHandleConfig.StartRequestTimeField),
-		).Value(),
-		FinishRequestTimeField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.StartRequestTimeField,
+		),
+		FinishRequestTimeField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.FinishRequestTimeField == "",
 			consts.GinFinishRequestTimeField,
-			wrapper.String(inputHttpHandleConfig.FinishRequestTimeField),
-		).Value(),
-		RecordRequestDataField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.FinishRequestTimeField,
+		),
+		RecordRequestDataField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.RecordRequestDataField == "",
 			consts.GinRecordRequestDataField,
-			wrapper.String(inputHttpHandleConfig.RecordRequestDataField),
-		).Value(),
-		RecordResponseDataField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.RecordRequestDataField,
+		),
+		RecordResponseDataField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.RecordResponseDataField == "",
 			consts.GinRecordResponseDataField,
-			wrapper.String(inputHttpHandleConfig.RecordResponseDataField),
-		).Value(),
-		RequestIsSuccessField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.RecordResponseDataField,
+		),
+		RequestIsSuccessField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.RequestIsSuccessField == "",
 			consts.GinRequestIsSuccessField,
-			wrapper.String(inputHttpHandleConfig.RecordResponseDataField),
-		).Value(),
-		ExtensionOutputField: wrapper.TernaryOperator.String(
+			inputHttpHandleConfig.RecordResponseDataField,
+		),
+		ExtensionOutputField: op_ternary.BaseType[string](
 			nil == inputHttpHandleConfig || inputHttpHandleConfig.ExtensionOutputField == "",
 			consts.GinResponseExtensionField,
-			wrapper.String(inputHttpHandleConfig.RecordResponseDataField),
-		).Value(),
+			inputHttpHandleConfig.RecordResponseDataField,
+		),
 	}
 }