Explorar el Código

v0.0.1开发:获取客服信息接口开发

#Suyghur hace 2 años
padre
commit
5ccf2d65fa

+ 1 - 1
bff/authbff/api/etc/authbff.yaml

@@ -5,7 +5,7 @@ Port: 10000
 #链路追踪
 Telemetry:
   Name: authbff-api
-  Endpoint: http://127.0.0.1:9092/api/traces
+  Endpoint: http://127.0.0.1:14268/api/traces
   Sampler: 1.0
   Batcher: jaeger
 

+ 0 - 4
bff/cmdbff/api/desc/cmdbff.api

@@ -28,10 +28,6 @@ service cmdbff {
 	@handler playerSendMsg
 	post /player/send-msg (PlayerSendMsgReq)
 	
-	@doc "玩家断开连接客服"
-	@handler playerDisconnect
-	post /player/disconnect
-	
 	@doc "客服获取玩家等待队列"
 	@handler csFetchPlayerQueue
 	post /cs/fetch-player-queue (CsFetchPlayerQueueReq) returns (CsFetchPlayerQueueResp)

+ 1 - 1
bff/cmdbff/api/etc/cmdbff.yaml

@@ -4,7 +4,7 @@ Port: 10100
 
 Telemetry:
   Name: cmdbff-api
-  Endpoint: http://127.0.0.1:9092/api/traces
+  Endpoint: http://127.0.0.1:14268/api/traces
   Sampler: 1.0
   Batcher: jaeger
 

+ 0 - 17
bff/cmdbff/api/internal/handler/playerdisconnecthandler.go

@@ -1,17 +0,0 @@
-package handler
-
-import (
-	"net/http"
-	"ylink/comm/result"
-
-	"ylink/bff/cmdbff/api/internal/logic"
-	"ylink/bff/cmdbff/api/internal/svc"
-)
-
-func playerDisconnectHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		l := logic.NewPlayerDisconnectLogic(r.Context(), svcCtx)
-		err := l.PlayerDisconnect()
-		result.HttpResult(r, w, nil, err)
-	}
-}

+ 0 - 5
bff/cmdbff/api/internal/handler/routes.go

@@ -27,11 +27,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/player/send-msg",
 				Handler: playerSendMsgHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/player/disconnect",
-				Handler: playerDisconnectHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/cs/fetch-player-queue",

+ 0 - 34
bff/cmdbff/api/internal/logic/playerdisconnectlogic.go

@@ -1,34 +0,0 @@
-package logic
-
-import (
-	"context"
-	"ylink/comm/ctxdata"
-	"ylink/core/cmd/rpc/cmd"
-
-	"github.com/zeromicro/go-zero/core/logx"
-	"ylink/bff/cmdbff/api/internal/svc"
-)
-
-type PlayerDisconnectLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewPlayerDisconnectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerDisconnectLogic {
-	return &PlayerDisconnectLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *PlayerDisconnectLogic) PlayerDisconnect() error {
-	playerId := ctxdata.GetPlayerIdFromCtx(l.ctx)
-	gameId := ctxdata.GetGameIdFromCtx(l.ctx)
-	_, err := l.svcCtx.CmdRpc.PlayerDisconnect(l.ctx, &cmd.PlayerDisconnectReq{
-		PlayerId: playerId,
-		GameId:   gameId,
-	})
-	return err
-}

+ 0 - 8
core/cmd/rpc/cmd/cmd.go

@@ -23,8 +23,6 @@ type (
 	CsFetchPlayerQueueResp    = pb.CsFetchPlayerQueueResp
 	CsSendMsgReq              = pb.CsSendMsgReq
 	CsSendMsgResp             = pb.CsSendMsgResp
-	PlayerDisconnectReq       = pb.PlayerDisconnectReq
-	PlayerDisconnectResp      = pb.PlayerDisconnectResp
 	PlayerFetchCsInfoReq      = pb.PlayerFetchCsInfoReq
 	PlayerFetchCsInfoResp     = pb.PlayerFetchCsInfoResp
 	PlayerFetchHistoryMsgReq  = pb.PlayerFetchHistoryMsgReq
@@ -36,7 +34,6 @@ type (
 		PlayerFetchCsInfo(ctx context.Context, in *PlayerFetchCsInfoReq, opts ...grpc.CallOption) (*PlayerFetchCsInfoResp, error)
 		PlayerFetchHistoryMsg(ctx context.Context, in *PlayerFetchHistoryMsgReq, opts ...grpc.CallOption) (*PlayerFetchHistoryMsgResp, error)
 		PlayerSendMsg(ctx context.Context, in *PlayerSendMsgReq, opts ...grpc.CallOption) (*PlayerSendMsgResp, error)
-		PlayerDisconnect(ctx context.Context, in *PlayerDisconnectReq, opts ...grpc.CallOption) (*PlayerDisconnectResp, error)
 		CsFetchPlayerQueue(ctx context.Context, in *CsFetchPlayerQueueReq, opts ...grpc.CallOption) (*CsFetchPlayerQueueResp, error)
 		CsConnectPlayer(ctx context.Context, in *CsConnectPlayerReq, opts ...grpc.CallOption) (*CsConnectPlayerResp, error)
 		CsFetchHistoryChat(ctx context.Context, in *CsFetchHistoryChatReq, opts ...grpc.CallOption) (*CsFetchHistoryChatResp, error)
@@ -70,11 +67,6 @@ func (m *defaultCmd) PlayerSendMsg(ctx context.Context, in *PlayerSendMsgReq, op
 	return client.PlayerSendMsg(ctx, in, opts...)
 }
 
-func (m *defaultCmd) PlayerDisconnect(ctx context.Context, in *PlayerDisconnectReq, opts ...grpc.CallOption) (*PlayerDisconnectResp, error) {
-	client := pb.NewCmdClient(m.cli.Conn())
-	return client.PlayerDisconnect(ctx, in, opts...)
-}
-
 func (m *defaultCmd) CsFetchPlayerQueue(ctx context.Context, in *CsFetchPlayerQueueReq, opts ...grpc.CallOption) (*CsFetchPlayerQueueResp, error) {
 	client := pb.NewCmdClient(m.cli.Conn())
 	return client.CsFetchPlayerQueue(ctx, in, opts...)

+ 1 - 1
core/cmd/rpc/etc/cmd.yaml

@@ -8,7 +8,7 @@ InnerRpcConf:
 
 Telemetry:
   Name: cmd-api
-  Endpoint: http://127.0.0.1:9092/api/traces
+  Endpoint: http://127.0.0.1:14268/api/traces
   Sampler: 1.0
   Batcher: jaeger
 

+ 0 - 36
core/cmd/rpc/internal/logic/playerdisconnectlogic.go

@@ -1,36 +0,0 @@
-package logic
-
-import (
-	"context"
-	"ylink/core/cmd/rpc/internal/svc"
-	"ylink/core/cmd/rpc/pb"
-	"ylink/core/inner/rpc/inner"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type PlayerDisconnectLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewPlayerDisconnectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PlayerDisconnectLogic {
-	return &PlayerDisconnectLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-func (l *PlayerDisconnectLogic) PlayerDisconnect(in *pb.PlayerDisconnectReq) (*pb.PlayerDisconnectResp, error) {
-	// 调用inner服务玩家状态
-	_, err := l.svcCtx.InnerRpc.PlayerDisconnect(l.ctx, &inner.InnerPlayerDisconnectReq{
-		PlayerId: in.PlayerId,
-		GameId:   in.GameId,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &pb.PlayerDisconnectResp{}, nil
-}

+ 0 - 5
core/cmd/rpc/internal/server/cmdserver.go

@@ -37,11 +37,6 @@ func (s *CmdServer) PlayerSendMsg(ctx context.Context, in *pb.PlayerSendMsgReq)
 	return l.PlayerSendMsg(in)
 }
 
-func (s *CmdServer) PlayerDisconnect(ctx context.Context, in *pb.PlayerDisconnectReq) (*pb.PlayerDisconnectResp, error) {
-	l := logic.NewPlayerDisconnectLogic(ctx, s.svcCtx)
-	return l.PlayerDisconnect(in)
-}
-
 func (s *CmdServer) CsFetchPlayerQueue(ctx context.Context, in *pb.CsFetchPlayerQueueReq) (*pb.CsFetchPlayerQueueResp, error) {
 	l := logic.NewCsFetchPlayerQueueLogic(ctx, s.svcCtx)
 	return l.CsFetchPlayerQueue(in)

+ 167 - 299
core/cmd/rpc/pb/cmd.pb.go

@@ -408,99 +408,6 @@ func (*PlayerSendMsgResp) Descriptor() ([]byte, []int) {
 	return file_pb_cmd_proto_rawDescGZIP(), []int{5}
 }
 
-type PlayerDisconnectReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PlayerId string `protobuf:"bytes,1,opt,name=player_id,json=playerId,proto3" json:"player_id,omitempty"`
-	GameId   string `protobuf:"bytes,2,opt,name=game_id,json=gameId,proto3" json:"game_id,omitempty"`
-}
-
-func (x *PlayerDisconnectReq) Reset() {
-	*x = PlayerDisconnectReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PlayerDisconnectReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PlayerDisconnectReq) ProtoMessage() {}
-
-func (x *PlayerDisconnectReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PlayerDisconnectReq.ProtoReflect.Descriptor instead.
-func (*PlayerDisconnectReq) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *PlayerDisconnectReq) GetPlayerId() string {
-	if x != nil {
-		return x.PlayerId
-	}
-	return ""
-}
-
-func (x *PlayerDisconnectReq) GetGameId() string {
-	if x != nil {
-		return x.GameId
-	}
-	return ""
-}
-
-type PlayerDisconnectResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PlayerDisconnectResp) Reset() {
-	*x = PlayerDisconnectResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PlayerDisconnectResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PlayerDisconnectResp) ProtoMessage() {}
-
-func (x *PlayerDisconnectResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PlayerDisconnectResp.ProtoReflect.Descriptor instead.
-func (*PlayerDisconnectResp) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{7}
-}
-
 //*
 //Cs Command Request Bean
 type CsFetchPlayerQueueReq struct {
@@ -514,7 +421,7 @@ type CsFetchPlayerQueueReq struct {
 func (x *CsFetchPlayerQueueReq) Reset() {
 	*x = CsFetchPlayerQueueReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[8]
+		mi := &file_pb_cmd_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -527,7 +434,7 @@ func (x *CsFetchPlayerQueueReq) String() string {
 func (*CsFetchPlayerQueueReq) ProtoMessage() {}
 
 func (x *CsFetchPlayerQueueReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[8]
+	mi := &file_pb_cmd_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -540,7 +447,7 @@ func (x *CsFetchPlayerQueueReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsFetchPlayerQueueReq.ProtoReflect.Descriptor instead.
 func (*CsFetchPlayerQueueReq) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{8}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *CsFetchPlayerQueueReq) GetLimit() int64 {
@@ -562,7 +469,7 @@ type CsFetchPlayerQueueResp struct {
 func (x *CsFetchPlayerQueueResp) Reset() {
 	*x = CsFetchPlayerQueueResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[9]
+		mi := &file_pb_cmd_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -575,7 +482,7 @@ func (x *CsFetchPlayerQueueResp) String() string {
 func (*CsFetchPlayerQueueResp) ProtoMessage() {}
 
 func (x *CsFetchPlayerQueueResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[9]
+	mi := &file_pb_cmd_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -588,7 +495,7 @@ func (x *CsFetchPlayerQueueResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsFetchPlayerQueueResp.ProtoReflect.Descriptor instead.
 func (*CsFetchPlayerQueueResp) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{9}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *CsFetchPlayerQueueResp) GetTotal() int64 {
@@ -618,7 +525,7 @@ type CsConnectPlayerReq struct {
 func (x *CsConnectPlayerReq) Reset() {
 	*x = CsConnectPlayerReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[10]
+		mi := &file_pb_cmd_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -631,7 +538,7 @@ func (x *CsConnectPlayerReq) String() string {
 func (*CsConnectPlayerReq) ProtoMessage() {}
 
 func (x *CsConnectPlayerReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[10]
+	mi := &file_pb_cmd_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -644,7 +551,7 @@ func (x *CsConnectPlayerReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsConnectPlayerReq.ProtoReflect.Descriptor instead.
 func (*CsConnectPlayerReq) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{10}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *CsConnectPlayerReq) GetCsId() string {
@@ -677,7 +584,7 @@ type CsConnectPlayerResp struct {
 func (x *CsConnectPlayerResp) Reset() {
 	*x = CsConnectPlayerResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[11]
+		mi := &file_pb_cmd_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -690,7 +597,7 @@ func (x *CsConnectPlayerResp) String() string {
 func (*CsConnectPlayerResp) ProtoMessage() {}
 
 func (x *CsConnectPlayerResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[11]
+	mi := &file_pb_cmd_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -703,7 +610,7 @@ func (x *CsConnectPlayerResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsConnectPlayerResp.ProtoReflect.Descriptor instead.
 func (*CsConnectPlayerResp) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{11}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{9}
 }
 
 type CsFetchHistoryChatReq struct {
@@ -719,7 +626,7 @@ type CsFetchHistoryChatReq struct {
 func (x *CsFetchHistoryChatReq) Reset() {
 	*x = CsFetchHistoryChatReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[12]
+		mi := &file_pb_cmd_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -732,7 +639,7 @@ func (x *CsFetchHistoryChatReq) String() string {
 func (*CsFetchHistoryChatReq) ProtoMessage() {}
 
 func (x *CsFetchHistoryChatReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[12]
+	mi := &file_pb_cmd_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -745,7 +652,7 @@ func (x *CsFetchHistoryChatReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsFetchHistoryChatReq.ProtoReflect.Descriptor instead.
 func (*CsFetchHistoryChatReq) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{12}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *CsFetchHistoryChatReq) GetCsId() string {
@@ -782,7 +689,7 @@ type CsFetchHistoryChatResp struct {
 func (x *CsFetchHistoryChatResp) Reset() {
 	*x = CsFetchHistoryChatResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[13]
+		mi := &file_pb_cmd_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -795,7 +702,7 @@ func (x *CsFetchHistoryChatResp) String() string {
 func (*CsFetchHistoryChatResp) ProtoMessage() {}
 
 func (x *CsFetchHistoryChatResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[13]
+	mi := &file_pb_cmd_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -808,7 +715,7 @@ func (x *CsFetchHistoryChatResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsFetchHistoryChatResp.ProtoReflect.Descriptor instead.
 func (*CsFetchHistoryChatResp) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{13}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *CsFetchHistoryChatResp) GetTotalPage() int64 {
@@ -847,7 +754,7 @@ type CsFetchHistoryMsgReq struct {
 func (x *CsFetchHistoryMsgReq) Reset() {
 	*x = CsFetchHistoryMsgReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[14]
+		mi := &file_pb_cmd_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -860,7 +767,7 @@ func (x *CsFetchHistoryMsgReq) String() string {
 func (*CsFetchHistoryMsgReq) ProtoMessage() {}
 
 func (x *CsFetchHistoryMsgReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[14]
+	mi := &file_pb_cmd_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -873,7 +780,7 @@ func (x *CsFetchHistoryMsgReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsFetchHistoryMsgReq.ProtoReflect.Descriptor instead.
 func (*CsFetchHistoryMsgReq) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{14}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *CsFetchHistoryMsgReq) GetCsId() string {
@@ -925,7 +832,7 @@ type CsFetchHistoryMsgResp struct {
 func (x *CsFetchHistoryMsgResp) Reset() {
 	*x = CsFetchHistoryMsgResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[15]
+		mi := &file_pb_cmd_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -938,7 +845,7 @@ func (x *CsFetchHistoryMsgResp) String() string {
 func (*CsFetchHistoryMsgResp) ProtoMessage() {}
 
 func (x *CsFetchHistoryMsgResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[15]
+	mi := &file_pb_cmd_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -951,7 +858,7 @@ func (x *CsFetchHistoryMsgResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsFetchHistoryMsgResp.ProtoReflect.Descriptor instead.
 func (*CsFetchHistoryMsgResp) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{15}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *CsFetchHistoryMsgResp) GetCsId() string {
@@ -997,7 +904,7 @@ type CsSendMsgReq struct {
 func (x *CsSendMsgReq) Reset() {
 	*x = CsSendMsgReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[16]
+		mi := &file_pb_cmd_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1010,7 +917,7 @@ func (x *CsSendMsgReq) String() string {
 func (*CsSendMsgReq) ProtoMessage() {}
 
 func (x *CsSendMsgReq) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[16]
+	mi := &file_pb_cmd_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1023,7 +930,7 @@ func (x *CsSendMsgReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsSendMsgReq.ProtoReflect.Descriptor instead.
 func (*CsSendMsgReq) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{16}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *CsSendMsgReq) GetCsId() string {
@@ -1070,7 +977,7 @@ type CsSendMsgResp struct {
 func (x *CsSendMsgResp) Reset() {
 	*x = CsSendMsgResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pb_cmd_proto_msgTypes[17]
+		mi := &file_pb_cmd_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1083,7 +990,7 @@ func (x *CsSendMsgResp) String() string {
 func (*CsSendMsgResp) ProtoMessage() {}
 
 func (x *CsSendMsgResp) ProtoReflect() protoreflect.Message {
-	mi := &file_pb_cmd_proto_msgTypes[17]
+	mi := &file_pb_cmd_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1096,7 +1003,7 @@ func (x *CsSendMsgResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CsSendMsgResp.ProtoReflect.Descriptor instead.
 func (*CsSendMsgResp) Descriptor() ([]byte, []int) {
-	return file_pb_cmd_proto_rawDescGZIP(), []int{17}
+	return file_pb_cmd_proto_rawDescGZIP(), []int{15}
 }
 
 var File_pb_cmd_proto protoreflect.FileDescriptor
@@ -1148,114 +1055,103 @@ var file_pb_cmd_proto_rawDesc = []byte{
 	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12,
 	0x10, 0x0a, 0x03, 0x70, 0x69, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69,
 	0x63, 0x22, 0x13, 0x0a, 0x11, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x4d,
-	0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x22, 0x4b, 0x0a, 0x13, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1b, 0x0a,
-	0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x61,
-	0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x61, 0x6d,
-	0x65, 0x49, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x69, 0x73,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2d, 0x0a, 0x15, 0x43,
-	0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75,
-	0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x5e, 0x0a, 0x16, 0x43, 0x73,
-	0x46, 0x65, 0x74, 0x63, 0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69,
-	0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x5f, 0x0a, 0x12, 0x43, 0x73,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x71,
-	0x12, 0x13, 0x0a, 0x05, 0x63, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x63, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x43,
-	0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65,
-	0x73, 0x70, 0x22, 0x56, 0x0a, 0x15, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73,
-	0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x13, 0x0a, 0x05, 0x63,
+	0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63,
+	0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75, 0x65, 0x52, 0x65, 0x71, 0x12,
+	0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x5e, 0x0a, 0x16, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68,
+	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
+	0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x5f, 0x0a, 0x12, 0x43, 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x13, 0x0a, 0x05, 0x63,
 	0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x73, 0x49, 0x64,
-	0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04,
-	0x70, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x8a, 0x01, 0x0a, 0x16, 0x43,
-	0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x70,
-	0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c,
-	0x50, 0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f,
-	0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x74, 0x50, 0x61, 0x67, 0x65, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x8b, 0x01, 0x0a, 0x14, 0x43, 0x73, 0x46, 0x65,
-	0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71,
-	0x12, 0x13, 0x0a, 0x05, 0x63, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x63, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70,
-	0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
-	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x9e, 0x01, 0x0a, 0x15, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63,
-	0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x13, 0x0a, 0x05, 0x63, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x63, 0x73, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x70, 0x61,
-	0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x50,
-	0x61, 0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x70,
-	0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65,
-	0x6e, 0x74, 0x50, 0x61, 0x67, 0x65, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x85, 0x01, 0x0a, 0x0c, 0x43, 0x73, 0x53, 0x65, 0x6e,
-	0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x12, 0x13, 0x0a, 0x05, 0x63, 0x73, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09,
-	0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x61, 0x6d,
-	0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x61, 0x6d, 0x65,
-	0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03,
-	0x70, 0x69, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x63, 0x22, 0x0f,
-	0x0a, 0x0d, 0x43, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x32,
-	0x84, 0x05, 0x0a, 0x03, 0x43, 0x6d, 0x64, 0x12, 0x48, 0x0a, 0x11, 0x70, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x2e, 0x70,
-	0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x73, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79,
-	0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x54, 0x0a, 0x15, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68,
-	0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e,
-	0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f,
-	0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79,
-	0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3c, 0x0a, 0x0d, 0x70, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x15,
-	0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73,
-	0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x45, 0x0a, 0x10, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
-	0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x50,
-	0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52,
-	0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x69,
-	0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4b, 0x0a, 0x12,
-	0x63, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65,
-	0x75, 0x65, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x50,
-	0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e,
-	0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x51, 0x75, 0x65, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x73, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x70,
-	0x62, 0x2e, 0x43, 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4b, 0x0a,
-	0x12, 0x63, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43,
-	0x68, 0x61, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68,
-	0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1a,
-	0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f,
-	0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x48, 0x0a, 0x11, 0x63, 0x73,
-	0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x12,
-	0x18, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74,
-	0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43,
-	0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x09, 0x63, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73,
-	0x67, 0x12, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67,
-	0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d,
-	0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x17, 0x0a,
+	0x07, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x67, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x73, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x56, 0x0a,
+	0x15, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43,
+	0x68, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x13, 0x0a, 0x05, 0x63, 0x73, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x73, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70,
+	0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x8a, 0x01, 0x0a, 0x16, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63,
+	0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x61, 0x67, 0x65, 0x12,
+	0x21, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x61,
+	0x67, 0x65, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x6c, 0x69,
+	0x73, 0x74, 0x22, 0x8b, 0x01, 0x0a, 0x14, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69,
+	0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x12, 0x13, 0x0a, 0x05, 0x63,
+	0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x73, 0x49, 0x64,
+	0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x17, 0x0a,
+	0x07, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x67, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69,
+	0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74,
+	0x22, 0x9e, 0x01, 0x0a, 0x15, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74,
+	0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x13, 0x0a, 0x05, 0x63, 0x73,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x73, 0x49, 0x64, 0x12,
+	0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x50, 0x61, 0x67, 0x65, 0x12, 0x21,
+	0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x67,
+	0x65, 0x12, 0x2e, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73,
+	0x74, 0x22, 0x85, 0x01, 0x0a, 0x0c, 0x43, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52,
+	0x65, 0x71, 0x12, 0x13, 0x0a, 0x05, 0x63, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65,
+	0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79,
+	0x65, 0x72, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a,
+	0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x63, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69, 0x63, 0x22, 0x0f, 0x0a, 0x0d, 0x43, 0x73, 0x53,
+	0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x32, 0xbd, 0x04, 0x0a, 0x03, 0x43,
+	0x6d, 0x64, 0x12, 0x48, 0x0a, 0x11, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63,
+	0x68, 0x43, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x43, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+	0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74,
+	0x63, 0x68, 0x43, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x54, 0x0a, 0x15,
+	0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f,
+	0x72, 0x79, 0x4d, 0x73, 0x67, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65,
+	0x72, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67,
+	0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x46,
+	0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x3c, 0x0a, 0x0d, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x53, 0x65, 0x6e, 0x64,
+	0x4d, 0x73, 0x67, 0x12, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x53,
+	0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x4b, 0x0a, 0x12, 0x63, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x50, 0x6c, 0x61, 0x79, 0x65,
+	0x72, 0x51, 0x75, 0x65, 0x75, 0x65, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65,
+	0x74, 0x63, 0x68, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75, 0x65, 0x52, 0x65,
+	0x71, 0x1a, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x50, 0x6c,
+	0x61, 0x79, 0x65, 0x72, 0x51, 0x75, 0x65, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x42, 0x0a,
+	0x0f, 0x63, 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x12, 0x16, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x4b, 0x0a, 0x12, 0x63, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74,
+	0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46,
+	0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x52,
+	0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48,
+	0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x48,
+	0x0a, 0x11, 0x63, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79,
+	0x4d, 0x73, 0x67, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68,
+	0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e,
+	0x70, 0x62, 0x2e, 0x43, 0x73, 0x46, 0x65, 0x74, 0x63, 0x68, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72,
+	0x79, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x09, 0x63, 0x73, 0x53, 0x65,
+	0x6e, 0x64, 0x4d, 0x73, 0x67, 0x12, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x53, 0x65, 0x6e,
+	0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x73, 0x53,
+	0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1270,7 +1166,7 @@ func file_pb_cmd_proto_rawDescGZIP() []byte {
 	return file_pb_cmd_proto_rawDescData
 }
 
-var file_pb_cmd_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_pb_cmd_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
 var file_pb_cmd_proto_goTypes = []interface{}{
 	(*PlayerFetchCsInfoReq)(nil),      // 0: pb.PlayerFetchCsInfoReq
 	(*PlayerFetchCsInfoResp)(nil),     // 1: pb.PlayerFetchCsInfoResp
@@ -1278,45 +1174,41 @@ var file_pb_cmd_proto_goTypes = []interface{}{
 	(*PlayerFetchHistoryMsgResp)(nil), // 3: pb.PlayerFetchHistoryMsgResp
 	(*PlayerSendMsgReq)(nil),          // 4: pb.PlayerSendMsgReq
 	(*PlayerSendMsgResp)(nil),         // 5: pb.PlayerSendMsgResp
-	(*PlayerDisconnectReq)(nil),       // 6: pb.PlayerDisconnectReq
-	(*PlayerDisconnectResp)(nil),      // 7: pb.PlayerDisconnectResp
-	(*CsFetchPlayerQueueReq)(nil),     // 8: pb.CsFetchPlayerQueueReq
-	(*CsFetchPlayerQueueResp)(nil),    // 9: pb.CsFetchPlayerQueueResp
-	(*CsConnectPlayerReq)(nil),        // 10: pb.CsConnectPlayerReq
-	(*CsConnectPlayerResp)(nil),       // 11: pb.CsConnectPlayerResp
-	(*CsFetchHistoryChatReq)(nil),     // 12: pb.CsFetchHistoryChatReq
-	(*CsFetchHistoryChatResp)(nil),    // 13: pb.CsFetchHistoryChatResp
-	(*CsFetchHistoryMsgReq)(nil),      // 14: pb.CsFetchHistoryMsgReq
-	(*CsFetchHistoryMsgResp)(nil),     // 15: pb.CsFetchHistoryMsgResp
-	(*CsSendMsgReq)(nil),              // 16: pb.CsSendMsgReq
-	(*CsSendMsgResp)(nil),             // 17: pb.CsSendMsgResp
-	(*structpb.ListValue)(nil),        // 18: google.protobuf.ListValue
+	(*CsFetchPlayerQueueReq)(nil),     // 6: pb.CsFetchPlayerQueueReq
+	(*CsFetchPlayerQueueResp)(nil),    // 7: pb.CsFetchPlayerQueueResp
+	(*CsConnectPlayerReq)(nil),        // 8: pb.CsConnectPlayerReq
+	(*CsConnectPlayerResp)(nil),       // 9: pb.CsConnectPlayerResp
+	(*CsFetchHistoryChatReq)(nil),     // 10: pb.CsFetchHistoryChatReq
+	(*CsFetchHistoryChatResp)(nil),    // 11: pb.CsFetchHistoryChatResp
+	(*CsFetchHistoryMsgReq)(nil),      // 12: pb.CsFetchHistoryMsgReq
+	(*CsFetchHistoryMsgResp)(nil),     // 13: pb.CsFetchHistoryMsgResp
+	(*CsSendMsgReq)(nil),              // 14: pb.CsSendMsgReq
+	(*CsSendMsgResp)(nil),             // 15: pb.CsSendMsgResp
+	(*structpb.ListValue)(nil),        // 16: google.protobuf.ListValue
 }
 var file_pb_cmd_proto_depIdxs = []int32{
-	18, // 0: pb.PlayerFetchHistoryMsgResp.list:type_name -> google.protobuf.ListValue
-	18, // 1: pb.CsFetchPlayerQueueResp.list:type_name -> google.protobuf.ListValue
-	18, // 2: pb.CsFetchHistoryChatResp.list:type_name -> google.protobuf.ListValue
-	18, // 3: pb.CsFetchHistoryMsgResp.list:type_name -> google.protobuf.ListValue
+	16, // 0: pb.PlayerFetchHistoryMsgResp.list:type_name -> google.protobuf.ListValue
+	16, // 1: pb.CsFetchPlayerQueueResp.list:type_name -> google.protobuf.ListValue
+	16, // 2: pb.CsFetchHistoryChatResp.list:type_name -> google.protobuf.ListValue
+	16, // 3: pb.CsFetchHistoryMsgResp.list:type_name -> google.protobuf.ListValue
 	0,  // 4: pb.Cmd.playerFetchCsInfo:input_type -> pb.PlayerFetchCsInfoReq
 	2,  // 5: pb.Cmd.playerFetchHistoryMsg:input_type -> pb.PlayerFetchHistoryMsgReq
 	4,  // 6: pb.Cmd.playerSendMsg:input_type -> pb.PlayerSendMsgReq
-	6,  // 7: pb.Cmd.playerDisconnect:input_type -> pb.PlayerDisconnectReq
-	8,  // 8: pb.Cmd.csFetchPlayerQueue:input_type -> pb.CsFetchPlayerQueueReq
-	10, // 9: pb.Cmd.csConnectPlayer:input_type -> pb.CsConnectPlayerReq
-	12, // 10: pb.Cmd.csFetchHistoryChat:input_type -> pb.CsFetchHistoryChatReq
-	14, // 11: pb.Cmd.csFetchHistoryMsg:input_type -> pb.CsFetchHistoryMsgReq
-	16, // 12: pb.Cmd.csSendMsg:input_type -> pb.CsSendMsgReq
-	1,  // 13: pb.Cmd.playerFetchCsInfo:output_type -> pb.PlayerFetchCsInfoResp
-	3,  // 14: pb.Cmd.playerFetchHistoryMsg:output_type -> pb.PlayerFetchHistoryMsgResp
-	5,  // 15: pb.Cmd.playerSendMsg:output_type -> pb.PlayerSendMsgResp
-	7,  // 16: pb.Cmd.playerDisconnect:output_type -> pb.PlayerDisconnectResp
-	9,  // 17: pb.Cmd.csFetchPlayerQueue:output_type -> pb.CsFetchPlayerQueueResp
-	11, // 18: pb.Cmd.csConnectPlayer:output_type -> pb.CsConnectPlayerResp
-	13, // 19: pb.Cmd.csFetchHistoryChat:output_type -> pb.CsFetchHistoryChatResp
-	15, // 20: pb.Cmd.csFetchHistoryMsg:output_type -> pb.CsFetchHistoryMsgResp
-	17, // 21: pb.Cmd.csSendMsg:output_type -> pb.CsSendMsgResp
-	13, // [13:22] is the sub-list for method output_type
-	4,  // [4:13] is the sub-list for method input_type
+	6,  // 7: pb.Cmd.csFetchPlayerQueue:input_type -> pb.CsFetchPlayerQueueReq
+	8,  // 8: pb.Cmd.csConnectPlayer:input_type -> pb.CsConnectPlayerReq
+	10, // 9: pb.Cmd.csFetchHistoryChat:input_type -> pb.CsFetchHistoryChatReq
+	12, // 10: pb.Cmd.csFetchHistoryMsg:input_type -> pb.CsFetchHistoryMsgReq
+	14, // 11: pb.Cmd.csSendMsg:input_type -> pb.CsSendMsgReq
+	1,  // 12: pb.Cmd.playerFetchCsInfo:output_type -> pb.PlayerFetchCsInfoResp
+	3,  // 13: pb.Cmd.playerFetchHistoryMsg:output_type -> pb.PlayerFetchHistoryMsgResp
+	5,  // 14: pb.Cmd.playerSendMsg:output_type -> pb.PlayerSendMsgResp
+	7,  // 15: pb.Cmd.csFetchPlayerQueue:output_type -> pb.CsFetchPlayerQueueResp
+	9,  // 16: pb.Cmd.csConnectPlayer:output_type -> pb.CsConnectPlayerResp
+	11, // 17: pb.Cmd.csFetchHistoryChat:output_type -> pb.CsFetchHistoryChatResp
+	13, // 18: pb.Cmd.csFetchHistoryMsg:output_type -> pb.CsFetchHistoryMsgResp
+	15, // 19: pb.Cmd.csSendMsg:output_type -> pb.CsSendMsgResp
+	12, // [12:20] is the sub-list for method output_type
+	4,  // [4:12] is the sub-list for method input_type
 	4,  // [4:4] is the sub-list for extension type_name
 	4,  // [4:4] is the sub-list for extension extendee
 	0,  // [0:4] is the sub-list for field type_name
@@ -1401,30 +1293,6 @@ func file_pb_cmd_proto_init() {
 			}
 		}
 		file_pb_cmd_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlayerDisconnectReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_cmd_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlayerDisconnectResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pb_cmd_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsFetchPlayerQueueReq); i {
 			case 0:
 				return &v.state
@@ -1436,7 +1304,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsFetchPlayerQueueResp); i {
 			case 0:
 				return &v.state
@@ -1448,7 +1316,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsConnectPlayerReq); i {
 			case 0:
 				return &v.state
@@ -1460,7 +1328,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsConnectPlayerResp); i {
 			case 0:
 				return &v.state
@@ -1472,7 +1340,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsFetchHistoryChatReq); i {
 			case 0:
 				return &v.state
@@ -1484,7 +1352,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsFetchHistoryChatResp); i {
 			case 0:
 				return &v.state
@@ -1496,7 +1364,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsFetchHistoryMsgReq); i {
 			case 0:
 				return &v.state
@@ -1508,7 +1376,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsFetchHistoryMsgResp); i {
 			case 0:
 				return &v.state
@@ -1520,7 +1388,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsSendMsgReq); i {
 			case 0:
 				return &v.state
@@ -1532,7 +1400,7 @@ func file_pb_cmd_proto_init() {
 				return nil
 			}
 		}
-		file_pb_cmd_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_pb_cmd_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CsSendMsgResp); i {
 			case 0:
 				return &v.state
@@ -1551,7 +1419,7 @@ func file_pb_cmd_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_pb_cmd_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   18,
+			NumMessages:   16,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 0 - 8
core/cmd/rpc/pb/cmd.proto

@@ -45,13 +45,6 @@ message PlayerSendMsgReq{
 
 message PlayerSendMsgResp{}
 
-message PlayerDisconnectReq{
-  string player_id = 1;
-  string game_id = 2;
-}
-
-message PlayerDisconnectResp{}
-
 /**
 Cs Command Request Bean
  */
@@ -113,7 +106,6 @@ service Cmd {
   rpc playerFetchCsInfo (PlayerFetchCsInfoReq) returns (PlayerFetchCsInfoResp);
   rpc playerFetchHistoryMsg (PlayerFetchHistoryMsgReq) returns (PlayerFetchHistoryMsgResp);
   rpc playerSendMsg (PlayerSendMsgReq) returns (PlayerSendMsgResp);
-  rpc playerDisconnect (PlayerDisconnectReq) returns (PlayerDisconnectResp);
 
   rpc csFetchPlayerQueue (CsFetchPlayerQueueReq) returns (CsFetchPlayerQueueResp);
   rpc csConnectPlayer (CsConnectPlayerReq) returns (CsConnectPlayerResp);

+ 0 - 36
core/cmd/rpc/pb/cmd_grpc.pb.go

@@ -25,7 +25,6 @@ type CmdClient interface {
 	PlayerFetchCsInfo(ctx context.Context, in *PlayerFetchCsInfoReq, opts ...grpc.CallOption) (*PlayerFetchCsInfoResp, error)
 	PlayerFetchHistoryMsg(ctx context.Context, in *PlayerFetchHistoryMsgReq, opts ...grpc.CallOption) (*PlayerFetchHistoryMsgResp, error)
 	PlayerSendMsg(ctx context.Context, in *PlayerSendMsgReq, opts ...grpc.CallOption) (*PlayerSendMsgResp, error)
-	PlayerDisconnect(ctx context.Context, in *PlayerDisconnectReq, opts ...grpc.CallOption) (*PlayerDisconnectResp, error)
 	CsFetchPlayerQueue(ctx context.Context, in *CsFetchPlayerQueueReq, opts ...grpc.CallOption) (*CsFetchPlayerQueueResp, error)
 	CsConnectPlayer(ctx context.Context, in *CsConnectPlayerReq, opts ...grpc.CallOption) (*CsConnectPlayerResp, error)
 	CsFetchHistoryChat(ctx context.Context, in *CsFetchHistoryChatReq, opts ...grpc.CallOption) (*CsFetchHistoryChatResp, error)
@@ -68,15 +67,6 @@ func (c *cmdClient) PlayerSendMsg(ctx context.Context, in *PlayerSendMsgReq, opt
 	return out, nil
 }
 
-func (c *cmdClient) PlayerDisconnect(ctx context.Context, in *PlayerDisconnectReq, opts ...grpc.CallOption) (*PlayerDisconnectResp, error) {
-	out := new(PlayerDisconnectResp)
-	err := c.cc.Invoke(ctx, "/pb.Cmd/playerDisconnect", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *cmdClient) CsFetchPlayerQueue(ctx context.Context, in *CsFetchPlayerQueueReq, opts ...grpc.CallOption) (*CsFetchPlayerQueueResp, error) {
 	out := new(CsFetchPlayerQueueResp)
 	err := c.cc.Invoke(ctx, "/pb.Cmd/csFetchPlayerQueue", in, out, opts...)
@@ -129,7 +119,6 @@ type CmdServer interface {
 	PlayerFetchCsInfo(context.Context, *PlayerFetchCsInfoReq) (*PlayerFetchCsInfoResp, error)
 	PlayerFetchHistoryMsg(context.Context, *PlayerFetchHistoryMsgReq) (*PlayerFetchHistoryMsgResp, error)
 	PlayerSendMsg(context.Context, *PlayerSendMsgReq) (*PlayerSendMsgResp, error)
-	PlayerDisconnect(context.Context, *PlayerDisconnectReq) (*PlayerDisconnectResp, error)
 	CsFetchPlayerQueue(context.Context, *CsFetchPlayerQueueReq) (*CsFetchPlayerQueueResp, error)
 	CsConnectPlayer(context.Context, *CsConnectPlayerReq) (*CsConnectPlayerResp, error)
 	CsFetchHistoryChat(context.Context, *CsFetchHistoryChatReq) (*CsFetchHistoryChatResp, error)
@@ -151,9 +140,6 @@ func (UnimplementedCmdServer) PlayerFetchHistoryMsg(context.Context, *PlayerFetc
 func (UnimplementedCmdServer) PlayerSendMsg(context.Context, *PlayerSendMsgReq) (*PlayerSendMsgResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PlayerSendMsg not implemented")
 }
-func (UnimplementedCmdServer) PlayerDisconnect(context.Context, *PlayerDisconnectReq) (*PlayerDisconnectResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method PlayerDisconnect not implemented")
-}
 func (UnimplementedCmdServer) CsFetchPlayerQueue(context.Context, *CsFetchPlayerQueueReq) (*CsFetchPlayerQueueResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CsFetchPlayerQueue not implemented")
 }
@@ -236,24 +222,6 @@ func _Cmd_PlayerSendMsg_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Cmd_PlayerDisconnect_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PlayerDisconnectReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(CmdServer).PlayerDisconnect(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pb.Cmd/playerDisconnect",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(CmdServer).PlayerDisconnect(ctx, req.(*PlayerDisconnectReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Cmd_CsFetchPlayerQueue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CsFetchPlayerQueueReq)
 	if err := dec(in); err != nil {
@@ -363,10 +331,6 @@ var Cmd_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "playerSendMsg",
 			Handler:    _Cmd_PlayerSendMsg_Handler,
 		},
-		{
-			MethodName: "playerDisconnect",
-			Handler:    _Cmd_PlayerDisconnect_Handler,
-		},
 		{
 			MethodName: "csFetchPlayerQueue",
 			Handler:    _Cmd_CsFetchPlayerQueue_Handler,

+ 5 - 5
core/inner/rpc/etc/inner.yaml

@@ -1,9 +1,9 @@
-Name: inner.api
-ListenOn: 127.0.0.1:10500
+Name: inner.rpc
+ListenOn: 0.0.0.0:10500
 
 Telemetry:
-  Name: cmd-api
-  Endpoint: http://127.0.0.1:9092/api/traces
+  Name: inner-rpc
+  Endpoint: http://127.0.0.1:14268/api/traces
   Sampler: 1.0
   Batcher: jaeger
 
@@ -11,7 +11,7 @@ KqMsgBoxConsumerConf:
   Brokers:
     - 127.0.0.1:9092
   Topic: send-box-topic
-  GroupId: inner-api
+  GroupId: inner-rpc
 
 KqMsgBoxProducerConf:
   Brokers:

+ 5 - 4
core/inner/rpc/internal/ext/global.go

@@ -10,8 +10,9 @@ import (
 )
 
 var (
-	Game2PlayerMap     *treemap.Map
-	CsMap              *treemap.Map
-	Game2PlayerStatMap *treemap.Map
-	WaitingQueue       *simplelist.List
+	GameVipMap           *treemap.Map
+	CsInfoMap            *treemap.Map
+	Game2PlayerStatusMap *treemap.Map
+	GameConnMap          *treemap.Map
+	WaitingQueue         *simplelist.List
 )

+ 10 - 1
core/inner/rpc/internal/logic/csconnectplayerlogic.go

@@ -2,6 +2,8 @@ package logic
 
 import (
 	"context"
+	treemap "github.com/liyue201/gostl/ds/map"
+	"ylink/core/inner/rpc/internal/ext"
 	"ylink/core/inner/rpc/internal/svc"
 	"ylink/core/inner/rpc/pb"
 
@@ -23,7 +25,14 @@ func NewCsConnectPlayerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C
 }
 
 func (l *CsConnectPlayerLogic) CsConnectPlayer(in *pb.InnerCsConnectPlayerReq) (*pb.InnerCsConnectPlayerResp, error) {
-	// todo: 建立玩家-客服的映射关系
+	if ext.GameConnMap.Contains(in.GameId) {
+		playerConnMap := ext.GameConnMap.Get(in.GameId).(*treemap.Map)
+		playerConnMap.Insert(in.PlayerId, in.CsId)
+	} else {
+		playerConnMap := treemap.New(treemap.WithGoroutineSafe())
+		playerConnMap.Insert(in.PlayerId, in.CsId)
+		ext.GameConnMap.Insert(in.GameId, playerConnMap)
+	}
 
 	return &pb.InnerCsConnectPlayerResp{}, nil
 }

+ 3 - 5
core/inner/rpc/internal/logic/notifyuserofflinelogic.go

@@ -33,9 +33,9 @@ func (l *NotifyUserOfflineLogic) NotifyUserOffline(in *pb.NotifyUserStatusReq) (
 	switch in.Type {
 	case globalkey.CONNECT_TYPE_PLAYER:
 		// 修改玩家在线状态
-		if ext.Game2PlayerStatMap.Contains(in.GameId) {
+		if ext.Game2PlayerStatusMap.Contains(in.GameId) {
 			// 有则取出玩家的set
-			playerStatSet := ext.Game2PlayerStatMap.Get(in.GameId).(*set.Set)
+			playerStatSet := ext.Game2PlayerStatusMap.Get(in.GameId).(*set.Set)
 			if playerStatSet.Contains(in.Uid) {
 				// 有则清除,代表下线
 				playerStatSet.Erase(in.Uid)
@@ -50,11 +50,9 @@ func (l *NotifyUserOfflineLogic) NotifyUserOffline(in *pb.NotifyUserStatusReq) (
 				break
 			}
 		}
-		l.Logger.Infof("waiting queue size: %d", ext.WaitingQueue.Len())
-		l.Logger.Infof("waiting queue: %s", ext.WaitingQueue.String())
 	case globalkey.CONNECT_TYPE_CS:
 		// 修改客服在线状态
-		csInfo := ext.CsMap.Get(in.Uid).(*model.CsInfo)
+		csInfo := ext.CsInfoMap.Get(in.Uid).(*model.CsInfo)
 		csInfo.OnlineStatus = 0
 	default:
 		return nil, errors.Wrap(result.NewErrMsg("no such user type"), "")

+ 6 - 6
core/inner/rpc/internal/logic/notifyuseronlinelogic.go

@@ -35,21 +35,21 @@ func (l *NotifyUserOnlineLogic) NotifyUserOnline(in *pb.NotifyUserStatusReq) (*p
 	switch in.Type {
 	case globalkey.CONNECT_TYPE_PLAYER:
 		// 修改玩家在线状态
-		if ext.Game2PlayerStatMap.Contains(in.GameId) {
+		if ext.Game2PlayerStatusMap.Contains(in.GameId) {
 			// 有则取出玩家的set
-			playerStatSet := ext.Game2PlayerStatMap.Get(in.GameId).(*set.Set)
+			playerStatSet := ext.Game2PlayerStatusMap.Get(in.GameId).(*set.Set)
 			if !playerStatSet.Contains(in.Uid) {
 				playerStatSet.Insert(in.Uid)
 			}
 		} else {
 			playerStatSet := set.New()
 			playerStatSet.Insert(in.Uid)
-			ext.Game2PlayerStatMap.Insert(in.GameId, playerStatSet)
+			ext.Game2PlayerStatusMap.Insert(in.GameId, playerStatSet)
 		}
 
 		// 判断是否有专属客服,没有则放入等待队列
-		if ext.Game2PlayerMap.Contains(in.GameId) {
-			p2cMap := ext.Game2PlayerMap.Get(in.GameId).(*treemap.Map)
+		if ext.GameVipMap.Contains(in.GameId) {
+			p2cMap := ext.GameVipMap.Get(in.GameId).(*treemap.Map)
 			if !p2cMap.Contains(in.Uid) {
 				ext.WaitingQueue.PushBack(&model.PlayerWaitingInfo{
 					PlayerId:    in.Uid,
@@ -67,7 +67,7 @@ func (l *NotifyUserOnlineLogic) NotifyUserOnline(in *pb.NotifyUserStatusReq) (*p
 		l.Logger.Infof("enqueue waiting list: %s", ext.WaitingQueue.String())
 	case globalkey.CONNECT_TYPE_CS:
 		// 修改客服在线状态
-		csInfo := ext.CsMap.Get(in.Uid).(*model.CsInfo)
+		csInfo := ext.CsInfoMap.Get(in.Uid).(*model.CsInfo)
 		csInfo.OnlineStatus = 1
 	default:
 		return nil, errors.Wrap(result.NewErrMsg("no such user type"), "")

+ 20 - 9
core/inner/rpc/internal/logic/playerfetchcsinfologic.go

@@ -2,6 +2,11 @@ package logic
 
 import (
 	"context"
+	treemap "github.com/liyue201/gostl/ds/map"
+	"github.com/pkg/errors"
+	"ylink/comm/model"
+	"ylink/comm/result"
+	"ylink/core/inner/rpc/internal/ext"
 	"ylink/core/inner/rpc/internal/svc"
 	"ylink/core/inner/rpc/pb"
 
@@ -23,13 +28,19 @@ func NewPlayerFetchCsInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }
 
 func (l *PlayerFetchCsInfoLogic) PlayerFetchCsInfo(in *pb.InnerPlayerFetchCsInfoReq) (*pb.InnerPlayerFetchCsInfoResp, error) {
-	// todo: 修改玩家在线状态
-
-	return &pb.InnerPlayerFetchCsInfoResp{
-		CsId:         in.CsId,
-		CsNickname:   "vip客服1231",
-		CsAvatarUrl:  "https://www.baiduc.om",
-		CsSignature:  "服务时间:9:30-20:30",
-		OnlineStatus: 1,
-	}, nil
+	if ext.GameConnMap.Contains(in.GameId) {
+		playerConnMap := ext.GameConnMap.Get(in.GameId).(*treemap.Map)
+		csId := playerConnMap.Get(in.PlayerId).(string)
+		if ext.CsInfoMap.Contains(csId) {
+			csInfo := ext.CsInfoMap.Get(csId).(model.CsInfo)
+			return &pb.InnerPlayerFetchCsInfoResp{
+				CsId:         csInfo.CsId,
+				CsNickname:   csInfo.CsNickname,
+				CsAvatarUrl:  csInfo.CsAvatarUrl,
+				CsSignature:  csInfo.CsSignature,
+				OnlineStatus: csInfo.OnlineStatus,
+			}, nil
+		}
+	}
+	return nil, errors.Wrap(result.NewErrMsg("Customer service information does not exist"), "")
 }

+ 14 - 13
core/inner/rpc/internal/svc/servicecontext.go

@@ -72,7 +72,7 @@ func (s *ServiceContext) handleMessage(sess sarama.ConsumerGroupSession, msg *sa
 		trace.StartTrace(ctx, "InnerServer.handleMessage.SendMessage", func(ctx context.Context) {
 			if len(message.ReceiverId) == 0 || message.ReceiverId == "" {
 				// 玩家发的消息
-				p2cMap := ext.Game2PlayerMap.Get(message.GameId).(*treemap.Map)
+				p2cMap := ext.GameVipMap.Get(message.GameId).(*treemap.Map)
 				message.ReceiverId = p2cMap.Get(message.SenderId).(string)
 				logx.WithContext(ctx).Infof("receiver: %s", message.ReceiverId)
 				kMsg, _ := json.Marshal(message)
@@ -91,7 +91,8 @@ func (s *ServiceContext) subscribe() {
 
 func fetchCsCenterInfo() {
 	// mock info
-	ext.Game2PlayerStatMap = treemap.New(treemap.WithGoroutineSafe())
+	ext.Game2PlayerStatusMap = treemap.New(treemap.WithGoroutineSafe())
+	ext.GameConnMap = treemap.New(treemap.WithGoroutineSafe())
 	ext.WaitingQueue = simplelist.New()
 	mockInfo()
 }
@@ -101,22 +102,22 @@ func loadGameList() {
 }
 
 func loadCsInfo() {
-	ext.CsMap = treemap.New(treemap.WithGoroutineSafe())
-	ext.CsMap.Insert("cs_1231", &model.CsInfo{
+	ext.CsInfoMap = treemap.New(treemap.WithGoroutineSafe())
+	ext.CsInfoMap.Insert("cs_1231", &model.CsInfo{
 		CsId:         "cs_1231",
 		CsNickname:   "客服1231",
 		CsAvatarUrl:  "https://www.baidu.com",
 		CsSignature:  "我是客服1231",
 		OnlineStatus: 0,
 	})
-	ext.CsMap.Insert("cs_1111", &model.CsInfo{
+	ext.CsInfoMap.Insert("cs_1111", &model.CsInfo{
 		CsId:         "cs_1111",
 		CsNickname:   "客服1111",
 		CsAvatarUrl:  "https://www.baidu.com",
 		CsSignature:  "我是客服1111",
 		OnlineStatus: 0,
 	})
-	ext.CsMap.Insert("cs_2222", &model.CsInfo{
+	ext.CsInfoMap.Insert("cs_2222", &model.CsInfo{
 		CsId:         "cs_2222",
 		CsNickname:   "客服2222",
 		CsAvatarUrl:  "https://www.baidu.com",
@@ -126,8 +127,8 @@ func loadCsInfo() {
 }
 
 func mockInfo() {
-	ext.Game2PlayerMap = treemap.New(treemap.WithGoroutineSafe())
-	ext.CsMap = treemap.New(treemap.WithGoroutineSafe())
+	ext.GameVipMap = treemap.New(treemap.WithGoroutineSafe())
+	ext.CsInfoMap = treemap.New(treemap.WithGoroutineSafe())
 
 	// 已连接的映射
 
@@ -139,24 +140,24 @@ func mockInfo() {
 	game1111P2cMap := treemap.New(treemap.WithGoroutineSafe())
 	game1111P2cMap.Insert("player1231", "cs_1111")
 
-	ext.Game2PlayerMap.Insert("game1231", game1231P2cMap)
-	ext.Game2PlayerMap.Insert("game1111", game1111P2cMap)
+	ext.GameVipMap.Insert("game1231", game1231P2cMap)
+	ext.GameVipMap.Insert("game1111", game1111P2cMap)
 
-	ext.CsMap.Insert("cs_1231", &model.CsInfo{
+	ext.CsInfoMap.Insert("cs_1231", &model.CsInfo{
 		CsId:         "cs_1231",
 		CsNickname:   "客服1231",
 		CsAvatarUrl:  "https://www.baidu.com",
 		CsSignature:  "我是客服1231",
 		OnlineStatus: 0,
 	})
-	ext.CsMap.Insert("cs_1111", &model.CsInfo{
+	ext.CsInfoMap.Insert("cs_1111", &model.CsInfo{
 		CsId:         "cs_1111",
 		CsNickname:   "客服1111",
 		CsAvatarUrl:  "https://www.baidu.com",
 		CsSignature:  "我是客服1111",
 		OnlineStatus: 0,
 	})
-	ext.CsMap.Insert("cs_2222", &model.CsInfo{
+	ext.CsInfoMap.Insert("cs_2222", &model.CsInfo{
 		CsId:         "cs_2222",
 		CsNickname:   "客服2222",
 		CsAvatarUrl:  "https://www.baidu.com",

+ 1 - 1
flowsrv/rpc/etc/flowsrv.yaml

@@ -3,7 +3,7 @@ ListenOn: 0.0.0.0:10200
 
 Telemetry:
   Name: flowsrv-api
-  Endpoint: http://127.0.0.1:9092/api/traces
+  Endpoint: http://127.0.0.1:14268/api/traces
   Sampler: 1.0
   Batcher: jaeger
 

+ 8 - 6
go.mod

@@ -3,14 +3,14 @@ module ylink
 go 1.18
 
 require (
-	github.com/Shopify/sarama v1.32.0
+	github.com/Shopify/sarama v1.33.0
 	github.com/golang-jwt/jwt/v4 v4.4.1
 	github.com/liyue201/gostl v1.0.1
 	github.com/pkg/errors v0.9.1
 	github.com/zeromicro/go-zero v1.3.3
-	go.opentelemetry.io/otel v1.3.0
-	go.opentelemetry.io/otel/trace v1.3.0
-	google.golang.org/grpc v1.46.0
+	go.opentelemetry.io/otel v1.7.0
+	go.opentelemetry.io/otel/trace v1.7.0
+	google.golang.org/grpc v1.46.2
 	google.golang.org/protobuf v1.28.0
 )
 
@@ -24,7 +24,7 @@ require (
 	github.com/eapache/go-resiliency v1.2.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/go-logr/logr v1.2.2 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-redis/redis/v8 v8.11.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
@@ -35,6 +35,8 @@ require (
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/gnostic v0.4.1 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
@@ -44,7 +46,7 @@ require (
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/justinas/alice v1.2.0 // indirect
-	github.com/klauspost/compress v1.14.4 // indirect
+	github.com/klauspost/compress v1.15.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect

+ 21 - 11
go.sum

@@ -48,8 +48,8 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs=
-github.com/Shopify/sarama v1.32.0 h1:P+RUjEaRU0GMMbYexGMDyrMkLhbbBVUVISDywi+IlFU=
-github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs=
+github.com/Shopify/sarama v1.33.0 h1:2K4mB9M4fo46sAM7t6QTsmSO8dLX1OqznLM7vn3OjZ8=
+github.com/Shopify/sarama v1.33.0/go.mod h1:lYO7LwEBkE0iAeTl94UfPSrDaavFzSFlmn+5isARATQ=
 github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0=
 github.com/Shopify/toxiproxy/v2 v2.3.0 h1:62YkpiP4bzdhKMH+6uC5E95y608k3zDwdzuBMsnn3uQ=
 github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c=
@@ -145,8 +145,9 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
@@ -249,6 +250,10 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
+github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -285,8 +290,8 @@ github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNE
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4=
-github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
+github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -408,14 +413,16 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -438,16 +445,18 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
+go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
+go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
 go.opentelemetry.io/otel/exporters/jaeger v1.3.0 h1:HfydzioALdtcB26H5WHc4K47iTETJCdloL7VN579/L0=
 go.opentelemetry.io/otel/exporters/jaeger v1.3.0/go.mod h1:KoYHi1BtkUPncGSRtCe/eh1ijsnePhSkxwzz07vU0Fc=
 go.opentelemetry.io/otel/exporters/zipkin v1.3.0 h1:uOD28dZ7yIKITTcUS6MeAGNHYy3uhP7DTkhcJM6onlQ=
 go.opentelemetry.io/otel/exporters/zipkin v1.3.0/go.mod h1:LxGGfHIYbvsFnrJtBcazb0yG24xHdDGrT/H6RB9r3+8=
 go.opentelemetry.io/otel/sdk v1.3.0 h1:3278edCoH89MEJ0Ky8WQXVmDQv3FX4ZJ3Pp+9fJreAI=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
-go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY=
 go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
+go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o=
+go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
@@ -547,7 +556,7 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 h1:yssD99+7tqHWO5Gwh81phT+67hg+KttniBr6UnEXOY8=
 golang.org/x/net v0.0.0-20220421235706-1d1ef9303861/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -770,8 +779,9 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=