diff --git a/cmd/v2/service/connService.go b/cmd/v2/service/connService.go index 3155b515e..c71879feb 100644 --- a/cmd/v2/service/connService.go +++ b/cmd/v2/service/connService.go @@ -24,7 +24,7 @@ type ConnService interface { WsConnect(wsUrl string) error HttpConnect(url string) ([]byte, error) SendMsg(msg *pb.UserMessage, rsp proto.Message) (err error) - ReceiveMsg() (code pb.ErrorCode, msg *pb.UserMessage) + ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessage) ListenerPush() Close() } @@ -140,7 +140,7 @@ func (c *ConnServiceImpl) SendMsg(msg *pb.UserMessage, rsp proto.Message) (err e } // ReceiveMsg .... -func (c *ConnServiceImpl) ReceiveMsg() (code pb.ErrorCode, msg *pb.UserMessage) { +func (c *ConnServiceImpl) ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessage) { msg = &pb.UserMessage{} _, data, err := c.ws.ReadMessage() if err != nil { diff --git a/comm/imodule.go b/comm/imodule.go index bafb7391f..cfcdd1f10 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -61,7 +61,7 @@ type ( ///刷新恢复入场券 RecoverTicket(session IUserSession) (code pb.ErrorCode) //出售道具 - SellItem(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode, atno []*pb.UserAtno) + SellItem(session IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) CleanItemById(session IUserSession, t string) (code pb.ErrorCode) } @@ -178,17 +178,17 @@ type ( //添加所有装备 AddAllEquipments(session IUserSession) (code pb.ErrorCode) //创建装备 - NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment) + NewEquipment(uid, cid string) (errdata *pb.ErrorData, equip *pb.DB_Equipment) //添加装备 AddEquipment(session IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode) //出售装备 - SellEquipments(session IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno) + SellEquipments(session IUserSession, equs []string) (errdata *pb.ErrorData, atno []*pb.UserAtno) //回收装备接口 - RecycleEquipments(session IUserSession, equs []string, discount int32) (code pb.ErrorCode, atno []*pb.UserAtno) + RecycleEquipments(session IUserSession, equs []string, discount int32) (errdata *pb.ErrorData, atno []*pb.UserAtno) //获得可操作用户装备列表 - GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment) + GetActionableEquipments(uid string) (errdata *pb.ErrorData, eruips []*pb.DB_Equipment) //获取可用套装 (铁匠铺使用) - GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32) + GetActionableSuit(uid string) (errdata *pb.ErrorData, Suit []int32) // 随机获得一件N级的装备装备 /* suiteId: 套装id @@ -275,19 +275,19 @@ type ( //战斗系统 IBattle interface { //创建eve战斗 - CreateEveBattle(session IUserSession, req *pb.BattleEVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) + CreateEveBattle(session IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) ///创建pve战斗 - CreatePveBattle(session IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) + CreatePveBattle(session IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) ///创建pvb战斗 - CreatePvbBattle(session IUserSession, req *pb.BattlePVBReq) (code pb.ErrorCode, record *pb.DBBattleRecord) + CreatePvbBattle(session IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) ///创建pvp战斗 - CreatePvpBattle(session IUserSession, req *pb.BattlePVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord) + CreatePvpBattle(session IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) ///同步pvp战斗 - CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord) + CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) ///连续pve战斗 - CreateLPVEBattle(session IUserSession, req *pb.BattleLPVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) + CreateLPVEBattle(session IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) ///获取战斗详情 - GetBattleInfo(req *pb.BattleGetInfoReq) (code pb.ErrorCode, resp *pb.BattleGetInfoResp) + GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp) ///创建战斗角色 CreateRolesByFormat(fid int32) (captain int32, roles []*pb.BattleRole, code pb.ErrorCode) ///创建战斗角色 @@ -299,7 +299,7 @@ type ( ///战斗认输请求 ConcedeBattle(req *pb.BattleConcedeReq) (code pb.ErrorCode) //校验战报 - CheckBattleReport(session IUserSession, report *pb.BattleReport) (code pb.ErrorCode, iswin bool) + CheckBattleReport(session IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) } IGm interface { CreateCmd(session IUserSession, cmd string) (code pb.ErrorCode) @@ -338,8 +338,8 @@ type ( // 自动购买门票 AutoBuyTicket(session IUserSession, bossId, difficulty int32) (code pb.ErrorCode) // 自动战斗 战斗信息 - AutoBattleInfo(session IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo) - AutoBattleOver(session IUserSession, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (code pb.ErrorCode, atno []*pb.UserAtno) + AutoBattleInfo(session IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (errdata *pb.ErrorData, battleInfo *pb.BattleInfo) + AutoBattleOver(session IUserSession, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (errdata *pb.ErrorData, atno []*pb.UserAtno) CheckBattelParameter(session IUserSession, battle *pb.BattleFormation, bossid, difficulty int32) (code pb.ErrorCode) } IHunting interface { @@ -374,7 +374,7 @@ type ( } IPrivilege interface { // 创建一个新的特权卡 - Delivery(session IUserSession, pId string) (code pb.ErrorCode, items []*pb.UserAssets) + Delivery(session IUserSession, pId string) (errdata *pb.ErrorData, items []*pb.UserAssets) // 续费特权卡 RenewPrivilegeCard(session IUserSession, cId string) (code pb.ErrorCode) // 检查特权 参数 计费点 返回值 是否有特权 @@ -442,7 +442,7 @@ type ( } //支付发货 IPayDelivery interface { - Delivery(session IUserSession, pid string) (code pb.ErrorCode, items []*pb.UserAssets) + Delivery(session IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) } //实时Pvp diff --git a/modules/academy/api_challenge.go b/modules/academy/api_challenge.go index b9c693543..2a9a7760d 100644 --- a/modules/academy/api_challenge.go +++ b/modules/academy/api_challenge.go @@ -7,22 +7,21 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.AcademyChallengeReq) (errdata *pb.ErrorData) { return } ///挑战 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (errdata *pb.ErrorData) { var ( level *cfg.GameTeachingData record *pb.DBBattleRecord err error - cd pb.ErrorCode ) defer func() { - if cd == pb.ErrorCode_Success { - session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: cd, Level: req.Level, Info: &pb.BattleInfo{ + if errdata == nil { + session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: pb.ErrorCode_Success, Level: req.Level, Info: &pb.BattleInfo{ Id: record.Id, Title: record.Title, Rulesid: level.Battleready, @@ -35,15 +34,18 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen Tasks: level.Task, }}) } else { - session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: cd, Info: nil}) + session.SendMsg(string(this.module.GetType()), "challenge", &pb.AcademyChallengeResp{Code: errdata.Code, Info: nil}) } }() - if cd = this.ChallengeCheck(session, req); cd != pb.ErrorCode_Success { + if errdata = this.ChallengeCheck(session, req); errdata != nil { return } if level, err = this.module.configure.getGameTeaching(req.Level); err != nil { - cd = pb.ErrorCode_ConfigNoFound + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + } return } cd, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{ diff --git a/modules/academy/api_info.go b/modules/academy/api_info.go index 9e84f6765..80b889c1a 100644 --- a/modules/academy/api_info.go +++ b/modules/academy/api_info.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AcademyInfoReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (errdata *pb.ErrorData) { var ( info *pb.DBAcademy err error diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index 89cf82cb1..e2495f052 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AcademyReceiveReq) (errdata *pb.ErrorData) { return } ///奖励领取 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (errdata *pb.ErrorData) { var ( iswin bool level *cfg.GameTeachingData diff --git a/modules/academy/api_teaching.go b/modules/academy/api_teaching.go index 8286821c5..7e162a347 100644 --- a/modules/academy/api_teaching.go +++ b/modules/academy/api_teaching.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) TeachingCheck(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode) { +func (this *apiComp) TeachingCheck(session comm.IUserSession, req *pb.AcademyTeachingReq) (errdata *pb.ErrorData) { return } ///挑战 -func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (errdata *pb.ErrorData) { var ( level *cfg.GameHeroStrategyData record *pb.DBBattleRecord diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index c6f909760..338fdbb05 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) TeachingReceiveCheck(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) TeachingReceiveCheck(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (errdata *pb.ErrorData) { return } ///奖励领取 -func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (errdata *pb.ErrorData) { var ( iswin bool level *cfg.GameHeroStrategyData diff --git a/modules/arena/api_buy.go b/modules/arena/api_buy.go index 1ea9e823f..75d8e48a1 100644 --- a/modules/arena/api_buy.go +++ b/modules/arena/api_buy.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (errdata *pb.ErrorData) { if req.BuyNum == 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (c } ///获取自己的排行榜信息 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdata *pb.ErrorData) { var ( // global *cfg.GameGlobalData info *pb.DBArenaUser diff --git a/modules/arena/api_challenge.go b/modules/arena/api_challenge.go index 2a55cba8d..b65da8313 100644 --- a/modules/arena/api_challenge.go +++ b/modules/arena/api_challenge.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChallengeReq) (errdata *pb.ErrorData) { if (!req.Isai && req.Playerid == "") || (req.Isai && req.MformatId == 0) || req.Battle.Format == nil || len(req.Battle.Format) != 5 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChal } ///挑战 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (errdata *pb.ErrorData) { var ( red *pb.DBArenaUser bule *pb.ArenaPlayer diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 9b7e14563..9a91d2df7 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (errdata *pb.ErrorData) { return } ///挑战奖励领取 -func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (errdata *pb.ErrorData) { var ( reward *cfg.GameArenaActiveRewardData info *pb.DBArenaUser diff --git a/modules/arena/api_delreward.go b/modules/arena/api_delreward.go index beadda2de..5c835f81f 100644 --- a/modules/arena/api_delreward.go +++ b/modules/arena/api_delreward.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode) { +func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelRewardReq) (errdata *pb.ErrorData) { if req.Bid == "" { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelR } ///删除战斗记录 -func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (errdata *pb.ErrorData) { var ( info *pb.DBArenaUser err error diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go index cfe634583..afe251dcd 100644 --- a/modules/arena/api_info.go +++ b/modules/arena/api_info.go @@ -11,13 +11,13 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errdata *pb.ErrorData) { var ( global *cfg.GameGlobalData info *pb.DBArenaUser diff --git a/modules/arena/api_matche.go b/modules/arena/api_matche.go index 22306d358..0e066675a 100644 --- a/modules/arena/api_matche.go +++ b/modules/arena/api_matche.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode) { +func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.ArenaMatcheReq) (errdata *pb.ErrorData) { return } ///匹配 -func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (errdata *pb.ErrorData) { var ( info *pb.DBArenaUser active *cfg.GameArenaActiveRewardData diff --git a/modules/arena/api_otherinfo.go b/modules/arena/api_otherinfo.go index 02e017daf..b663c2f2a 100644 --- a/modules/arena/api_otherinfo.go +++ b/modules/arena/api_otherinfo.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode) { +func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (errdata *pb.ErrorData) { if req.OtherId == "" { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOthe } ///获取自己的排行榜信息 -func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (errdata *pb.ErrorData) { var ( info *pb.DBArenaUser err error diff --git a/modules/arena/api_plot.go b/modules/arena/api_plot.go index 830c465b5..eeacdc683 100644 --- a/modules/arena/api_plot.go +++ b/modules/arena/api_plot.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode) { +func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errdata *pb.ErrorData) { var ( npc *cfg.GameArenaChallengeNpcData info *pb.DBArenaUser @@ -79,7 +79,7 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code if !configure.Now().After(time.Unix(ndata.Cd, 0)) { //已经过了cd时间 code = pb.ErrorCode_ArenaTicketNpcInCd data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + Title: pb.GetErrorCodeMsg(code), } return } @@ -93,7 +93,7 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code if err = this.module.modelArena.updateArenaUserInfo(info); err != nil { code = pb.ErrorCode_DBError data = &pb.ErrorData{ - Title: pb.GetErrorCodeMsg(code), + Title: pb.GetErrorCodeMsg(code), } return } diff --git a/modules/arena/api_plotreward.go b/modules/arena/api_plotreward.go index 473f3a024..1714f8eb8 100644 --- a/modules/arena/api_plotreward.go +++ b/modules/arena/api_plotreward.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode) { +func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (errdata *pb.ErrorData) { if req.Pid == 0 || req.Report == nil { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlo } ///领取战斗奖励 -func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (errdata *pb.ErrorData) { var ( npc *cfg.GameArenaChallengeNpcData info *pb.DBArenaUser diff --git a/modules/arena/api_rank.go b/modules/arena/api_rank.go index 290527ee2..0576fa663 100644 --- a/modules/arena/api_rank.go +++ b/modules/arena/api_rank.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode) { +func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq) (errdata *pb.ErrorData) { return } ///排行榜获取 -func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errdata *pb.ErrorData) { var ( info *pb.DBArenaUser uids []string diff --git a/modules/arena/api_setdattformt.go b/modules/arena/api_setdattformt.go index 4149b3669..ba226ec92 100644 --- a/modules/arena/api_setdattformt.go +++ b/modules/arena/api_setdattformt.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode) { +func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (errdata *pb.ErrorData) { return } ///设置防守阵型 -func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (errdata *pb.ErrorData) { var ( info *pb.DBArenaUser heros []*pb.DBHero diff --git a/modules/arena/api_setdefformt.go b/modules/arena/api_setdefformt.go index b5339f383..6e93f1d7f 100644 --- a/modules/arena/api_setdefformt.go +++ b/modules/arena/api_setdefformt.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode) { +func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) { return } ///设置防守阵型 -func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) { var ( info *pb.DBArenaUser heros []*pb.DBHero diff --git a/modules/atlas/api_atlasactivate.go b/modules/atlas/api_atlasactivate.go index e654b289e..b0ba82865 100644 --- a/modules/atlas/api_atlasactivate.go +++ b/modules/atlas/api_atlasactivate.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode) { +func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActivateReq) (errdata *pb.ErrorData) { if req.Id == "" { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv } // 激活图鉴信息 -func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (errdata *pb.ErrorData) { if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/atlas/api_atlasaward.go b/modules/atlas/api_atlasaward.go index d4b804226..0b91215c4 100644 --- a/modules/atlas/api_atlasaward.go +++ b/modules/atlas/api_atlasaward.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode) { +func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.AtlasAwardReq) (errdata *pb.ErrorData) { return } // 一键领取所有可以领取的奖励 -func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (errdata *pb.ErrorData) { var ( res []*cfg.Gameatn respRes []*pb.UserAssets diff --git a/modules/atlas/api_getatlas.go b/modules/atlas/api_getatlas.go index da24d0115..26960e3be 100644 --- a/modules/atlas/api_getatlas.go +++ b/modules/atlas/api_getatlas.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.AtlasGetListReq) (errdata *pb.ErrorData) { return } // 获取铁匠铺图鉴信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (errdata *pb.ErrorData) { list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) if err != nil { diff --git a/modules/battle/module.go b/modules/battle/module.go index c32da535e..acf5ceeda 100644 --- a/modules/battle/module.go +++ b/modules/battle/module.go @@ -81,7 +81,7 @@ func (this *Battle) OnInstallComp() { } //查询战斗记录 -func (this *Battle) QueryBattleRecord(oid string) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) QueryBattleRecord(oid string) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var err error if record, err = this.modelBattle.queryrecord(oid); err != nil { code = pb.ErrorCode_BattleNoFoundRecord @@ -91,7 +91,7 @@ func (this *Battle) QueryBattleRecord(oid string) (code pb.ErrorCode, record *pb } //创建pve战斗 -func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn err error @@ -114,7 +114,7 @@ func (this *Battle) CreateEveBattle(session comm.IUserSession, req *pb.BattleEVE } //创建pve战斗 -func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn err error @@ -154,7 +154,7 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE } //创建pve战斗 -func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVBReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn err error @@ -180,7 +180,7 @@ func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVB } //创建pve战斗 -func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn err error @@ -202,7 +202,7 @@ func (this *Battle) CreatePvpBattle(session comm.IUserSession, req *pb.BattlePVP } //只有跨服环境下才可使用 -func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( redmodel *db.DBModel bluemodel *db.DBModel @@ -227,7 +227,7 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode } //创建连续战斗 -func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) { +func (this *Battle) CreateLPVEBattle(session comm.IUserSession, req *pb.BattleLPVEReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord) { var ( conn *db.DBConn err error @@ -286,7 +286,7 @@ func (this *Battle) CreateRolesByHeros(heros []*pb.DBHero) (roles []*pb.BattleRo } ///获取战斗详情 -func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (code pb.ErrorCode, resp *pb.BattleGetInfoResp) { +func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (errdata *pb.ErrorData, resp *pb.BattleGetInfoResp) { this.Debug("GetBattleInfo", log.Field{Key: "req", Value: req}) var ( ctx context.Context @@ -301,7 +301,7 @@ func (this *Battle) GetBattleInfo(req *pb.BattleGetInfoReq) (code pb.ErrorCode, } //创建战斗服务 -func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (code pb.ErrorCode) { +func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (errdata *pb.ErrorData) { this.Debug("CreateBattleServer", log.Field{Key: "req", Value: req}) var ( resp *pb.BattleCreateServerResp @@ -319,7 +319,7 @@ func (this *Battle) CreateBattleServer(req *pb.BattleInfo) (code pb.ErrorCode) { return } -func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (code pb.ErrorCode) { +func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (errdata *pb.ErrorData) { var ( resp *pb.BattleInCmdResp ctx context.Context @@ -337,7 +337,7 @@ func (this *Battle) InCmdBattle(req *pb.BattleInCmdReq) (code pb.ErrorCode) { } //pvp认输 -func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (code pb.ErrorCode) { +func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (errdata *pb.ErrorData) { var ( resp *pb.BattleConcedeResp err error @@ -353,7 +353,7 @@ func (this *Battle) ConcedeBattle(req *pb.BattleConcedeReq) (code pb.ErrorCode) } //校验战报是否成功 -func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (code pb.ErrorCode, iswin bool) { +func (this *Battle) CheckBattleReport(session comm.IUserSession, report *pb.BattleReport) (errdata *pb.ErrorData, iswin bool) { var ( reply *pb.BattleCheckResults ctx context.Context diff --git a/modules/buried/api_send.go b/modules/buried/api_send.go index bd2e35a69..690777763 100644 --- a/modules/buried/api_send.go +++ b/modules/buried/api_send.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (code pb.ErrorCode) { +func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (errdata *pb.ErrorData) { if len(req.Conditions) == 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.BuriedInquireP } ///查询任务进度接口 -func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) InquireProgress(session comm.IUserSession, req *pb.BuriedInquireProgressReq) (errdata *pb.ErrorData) { var ( condis []*pb.ConIProgress err error diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index 1c7ebd664..be7b8b302 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -7,14 +7,14 @@ import ( ) //参数校验 -func (this *apiComp) BuyOrSellCheck(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (code pb.ErrorCode) { +func (this *apiComp) BuyOrSellCheck(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (errdata *pb.ErrorData) { if len(req.Items) == 0 || req.City == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSellReq) (errdata *pb.ErrorData) { var ( update map[string]interface{} addScore int32 // 收益 diff --git a/modules/caravan/api_getlist.go b/modules/caravan/api_getlist.go index 680328b61..01e678045 100644 --- a/modules/caravan/api_getlist.go +++ b/modules/caravan/api_getlist.go @@ -8,12 +8,12 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.CaravanGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.CaravanGetListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListReq) (errdata *pb.ErrorData) { var ( resp *pb.CaravanGetListResp ) diff --git a/modules/caravan/api_getstory.go b/modules/caravan/api_getstory.go index 2ddd68a89..55e20103b 100644 --- a/modules/caravan/api_getstory.go +++ b/modules/caravan/api_getstory.go @@ -7,14 +7,14 @@ import ( ) //参数校验 -func (this *apiComp) GetStoryCheck(session comm.IUserSession, req *pb.CaravanGetStoryReq) (code pb.ErrorCode) { +func (this *apiComp) GetStoryCheck(session comm.IUserSession, req *pb.CaravanGetStoryReq) (errdata *pb.ErrorData) { if req.Cid == 0 || req.Citystory == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStoryReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStoryReq) (errdata *pb.ErrorData) { var ( resp *pb.CaravanGetStoryResp update map[string]interface{} diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index 22a2fe773..ea2bb4752 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -8,14 +8,14 @@ import ( ) //参数校验 -func (this *apiComp) GotoCityCheck(session comm.IUserSession, req *pb.CaravanGotoCityReq) (code pb.ErrorCode) { +func (this *apiComp) GotoCityCheck(session comm.IUserSession, req *pb.CaravanGotoCityReq) (errdata *pb.ErrorData) { if req.City == 0 || req.Ticket <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCityReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCityReq) (errdata *pb.ErrorData) { var ( resp *pb.CaravanGotoCityResp res *cfg.Gameatn diff --git a/modules/caravan/api_ranklist.go b/modules/caravan/api_ranklist.go index 8324a60f2..ecf7aaf08 100644 --- a/modules/caravan/api_ranklist.go +++ b/modules/caravan/api_ranklist.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.CaravanRankListReq) (code pb.ErrorCode) { +func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.CaravanRankListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.CaravanRankListReq) (errdata *pb.ErrorData) { var ( rankid int32 diff --git a/modules/caravan/api_refreshcity.go b/modules/caravan/api_refreshcity.go index 287d9c188..c3f177e24 100644 --- a/modules/caravan/api_refreshcity.go +++ b/modules/caravan/api_refreshcity.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) RefreshCityCheck(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (code pb.ErrorCode) { +func (this *apiComp) RefreshCityCheck(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (errdata *pb.ErrorData) { return } // 刷新城市信息 -func (this *apiComp) RefreshCity(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RefreshCity(session comm.IUserSession, req *pb.CaravanRefreshCityReq) (errdata *pb.ErrorData) { var ( resp *pb.CaravanRefreshCityResp ) diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 96d4fb6d9..de380ac79 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -61,7 +61,7 @@ func (this *Caravan) OnInstallComp() { } // 接口信息 修改数据 -func (this *Caravan) ModifyCaravanData(uid string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Caravan) ModifyCaravanData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelCaravan.modifyCaravanDataByObjId(uid, data) if err != nil { code = pb.ErrorCode_DBError @@ -113,7 +113,7 @@ func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) { } // 初始化门票和虚拟币 -func (this *Caravan) InitCaravanTicket(session comm.IUserSession, lv int32) (code pb.ErrorCode) { +func (this *Caravan) InitCaravanTicket(session comm.IUserSession, lv int32) (errdata *pb.ErrorData) { code = pb.ErrorCode_ConfigNoFound if conf, _ := this.modelCaravan.module.configure.GetCaravanLv(lv); conf != nil { var res []*cfg.Gameatn diff --git a/modules/chat/api_chanagechannel.go b/modules/chat/api_chanagechannel.go index 47d62fd5a..181a3bd57 100644 --- a/modules/chat/api_chanagechannel.go +++ b/modules/chat/api_chanagechannel.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode) { +func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.ChatChanageChannelReq) (errdata *pb.ErrorData) { if req.ChannelId < 0 { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.Chat } ///改变跨服聊天频道 -func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (errdata *pb.ErrorData) { var ( err error ok bool diff --git a/modules/chat/api_crosschannel.go b/modules/chat/api_crosschannel.go index 69e5bbc6f..99ec922b5 100644 --- a/modules/chat/api_crosschannel.go +++ b/modules/chat/api_crosschannel.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) CrossChannelCheck(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode) { +func (this *apiComp) CrossChannelCheck(session comm.IUserSession, req *pb.ChatCrossChannelReq) (errdata *pb.ErrorData) { return } ///请求跨服聊天频道 -func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (errdata *pb.ErrorData) { var ( channel int32 err error diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index 1f4ad66f8..8f0d9ab5b 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetListReq) (errdata *pb.ErrorData) { if req.Channel == pb.ChatChannel_CrossServer && req.ChannelId == 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetList } ///获取本服聊天消息记录 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (errdata *pb.ErrorData) { var ( err error result *pb.DBUserExpand diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index b847fbcf0..4b0d41451 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -12,7 +12,7 @@ import ( ) //参数校验 -func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode) { +func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (errdata *pb.ErrorData) { if (req.Channel == pb.ChatChannel_Union && req.TargetId == "") || (req.Channel == pb.ChatChannel_Private && req.TargetId == "") { code = pb.ErrorCode_ReqParameterError } @@ -20,7 +20,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) ( } ///消息发送请求 -func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (errdata *pb.ErrorData) { var ( err error msg *pb.DBChat diff --git a/modules/chat/modelChat.go b/modules/chat/modelChat.go index 6b9bdd477..15c379832 100644 --- a/modules/chat/modelChat.go +++ b/modules/chat/modelChat.go @@ -235,7 +235,7 @@ func (this *modelChatComp) saveUserMsg(msg *pb.DBChat) (err error) { } // //发送世界频道聊天 -// func (this *modelChatComp) sendWorldChat(msg *pb.DBChat) (code pb.ErrorCode) { +// func (this *modelChatComp) sendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) { // var ( // err error // max int32 @@ -261,7 +261,7 @@ func (this *modelChatComp) saveUserMsg(msg *pb.DBChat) (err error) { // } // //发送系统频道聊天 -// func (this *modelChatComp) sendSystemChat(msg *pb.DBChat) (code pb.ErrorCode) { +// func (this *modelChatComp) sendSystemChat(msg *pb.DBChat) (errdata *pb.ErrorData) { // var ( // err error // ) diff --git a/modules/chat/module.go b/modules/chat/module.go index 55fe79513..672a75e48 100644 --- a/modules/chat/module.go +++ b/modules/chat/module.go @@ -135,7 +135,7 @@ func (this *Chat) Rpc_ModuleChatPushChat(ctx context.Context, args *pb.DBChat, r //对外接口---------------------------------------------------------------------------------------------------------- //向世界频道发送聊天消息 -func (this *Chat) SendWorldChat(msg *pb.DBChat) (code pb.ErrorCode) { +func (this *Chat) SendWorldChat(msg *pb.DBChat) (errdata *pb.ErrorData) { var ( max_chat int32 err error @@ -166,7 +166,7 @@ func (this *Chat) SendWorldChat(msg *pb.DBChat) (code pb.ErrorCode) { } //向工会发送聊天消息 -func (this *Chat) SendUnionChat(msg *pb.DBChat) (code pb.ErrorCode) { +func (this *Chat) SendUnionChat(msg *pb.DBChat) (errdata *pb.ErrorData) { var ( max_chat int32 err error @@ -197,7 +197,7 @@ func (this *Chat) SendUnionChat(msg *pb.DBChat) (code pb.ErrorCode) { } //向个人发送聊天消息 -func (this *Chat) SendUserChat(msg *pb.DBChat) (code pb.ErrorCode) { +func (this *Chat) SendUserChat(msg *pb.DBChat) (errdata *pb.ErrorData) { var ( err error session comm.IUserSession @@ -223,7 +223,7 @@ func (this *Chat) SendUserChat(msg *pb.DBChat) (code pb.ErrorCode) { } //广播系统消息 -func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata interface{}, value0 int32, value1 int32, agrs ...string) (code pb.ErrorCode) { +func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata interface{}, value0 int32, value1 int32, agrs ...string) (errdata *pb.ErrorData) { var ( jsonStr []byte err error @@ -280,7 +280,7 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter } //广播系统消息 -func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSystemType, value0, value1 int32, agrs ...string) (code pb.ErrorCode) { +func (this *Chat) SendSysChatToUser(session comm.IUserSession, ctype comm.ChatSystemType, value0, value1 int32, agrs ...string) (errdata *pb.ErrorData) { if st, ok := this.configure.GetCheckChatSystem(int32(ctype), value0, value1); ok { msg := &pb.DBChat{ Channel: pb.ChatChannel_System, diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index d84656154..552349202 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode) { +func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.CombatAskReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errdata *pb.ErrorData) { var ( info *pb.DBCombatUser level *pb.DBCombatLevel diff --git a/modules/combat/api_challenge.go b/modules/combat/api_challenge.go index cdbf2530a..a2051ac98 100644 --- a/modules/combat/api_challenge.go +++ b/modules/combat/api_challenge.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.CombatChallengeReq) (errdata *pb.ErrorData) { return } ///挑战 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (errdata *pb.ErrorData) { var ( manster *cfg.GameCombatMansterData record *pb.DBBattleRecord diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index 1fd6a56ae..f029163f5 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeReceiveCheck(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeReceiveCheck(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (errdata *pb.ErrorData) { return } ///奖励领取 -func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (errdata *pb.ErrorData) { var ( iswin bool info *pb.DBCombatUser diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index f3eb7e08d..c08a7f843 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode) { +func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq) (errdata *pb.ErrorData) { return } ///奖励领取 -func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (errdata *pb.ErrorData) { var ( info *pb.DBCombatUser lv *pb.DBCombatLevel diff --git a/modules/combat/api_in.go b/modules/combat/api_in.go index d14261d99..639ccf67f 100644 --- a/modules/combat/api_in.go +++ b/modules/combat/api_in.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode) { +func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (errdata *pb.ErrorData) { var ( info *pb.DBCombatUser level *pb.DBCombatLevel diff --git a/modules/combat/api_updatelevel.go b/modules/combat/api_updatelevel.go index c694997e9..67dc87f0b 100644 --- a/modules/combat/api_updatelevel.go +++ b/modules/combat/api_updatelevel.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) UpdateLevelCheck(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode) { +func (this *apiComp) UpdateLevelCheck(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (errdata *pb.ErrorData) { var ( info *pb.DBCombatUser level *pb.DBCombatLevel diff --git a/modules/comp_gate.go b/modules/comp_gate.go index a9703ce41..b35a37e13 100644 --- a/modules/comp_gate.go +++ b/modules/comp_gate.go @@ -101,16 +101,16 @@ func (this *MCompGate) reflectionRouteHandle(typ reflect.Type, method reflect.Me log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname) return } - if mtype.NumOut() != 2 { + if mtype.NumOut() != 1 { log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname) return } - returnCodeType := mtype.Out(0) - if returnCodeType != typeOfErrorCode { - log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname) - return - } - returnDataType := mtype.Out(1) + // returnCodeType := mtype.Out(0) + // if returnCodeType != typeOfErrorCode { + // log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname) + // return + // } + returnDataType := mtype.Out(0) if returnDataType != typeOfErrorData { log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname) return @@ -151,9 +151,9 @@ func (this *MCompGate) reflectionRouteCheck(method reflect.Method, msgtype refle if mtype.NumOut() != 1 { return fmt.Errorf("mtype.NumOut():%d", mtype.NumOut()) } - returnCodeType := mtype.Out(0) - if returnCodeType != typeOfErrorCode { - return fmt.Errorf("returnCodeType:%T", returnCodeType) + returnDataType := mtype.Out(0) + if returnDataType != typeOfErrorData { + return fmt.Errorf("returnType:%T", returnDataType) } return nil } diff --git a/modules/core.go b/modules/core.go index d3e8ca283..2168c0642 100644 --- a/modules/core.go +++ b/modules/core.go @@ -23,6 +23,6 @@ type ( SendMsgToUsers(mainType, subType string, msg proto.Message, uids ...string) (err error) SendMsgToCUsers(mainType, subType string, msg proto.Message, users ...*pb.CacheUser) (err error) //校验消耗资源 - CheckConsumeRes(uid string, res []*cfg.Gameatn) (code pb.ErrorCode) + CheckConsumeRes(uid string, res []*cfg.Gameatn) (errdata *pb.ErrorData) } ) diff --git a/modules/dispatch/api_autoreceive.go b/modules/dispatch/api_autoreceive.go index aa279ff19..6f43d7245 100644 --- a/modules/dispatch/api_autoreceive.go +++ b/modules/dispatch/api_autoreceive.go @@ -6,11 +6,11 @@ import ( "go_dreamfactory/pb" ) -func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode) { +func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) { return } -func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (errdata *pb.ErrorData) { rsp := &pb.DispatchAutoReceiveResp{} d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { diff --git a/modules/dispatch/api_do.go b/modules/dispatch/api_do.go index 911bc9602..6c7d5f0ce 100644 --- a/modules/dispatch/api_do.go +++ b/modules/dispatch/api_do.go @@ -10,7 +10,7 @@ import ( // 派遣 -func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode) { +func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (errdata *pb.ErrorData) { if len(req.HeroIds) == 0 || req.TaskId == 0 { code = pb.ErrorCode_ReqParameterError return @@ -25,7 +25,7 @@ func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (cod return } -func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errdata *pb.ErrorData) { if code = this.DoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index 1a76f1ee7..09fd32f52 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -10,11 +10,11 @@ import ( // 公告板信息 -func (a *apiComp) NoticeCheck(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode) { +func (a *apiComp) NoticeCheck(session comm.IUserSession, req *pb.DispatchNoticeReq) (errdata *pb.ErrorData) { return } -func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (errdata *pb.ErrorData) { d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { code = pb.ErrorCode_DataNotFound diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go index c757fb234..bb7dbf966 100644 --- a/modules/dispatch/api_receive.go +++ b/modules/dispatch/api_receive.go @@ -8,14 +8,14 @@ import ( // 领取派遣奖励 -func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode) { +func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) { if req.TaskId == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (errdata *pb.ErrorData) { if code = a.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/dispatch/api_refresh.go b/modules/dispatch/api_refresh.go index 268002b0c..7a13508ca 100644 --- a/modules/dispatch/api_refresh.go +++ b/modules/dispatch/api_refresh.go @@ -9,11 +9,11 @@ import ( ) // 刷新 -func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode) { +func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) { return } -func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (errdata *pb.ErrorData) { d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index a61e24390..aebd7f045 100644 --- a/modules/dispatch/api_week.go +++ b/modules/dispatch/api_week.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode) { +func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) { if req.Idx == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (errdata *pb.ErrorData) { if code = a.WeekreciveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/enchant/api_buy.go b/modules/enchant/api_buy.go index 3cd139386..95e66934c 100644 --- a/modules/enchant/api_buy.go +++ b/modules/enchant/api_buy.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq) (errdata *pb.ErrorData) { if req.Count <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq) } // 协议废除 走通用购买逻辑 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (errdata *pb.ErrorData) { session.SendMsg(string(this.module.GetType()), EnchantBuyResp, &pb.EnchantBuyResp{}) return diff --git a/modules/enchant/api_challenge.go b/modules/enchant/api_challenge.go index d7a9d362d..6cd81a532 100644 --- a/modules/enchant/api_challenge.go +++ b/modules/enchant/api_challenge.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantChallengeReq) (errdata *pb.ErrorData) { if req.BossType <= 0 || req.Battle == nil { code = pb.ErrorCode_ReqParameterError return @@ -16,7 +16,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantCh } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (errdata *pb.ErrorData) { code = this.ChallengeCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index 769c47ea4..2d3759ea7 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (errdata *pb.ErrorData) { if req.BossType <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Encha } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (errdata *pb.ErrorData) { var ( mapData map[string]interface{} bWin bool // 战斗是否胜利 diff --git a/modules/enchant/api_getlist.go b/modules/enchant/api_getlist.go index de2ffcae6..9f60aed96 100644 --- a/modules/enchant/api_getlist.go +++ b/modules/enchant/api_getlist.go @@ -9,12 +9,12 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (errdata *pb.ErrorData) { // 刷新挑战卷 if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success { diff --git a/modules/enchant/api_ranklist.go b/modules/enchant/api_ranklist.go index 357ba2f03..69b14630f 100644 --- a/modules/enchant/api_ranklist.go +++ b/modules/enchant/api_ranklist.go @@ -12,12 +12,12 @@ import ( ) //参数校验 -func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode) { +func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRankListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (errdata *pb.ErrorData) { var ( szRank []*pb.DBEnchantRank rd *redis.StringSliceCmd diff --git a/modules/enchant/module.go b/modules/enchant/module.go index c0ec5d9e8..306f81ea8 100644 --- a/modules/enchant/module.go +++ b/modules/enchant/module.go @@ -58,7 +58,7 @@ func (this *Enchant) OnInstallComp() { } // 接口信息 -func (this *Enchant) ModifyEnchantData(uid string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Enchant) ModifyEnchantData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelEnchant.modifyEnchantDataByObjId(uid, data) if err != nil { code = pb.ErrorCode_DBError diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go index 6da35b6e1..21abc4092 100644 --- a/modules/equipment/api_ench.go +++ b/modules/equipment/api_ench.go @@ -10,7 +10,7 @@ import ( ) //参数校验 -func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode) { +func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchReq) (errdata *pb.ErrorData) { if req.Eid == "" { code = pb.ErrorCode_ReqParameterError } @@ -18,7 +18,7 @@ func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchR } //附魔 -func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (errdata *pb.ErrorData) { var ( equip *pb.DB_Equipment conf *cfg.GameEquipEnchantingData diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index dd08b0a32..04e6e6960 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -10,7 +10,7 @@ import ( ) //参数校验 -func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode) { +func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) { if len(req.EquipmentId) != 8 || req.HeroCardId == "" { code = pb.ErrorCode_ReqParameterError } @@ -18,7 +18,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui } ///英雄挂在装备 code 错误码信息 data 错误附加数据 -func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (errdata *pb.ErrorData) { var ( err error confs []*cfg.GameEquipData diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go index 2926e7f33..f3fd0534d 100644 --- a/modules/equipment/api_forg.go +++ b/modules/equipment/api_forg.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode) { +func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgReq) (errdata *pb.ErrorData) { if req.Forgid == 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgR } //锻造 -func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (errdata *pb.ErrorData) { var ( conf *cfg.GameEquipSComposeData need []*cfg.Gameatn diff --git a/modules/equipment/api_getlist.go b/modules/equipment/api_getlist.go index dda9522bd..b14692ca3 100644 --- a/modules/equipment/api_getlist.go +++ b/modules/equipment/api_getlist.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.EquipmentGetListReq) (errdata *pb.ErrorData) { return } ///获取用户装备列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (errdata *pb.ErrorData) { var ( err error items []*pb.DB_Equipment diff --git a/modules/equipment/api_lock.go b/modules/equipment/api_lock.go index 556cb8091..07c1c9853 100644 --- a/modules/equipment/api_lock.go +++ b/modules/equipment/api_lock.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode) { +func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockReq) (errdata *pb.ErrorData) { if req.EquipmentId == "" { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockR } ///获取用户装备列表 -func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (errdata *pb.ErrorData) { var ( err error equipment *pb.DB_Equipment diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 4a86cb9c5..7dc42cecf 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode) { +func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellReq) (errdata *pb.ErrorData) { if req.EquipIds == nil || len(req.EquipIds) == 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellR } //出售 -func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (errdata *pb.ErrorData) { var ( err error equipments []*pb.DB_Equipment diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 81aaf4129..5b3bd07f1 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -13,7 +13,7 @@ import ( ) //参数校验 -func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode) { +func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) { if req.EquipmentId == "" { code = pb.ErrorCode_ReqParameterError return @@ -22,7 +22,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp } ///英雄挂在装备 -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (errdata *pb.ErrorData) { var ( err error conf *cfg.GameEquipData diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index d7455572f..8e6ca6a23 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode) { +func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashReq) (errdata *pb.ErrorData) { if req.Eid == "" { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashR } //锻造 -func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (errdata *pb.ErrorData) { var ( equip *pb.DB_Equipment conf *cfg.GameEquipData diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go index 5155f31d8..1cf137ade 100644 --- a/modules/equipment/api_washconfirm.go +++ b/modules/equipment/api_washconfirm.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode) { +func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) { if req.Eid == "" || req.Pids == nil || len(req.Pids) == 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.Equipme } //锻造 -func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) { var ( equip *pb.DB_Equipment attrlibrary *cfg.GameEquipAttrlibrarySData diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 0a084cee8..31607b97e 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -132,7 +132,7 @@ func (this *Equipment) AddNewEquipments(session comm.IUserSession, cIds map[stri return } -func (this *Equipment) AddAllEquipments(session comm.IUserSession) (code pb.ErrorCode) { +func (this *Equipment) AddAllEquipments(session comm.IUserSession) (errdata *pb.ErrorData) { var ( configure *cfg.GameEquip cIds map[string]uint32 @@ -151,7 +151,7 @@ func (this *Equipment) AddAllEquipments(session comm.IUserSession) (code pb.Erro } //删除武器 -func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []string, bPush bool) (code pb.ErrorCode) { +func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []string, bPush bool) (errdata *pb.ErrorData) { var ( err error change []*pb.DB_Equipment @@ -168,7 +168,7 @@ func (this *Equipment) DelEquipments(session comm.IUserSession, equipIds []strin } //创建新的装备 -func (this *Equipment) NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment) { +func (this *Equipment) NewEquipment(uid, cid string) (errdata *pb.ErrorData, equip *pb.DB_Equipment) { var ( conf *cfg.GameEquipData err error @@ -185,7 +185,7 @@ func (this *Equipment) NewEquipment(uid, cid string) (code pb.ErrorCode, equip * } //创建新的装备 -func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode) { +func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equipment) (errdata *pb.ErrorData) { var ( err error configure *cfg.GameEquipData @@ -221,7 +221,7 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi } ///出售装备 -func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno) { +func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) (errdata *pb.ErrorData, atno []*pb.UserAtno) { var ( err error equipments []*pb.DB_Equipment @@ -274,7 +274,7 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) } //回收装备接口 -func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []string, discount int32) (code pb.ErrorCode, atno []*pb.UserAtno) { +func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []string, discount int32) (errdata *pb.ErrorData, atno []*pb.UserAtno) { var ( err error equipments []*pb.DB_Equipment @@ -333,7 +333,7 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin } //获得可操作用户装备列表 -func (this *Equipment) GetActionableEquipments(uid string) (code pb.ErrorCode, eruips []*pb.DB_Equipment) { +func (this *Equipment) GetActionableEquipments(uid string) (errdata *pb.ErrorData, eruips []*pb.DB_Equipment) { var ( err error equipments []*pb.DB_Equipment @@ -351,7 +351,7 @@ func (this *Equipment) GetActionableEquipments(uid string) (code pb.ErrorCode, e } //获取可用套装 (铁匠铺使用) -func (this *Equipment) GetActionableSuit(uid string) (code pb.ErrorCode, Suit []int32) { +func (this *Equipment) GetActionableSuit(uid string) (errdata *pb.ErrorData, Suit []int32) { var ( err error equipments []*pb.DB_Equipment diff --git a/modules/forum/api_getlist.go b/modules/forum/api_getlist.go index 6e38c11b1..4fd89635e 100644 --- a/modules/forum/api_getlist.go +++ b/modules/forum/api_getlist.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetListReq) (errdata *pb.ErrorData) { if req.Herocid == "" { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetLis } ///获取本服聊天消息记录 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (errdata *pb.ErrorData) { var ( err error list []*pb.DBComment diff --git a/modules/forum/api_like.go b/modules/forum/api_like.go index 66e329499..453c2e558 100644 --- a/modules/forum/api_like.go +++ b/modules/forum/api_like.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode) { +func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq) (errdata *pb.ErrorData) { if req.Herocid == "" || req.Cid == "" { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq) } ///获取本服聊天消息记录 -func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (errdata *pb.ErrorData) { var ( err error ) diff --git a/modules/forum/api_releasecomment.go b/modules/forum/api_releasecomment.go index 0178b3916..bf648bd94 100644 --- a/modules/forum/api_releasecomment.go +++ b/modules/forum/api_releasecomment.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode) { +func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (errdata *pb.ErrorData) { if req.Herocid == "" || req.Herooid == "" || req.Content == "" { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.Foru } ///发布评论 -func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (errdata *pb.ErrorData) { var ( err error comment *pb.DBComment diff --git a/modules/forum/api_watchhero.go b/modules/forum/api_watchhero.go index 18edb40fa..66585acca 100644 --- a/modules/forum/api_watchhero.go +++ b/modules/forum/api_watchhero.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode) { +func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatchHeroReq) (errdata *pb.ErrorData) { if req.Uid == "" || req.HerocId == "" || req.HerooId == "" { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatc } ///获取本服聊天消息记录 -func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (errdata *pb.ErrorData) { var ( hero *pb.DBHero err error diff --git a/modules/friend/api_cross_accept.go b/modules/friend/api_cross_accept.go index 78f6d61cf..55daa30ca 100644 --- a/modules/friend/api_cross_accept.go +++ b/modules/friend/api_cross_accept.go @@ -9,14 +9,14 @@ import ( //接受切磋 -func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode) { +func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) { if req.Uid == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) { if code = this.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_addblack.go b/modules/friend/api_cross_addblack.go index 2e590ab63..022a37849 100644 --- a/modules/friend/api_cross_addblack.go +++ b/modules/friend/api_cross_addblack.go @@ -9,7 +9,7 @@ import ( //加入黑名单 -func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode) { +func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddBlackReq) (errdata *pb.ErrorData) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("加入黑名单参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddB return } -func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (errdata *pb.ErrorData) { if code = this.AddblackCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go index cf9e469f8..8df12366a 100644 --- a/modules/friend/api_cross_agree.go +++ b/modules/friend/api_cross_agree.go @@ -9,7 +9,7 @@ import ( //单个/批量同意 -func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode) { +func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeReq) (errdata *pb.ErrorData) { if len(req.FriendIds) == 0 { code = pb.ErrorCode_ReqParameterError this.module.Error("好友审批同意参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -18,7 +18,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeRe return } -func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (errdata *pb.ErrorData) { if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_apply.go b/modules/friend/api_cross_apply.go index 09e479b04..d3739453e 100644 --- a/modules/friend/api_cross_apply.go +++ b/modules/friend/api_cross_apply.go @@ -9,7 +9,7 @@ import ( //好友申请 -func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode) { +func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyReq) (errdata *pb.ErrorData) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("好友申请参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe return } -func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (errdata *pb.ErrorData) { if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_applylist.go b/modules/friend/api_cross_applylist.go index 4947b2ea4..f788c3735 100644 --- a/modules/friend/api_cross_applylist.go +++ b/modules/friend/api_cross_applylist.go @@ -7,11 +7,11 @@ import ( //申请列表 -func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode) { +func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApplyListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (errdata *pb.ErrorData) { var ( self *pb.DBFriend list []*pb.FriendBase diff --git a/modules/friend/api_cross_assisthero.go b/modules/friend/api_cross_assisthero.go index 95f66bf54..506826172 100644 --- a/modules/friend/api_cross_assisthero.go +++ b/modules/friend/api_cross_assisthero.go @@ -9,7 +9,7 @@ import ( // 设置助战英雄 -func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode) { +func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAssistheroReq) (errdata *pb.ErrorData) { if req.HeroObjId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("设置助战英雄参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAs return } -func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (errdata *pb.ErrorData) { if code = this.AssistheroCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_assistherolist.go b/modules/friend/api_cross_assistherolist.go index a8b95ac69..fe1f54a04 100644 --- a/modules/friend/api_cross_assistherolist.go +++ b/modules/friend/api_cross_assistherolist.go @@ -7,11 +7,11 @@ import ( // 好友助战英雄列表 -func (this *apiComp) AssistHeroListCheck(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode) { +func (this *apiComp) AssistHeroListCheck(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (errdata *pb.ErrorData) { //获取玩家自己好友数据 self := this.module.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_cross_assistlist.go b/modules/friend/api_cross_assistlist.go index 2f9560f97..84a7e8150 100644 --- a/modules/friend/api_cross_assistlist.go +++ b/modules/friend/api_cross_assistlist.go @@ -9,11 +9,11 @@ import ( // 助战列表 -func (this *apiComp) AssistlistCheck(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode) { +func (this *apiComp) AssistlistCheck(session comm.IUserSession, req *pb.FriendAssistlistReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (errdata *pb.ErrorData) { var list []*pb.FriendBase //获取玩家自己好友数据 self := this.module.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_cross_blacklist.go b/modules/friend/api_cross_blacklist.go index d6d50e3fd..bed123acd 100644 --- a/modules/friend/api_cross_blacklist.go +++ b/modules/friend/api_cross_blacklist.go @@ -6,11 +6,11 @@ import ( ) // 黑名单列表 -func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode) { +func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (errdata *pb.ErrorData) { var ( self *pb.DBFriend list []*pb.FriendBase diff --git a/modules/friend/api_cross_del.go b/modules/friend/api_cross_del.go index 4950e8352..d9f7e4de3 100644 --- a/modules/friend/api_cross_del.go +++ b/modules/friend/api_cross_del.go @@ -8,7 +8,7 @@ import ( ) // 删除好友 -func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode) { +func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (errdata *pb.ErrorData) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("删除好友参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) ( return } -func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (errdata *pb.ErrorData) { if code = this.DelCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_delblack.go b/modules/friend/api_cross_delblack.go index c262d98be..624c60657 100644 --- a/modules/friend/api_cross_delblack.go +++ b/modules/friend/api_cross_delblack.go @@ -8,7 +8,7 @@ import ( ) // 删除黑名单 -func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode) { +func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (errdata *pb.ErrorData) { if req.FriendId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelB return } -func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (errdata *pb.ErrorData) { if code = this.DelblackCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_getrelation.go b/modules/friend/api_cross_getrelation.go index 94fb7fbbb..937d6090d 100644 --- a/modules/friend/api_cross_getrelation.go +++ b/modules/friend/api_cross_getrelation.go @@ -8,7 +8,7 @@ import ( ) // 获取好友关系 -func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode) { +func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendGetRelationReq) (errdata *pb.ErrorData) { if req.TargetUid == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendG return } -func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (errdata *pb.ErrorData) { if code = this.GetRelationCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index 25fc72b70..d3ee6c9d9 100644 --- a/modules/friend/api_cross_getreward.go +++ b/modules/friend/api_cross_getreward.go @@ -7,11 +7,11 @@ import ( ) // 领取奖励 -func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode) { +func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGetrewardReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (errdata *pb.ErrorData) { uid := session.GetUserId() //获取玩家自己好友数据 self := this.module.modelFriend.GetFriend(uid) diff --git a/modules/friend/api_cross_list.go b/modules/friend/api_cross_list.go index f74a95426..6ae61a8e8 100644 --- a/modules/friend/api_cross_list.go +++ b/modules/friend/api_cross_list.go @@ -8,11 +8,11 @@ import ( //好友列表 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (errdata *pb.ErrorData) { var ( self *pb.DBFriend list []*pb.FriendBase diff --git a/modules/friend/api_cross_qiecuo.go b/modules/friend/api_cross_qiecuo.go index 4ec85d459..963792c89 100644 --- a/modules/friend/api_cross_qiecuo.go +++ b/modules/friend/api_cross_qiecuo.go @@ -7,14 +7,14 @@ import ( ) // 踢馆(熊猫武馆) -func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode) { +func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) { if req.TargetUid == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) { if code = this.QiecuoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_randlist.go b/modules/friend/api_cross_randlist.go index 2d331d935..f29df6301 100644 --- a/modules/friend/api_cross_randlist.go +++ b/modules/friend/api_cross_randlist.go @@ -9,11 +9,11 @@ import ( // 好友推荐 -func (this *apiComp) RandlistCheck(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode) { +func (this *apiComp) RandlistCheck(session comm.IUserSession, req *pb.FriendRandlistReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (errdata *pb.ErrorData) { // 当前玩家好友数据 self := this.module.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_cross_refuse.go b/modules/friend/api_cross_refuse.go index d9c775002..46328e872 100644 --- a/modules/friend/api_cross_refuse.go +++ b/modules/friend/api_cross_refuse.go @@ -8,7 +8,7 @@ import ( ) // 好友审核-拒绝 -func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode) { +func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuseReq) (errdata *pb.ErrorData) { if len(req.FriendIds) == 0 { code = pb.ErrorCode_ReqParameterError this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -18,7 +18,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse } // 单个/批量拒绝 -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (errdata *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_search.go b/modules/friend/api_cross_search.go index 3117a679f..554ac6ef9 100644 --- a/modules/friend/api_cross_search.go +++ b/modules/friend/api_cross_search.go @@ -8,7 +8,7 @@ import ( ) // 搜索 -func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode) { +func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (errdata *pb.ErrorData) { if req.NickName == "" { code = pb.ErrorCode_FriendSearchNameEmpty this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch return } -func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (errdata *pb.ErrorData) { if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_stop.go b/modules/friend/api_cross_stop.go index cdef6072f..2ba0216b3 100644 --- a/modules/friend/api_cross_stop.go +++ b/modules/friend/api_cross_stop.go @@ -6,11 +6,11 @@ import ( ) // 切磋终止 -func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode) { +func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) { if code = this.StopCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index aba83cc86..5f945710b 100644 --- a/modules/friend/api_cross_zan.go +++ b/modules/friend/api_cross_zan.go @@ -8,7 +8,7 @@ import ( ) // 点赞 -func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode) { +func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (errdata *pb.ErrorData) { if len(req.FriendIds) == 0 { code = pb.ErrorCode_ReqParameterError this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) ( return } -func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errdata *pb.ErrorData) { if code = this.ZanCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_zanlist.go b/modules/friend/api_cross_zanlist.go index a9dac148f..41006369e 100644 --- a/modules/friend/api_cross_zanlist.go +++ b/modules/friend/api_cross_zanlist.go @@ -6,12 +6,12 @@ import ( ) // 点赞列表 -func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode) { +func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanlistReq) (errdata *pb.ErrorData) { return } // Deprecated: -func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (errdata *pb.ErrorData) { if code = this.ZanlistCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_zanreceive.go b/modules/friend/api_cross_zanreceive.go index f34d351b7..188d8c054 100644 --- a/modules/friend/api_cross_zanreceive.go +++ b/modules/friend/api_cross_zanreceive.go @@ -9,7 +9,7 @@ import ( // 领取点赞奖励 -func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZanreceiveReq) (errdata *pb.ErrorData) { if len(req.FriendIds) == 0 { code = pb.ErrorCode_ReqParameterError this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZa return } -func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (errdata *pb.ErrorData) { if code = this.ZanreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go index d5dcce80d..a5782f763 100644 --- a/modules/gateway/agent.go +++ b/modules/gateway/agent.go @@ -170,7 +170,7 @@ locp: } // 安全认证 所有协议 -func (this *Agent) secAuth(msg *pb.UserMessage) (code pb.ErrorCode, err error) { +func (this *Agent) secAuth(msg *pb.UserMessage) (errdata *pb.ErrorData, err error) { if !utils.ValidSecretKey(msg.Sec) { //验证失败 this.gateway.Errorf("%v", msg.Sec) return pb.ErrorCode_SignError, fmt.Errorf("key invalid") @@ -179,7 +179,7 @@ func (this *Agent) secAuth(msg *pb.UserMessage) (code pb.ErrorCode, err error) { } // 解码 -func (this *Agent) decodeUserData(msg *pb.UserMessage) (code pb.ErrorCode, err error) { +func (this *Agent) decodeUserData(msg *pb.UserMessage) (errdata *pb.ErrorData, err error) { base64Str := msg.Sec dec, err := base64.StdEncoding.DecodeString(base64Str[35:]) if err != nil { @@ -371,13 +371,13 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { // if v, ok := this.protoMsg[key]; ok && v != 0 { // 发送消息 协议解锁 // v = 0 // } - if reply.Code != pb.ErrorCode_Success { + if reply.ErrorData != nil { data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ MsgId: msg.MsgId, ReqMainType: msg.MainType, ReqSubType: msg.SubType, Arg: msg.Data, - Code: pb.ErrorCode(reply.Code.Number()), + Code: reply.ErrorData.Code, Err: reply.ErrorData}) err = this.WriteMsg(&pb.UserMessage{ MsgId: msg.MsgId, diff --git a/modules/gateway/agentmgr_comp.go b/modules/gateway/agentmgr_comp.go index 1cbc4847a..0605734fe 100644 --- a/modules/gateway/agentmgr_comp.go +++ b/modules/gateway/agentmgr_comp.go @@ -104,8 +104,11 @@ func (this *AgentMgrComp) Bind(ctx context.Context, args *pb.AgentBuildReq, repl } // } } else { - reply.Code = pb.ErrorCode_UserSessionNobeing - reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing) + reply.ErrorData = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Message: fmt.Sprintf("绑定uid:%s失败!", args.WorkerId), + } } return nil } @@ -115,8 +118,11 @@ func (this *AgentMgrComp) UnBind(ctx context.Context, args *pb.AgentUnBuildReq, if a, ok := this.agents.Load(args.UserSessionId); ok { a.(IAgent).UnBind() } else { - reply.Code = pb.ErrorCode_UserSessionNobeing - reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing) + reply.ErrorData = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Message: fmt.Sprintf("解绑SessionId:%s失败!", args.UserSessionId), + } } return nil } @@ -129,8 +135,11 @@ func (this *AgentMgrComp) SendMsgToAgent(ctx context.Context, args *pb.AgentSend a.(IAgent).WriteMsg(v) } } else { - reply.Code = pb.ErrorCode_UserSessionNobeing - reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing) + reply.ErrorData = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Message: fmt.Sprintf("解绑SessionId:%s失败!", args.UserSessionId), + } } return nil } @@ -191,8 +200,11 @@ func (this *AgentMgrComp) CloseAgent(ctx context.Context, args *pb.AgentCloseeRe if a, ok := this.agents.Load(args.UserSessionId); ok { a.(IAgent).Close() } else { - reply.Code = pb.ErrorCode_UserSessionNobeing - reply.ErrorMessage = pb.GetErrorCodeMsg(pb.ErrorCode_UserSessionNobeing) + reply.ErrorData = &pb.ErrorData{ + Code: pb.ErrorCode_UserSessionNobeing, + Title: pb.ErrorCode_UserSessionNobeing.ToString(), + Message: fmt.Sprintf("解绑SessionId:%s失败!", args.UserSessionId), + } } return nil } diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index a5056ecc0..66baa6776 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -40,7 +40,7 @@ import ( 24、bingo:cleannpc */ //参数校验 -func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode) { +func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (errdata *pb.ErrorData) { if len(req.Cmod) == 0 { code = pb.ErrorCode_ReqParameterError } @@ -48,7 +48,7 @@ func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code } ///解析GM 指令 -func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (errdata *pb.ErrorData) { if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/gm/module.go b/modules/gm/module.go index 46a51d638..e3c02e465 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -60,7 +60,7 @@ func (this *GM) OnInstallComp() { } // bingo:Iamyoudad -func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorCode) { +func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.ErrorData) { cmd = strings.Replace(cmd, " ", "", -1) // 去空格 keys := strings.Split(cmd, ":") diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index 35f8d19ad..7cc60687b 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode) { +func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (errdata *pb.ErrorData) { if req.Cid == "" { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm return } -func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (errdata *pb.ErrorData) { code = this.ActivateAtlasCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index 55984ee4d..8e880f9ed 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode) { +func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (errdata *pb.ErrorData) { if req.Cid == "" || len(req.Material) == 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetC } ///获取美食城基本信息 -func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (errdata *pb.ErrorData) { var ( res []*cfg.Gameatn curFood string // 做出来的食物ID diff --git a/modules/gourmet/api_getatlas.go b/modules/gourmet/api_getatlas.go index 7976ad9db..0df9fae3c 100644 --- a/modules/gourmet/api_getatlas.go +++ b/modules/gourmet/api_getatlas.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode) { +func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasReq) (errdata *pb.ErrorData) { return } ///获取美食城基本信息 -func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (errdata *pb.ErrorData) { code = this.AtlasCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/gourmet/api_getranduser.go b/modules/gourmet/api_getranduser.go index 0167b8f35..dcf16af7d 100644 --- a/modules/gourmet/api_getranduser.go +++ b/modules/gourmet/api_getranduser.go @@ -14,7 +14,7 @@ import ( ) //参数校验 -func (this *apiComp) GetRandUserCheck(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode) { +func (this *apiComp) GetRandUserCheck(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (errdata *pb.ErrorData) { if req.People <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -23,7 +23,7 @@ func (this *apiComp) GetRandUserCheck(session comm.IUserSession, req *pb.Gourmet } /// 获取一些玩家数据 -func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (errdata *pb.ErrorData) { var ( szDbUser []*pb.DBUser mapUser map[string]struct{} diff --git a/modules/growtask/api_advreceive.go b/modules/growtask/api_advreceive.go index 651126c8d..1d5d67d89 100644 --- a/modules/growtask/api_advreceive.go +++ b/modules/growtask/api_advreceive.go @@ -7,14 +7,14 @@ import ( //进阶奖励领取 -func (this *apiComp) AdvreceiveCheck(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) AdvreceiveCheck(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (errdata *pb.ErrorData) { if req.TaskType == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (errdata *pb.ErrorData) { if code = this.AdvreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/growtask/api_receive.go b/modules/growtask/api_receive.go index 0fdd66557..c19b23ffb 100644 --- a/modules/growtask/api_receive.go +++ b/modules/growtask/api_receive.go @@ -7,14 +7,14 @@ import ( // 子任务奖励领取 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (errdata *pb.ErrorData) { if req.TaskId == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (errdata *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/growtask/api_tasklist.go b/modules/growtask/api_tasklist.go index ea2b1193a..fe593c25f 100644 --- a/modules/growtask/api_tasklist.go +++ b/modules/growtask/api_tasklist.go @@ -7,14 +7,14 @@ import ( // 成长任务列表 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.GrowtaskListReq) (errdata *pb.ErrorData) { if req.TaskType == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (errdata *pb.ErrorData) { uid := session.GetUserId() gt, err := this.module.modelGrowtask.getUserGrowtask(uid) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 52d92669a..6c62b9767 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode) { +func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenReq) (errdata *pb.ErrorData) { if req.HeroObjID == "" { code = pb.ErrorCode_ReqParameterError return @@ -19,7 +19,7 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe } /// 英雄觉醒 -func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (errdata *pb.ErrorData) { var ( awakenData *cfg.GameHeroAwakenData _hero *pb.DBHero diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index 149c1ab25..3f6d40686 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HeroBuyReq) (errdata *pb.ErrorData) { if req.BuyType == 0 || req.BuyCount == 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HeroBuyReq) (co } ///获取用户商品列表 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (errdata *pb.ErrorData) { var ( err error conf *cfg.GameShopitemData diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 1f2c402eb..c7d8a3bae 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -8,7 +8,7 @@ import ( "math/big" ) -func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode) { +func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) { if req.DrawType < 0 && (req.DrawCount == 1 || req.DrawCount == 10) { // 只能是单抽或10抽 code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa } //抽卡 -func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) { var ( szCards []string // 最终抽到的卡牌 drawCount int32 // 抽卡次数 diff --git a/modules/hero/api_drawCardFloor.go b/modules/hero/api_drawCardFloor.go index b39aa66fd..d4692b62d 100644 --- a/modules/hero/api_drawCardFloor.go +++ b/modules/hero/api_drawCardFloor.go @@ -5,13 +5,13 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode) { +func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (errdata *pb.ErrorData) { return } //抽卡 -func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (errdata *pb.ErrorData) { rsp := &pb.HeroDrawCardFloorResp{} if heroRecord, err := this.module.modelRecord.GetHeroRecord(session.GetUserId()); err == nil { rsp.Star4 = heroRecord.Star4 diff --git a/modules/hero/api_fusion.go b/modules/hero/api_fusion.go index a26febedc..4f90266af 100644 --- a/modules/hero/api_fusion.go +++ b/modules/hero/api_fusion.go @@ -8,14 +8,14 @@ import ( ) //参数校验 -func (this *apiComp) FusionCheck(session comm.IUserSession, req *pb.HeroFusionReq) (code pb.ErrorCode) { +func (this *apiComp) FusionCheck(session comm.IUserSession, req *pb.HeroFusionReq) (errdata *pb.ErrorData) { if req.HeroId == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (errdata *pb.ErrorData) { var ( totalCount int32 mapHero map[string]int32 diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go index b8ee0758d..996bfebcb 100644 --- a/modules/hero/api_info.go +++ b/modules/hero/api_info.go @@ -9,14 +9,14 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (errdata *pb.ErrorData) { if len(req.HeroId) == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (errdata *pb.ErrorData) { var ( uid string ) diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go index c85458b0c..4edc866de 100644 --- a/modules/hero/api_list.go +++ b/modules/hero/api_list.go @@ -8,11 +8,11 @@ import ( ) //参数校验 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.HeroListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (errdata *pb.ErrorData) { rsp := &pb.HeroListResp{} rsp.List = this.module.GetHeroList(session.GetUserId()) diff --git a/modules/hero/api_lock.go b/modules/hero/api_lock.go index 2514fb9b2..177b0d0a1 100644 --- a/modules/hero/api_lock.go +++ b/modules/hero/api_lock.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.HeroLockReq) (code pb.ErrorCode) { +func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.HeroLockReq) (errdata *pb.ErrorData) { if req.Heroid == "" { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.HeroLockReq) ( } /// 英雄锁定 -func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (errdata *pb.ErrorData) { var ( _hero *pb.DBHero ) diff --git a/modules/hero/api_specified.go b/modules/hero/api_specified.go index 64072037a..9645967db 100644 --- a/modules/hero/api_specified.go +++ b/modules/hero/api_specified.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode) { +func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (errdata *pb.ErrorData) { if req.HeroCoinfigID == "" || req.Star <= 0 || req.Lv <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGe } /// 获取指定星级或等级的英雄 GM 协议 -func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (errdata *pb.ErrorData) { code = this.GetSpecifiedCheck(session, req) // check if code != pb.ErrorCode_Success { diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index cdbb04adc..ffeccf47d 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode) { +func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (errdata *pb.ErrorData) { if req.HeroObjID == "" || len(req.Item) == 0 { code = pb.ErrorCode_ReqParameterError return @@ -18,7 +18,7 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H } /// 英雄技能升级 -func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (errdata *pb.ErrorData) { var ( upSkillPos int32 // 升级的技能位置 _hero *pb.DBHero // 操作的英雄 diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 1299bcfef..8e8062643 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode) { +func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (errdata *pb.ErrorData) { if req.HeroObjID == "" { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He } /// 英雄升星 -func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (errdata *pb.ErrorData) { var ( starConf *cfg.GameHeroStarupData // 配置表目标升星英雄信息 _hero *pb.DBHero // 目标英雄 diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index 04f024657..ca3551244 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode) { +func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (errdata *pb.ErrorData) { if req.HeroObjID == "" || len(req.Item) == 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero } /// 英雄升级 -func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (errdata *pb.ErrorData) { var ( addExp int32 // 需要增加的经验 diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index a54023c9d..7ae1d255a 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) TalentLearnCheck(session comm.IUserSession, req *pb.HeroTalentLearnReq) (code pb.ErrorCode) { +func (this *apiComp) TalentLearnCheck(session comm.IUserSession, req *pb.HeroTalentLearnReq) (errdata *pb.ErrorData) { if req.TalentID <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) TalentLearnCheck(session comm.IUserSession, req *pb.HeroTal } // 天赋学习 -func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLearnReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLearnReq) (errdata *pb.ErrorData) { var ( talent *pb.DBHeroTalent err error diff --git a/modules/hero/api_talentlist.go b/modules/hero/api_talentlist.go index 3400eeaff..b900ad933 100644 --- a/modules/hero/api_talentlist.go +++ b/modules/hero/api_talentlist.go @@ -7,11 +7,11 @@ import ( ) //参数校验 -func (this *apiComp) TalentListCheck(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode) { +func (this *apiComp) TalentListCheck(session comm.IUserSession, req *pb.HeroTalentListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) TalentList(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) TalentList(session comm.IUserSession, req *pb.HeroTalentListReq) (errdata *pb.ErrorData) { var ( err error ) diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index 6a8a47032..abe433801 100644 --- a/modules/hero/api_talentreset.go +++ b/modules/hero/api_talentreset.go @@ -7,14 +7,14 @@ import ( ) //参数校验 -func (this *apiComp) TalentResetCheck(session comm.IUserSession, req *pb.HeroTalentResetReq) (code pb.ErrorCode) { +func (this *apiComp) TalentResetCheck(session comm.IUserSession, req *pb.HeroTalentResetReq) (errdata *pb.ErrorData) { if req.ObjId == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentResetReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentResetReq) (errdata *pb.ErrorData) { var ( heroList []*pb.DBHero chanegCard []*pb.DBHero // 推送属性变化 diff --git a/modules/hero/module.go b/modules/hero/module.go index 93fcaba75..a28b84cca 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -122,7 +122,7 @@ func (this *Hero) GetHeroByObjID(uid, heroId string) (*pb.DBHero, pb.ErrorCode) } // 佩戴装备 -func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) { +func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, equip []*pb.DB_Equipment) (errdata *pb.ErrorData) { if hero == nil { code = pb.ErrorCode_HeroNoExist @@ -193,7 +193,7 @@ func (this *Hero) QueryHeroByConfId(uId string, heroCfgId string) (hero *pb.DBHe } // 删除指定卡牌 -func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (code pb.ErrorCode) { +func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (errdata *pb.ErrorData) { err := this.modelHero.consumeHeroCard(udi, hero, amount) if err != nil { code = pb.ErrorCode_DBError @@ -208,7 +208,7 @@ func (this *Hero) CleanData(uid string) { } // 创建一些特殊的英雄 -func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, star, lv int32) (code pb.ErrorCode) { +func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, star, lv int32) (errdata *pb.ErrorData) { if session.GetUserId() == "" || heroConfId == "" || star == 0 || lv == 0 { return pb.ErrorCode_ReqParameterError } @@ -337,7 +337,7 @@ func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp in } // 英雄练功 -func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongfu bool, kongfuUid string) (code pb.ErrorCode) { +func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongfu bool, kongfuUid string) (errdata *pb.ErrorData) { var ( _hero *pb.DBHero _changeHero []*pb.DBHero // 变化的英雄 @@ -642,7 +642,7 @@ func (this *Hero) CheckJuexingHeroNum(uid string, juexingLv int32, star int32) i } // 获取所有满星满级满觉醒的英雄 -func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { +func (this *Hero) GetAllMaxHero(session comm.IUserSession) (errdata *pb.ErrorData) { data := this.modelHero.module.configure.GetHeroConfigData() var ( changeHero []*pb.DBHero @@ -836,7 +836,7 @@ func (this *Hero) InRange(heroRecord *pb.DBHeroRecord, strPool []string, update return } -func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid []string, fulllvenr int32) (code pb.ErrorCode) { +func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid []string, fulllvenr int32) (errdata *pb.ErrorData) { var ( _szHero []*pb.DBHero model *db.DBModel diff --git a/modules/horoscope/api_info.go b/modules/horoscope/api_info.go index a9afc514f..5e6e8ea05 100644 --- a/modules/horoscope/api_info.go +++ b/modules/horoscope/api_info.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HoroscopeInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HoroscopeInfoReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) (errdata *pb.ErrorData) { var ( info *pb.DBHoroscope err error diff --git a/modules/horoscope/api_rest.go b/modules/horoscope/api_rest.go index 1ec9754c4..8a532573e 100644 --- a/modules/horoscope/api_rest.go +++ b/modules/horoscope/api_rest.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) ResetCheck(session comm.IUserSession, req *pb.HoroscopeResetReq) (code pb.ErrorCode) { +func (this *apiComp) ResetCheck(session comm.IUserSession, req *pb.HoroscopeResetReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) (errdata *pb.ErrorData) { var ( info *pb.DBHoroscope conf *cfg.GameGlobalData diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go index 3fbf2ae2c..fff6c23bd 100644 --- a/modules/horoscope/api_upgrade.go +++ b/modules/horoscope/api_upgrade.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (code pb.ErrorCode) { +func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (errdata *pb.ErrorData) { return } ///获取自己的排行榜信息 -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (errdata *pb.ErrorData) { var ( info *pb.DBHoroscope conf *cfg.GameHoroscopeData diff --git a/modules/hunting/api_buy.go b/modules/hunting/api_buy.go index 9cee7c0d2..c6226fcff 100644 --- a/modules/hunting/api_buy.go +++ b/modules/hunting/api_buy.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HuntingBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HuntingBuyReq) (errdata *pb.ErrorData) { if req.Count <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -14,7 +14,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HuntingBuyReq) return } -func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (errdata *pb.ErrorData) { session.SendMsg(string(this.module.GetType()), HuntingBuyResp, &pb.HuntingBuyResp{}) return diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index 6029e5f70..1bd219d3b 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.HuntingChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.HuntingChallengeReq) (errdata *pb.ErrorData) { if req.BossType <= 0 && req.Difficulty > 0 || req.Battle == nil { code = pb.ErrorCode_ReqParameterError return @@ -16,7 +16,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.HuntingCh } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallengeReq) (errdata *pb.ErrorData) { var ( ps int32 ) diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index b046c407c..507a56b7c 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.HuntingChallengeOverReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.HuntingChallengeOverReq) (errdata *pb.ErrorData) { if req.BossType <= 0 && req.Difficulty > 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Hunti } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingChallengeOverReq) (errdata *pb.ErrorData) { var ( mapData map[string]interface{} newChallenge bool // 新的关卡 diff --git a/modules/hunting/api_getlist.go b/modules/hunting/api_getlist.go index 2c2a69a10..40494844f 100644 --- a/modules/hunting/api_getlist.go +++ b/modules/hunting/api_getlist.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.HuntingGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.HuntingGetListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListReq) (errdata *pb.ErrorData) { code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/hunting/api_ranklist.go b/modules/hunting/api_ranklist.go index db65105c9..767d79fe0 100644 --- a/modules/hunting/api_ranklist.go +++ b/modules/hunting/api_ranklist.go @@ -12,12 +12,12 @@ import ( ) //参数校验 -func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.HuntingRankListReq) (code pb.ErrorCode) { +func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.HuntingRankListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankListReq) (errdata *pb.ErrorData) { var ( szRank []*pb.DBHuntingRank rd *redis.StringSliceCmd diff --git a/modules/hunting/module.go b/modules/hunting/module.go index 24032ff69..cf4fc2366 100644 --- a/modules/hunting/module.go +++ b/modules/hunting/module.go @@ -60,7 +60,7 @@ func (this *Hunting) OnInstallComp() { } // 接口信息 -func (this *Hunting) ModifyHuntingData(uid string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Hunting) ModifyHuntingData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelHunting.modifyHuntingDataByObjId(uid, data) if err != nil { code = pb.ErrorCode_DBError @@ -177,7 +177,7 @@ func (this *Hunting) Reddot(session comm.IUserSession, rid ...comm.ReddotType) ( } // 解锁远征所有难度 -func (this *Hunting) CompleteAllLevel(session comm.IUserSession) (code pb.ErrorCode) { +func (this *Hunting) CompleteAllLevel(session comm.IUserSession) (errdata *pb.ErrorData) { list, err := this.modelHunting.getHuntingList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError diff --git a/modules/items/api_buyphysical.go b/modules/items/api_buyphysical.go index 6ac60384b..7ee28f3ad 100644 --- a/modules/items/api_buyphysical.go +++ b/modules/items/api_buyphysical.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyPhysicalCheck(session comm.IUserSession, req *pb.ItemsBuyPhysicalReq) (code pb.ErrorCode) { +func (this *apiComp) BuyPhysicalCheck(session comm.IUserSession, req *pb.ItemsBuyPhysicalReq) (errdata *pb.ErrorData) { if req.Amount <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) BuyPhysicalCheck(session comm.IUserSession, req *pb.ItemsBu } //购买 -func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhysicalReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhysicalReq) (errdata *pb.ErrorData) { var ( err error user *pb.DBUserExpand diff --git a/modules/items/api_buyunifiedticket.go b/modules/items/api_buyunifiedticket.go index ad56c8898..f532194cf 100644 --- a/modules/items/api_buyunifiedticket.go +++ b/modules/items/api_buyunifiedticket.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyUnifiedTicketCheck(session comm.IUserSession, req *pb.ItemsBuyUnifiedTicketReq) (code pb.ErrorCode) { +func (this *apiComp) BuyUnifiedTicketCheck(session comm.IUserSession, req *pb.ItemsBuyUnifiedTicketReq) (errdata *pb.ErrorData) { if req.BuyNum <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) BuyUnifiedTicketCheck(session comm.IUserSession, req *pb.It } //购买 -func (this *apiComp) BuyUnifiedTicket(session comm.IUserSession, req *pb.ItemsBuyUnifiedTicketReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) BuyUnifiedTicket(session comm.IUserSession, req *pb.ItemsBuyUnifiedTicketReq) (errdata *pb.ErrorData) { var ( info *pb.DBUserExpand ) diff --git a/modules/items/api_decompose.go b/modules/items/api_decompose.go index cade22963..dc51b51c5 100644 --- a/modules/items/api_decompose.go +++ b/modules/items/api_decompose.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode) { +func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDecomposeReq) (errdata *pb.ErrorData) { if req.GridId == "" || req.Amount <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDeco } //分解道具 -func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (errdata *pb.ErrorData) { var ( err error item *pb.DB_UserItemData diff --git a/modules/items/api_getlist.go b/modules/items/api_getlist.go index 4a27be265..018c16302 100644 --- a/modules/items/api_getlist.go +++ b/modules/items/api_getlist.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ItemsGetlistReq) (code pb.ErrorCode) { +func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ItemsGetlistReq) (errdata *pb.ErrorData) { return } ///获取用户道具 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ItemsGetlistReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ItemsGetlistReq) (errdata *pb.ErrorData) { var ( err error items []*pb.DB_UserItemData diff --git a/modules/items/api_potionsynthesis.go b/modules/items/api_potionsynthesis.go index 6dcfbfbad..842aeb03b 100644 --- a/modules/items/api_potionsynthesis.go +++ b/modules/items/api_potionsynthesis.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) PotionSynthesisCheck(session comm.IUserSession, req *pb.ItemsPotionSynthesisReq) (code pb.ErrorCode) { +func (this *apiComp) PotionSynthesisCheck(session comm.IUserSession, req *pb.ItemsPotionSynthesisReq) (errdata *pb.ErrorData) { return } //魔药合成 -func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPotionSynthesisReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPotionSynthesisReq) (errdata *pb.ErrorData) { var ( configure *cfg.GamePotionsData need []*cfg.Gameatn diff --git a/modules/items/api_refreshunifiedticket.go b/modules/items/api_refreshunifiedticket.go index 23062ed9d..0c24302a7 100644 --- a/modules/items/api_refreshunifiedticket.go +++ b/modules/items/api_refreshunifiedticket.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) RefreshUnifiedTicketCheck(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (code pb.ErrorCode) { +func (this *apiComp) RefreshUnifiedTicketCheck(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (errdata *pb.ErrorData) { return } //购买 -func (this *apiComp) RefreshUnifiedTicket(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RefreshUnifiedTicket(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (errdata *pb.ErrorData) { if code = this.RefreshUnifiedTicketCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index 605cf5d37..ce6048767 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode) { +func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellItemReq) (errdata *pb.ErrorData) { if req.GridId == "" || req.Amount <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellI } //分解道具 -func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (errdata *pb.ErrorData) { var ( err error item *pb.DB_UserItemData diff --git a/modules/items/api_sellinbulk.go b/modules/items/api_sellinbulk.go index d68330827..b0ee5ec4a 100644 --- a/modules/items/api_sellinbulk.go +++ b/modules/items/api_sellinbulk.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) SellinbulkCheck(session comm.IUserSession, req *pb.ItemsSellinbulkReq) (code pb.ErrorCode) { +func (this *apiComp) SellinbulkCheck(session comm.IUserSession, req *pb.ItemsSellinbulkReq) (errdata *pb.ErrorData) { if req.Grids == nil || req.Amount == nil || len(req.Grids) != len(req.Amount) { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) SellinbulkCheck(session comm.IUserSession, req *pb.ItemsSel } //批量出售 -func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbulkReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbulkReq) (errdata *pb.ErrorData) { var ( err error items []*pb.DB_UserItemData diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 8f57d1d48..e966711f6 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.ItemsUseItemReq) (code pb.ErrorCode) { +func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.ItemsUseItemReq) (errdata *pb.ErrorData) { if req.GridId == "" || req.Amount <= 0 || req.Select < 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.ItemsUseIte } //使用道具 -func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) (errdata *pb.ErrorData) { var ( err error item *pb.DB_UserItemData diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 88ae427d8..0f3330840 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -526,7 +526,7 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf } ///回复门票 -func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (code pb.ErrorCode) { +func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) { var ( user *pb.DBUser info *pb.DBUserExpand diff --git a/modules/items/module.go b/modules/items/module.go index 6f132b332..58e3eafa1 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -87,7 +87,7 @@ func (this *Items) QueryItemsAmount(uId string, itemid ...string) (result map[st return } -func (this *Items) AddItemforGrid(session comm.IUserSession, gridid string, addnum int32, bPush bool) (code pb.ErrorCode) { +func (this *Items) AddItemforGrid(session comm.IUserSession, gridid string, addnum int32, bPush bool) (errdata *pb.ErrorData) { var ( err error change []*pb.DB_UserItemData @@ -112,7 +112,7 @@ func (this *Items) AddItemforGrid(session comm.IUserSession, gridid string, addn } ///添加单个物品到背包 (可以加物品和减物品) -func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (code pb.ErrorCode) { +func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData) { var ( err error change []*pb.DB_UserItemData @@ -173,7 +173,7 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b } //清理背包 -func (this *Items) CleanItems(session comm.IUserSession) (code pb.ErrorCode) { +func (this *Items) CleanItems(session comm.IUserSession) (errdata *pb.ErrorData) { var ( err error itmes []*pb.DB_UserItemData @@ -191,19 +191,19 @@ func (this *Items) CleanItems(session comm.IUserSession) (code pb.ErrorCode) { } //购买门票道具 -func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (code pb.ErrorCode) { +func (this *Items) BuyUnifiedTicket(session comm.IUserSession, buynum int32) (errdata *pb.ErrorData) { _, code = this.modelItems.buyTicket(session, buynum) return } //回复道具 -func (this *Items) RecoverTicket(session comm.IUserSession) (code pb.ErrorCode) { +func (this *Items) RecoverTicket(session comm.IUserSession) (errdata *pb.ErrorData) { code = this.modelItems.recoverTicket(session) return } //出售道具 -func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode, atno []*pb.UserAtno) { +func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) { var ( grids []string = make([]string, 0, len(items)) _itmes []*pb.DB_UserItemData @@ -275,7 +275,7 @@ func (this *Items) itemsChangePush(session comm.IUserSession, items []*pb.DB_Use return } -func (this *Items) CleanItemById(session comm.IUserSession, t string) (code pb.ErrorCode) { +func (this *Items) CleanItemById(session comm.IUserSession, t string) (errdata *pb.ErrorData) { var itmes []*pb.DB_UserItemData if v, err := this.modelItems.QueryUserPack(session.GetUserId()); err == nil { diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index 6a7fd32d8..8aad698b7 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -6,14 +6,14 @@ import ( ) //参数校验 -func (this *apiComp) ActivationFetterCheck(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (code pb.ErrorCode) { +func (this *apiComp) ActivationFetterCheck(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (errdata *pb.ErrorData) { if req.Oid == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (errdata *pb.ErrorData) { code = this.ActivationFetterCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go index f9aa5f030..d03e9a024 100644 --- a/modules/library/api_getfetterlist.go +++ b/modules/library/api_getfetterlist.go @@ -8,12 +8,12 @@ import ( ) //参数校验 -func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode) { +func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (errdata *pb.ErrorData) { if code = this.GetFetterListCheck(session, req); code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/library/api_getlist.go b/modules/library/api_getlist.go index 8104872a3..c815361e2 100644 --- a/modules/library/api_getlist.go +++ b/modules/library/api_getlist.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.LibraryGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.LibraryGetListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.LibraryGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.LibraryGetListReq) (errdata *pb.ErrorData) { code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index c7f289d40..c525a62ed 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -11,14 +11,14 @@ import ( ) //参数校验 -func (this *apiComp) GetStoryRewardCheck(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode) { +func (this *apiComp) GetStoryRewardCheck(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (errdata *pb.ErrorData) { if req.Oid == "" || req.History == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (errdata *pb.ErrorData) { var ( update map[string]interface{} ) diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 3026d56c1..3bfc650a9 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -10,7 +10,7 @@ import ( ) //参数校验 -func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.LibraryLvRewardReq) (code pb.ErrorCode) { +func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.LibraryLvRewardReq) (errdata *pb.ErrorData) { if req.Oid == "" || req.Lv <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -18,7 +18,7 @@ func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.LibraryLvR } // 英雄回礼 -func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvRewardReq) (errdata *pb.ErrorData) { resp := &pb.LibraryLvRewardResp{} code = this.LvRewardCheck(session, req) diff --git a/modules/library/api_lvup.go b/modules/library/api_lvup.go index 3fbc55c34..e782d488c 100644 --- a/modules/library/api_lvup.go +++ b/modules/library/api_lvup.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) FetterLvUpCheck(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode) { +func (this *apiComp) FetterLvUpCheck(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (errdata *pb.ErrorData) { if req.LibOid == "" { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) FetterLvUpCheck(session comm.IUserSession, req *pb.LibraryF } // 羁绊等级奖励 -func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (errdata *pb.ErrorData) { var ( totalFetterLv int32 //羁绊总等级 diff --git a/modules/library/api_maintask.go b/modules/library/api_maintask.go index 1ab3f4b4e..0a688629b 100644 --- a/modules/library/api_maintask.go +++ b/modules/library/api_maintask.go @@ -7,7 +7,7 @@ import ( ) // 羁绊剧情-我的主线任务 -func (this *apiComp) FetterstoryTaskCheck(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (code pb.ErrorCode) { +func (this *apiComp) FetterstoryTaskCheck(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (errdata *pb.ErrorData) { if req.FetterId == 0 { this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError @@ -15,7 +15,7 @@ func (this *apiComp) FetterstoryTaskCheck(session comm.IUserSession, req *pb.Lib return } -func (this *apiComp) FetterstoryTask(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FetterstoryTask(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (errdata *pb.ErrorData) { if code = this.FetterstoryTaskCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 0c23d5d93..8bb59c112 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode) { +func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseGiftReq) (errdata *pb.ErrorData) { if req.Heroid == "" || req.Items == "" || req.Counts == 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseG } // 给英雄赠送美食 -func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (errdata *pb.ErrorData) { var ( res []*cfg.Gameatn maxLv int32 // 羁绊最大等级 diff --git a/modules/library/module.go b/modules/library/module.go index cfced6ed8..2672d36af 100644 --- a/modules/library/module.go +++ b/modules/library/module.go @@ -55,7 +55,7 @@ func (this *Library) Start() (err error) { } // 接口信息 更新藏书馆数据 -func (this *Library) ModifyLibraryData(uid string, obj string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Library) ModifyLibraryData(uid string, obj string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelLibrary.modifyLibraryDataByObjId(uid, obj, data) if err != nil { code = pb.ErrorCode_DBError @@ -132,7 +132,7 @@ func (this *Library) CheckFetter(uid string, hid string) (dbLibrary []*pb.DBLibr return } -func (this *Library) ModifyHeroFetterData(uid string, obj string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Library) ModifyHeroFetterData(uid string, obj string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelFetter.modifyHeroFetterDataByObjId(uid, obj, data) if err != nil { code = pb.ErrorCode_DBError @@ -215,7 +215,7 @@ func (this *Library) SendRpcAddHero(uid string, heroConfId string, serverTag str } // 创建一条羁绊信息 -func (this *Library) AddHeroFetterData(uid, heroConfId string) (code pb.ErrorCode) { +func (this *Library) AddHeroFetterData(uid, heroConfId string) (errdata *pb.ErrorData) { rsp := &pb.LibraryChangePush{} rsp.Data, rsp.Fetter = this.CheckFetter(uid, heroConfId) diff --git a/modules/linestory/api_chapter.go b/modules/linestory/api_chapter.go index 4372356bb..f1fa0adf7 100644 --- a/modules/linestory/api_chapter.go +++ b/modules/linestory/api_chapter.go @@ -6,11 +6,11 @@ import ( ) // 支线剧情任务-章节 -func (this *apiComp) ChapterCheck(session comm.IUserSession, req *pb.LinestoryChapterReq) (code pb.ErrorCode) { +func (this *apiComp) ChapterCheck(session comm.IUserSession, req *pb.LinestoryChapterReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Chapter(session comm.IUserSession, req *pb.LinestoryChapterReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Chapter(session comm.IUserSession, req *pb.LinestoryChapterReq) (errdata *pb.ErrorData) { uid := session.GetUserId() taskMap := this.module.modelLinestory.getChapters(uid) rsp := &pb.LinestoryChapterResp{ diff --git a/modules/linestory/api_maintask.go b/modules/linestory/api_maintask.go index ba377d29e..8d43df4ce 100644 --- a/modules/linestory/api_maintask.go +++ b/modules/linestory/api_maintask.go @@ -7,7 +7,7 @@ import ( ) // 支线剧情-我的主线任务 -func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (code pb.ErrorCode) { +func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (errdata *pb.ErrorData) { if req.ChapterId == 0 { this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError @@ -15,7 +15,7 @@ func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryM return } -func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (errdata *pb.ErrorData) { if code = this.MaintaskCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index 14ea15f43..5bfe8a9b1 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -9,7 +9,7 @@ import ( ) // 章节奖励领取 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryReceiveReq) (errdata *pb.ErrorData) { if req.ChapterId == 0 { this.module.Error("参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError @@ -17,7 +17,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryRe return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceiveReq) (errdata *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/mail/api_delallmail.go b/modules/mail/api_delallmail.go index 8bd448f7c..7d5b3ee85 100644 --- a/modules/mail/api_delallmail.go +++ b/modules/mail/api_delallmail.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) DelAllMailCheck(session comm.IUserSession, req *pb.MailDelAllMailReq) (code pb.ErrorCode) { +func (this *apiComp) DelAllMailCheck(session comm.IUserSession, req *pb.MailDelAllMailReq) (errdata *pb.ErrorData) { if session.GetUserId() == "" { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) DelAllMailCheck(session comm.IUserSession, req *pb.MailDelA } // 删除邮件 -func (this *apiComp) DelAllMail(session comm.IUserSession, req *pb.MailDelAllMailReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) DelAllMail(session comm.IUserSession, req *pb.MailDelAllMailReq) (errdata *pb.ErrorData) { var ( mailinfo []*pb.DBMailData err error diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go index d009c1b00..dc5ef3932 100644 --- a/modules/mail/api_delmail.go +++ b/modules/mail/api_delmail.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode) { +func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMailReq) (errdata *pb.ErrorData) { if session.GetUserId() == "" || req.ObjID == "" { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMail } // 删除邮件 -func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (errdata *pb.ErrorData) { code = this.DelMailCheck(session, req) // check if code != pb.ErrorCode_Success { return diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index f78a023fe..d5c395ef3 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -6,7 +6,7 @@ import ( cfg "go_dreamfactory/sys/configure/structs" ) -func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode) { +func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (errdata *pb.ErrorData) { if req.ObjID == "" { return pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req * } // 领取附件 -func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (errdata *pb.ErrorData) { code = this.GetUserMailAttachmentCheck(session, req) // check if code != pb.ErrorCode_Success { @@ -53,12 +53,12 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma return } -func (this *apiComp) GetAllMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (code pb.ErrorCode) { +func (this *apiComp) GetAllMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (errdata *pb.ErrorData) { var ( mailIds []string diff --git a/modules/mail/api_getmail.go b/modules/mail/api_getmail.go index 5dd49fcdb..20e8c72a2 100644 --- a/modules/mail/api_getmail.go +++ b/modules/mail/api_getmail.go @@ -5,12 +5,12 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetListReq) (errdata *pb.ErrorData) { return } // 查看所有邮件信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) (errdata *pb.ErrorData) { var err error mailinfo := make([]*pb.DBMailData, 0) diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index caf1ce615..6099b865d 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode) { +func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (errdata *pb.ErrorData) { if session.GetUserId() == "" || req.ObjID == "" { code = pb.ErrorCode_ReqParameterError return @@ -14,7 +14,7 @@ func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMa } // 查看某一封邮件 -func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq) (errdata *pb.ErrorData) { var ( err error mail *pb.DBMailData diff --git a/modules/mline/api_challenge.go b/modules/mline/api_challenge.go index a22a56ae2..6b7020219 100644 --- a/modules/mline/api_challenge.go +++ b/modules/mline/api_challenge.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MlineChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MlineChallengeReq) (errdata *pb.ErrorData) { if req.StageId == 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MlineChal } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallengeReq) (errdata *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 ps int32 // 消耗的体力 diff --git a/modules/mline/api_challengeover.go b/modules/mline/api_challengeover.go index 611e9340a..905ed0556 100644 --- a/modules/mline/api_challengeover.go +++ b/modules/mline/api_challengeover.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.MlineChallengeOverReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.MlineChallengeOverReq) (errdata *pb.ErrorData) { if req.StageId == 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Mline } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChallengeOverReq) (errdata *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 stageConf *cfg.GameMainStageData diff --git a/modules/mline/api_cleanstage.go b/modules/mline/api_cleanstage.go index df66a0df8..6149c5611 100644 --- a/modules/mline/api_cleanstage.go +++ b/modules/mline/api_cleanstage.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) CleanStageCheck(session comm.IUserSession, req *pb.MlineCleanStageReq) (code pb.ErrorCode) { +func (this *apiComp) CleanStageCheck(session comm.IUserSession, req *pb.MlineCleanStageReq) (errdata *pb.ErrorData) { if req.StageId == 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) CleanStageCheck(session comm.IUserSession, req *pb.MlineCle } ///挑战主线关卡 -func (this *apiComp) CleanStage(session comm.IUserSession, req *pb.MlineCleanStageReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) CleanStage(session comm.IUserSession, req *pb.MlineCleanStageReq) (errdata *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 stageConf *cfg.GameMainStageData diff --git a/modules/mline/api_getReward.go b/modules/mline/api_getReward.go index 185680de1..9cfd48ac4 100644 --- a/modules/mline/api_getReward.go +++ b/modules/mline/api_getReward.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.MlineGetRewardReq) (code pb.ErrorCode) { +func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.MlineGetRewardReq) (errdata *pb.ErrorData) { if req.CId == 0 || req.Star == 0 { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.MlineGetR } // 领取奖励 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetRewardReq) (errdata *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 update map[string]interface{} diff --git a/modules/mline/api_getlist.go b/modules/mline/api_getlist.go index 04d43886c..abc732544 100644 --- a/modules/mline/api_getlist.go +++ b/modules/mline/api_getlist.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MlineGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MlineGetListReq) (errdata *pb.ErrorData) { if req.CType == 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MlineGetLis } ///获取主线关卡信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) (errdata *pb.ErrorData) { rsp := &pb.MlineGetListResp{} code = this.GetListCheck(session, req) diff --git a/modules/mline/module.go b/modules/mline/module.go index 0034d8084..d63050fea 100644 --- a/modules/mline/module.go +++ b/modules/mline/module.go @@ -88,7 +88,7 @@ func (this *Mline) CheckPoint(uid string) bool { } // 参数 难度 + 章节id -func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32) (code pb.ErrorCode) { +func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32) (errdata *pb.ErrorData) { var del []string connf := this.configure.GetMainStageConf(id) if connf == nil { diff --git a/modules/modulebase.go b/modules/modulebase.go index 67763a140..bbb51d0f9 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -304,7 +304,7 @@ func (this *ModuleBase) SendMsgToSession(mainType, subType string, msg proto.Mes } // 只校验资源 参数 atn格式 -func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) (code pb.ErrorCode) { +func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) (errdata *pb.ErrorData) { var ( items map[string]int32 // 道具背包 批量处理 attrs map[string]int32 // 属性 @@ -341,7 +341,7 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) } // 消耗资源 -func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (code pb.ErrorCode) { +func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (errdata *pb.ErrorData) { var ( items map[string]int32 // 道具背包 批量处理 attrs map[string]int32 // 属性 @@ -399,7 +399,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn } // 发放资源 -func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (code pb.ErrorCode) { +func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (errdata *pb.ErrorData) { var ( items map[string]int32 // 道具背包 批量处理 heros map[string]int32 // 英雄 @@ -615,7 +615,7 @@ func (this *ModuleBase) Panicln(args ...interface{}) { } // 发放资源 -func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (code pb.ErrorCode, atno []*pb.UserAtno) { +func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) { var ( items map[string]int32 // 道具背包 批量处理 heros map[string]int32 // 英雄 diff --git a/modules/moonfantasy/api_ask.go b/modules/moonfantasy/api_ask.go index a89800c0c..fa8c2e045 100644 --- a/modules/moonfantasy/api_ask.go +++ b/modules/moonfantasy/api_ask.go @@ -7,12 +7,12 @@ import ( ) //参数校验 -func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.MoonfantasyAskReq) (code pb.ErrorCode) { +func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.MoonfantasyAskReq) (errdata *pb.ErrorData) { return } ///询问怪物是否可以挑战 -func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) (errdata *pb.ErrorData) { var ( mdata *pb.DBMoonFantasy lock *redis.RedisMutex diff --git a/modules/moonfantasy/api_battle.go b/modules/moonfantasy/api_battle.go index 148740dc5..87c89e3c7 100644 --- a/modules/moonfantasy/api_battle.go +++ b/modules/moonfantasy/api_battle.go @@ -7,12 +7,12 @@ import ( ) //参数校验 -func (this *apiComp) BattleCheck(session comm.IUserSession, req *pb.MoonfantasyBattleReq) (code pb.ErrorCode) { +func (this *apiComp) BattleCheck(session comm.IUserSession, req *pb.MoonfantasyBattleReq) (errdata *pb.ErrorData) { return } ///挑战怪物请求 -func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattleReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattleReq) (errdata *pb.ErrorData) { var ( boss *cfg.GameDreamlandBoosData // umfantasy *pb.DBUserMFantasy diff --git a/modules/moonfantasy/api_buy.go b/modules/moonfantasy/api_buy.go index 94d508beb..9db08e9e2 100644 --- a/modules/moonfantasy/api_buy.go +++ b/modules/moonfantasy/api_buy.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.MoonfantasyBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.MoonfantasyBuyReq) (errdata *pb.ErrorData) { if req.BuyNum == 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.MoonfantasyBuyR } ///询问怪物是否可以挑战 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) (errdata *pb.ErrorData) { var ( info *pb.DBUserMFantasy challengeD *cfg.GameDreamlandChallengeData diff --git a/modules/moonfantasy/api_getlist.go b/modules/moonfantasy/api_getlist.go index 2d6a3860e..e8e9eede0 100644 --- a/modules/moonfantasy/api_getlist.go +++ b/modules/moonfantasy/api_getlist.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.MoonfantasyGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.MoonfantasyGetListReq) (errdata *pb.ErrorData) { return } ///获取用户秘境列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.MoonfantasyGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.MoonfantasyGetListReq) (errdata *pb.ErrorData) { var ( err error info *pb.DBUserMFantasy diff --git a/modules/moonfantasy/api_receive.go b/modules/moonfantasy/api_receive.go index d2958521a..d4cd1c648 100644 --- a/modules/moonfantasy/api_receive.go +++ b/modules/moonfantasy/api_receive.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.MoonfantasyReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.MoonfantasyReceiveReq) (errdata *pb.ErrorData) { if req.Bid == "" || req.Mid == "" { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.Moonfantasy } ///领取战斗奖励 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyReceiveReq) (errdata *pb.ErrorData) { var ( boss *cfg.GameDreamlandBoosData iswin bool diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index 3bb0b460e..cd631a44a 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -194,7 +194,7 @@ func (this *modelDreamComp) triggerbyid(session comm.IUserSession, boosid string } ///查询好友数据 -func (this *modelDreamComp) noticeuserfriend(session comm.IUserSession, mid string, chat *pb.DBChat) (code pb.ErrorCode) { +func (this *modelDreamComp) noticeuserfriend(session comm.IUserSession, mid string, chat *pb.DBChat) (errdata *pb.ErrorData) { var ( // model *db.DBModel // err error diff --git a/modules/notify/api_getlist.go b/modules/notify/api_getlist.go index 097c712cb..ec4a277d7 100644 --- a/modules/notify/api_getlist.go +++ b/modules/notify/api_getlist.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.NotifyGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.NotifyGetListReq) (errdata *pb.ErrorData) { return } ///获取系统公告 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.NotifyGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.NotifyGetListReq) (errdata *pb.ErrorData) { var ( err error userexpand *pb.DBUserExpand diff --git a/modules/oldtimes/api_getall.go b/modules/oldtimes/api_getall.go index 23c9596fc..0828a701f 100644 --- a/modules/oldtimes/api_getall.go +++ b/modules/oldtimes/api_getall.go @@ -6,11 +6,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) GetallCheck(session comm.IUserSession, req *pb.OldtimesGetallReq) (code pb.ErrorCode) { +func (this *apiComp) GetallCheck(session comm.IUserSession, req *pb.OldtimesGetallReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Getall(session comm.IUserSession, req *pb.OldtimesGetallReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getall(session comm.IUserSession, req *pb.OldtimesGetallReq) (errdata *pb.ErrorData) { uid := session.GetUserId() rsp := &pb.OldtimesGetallResp{} diff --git a/modules/oldtimes/api_receive.go b/modules/oldtimes/api_receive.go index 1c9debe4c..1c0dadf37 100644 --- a/modules/oldtimes/api_receive.go +++ b/modules/oldtimes/api_receive.go @@ -5,15 +5,15 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.OldtimesReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.OldtimesReceiveReq) (errdata *pb.ErrorData) { if req.ChapterId <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { - if code = this.ReceiveCheck(session,req);code!=pb.ErrorCode_Success{ +func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveReq) (errdata *pb.ErrorData) { + if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } uid := session.GetUserId() diff --git a/modules/pagoda/api_activate.go b/modules/pagoda/api_activate.go index 1b7c8f38e..c480755d6 100644 --- a/modules/pagoda/api_activate.go +++ b/modules/pagoda/api_activate.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.PagodaActivateReq) (code pb.ErrorCode) { +func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.PagodaActivateReq) (errdata *pb.ErrorData) { return } ///获取主线关卡信息 -func (this *apiComp) Activate(session comm.IUserSession, req *pb.PagodaActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Activate(session comm.IUserSession, req *pb.PagodaActivateReq) (errdata *pb.ErrorData) { var ( list *pb.DBPagoda ) diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go index aacce0046..5eb2f5e0c 100644 --- a/modules/pagoda/api_challenge.go +++ b/modules/pagoda/api_challenge.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.PagodaChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.PagodaChallengeReq) (errdata *pb.ErrorData) { if req.Cid <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.PagodaCha } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChallengeReq) (errdata *pb.ErrorData) { var ( pagoda *pb.DBPagoda err error diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 1be6cdab5..04f524c0e 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -12,7 +12,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (errdata *pb.ErrorData) { if req.Cid <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -21,7 +21,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Pagod } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (errdata *pb.ErrorData) { var ( mapData map[string]interface{} pagoda *pb.DBPagoda diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go index e5c7772c3..462837c5e 100644 --- a/modules/pagoda/api_getReward.go +++ b/modules/pagoda/api_getReward.go @@ -6,14 +6,14 @@ import ( ) //参数校验 -func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode) { +func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGetRewardReq) (errdata *pb.ErrorData) { if req.Id <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (errdata *pb.ErrorData) { code = this.GetRewardCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go index 5f6566736..f489794e5 100644 --- a/modules/pagoda/api_getlist.go +++ b/modules/pagoda/api_getlist.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetListReq) (errdata *pb.ErrorData) { return } ///获取主线关卡信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (errdata *pb.ErrorData) { list, err := this.module.modelPagoda.getPagodaList(session.GetUserId()) if err != nil { diff --git a/modules/pagoda/api_queryrecord.go b/modules/pagoda/api_queryrecord.go index 4b87fc055..7a15b53b3 100644 --- a/modules/pagoda/api_queryrecord.go +++ b/modules/pagoda/api_queryrecord.go @@ -6,11 +6,11 @@ import ( ) //参数校验 -func (this *apiComp) QueryRecordCheck(session comm.IUserSession, req *pb.PagodaQueryRecordReq) (code pb.ErrorCode) { +func (this *apiComp) QueryRecordCheck(session comm.IUserSession, req *pb.PagodaQueryRecordReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) QueryRecord(session comm.IUserSession, req *pb.PagodaQueryRecordReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) QueryRecord(session comm.IUserSession, req *pb.PagodaQueryRecordReq) (errdata *pb.ErrorData) { var ( record *pb.DBPagodaRecord ) diff --git a/modules/pagoda/api_ranklist.go b/modules/pagoda/api_ranklist.go index a0686ad15..08bdd1736 100644 --- a/modules/pagoda/api_ranklist.go +++ b/modules/pagoda/api_ranklist.go @@ -11,12 +11,12 @@ import ( ) //参数校验 -func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.PagodaRankListReq) (code pb.ErrorCode) { +func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.PagodaRankListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListReq) (errdata *pb.ErrorData) { var ( szRank []*pb.DBPagodaRecord rd *redis.StringSliceCmd diff --git a/modules/pagoda/api_warorder.go b/modules/pagoda/api_warorder.go index 9b2e6d2ed..9dfe1ba94 100644 --- a/modules/pagoda/api_warorder.go +++ b/modules/pagoda/api_warorder.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) WarOrderCheck(session comm.IUserSession, req *pb.PagodaWarOrderReq) (code pb.ErrorCode) { +func (this *apiComp) WarOrderCheck(session comm.IUserSession, req *pb.PagodaWarOrderReq) (errdata *pb.ErrorData) { return } // 战令领取 -func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderReq) (errdata *pb.ErrorData) { var ( list *pb.DBPagoda resCfg []*cfg.Gameatn diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 965b8825e..249d9c847 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -51,7 +51,7 @@ func (this *Pagoda) OnInstallComp() { } // 接口信息 -func (this *Pagoda) ModifyPagodaData(uid string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Pagoda) ModifyPagodaData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelPagoda.modifyPagodaDataByObjId(uid, data) if err != nil { code = pb.ErrorCode_DBError @@ -81,7 +81,7 @@ func (this *Pagoda) Start() (err error) { } // 给gm 调用修改爬塔层数 -func (this *Pagoda) ModifyPagodaFloor(session comm.IUserSession, level int32) (code pb.ErrorCode) { +func (this *Pagoda) ModifyPagodaFloor(session comm.IUserSession, level int32) (errdata *pb.ErrorData) { list, _ := this.modelPagoda.getPagodaList(session.GetUserId()) if list != nil { diff --git a/modules/parkour/api_Info.go b/modules/parkour/api_Info.go index d933a5ac0..e3d880f70 100644 --- a/modules/parkour/api_Info.go +++ b/modules/parkour/api_Info.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ParkourInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ParkourInfoReq) (errdata *pb.ErrorData) { return } ///匹配请求 -func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (errdata *pb.ErrorData) { var ( isopen bool info *pb.DBParkour diff --git a/modules/parkour/api_avoid.go b/modules/parkour/api_avoid.go index 9a041a970..52833491b 100644 --- a/modules/parkour/api_avoid.go +++ b/modules/parkour/api_avoid.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) AvoidCheck(session comm.IUserSession, req *pb.ParkourAvoidReq) (code pb.ErrorCode) { +func (this *apiComp) AvoidCheck(session comm.IUserSession, req *pb.ParkourAvoidReq) (errdata *pb.ErrorData) { return } ///游戏 -func (this *apiComp) Avoid(session comm.IUserSession, req *pb.ParkourAvoidReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Avoid(session comm.IUserSession, req *pb.ParkourAvoidReq) (errdata *pb.ErrorData) { var ( ok bool ) diff --git a/modules/parkour/api_changemts.go b/modules/parkour/api_changemts.go index 1053b2d75..c33c438c9 100644 --- a/modules/parkour/api_changemts.go +++ b/modules/parkour/api_changemts.go @@ -7,12 +7,12 @@ import ( ) //参数校验 -func (this *apiComp) ChangeMtsCheck(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (code pb.ErrorCode) { +func (this *apiComp) ChangeMtsCheck(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (errdata *pb.ErrorData) { return } ///游戏 -func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (errdata *pb.ErrorData) { var ( info *pb.DBParkour team *pb.DBParkour diff --git a/modules/parkour/api_getreward.go b/modules/parkour/api_getreward.go index 033e696f9..dcfbce002 100644 --- a/modules/parkour/api_getreward.go +++ b/modules/parkour/api_getreward.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.ParkourGetRewardReq) (code pb.ErrorCode) { +func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.ParkourGetRewardReq) (errdata *pb.ErrorData) { return } ///积分领奖 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ParkourGetRewardReq) (errdata *pb.ErrorData) { var ( info *pb.DBParkour err error diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go index e96f23788..fe03c17e4 100644 --- a/modules/parkour/api_invite.go +++ b/modules/parkour/api_invite.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) InviteCheck(session comm.IUserSession, req *pb.ParkourInviteReq) (code pb.ErrorCode) { +func (this *apiComp) InviteCheck(session comm.IUserSession, req *pb.ParkourInviteReq) (errdata *pb.ErrorData) { if req.Uid == session.GetUserId() { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) InviteCheck(session comm.IUserSession, req *pb.ParkourInvit } ///邀请组队 -func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) (errdata *pb.ErrorData) { var ( info *pb.DBParkour tinfo *pb.DBParkour diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go index 3790689a4..9923744aa 100644 --- a/modules/parkour/api_invitehandle.go +++ b/modules/parkour/api_invitehandle.go @@ -9,12 +9,12 @@ import ( ) //参数校验 -func (this *apiComp) InviteHandleCheck(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (code pb.ErrorCode) { +func (this *apiComp) InviteHandleCheck(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (errdata *pb.ErrorData) { return } ///邀请组队 -func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (errdata *pb.ErrorData) { var ( info *pb.DBParkour tean *pb.DBParkour diff --git a/modules/parkour/api_jointeam.go b/modules/parkour/api_jointeam.go index d19f19092..bd3480d74 100644 --- a/modules/parkour/api_jointeam.go +++ b/modules/parkour/api_jointeam.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (code pb.ErrorCode) { +func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (errdata *pb.ErrorData) { if session.GetUserId() == req.Uid { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) JoinTeamCheck(session comm.IUserSession, req *pb.ParkourJoi } ///请求进入队伍 -func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) JoinTeam(session comm.IUserSession, req *pb.ParkourJoinTeamReq) (errdata *pb.ErrorData) { var ( info *pb.DBParkour tean *pb.DBParkour diff --git a/modules/parkour/api_quitteam.go b/modules/parkour/api_quitteam.go index de8df4949..0b99e639c 100644 --- a/modules/parkour/api_quitteam.go +++ b/modules/parkour/api_quitteam.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) QuitTeamCheck(session comm.IUserSession, req *pb.ParkourQuitTeamReq) (code pb.ErrorCode) { +func (this *apiComp) QuitTeamCheck(session comm.IUserSession, req *pb.ParkourQuitTeamReq) (errdata *pb.ErrorData) { return } ///退出队伍 -func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeamReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) QuitTeam(session comm.IUserSession, req *pb.ParkourQuitTeamReq) (errdata *pb.ErrorData) { var ( tean *pb.DBParkour ntean *pb.DBParkour diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go index 2730411bd..1ffa16719 100644 --- a/modules/parkour/api_racematch.go +++ b/modules/parkour/api_racematch.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode) { +func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (errdata *pb.ErrorData) { if session.GetUserId() != req.Captainid { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRa } ///匹配请求 -func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (errdata *pb.ErrorData) { var ( team *pb.DBParkour tuser *pb.DBUser diff --git a/modules/parkour/api_racematchcancel.go b/modules/parkour/api_racematchcancel.go index cf0110ca0..16517fce6 100644 --- a/modules/parkour/api_racematchcancel.go +++ b/modules/parkour/api_racematchcancel.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) RaceMatchCancelCheck(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (code pb.ErrorCode) { +func (this *apiComp) RaceMatchCancelCheck(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (errdata *pb.ErrorData) { if session.GetUserId() != req.Captainid { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) RaceMatchCancelCheck(session comm.IUserSession, req *pb.Par } ///匹配请求 -func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (errdata *pb.ErrorData) { var ( team *pb.DBParkour users []string diff --git a/modules/parkour/api_ready.go b/modules/parkour/api_ready.go index 7dfb49d50..580898dad 100644 --- a/modules/parkour/api_ready.go +++ b/modules/parkour/api_ready.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) ReadyCheck(session comm.IUserSession, req *pb.ParkourReadyReq) (code pb.ErrorCode) { +func (this *apiComp) ReadyCheck(session comm.IUserSession, req *pb.ParkourReadyReq) (errdata *pb.ErrorData) { return } ///匹配请求 -func (this *apiComp) Ready(session comm.IUserSession, req *pb.ParkourReadyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Ready(session comm.IUserSession, req *pb.ParkourReadyReq) (errdata *pb.ErrorData) { var ( race *RaceItem ok bool diff --git a/modules/parkour/api_recoverhp.go b/modules/parkour/api_recoverhp.go index b5dbe7b1a..074957fa8 100644 --- a/modules/parkour/api_recoverhp.go +++ b/modules/parkour/api_recoverhp.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) RecoverHpCheck(session comm.IUserSession, req *pb.ParkourRecoverHpReq) (code pb.ErrorCode) { +func (this *apiComp) RecoverHpCheck(session comm.IUserSession, req *pb.ParkourRecoverHpReq) (errdata *pb.ErrorData) { return } ///匹配请求 -func (this *apiComp) RecoverHp(session comm.IUserSession, req *pb.ParkourRecoverHpReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RecoverHp(session comm.IUserSession, req *pb.ParkourRecoverHpReq) (errdata *pb.ErrorData) { var ( battle *RaceItem users []string diff --git a/modules/parkour/api_shot.go b/modules/parkour/api_shot.go index c6df0ba17..b4fd796f1 100644 --- a/modules/parkour/api_shot.go +++ b/modules/parkour/api_shot.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) ShotCheck(session comm.IUserSession, req *pb.ParkourShotReq) (code pb.ErrorCode) { +func (this *apiComp) ShotCheck(session comm.IUserSession, req *pb.ParkourShotReq) (errdata *pb.ErrorData) { return } ///匹配请求 -func (this *apiComp) Shot(session comm.IUserSession, req *pb.ParkourShotReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Shot(session comm.IUserSession, req *pb.ParkourShotReq) (errdata *pb.ErrorData) { var ( ok bool ) diff --git a/modules/parkour/api_viewplayer.go b/modules/parkour/api_viewplayer.go index df8a1d9fe..576189f8b 100644 --- a/modules/parkour/api_viewplayer.go +++ b/modules/parkour/api_viewplayer.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) ViewPlayerCheck(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (code pb.ErrorCode) { +func (this *apiComp) ViewPlayerCheck(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (errdata *pb.ErrorData) { return } ///游戏 -func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ViewPlayer(session comm.IUserSession, req *pb.ParkourViewPlayerReq) (errdata *pb.ErrorData) { var ( resp *pb.ParkourViewPlayerResp ) diff --git a/modules/parkour/module.go b/modules/parkour/module.go index abf297800..d7048fb6e 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -70,7 +70,7 @@ func (this *Parkour) OnInstallComp() { } //添加坐骑资源 -func (this *Parkour) AddMounts(session comm.IUserSession, mounts map[string]int32, bPush bool) (code pb.ErrorCode) { +func (this *Parkour) AddMounts(session comm.IUserSession, mounts map[string]int32, bPush bool) (errdata *pb.ErrorData) { var ( result *pb.DBParkour err error diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index 2baf0cea8..000b831ed 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) DailyBuyCheck(session comm.IUserSession, req *pb.PayDailyBuyReq) (code pb.ErrorCode) { +func (this *apiComp) DailyBuyCheck(session comm.IUserSession, req *pb.PayDailyBuyReq) (errdata *pb.ErrorData) { if req.Id == 0 { code = pb.ErrorCode_ReqParameterError return @@ -16,7 +16,7 @@ func (this *apiComp) DailyBuyCheck(session comm.IUserSession, req *pb.PayDailyBu } ///获取系统公告 -func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) (errdata *pb.ErrorData) { var ( info *pb.DBPayDaily conf *cfg.GamePayPackageData diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go index 80c57ef59..0de0d651c 100644 --- a/modules/pay/api_delivery.go +++ b/modules/pay/api_delivery.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliveryReq) (code pb.ErrorCode) { +func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliveryReq) (errdata *pb.ErrorData) { return } ///模拟充值 -func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (errdata *pb.ErrorData) { var ( err error ) diff --git a/modules/pay/api_info.go b/modules/pay/api_info.go index 2e8261ef9..88c502eeb 100644 --- a/modules/pay/api_info.go +++ b/modules/pay/api_info.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PayInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PayInfoReq) (errdata *pb.ErrorData) { return } ///获取系统公告 -func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (errdata *pb.ErrorData) { var ( info *pb.DBPayDaily goods []*cfg.GamePayPackageData diff --git a/modules/pay/api_record.go b/modules/pay/api_record.go index 15085170e..31a346ef7 100644 --- a/modules/pay/api_record.go +++ b/modules/pay/api_record.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) RecordCheck(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode) { +func (this *apiComp) RecordCheck(session comm.IUserSession, req *pb.PayRecordReq) (errdata *pb.ErrorData) { return } ///获取系统公告 -func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (errdata *pb.ErrorData) { var ( info *pb.DBUserPay err error diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index 51dbd834d..62026213f 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -58,7 +58,7 @@ func (this *modelDailyComp) updateUserDaily(info *pb.DBPayDaily) (err error) { } //每日礼包发货 -func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (code pb.ErrorCode, items []*pb.UserAssets) { +func (this *modelDailyComp) delivery(session comm.IUserSession, pid string) (errdata *pb.ErrorData, items []*pb.UserAssets) { var ( info *pb.DBPayDaily conf *cfg.GamePayPackageData diff --git a/modules/pay/module.go b/modules/pay/module.go index 93a5cee7d..d61fdc9f4 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -148,7 +148,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery } //发货 -func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, Price int32) (code pb.ErrorCode) { +func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string, Price int32) (errdata *pb.ErrorData) { var ( conf *cfg.GameRechargeData info *pb.DBUserPay diff --git a/modules/practice/api_accept.go b/modules/practice/api_accept.go index a516205f3..7bc881411 100644 --- a/modules/practice/api_accept.go +++ b/modules/practice/api_accept.go @@ -10,14 +10,14 @@ import ( //接受切磋 -func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.PracticeAcceptReq) (code pb.ErrorCode) { +func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.PracticeAcceptReq) (errdata *pb.ErrorData) { if req.Uid == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq) (errdata *pb.ErrorData) { if code = this.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/practice/api_enrolled.go b/modules/practice/api_enrolled.go index 0051f7f76..7522da3e8 100644 --- a/modules/practice/api_enrolled.go +++ b/modules/practice/api_enrolled.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) EnrolledCheck(session comm.IUserSession, req *pb.PracticeEnrolledReq) (code pb.ErrorCode) { +func (this *apiComp) EnrolledCheck(session comm.IUserSession, req *pb.PracticeEnrolledReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolledReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolledReq) (errdata *pb.ErrorData) { var ( err error diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index d072252c3..a3b755dfd 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -11,13 +11,13 @@ import ( ) //参数校验 -func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode) { +func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeExpulsionReq) (errdata *pb.ErrorData) { return } ///练功请求 驱逐 -func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (errdata *pb.ErrorData) { var ( err error ok bool diff --git a/modules/practice/api_friendromm.go b/modules/practice/api_friendromm.go index be71d6445..02942d718 100644 --- a/modules/practice/api_friendromm.go +++ b/modules/practice/api_friendromm.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) FriendRommCheck(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode) { +func (this *apiComp) FriendRommCheck(session comm.IUserSession, req *pb.PracticeFriendRommReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFriendRommReq) (errdata *pb.ErrorData) { var ( err error rooms []*pb.DBPracticeRoom diff --git a/modules/practice/api_getgymbuff.go b/modules/practice/api_getgymbuff.go index 077f6a44e..aef2a9ad0 100644 --- a/modules/practice/api_getgymbuff.go +++ b/modules/practice/api_getgymbuff.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) GetGymBuffCheck(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (code pb.ErrorCode) { +func (this *apiComp) GetGymBuffCheck(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (errdata *pb.ErrorData) { var ( mryl *cfg.GamePandamasMrylData buff *cfg.GamePandamasBuffData diff --git a/modules/practice/api_gymconfirm.go b/modules/practice/api_gymconfirm.go index 7c8f11fb7..e71f7da83 100644 --- a/modules/practice/api_gymconfirm.go +++ b/modules/practice/api_gymconfirm.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GymConfirmCheck(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (code pb.ErrorCode) { +func (this *apiComp) GymConfirmCheck(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (errdata *pb.ErrorData) { this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ "globalbuff": req.Buffid, diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go index c4d403af4..71a8321fd 100644 --- a/modules/practice/api_gyminfo.go +++ b/modules/practice/api_gyminfo.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) GymInfoCheck(session comm.IUserSession, req *pb.PracticeGymInfoReq) (code pb.ErrorCode) { +func (this *apiComp) GymInfoCheck(session comm.IUserSession, req *pb.PracticeGymInfoReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index 0774edd2d..6ac6d0f34 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode) { +func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_info.go b/modules/practice/api_info.go index de4e0cb20..ce9a8f90b 100644 --- a/modules/practice/api_info.go +++ b/modules/practice/api_info.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PracticeInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PracticeInfoReq) (errdata *pb.ErrorData) { return } ///练功请求 -func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_loot.go b/modules/practice/api_loot.go index cd2ac9139..bf8a32341 100644 --- a/modules/practice/api_loot.go +++ b/modules/practice/api_loot.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) LootCheck(session comm.IUserSession, req *pb.PracticeLootReq) (code pb.ErrorCode) { +func (this *apiComp) LootCheck(session comm.IUserSession, req *pb.PracticeLootReq) (errdata *pb.ErrorData) { return } ///练功请求 蹭馆 -func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (errdata *pb.ErrorData) { var ( err error froom *pb.DBPracticeRoom diff --git a/modules/practice/api_npcbattkle.go b/modules/practice/api_npcbattkle.go index 18bee529f..9f4311bbc 100644 --- a/modules/practice/api_npcbattkle.go +++ b/modules/practice/api_npcbattkle.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) NPCBattkleCheck(session comm.IUserSession, req *pb.PracticeNPCBattkleReq) (code pb.ErrorCode) { +func (this *apiComp) NPCBattkleCheck(session comm.IUserSession, req *pb.PracticeNPCBattkleReq) (errdata *pb.ErrorData) { return } ///npc 战斗请求 -func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBattkleReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBattkleReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index d4d411b1e..e613fd402 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -8,13 +8,13 @@ import ( ) //参数校验 -func (this *apiComp) NPCBattkleFinishCheck(session comm.IUserSession, req *pb.PracticeNPCBattkleFinishReq) (code pb.ErrorCode) { +func (this *apiComp) NPCBattkleFinishCheck(session comm.IUserSession, req *pb.PracticeNPCBattkleFinishReq) (errdata *pb.ErrorData) { return } ///npc 战斗结果请求 -func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.PracticeNPCBattkleFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.PracticeNPCBattkleFinishReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go index 5a3a9835f..763749258 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode) { +func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (errdata *pb.ErrorData) { return } ///npc 此协议废弃 不用 -func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (errdata *pb.ErrorData) { // var ( // err error // room *pb.DBPracticeRoom diff --git a/modules/practice/api_practice.go b/modules/practice/api_practice.go index e2d923272..26e745b80 100644 --- a/modules/practice/api_practice.go +++ b/modules/practice/api_practice.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) PracticeCheck(session comm.IUserSession, req *pb.PracticePracticeReq) (code pb.ErrorCode) { +func (this *apiComp) PracticeCheck(session comm.IUserSession, req *pb.PracticePracticeReq) (errdata *pb.ErrorData) { return } ///练功请求 练功 -func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePracticeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePracticeReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_qiecuo.go b/modules/practice/api_qiecuo.go index 2807a832c..6a6814947 100644 --- a/modules/practice/api_qiecuo.go +++ b/modules/practice/api_qiecuo.go @@ -9,14 +9,14 @@ import ( ) // 踢馆(熊猫武馆) -func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.PracticeQiecuoReq) (code pb.ErrorCode) { +func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.PracticeQiecuoReq) (errdata *pb.ErrorData) { if req.Fid == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq) (errdata *pb.ErrorData) { if code = this.QiecuoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index 98f657f5f..169aa9c9c 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -12,13 +12,13 @@ import ( ) //参数校验 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.PracticeReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.PracticeReceiveReq) (errdata *pb.ErrorData) { return } ///练功请求 奖励 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (errdata *pb.ErrorData) { var ( err error diff --git a/modules/practice/api_refuse.go b/modules/practice/api_refuse.go index 81ba7db8d..a22575aa3 100644 --- a/modules/practice/api_refuse.go +++ b/modules/practice/api_refuse.go @@ -6,12 +6,12 @@ import ( ) // 切磋终止 -func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.PracticeRefuseReq) (code pb.ErrorCode) { +func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.PracticeRefuseReq) (errdata *pb.ErrorData) { return } //拒绝切磋 -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq) (errdata *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index 535e5a27f..2b7d1585c 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) UnLockCheck(session comm.IUserSession, req *pb.PracticeUnLockReq) (code pb.ErrorCode) { +func (this *apiComp) UnLockCheck(session comm.IUserSession, req *pb.PracticeUnLockReq) (errdata *pb.ErrorData) { return } ///练功请求 解锁木桩 -func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index dbb58e636..1ec8a8f73 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.PracticeUpgradeReq) (code pb.ErrorCode) { +func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.PracticeUpgradeReq) (errdata *pb.ErrorData) { return } ///练功请求 蹭馆 -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeReq) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/module.go b/modules/practice/module.go index c3937ff7c..cc1d288d2 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -96,7 +96,7 @@ func (this *Practice) OnInstallComp() { } //添加武馆资源 -func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) { +func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (errdata *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index 00e98ca38..b390e4af7 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyGiftCheck(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (code pb.ErrorCode) { +func (this *apiComp) BuyGiftCheck(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (errdata *pb.ErrorData) { if req.VipLv == 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) BuyGiftCheck(session comm.IUserSession, req *pb.PrivilegeBu } ///获取特权列表 -func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (errdata *pb.ErrorData) { if code = this.BuyGiftCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/privilege/api_buyyueka.go b/modules/privilege/api_buyyueka.go index 270ff69cc..068561fbb 100644 --- a/modules/privilege/api_buyyueka.go +++ b/modules/privilege/api_buyyueka.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyYuekaCheck(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (code pb.ErrorCode) { +func (this *apiComp) BuyYuekaCheck(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (errdata *pb.ErrorData) { if req.CID == "" { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) BuyYuekaCheck(session comm.IUserSession, req *pb.PrivilegeB } ///获取特权列表 -func (this *apiComp) BuyYueka(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) BuyYueka(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (errdata *pb.ErrorData) { if code = this.BuyYuekaCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/privilege/api_getlist.go b/modules/privilege/api_getlist.go index 4d808f007..f691e9403 100644 --- a/modules/privilege/api_getlist.go +++ b/modules/privilege/api_getlist.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.PrivilegeGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.PrivilegeGetListReq) (errdata *pb.ErrorData) { return } ///获取特权列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.PrivilegeGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.PrivilegeGetListReq) (errdata *pb.ErrorData) { list, _ := this.module.modelPrivilege.getPrivilegeList(session.GetUserId()) session.SendMsg(string(this.module.GetType()), PrivilegeGetListResp, &pb.PrivilegeGetListResp{Data: list}) diff --git a/modules/privilege/api_viplist.go b/modules/privilege/api_viplist.go index 9b3b208ce..593712528 100644 --- a/modules/privilege/api_viplist.go +++ b/modules/privilege/api_viplist.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) VipListCheck(session comm.IUserSession, req *pb.PrivilegeVipListReq) (code pb.ErrorCode) { +func (this *apiComp) VipListCheck(session comm.IUserSession, req *pb.PrivilegeVipListReq) (errdata *pb.ErrorData) { return } ///获取特权列表 -func (this *apiComp) VipList(session comm.IUserSession, req *pb.PrivilegeVipListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) VipList(session comm.IUserSession, req *pb.PrivilegeVipListReq) (errdata *pb.ErrorData) { list, _ := this.module.modelVip.getVipList(session.GetUserId()) session.SendMsg(string(this.module.GetType()), PrivilegeVipListResp, &pb.PrivilegeVipListResp{Data: list}) diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 593afa2ca..f640608c6 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -66,7 +66,7 @@ func (this *Privilege) EventUserOffline(uid, sessionid string) { } // 购买了一个新的特权 -func (this *Privilege) Delivery(session comm.IUserSession, cId string) (code pb.ErrorCode, items []*pb.UserAssets) { +func (this *Privilege) Delivery(session comm.IUserSession, cId string) (errdata *pb.ErrorData, items []*pb.UserAssets) { var ( bFind bool ) @@ -182,7 +182,7 @@ func (this *Privilege) Delivery(session comm.IUserSession, cId string) (code pb. } // 续费特权 -func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId string) (code pb.ErrorCode) { +func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId string) (errdata *pb.ErrorData) { list, err := this.modelPrivilege.getPrivilegeList(session.GetUserId()) if err != nil { return diff --git a/modules/pvp/api_activecancel.go b/modules/pvp/api_activecancel.go index f74b2a77d..a7831fa99 100644 --- a/modules/pvp/api_activecancel.go +++ b/modules/pvp/api_activecancel.go @@ -7,12 +7,12 @@ import ( ) //参数校验 -func (this *apiComp) ActiveCancelCheck(session comm.IUserSession, req *pb.PvpActiveCancelReq) (code pb.ErrorCode) { +func (this *apiComp) ActiveCancelCheck(session comm.IUserSession, req *pb.PvpActiveCancelReq) (errdata *pb.ErrorData) { return } ///设置战斗阵型 -func (this *apiComp) ActiveCancel(session comm.IUserSession, req *pb.PvpActiveCancelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ActiveCancel(session comm.IUserSession, req *pb.PvpActiveCancelReq) (errdata *pb.ErrorData) { var ( battle *BattleItem ok bool diff --git a/modules/pvp/api_formation.go b/modules/pvp/api_formation.go index 1fa3e7854..0d8884bad 100644 --- a/modules/pvp/api_formation.go +++ b/modules/pvp/api_formation.go @@ -7,12 +7,12 @@ import ( ) //参数校验 -func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.PvpFormationReq) (code pb.ErrorCode) { +func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.PvpFormationReq) (errdata *pb.ErrorData) { return } ///设置战斗阵型 -func (this *apiComp) Formation(session comm.IUserSession, req *pb.PvpFormationReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Formation(session comm.IUserSession, req *pb.PvpFormationReq) (errdata *pb.ErrorData) { var ( battle *BattleItem ok bool diff --git a/modules/pvp/api_incmd.go b/modules/pvp/api_incmd.go index 58517dee4..6784310b8 100644 --- a/modules/pvp/api_incmd.go +++ b/modules/pvp/api_incmd.go @@ -8,12 +8,12 @@ import ( ) //参数校验 -func (this *apiComp) InCmdCheck(session comm.IUserSession, req *pb.PvpInCmdReq) (code pb.ErrorCode) { +func (this *apiComp) InCmdCheck(session comm.IUserSession, req *pb.PvpInCmdReq) (errdata *pb.ErrorData) { return } ///设置战斗阵型 -func (this *apiComp) InCmd(session comm.IUserSession, req *pb.PvpInCmdReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) InCmd(session comm.IUserSession, req *pb.PvpInCmdReq) (errdata *pb.ErrorData) { var ( battle *BattleItem side int32 diff --git a/modules/pvp/api_into.go b/modules/pvp/api_into.go index 7a804ef85..4c7e4a516 100644 --- a/modules/pvp/api_into.go +++ b/modules/pvp/api_into.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) IntoCheck(session comm.IUserSession, req *pb.PvpIntoReq) (code pb.ErrorCode) { +func (this *apiComp) IntoCheck(session comm.IUserSession, req *pb.PvpIntoReq) (errdata *pb.ErrorData) { return } ///设置战斗阵型 -func (this *apiComp) Into(session comm.IUserSession, req *pb.PvpIntoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Into(session comm.IUserSession, req *pb.PvpIntoReq) (errdata *pb.ErrorData) { var ( battle *BattleItem resp *pb.BattleGetInfoResp = &pb.BattleGetInfoResp{} diff --git a/modules/pvp/api_list.go b/modules/pvp/api_list.go index 2961cc346..94a865d77 100644 --- a/modules/pvp/api_list.go +++ b/modules/pvp/api_list.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.PvpListReq) (code pb.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.PvpListReq) (errdata *pb.ErrorData) { return } ///设置战斗阵型 -func (this *apiComp) List(session comm.IUserSession, req *pb.PvpListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) List(session comm.IUserSession, req *pb.PvpListReq) (errdata *pb.ErrorData) { var ( result []*pb.DBPvpBattle userpvp []*pb.DBPvpBattle diff --git a/modules/pvp/api_loadcomplete.go b/modules/pvp/api_loadcomplete.go index cd1b37c38..a1ccd20ac 100644 --- a/modules/pvp/api_loadcomplete.go +++ b/modules/pvp/api_loadcomplete.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) LoadCompleteCheck(session comm.IUserSession, req *pb.PvpLoadCompleteReq) (code pb.ErrorCode) { +func (this *apiComp) LoadCompleteCheck(session comm.IUserSession, req *pb.PvpLoadCompleteReq) (errdata *pb.ErrorData) { return } ///设置战斗阵型 -func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.PvpLoadCompleteReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.PvpLoadCompleteReq) (errdata *pb.ErrorData) { var ( battle *BattleItem err error diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go index 31b4f30c6..d0aabbade 100644 --- a/modules/reddot/api_get.go +++ b/modules/reddot/api_get.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetCheck(session comm.IUserSession, req *pb.ReddotGetReq) (code pb.ErrorCode) { +func (this *apiComp) GetCheck(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) { return } ///获取系统公告 -func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (errdata *pb.ErrorData) { var ( reddot map[int32]bool = make(map[int32]bool) ) diff --git a/modules/reddot/api_getall.go b/modules/reddot/api_getall.go index 698392dbf..a9567f69b 100644 --- a/modules/reddot/api_getall.go +++ b/modules/reddot/api_getall.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetAllCheck(session comm.IUserSession, req *pb.ReddotGetAllReq) (code pb.ErrorCode) { +func (this *apiComp) GetAllCheck(session comm.IUserSession, req *pb.ReddotGetAllReq) (errdata *pb.ErrorData) { return } ///获取系统公告 -func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq) (errdata *pb.ErrorData) { var ( reddot map[int32]bool = make(map[int32]bool) ) diff --git a/modules/reputation/api_getattrs.go b/modules/reputation/api_getattrs.go index 106c80125..a3978b83f 100644 --- a/modules/reputation/api_getattrs.go +++ b/modules/reputation/api_getattrs.go @@ -6,11 +6,11 @@ import ( ) // 获取阵营天赋属性 -func (this *apiComp) GetattrsCheck(session comm.IUserSession, req *pb.ReputationTalentReq) (code pb.ErrorCode) { +func (this *apiComp) GetattrsCheck(session comm.IUserSession, req *pb.ReputationTalentReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Getattrs(session comm.IUserSession, req *pb.ReputationTalentReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getattrs(session comm.IUserSession, req *pb.ReputationTalentReq) (errdata *pb.ErrorData) { uid := session.GetUserId() rsp := &pb.ReputationTalentResp{} diff --git a/modules/reputation/api_reset.go b/modules/reputation/api_reset.go index 695ae2ba8..e7d0719b6 100644 --- a/modules/reputation/api_reset.go +++ b/modules/reputation/api_reset.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ResetCheck(session comm.IUserSession, req *pb.ReputationTalentresetReq) (code pb.ErrorCode) { +func (this *apiComp) ResetCheck(session comm.IUserSession, req *pb.ReputationTalentresetReq) (errdata *pb.ErrorData) { if req.RaceType < 1 && req.RaceType > 4 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Reset(session comm.IUserSession, req *pb.ReputationTalentresetReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Reset(session comm.IUserSession, req *pb.ReputationTalentresetReq) (errdata *pb.ErrorData) { uid := session.GetUserId() reputation := this.module.modelReputation.getDBReputation(uid) if reputation == nil { diff --git a/modules/reputation/api_talenttest.go b/modules/reputation/api_talenttest.go index c36b257e8..0d5c35783 100644 --- a/modules/reputation/api_talenttest.go +++ b/modules/reputation/api_talenttest.go @@ -6,11 +6,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) TalenttestCheck(session comm.IUserSession, req *pb.ReputationTalenttestReq) (code pb.ErrorCode) { +func (this *apiComp) TalenttestCheck(session comm.IUserSession, req *pb.ReputationTalenttestReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Talenttest(session comm.IUserSession, req *pb.ReputationTalenttestReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Talenttest(session comm.IUserSession, req *pb.ReputationTalenttestReq) (errdata *pb.ErrorData) { rsp := &pb.ReputationTalenttestResp{} lv := this.module.Upgrade(session, req.RaceType, req.FriendValue) this.module.Debug("声望", log.Field{Key: "阵营", Value: req.RaceType}, log.Field{Key: "等级", Value: lv}) diff --git a/modules/reputation/api_upgrade.go b/modules/reputation/api_upgrade.go index 5aa5ca6d6..1259f85bc 100644 --- a/modules/reputation/api_upgrade.go +++ b/modules/reputation/api_upgrade.go @@ -6,11 +6,11 @@ import ( ) // 天赋树升级 -func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.ReputationUpgradeReq) (code pb.ErrorCode) { +func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.ReputationUpgradeReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.ReputationUpgradeReq) (errdata *pb.ErrorData) { uid := session.GetUserId() rsp := &pb.ReputationUpgradeResp{} diff --git a/modules/rtask/api_tasktest.go b/modules/rtask/api_tasktest.go index d83c82300..72de430a2 100644 --- a/modules/rtask/api_tasktest.go +++ b/modules/rtask/api_tasktest.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) RtestCheck(session comm.IUserSession, req *pb.RtaskTestReq) (code pb.ErrorCode) { +func (this *apiComp) RtestCheck(session comm.IUserSession, req *pb.RtaskTestReq) (errdata *pb.ErrorData) { if len(req.Params) < 1 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (errdata *pb.ErrorData) { if code = this.RtestCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/rtask/module.go b/modules/rtask/module.go index e2907e82e..f1daacbc6 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -407,7 +407,7 @@ func (this *ModuleRtask) processTasks(session comm.IUserSession, taskParams ...* // 任务条件校验 // Deprecated -func (this *ModuleRtask) CheckCondi(uid string, condiId int32, params ...int32) (code pb.ErrorCode) { +func (this *ModuleRtask) CheckCondi(uid string, condiId int32, params ...int32) (errdata *pb.ErrorData) { record := this.modelRtaskRecord.getRecord(uid) if record == nil { code = pb.ErrorCode_DataNotFound diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 15d5f8f5d..a96520dce 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -9,7 +9,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (errdata *pb.ErrorData) { if req.ShopType == 0 || req.GoodsId == 0 || req.BuyNum <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -17,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (co } ///获取用户商品列表 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata *pb.ErrorData) { var ( err error conf *cfg.GameShopitemData diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 20157123d..48be01225 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -10,7 +10,7 @@ import ( ) //参数校验 -func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetListReq) (errdata *pb.ErrorData) { if req.SType == 0 { code = pb.ErrorCode_ReqParameterError } @@ -18,7 +18,7 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetList } ///获取用户商品列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (errdata *pb.ErrorData) { var ( err error filed string diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index 4867d573e..06e736f5f 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) AtlasActivateCheck(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode) { +func (this *apiComp) AtlasActivateCheck(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (errdata *pb.ErrorData) { if req.Id == "" { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) AtlasActivateCheck(session comm.IUserSession, req *pb.Smith } // 获取铁匠铺图鉴信息 -func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (errdata *pb.ErrorData) { var ( addScore int32 // 更新图鉴增加的积分 szTask []*pb.BuriedParam diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go index 1a52c134c..292e1a586 100644 --- a/modules/smithy/api_atlasaward.go +++ b/modules/smithy/api_atlasaward.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode) { +func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (errdata *pb.ErrorData) { return } // 一键领取所有可以领取的奖励 -func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (errdata *pb.ErrorData) { var ( res []*cfg.Gameatn respRes []*pb.UserAssets diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 1fc0c9b21..1254220c4 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode) { +func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (errdata *pb.ErrorData) { if req.ReelId == 0 || req.Lava < 0 || req.Quality < 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyFo } // 打造装备 -func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (errdata *pb.ErrorData) { var ( stove *pb.DBStove err error diff --git a/modules/smithy/api_getCustomer.go b/modules/smithy/api_getCustomer.go index 0b54923a9..c05108537 100644 --- a/modules/smithy/api_getCustomer.go +++ b/modules/smithy/api_getCustomer.go @@ -8,11 +8,11 @@ import ( "go.mongodb.org/mongo-driver/mongo" ) -func (this *apiComp) CustomerCheck(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode) { +func (this *apiComp) CustomerCheck(session comm.IUserSession, req *pb.SmithyCustomerReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerReq) (errdata *pb.ErrorData) { customerCount := this.module.ModuleTools.GetGlobalConf().SmithyMaxNpc if customerCount <= 0 { code = pb.ErrorCode_ConfigNoFound diff --git a/modules/smithy/api_getatlas.go b/modules/smithy/api_getatlas.go index 8fd34de49..5ccba2613 100644 --- a/modules/smithy/api_getatlas.go +++ b/modules/smithy/api_getatlas.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode) { +func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtlasListReq) (errdata *pb.ErrorData) { return } // 获取铁匠铺图鉴信息 -func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (errdata *pb.ErrorData) { code = this.AtlasListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/smithy/api_getstoveinfo.go b/modules/smithy/api_getstoveinfo.go index 342ffdd09..de440b202 100644 --- a/modules/smithy/api_getstoveinfo.go +++ b/modules/smithy/api_getstoveinfo.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) GetStoveInfoCheck(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (code pb.ErrorCode) { +func (this *apiComp) GetStoveInfoCheck(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (errdata *pb.ErrorData) { return } // 获取铁匠铺信息 -func (this *apiComp) GetStoveInfo(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetStoveInfo(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (errdata *pb.ErrorData) { code = this.GetStoveInfoCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go index 00a21ee78..eff6029df 100644 --- a/modules/smithy/api_receive.go +++ b/modules/smithy/api_receive.go @@ -7,14 +7,14 @@ import ( ) // 图鉴任务奖励领取 -func (this *apiComp) TaskAwardCheck(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (code pb.ErrorCode) { +func (this *apiComp) TaskAwardCheck(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (errdata *pb.ErrorData) { if req.TaskId == 0 { return pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (errdata *pb.ErrorData) { if code = this.TaskAwardCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/api_refuse.go b/modules/smithy/api_refuse.go index cc957a6d7..d6ade785c 100644 --- a/modules/smithy/api_refuse.go +++ b/modules/smithy/api_refuse.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode) { +func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SmithyRefuseReq) (errdata *pb.ErrorData) { if req.CustomerId == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) (errdata *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index b26c25638..a3c4336d6 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode) { +func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq) (errdata *pb.ErrorData) { if req.ItemId == "" || req.Count <= 0 { code = pb.ErrorCode_ReqParameterError } @@ -15,7 +15,7 @@ func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq) } // 炉子升温 -func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (errdata *pb.ErrorData) { var ( cost []*cfg.Gameatn // 消耗材料 ) diff --git a/modules/smithy/api_stoveup.go b/modules/smithy/api_stoveup.go index 1655daf63..659474268 100644 --- a/modules/smithy/api_stoveup.go +++ b/modules/smithy/api_stoveup.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) StoveUpCheck(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode) { +func (this *apiComp) StoveUpCheck(session comm.IUserSession, req *pb.SmithyStoveUpReq) (errdata *pb.ErrorData) { return } // 炉子升级 -func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (errdata *pb.ErrorData) { code = this.StoveUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/smithy/api_tasklist.go b/modules/smithy/api_tasklist.go index 8c84cd041..ad5ec9ef8 100644 --- a/modules/smithy/api_tasklist.go +++ b/modules/smithy/api_tasklist.go @@ -7,11 +7,11 @@ import ( "go.mongodb.org/mongo-driver/mongo" ) -func (a *apiComp) TasklistCheck(session comm.IUserSession, req *pb.SmithyTasklistReq) (code pb.ErrorCode) { +func (a *apiComp) TasklistCheck(session comm.IUserSession, req *pb.SmithyTasklistReq) (errdata *pb.ErrorData) { return } -func (a *apiComp) Tasklist(session comm.IUserSession, req *pb.SmithyTasklistReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Tasklist(session comm.IUserSession, req *pb.SmithyTasklistReq) (errdata *pb.ErrorData) { if code = a.TasklistCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/api_toolsup.go b/modules/smithy/api_toolsup.go index f37914bfc..e2734957f 100644 --- a/modules/smithy/api_toolsup.go +++ b/modules/smithy/api_toolsup.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) ToolsUpCheck(session comm.IUserSession, req *pb.SmithyToolsUpReq) (code pb.ErrorCode) { +func (this *apiComp) ToolsUpCheck(session comm.IUserSession, req *pb.SmithyToolsUpReq) (errdata *pb.ErrorData) { if req.Id == 0 { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) ToolsUpCheck(session comm.IUserSession, req *pb.SmithyTools } // 工具升级 -func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq) (errdata *pb.ErrorData) { code = this.ToolsUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index a93856dd7..3ed997e8d 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -7,14 +7,14 @@ import ( // 贸易 -func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode) { +func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) (errdata *pb.ErrorData) { if req.CustomerId == 0 || len(req.EquipIds) == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (errdata *pb.ErrorData) { if code = this.SellCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_Formation.go b/modules/sociaty/api_cross_Formation.go index 5b6d4277a..562bb6b03 100644 --- a/modules/sociaty/api_cross_Formation.go +++ b/modules/sociaty/api_cross_Formation.go @@ -7,11 +7,11 @@ import ( ) // 设置阵容 -func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.SociatyBFormationReq) (code pb.ErrorCode) { +func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.SociatyBFormationReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormationReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormationReq) (errdata *pb.ErrorData) { if code = this.FormationCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index 7cd5b8f03..210ec2477 100644 --- a/modules/sociaty/api_cross_accuse.go +++ b/modules/sociaty/api_cross_accuse.go @@ -9,11 +9,11 @@ import ( // 弹劾会长 -func (this *apiComp) AccuseCheck(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode) { +func (this *apiComp) AccuseCheck(session comm.IUserSession, req *pb.SociatyAccuseReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (errdata *pb.ErrorData) { if code = this.AccuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_activitylist.go b/modules/sociaty/api_cross_activitylist.go index bc2b5f9c2..7d2e5bfef 100644 --- a/modules/sociaty/api_cross_activitylist.go +++ b/modules/sociaty/api_cross_activitylist.go @@ -7,11 +7,11 @@ import ( // 活跃度列表 -func (this *apiComp) ActivitylistCheck(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode) { +func (this *apiComp) ActivitylistCheck(session comm.IUserSession, req *pb.SociatyActivityListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (errdata *pb.ErrorData) { data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index a69be248e..58db3f8bb 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -8,7 +8,7 @@ import ( ) // 活跃度领取 -func (this *apiComp) ActivityreceiveCheck(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ActivityreceiveCheck(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (errdata *pb.ErrorData) { if req.Id == 0 { this.module.Error("活跃度领取参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError @@ -16,7 +16,7 @@ func (this *apiComp) ActivityreceiveCheck(session comm.IUserSession, req *pb.Soc return } -func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (errdata *pb.ErrorData) { if code = this.ActivityreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index 5525d6c7f..e2352e438 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -9,7 +9,7 @@ import ( // 公会申请-同意 -func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.SociatyAgreeReq) (code pb.ErrorCode) { +func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.SociatyAgreeReq) (errdata *pb.ErrorData) { if req.Uid == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会申请-同意参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.SociatyAgreeR return } -func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (errdata *pb.ErrorData) { if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index 7fcd6dccb..e4e361b66 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -11,7 +11,7 @@ import ( // 公会申请 -func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyReq) (code pb.ErrorCode) { +func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyReq) (errdata *pb.ErrorData) { if req.SociatyId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会申请参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -19,7 +19,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyR return } -func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (errdata *pb.ErrorData) { if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go index 5550e8371..24a8decba 100644 --- a/modules/sociaty/api_cross_applycancel.go +++ b/modules/sociaty/api_cross_applycancel.go @@ -8,7 +8,7 @@ import ( // 取消公会申请 -func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (code pb.ErrorCode) { +func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (errdata *pb.ErrorData) { if req.SociatyId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会申请取消参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.Sociaty return } -func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (errdata *pb.ErrorData) { if code = this.ApplyCancelCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_applylist.go b/modules/sociaty/api_cross_applylist.go index 15e5576b7..ae7e2fef3 100644 --- a/modules/sociaty/api_cross_applylist.go +++ b/modules/sociaty/api_cross_applylist.go @@ -8,7 +8,7 @@ import ( // 申请列表 -func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.SociatyApplyListReq) (code pb.ErrorCode) { +func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.SociatyApplyListReq) (errdata *pb.ErrorData) { if req.SociatyId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("申请列表参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.SociatyAp return } -func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyListReq) (errdata *pb.ErrorData) { if code = this.ApplyListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_assign.go b/modules/sociaty/api_cross_assign.go index c42230f10..7676c66e0 100644 --- a/modules/sociaty/api_cross_assign.go +++ b/modules/sociaty/api_cross_assign.go @@ -8,7 +8,7 @@ import ( ) // 公会转让 -func (this *apiComp) AssignCheck(session comm.IUserSession, req *pb.SociatyAssignReq) (code pb.ErrorCode) { +func (this *apiComp) AssignCheck(session comm.IUserSession, req *pb.SociatyAssignReq) (errdata *pb.ErrorData) { if req.TargetId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会转让参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) AssignCheck(session comm.IUserSession, req *pb.SociatyAssig return } -func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) (errdata *pb.ErrorData) { if code = this.AssignCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_bossmain.go b/modules/sociaty/api_cross_bossmain.go index e408119af..b918c41a5 100644 --- a/modules/sociaty/api_cross_bossmain.go +++ b/modules/sociaty/api_cross_bossmain.go @@ -9,11 +9,11 @@ import ( // 公会BOSS入口 -func (this *apiComp) BossmainCheck(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode) { +func (this *apiComp) BossmainCheck(session comm.IUserSession, req *pb.SociatyBMainReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq) (errdata *pb.ErrorData) { uid := session.GetUserId() data = &pb.ErrorData{} ggd := this.module.ModuleTools.GetGlobalConf() diff --git a/modules/sociaty/api_cross_bossrank.go b/modules/sociaty/api_cross_bossrank.go index 538895a70..7274c9d10 100644 --- a/modules/sociaty/api_cross_bossrank.go +++ b/modules/sociaty/api_cross_bossrank.go @@ -8,14 +8,14 @@ import ( // 公会BOSS 赛季排行榜 -func (this *apiComp) BrankCheck(session comm.IUserSession, req *pb.SociatyBRankReq) (code pb.ErrorCode) { +func (this *apiComp) BrankCheck(session comm.IUserSession, req *pb.SociatyBRankReq) (errdata *pb.ErrorData) { if req.RankType != 1 && req.RankType != 2 && req.RankType != 3 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Brank(session comm.IUserSession, req *pb.SociatyBRankReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Brank(session comm.IUserSession, req *pb.SociatyBRankReq) (errdata *pb.ErrorData) { if code = this.BrankCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_breceive.go b/modules/sociaty/api_cross_breceive.go index 27fc5122c..ac366474b 100644 --- a/modules/sociaty/api_cross_breceive.go +++ b/modules/sociaty/api_cross_breceive.go @@ -8,14 +8,14 @@ import ( // 公会BOSS 积分奖励领取 -func (this *apiComp) BreceiveCheck(session comm.IUserSession, req *pb.SociatyBReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) BreceiveCheck(session comm.IUserSession, req *pb.SociatyBReceiveReq) (errdata *pb.ErrorData) { if req.TaskId <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceiveReq) (errdata *pb.ErrorData) { if code = this.BreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index 117d042e9..e595d9963 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -7,14 +7,14 @@ import ( cfg "go_dreamfactory/sys/configure/structs" ) -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.SociatyBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.SociatyBuyReq) (errdata *pb.ErrorData) { if req.Atn != nil && req.Atn.N <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errdata *pb.ErrorData) { if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success { return } @@ -77,7 +77,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code //扣除资源 if code = this.module.DispenseRes(session, atn, true); code != pb.ErrorCode_Success { - data.Title =code.ToString() + data.Title = code.ToString() return } diff --git a/modules/sociaty/api_cross_challengefinish.go b/modules/sociaty/api_cross_challengefinish.go index 06d22d599..d83203ad5 100644 --- a/modules/sociaty/api_cross_challengefinish.go +++ b/modules/sociaty/api_cross_challengefinish.go @@ -7,11 +7,11 @@ import ( ) // 结束挑战 -func (this *apiComp) ChallengefinishCheck(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengefinishCheck(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (errdata *pb.ErrorData) { if code = this.ChallengefinishCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_challengestart.go b/modules/sociaty/api_cross_challengestart.go index 1ede70fea..03544b595 100644 --- a/modules/sociaty/api_cross_challengestart.go +++ b/modules/sociaty/api_cross_challengestart.go @@ -8,11 +8,11 @@ import ( ) // 开始挑战 -func (this *apiComp) ChallengestartCheck(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengestartCheck(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (errdata *pb.ErrorData) { if code = this.ChallengestartCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index 1bbe40ec3..2d4f81965 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -14,7 +14,7 @@ import ( ) // 公会创建 -func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreateReq) (code pb.ErrorCode) { +func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreateReq) (errdata *pb.ErrorData) { if len(req.Notice) > 150 || strings.TrimSpace(req.Name) == "" { this.module.Error("公会创建参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError @@ -22,7 +22,7 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreat return } -func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) (errdata *pb.ErrorData) { if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 12c3a9a2d..f21c857bd 100644 --- a/modules/sociaty/api_cross_discharge.go +++ b/modules/sociaty/api_cross_discharge.go @@ -9,7 +9,7 @@ import ( // 踢出公会 -func (this *apiComp) DischargeCheck(session comm.IUserSession, req *pb.SociatyDischargeReq) (code pb.ErrorCode) { +func (this *apiComp) DischargeCheck(session comm.IUserSession, req *pb.SociatyDischargeReq) (errdata *pb.ErrorData) { if req.TargetId == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("踢出公会参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) DischargeCheck(session comm.IUserSession, req *pb.SociatyDi return } -func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischargeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischargeReq) (errdata *pb.ErrorData) { if code = this.DischargeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go index 99a33e283..059f65f13 100644 --- a/modules/sociaty/api_cross_dismiss.go +++ b/modules/sociaty/api_cross_dismiss.go @@ -9,7 +9,7 @@ import ( // 公会解散/取消解散 -func (this *apiComp) DismissCheck(session comm.IUserSession, req *pb.SociatyDismissReq) (code pb.ErrorCode) { +func (this *apiComp) DismissCheck(session comm.IUserSession, req *pb.SociatyDismissReq) (errdata *pb.ErrorData) { if req.Dismiss > 1 { code = pb.ErrorCode_ReqParameterError this.module.Error("公会解散参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -17,7 +17,7 @@ func (this *apiComp) DismissCheck(session comm.IUserSession, req *pb.SociatyDism return } -func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissReq) (errdata *pb.ErrorData) { if code = this.DismissCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_list.go b/modules/sociaty/api_cross_list.go index e3467720a..e6764fd83 100644 --- a/modules/sociaty/api_cross_list.go +++ b/modules/sociaty/api_cross_list.go @@ -7,7 +7,7 @@ import ( ) // 公会列表 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq) (code pb.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq) (errdata *pb.ErrorData) { if req.Filter > 3 { code = pb.ErrorCode_ReqParameterError this.module.Error("公会列表参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -15,7 +15,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq return } -func (this *apiComp) List(session comm.IUserSession, req *pb.SociatyListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) List(session comm.IUserSession, req *pb.SociatyListReq) (errdata *pb.ErrorData) { if code = this.ListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_log.go b/modules/sociaty/api_cross_log.go index deac3cd7d..0e40968a3 100644 --- a/modules/sociaty/api_cross_log.go +++ b/modules/sociaty/api_cross_log.go @@ -8,11 +8,11 @@ import ( // 公会日志 -func (this *apiComp) LogCheck(session comm.IUserSession, req *pb.SociatyLogReq) (code pb.ErrorCode) { +func (this *apiComp) LogCheck(session comm.IUserSession, req *pb.SociatyLogReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Log(session comm.IUserSession, req *pb.SociatyLogReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Log(session comm.IUserSession, req *pb.SociatyLogReq) (errdata *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_members.go b/modules/sociaty/api_cross_members.go index 50f5fe032..f8771cc8a 100644 --- a/modules/sociaty/api_cross_members.go +++ b/modules/sociaty/api_cross_members.go @@ -8,11 +8,11 @@ import ( // 公会成员列表 -func (this *apiComp) MembersCheck(session comm.IUserSession, req *pb.SociatyMembersReq) (code pb.ErrorCode) { +func (this *apiComp) MembersCheck(session comm.IUserSession, req *pb.SociatyMembersReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Members(session comm.IUserSession, req *pb.SociatyMembersReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Members(session comm.IUserSession, req *pb.SociatyMembersReq) (errdata *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index f1c05bcfb..4c6d4ab88 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -9,11 +9,11 @@ import ( // 我的公会 -func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode) { +func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (errdata *pb.ErrorData) { data = &pb.ErrorData{} uid := session.GetUserId() userEx, err := this.module.ModuleUser.GetUserExpand(uid) diff --git a/modules/sociaty/api_cross_quit.go b/modules/sociaty/api_cross_quit.go index 02593cfc3..99e0e28c6 100644 --- a/modules/sociaty/api_cross_quit.go +++ b/modules/sociaty/api_cross_quit.go @@ -9,11 +9,11 @@ import ( // 退出公会 -func (this *apiComp) QuitCheck(session comm.IUserSession, req *pb.SociatyQuitReq) (code pb.ErrorCode) { +func (this *apiComp) QuitCheck(session comm.IUserSession, req *pb.SociatyQuitReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (errdata *pb.ErrorData) { data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) diff --git a/modules/sociaty/api_cross_rank.go b/modules/sociaty/api_cross_rank.go index 409aba5a6..702425fec 100644 --- a/modules/sociaty/api_cross_rank.go +++ b/modules/sociaty/api_cross_rank.go @@ -7,11 +7,11 @@ import ( // 公会排行榜 -func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.SociatyRankReq) (code pb.ErrorCode) { +func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.SociatyRankReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Rank(session comm.IUserSession, req *pb.SociatyRankReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Rank(session comm.IUserSession, req *pb.SociatyRankReq) (errdata *pb.ErrorData) { // 排行榜 list := this.module.modelSociaty.rank() rsp := &pb.SociatyRankResp{ diff --git a/modules/sociaty/api_cross_receive.go b/modules/sociaty/api_cross_receive.go index 8d1effe17..d012f67f5 100644 --- a/modules/sociaty/api_cross_receive.go +++ b/modules/sociaty/api_cross_receive.go @@ -8,7 +8,7 @@ import ( // 公会任务奖励领取 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.SociatyReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.SociatyReceiveReq) (errdata *pb.ErrorData) { if req.TaskId == 0 { code = pb.ErrorCode_ReqParameterError this.module.Error("公会任务奖励领取参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.SociatyRece return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveReq) (errdata *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_recommend.go b/modules/sociaty/api_cross_recommend.go index 41a924a76..02b106a45 100644 --- a/modules/sociaty/api_cross_recommend.go +++ b/modules/sociaty/api_cross_recommend.go @@ -6,14 +6,14 @@ import ( ) // 公会BOSS 推荐 -func (this *apiComp) RecommendCheck(session comm.IUserSession, req *pb.SociatyRecommendReq) (code pb.ErrorCode) { +func (this *apiComp) RecommendCheck(session comm.IUserSession, req *pb.SociatyRecommendReq) (errdata *pb.ErrorData) { if req.Cate != 1 && req.Cate != 2 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Recommend(session comm.IUserSession, req *pb.SociatyRecommendReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Recommend(session comm.IUserSession, req *pb.SociatyRecommendReq) (errdata *pb.ErrorData) { if code = this.RecommendCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_refuse.go b/modules/sociaty/api_cross_refuse.go index 84f2ece25..670faea4d 100644 --- a/modules/sociaty/api_cross_refuse.go +++ b/modules/sociaty/api_cross_refuse.go @@ -8,7 +8,7 @@ import ( // 公会申请审核-拒绝 -func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SociatyRefuseReq) (code pb.ErrorCode) { +func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SociatyRefuseReq) (errdata *pb.ErrorData) { if req.Uid == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会申请审核-拒绝参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SociatyRefus return } -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) (errdata *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_search.go b/modules/sociaty/api_cross_search.go index f89fa39e5..3a41489b9 100644 --- a/modules/sociaty/api_cross_search.go +++ b/modules/sociaty/api_cross_search.go @@ -7,7 +7,7 @@ import ( ) // 公会搜索 -func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.SociatySearchReq) (code pb.ErrorCode) { +func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.SociatySearchReq) (errdata *pb.ErrorData) { if req.Name == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会搜索参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -15,7 +15,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.SociatySearc return } -func (this *apiComp) Search(session comm.IUserSession, req *pb.SociatySearchReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Search(session comm.IUserSession, req *pb.SociatySearchReq) (errdata *pb.ErrorData) { if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_setting.go b/modules/sociaty/api_cross_setting.go index 6787a5c67..dcb580b25 100644 --- a/modules/sociaty/api_cross_setting.go +++ b/modules/sociaty/api_cross_setting.go @@ -8,7 +8,7 @@ import ( // 公会设置 -func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySettingReq) (code pb.ErrorCode) { +func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySettingReq) (errdata *pb.ErrorData) { if len(req.Notice) > 150 || req.ApplyLv == 0 || req.Icon == "" { code = pb.ErrorCode_ReqParameterError this.module.Error("公会设置参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -16,7 +16,7 @@ func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySett return } -func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingReq) (errdata *pb.ErrorData) { if code = this.SettingCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_settingjob.go b/modules/sociaty/api_cross_settingjob.go index 4c6b28135..73ba49b3b 100644 --- a/modules/sociaty/api_cross_settingjob.go +++ b/modules/sociaty/api_cross_settingjob.go @@ -7,7 +7,7 @@ import ( ) // 设置职位 -func (this *apiComp) SettingJobCheck(session comm.IUserSession, req *pb.SociatySettingJobReq) (code pb.ErrorCode) { +func (this *apiComp) SettingJobCheck(session comm.IUserSession, req *pb.SociatySettingJobReq) (errdata *pb.ErrorData) { if req.TargetId == "" || req.Job == 0 { code = pb.ErrorCode_ReqParameterError this.module.Error("公会设置职位参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) @@ -15,7 +15,7 @@ func (this *apiComp) SettingJobCheck(session comm.IUserSession, req *pb.SociatyS return } -func (this *apiComp) SettingJob(session comm.IUserSession, req *pb.SociatySettingJobReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) SettingJob(session comm.IUserSession, req *pb.SociatySettingJobReq) (errdata *pb.ErrorData) { if code = this.SettingJobCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go index e660e1915..e859aca28 100644 --- a/modules/sociaty/api_cross_sign.go +++ b/modules/sociaty/api_cross_sign.go @@ -7,11 +7,11 @@ import ( ) // 签到 -func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.SociatySignReq) (code pb.ErrorCode) { +func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.SociatySignReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (errdata *pb.ErrorData) { if code = this.SignCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go index 3f564a3a7..77325c005 100644 --- a/modules/sociaty/api_cross_tasklist.go +++ b/modules/sociaty/api_cross_tasklist.go @@ -8,11 +8,11 @@ import ( // 任务列表 -func (this *apiComp) TaskListCheck(session comm.IUserSession, req *pb.SociatyTaskListReq) (code pb.ErrorCode) { +func (this *apiComp) TaskListCheck(session comm.IUserSession, req *pb.SociatyTaskListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskListReq) (errdata *pb.ErrorData) { uid := session.GetUserId() data = &pb.ErrorData{} sociaty := this.module.modelSociaty.getUserSociaty(uid) diff --git a/modules/sys/api_activate.go b/modules/sys/api_activate.go index aad7a6c73..40bed01b6 100644 --- a/modules/sys/api_activate.go +++ b/modules/sys/api_activate.go @@ -6,11 +6,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) FuncActivateCheck(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode) { +func (this *apiComp) FuncActivateCheck(session comm.IUserSession, req *pb.SysFuncActivateReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActivateReq) (errdata *pb.ErrorData) { rsp := &pb.SysFuncActivateResp{} diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go index 0ab2b46eb..2b91eb2ab 100644 --- a/modules/sys/api_getlist.go +++ b/modules/sys/api_getlist.go @@ -5,11 +5,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) FuncGetListCheck(session comm.IUserSession, req *pb.SysFuncGetListReq) (code pb.ErrorCode) { +func (this *apiComp) FuncGetListCheck(session comm.IUserSession, req *pb.SysFuncGetListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetListReq) (errdata *pb.ErrorData) { rsp := &pb.SysFuncGetListResp{} rsp.Cond = make(map[string]int32, 0) diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index 6ddc07ef8..33aff6919 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -26,7 +26,7 @@ func (this *ModelSys) Init(service core.IService, module core.IModule, comp core } // 是否允许访问功能,条件:玩家等级 -func (this *ModelSys) IsAccess(funName string, uid string) (code pb.ErrorCode) { +func (this *ModelSys) IsAccess(funName string, uid string) (errdata *pb.ErrorData) { // user := this.moduleSys.ModuleUser.GetUser(uid) // if user != nil { // if conf := this.moduleSys.configure.getFuncCfg(funName); conf != nil { diff --git a/modules/sys/module.go b/modules/sys/module.go index 8ba9adbcf..6b8b01c49 100644 --- a/modules/sys/module.go +++ b/modules/sys/module.go @@ -38,7 +38,7 @@ func (this *ModuleSys) GetType() core.M_Modules { return comm.ModuleSys } -func (this *ModuleSys) IsAccess(funcName string, userId string) (code pb.ErrorCode) { +func (this *ModuleSys) IsAccess(funcName string, userId string) (errdata *pb.ErrorData) { return this.modelSys.IsAccess(funcName, userId) } diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index bdfc0e416..5ab37fbe3 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -6,14 +6,14 @@ import ( ) // 活跃度列表 -func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode) { +func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActiveListReq) (errdata *pb.ErrorData) { if req.TaskTag <= 0 || req.TaskTag > 2 { code = pb.ErrorCode_TaskTagEmpty } return } -func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveListReq) (errdata *pb.ErrorData) { if code = this.ActiveListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 00e6b7dba..6da68f74a 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -8,7 +8,7 @@ import ( ) // 活跃度领取 -func (this *apiComp) ActiveReceiveCheck(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ActiveReceiveCheck(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (errdata *pb.ErrorData) { if req.Id == 0 { code = pb.ErrorCode_TaskIdEmpty } else if req.TaskTag <= 0 || req.TaskTag > 2 { @@ -17,7 +17,7 @@ func (this *apiComp) ActiveReceiveCheck(session comm.IUserSession, req *pb.TaskA return } -func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (errdata *pb.ErrorData) { if code = this.ActiveReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_getrecord.go b/modules/task/api_getrecord.go index eb9029761..2c2943966 100644 --- a/modules/task/api_getrecord.go +++ b/modules/task/api_getrecord.go @@ -5,13 +5,13 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode) { +func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.TaskGetrecordReq) (errdata *pb.ErrorData) { return } // 获取玩家任务条件记录 // 客户端会在登录时拉取此数据 -func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.TaskGetrecordReq) (errdata *pb.ErrorData) { rsp := &pb.TaskGetrecordResp{} if imodule, err := this.service.GetModule(comm.ModuleRtask); err == nil { if itask, ok := imodule.(comm.IRtask); ok { diff --git a/modules/task/api_list.go b/modules/task/api_list.go index 1c04c78ef..57717a83b 100644 --- a/modules/task/api_list.go +++ b/modules/task/api_list.go @@ -7,14 +7,14 @@ import ( // 任务列表 -func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.TaskListReq) (code pb.ErrorCode) { +func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.TaskListReq) (errdata *pb.ErrorData) { if req.TaskTag <= 0 || req.TaskTag > 3 { code = pb.ErrorCode_TaskTagEmpty } return } -func (this *apiComp) List(session comm.IUserSession, req *pb.TaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) List(session comm.IUserSession, req *pb.TaskListReq) (errdata *pb.ErrorData) { if code = this.ListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 7e5903549..241c869be 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -9,7 +9,7 @@ import ( //任务奖励领取 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceiveReq) (code pb.ErrorCode) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceiveReq) (errdata *pb.ErrorData) { if req.Id == 0 { code = pb.ErrorCode_TaskIdEmpty } else if req.TaskTag == 0 { @@ -18,7 +18,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceive return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) (errdata *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_send.go b/modules/task/api_send.go index 5721e4173..77887d823 100644 --- a/modules/task/api_send.go +++ b/modules/task/api_send.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.TaskSendReq) (code pb.ErrorCode) { +func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.TaskSendReq) (errdata *pb.ErrorData) { if len(req.Params) == 0 || req.TaskType == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Send(session comm.IUserSession, req *pb.TaskSendReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Send(session comm.IUserSession, req *pb.TaskSendReq) (errdata *pb.ErrorData) { // if imodule, err := this.service.GetModule(comm.ModuleRtask); err == nil { // if itask, ok := imodule.(comm.IRtask); ok { // itask.TriggerTask(session.GetUserId(), comm.GetTaskParam(comm.TaskType(req.TaskType), req.Params...)) diff --git a/modules/user/api_battlerecord.go b/modules/user/api_battlerecord.go index b7c6e3ea0..de1cf5804 100644 --- a/modules/user/api_battlerecord.go +++ b/modules/user/api_battlerecord.go @@ -6,11 +6,11 @@ import ( ) // 玩家战斗记录 -func (this *apiComp) BattlerecordCheck(session comm.IUserSession, req *pb.UserBattlerecordReq) (code pb.ErrorCode) { +func (this *apiComp) BattlerecordCheck(session comm.IUserSession, req *pb.UserBattlerecordReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattlerecordReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattlerecordReq) (errdata *pb.ErrorData) { var uid string if req.Uid == "" { uid = session.GetUserId() diff --git a/modules/user/api_changetips.go b/modules/user/api_changetips.go index 9e540505d..27b5e5c28 100644 --- a/modules/user/api_changetips.go +++ b/modules/user/api_changetips.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) ChangeTipsCheck(session comm.IUserSession, req *pb.UserChangeTipsReq) (code pb.ErrorCode) { +func (this *apiComp) ChangeTipsCheck(session comm.IUserSession, req *pb.UserChangeTipsReq) (errdata *pb.ErrorData) { return } //修改提示次数 -func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTipsReq) (code pb.ErrorCode, data *pb.ErrorData) { +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 { diff --git a/modules/user/api_create.go b/modules/user/api_create.go index a637413be..714529b4e 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -8,7 +8,7 @@ import ( "strings" ) -func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateReq) (code pb.ErrorCode) { +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 @@ -22,7 +22,7 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateRe } // 创角 -func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (code pb.ErrorCode, edata *pb.ErrorData) { +func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData, edata *pb.ErrorData) { if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_getserverdata.go b/modules/user/api_getserverdata.go index d3383c022..f5e6cac1f 100644 --- a/modules/user/api_getserverdata.go +++ b/modules/user/api_getserverdata.go @@ -9,11 +9,11 @@ import ( "go.mongodb.org/mongo-driver/bson" ) -func (this *apiComp) GetServerDataCheck(session comm.IUserSession, req *pb.UserGetServerDataReq) (code pb.ErrorCode) { +func (this *apiComp) GetServerDataCheck(session comm.IUserSession, req *pb.UserGetServerDataReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetServerData(session comm.IUserSession, req *pb.UserGetServerDataReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetServerData(session comm.IUserSession, req *pb.UserGetServerDataReq) (errdata *pb.ErrorData) { rsp := &pb.UserGetServerDataResp{ Data: &pb.DBServerData{}, diff --git a/modules/user/api_getsetting.go b/modules/user/api_getsetting.go index ffa4c969f..529099dbb 100644 --- a/modules/user/api_getsetting.go +++ b/modules/user/api_getsetting.go @@ -5,11 +5,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) GetsettingCheck(session comm.IUserSession, req *pb.UserGetSettingReq) (code pb.ErrorCode) { +func (this *apiComp) GetsettingCheck(session comm.IUserSession, req *pb.UserGetSettingReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Getsetting(session comm.IUserSession, req *pb.UserGetSettingReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Getsetting(session comm.IUserSession, req *pb.UserGetSettingReq) (errdata *pb.ErrorData) { if code = this.GetsettingCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_gettujian.go b/modules/user/api_gettujian.go index b5e31343e..81798c4db 100644 --- a/modules/user/api_gettujian.go +++ b/modules/user/api_gettujian.go @@ -5,11 +5,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) GetTujianCheck(session comm.IUserSession, req *pb.UserGetTujianReq) (code pb.ErrorCode) { +func (this *apiComp) GetTujianCheck(session comm.IUserSession, req *pb.UserGetTujianReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianReq) (errdata *pb.ErrorData) { if code = this.GetTujianCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_info.go b/modules/user/api_info.go index 1ffebf20c..f662cb9f6 100644 --- a/modules/user/api_info.go +++ b/modules/user/api_info.go @@ -5,11 +5,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UserInfoReq) (code pb.ErrorCode) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) { if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_initdata.go b/modules/user/api_initdata.go index d88a4348d..a316792e0 100644 --- a/modules/user/api_initdata.go +++ b/modules/user/api_initdata.go @@ -6,14 +6,14 @@ import ( ) //初始化账号数据 恢复到创角前 -func (this *apiComp) InitdataCheck(session comm.IUserSession, req *pb.UserInitdataReq) (code pb.ErrorCode) { +func (this *apiComp) InitdataCheck(session comm.IUserSession, req *pb.UserInitdataReq) (errdata *pb.ErrorData) { if req.Code == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq) (errdata *pb.ErrorData) { if code = this.InitdataCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index ec2d16469..a6e7dbb01 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -11,7 +11,7 @@ import ( ) //参数校验 -func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) (code pb.ErrorCode) { +func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { if req.Account == "" { code = pb.ErrorCode_ReqParameterError } @@ -19,7 +19,7 @@ func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) } //登录 -func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { if code = this.LoginCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_logout.go b/modules/user/api_logout.go index a35a0097e..182ab4651 100644 --- a/modules/user/api_logout.go +++ b/modules/user/api_logout.go @@ -6,12 +6,12 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) LogoutCheck(session comm.IUserSession, req *pb.UserLoginReq) (code pb.ErrorCode) { +func (this *apiComp) LogoutCheck(session comm.IUserSession, req *pb.UserLoginReq) (errdata *pb.ErrorData) { return } //注销 -func (this *apiComp) Logout(session comm.IUserSession, rsp *pb.UserLoginReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Logout(session comm.IUserSession, rsp *pb.UserLoginReq) (errdata *pb.ErrorData) { log.Debugf("User - Logout: session:%v rsp:%v", session.ToString(), rsp) return diff --git a/modules/user/api_modifyavatar.go b/modules/user/api_modifyavatar.go index 3d097f4fd..47f338121 100644 --- a/modules/user/api_modifyavatar.go +++ b/modules/user/api_modifyavatar.go @@ -7,14 +7,14 @@ import ( // 修改主角头像 -func (this *apiComp) ModifyavatarCheck(session comm.IUserSession, req *pb.UserModifyavatarReq) (code pb.ErrorCode) { +func (this *apiComp) ModifyavatarCheck(session comm.IUserSession, req *pb.UserModifyavatarReq) (errdata *pb.ErrorData) { if req.AvatarId == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifyavatarReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifyavatarReq) (errdata *pb.ErrorData) { if code = this.ModifyavatarCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifybgp.go b/modules/user/api_modifybgp.go index 726e71c42..024b9b96b 100644 --- a/modules/user/api_modifybgp.go +++ b/modules/user/api_modifybgp.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ModifybgpCheck(session comm.IUserSession, req *pb.UserModifybgpReq) (code pb.ErrorCode) { +func (this *apiComp) ModifybgpCheck(session comm.IUserSession, req *pb.UserModifybgpReq) (errdata *pb.ErrorData) { if req.BgpId == "" { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpReq) (errdata *pb.ErrorData) { if code = this.ModifybgpCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifyfigure.go b/modules/user/api_modifyfigure.go index 216d6e51a..31767b53c 100644 --- a/modules/user/api_modifyfigure.go +++ b/modules/user/api_modifyfigure.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ModifyfigureCheck(session comm.IUserSession, req *pb.UserModifyfigureReq) (code pb.ErrorCode) { +func (this *apiComp) ModifyfigureCheck(session comm.IUserSession, req *pb.UserModifyfigureReq) (errdata *pb.ErrorData) { if req.FigureId == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyfigureReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyfigureReq) (errdata *pb.ErrorData) { if code = this.ModifyfigureCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index 9ab0c1d63..cd0174f34 100644 --- a/modules/user/api_modifyname.go +++ b/modules/user/api_modifyname.go @@ -6,14 +6,14 @@ import ( "strings" ) -func (this *apiComp) ModifynameCheck(session comm.IUserSession, req *pb.UserModifynameReq) (code pb.ErrorCode) { +func (this *apiComp) ModifynameCheck(session comm.IUserSession, req *pb.UserModifynameReq) (errdata *pb.ErrorData) { if strings.TrimSpace(req.Name) == "" || len(strings.TrimSpace(req.Name)) > 18 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynameReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynameReq) (errdata *pb.ErrorData) { if code = this.ModifynameCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifysign.go b/modules/user/api_modifysign.go index 30b99ee7c..1553825f3 100644 --- a/modules/user/api_modifysign.go +++ b/modules/user/api_modifysign.go @@ -7,14 +7,14 @@ import ( // 修改签名 -func (this *apiComp) ModifysignCheck(session comm.IUserSession, req *pb.UserModifysignReq) (code pb.ErrorCode) { +func (this *apiComp) ModifysignCheck(session comm.IUserSession, req *pb.UserModifysignReq) (errdata *pb.ErrorData) { if req.Sign == "" || len(req.Sign) > 200 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysignReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysignReq) (errdata *pb.ErrorData) { if code = this.ModifysignCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_puzzleaward.go b/modules/user/api_puzzleaward.go index 1637c17aa..9af7d36e6 100644 --- a/modules/user/api_puzzleaward.go +++ b/modules/user/api_puzzleaward.go @@ -6,13 +6,13 @@ import ( ) //参数校验 -func (this *apiComp) PuzzleAwardCheck(session comm.IUserSession, req *pb.UserPuzzleAwardReq) (code pb.ErrorCode) { +func (this *apiComp) PuzzleAwardCheck(session comm.IUserSession, req *pb.UserPuzzleAwardReq) (errdata *pb.ErrorData) { return } //拼图领奖 -func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAwardReq) (errdata *pb.ErrorData) { var ( sign *pb.DBSign err error diff --git a/modules/user/api_sellres.go b/modules/user/api_sellres.go index 20661eace..bbe56124f 100644 --- a/modules/user/api_sellres.go +++ b/modules/user/api_sellres.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) SellResCheck(session comm.IUserSession, req *pb.UserSellResReq) (code pb.ErrorCode) { +func (this *apiComp) SellResCheck(session comm.IUserSession, req *pb.UserSellResReq) (errdata *pb.ErrorData) { if len(req.Atno) == 0 { code = pb.ErrorCode_ReqParameterError } @@ -14,7 +14,7 @@ func (this *apiComp) SellResCheck(session comm.IUserSession, req *pb.UserSellRes } //分解道具 -func (this *apiComp) SellRes(session comm.IUserSession, req *pb.UserSellResReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) SellRes(session comm.IUserSession, req *pb.UserSellResReq) (errdata *pb.ErrorData) { var ( equip []string // 出售的装备 sale []*pb.UserAssets diff --git a/modules/user/api_settingteam.go b/modules/user/api_settingteam.go index 7691ff20a..afd5d50d8 100644 --- a/modules/user/api_settingteam.go +++ b/modules/user/api_settingteam.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) SettingteamCheck(session comm.IUserSession, req *pb.UserSettingteamReq) (code pb.ErrorCode) { +func (this *apiComp) SettingteamCheck(session comm.IUserSession, req *pb.UserSettingteamReq) (errdata *pb.ErrorData) { if len(req.HeroObjIds) == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Settingteam(session comm.IUserSession, req *pb.UserSettingteamReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Settingteam(session comm.IUserSession, req *pb.UserSettingteamReq) (errdata *pb.ErrorData) { if code = this.SettingteamCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_showteam.go b/modules/user/api_showteam.go index 88d20e5cf..7f4a2a54e 100644 --- a/modules/user/api_showteam.go +++ b/modules/user/api_showteam.go @@ -5,11 +5,11 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ShowteamCheck(session comm.IUserSession, req *pb.UserShowteamReq) (code pb.ErrorCode) { +func (this *apiComp) ShowteamCheck(session comm.IUserSession, req *pb.UserShowteamReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Showteam(session comm.IUserSession, req *pb.UserShowteamReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Showteam(session comm.IUserSession, req *pb.UserShowteamReq) (errdata *pb.ErrorData) { result, err := this.module.modelExpand.GetUserExpand(session.GetUserId()) if err != nil { this.module.Errorf("uid:%v err: %v", session.GetUserId(), err) diff --git a/modules/user/api_sign.go b/modules/user/api_sign.go index acc929a07..b109f20b1 100644 --- a/modules/user/api_sign.go +++ b/modules/user/api_sign.go @@ -6,13 +6,13 @@ import ( ) // 参数校验 -func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode) { +func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.UserSignReq) (errdata *pb.ErrorData) { return } // 登录 -func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (errdata *pb.ErrorData) { if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSignResp{ diff --git a/modules/user/api_switchdefper.go b/modules/user/api_switchdefper.go index 7995f7e59..04b15c06d 100644 --- a/modules/user/api_switchdefper.go +++ b/modules/user/api_switchdefper.go @@ -7,13 +7,13 @@ import ( ) //参数校验 -func (this *apiComp) SwitchDefPerCheck(session comm.IUserSession, req *pb.UserSwitchDefPerReq) (code pb.ErrorCode) { +func (this *apiComp) SwitchDefPerCheck(session comm.IUserSession, req *pb.UserSwitchDefPerReq) (errdata *pb.ErrorData) { return } //登录 -func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchDefPerReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) SwitchDefPer(session comm.IUserSession, req *pb.UserSwitchDefPerReq) (errdata *pb.ErrorData) { var ( change map[string]interface{} = make(map[string]interface{}) user *pb.DBUser diff --git a/modules/user/api_updatesetting.go b/modules/user/api_updatesetting.go index 7b4dffe1b..d591af0f8 100644 --- a/modules/user/api_updatesetting.go +++ b/modules/user/api_updatesetting.go @@ -6,14 +6,14 @@ import ( "go_dreamfactory/utils" ) -func (this *apiComp) UpdatesettingCheck(session comm.IUserSession, req *pb.UserUpdateSettingReq) (code pb.ErrorCode) { +func (this *apiComp) UpdatesettingCheck(session comm.IUserSession, req *pb.UserUpdateSettingReq) (errdata *pb.ErrorData) { if req.Setting.Huazhi > 3 || req.Setting.Kangjuchi > 3 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Updatesetting(session comm.IUserSession, req *pb.UserUpdateSettingReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Updatesetting(session comm.IUserSession, req *pb.UserUpdateSettingReq) (errdata *pb.ErrorData) { if code = this.UpdatesettingCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_vericode.go b/modules/user/api_vericode.go index b22b3431b..9af4f7b3c 100644 --- a/modules/user/api_vericode.go +++ b/modules/user/api_vericode.go @@ -7,11 +7,11 @@ import ( // 验证码 -func (this *apiComp) VericodeCheck(session comm.IUserSession, req *pb.UserVeriCodeReq) (code pb.ErrorCode) { +func (this *apiComp) VericodeCheck(session comm.IUserSession, req *pb.UserVeriCodeReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Vericode(session comm.IUserSession, req *pb.UserVeriCodeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Vericode(session comm.IUserSession, req *pb.UserVeriCodeReq) (errdata *pb.ErrorData) { if code = this.VericodeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index a851cd5ad..27dc74c70 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -157,7 +157,7 @@ func (this *ModelUser) delete(uid string) { } // 修改玩家名字 -func (this *ModelUser) modifyName(uid string, newName string) (code pb.ErrorCode) { +func (this *ModelUser) modifyName(uid string, newName string) (errdata *pb.ErrorData) { user := this.GetUser(uid) if user == nil { diff --git a/modules/user/module.go b/modules/user/module.go index 99d21e272..7bab7cf6f 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -586,7 +586,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha } // 用户资源 -func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add int32, bPush bool) (code pb.ErrorCode) { +func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add int32, bPush bool) (errdata *pb.ErrorData) { var _change *pb.UserResChangedPush _change, code = this.change(session, attr, add) @@ -605,7 +605,7 @@ func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add } // 用户资源 -func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string]int32, bPush bool) (code pb.ErrorCode) { +func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string]int32, bPush bool) (errdata *pb.ErrorData) { for key, add := range attrs { var _change *pb.UserResChangedPush _change, code = this.change(session, key, add) @@ -952,7 +952,7 @@ func (this *User) BingoSetUserVipLv(session comm.IUserSession, lv int32) error { } // 添加用户皮肤数据 -func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush bool) (code pb.ErrorCode) { +func (this *User) AddPer(session comm.IUserSession, pers map[string]int32, bPush bool) (errdata *pb.ErrorData) { var ( err error conf *cfg.GamePlayerInfor_overviewData diff --git a/modules/viking/api_buy.go b/modules/viking/api_buy.go index 209d444d8..b5756a23c 100644 --- a/modules/viking/api_buy.go +++ b/modules/viking/api_buy.go @@ -6,7 +6,7 @@ import ( ) //参数校验 -func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.VikingBuyReq) (code pb.ErrorCode) { +func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.VikingBuyReq) (errdata *pb.ErrorData) { if req.Count <= 0 { code = pb.ErrorCode_ReqParameterError return @@ -15,7 +15,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.VikingBuyReq) ( } // 协议废弃 走通用字段 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.VikingBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.VikingBuyReq) (errdata *pb.ErrorData) { session.SendMsg(string(this.module.GetType()), VikingBuyResp, &pb.VikingBuyResp{}) return diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 23e07760f..7a205d1d3 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -7,7 +7,7 @@ import ( ) //参数校验 -func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingChallengeReq) (errdata *pb.ErrorData) { if req.BossId <= 0 && req.Difficulty > 0 || req.Battle == nil { code = pb.ErrorCode_ReqParameterError return @@ -16,7 +16,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingCha } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChallengeReq) (errdata *pb.ErrorData) { var ( ps int32 ) diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index f870a9964..212e063df 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -8,7 +8,7 @@ import ( ) // 参数校验 -func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode) { +func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.VikingChallengeOverReq) (errdata *pb.ErrorData) { if req.BossId <= 0 && req.Difficulty > 0 { code = pb.ErrorCode_ReqParameterError return @@ -17,7 +17,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Vikin } // /挑战完成 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChallengeOverReq) (errdata *pb.ErrorData) { var ( mapData map[string]interface{} reward []*cfg.Gameatn diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index 28c6411ce..f35d6af4d 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -6,12 +6,12 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.VikingGetListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.VikingGetListReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq) (errdata *pb.ErrorData) { code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/viking/api_ranklist.go b/modules/viking/api_ranklist.go index 7b3ccee24..d8155a38c 100644 --- a/modules/viking/api_ranklist.go +++ b/modules/viking/api_ranklist.go @@ -12,14 +12,14 @@ import ( ) //参数校验 -func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.VikingRankListReq) (code pb.ErrorCode) { +func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.VikingRankListReq) (errdata *pb.ErrorData) { if req.BoosType == 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListReq) (errdata *pb.ErrorData) { var ( szRank []*pb.DBVikingRank rd *redis.StringSliceCmd diff --git a/modules/viking/module.go b/modules/viking/module.go index 8b2a0243a..71e22d1d7 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -53,7 +53,7 @@ func (this *Viking) OnInstallComp() { } // 接口信息 -func (this *Viking) ModifyVikingData(uid string, data map[string]interface{}) (code pb.ErrorCode) { +func (this *Viking) ModifyVikingData(uid string, data map[string]interface{}) (errdata *pb.ErrorData) { err := this.modelViking.modifyVikingDataByObjId(uid, data) if err != nil { code = pb.ErrorCode_DBError @@ -183,7 +183,7 @@ func (this *Viking) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (r } // 解锁远征所有难度 -func (this *Viking) CompleteAllLevel(session comm.IUserSession) (code pb.ErrorCode) { +func (this *Viking) CompleteAllLevel(session comm.IUserSession) (errdata *pb.ErrorData) { list, err := this.modelViking.getVikingList(session.GetUserId()) if err != nil { code = pb.ErrorCode_DBError @@ -206,7 +206,7 @@ func (this *Viking) CompleteAllLevel(session comm.IUserSession) (code pb.ErrorCo return } -func (this *Viking) AutoBuyTicket(session comm.IUserSession, bossId, difficulty int32) (code pb.ErrorCode) { +func (this *Viking) AutoBuyTicket(session comm.IUserSession, bossId, difficulty int32) (errdata *pb.ErrorData) { conf, _ := this.configure.GetVikingBossConfigData(bossId, difficulty) if code := this.CheckRes(session, conf.PsConsume); code != pb.ErrorCode_Success { amount := int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), conf.PsConsume[0].T)) // 获取当前数量 @@ -220,7 +220,7 @@ func (this *Viking) AutoBuyTicket(session comm.IUserSession, bossId, difficulty return } -func (this *Viking) AutoBattleInfo(session comm.IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (code pb.ErrorCode, battleInfo *pb.BattleInfo) { +func (this *Viking) AutoBattleInfo(session comm.IUserSession, battle *pb.BattleFormation, bossId, difficulty int32) (errdata *pb.ErrorData, battleInfo *pb.BattleInfo) { cfgData, _ := this.configure.GetVikingBossConfigData(bossId, difficulty) if cfgData == nil { @@ -250,7 +250,7 @@ func (this *Viking) AutoBattleInfo(session comm.IUserSession, battle *pb.BattleF } // 自动战斗完成 -func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (code pb.ErrorCode, atno []*pb.UserAtno) { +func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleReport, autoBattle *pb.DBAutoBattle) (errdata *pb.ErrorData, atno []*pb.UserAtno) { bossId := autoBattle.BossId difficulty := autoBattle.Difficulty atno = make([]*pb.UserAtno, 0) @@ -335,7 +335,7 @@ func (this *Viking) AutoBattleOver(session comm.IUserSession, Report *pb.BattleR return } -func (this *Viking) CheckBattelParameter(session comm.IUserSession, battle *pb.BattleFormation, bossid, difficulty int32) (code pb.ErrorCode) { +func (this *Viking) CheckBattelParameter(session comm.IUserSession, battle *pb.BattleFormation, bossid, difficulty int32) (errdata *pb.ErrorData) { code, _ = this.api.Challenge(session, &pb.VikingChallengeReq{ BossId: bossid, Difficulty: difficulty, diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index da3d302d0..18006d075 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -8,14 +8,14 @@ import ( // 任务接取 -func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (code pb.ErrorCode) { +func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) { if req.TaskId <= 0 || req.GroupId <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) { if code = a.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 81e85f3d3..f1051aaca 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -10,7 +10,7 @@ import ( ) // 战斗结束的请求 -func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode) { +func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) { if req.GroupId <= 0 || req.BattleConfId <= 0 || req.TaskId <= 0 || req.Report == nil { this.module.Error("世界任务战斗结束参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, @@ -21,7 +21,7 @@ func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.Worldt return } -func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) { if code = this.BattlefinishCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index 248b04b8f..c4e1328ee 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -8,7 +8,7 @@ import ( ) // 战斗开始 -func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (code pb.ErrorCode) { +func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (errdata *pb.ErrorData) { if req.BattleConfId == 0 || req.Battle == nil { this.module.Error("世界任务战斗开始参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, @@ -19,7 +19,7 @@ func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.Worldta return } -func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (errdata *pb.ErrorData) { if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go index e6d8563e8..30e6f1072 100644 --- a/modules/worldtask/api_chapterreward.go +++ b/modules/worldtask/api_chapterreward.go @@ -5,14 +5,14 @@ import ( "go_dreamfactory/pb" ) -func (this *apiComp) ChapterrewardCheck(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (code pb.ErrorCode) { +func (this *apiComp) ChapterrewardCheck(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (errdata *pb.ErrorData) { if req.GroupId <= 0 { code = pb.ErrorCode_ReqParameterError } return } -func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (errdata *pb.ErrorData) { if code = this.ChapterrewardCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 0a01e695c..43a35ea64 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -6,14 +6,14 @@ import ( ) // 任务完成条件 -func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (code pb.ErrorCode) { +func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) { if req.GroupId <= 0 || req.TaskId <= 0 || req.CondiId <= 0 { code = *pb.ErrorCode_ReqParameterError.Enum() } return } -func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) { if code = this.CompleteCondiCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 3c37cbf45..93a0e70ce 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -11,7 +11,7 @@ import ( // 世界任务完成 -func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFinishReq) (code pb.ErrorCode) { +func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) { if req.GroupId == 0 || req.TaskId == 0 { this.module.Error("世界任务完成参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) code = pb.ErrorCode_ReqParameterError @@ -19,7 +19,7 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFin return } -func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) { if code = this.FinishCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go index cf4aa41c6..8895933b7 100644 --- a/modules/worldtask/api_mine.go +++ b/modules/worldtask/api_mine.go @@ -12,11 +12,11 @@ var ( ) // 我的世界任务 -func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineReq) (code pb.ErrorCode) { +func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineReq) (errdata *pb.ErrorData) { return } -func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (code pb.ErrorCode, data *pb.ErrorData) { +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) diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 3a34a602d..129141d34 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -82,10 +82,11 @@ type ErrorData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title"` - Dataint int32 `protobuf:"varint,2,opt,name=dataint,proto3" json:"dataint"` - Datastring string `protobuf:"bytes,3,opt,name=datastring,proto3" json:"datastring"` - Message string `protobuf:"bytes,4,opt,name=message,proto3" json:"message"` + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` + Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title"` + Dataint int32 `protobuf:"varint,3,opt,name=dataint,proto3" json:"dataint"` + Datastring string `protobuf:"bytes,4,opt,name=datastring,proto3" json:"datastring"` + Message string `protobuf:"bytes,5,opt,name=message,proto3" json:"message"` } func (x *ErrorData) Reset() { @@ -120,6 +121,13 @@ func (*ErrorData) Descriptor() ([]byte, []int) { return file_comm_proto_rawDescGZIP(), []int{0} } +func (x *ErrorData) GetCode() ErrorCode { + if x != nil { + return x.Code + } + return ErrorCode_Success +} + func (x *ErrorData) GetTitle() string { if x != nil { return x.Title @@ -347,10 +355,8 @@ type RPCMessageReply struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` - ErrorMessage string `protobuf:"bytes,2,opt,name=ErrorMessage,proto3" json:"ErrorMessage"` - ErrorData *ErrorData `protobuf:"bytes,3,opt,name=ErrorData,proto3" json:"ErrorData"` - Reply []*UserMessage `protobuf:"bytes,4,rep,name=Reply,proto3" json:"Reply"` + ErrorData *ErrorData `protobuf:"bytes,1,opt,name=ErrorData,proto3" json:"ErrorData"` + Reply []*UserMessage `protobuf:"bytes,2,rep,name=Reply,proto3" json:"Reply"` } func (x *RPCMessageReply) Reset() { @@ -385,20 +391,6 @@ func (*RPCMessageReply) Descriptor() ([]byte, []int) { return file_comm_proto_rawDescGZIP(), []int{3} } -func (x *RPCMessageReply) GetCode() ErrorCode { - if x != nil { - return x.Code - } - return ErrorCode_Success -} - -func (x *RPCMessageReply) GetErrorMessage() string { - if x != nil { - return x.ErrorMessage - } - return "" -} - func (x *RPCMessageReply) GetErrorData() *ErrorData { if x != nil { return x.ErrorData @@ -1938,206 +1930,204 @@ var file_comm_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, - 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x75, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, - 0x61, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x61, - 0x74, 0x61, 0x69, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, - 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, - 0xb7, 0x01, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, - 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x28, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, - 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x8e, 0x02, 0x0a, 0x0c, 0x41, 0x67, - 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, - 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, - 0x79, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xa3, 0x01, 0x0a, 0x0f, 0x52, - 0x50, 0x43, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1e, - 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, - 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x22, - 0x0a, 0x0c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, - 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, - 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, - 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, - 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, - 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, - 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, - 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, - 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, - 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, - 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, + 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x01, 0x0a, 0x09, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, + 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x64, 0x61, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, + 0x61, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, 0x74, + 0x72, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, + 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x22, 0xb7, 0x01, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x12, 0x14, 0x0a, 0x05, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x05, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x28, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, - 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, - 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, + 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x8e, 0x02, 0x0a, 0x0c, 0x41, + 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, + 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, + 0x6e, 0x79, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5f, 0x0a, 0x0f, 0x52, + 0x50, 0x43, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, + 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, + 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, + 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, + 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, + 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, + 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, + 0x55, 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, - 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, - 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, - 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, - 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, - 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, - 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, - 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, - 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, - 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, - 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, - 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, - 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, - 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, - 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, - 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, - 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, - 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, - 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, - 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, - 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, - 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, - 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, - 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x34, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, - 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, - 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, - 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, - 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, - 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, - 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, - 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, - 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, - 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, - 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, - 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, - 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, - 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, - 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, - 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x22, 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, + 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, + 0x79, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, + 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, + 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, + 0x13, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, + 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, + 0x44, 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, + 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, + 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, + 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, + 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, + 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, + 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, + 0x0a, 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, + 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, + 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, + 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, + 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, + 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, + 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, + 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, + 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, + 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, + 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, + 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, + 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, + 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, + 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, + 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, + 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, + 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, + 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, + 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, + 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, + 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, + 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, + 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, + 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, + 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, + 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, + 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, + 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, + 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x51, + 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, + 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, + 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, + 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, + 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, + 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, + 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, + 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, + 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, + 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, + 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, + 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, + 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, + 0x61, 0x62, 0x61, 0x73, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, + 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, + 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, + 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2184,18 +2174,18 @@ var file_comm_proto_goTypes = []interface{}{ (*RPCGeneralReqA4)(nil), // 26: RPCGeneralReqA4 (*RPCRTaskReq)(nil), // 27: RPCRTaskReq (*ServiceDBInfo)(nil), // 28: ServiceDBInfo - (*anypb.Any)(nil), // 29: google.protobuf.Any - (ErrorCode)(0), // 30: ErrorCode + (ErrorCode)(0), // 29: ErrorCode + (*anypb.Any)(nil), // 30: google.protobuf.Any } var file_comm_proto_depIdxs = []int32{ - 29, // 0: UserMessage.data:type_name -> google.protobuf.Any - 29, // 1: AgentMessage.Message:type_name -> google.protobuf.Any - 30, // 2: RPCMessageReply.Code:type_name -> ErrorCode + 29, // 0: ErrorData.code:type_name -> ErrorCode + 30, // 1: UserMessage.data:type_name -> google.protobuf.Any + 30, // 2: AgentMessage.Message:type_name -> google.protobuf.Any 1, // 3: RPCMessageReply.ErrorData:type_name -> ErrorData 2, // 4: RPCMessageReply.Reply:type_name -> UserMessage 2, // 5: AgentSendMessageReq.Reply:type_name -> UserMessage - 29, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any - 29, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 30, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any + 30, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any 8, // [8:8] is the sub-list for method output_type 8, // [8:8] is the sub-list for method input_type 8, // [8:8] is the sub-list for extension type_name diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index 976ad712d..f11c8c19c 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -153,15 +153,10 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag //执行处理流 stime := time.Now() handlereturn := msghandle.handle.Func.Call([]reflect.Value{msghandle.rcvr, reflect.ValueOf(session), reflect.ValueOf(msg)}) - errcode := pb.ErrorCode(handlereturn[0].Int()) - errdata := handlereturn[1].Interface() - if errcode != pb.ErrorCode_Success { //处理返货错误码 返回用户错误信息 - reply.Code = errcode - reply.ErrorMessage = pb.GetErrorCodeMsg(errcode) - if errdata != nil { - //data, _ := anypb.New(errdata.(proto.Message)) - reply.ErrorData = errdata.(*pb.ErrorData) - } + errdata := handlereturn[0] + if !errdata.IsNil() { //处理返货错误码 返回用户错误信息 + //data, _ := anypb.New(errdata.(proto.Message)) + reply.ErrorData = errdata.Interface().(*pb.ErrorData) // log.Errorf("[Handle Api] t:%v m:%s req:%v reply:%v", time.Since(stime), method, msg, reply) log.Error("[Handle Api]", log.Field{Key: "t", Value: time.Since(stime).Milliseconds()}, @@ -183,7 +178,10 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag } } else { //未找到消息处理函数 log.Errorf("[Handle Api] no found handle %s", method) - reply.Code = pb.ErrorCode_ReqParameterError + reply.ErrorData = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } } return nil }