liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
wh_zcy 2023-03-08 18:55:40 +08:00
commit 8dd45984bb
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/gateway/agent.go
View File

@ -97,25 +97,25 @@ locp:
if err == nil { if err == nil {
// this.gateway.Debugf("----------2 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) // this.gateway.Debugf("----------2 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType)
key := msg.MainType + msg.SubType // 加锁 // key := msg.MainType + msg.SubType // 加锁
if v, ok := this.protoMsg[key]; ok { // if v, ok := this.protoMsg[key]; ok {
if v != 0 && configure.Now().UnixMilli() -v < 1 { // if v != 0 && configure.Now().Unix()-v < 2 {
// 返回错误码 // // 返回错误码
this.protoMsg[key] = configure.Now().Unix() // this.protoMsg[key] = configure.Now().Unix()
data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ // data, _ := anypb.New(&pb.NotifyErrorNotifyPush{
ReqMainType: msg.MainType, // ReqMainType: msg.MainType,
ReqSubType: msg.SubType, // ReqSubType: msg.SubType,
Arg: msg.Data, // Arg: msg.Data,
Code: pb.ErrorCode_InsufficientPermissions}) // Code: pb.ErrorCode_InsufficientPermissions})
err = this.WriteMsg(&pb.UserMessage{ // err = this.WriteMsg(&pb.UserMessage{
MainType: comm.MainTypeNotify, // MainType: comm.MainTypeNotify,
SubType: comm.SubTypeErrorNotify, // SubType: comm.SubTypeErrorNotify,
Data: data, // Data: data,
}) // })
continue // continue
} // }
} // }
this.protoMsg[key] = configure.Now().UnixMilli() // this.protoMsg[key] = configure.Now().Unix()
if err := this.messageDistribution(msg); err != nil { if err := this.messageDistribution(msg); err != nil {
this.gateway.Errorf("messageDistribution err:%v", err) this.gateway.Errorf("messageDistribution err:%v", err)
@ -366,10 +366,10 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) {
log.Field{Key: "req", Value: fmt.Sprintf("%s:%s %v", req.MainType, req.SubType, req.Message.String())}, log.Field{Key: "req", Value: fmt.Sprintf("%s:%s %v", req.MainType, req.SubType, req.Message.String())},
log.Field{Key: "reply", Value: reply.String()}, log.Field{Key: "reply", Value: reply.String()},
) )
key := msg.MainType + msg.SubType // key := msg.MainType + msg.SubType
if v, ok := this.protoMsg[key]; ok && v != 0 { // 发送消息 协议解锁 // if v, ok := this.protoMsg[key]; ok && v != 0 { // 发送消息 协议解锁
v = 0 // v = 0
} // }
if reply.Code != pb.ErrorCode_Success { if reply.Code != pb.ErrorCode_Success {
data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ data, _ := anypb.New(&pb.NotifyErrorNotifyPush{
ReqMainType: msg.MainType, ReqMainType: msg.MainType,