v0.0.1开发：调整apibff非网络异常的接口返回

bff/apibff/api/internal/handler/cs/cmd/csconnecthandler.go

@@ -13,14 +13,22 @@ func CsConnectHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.CsConnectReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := cmd.NewCsConnectLogic(r.Context(), svcCtx)
 		resp, err := l.CsConnect(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/cs/cmd/csdisconnecthandler.go

@@ -13,14 +13,22 @@ func CsDisconnectHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.CsDisconnectReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := cmd.NewCsDisconnectLogic(r.Context(), svcCtx)
 		resp, err := l.CsDisconnect(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/cs/cmd/csfetchqueuehandler.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"net/http"
+	"ylink/bff/apibff/api/internal/types"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
 	"ylink/bff/apibff/api/internal/logic/cs/cmd"
@@ -13,7 +14,11 @@ func CsFetchQueueHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		l := cmd.NewCsFetchQueueLogic(r.Context(), svcCtx)
 		resp, err := l.CsFetchQueue()
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/cs/cmd/cslogouthandler.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"net/http"
+	"ylink/bff/apibff/api/internal/types"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
 	"ylink/bff/apibff/api/internal/logic/cs/cmd"
@@ -13,7 +14,11 @@ func CsLogoutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		l := cmd.NewCsLogoutLogic(r.Context(), svcCtx)
 		resp, err := l.CsLogout()
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/cs/cmd/cssendhandler.go

@@ -13,14 +13,22 @@ func CsSendHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.ChatMsgReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := cmd.NewCsSendLogic(r.Context(), svcCtx)
 		resp, err := l.CsSend(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/cs/login/csloginhandler.go

@@ -13,14 +13,22 @@ func CsLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.CsLoginInfo
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := login.NewCsLoginLogic(r.Context(), svcCtx)
 		resp, err := l.CsLogin(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/player/cmd/playerconnecthandler.go

@@ -13,14 +13,22 @@ func PlayerConnectHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.PlayerConnectReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := cmd.NewPlayerConnectLogic(r.Context(), svcCtx)
 		resp, err := l.PlayerConnect(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/player/cmd/playerdisconnecthandler.go

@@ -13,14 +13,22 @@ func PlayerDisconnectHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.PlayerDisconnectReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := cmd.NewPlayerDisconnectLogic(r.Context(), svcCtx)
 		resp, err := l.PlayerDisconnect(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/player/cmd/playerlogouthandler.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"net/http"
+	"ylink/bff/apibff/api/internal/types"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
 	"ylink/bff/apibff/api/internal/logic/player/cmd"
@@ -13,7 +14,11 @@ func PlayerLogoutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		l := cmd.NewPlayerLogoutLogic(r.Context(), svcCtx)
 		resp, err := l.PlayerLogout()
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/player/cmd/playersendhandler.go

@@ -20,7 +20,11 @@ func PlayerSendHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		l := cmd.NewPlayerSendLogic(r.Context(), svcCtx)
 		resp, err := l.PlayerSend(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/handler/player/login/playerloginhandler.go

@@ -13,14 +13,22 @@ func PlayerLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.PlayerLoginInfo
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 			return
 		}
 
 		l := login.NewPlayerLoginLogic(r.Context(), svcCtx)
 		resp, err := l.PlayerLogin(&req)
 		if err != nil {
-			httpx.Error(w, err)
+			httpx.OkJson(w, &types.CommResp{
+				Code: -1,
+				Msg:  err.Error(),
+				Data: map[string]interface{}{},
+			})
 		} else {
 			httpx.OkJson(w, resp)
 		}

bff/apibff/api/internal/logic/player/login/playerloginlogic.go

@@ -36,7 +36,7 @@ func (l *PlayerLoginLogic) PlayerLogin(req *types.PlayerLoginInfo) (resp *types.
 	return &types.CommResp{Code: 0, Msg: "success", Data: map[string]interface{}{
 		"access_token":  rpcResp.AccessToken,
 		"access_expire": rpcResp.AccessExpire,
-		"refreshAfter":  rpcResp.RefreshAfter,
+		"refresh_after": rpcResp.RefreshAfter,
 		"url":           rpcResp.Url,
 	}}, nil
 }

gateway/rpc/internal/logic/playerloginlogic.go

@@ -27,7 +27,7 @@ func (l *PlayerLoginLogic) PlayerLogin(in *pb.PlayerLoginReq) (*pb.LoginResp, er
 	// todo: add your logic here and delete this line
 
 	return &pb.LoginResp{
-		AccessToken:  "test_token",
+		AccessToken:  in.PlayerId,
 		AccessExpire: 100,
 		RefreshAfter: 100,
 		Url:          "www.baidu.com"}, nil