好友功能条件开启

This commit is contained in:
meixiongfeng 2023-03-08 16:08:23 +08:00
parent 6a39b36e47
commit 6fe3d364b8
2 changed files with 10 additions and 11 deletions

View File

@ -74,11 +74,11 @@
"main": [ "main": [
{ {
"key": 1, "key": 1,
"param": 1 "param": 30
} }
], ],
"optional": "", "optional": "",
"wkqbx": 0, "wkqbx": 2,
"kqbx": 0, "kqbx": 0,
"img": "zc_icon_01", "img": "zc_icon_01",
"prompt": { "prompt": {
@ -844,7 +844,7 @@
"main": [ "main": [
{ {
"key": 1, "key": 1,
"param": 1 "param": 100
} }
], ],
"optional": "", "optional": "",

View File

@ -97,12 +97,6 @@ locp:
code, err = this.secAuth(msg) code, err = this.secAuth(msg)
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)
if err := this.messageDistribution(msg); err != nil {
this.gateway.Errorf("messageDistribution err:%v", err)
go this.Close()
break locp
}
if this.uId != "" { if this.uId != "" {
key := this.uId + msg.MainType + msg.SubType // 加锁 key := this.uId + msg.MainType + msg.SubType // 加锁
if v, ok := this.protoMsg[key]; ok { if v, ok := this.protoMsg[key]; ok {
@ -111,7 +105,6 @@ locp:
this.hlock.Lock() this.hlock.Lock()
this.protoMsg[key] = configure.Now().Unix() this.protoMsg[key] = configure.Now().Unix()
this.hlock.Unlock() this.hlock.Unlock()
data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ data, _ := anypb.New(&pb.NotifyErrorNotifyPush{
ReqMainType: msg.MainType, ReqMainType: msg.MainType,
ReqSubType: msg.SubType, ReqSubType: msg.SubType,
@ -122,7 +115,7 @@ locp:
SubType: comm.SubTypeErrorNotify, SubType: comm.SubTypeErrorNotify,
Data: data, Data: data,
}) })
return continue
} }
} }
this.hlock.Lock() this.hlock.Lock()
@ -130,6 +123,12 @@ locp:
this.hlock.Unlock() this.hlock.Unlock()
} }
if err := this.messageDistribution(msg); err != nil {
this.gateway.Errorf("messageDistribution err:%v", err)
go this.Close()
break locp
}
} else { } else {
this.gateway.Errorf("agent:%s uId:%s 密钥无效 err:%v", this.sessionId, this.uId, err) this.gateway.Errorf("agent:%s uId:%s 密钥无效 err:%v", this.sessionId, this.uId, err)
data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: code, Message: err.Error()}) data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: code, Message: err.Error()})