优化home模块页面错误处理

server/internal/logic/middleware/home_auth.go

@@ -0,0 +1,15 @@
+package middleware
+
+import (
+	"github.com/gogf/gf/v2/net/ghttp"
+)
+
+// HomeAuth 前台页面鉴权中间件
+func (s *sMiddleware) HomeAuth(r *ghttp.Request) {
+	r.Response.Header().Set("Content-Type", "text/html")
+
+	// 鉴权
+	// ...
+
+	r.Middleware.Next()
+}

server/internal/logic/middleware/response.go

@@ -17,15 +17,22 @@ import (
 	"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()
 
-	// 模板页面响应
-	if "text/html" == r.Response.Header().Get("Content-Type") {
-		r.Middleware.Next()
+	// 已存在响应
+	if r.Response.BufferLength() > 0 && contexts.Get(r.Context()).Response != nil {
+		return
+	}
+
+	// html模板响应
+	if r.Response.Header().Get("Content-Type") == "text/html" {
+		s.responseHtml(r)
 		return
 	}
 
@@ -35,10 +42,27 @@ func (s *sMiddleware) ResponseHandler(r *ghttp.Request) {
 		return
 	}
 
+	// 默认json响应
 	responseJson(r)
 }
 
-// rTemplate 支付通知响应
+// responseHtml html模板响应
+func (s *sMiddleware) responseHtml(r *ghttp.Request) {
+	code, message, resp := parseResponse(r)
+	if code == gcode.CodeOK.Code() {
+		return
+	}
+
+	r.Response.ClearBuffer()
+	_ = 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()
@@ -46,18 +70,16 @@ func (s *sMiddleware) responsePayNotify(r *ghttp.Request) {
 		data *payin.PayNotifyModel
 	)
 
-	// 异常
-	if err = r.GetError(); err != nil {
-		g.Log("exception").Error(ctx, err)
-		r.Response.ClearBuffer()
-		r.Response.WriteStatus(500, err.Error())
+	code, message, resp := parseResponse(r)
+	if code != gcode.CodeOK.Code() {
+		response.RJson(r, code, message, data)
 		return
 	}
 
-	if err = gconv.Scan(r.GetHandlerResponse(), &data); err != nil || data == nil {
+	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(500, err.Error())
+		r.Response.WriteStatus(http.StatusInternalServerError, err.Error())
 		return
 	}
 
@@ -80,46 +102,43 @@ func (s *sMiddleware) responsePayNotify(r *ghttp.Request) {
 		err = gerror.Newf("无效的支付方式，这可能是没有配置通知回调响应方式导致的：%+v", data)
 		g.Log("exception").Error(ctx, err)
 		r.Response.ClearBuffer()
-		r.Response.WriteStatus(500, err.Error())
+		r.Response.WriteStatus(http.StatusInternalServerError, err.Error())
 	}
 }
 
+// responseJson json响应
 func responseJson(r *ghttp.Request) {
-	var (
-		ctx         = r.Context()
-		comResponse = contexts.Get(ctx).Response
-		code        = gcode.CodeOK.Code()
-		message     = "操作成功"
-		data        interface{}
-		err         error
-	)
-
-	// 已存在响应内容，且是comResponse返回的时，中断运行
-	if r.Response.BufferLength() > 0 && comResponse != nil {
-		return
-	}
-
-	if err = r.GetError(); err != nil {
-		// 记录到自定义错误日志文件
-		code = gerror.Code(err).Code()
-
-		if code == gcode.CodeNil.Code() {
-			g.Log().Stdout(false).Printf(ctx, "exception:%v", err)
-		} else {
-			g.Log().Errorf(ctx, "exception:%v", err)
-		}
-
-		// 是否输出错误到页面
-		if g.Cfg().MustGet(ctx, "hotgo.debug", true).Bool() {
-			message = gerror.Current(err).Error()
-			data = charset.ParseErrStack(err)
-		} else {
-			message = consts.ErrorMessage(gerror.Current(err))
-		}
-	} else {
-		data = r.GetHandlerResponse()
-	}
-
-	// 返回固定的友好信息
+	code, message, data := parseResponse(r)
 	response.RJson(r, code, message, data)
 }
+
+// parseResponse 解析响应数据
+func parseResponse(r *ghttp.Request) (code int, message string, resp interface{}) {
+	var (
+		ctx = r.Context()
+		err = r.GetError()
+	)
+
+	if err == nil {
+		return gcode.CodeOK.Code(), "操作成功", r.GetHandlerResponse()
+	}
+
+	// 是否输出错误堆栈到页面
+	if g.Cfg().MustGet(ctx, "hotgo.debug", true).Bool() {
+		message = gerror.Current(err).Error()
+		resp = charset.ParseErrStack(err)
+	} else {
+		message = consts.ErrorMessage(gerror.Current(err))
+	}
+
+	// 解析错误状态码
+	code = gerror.Code(err).Code()
+
+	// 记录异常日志
+	if code == gcode.CodeNil.Code() {
+		g.Log().Stdout(false).Printf(ctx, "exception:%v", err)
+	} else {
+		g.Log().Errorf(ctx, "exception:%v", err)
+	}
+	return
+}

server/internal/logic/view/view.go

@@ -7,10 +7,13 @@ package view
 
 import (
 	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/model"
 	"hotgo/internal/service"
+	"hotgo/utility/charset"
+	"hotgo/utility/simple"
 )
 
 type sView struct{}
@@ -83,70 +86,23 @@ func (s *sView) Render(ctx context.Context, data ...model.View) {
 	s.RenderTpl(ctx, g.Cfg().MustGet(ctx, "viewer.homeLayout").String(), data...)
 }
 
-// Render302 跳转中间页面
-func (s *sView) Render302(ctx context.Context, data ...model.View) {
-	view := model.View{}
-	if len(data) > 0 {
-		view = data[0]
-	}
-	if view.Title == "" {
-		view.Title = "页面跳转中"
-	}
-	s.RenderTpl(ctx, "default/pages/302.html", view)
-}
-
-// Render401 401页面
-func (s *sView) Render401(ctx context.Context, data ...model.View) {
-	view := model.View{}
-	if len(data) > 0 {
-		view = data[0]
-	}
-	if view.Title == "" {
-		view.Title = "无访问权限"
-	}
-	s.RenderTpl(ctx, "default/pages/401.html", view)
-}
-
-// Render403 403页面
-func (s *sView) Render403(ctx context.Context, data ...model.View) {
-	view := model.View{}
-	if len(data) > 0 {
-		view = data[0]
-	}
-	if view.Title == "" {
-		view.Title = "无访问权限"
-	}
-	s.RenderTpl(ctx, "default/pages/403.html", view)
-}
-
-// Render404 404页面
-func (s *sView) Render404(ctx context.Context, data ...model.View) {
-	view := model.View{}
-	if len(data) > 0 {
-		view = data[0]
-	}
-	if view.Title == "" {
-		view.Title = "资源不存在"
-	}
-	s.RenderTpl(ctx, "default/pages/404.html", view)
-}
-
-// Render500 500页面
-func (s *sView) Render500(ctx context.Context, data ...model.View) {
-	view := model.View{}
-	if len(data) > 0 {
-		view = data[0]
-	}
-	if view.Title == "" {
-		view.Title = "请求执行错误"
-	}
-	s.RenderTpl(ctx, "default/pages/500.html", view)
-}
-
+// Error 自定义错误页面
 func (s *sView) Error(ctx context.Context, err error) {
-	view := model.View{
-		Title: "错误提示",
-		Error: err.Error(),
+	var (
+		request = g.RequestFromCtx(ctx)
+		code    = gerror.Code(err)
+		stack   string
+	)
+
+	// 是否输出错误堆栈到页面
+	if g.Cfg().MustGet(ctx, "hotgo.debug", true).Bool() {
+		stack = charset.SerializeStack(err)
 	}
-	s.RenderTpl(ctx, "default/pages/500.html", view)
+
+	request.Response.ClearBuffer()
+	_ = request.Response.WriteTplContent(simple.DefaultErrorTplContent(ctx), g.Map{
+		"code":    code.Code(),
+		"message": code.Message(),
+		"stack":   stack,
+	})
 }