From 146fbaf8780b8ce6f56fd7f36427762bd2058a86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?=
 <go_developer@163.com>
Date: Tue, 29 Apr 2025 14:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=BA=94=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 response/response.go |  6 +++---
 router/handler.go    | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/response/response.go b/response/response.go
index f0cfbef..db68f72 100644
--- a/response/response.go
+++ b/response/response.go
@@ -95,7 +95,7 @@ func Send(ctx *gin.Context, code any, httpCode int, data any, responseOption *de
 	responseContentType := getResponseDataType(responseOption.ContentType)
 	responseInstance, _ := wrapper.NewJson(serialize.JSON.MarshalForStringIgnoreError(responseException.GetData()), &wrapper.Option{XmlName: responseOption.XmlName})
 	finalResponseData, _ := responseInstance.Marshal(responseContentType)
-	ctx.Data(responseException.GetHttpCode(), responseContentType, finalResponseData)
+	ctx.Data(responseException.GetHttpCode(), responseOption.ContentType, finalResponseData)
 }
 
 // getResponseDataType 获取相应数据类型
@@ -138,7 +138,7 @@ func SendWithStatusOK(ctx *gin.Context, code any, data any) {
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 13:08 2022/6/26
-func SendWithException(ctx *gin.Context, e exception.IException, data map[string]any) {
+func SendWithException(ctx *gin.Context, e exception.IException, data map[string]any, responseOption *define.ResponseOption) {
 	if nil == e {
 		e = exception.NewSuccess(data)
 	}
@@ -152,7 +152,7 @@ func SendWithException(ctx *gin.Context, e exception.IException, data map[string
 		"e_data":   e.GetData(),
 		"u_e_data": data,
 	}
-	Send(ctx, e.GetCode(), e.GetHttpCode(), outputData, nil)
+	Send(ctx, e.GetCode(), e.GetHttpCode(), outputData, responseOption)
 }
 
 // JSON ctx.JSON 的平替, 增加了数据是否已相应的标识
diff --git a/router/handler.go b/router/handler.go
index db29c72..34f5490 100644
--- a/router/handler.go
+++ b/router/handler.go
@@ -44,7 +44,9 @@ func RequestHandler(uriCfg UriConfig) gin.HandlerFunc {
 			// 格式化验证错误的信息
 			err = GetValidateErr(formValue, err)
 			e = exception.NewFromError(400, err)
-			response.SendWithException(ctx, e, nil)
+			response.SendWithException(ctx, e, nil, &define.ResponseOption{
+				ContentType: "application/json;charset=utf-8",
+			})
 			ctx.Abort()
 			return
 		}
@@ -97,7 +99,7 @@ func RequestHandler(uriCfg UriConfig) gin.HandlerFunc {
 		if resList[1].IsNil() {
 			// 请求成功
 			isSuccess = true
-			response.Success(ctx, resList[0].Interface())
+			response.SuccessWithExtension(ctx, resList[0].Interface(), &define.ResponseOption{ContentType: "application/json;charset=utf-8"})
 			return
 		}
 		// 请求失败
@@ -110,7 +112,9 @@ func RequestHandler(uriCfg UriConfig) gin.HandlerFunc {
 				"err": resList[1].Interface(),
 			})
 		}
-		response.SendWithException(ctx, e, nil)
+		response.SendWithException(ctx, e, nil, &define.ResponseOption{
+			ContentType: "application/json;charset=utf-8",
+		})
 		return
 	}
 }