From 603a9914a534ef5a2745df2fb9cc566d2252d820 Mon Sep 17 00:00:00 2001
From: Yun <yun@yun.ink>
Date: Sun, 11 Aug 2024 23:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=80=E4=B8=AA=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod      | 2 +-
 go.sum      | 4 ++--
 readme.md   | 6 ++++++
 response.go | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 readme.md

diff --git a/go.mod b/go.mod
index 150153d..5469e72 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/gin-gonic/gin v1.9.1
-	github.com/yuninks/langx v0.0.3
+	github.com/yuninks/langx v0.0.5
 	github.com/zeromicro/go-zero v1.6.4
 	gorm.io/gorm v1.25.9
 )
diff --git a/go.sum b/go.sum
index 9178737..5140831 100644
--- a/go.sum
+++ b/go.sum
@@ -87,8 +87,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/yuninks/langx v0.0.3 h1:f+k3x8yz85Sx3LfmmACq7qilInuXxJjCi2wdAhj8E3Q=
-github.com/yuninks/langx v0.0.3/go.mod h1:nAylzjNIjCThhEQSJsIKP8Vhja0aJlcyig+NsNPZLSk=
+github.com/yuninks/langx v0.0.5 h1:vqPK6wgAICmRiKdgnzyEvxrDUJOmmPlu2HqADu4GCjI=
+github.com/yuninks/langx v0.0.5/go.mod h1:nAylzjNIjCThhEQSJsIKP8Vhja0aJlcyig+NsNPZLSk=
 github.com/zeromicro/go-zero v1.6.4 h1:GvZXxxwl1Lby/gIHxHwN/ZNmXl1WFJa1DvoVgqgttUs=
 github.com/zeromicro/go-zero v1.6.4/go.mod h1:dQ39Zoz20/6x/SUhFXyEEg8lWjl+CO3dzg8Je2xG63Q=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..42e233b
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,6 @@
+# 功能说明
+
+1. 这个是API响应封装组件
+2. 支持多多语言的错误码和错误提示
+3. 优化了gin框架的响应体验
+4. 支持gozero框架的traceid
diff --git a/response.go b/response.go
index 6b8748b..e387159 100644
--- a/response.go
+++ b/response.go
@@ -50,7 +50,7 @@ func GetPage(page, size, totalCount int64) pagination {
 
 // Msg格式化响应
 func FormatMessage(ctx context.Context, w http.ResponseWriter, message string, format map[string]string, data interface{}) {
-	code, msg := langx.GetTrans(message, message, format)
+	code, msg := langx.GetTransFormatCtx(ctx, message, format)
 	ResponseCtx(ctx, w, code, msg, data)
 }
 
@@ -68,10 +68,10 @@ func Error(ctx context.Context, w http.ResponseWriter, err error) {
 	code := op.defaultErrorCode
 	msg := "请求失败"
 	if err != nil {
-		val, ok := err.(*langx.LangError)
+		val, ok := err.(langx.LangError)
 		if ok {
-			if langx.GetDefaultCode() != val.Code() {
-				code = val.Code()
+			if langx.GetDefaultCode() != val.GetCode() {
+				code = val.GetCode()
 			}
 		}
 		msg = err.Error()