优化响应中间件，自动识别响应数据格式

server/internal/logic/middleware/home_auth.go

@@ -6,8 +6,6 @@ import (
 
 // HomeAuth 前台页面鉴权中间件
 func (s *sMiddleware) HomeAuth(r *ghttp.Request) {
-	r.Response.Header().Set("Content-Type", "text/html")
-
 	// 鉴权
 	// ...
 

server/internal/logic/middleware/init.go

@@ -30,9 +30,8 @@ import (
 )
 
 type sMiddleware struct {
-	LoginUrl        string // 登录路由地址
-	DemoWhiteList   g.Map  // 演示模式放行的路由白名单
-	PayNotifyRoutes g.Map  // 支付异步通知路由
+	LoginUrl      string // 登录路由地址
+	DemoWhiteList g.Map  // 演示模式放行的路由白名单
 }
 
 func init() {
@@ -47,11 +46,6 @@ func NewMiddleware() *sMiddleware {
 			"/admin/site/mobileLogin":  struct{}{}, // 手机号登录
 			"/admin/genCodes/preview":  struct{}{}, // 预览代码
 		},
-		PayNotifyRoutes: g.Map{
-			"/api/pay/notify/alipay": struct{}{}, // 支付宝
-			"/api/pay/notify/wxpay":  struct{}{}, // 微信支付
-			"/api/pay/notify/qqpay":  struct{}{}, // QQ支付
-		},
 	}
 }
 

server/internal/logic/middleware/limit_develop.go

@@ -19,17 +19,17 @@ func (s *sMiddleware) Develop(r *ghttp.Request) {
 	}
 
 	if !gstr.InArray(ips, "*") {
-		cuIp := location.GetClientIp(r)
+		clientIp := location.GetClientIp(r)
 		ok := false
 		for _, ip := range ips {
-			if ip == cuIp {
+			if ip == clientIp {
 				ok = true
 				break
 			}
 		}
 
 		if !ok {
-			response.JsonExit(r, gcode.CodeNotSupported.Code(), fmt.Sprintf("当前IP[%s]没有配置生成白名单！", cuIp))
+			response.JsonExit(r, gcode.CodeNotSupported.Code(), fmt.Sprintf("当前IP[%s]没有配置生成白名单！", clientIp))
 			return
 		}
 	}

server/internal/logic/middleware/response.go

@@ -6,44 +6,40 @@
 package middleware
 
 import (
-	"fmt"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gmeta"
 	"hotgo/internal/consts"
 	"hotgo/internal/library/contexts"
 	"hotgo/internal/library/response"
-	"hotgo/internal/model/input/payin"
 	"hotgo/utility/charset"
 	"hotgo/utility/simple"
-	"net/http"
 )
 
 // ResponseHandler HTTP响应预处理
 func (s *sMiddleware) ResponseHandler(r *ghttp.Request) {
 	r.Middleware.Next()
 
+	contentType := getContentType(r)
 	// 已存在响应
-	if r.Response.BufferLength() > 0 && contexts.Get(r.Context()).Response != nil {
+	if contentType != consts.HTTPContentTypeStream && r.Response.BufferLength() > 0 && contexts.Get(r.Context()).Response != nil {
 		return
 	}
 
-	// html模板响应
-	if r.Response.Header().Get("Content-Type") == "text/html" {
+	switch contentType {
+	case consts.HTTPContentTypeHtml:
 		s.responseHtml(r)
 		return
-	}
-
-	// 支付通知响应
-	if _, ok := s.PayNotifyRoutes[r.Router.Uri]; ok {
-		s.responsePayNotify(r)
+	case consts.HTTPContentTypeXml:
+		s.responseXml(r)
 		return
+	case consts.HTTPContentTypeStream:
+		// ...
+	default:
+		responseJson(r)
 	}
-
-	// 默认json响应
-	responseJson(r)
 }
 
 // responseHtml html模板响应
@@ -54,56 +50,23 @@ func (s *sMiddleware) responseHtml(r *ghttp.Request) {
 	}
 
 	r.Response.ClearBuffer()
-	_ = r.Response.WriteTplContent(simple.DefaultErrorTplContent(r.Context()), g.Map{
-		"code":    code,
-		"message": message,
-		"stack":   resp,
-	})
+	_ = r.Response.WriteTplContent(simple.DefaultErrorTplContent(r.Context()), g.Map{"code": code, "message": message, "stack": resp})
 	return
 }
 
-// responsePayNotify 支付通知响应
-func (s *sMiddleware) responsePayNotify(r *ghttp.Request) {
-	var (
-		ctx  = r.Context()
-		err  error
-		data *payin.PayNotifyModel
-	)
-
+// responseXml xml响应
+func (s *sMiddleware) responseXml(r *ghttp.Request) {
 	code, message, resp := parseResponse(r)
-	if code != gcode.CodeOK.Code() {
-		response.RJson(r, code, message, data)
-		return
-	}
-
-	if err = gconv.Scan(resp, &data); err != nil || data == nil {
-		g.Log("exception").Errorf(ctx, "middleware.responsePayNotify Scan err:%+v, data:%+v", err, data)
-		r.Response.ClearBuffer()
-		r.Response.WriteStatus(http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	switch data.PayType {
-	case consts.PayTypeAliPay:
-		response.RText(r, data.Message)
-
-	case consts.PayTypeWxPay:
-		r.Response.ClearBuffer()
-		r.Response.WriteJson(fmt.Sprintf(`{"code": "%v","message": "%v"}`, data.Code, data.Message))
-
-	case consts.PayTypeQQPay:
-		r.Response.ClearBuffer()
-		r.Response.Write(`<?xml version="1.0" encoding="UTF-8"?>`)
-		r.Response.WriteXml(g.Map{
-			"return_code": data.Message,
-		})
+	r.Response.ClearBuffer()
+	r.Response.Write(`<?xml version="1.0" encoding="UTF-8"?>`)
 
+	switch code {
+	case gcode.CodeOK.Code():
+		r.Response.WriteXml(g.Map{"code": code, "message": message, "data": resp})
 	default:
-		err = gerror.Newf("无效的支付方式，这可能是没有配置通知回调响应方式导致的：%+v", data)
-		g.Log("exception").Error(ctx, err)
-		r.Response.ClearBuffer()
-		r.Response.WriteStatus(http.StatusInternalServerError, err.Error())
+		r.Response.WriteXml(g.Map{"code": code, "message": message, "error": resp})
 	}
+	return
 }
 
 // responseJson json响应
@@ -114,11 +77,8 @@ func responseJson(r *ghttp.Request) {
 
 // parseResponse 解析响应数据
 func parseResponse(r *ghttp.Request) (code int, message string, resp interface{}) {
-	var (
-		ctx = r.Context()
-		err = r.GetError()
-	)
-
+	ctx := r.Context()
+	err := r.GetError()
 	if err == nil {
 		return gcode.CodeOK.Code(), "操作成功", r.GetHandlerResponse()
 	}
@@ -126,12 +86,15 @@ func parseResponse(r *ghttp.Request) (code int, message string, resp interface{}
 	// 是否输出错误堆栈到页面
 	if g.Cfg().MustGet(ctx, "hotgo.debug", true).Bool() {
 		message = gerror.Current(err).Error()
-		resp = charset.ParseErrStack(err)
+		if getContentType(r) == consts.HTTPContentTypeHtml {
+			resp = charset.SerializeStack(err)
+		} else {
+			resp = charset.ParseErrStack(err)
+		}
 	} else {
 		message = consts.ErrorMessage(gerror.Current(err))
 	}
 
-	// 解析错误状态码
 	code = gerror.Code(err).Code()
 
 	// 记录异常日志
@@ -142,3 +105,18 @@ func parseResponse(r *ghttp.Request) (code int, message string, resp interface{}
 	}
 	return
 }
+
+func getContentType(r *ghttp.Request) (contentType string) {
+	contentType = r.Response.Header().Get("Content-Type")
+	if contentType != "" {
+		return
+	}
+
+	mime := gmeta.Get(r.GetHandlerResponse(), "mime").String()
+	if mime == "" {
+		contentType = consts.HTTPContentTypeJson
+	} else {
+		contentType = mime
+	}
+	return
+}