Browse Source

[dev]中间件统一返回结果

Zhangzhenhua 2 weeks ago
parent
commit
64fc7f67cc
2 changed files with 4 additions and 6 deletions
  1. 2 0
      internal/cmd/cmd.go
  2. 2 6
      internal/controller/login/login_v1_login.go

+ 2 - 0
internal/cmd/cmd.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcmd"
 
+	"cris/internal/controller/chat"
 	"cris/internal/controller/login"
 )
 
@@ -25,6 +26,7 @@ var (
 			//websocket路由
 			s.Group("/websocket", func(group *ghttp.RouterGroup) {
 				group.Middleware(ghttp.MiddlewareHandlerResponse)
+				group.Bind(chat.NewV1())
 			})
 
 			s.Run()

+ 2 - 6
internal/controller/login/login_v1_login.go

@@ -3,18 +3,14 @@ package login
 import (
 	"context"
 
-	"github.com/gogf/gf/v2/frame/g"
-
 	v1 "cris/api/login/v1"
 	"cris/internal/service"
 )
 
 func (c *ControllerV1) Login(ctx context.Context, req *v1.LoginReq) (res *v1.LoginRes, err error) {
-	r := g.RequestFromCtx(ctx)
 	login, err := service.Login().Login(ctx, req)
 	if err != nil {
-		r.Response.WriteExit("login error")
+		return nil, err
 	}
-	r.Response.WriteJson(login)
-	return
+	return login, err
 }