From 1fe4cd65a8bad383e543fe5a631cd9710dd29de7 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 6 Jun 2023 10:16:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9ErrorData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/worldtask/api_accept.go | 49 ++++++++++++++++--------- modules/worldtask/api_battlefinish.go | 53 ++++++++++++++++++--------- modules/worldtask/api_battlestart.go | 34 +++++++++++------ 3 files changed, 90 insertions(+), 46 deletions(-) diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index 5098bf4c9..ed251cd29 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -19,50 +19,60 @@ func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAccept } func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) { - if code = a.AcceptCheck(session, req); code != pb.ErrorCode_Success { + if errdata = a.AcceptCheck(session, req); errdata != nil { return } - data = &pb.ErrorData{} + uid := session.GetUserId() user := a.module.ModuleUser.GetUser(uid) if user == nil { - code = pb.ErrorCode_UserSessionNobeing - data.Title = code.ToString() - data.Datastring = uid + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Datastring: uid, + } return } rsp := &pb.WorldtaskAcceptResp{} myWorldtask, err := a.module.modelWorldtask.getWorldtask(uid) if err != nil { - code = pb.ErrorCode_DBError - data.Title = code.ToString() - data.Datastring = uid + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Datastring: uid, + } return } // 当前任务配置 curTaskConf, err := a.module.configure.getWorldtaskById(req.TaskId) if err != nil || curTaskConf == nil { - code = pb.ErrorCode_ConfigNoFound - data.Title = code.ToString() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } // 判断玩家等级要求 if user.Lv < curTaskConf.Lock { - code = pb.ErrorCode_WorldtaskLvNotEnough - data.Title = code.ToString() - data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskLvNotEnough, + Title: pb.ErrorCode_WorldtaskLvNotEnough.ToString(), + Message: fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock), + } return } // 前置任务ID 只有世界任务才校验前置 if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) { - code = pb.ErrorCode_WorldtaskLastUnFinished - data.Title = code.ToString() - data.Message = fmt.Sprintf("%v前置任务%v未完成", curTaskConf.Key, curTaskConf.Ontxe) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskLastUnFinished, + Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(), + Message: fmt.Sprintf("%v前置任务%v未完成", curTaskConf.Key, curTaskConf.Ontxe), + } return } @@ -80,7 +90,10 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) } if err := a.module.modelWorldtask.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + } return } diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index e82df1979..4338cbba9 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -25,23 +25,29 @@ func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.Worldt } func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) { - if code = this.BattlefinishCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.BattlefinishCheck(session, req); errdata != nil { return } - data = &pb.ErrorData{} + uid := session.GetUserId() taskConf, err := this.module.configure.getWorldtaskById(req.TaskId) if err != nil || taskConf == nil { - code = pb.ErrorCode_ConfigNoFound - data.Title = code.ToString() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } return } // 当前玩家世界任务 userTask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -49,9 +55,11 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa if len(taskConf.Completetask) == 0 { if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil { - code = pb.ErrorCode_DBError - data.Title = code.ToString() - data.Message = err.Error() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -61,16 +69,20 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa battleModule, err := this.module.service.GetModule(comm.ModuleBattle) if err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } if ibattle, ok := battleModule.(comm.IBattle); ok { var isWin bool - if code, isWin = ibattle.CheckBattleReport(session, req.Report); code == pb.ErrorCode_Success { + if errdata, isWin = ibattle.CheckBattleReport(session, req.Report); errdata == nil { if isWin { if battleConf, ok := this.module.worldBattleConf.GetDataMap()[req.BattleConfId]; ok { - if code = this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); errdata != nil { this.module.Error("世界任务战斗玩家经验结算", log.Field{Key: "uid", Value: uid}, log.Field{Key: "playerExp", Value: battleConf.Playexp}, @@ -91,7 +103,11 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa "currentTask": userTask.CurrentTask, } if err := this.module.modelWorldtask.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } @@ -100,20 +116,23 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa } } else { - data.Title = code.ToString() - data.Message = "战报校验错误" + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: "战报校验错误", + } return } //判断是否配置了通知module if len(taskConf.Module) == 0 { // 发奖 - if code = this.module.DispenseRes(session, taskConf.Reword, true); code != pb.ErrorCode_Success { + if errdata = this.module.DispenseRes(session, taskConf.Reword, true); errdata != nil { this.module.Error("资源发放", log.Field{Key: "uid", Value: uid}, log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "reword", Value: taskConf.Reword}, - log.Field{Key: "code", Value: code}, + log.Field{Key: "errdata", Value: errdata}, ) return } diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index c4c1b7fbf..a15d339bf 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -23,23 +23,28 @@ func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.Worldta } func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (errdata *pb.ErrorData) { - if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { + if errdata = this.BattlestartCheck(session, req); errdata != nil { return } - data = &pb.ErrorData{} resp := &pb.WorldtaskBattleStartResp{} battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId) if err != nil || battleConf == nil { - code = pb.ErrorCode_ConfigNoFound - data.Title = code.String() - data.Message = fmt.Sprintf("战斗配置未找到 %v", req.BattleConfId) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: fmt.Sprintf("战斗配置未找到 %v", req.BattleConfId), + } return } iBattle, err := this.module.service.GetModule(comm.ModuleBattle) if err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } @@ -47,14 +52,18 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat var ( record *pb.DBBattleRecord ) - code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{ + errdata, record = b.CreateEveBattle(session, &pb.BattleEVEReq{ Ptype: pb.PlayType_rtask, Format: req.Battle, Buleformat: battleConf.FormatList, }) - if code != pb.ErrorCode_Success { - data.Title = code.String() + if errdata != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: "创建Eve战斗失败", + } return } @@ -73,8 +82,11 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat }, } } else { - code = pb.ErrorCode_WorldtaskBattleCreate - data.Title = code.String() + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_WorldtaskBattleCreate, + Title: pb.ErrorCode_WorldtaskBattleCreate.ToString(), + Message: "战斗记录是空", + } return } From af1fe8d3bc20bce2633fcca4492e1c2612d38078 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 6 Jun 2023 10:35:48 +0800 Subject: [PATCH 2/3] customererror --- comm/error.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comm/error.go b/comm/error.go index 12a9ac3c9..8c806acf6 100644 --- a/comm/error.go +++ b/comm/error.go @@ -16,7 +16,7 @@ func (e *CustomError) Error() string { return e.Code.String() } -func NewCustomError(errdata *pb.ErrorData) error { +func NewCustomError(code pb.ErrorCode) error { // 初次调用得用Wrap方法，进行实例化 return errors.Wrap(&CustomError{ Code: code, From 290484c3af15060851329fe0bfb85362ffbd680f Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 6 Jun 2023 11:01:50 +0800 Subject: [PATCH 3/3] errorcode --- modules/modulebase.go | 18 +++++++++++---- modules/user/api_battlerecord.go | 24 ++++++++++++++++---- modules/user/api_changetips.go | 6 ++--- modules/user/api_create.go | 34 ++++++++++++++++++---------- modules/worldtask/api_mine.go | 14 +++++++++--- modules/worldtask/model_worldtask.go | 2 +- 6 files changed, 71 insertions(+), 27 deletions(-) diff --git a/modules/modulebase.go b/modules/modulebase.go index 416144db1..ef05b8428 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -323,15 +323,25 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) } // 校验数量 for k, v := range attrs { - if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < int64(v) { - code = pb.ErrorCode_ResNoEnough + amount := this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) + if amount < int64(v) { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ResNoEnough, + Title: pb.ErrorCode_ResNoEnough.ToString(), + Message: fmt.Sprintf("资源%v的数量:%v 小于 %v", k, amount, v), + } // this.Warn("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) return } } for k, v := range items { //校验消费资源是否充足 - if int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) < v { - code = pb.ErrorCode_ResNoEnough + amount := int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) + if amount < v { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ResNoEnough, + Title: pb.ErrorCode_ResNoEnough.ToString(), + Message: fmt.Sprintf("道具%v的数量:%v 小于 %v", k, amount, v), + } // this.Warn("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) return } diff --git a/modules/user/api_battlerecord.go b/modules/user/api_battlerecord.go index de1cf5804..e78d36df6 100644 --- a/modules/user/api_battlerecord.go +++ b/modules/user/api_battlerecord.go @@ -21,7 +21,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler user := this.module.GetUser(uid) userEx, err := this.module.GetUserExpand(uid) if err != nil { - code = pb.ErrorCode_UserExpandNull + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserExpandNull, + Title: pb.ErrorCode_UserExpandNull.ToString(), + Message: err.Error(), + } return } @@ -33,7 +37,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler // 心魔塔 iPagoda, err := this.service.GetModule(comm.ModulePagoda) if err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + Message: err.Error(), + } return } @@ -47,7 +55,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler //狩猎 ihunting, err := this.service.GetModule(comm.ModuleHunting) if err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: err.Error(), + } return } @@ -60,7 +72,11 @@ func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattler //维京远征 iviking, err := this.service.GetModule(comm.ModuleViking) if err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ExternalModule, + Title: pb.ErrorCode_ExternalModule.ToString(), + Message: err.Error(), + } return } diff --git a/modules/user/api_changetips.go b/modules/user/api_changetips.go index 828bb45ad..6b2c05632 100644 --- a/modules/user/api_changetips.go +++ b/modules/user/api_changetips.go @@ -6,20 +6,20 @@ import ( cfg "go_dreamfactory/sys/configure/structs" ) -//参数校验 +// 参数校验 func (this *apiComp) ChangeTipsCheck(session comm.IUserSession, req *pb.UserChangeTipsReq) (errdata *pb.ErrorData) { return } -//修改提示次数 +// 修改提示次数 func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTipsReq) (errdata *pb.ErrorData) { update := make(map[string]interface{}, 0) if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { if conf := this.module.ModuleTools.GetGlobalConf().DailyTips; conf.N > 0 { - if code = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); errdata != nil { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf}, true); errdata != nil { return } } diff --git a/modules/user/api_create.go b/modules/user/api_create.go index de6db076b..3fe968bf7 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -11,19 +11,18 @@ import ( func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData) { name := strings.TrimSpace(req.NickName) if name == "" || len(name) > 30 { - code = pb.ErrorCode_UserNickNameEmpty - this.module.Error("参数错误", - log.Field{Key: "uid", Value: session.GetUserId()}, - log.Field{Key: "params", Value: req.String()}, - ) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserNickNameEmpty, + Title: pb.ErrorCode_UserNickNameEmpty.ToString(), + } } return } // 创角 -func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData, edata *pb.ErrorData) { - if code = this.CreateCheck(session, req); errdata != nil { +func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData) { + if errdata = this.CreateCheck(session, req); errdata != nil { return } @@ -32,20 +31,28 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e //获取用户 self := this.module.modelUser.GetUser(session.GetUserId()) if self == nil { - code = pb.ErrorCode_UserSessionNobeing + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserNofound, + Title: pb.ErrorCode_UserNofound.ToString(), + } return } //已否已创角 if self.Created { - code = pb.ErrorCode_RoleCreated + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_RoleCreated, + Title: pb.ErrorCode_RoleCreated.ToString(), + } return } //查询昵称是否重复 if ok := this.module.modelUser.NickNameIsExist(req.NickName); !ok { - code = pb.ErrorCode_UserNickNameExist - // this.sendMsg(session, UserSubTypeCreate, resp) + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserNickNameExist, + Title: pb.ErrorCode_UserNickNameExist.ToString(), + } return } @@ -72,7 +79,10 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e } if err := this.module.modelUser.Change(uid, update); err != nil { - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + } this.module.Error("创角", log.Field{Key: "uid", Value: uid}, log.Field{Key: "params", Value: update}, diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go index 8895933b7..3fa6df024 100644 --- a/modules/worldtask/api_mine.go +++ b/modules/worldtask/api_mine.go @@ -18,17 +18,25 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineR func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (errdata *pb.ErrorData) { uid := session.GetUserId() - data = &pb.ErrorData{} + user := this.module.ModuleUser.GetUser(uid) if user == nil { - code = pb.ErrorCode_UserNofound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_UserNofound, + Title: pb.ErrorCode_UserNofound.ToString(), + Message: "战斗记录是空", + } return } myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { this.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) - code = pb.ErrorCode_DBError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } return } diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index 50c27466a..b2fecbc72 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -139,7 +139,7 @@ func (this *ModelWorldtask) checkCondi(uid string, condiId int32) bool { if m, err := this.service.GetModule(comm.ModuleRtask); err == nil { iwt, ok := m.(comm.IRtask) if ok { - if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { + if errdata := iwt.CheckCondi(uid, condiId); errdata != nil { this.moduleWorldtask.Debug("任务完成条件不满足", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condiId", Value: condiId},