Преглед изворни кода

v0.0.1开发:apibff接口文件定义

#Suyghur пре 2 година
родитељ
комит
3efd97332c
47 измењених фајлова са 754 додато и 605 уклоњено
  1. 67 63
      bff/apibff/api/desc/apibff.api
  2. 80 0
      bff/apibff/api/desc/bean.api
  3. 0 49
      bff/apibff/api/desc/cmd.api
  4. 0 14
      bff/apibff/api/etc/apibff.yaml
  5. 1 5
      bff/apibff/api/internal/config/config.go
  6. 28 0
      bff/apibff/api/internal/handler/cs/auth/csauthhandler.go
  7. 0 36
      bff/apibff/api/internal/handler/cs/cmd/csconnecthandler.go
  8. 28 0
      bff/apibff/api/internal/handler/cs/cmd/csconnectplayerhandler.go
  9. 0 36
      bff/apibff/api/internal/handler/cs/cmd/csdisconnecthandler.go
  10. 28 0
      bff/apibff/api/internal/handler/cs/cmd/csfetchhistorylisthandler.go
  11. 28 0
      bff/apibff/api/internal/handler/cs/cmd/csfetchhistorymsghandler.go
  12. 11 9
      bff/apibff/api/internal/handler/cs/cmd/csfetchmsghandler.go
  13. 28 0
      bff/apibff/api/internal/handler/cs/cmd/csfetchplayerinfohandler.go
  14. 28 0
      bff/apibff/api/internal/handler/cs/cmd/csfetchplayerqueuehandler.go
  15. 0 36
      bff/apibff/api/internal/handler/cs/cmd/cssendhandler.go
  16. 11 9
      bff/apibff/api/internal/handler/cs/cmd/cssendmsghandler.go
  17. 0 36
      bff/apibff/api/internal/handler/cs/login/csloginhandler.go
  18. 28 0
      bff/apibff/api/internal/handler/player/auth/playerauthhandler.go
  19. 0 36
      bff/apibff/api/internal/handler/player/cmd/playerconnecthandler.go
  20. 2 17
      bff/apibff/api/internal/handler/player/cmd/playerdisconnecthandler.go
  21. 5 9
      bff/apibff/api/internal/handler/player/cmd/playerfetchcsinfohandler.go
  22. 28 0
      bff/apibff/api/internal/handler/player/cmd/playerfetchhistorymsghandler.go
  23. 21 0
      bff/apibff/api/internal/handler/player/cmd/playerfetchmsghandler.go
  24. 11 9
      bff/apibff/api/internal/handler/player/cmd/playersendmsghandler.go
  25. 0 36
      bff/apibff/api/internal/handler/player/login/playerloginhandler.go
  26. 39 24
      bff/apibff/api/internal/handler/routes.go
  27. 5 5
      bff/apibff/api/internal/logic/cs/auth/csauthlogic.go
  28. 30 0
      bff/apibff/api/internal/logic/cs/cmd/csconnectplayerlogic.go
  29. 30 0
      bff/apibff/api/internal/logic/cs/cmd/csfetchhistorylistlogic.go
  30. 30 0
      bff/apibff/api/internal/logic/cs/cmd/csfetchhistorymsglogic.go
  31. 4 4
      bff/apibff/api/internal/logic/cs/cmd/csfetchmsglogic.go
  32. 30 0
      bff/apibff/api/internal/logic/cs/cmd/csfetchplayerinfologic.go
  33. 30 0
      bff/apibff/api/internal/logic/cs/cmd/csfetchplayerqueuelogic.go
  34. 4 4
      bff/apibff/api/internal/logic/cs/cmd/cssendmsglogic.go
  35. 6 6
      bff/apibff/api/internal/logic/player/auth/playerauthlogic.go
  36. 0 30
      bff/apibff/api/internal/logic/player/cmd/playerconnectlogic.go
  37. 1 1
      bff/apibff/api/internal/logic/player/cmd/playerdisconnectlogic.go
  38. 30 0
      bff/apibff/api/internal/logic/player/cmd/playerfetchcsinfologic.go
  39. 30 0
      bff/apibff/api/internal/logic/player/cmd/playerfetchhistorymsglogic.go
  40. 4 4
      bff/apibff/api/internal/logic/player/cmd/playerfetchmsglogic.go
  41. 0 30
      bff/apibff/api/internal/logic/player/cmd/playerlogoutlogic.go
  42. 0 30
      bff/apibff/api/internal/logic/player/cmd/playersendlogic.go
  43. 4 4
      bff/apibff/api/internal/logic/player/cmd/playersendmsglogic.go
  44. 0 42
      bff/apibff/api/internal/logic/player/login/playerloginlogic.go
  45. 2 6
      bff/apibff/api/internal/svc/servicecontext.go
  46. 41 14
      bff/apibff/api/internal/types/types.go
  47. 1 1
      bff/rpcbff/etc/rpcbff.yaml

+ 67 - 63
bff/apibff/api/desc/apibff.api

@@ -1,90 +1,94 @@
 syntax = "v1"
 
 info(
-    title: "api前端服务"
-    desc: "api前端服务 "
-    author: "#Suyghur"
-    version: "v1"
+	title: "api前端服务"
+	desc: "api前端服务 "
+	author: "#Suyghur"
+	version: "v1"
 )
 
 import (
-    "cmd.api"
+	"bean.api"
 )
 
-type CommResp {
-    Code int `json:"code"`
-    Msg string `json:"msg"`
-    Data interface{} `json:"data"`
-}
-
 @server(
-    group: player/login
-    prefix: api/v1
+	group: player/auth
+	prefix: api/v1
 )
 service apibff {
-    @doc "玩家登录"
-    @handler playerLogin
-    post /player/login (PlayerLoginInfo) returns (CommResp)
+	@doc "玩家登录"
+	@handler playerAuth
+	post /player/auth (PlayerAuthReq) returns (CommResp)
 }
 
 @server(
-    group: player/cmd
-    prefix: api/v1
-    jwt: Auth
+	group: player/cmd
+	prefix: api/v1
+	jwt: Auth
 )
 service apibff {
-    @doc "玩家连接客服"
-    @handler playerConnect
-    post /player/connect (PlayerConnectReq) returns (CommResp)
-
-    @doc "玩家发送信息"
-    @handler playerSend
-    post /player/send (ChatMsgReq) returns (CommResp)
-
-    @doc "玩家断开连接"
-    @handler playerDisconnect
-    post /player/disconnect returns (CommResp)
-
-
-
-    @doc "玩家登出"
-    @handler playerLogout
-    post /player/logout returns (CommResp)
+	@doc "玩家获取客服信息"
+	@handler playerFetchCsInfo
+	post /player/fetch_cs_info (PlayerFetchCsInfoReq) returns (CommResp)
+	
+	@doc "玩家获取历史消息"
+	@handler playerFetchHistoryMsg
+	post /player/fetch_history_msg (PlayerFetchHistoryMsgReq) returns (CommResp)
+	
+	@doc "玩家获取消息"
+	@handler playerFetchMsg
+	post /player/fetch_msg returns (CommResp)
+	
+	@doc "玩家发送消息"
+	@handler playerSendMsg
+	post /player/send_msg (PlayerSendMsgReq) returns (CommResp)
+	
+	@doc "玩家断开连接客服"
+	@handler playerDisconnect
+	post /player/disconnect returns (CommResp)
 }
 
 @server(
-    group : cs/login
-    prefix : api/v1
+	group : cs/auth
+	prefix : api/v1
 )
 service apibff {
-    @doc "客服登录"
-    @handler csLogin
-    post /cs/login (CsLoginInfo) returns (CommResp)
+	@doc "客服登录"
+	@handler csAuth
+	post /cs/auth (CsAuthReq) returns (CommResp)
 }
 
 @server(
-    group : cs/cmd
-    prefix : api/v1
-    jwt : Auth
+	group : cs/cmd
+	prefix : api/v1
+	jwt : Auth
 )
 service apibff {
-    @doc "获取等待玩家列表"
-    @handler csFetchQueue
-    post /cs/fetch_queue returns (CommResp)
-
-    @doc "客服连接玩家"
-    @handler csConnect
-    post /cs/connect (CsConnectReq) returns (CommResp)
-
-    @doc "客服发送信息"
-    @handler csSend
-    post /cs/send (ChatMsgReq) returns (CommResp)
-
-    @doc "客服断开连接"
-    @handler csDisconnect
-    post /cs/disconnect (CsDisconnectReq) returns (CommResp)
-
-    @doc "客服登出"
-    @handler csLogout
-    post /cs/logout returns (CommResp)
+	@doc "客服获取玩家信息"
+	@handler csFetchPlayerInfo
+	post /cs/fetch_player_info (CsFetchPlayerInfoReq) returns (CommResp)
+	
+	@doc "客服获取玩家等待队列"
+	@handler csFetchPlayerQueue
+	post /cs/fetch_player_queue (CsFetchPlayerQueueReq) returns (CommResp)
+	
+	@doc "客服连接玩家"
+	@handler csConnectPlayer
+	post /cs/connect_player (CsConnectPlayerReq) returns (CommResp)
+	
+	@doc "客服获取历史会话列表"
+	@handler csFetchHistoryList
+	post /cs/fetch_history_list (CsFetchHistoryChatReq) returns (CommResp)
+	
+	@doc "客服获取历史消息"
+	@handler csFetchHistoryMsg
+	post /cs/fetch_history_msg (CsFetchHistoryMsgReq) returns (CommResp)
+	
+	@doc "客服获取消息"
+	@handler csFetchMsg
+	post /cs/fetch_msg (CsFetchMsgReq) returns (CommResp)
+	
+	@doc "客服发送消息"
+	@handler csSendMsg
+	post /cs/send_msg (CsSendMsgReq) returns (CommResp)
 }

+ 80 - 0
bff/apibff/api/desc/bean.api

@@ -0,0 +1,80 @@
+syntax = "v1"
+
+info(
+    title: "用户操作实例"
+    desc: "用户操作实例"
+    author: "#Suyghur"
+)
+
+
+type CommResp {
+    Code int `json:"code"`
+    Msg string `json:"msg"`
+    Data interface{} `json:"data"`
+}
+
+type (
+    PlayerAuthReq {
+        PlayerId string `json:"player_id"`
+        GameId string `json:"game_id"`
+    }
+
+    PlayerFetchCsInfoReq {
+        CsId string `json:"cs_id"`
+    }
+
+    PlayerFetchHistoryMsgReq {
+        Page int `json:"page"`
+        Limit int `json:"limit"`
+    }
+
+    PlayerSendMsgReq {
+        Content string `json:"content"`
+        Pic string `json:"pic"`
+    }
+)
+
+type (
+    CsAuthReq {
+        UserName string `json:"uname"`
+        Password string `json:"password"`
+    }
+
+    CsFetchPlayerInfoReq {
+        PlayerId string `json:"palyer_id"`
+        GameId string `json:"game_id"`
+    }
+
+    CsFetchPlayerQueueReq {
+        Limit int `json:"limit"`
+    }
+
+    CsConnectPlayerReq {
+        PlayerId string `json:"player_id"`
+        GameId string `json:"game_id"`
+    }
+
+    CsFetchHistoryChatReq {
+        Page int `json:"page"`
+        Limit int `json:"limit"`
+    }
+
+    CsFetchHistoryMsgReq {
+        PlayerId string `json:"player_id"`
+        GameId string `json:"game_id"`
+        Page int `json:"page"`
+        Limit int `json:"limit"`
+    }
+
+    CsFetchMsgReq {
+        PlayerId string `json:"player_id"`
+        GameId string `json:"game_id"`
+    }
+
+    CsSendMsgReq {
+        PlayerId string `json:"player_id"`
+        GameId string `json:"game_id"`
+        Content string `json:"content"`
+        Pic string `json:"pic"`
+    }
+)

+ 0 - 49
bff/apibff/api/desc/cmd.api

@@ -1,49 +0,0 @@
-syntax = "v1"
-
-info(
-    title: "用户操作实例"
-    desc: "用户操作实例"
-    author: "#Suyghur"
-)
-
-
-type (
-    PlayerLoginInfo {
-        PlayerId string `json:"player_id"`
-        GameId string `json:"game_id"`
-    }
-
-    PlayerInfo {
-        GameId string `json:"game_id"`
-        PlayerId string `json:"player_id"`
-        PlayerName string `json:"player_name"`
-        PlayerPower string `json:"player_power"`
-        PlayerVipLevel string `json:"player_vip_level"`
-        PlayerRechargeAmount string `json:"player_recharge_amount"`
-        ServerId string `json:"server_id"`
-        ServerName string `json:"server_name"`
-    }
-
-    PlayerConnectReq {
-        CsId string `json:"cs_id"`
-    }
-
-    CsLoginInfo {
-        UserName string `json:"user_name"`
-        Password string `json:"password"`
-    }
-
-    CsConnectReq {
-        PlayerId string `json:"palyer_id"`
-        GameId string `json:"game_id"`
-    }
-
-    CsDisconnectReq {
-        PlayerId string `json:"player_id"`
-    }
-
-    ChatMsgReq {
-        Text string `form:"msg"`
-        Pic string `form:"pic,optional"`
-    }
-)

+ 0 - 14
bff/apibff/api/etc/apibff.yaml

@@ -2,20 +2,6 @@ Name: apibff
 Host: 0.0.0.0
 Port: 8001
 
-#Mysql:
-#  DataSource: root:kel317-+@tcp(101.33.209.36)/ylink?charset=utf8mb4&parseTime=true&loc=Asia%2FShanghai
-
-#CacheRedis:
-#  - Host: $host
-#    Pass: $pass
-#    Type: node
-
-GatewayRpcConf:
-  Etcd:
-    Hosts:
-      - 101.33.209.36:2379
-    Key: gateway.rpc
-
 Auth:
   AccessSecret: ylink2022
   AccessExpire: 259200

+ 1 - 5
bff/apibff/api/internal/config/config.go

@@ -1,9 +1,6 @@
 package config
 
-import (
-	"github.com/zeromicro/go-zero/rest"
-	"github.com/zeromicro/go-zero/zrpc"
-)
+import "github.com/zeromicro/go-zero/rest"
 
 type Config struct {
 	rest.RestConf
@@ -11,5 +8,4 @@ type Config struct {
 		AccessSecret string
 		AccessExpire int64
 	}
-	GatewayRpcConf zrpc.RpcClientConf
 }

+ 28 - 0
bff/apibff/api/internal/handler/cs/auth/csauthhandler.go

@@ -0,0 +1,28 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/cs/auth"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func CsAuthHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CsAuthReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := auth.NewCsAuthLogic(r.Context(), svcCtx)
+		resp, err := l.CsAuth(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 0 - 36
bff/apibff/api/internal/handler/cs/cmd/csconnecthandler.go

@@ -1,36 +0,0 @@
-package cmd
-
-import (
-	"net/http"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"ylink/bff/apibff/api/internal/logic/cs/cmd"
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-)
-
-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.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.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 28 - 0
bff/apibff/api/internal/handler/cs/cmd/csconnectplayerhandler.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/cs/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func CsConnectPlayerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CsConnectPlayerReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsConnectPlayerLogic(r.Context(), svcCtx)
+		resp, err := l.CsConnectPlayer(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 0 - 36
bff/apibff/api/internal/handler/cs/cmd/csdisconnecthandler.go

@@ -1,36 +0,0 @@
-package cmd
-
-import (
-	"net/http"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"ylink/bff/apibff/api/internal/logic/cs/cmd"
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-)
-
-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.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.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 28 - 0
bff/apibff/api/internal/handler/cs/cmd/csfetchhistorylisthandler.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/cs/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func CsFetchHistoryListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CsFetchHistoryChatReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsFetchHistoryListLogic(r.Context(), svcCtx)
+		resp, err := l.CsFetchHistoryList(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 28 - 0
bff/apibff/api/internal/handler/cs/cmd/csfetchhistorymsghandler.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/cs/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func CsFetchHistoryMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CsFetchHistoryMsgReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsFetchHistoryMsgLogic(r.Context(), svcCtx)
+		resp, err := l.CsFetchHistoryMsg(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 11 - 9
bff/apibff/api/internal/handler/cs/cmd/csfetchqueuehandler.go → bff/apibff/api/internal/handler/cs/cmd/csfetchmsghandler.go

@@ -2,23 +2,25 @@ 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"
 	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
 )
 
-func CsFetchQueueHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func CsFetchMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		l := cmd.NewCsFetchQueueLogic(r.Context(), svcCtx)
-		resp, err := l.CsFetchQueue()
+		var req types.CsFetchMsgReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsFetchMsgLogic(r.Context(), svcCtx)
+		resp, err := l.CsFetchMsg(&req)
 		if err != nil {
-			httpx.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
+			httpx.Error(w, err)
 		} else {
 			httpx.OkJson(w, resp)
 		}

+ 28 - 0
bff/apibff/api/internal/handler/cs/cmd/csfetchplayerinfohandler.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/cs/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func CsFetchPlayerInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CsFetchPlayerInfoReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsFetchPlayerInfoLogic(r.Context(), svcCtx)
+		resp, err := l.CsFetchPlayerInfo(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 28 - 0
bff/apibff/api/internal/handler/cs/cmd/csfetchplayerqueuehandler.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/cs/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func CsFetchPlayerQueueHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CsFetchPlayerQueueReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsFetchPlayerQueueLogic(r.Context(), svcCtx)
+		resp, err := l.CsFetchPlayerQueue(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 0 - 36
bff/apibff/api/internal/handler/cs/cmd/cssendhandler.go

@@ -1,36 +0,0 @@
-package cmd
-
-import (
-	"net/http"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"ylink/bff/apibff/api/internal/logic/cs/cmd"
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-)
-
-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.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.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 11 - 9
bff/apibff/api/internal/handler/cs/cmd/cslogouthandler.go → bff/apibff/api/internal/handler/cs/cmd/cssendmsghandler.go

@@ -2,23 +2,25 @@ 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"
 	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
 )
 
-func CsLogoutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func CsSendMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		l := cmd.NewCsLogoutLogic(r.Context(), svcCtx)
-		resp, err := l.CsLogout()
+		var req types.CsSendMsgReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewCsSendMsgLogic(r.Context(), svcCtx)
+		resp, err := l.CsSendMsg(&req)
 		if err != nil {
-			httpx.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
+			httpx.Error(w, err)
 		} else {
 			httpx.OkJson(w, resp)
 		}

+ 0 - 36
bff/apibff/api/internal/handler/cs/login/csloginhandler.go

@@ -1,36 +0,0 @@
-package login
-
-import (
-	"net/http"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"ylink/bff/apibff/api/internal/logic/cs/login"
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-)
-
-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.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.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 28 - 0
bff/apibff/api/internal/handler/player/auth/playerauthhandler.go

@@ -0,0 +1,28 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/player/auth"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func PlayerAuthHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.PlayerAuthReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := auth.NewPlayerAuthLogic(r.Context(), svcCtx)
+		resp, err := l.PlayerAuth(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 0 - 36
bff/apibff/api/internal/handler/player/cmd/playerconnecthandler.go

@@ -1,36 +0,0 @@
-package cmd
-
-import (
-	"net/http"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"ylink/bff/apibff/api/internal/logic/player/cmd"
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-)
-
-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.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.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 2 - 17
bff/apibff/api/internal/handler/player/cmd/playerdisconnecthandler.go

@@ -6,29 +6,14 @@ import (
 	"github.com/zeromicro/go-zero/rest/httpx"
 	"ylink/bff/apibff/api/internal/logic/player/cmd"
 	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
 )
 
 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.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)
+		resp, err := l.PlayerDisconnect()
 		if err != nil {
-			httpx.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
+			httpx.Error(w, err)
 		} else {
 			httpx.OkJson(w, resp)
 		}

+ 5 - 9
bff/apibff/api/internal/handler/player/cmd/playersendhandler.go → bff/apibff/api/internal/handler/player/cmd/playerfetchcsinfohandler.go

@@ -9,22 +9,18 @@ import (
 	"ylink/bff/apibff/api/internal/types"
 )
 
-func PlayerSendHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func PlayerFetchCsInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.ChatMsgReq
+		var req types.PlayerFetchCsInfoReq
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.Error(w, err)
 			return
 		}
 
-		l := cmd.NewPlayerSendLogic(r.Context(), svcCtx)
-		resp, err := l.PlayerSend(&req)
+		l := cmd.NewPlayerFetchCsInfoLogic(r.Context(), svcCtx)
+		resp, err := l.PlayerFetchCsInfo(&req)
 		if err != nil {
-			httpx.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
+			httpx.Error(w, err)
 		} else {
 			httpx.OkJson(w, resp)
 		}

+ 28 - 0
bff/apibff/api/internal/handler/player/cmd/playerfetchhistorymsghandler.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/player/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+)
+
+func PlayerFetchHistoryMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.PlayerFetchHistoryMsgReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewPlayerFetchHistoryMsgLogic(r.Context(), svcCtx)
+		resp, err := l.PlayerFetchHistoryMsg(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 21 - 0
bff/apibff/api/internal/handler/player/cmd/playerfetchmsghandler.go

@@ -0,0 +1,21 @@
+package cmd
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"ylink/bff/apibff/api/internal/logic/player/cmd"
+	"ylink/bff/apibff/api/internal/svc"
+)
+
+func PlayerFetchMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := cmd.NewPlayerFetchMsgLogic(r.Context(), svcCtx)
+		resp, err := l.PlayerFetchMsg()
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

+ 11 - 9
bff/apibff/api/internal/handler/player/cmd/playerlogouthandler.go → bff/apibff/api/internal/handler/player/cmd/playersendmsghandler.go

@@ -2,23 +2,25 @@ 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"
 	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
 )
 
-func PlayerLogoutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func PlayerSendMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		l := cmd.NewPlayerLogoutLogic(r.Context(), svcCtx)
-		resp, err := l.PlayerLogout()
+		var req types.PlayerSendMsgReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := cmd.NewPlayerSendMsgLogic(r.Context(), svcCtx)
+		resp, err := l.PlayerSendMsg(&req)
 		if err != nil {
-			httpx.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
+			httpx.Error(w, err)
 		} else {
 			httpx.OkJson(w, resp)
 		}

+ 0 - 36
bff/apibff/api/internal/handler/player/login/playerloginhandler.go

@@ -1,36 +0,0 @@
-package login
-
-import (
-	"net/http"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"ylink/bff/apibff/api/internal/logic/player/login"
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-)
-
-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.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.OkJson(w, &types.CommResp{
-				Code: -1,
-				Msg:  err.Error(),
-				Data: map[string]interface{}{},
-			})
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 39 - 24
bff/apibff/api/internal/handler/routes.go

@@ -4,10 +4,10 @@ package handler
 import (
 	"net/http"
 
+	csauth "ylink/bff/apibff/api/internal/handler/cs/auth"
 	cscmd "ylink/bff/apibff/api/internal/handler/cs/cmd"
-	cslogin "ylink/bff/apibff/api/internal/handler/cs/login"
+	playerauth "ylink/bff/apibff/api/internal/handler/player/auth"
 	playercmd "ylink/bff/apibff/api/internal/handler/player/cmd"
-	playerlogin "ylink/bff/apibff/api/internal/handler/player/login"
 	"ylink/bff/apibff/api/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"
@@ -18,8 +18,8 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/player/login",
-				Handler: playerlogin.PlayerLoginHandler(serverCtx),
+				Path:    "/player/auth",
+				Handler: playerauth.PlayerAuthHandler(serverCtx),
 			},
 		},
 		rest.WithPrefix("/api/v1"),
@@ -29,23 +29,28 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/player/connect",
-				Handler: playercmd.PlayerConnectHandler(serverCtx),
+				Path:    "/player/fetch_cs_info",
+				Handler: playercmd.PlayerFetchCsInfoHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/player/send",
-				Handler: playercmd.PlayerSendHandler(serverCtx),
+				Path:    "/player/fetch_history_msg",
+				Handler: playercmd.PlayerFetchHistoryMsgHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/player/disconnect",
-				Handler: playercmd.PlayerDisconnectHandler(serverCtx),
+				Path:    "/player/fetch_msg",
+				Handler: playercmd.PlayerFetchMsgHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/player/logout",
-				Handler: playercmd.PlayerLogoutHandler(serverCtx),
+				Path:    "/player/send_msg",
+				Handler: playercmd.PlayerSendMsgHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/player/disconnect",
+				Handler: playercmd.PlayerDisconnectHandler(serverCtx),
 			},
 		},
 		rest.WithJwt(serverCtx.Config.Auth.AccessSecret),
@@ -56,8 +61,8 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/cs/login",
-				Handler: cslogin.CsLoginHandler(serverCtx),
+				Path:    "/cs/auth",
+				Handler: csauth.CsAuthHandler(serverCtx),
 			},
 		},
 		rest.WithPrefix("/api/v1"),
@@ -67,28 +72,38 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/cs/fetch_queue",
-				Handler: cscmd.CsFetchQueueHandler(serverCtx),
+				Path:    "/cs/fetch_player_info",
+				Handler: cscmd.CsFetchPlayerInfoHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/cs/fetch_player_queue",
+				Handler: cscmd.CsFetchPlayerQueueHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/cs/connect_player",
+				Handler: cscmd.CsConnectPlayerHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/cs/connect",
-				Handler: cscmd.CsConnectHandler(serverCtx),
+				Path:    "/cs/fetch_history_list",
+				Handler: cscmd.CsFetchHistoryListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/cs/send",
-				Handler: cscmd.CsSendHandler(serverCtx),
+				Path:    "/cs/fetch_history_msg",
+				Handler: cscmd.CsFetchHistoryMsgHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/cs/disconnect",
-				Handler: cscmd.CsDisconnectHandler(serverCtx),
+				Path:    "/cs/fetch_msg",
+				Handler: cscmd.CsFetchMsgHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/cs/logout",
-				Handler: cscmd.CsLogoutHandler(serverCtx),
+				Path:    "/cs/send_msg",
+				Handler: cscmd.CsSendMsgHandler(serverCtx),
 			},
 		},
 		rest.WithJwt(serverCtx.Config.Auth.AccessSecret),

+ 5 - 5
bff/apibff/api/internal/logic/cs/cmd/cslogoutlogic.go → bff/apibff/api/internal/logic/cs/auth/csauthlogic.go

@@ -1,4 +1,4 @@
-package cmd
+package auth
 
 import (
 	"context"
@@ -9,21 +9,21 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type CsLogoutLogic struct {
+type CsAuthLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewCsLogoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsLogoutLogic {
-	return &CsLogoutLogic{
+func NewCsAuthLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsAuthLogic {
+	return &CsAuthLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *CsLogoutLogic) CsLogout() (resp *types.CommResp, err error) {
+func (l *CsAuthLogic) CsAuth(req *types.CsAuthReq) (resp *types.CommResp, err error) {
 	// todo: add your logic here and delete this line
 
 	return

+ 30 - 0
bff/apibff/api/internal/logic/cs/cmd/csconnectplayerlogic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CsConnectPlayerLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCsConnectPlayerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsConnectPlayerLogic {
+	return &CsConnectPlayerLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CsConnectPlayerLogic) CsConnectPlayer(req *types.CsConnectPlayerReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
bff/apibff/api/internal/logic/cs/cmd/csfetchhistorylistlogic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CsFetchHistoryListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCsFetchHistoryListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsFetchHistoryListLogic {
+	return &CsFetchHistoryListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CsFetchHistoryListLogic) CsFetchHistoryList(req *types.CsFetchHistoryChatReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
bff/apibff/api/internal/logic/cs/cmd/csfetchhistorymsglogic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CsFetchHistoryMsgLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCsFetchHistoryMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsFetchHistoryMsgLogic {
+	return &CsFetchHistoryMsgLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CsFetchHistoryMsgLogic) CsFetchHistoryMsg(req *types.CsFetchHistoryMsgReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 4 - 4
bff/apibff/api/internal/logic/cs/cmd/cssendlogic.go → bff/apibff/api/internal/logic/cs/cmd/csfetchmsglogic.go

@@ -9,21 +9,21 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type CsSendLogic struct {
+type CsFetchMsgLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewCsSendLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsSendLogic {
-	return &CsSendLogic{
+func NewCsFetchMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsFetchMsgLogic {
+	return &CsFetchMsgLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *CsSendLogic) CsSend(req *types.ChatMsgReq) (resp *types.CommResp, err error) {
+func (l *CsFetchMsgLogic) CsFetchMsg(req *types.CsFetchMsgReq) (resp *types.CommResp, err error) {
 	// todo: add your logic here and delete this line
 
 	return

+ 30 - 0
bff/apibff/api/internal/logic/cs/cmd/csfetchplayerinfologic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CsFetchPlayerInfoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCsFetchPlayerInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsFetchPlayerInfoLogic {
+	return &CsFetchPlayerInfoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CsFetchPlayerInfoLogic) CsFetchPlayerInfo(req *types.CsFetchPlayerInfoReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
bff/apibff/api/internal/logic/cs/cmd/csfetchplayerqueuelogic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CsFetchPlayerQueueLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCsFetchPlayerQueueLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsFetchPlayerQueueLogic {
+	return &CsFetchPlayerQueueLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CsFetchPlayerQueueLogic) CsFetchPlayerQueue(req *types.CsFetchPlayerQueueReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 4 - 4
bff/apibff/api/internal/logic/cs/cmd/csconnectlogic.go → bff/apibff/api/internal/logic/cs/cmd/cssendmsglogic.go

@@ -9,21 +9,21 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type CsConnectLogic struct {
+type CsSendMsgLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewCsConnectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsConnectLogic {
-	return &CsConnectLogic{
+func NewCsSendMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsSendMsgLogic {
+	return &CsSendMsgLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *CsConnectLogic) CsConnect(req *types.CsConnectReq) (resp *types.CommResp, err error) {
+func (l *CsSendMsgLogic) CsSendMsg(req *types.CsSendMsgReq) (resp *types.CommResp, err error) {
 	// todo: add your logic here and delete this line
 
 	return

+ 6 - 6
bff/apibff/api/internal/logic/cs/login/csloginlogic.go → bff/apibff/api/internal/logic/player/auth/playerauthlogic.go

@@ -1,4 +1,4 @@
-package login
+package auth
 
 import (
 	"context"
@@ -9,22 +9,22 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type CsLoginLogic struct {
+type PlayerAuthLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewCsLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsLoginLogic {
-	return &CsLoginLogic{
+func NewPlayerAuthLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerAuthLogic {
+	return &PlayerAuthLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *CsLoginLogic) CsLogin(req *types.CsLoginInfo) (resp *types.CommResp, err error) {
-	// todo: add your logic here and delete this line
+func (l *PlayerAuthLogic) PlayerAuth(req *types.PlayerAuthReq) (resp *types.CommResp, err error) {
+	// todo: rpc调用apis下发token
 
 	return
 }

+ 0 - 30
bff/apibff/api/internal/logic/player/cmd/playerconnectlogic.go

@@ -1,30 +0,0 @@
-package cmd
-
-import (
-	"context"
-
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type PlayerConnectLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewPlayerConnectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerConnectLogic {
-	return &PlayerConnectLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *PlayerConnectLogic) PlayerConnect(req *types.PlayerConnectReq) (resp *types.CommResp, err error) {
-	// todo: add your logic here and delete this line
-
-	return
-}

+ 1 - 1
bff/apibff/api/internal/logic/player/cmd/playerdisconnectlogic.go

@@ -23,7 +23,7 @@ func NewPlayerDisconnectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
-func (l *PlayerDisconnectLogic) PlayerDisconnect(req *types.PlayerDisconnectReq) (resp *types.CommResp, err error) {
+func (l *PlayerDisconnectLogic) PlayerDisconnect() (resp *types.CommResp, err error) {
 	// todo: add your logic here and delete this line
 
 	return

+ 30 - 0
bff/apibff/api/internal/logic/player/cmd/playerfetchcsinfologic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type PlayerFetchCsInfoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewPlayerFetchCsInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerFetchCsInfoLogic {
+	return &PlayerFetchCsInfoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *PlayerFetchCsInfoLogic) PlayerFetchCsInfo(req *types.PlayerFetchCsInfoReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
bff/apibff/api/internal/logic/player/cmd/playerfetchhistorymsglogic.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	"context"
+
+	"ylink/bff/apibff/api/internal/svc"
+	"ylink/bff/apibff/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type PlayerFetchHistoryMsgLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewPlayerFetchHistoryMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerFetchHistoryMsgLogic {
+	return &PlayerFetchHistoryMsgLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *PlayerFetchHistoryMsgLogic) PlayerFetchHistoryMsg(req *types.PlayerFetchHistoryMsgReq) (resp *types.CommResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 4 - 4
bff/apibff/api/internal/logic/cs/cmd/csfetchqueuelogic.go → bff/apibff/api/internal/logic/player/cmd/playerfetchmsglogic.go

@@ -9,21 +9,21 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type CsFetchQueueLogic struct {
+type PlayerFetchMsgLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewCsFetchQueueLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsFetchQueueLogic {
-	return &CsFetchQueueLogic{
+func NewPlayerFetchMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerFetchMsgLogic {
+	return &PlayerFetchMsgLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *CsFetchQueueLogic) CsFetchQueue() (resp *types.CommResp, err error) {
+func (l *PlayerFetchMsgLogic) PlayerFetchMsg() (resp *types.CommResp, err error) {
 	// todo: add your logic here and delete this line
 
 	return

+ 0 - 30
bff/apibff/api/internal/logic/player/cmd/playerlogoutlogic.go

@@ -1,30 +0,0 @@
-package cmd
-
-import (
-	"context"
-
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type PlayerLogoutLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewPlayerLogoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerLogoutLogic {
-	return &PlayerLogoutLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *PlayerLogoutLogic) PlayerLogout() (resp *types.CommResp, err error) {
-	// todo: add your logic here and delete this line
-
-	return
-}

+ 0 - 30
bff/apibff/api/internal/logic/player/cmd/playersendlogic.go

@@ -1,30 +0,0 @@
-package cmd
-
-import (
-	"context"
-
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type PlayerSendLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewPlayerSendLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerSendLogic {
-	return &PlayerSendLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *PlayerSendLogic) PlayerSend(req *types.ChatMsgReq) (resp *types.CommResp, err error) {
-	// todo: add your logic here and delete this line
-
-	return
-}

+ 4 - 4
bff/apibff/api/internal/logic/cs/cmd/csdisconnectlogic.go → bff/apibff/api/internal/logic/player/cmd/playersendmsglogic.go

@@ -9,21 +9,21 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-type CsDisconnectLogic struct {
+type PlayerSendMsgLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewCsDisconnectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsDisconnectLogic {
-	return &CsDisconnectLogic{
+func NewPlayerSendMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerSendMsgLogic {
+	return &PlayerSendMsgLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *CsDisconnectLogic) CsDisconnect(req *types.CsDisconnectReq) (resp *types.CommResp, err error) {
+func (l *PlayerSendMsgLogic) PlayerSendMsg(req *types.PlayerSendMsgReq) (resp *types.CommResp, err error) {
 	// todo: add your logic here and delete this line
 
 	return

+ 0 - 42
bff/apibff/api/internal/logic/player/login/playerloginlogic.go

@@ -1,42 +0,0 @@
-package login
-
-import (
-	"context"
-	"ylink/gateway/rpc/gateway"
-
-	"ylink/bff/apibff/api/internal/svc"
-	"ylink/bff/apibff/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type PlayerLoginLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewPlayerLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerLoginLogic {
-	return &PlayerLoginLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *PlayerLoginLogic) PlayerLogin(req *types.PlayerLoginInfo) (resp *types.CommResp, err error) {
-	// todo: add your logic here and delete this line
-	rpcResp, err := l.svcCtx.GatewayRpc.PlayerLogin(l.ctx, &gateway.PlayerLoginReq{
-		PlayerId: req.PlayerId,
-		GameId:   req.GameId,
-	})
-	if err != nil {
-		return &types.CommResp{Code: -1, Msg: err.Error(), Data: map[string]interface{}{}}, err
-	}
-	return &types.CommResp{Code: 0, Msg: "success", Data: map[string]interface{}{
-		"access_token":  rpcResp.AccessToken,
-		"access_expire": rpcResp.AccessExpire,
-		"refresh_after": rpcResp.RefreshAfter,
-		"url":           rpcResp.Url,
-	}}, nil
-}

+ 2 - 6
bff/apibff/api/internal/svc/servicecontext.go

@@ -1,19 +1,15 @@
 package svc
 
 import (
-	"github.com/zeromicro/go-zero/zrpc"
 	"ylink/bff/apibff/api/internal/config"
-	"ylink/gateway/rpc/gateway"
 )
 
 type ServiceContext struct {
-	Config     config.Config
-	GatewayRpc gateway.Gateway
+	Config config.Config
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
-		Config:     c,
-		GatewayRpc: gateway.NewGateway(zrpc.MustNewClient(c.GatewayRpcConf)),
+		Config: c,
 	}
 }

+ 41 - 14
bff/apibff/api/internal/types/types.go

@@ -7,37 +7,64 @@ type CommResp struct {
 	Data interface{} `json:"data"`
 }
 
-type PlayerLoginInfo struct {
+type PlayerAuthReq struct {
 	PlayerId string `json:"player_id"`
 	GameId   string `json:"game_id"`
 }
 
-type PlayerConnectReq struct {
+type PlayerFetchCsInfoReq struct {
 	CsId string `json:"cs_id"`
 }
 
-type PlayerDisconnectReq struct {
-	CsId   string `json:"cs_id"`
-	ChatId string `json:"chat_id"`
+type PlayerFetchHistoryMsgReq struct {
+	Page  int `json:"page"`
+	Limit int `json:"limit"`
 }
 
-type CsLoginInfo struct {
-	UserName string `json:"user_name"`
+type PlayerSendMsgReq struct {
+	Content string `json:"content"`
+	Pic     string `json:"pic"`
+}
+
+type CsAuthReq struct {
+	UserName string `json:"uname"`
 	Password string `json:"password"`
 }
 
-type CsConnectReq struct {
+type CsFetchPlayerInfoReq struct {
 	PlayerId string `json:"palyer_id"`
 	GameId   string `json:"game_id"`
 }
 
-type CsDisconnectReq struct {
+type CsFetchPlayerQueueReq struct {
+	Limit int `json:"limit"`
+}
+
+type CsConnectPlayerReq struct {
 	PlayerId string `json:"player_id"`
-	ChatId   string `json:"chat_id"`
+	GameId   string `json:"game_id"`
 }
 
-type ChatMsgReq struct {
-	ChatId string `form:"chat_id"`
-	Text   string `form:"msg"`
-	Pic    string `form:"pic,optional"`
+type CsFetchHistoryChatReq struct {
+	Page  int `json:"page"`
+	Limit int `json:"limit"`
+}
+
+type CsFetchHistoryMsgReq struct {
+	PlayerId string `json:"player_id"`
+	GameId   string `json:"game_id"`
+	Page     int    `json:"page"`
+	Limit    int    `json:"limit"`
+}
+
+type CsFetchMsgReq struct {
+	PlayerId string `json:"player_id"`
+	GameId   string `json:"game_id"`
+}
+
+type CsSendMsgReq struct {
+	PlayerId string `json:"player_id"`
+	GameId   string `json:"game_id"`
+	Content  string `json:"content"`
+	Pic      string `json:"pic"`
 }

+ 1 - 1
bff/rpcbff/etc/rpcbff.yaml

@@ -2,5 +2,5 @@ Name: rpcbff.rpc
 ListenOn: 0.0.0.0:10001
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+  - 101.33.209.36:2379
   Key: rpcbff.rpc