Merge pull request #9 from sunjunnan79/main

feat:删除对rounter的封装，添加更多类型的响应封装

Author: sunjunnan79

pkg/transport/http/ginx/handler/handler.go

@@ -31,46 +31,6 @@ func Bind(ctx *gin.Context, req any) error {
 	return nil
 }
 
-// WrapReq 。用于处理有请求体的请求
-// ctx表示上下文,req表示请求结构体
-func WrapReq[Req any](fn func(*gin.Context, Req)) gin.HandlerFunc {
-	return func(ctx *gin.Context) {
-		//检查前置中间件是否存在错误,如果存在应当直接返回
-		if len(ctx.Errors) > 0 {
-			return
-		}
-		//解析参数
-		var req Req
-		err := Bind(ctx, &req)
-		if err != nil {
-			HandleResponse(ctx, t_http.Response{
-				HttpCode: http.StatusBadRequest,
-				Code:     DefaultBindErrCode,
-				Message:  "非法的参数: " + err.Error(),
-				Data:     nil,
-			})
-			return
-		}
-		// 调用业务逻辑函数
-		fn(ctx, req)
-		return
-	}
-}
-
-// Wrap 。用于处理没有请求体的请求
-// ctx表示上下文
-func Wrap(fn func(*gin.Context)) gin.HandlerFunc {
-	return func(ctx *gin.Context) {
-		//检查前置中间件是否存在错误,如果存在应当直接返回
-		if len(ctx.Errors) > 0 {
-			return
-		}
-		// 调用业务逻辑函数
-		fn(ctx)
-		return
-	}
-}
-
 // HandleResponse 处理需要自定义业务码的请求
 func HandleResponse(ctx *gin.Context, resp t_http.Response) {
 	finalResp := t_http.FinalResp{
@@ -91,3 +51,11 @@ func HandleSuccessResponseWithData(ctx *gin.Context, data any) {
 		Data:    data,
 	})
 }
+
+// HandleSuccessResponse 快速处理成功响应
+func HandleSuccessResponse(ctx *gin.Context) {
+	HandleResponse(ctx, t_http.Response{
+		Code:    http.StatusOK,
+		Message: "success",
+	})
+}

pkg/transport/http/ginx/handler/handler_test.go

@@ -1,126 +1 @@
 package handler
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-	t_http "github.com/muxi-Infra/muxi-micro/pkg/transport/http"
-	"github.com/stretchr/testify/assert"
-)
-
-type demoReq struct {
-	Name string `json:"name" form:"name" binding:"required"`
-}
-
-func handleDemoReq(c *gin.Context, r demoReq) {
-	HandleResponse(c, t_http.Response{
-		HttpCode: http.StatusOK,
-		Code:     0,
-		Message:  "ok",
-		Data:     r,
-	})
-}
-
-func handleNoBody(c *gin.Context) {
-	HandleResponse(c, t_http.Response{
-		HttpCode: http.StatusOK,
-		Code:     0,
-		Message:  "pong",
-	})
-}
-
-func decodeResp[T any](body []byte) (T, error) {
-	var resp t_http.FinalResp
-	var t T
-	err := json.Unmarshal(body, &resp)
-	if err != nil {
-		return t, err
-	}
-	db, _ := json.Marshal(resp.Data)
-	err = json.Unmarshal(db, &t)
-	return t, err
-}
-
-func setErrorHandlerFunc() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.Error(errors.New("test"))
-	}
-}
-
-func TestWrapReq(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	g := gin.New()
-	g.POST("/demo", WrapReq(handleDemoReq))
-
-	tests := []struct {
-		name   string
-		body   string
-		status int
-		expect string
-	}{
-		{"非法参数", `{"foo":"bar"}`, http.StatusBadRequest, ""},
-		{"正常参数", `{"name":"bar"}`, http.StatusOK, "bar"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			w := httptest.NewRecorder()
-			req, _ := http.NewRequest(http.MethodPost, "/demo", bytes.NewBufferString(tt.body))
-			req.Header.Set("Content-Type", "application/json")
-			g.ServeHTTP(w, req)
-
-			assert.Equal(t, tt.status, w.Code)
-			if tt.status == http.StatusOK {
-				res, err := decodeResp[demoReq](w.Body.Bytes())
-				assert.NoError(t, err)
-				assert.Equal(t, tt.expect, res.Name)
-			}
-		})
-	}
-
-	t.Run("error in front Middleware", func(t *testing.T) {
-		g.GET("/testFrontError", setErrorHandlerFunc(), WrapReq(handleDemoReq))
-		w := httptest.NewRecorder()
-		req, _ := http.NewRequest(http.MethodGet, "/testFrontError", bytes.NewBufferString("{\"name\":\"bar\"}"))
-		req.Header.Set("Content-Type", "application/json")
-		g.ServeHTTP(w, req)
-
-		assert.Equal(t, http.StatusOK, w.Code)
-
-	})
-}
-
-func TestWrap(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	g := gin.New()
-
-	t.Run("请求正常", func(t *testing.T) {
-		g.GET("/ping", Wrap(handleNoBody))
-
-		w := httptest.NewRecorder()
-		req, _ := http.NewRequest(http.MethodGet, "/ping", nil)
-		g.ServeHTTP(w, req)
-
-		assert.Equal(t, http.StatusOK, w.Code)
-		var resp t_http.FinalResp
-		_ = json.Unmarshal(w.Body.Bytes(), &resp)
-		assert.Equal(t, "pong", resp.Message)
-	})
-
-	t.Run("error in front Middleware", func(t *testing.T) {
-		g.GET("/testFrontError", setErrorHandlerFunc(), Wrap(handleNoBody))
-		w := httptest.NewRecorder()
-		req, _ := http.NewRequest(http.MethodGet, "/testFrontError", bytes.NewBufferString("{\"name\":\"bar\"}"))
-		req.Header.Set("Content-Type", "application/json")
-		g.ServeHTTP(w, req)
-
-		assert.Equal(t, http.StatusOK, w.Code)
-
-	})
-
-}

tool/gin/example/main.go

@@ -1,58 +1,17 @@
 package main
 
 import (
+	"github.com/gin-gonic/gin"
 	"github.com/muxi-Infra/muxi-micro/pkg/transport/http/ginx/engine"
-	"github.com/muxi-Infra/muxi-micro/pkg/transport/http/ginx/handler"
 	"github.com/muxi-Infra/muxi-micro/static"
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	t_http "github.com/muxi-Infra/muxi-micro/pkg/transport/http"
 )
 
-// 定义请求和响应结构体
-type LoginRequest struct {
-	Username string `json:"username" binding:"required"`
-	Password string `json:"password" binding:"required"`
-}
-
 func main() {
 	g := gin.Default()
 	engine.UseDefaultMiddleware(g)
 	router := engine.NewEngine(
 		engine.WithEnv(static.EnvDev),
 	)
 
-	// 1. 注册不需要请求体
-	router.GET("/ping", handler.Wrap(func(ctx *gin.Context) {
-
-		handler.HandleResponse(ctx, t_http.Response{
-			HttpCode: http.StatusOK,
-			Code:     0,
-			Message:  "pong",
-			Data:     nil,
-		})
-	}))
-
-	// 2. 注册需要请求体
-	router.POST("/login", handler.WrapReq(func(ctx *gin.Context, req LoginRequest) {
-		// 模拟登录逻辑
-		if req.Username == "admin" && req.Password == "123456" {
-			handler.HandleResponse(ctx, t_http.Response{
-				HttpCode: http.StatusOK,
-				Message:  "登录成功",
-				Data:     "token-string",
-			})
-			return
-		}
-		handler.HandleResponse(ctx, t_http.Response{
-			HttpCode: http.StatusUnauthorized,
-			Code:     40100,
-			Message:  "用户名或密码错误",
-			Data:     nil,
-		})
-		return
-	}))
-
 	router.Run("0.0.0.0:8080")
 }