From 86fe4f9bedde324c7e94c06f3481a04615bd71ee Mon Sep 17 00:00:00 2001 From: liwei Date: Thu, 21 Jul 2022 14:44:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E5=99=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/equipment/api_equip.go | 1 + modules/friend/api_apply.go | 5 +++-- modules/hero/api_chouka.go | 2 -- modules/hero/api_info.go | 3 +-- modules/hero/api_list.go | 3 +-- modules/task/api_activelist.go | 3 +-- modules/task/api_activereceive.go | 3 +-- modules/task/api_list.go | 3 +-- modules/task/api_receive.go | 3 +-- utils/trace.go | 6 +++--- 10 files changed, 13 insertions(+), 19 deletions(-) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index d77745832..ca8ada75f 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -96,6 +96,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) } else { subsit = false //辅套装没有 } + hero.EquipID[i] = "" } } diff --git a/modules/friend/api_apply.go b/modules/friend/api_apply.go index 87e28a8d2..d611ea676 100644 --- a/modules/friend/api_apply.go +++ b/modules/friend/api_apply.go @@ -18,7 +18,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe //好友申请 func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data proto.Message) { - if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { + if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { return } @@ -30,7 +30,8 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (c ) defer func() { - utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, Resp) + + // utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, Resp) }() defer func() { diff --git a/modules/hero/api_chouka.go b/modules/hero/api_chouka.go index a310f149b..b96cd75a7 100644 --- a/modules/hero/api_chouka.go +++ b/modules/hero/api_chouka.go @@ -3,7 +3,6 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -23,7 +22,6 @@ func (this *apiComp) Chouka(session comm.IUserSession, req *pb.HeroChoukaReq) (c code = pb.ErrorCode_SystemError return } - utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), HeroSubTypeChouka, req, rsp) }() heroCfgIds := req.HeroIds diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go index 05b1af607..2d998e893 100644 --- a/modules/hero/api_info.go +++ b/modules/hero/api_info.go @@ -4,7 +4,6 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -29,7 +28,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code code = pb.ErrorCode_SystemError return } - utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), HeroSubTypeInfo, req, rsp) + // utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), HeroSubTypeInfo, req, rsp) }() hero := this.module.modelHero.getOneHero(session.GetUserId(), req.HeroId) diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go index 57b1f5cf8..6f6c99bcd 100644 --- a/modules/hero/api_list.go +++ b/modules/hero/api_list.go @@ -3,7 +3,6 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -21,7 +20,7 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code if err != nil { code = pb.ErrorCode_SystemError } - utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), HeroSubTypeList, req, rsp) + // utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), HeroSubTypeList, req, rsp) }() rsp.List = this.module.GetHeroList(session.GetUserId()) diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index 417253257..322ef4fb2 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -3,7 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -28,7 +27,7 @@ func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveLis if err != nil { code = pb.ErrorCode_SystemError } - utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeActiveList, req, resp) + // utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeActiveList, req, resp) }() resp.Active = this.moduleTask.modelTask.countActive(session.GetUserId(), comm.TaskTag(req.TaskTag)) diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index c3c1c73d9..2efad197e 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -3,7 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -29,7 +28,7 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive if err != nil { code = pb.ErrorCode_SystemError } - utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, req, resp) + // utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, req, resp) }() ua := this.moduleTask.modelTaskActive.getUserActive(session.GetUserId(), req.Id, comm.TaskTag(req.TaskTag)) diff --git a/modules/task/api_list.go b/modules/task/api_list.go index db81c1859..4d272f908 100644 --- a/modules/task/api_list.go +++ b/modules/task/api_list.go @@ -3,7 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -26,7 +25,7 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.TaskListReq) (code if err != nil { code = pb.ErrorCode_SystemError } - utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeList, req, rsp) + // utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeList, req, rsp) }() rsp.List = this.moduleTask.modelTask.getTaskList(session.GetUserId(), comm.TaskTag(req.TaskTag)) diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index fd4332434..baa0dbd41 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) @@ -28,7 +27,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) if err != nil { code = pb.ErrorCode_SystemError } - utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeReceive, req, resp) + // utils.TraceFunc(session.GetUserId(), string(this.moduleTask.GetType()), TaskSubTypeReceive, req, resp) }() userTask := this.moduleTask.modelTask.getUserTask(session.GetUserId(), comm.TaskTag(req.TaskTag), req.Id) if userTask != nil { diff --git a/utils/trace.go b/utils/trace.go index 16b54858f..a1f5737fb 100644 --- a/utils/trace.go +++ b/utils/trace.go @@ -18,9 +18,9 @@ const ( ) //打印函数处理信息 -func TraceFunc(uid string, module string, funcName string, funcArgs interface{}, rsp interface{}) { - log.Debugf("traceFunc uid:%s module:%s funcName:%s funcArgs:%v", uid, module, funcName, funcArgs) -} +// func TraceFunc(uid string, module string, funcName string, funcArgs interface{}, rsp interface{}) { +// log.Debugf("traceFunc uid:%s module:%s funcName:%s funcArgs:%v", uid, module, funcName, funcArgs) +// } //打印函数处理时间 func TraceTimeCost(funcName string, invocation time.Time) {