From 9eb5afd1dd70180e78b767be44b00130b3210331 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 15 Aug 2024 19:09:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=93=8D=E5=BA=94500=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=A0=81=E5=B8=A6code=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/framework/errorcatch/errorcatch.go |  6 +++---
 src/framework/vo/result/result.go      | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/framework/errorcatch/errorcatch.go b/src/framework/errorcatch/errorcatch.go
index dc32b6d8..6e6f9e94 100644
--- a/src/framework/errorcatch/errorcatch.go
+++ b/src/framework/errorcatch/errorcatch.go
@@ -20,14 +20,14 @@ func ErrorCatch() gin.HandlerFunc {
 
 				// 返回错误响应给客户端
 				if config.Env() == "prod" {
-					c.JSON(500, result.ErrMsg("Internal Server Errors"))
+					c.JSON(500, result.CodeMsg(500, "Internal Server Errors"))
 				} else {
 					// 通过实现 error 接口的 Error() 方法自定义错误类型进行捕获
 					switch v := err.(type) {
 					case error:
-						c.JSON(500, result.ErrMsg(v.Error()))
+						c.JSON(500, result.CodeMsg(500, v.Error()))
 					default:
-						c.JSON(500, result.ErrMsg(fmt.Sprint(err)))
+						c.JSON(500, result.CodeMsg(500, fmt.Sprint(err)))
 					}
 				}
 
diff --git a/src/framework/vo/result/result.go b/src/framework/vo/result/result.go
index 7ff154ff..192e6461 100644
--- a/src/framework/vo/result/result.go
+++ b/src/framework/vo/result/result.go
@@ -1,7 +1,7 @@
 package result
 
 import (
-	"be.ems/src/framework/constants/result"
+	constResult "be.ems/src/framework/constants/result"
 )
 
 // CodeMsg 响应结果
@@ -15,8 +15,8 @@ func CodeMsg(code int, msg string) map[string]any {
 // 响应成功结果 map[string]any{}
 func Ok(v map[string]any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_SUCCESS
-	args["msg"] = result.MSG_SUCCESS
+	args["code"] = constResult.CODE_SUCCESS
+	args["msg"] = constResult.MSG_SUCCESS
 	// v合并到args
 	for key, value := range v {
 		args[key] = value
@@ -27,7 +27,7 @@ func Ok(v map[string]any) map[string]any {
 // 响应成功结果信息
 func OkMsg(msg string) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_SUCCESS
+	args["code"] = constResult.CODE_SUCCESS
 	args["msg"] = msg
 	return args
 }
@@ -35,8 +35,8 @@ func OkMsg(msg string) map[string]any {
 // 响应成功结果数据
 func OkData(data any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_SUCCESS
-	args["msg"] = result.MSG_SUCCESS
+	args["code"] = constResult.CODE_SUCCESS
+	args["msg"] = constResult.MSG_SUCCESS
 	args["data"] = data
 	return args
 }
@@ -44,8 +44,8 @@ func OkData(data any) map[string]any {
 // 响应失败结果 map[string]any{}
 func Err(v map[string]any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_ERROR
-	args["msg"] = result.MSG_ERROR
+	args["code"] = constResult.CODE_ERROR
+	args["msg"] = constResult.MSG_ERROR
 	// v合并到args
 	for key, value := range v {
 		args[key] = value
@@ -56,7 +56,7 @@ func Err(v map[string]any) map[string]any {
 // 响应失败结果信息
 func ErrMsg(msg string) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_ERROR
+	args["code"] = constResult.CODE_ERROR
 	args["msg"] = msg
 	return args
 }
@@ -64,8 +64,8 @@ func ErrMsg(msg string) map[string]any {
 // 响应失败结果数据
 func ErrData(data any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_ERROR
-	args["msg"] = result.MSG_ERROR
+	args["code"] = constResult.CODE_ERROR
+	args["msg"] = constResult.MSG_ERROR
 	args["data"] = data
 	return args
 }