Merge pull request #3 from sunjunnan79/fix_gin

fix:修复测试文件错误

Author: sunjunnan79

Makefile

@@ -0,0 +1,2 @@
+test:
+	go test -v ./...

example/logger/logger.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"errors"
-	"github.com/muxi-Infra/muxi-micro/pkg/1"
-	"github.com/muxi-Infra/muxi-micro/pkg/1/zapx"
 	"github.com/muxi-Infra/muxi-micro/pkg/errs"
+	"github.com/muxi-Infra/muxi-micro/pkg/logger"
+	"github.com/muxi-Infra/muxi-micro/pkg/logger/zapx"
 )
 
 var DBNOData = errs.NewErr("db_no_data", "db has no data")
@@ -26,13 +26,13 @@ func SearchUser(id int) error {
 }
 
 func main() {
-	l := zapx.NewDefaultZapLogger("./logs", logger.EnvTest)
+	l := zapx.NewDefaultZapLogger()
 	id := 1
 	A(id, l)
-	l.Info("查询出错id:", logger.Int("id", id))
+	l.Info("查询出错id:", logger.Field{"id": id})
 }
 
 func A(id int, l logger.Logger) {
 	err := SearchUser(id)
-	l.Error("查询数据库出错:", logger.Error(err))
+	l.Error("查询数据库出错:" + err.Error())
 }

tool/gin/example/main.go

@@ -23,32 +23,35 @@ func main() {
 		engine.WithEnv(static.EnvDev),
 	)
 
-	// 1. 注册不需要请求体和用户认证的路由
-	router.GET("/ping", handler.Wrap(func(ctx *gin.Context) t_http.Response {
-		return t_http.Response{
+	// 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) t_http.Response {
+	// 2. 注册需要请求体
+	router.POST("/login", handler.WrapReq(func(ctx *gin.Context, req LoginRequest) {
 		// 模拟登录逻辑
 		if req.Username == "admin" && req.Password == "123456" {
-			return t_http.Response{
+			handler.HandleResponse(ctx, t_http.Response{
 				HttpCode: http.StatusOK,
 				Message:  "登录成功",
 				Data:     "token-string",
-			}
+			})
+			return
 		}
-		return t_http.Response{
+		handler.HandleResponse(ctx, t_http.Response{
 			HttpCode: http.StatusUnauthorized,
 			Code:     40100,
 			Message:  "用户名或密码错误",
 			Data:     nil,
-		}
+		})
+		return
 	}))
 
 	router.Run("0.0.0.0:8080")