diff --git a/comm/usersession.go b/comm/usersession.go index 6d6b7955c..f0b7807c1 100644 --- a/comm/usersession.go +++ b/comm/usersession.go @@ -33,7 +33,7 @@ type UserSession struct { msgqueue []*pb.UserMessage } -//重置 +// 重置 func (this *UserSession) SetSession(ip, sessionId, stag, sid, uid string) { this.IP = ip this.SessionId = sessionId @@ -43,7 +43,7 @@ func (this *UserSession) SetSession(ip, sessionId, stag, sid, uid string) { this.msgqueue = this.msgqueue[:0] } -//重置 +// 重置 func (this *UserSession) Reset() { this.IP = "" this.SessionId = "" @@ -52,39 +52,39 @@ func (this *UserSession) Reset() { this.msgqueue = this.msgqueue[:0] } -//获取用户的会话id +// 获取用户的会话id func (this *UserSession) GetSessionId() string { return this.SessionId } -//获取用户的uid +// 获取用户的uid func (this *UserSession) GetUserId() string { return this.UserId } -//获取用户的远程ip地址 +// 获取用户的远程ip地址 func (this *UserSession) GetIP() string { return this.IP } -//会话所在集群 +// 会话所在集群 func (this *UserSession) GetServiecTag() string { return this.ServiceTag } -//用户当先所在网关服务 +// 用户当先所在网关服务 func (this *UserSession) GetGatewayServiceId() string { return this.GatewayServiceId } -//是否登录 +// 是否登录 func (this *UserSession) IsLogin() bool { return this.UserId != "" } -///绑定uid 登录后操作 -///uid 用户id -///wokerId 用户绑定worker服务id +// /绑定uid 登录后操作 +// /uid 用户id +// /wokerId 用户绑定worker服务id func (this *UserSession) Bind(uid string, wokerId string) (err error) { reply := &pb.RPCMessageReply{} if err = this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentBind), &pb.AgentBuildReq{ @@ -99,7 +99,7 @@ func (this *UserSession) Bind(uid string, wokerId string) (err error) { return } -//解绑uid 注销和切换账号是处理 +// 解绑uid 注销和切换账号是处理 func (this *UserSession) UnBind() (err error) { reply := &pb.RPCMessageReply{} if err = this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentUnBind), &pb.AgentUnBuildReq{ @@ -112,7 +112,7 @@ func (this *UserSession) UnBind() (err error) { return } -//向用户发送消息 +// 向用户发送消息 func (this *UserSession) SendMsg(mainType, subType string, msg proto.Message) (err error) { // log.Debugf("SendMsg to UserId:[%s] Data: %v", this.UserId, msg) data, _ := anypb.New(msg) @@ -124,7 +124,7 @@ func (this *UserSession) SendMsg(mainType, subType string, msg proto.Message) (e return } -//关闭用户连接对象 +// 关闭用户连接对象 func (this *UserSession) Close() (err error) { reply := &pb.RPCMessageReply{} if err := this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentSendMsg), &pb.AgentCloseeReq{ @@ -135,17 +135,17 @@ func (this *UserSession) Close() (err error) { return } -//清空消息队列 +// 清空消息队列 func (this *UserSession) Polls() []*pb.UserMessage { msgs := this.msgqueue this.msgqueue = this.msgqueue[:0] return msgs } -//推送消息到用户 +// 推送消息到用户 func (this *UserSession) Push() (err error) { // reply := &pb.RPCMessageReply{} - if len(this.msgqueue) > 0 { + if this.ServiceTag != "" && this.SessionId != "" && len(this.msgqueue) > 0 { if _, err = this.service.AcrossClusterRpcGo(context.Background(), this.ServiceTag, fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentSendMsg), &pb.AgentSendMessageReq{ UserSessionId: this.SessionId, Reply: this.msgqueue, @@ -157,7 +157,7 @@ func (this *UserSession) Push() (err error) { return } -//打印日志需要 +// 打印日志需要 func (this *UserSession) ToString() string { return fmt.Sprintf("SessionId:%s UserId:%s GatewayServiceId:%s", this.SessionId, this.UserId, this.GatewayServiceId) }