From b99226a3f15c23c87f5fde12b6bbccade03a707f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Dec 2023 17:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=86=99=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/academy/api_receive.go | 2 +- modules/academy/api_teachingreceive.go | 2 +- modules/achieve/api_award.go | 2 +- modules/activity/api_getreward.go | 2 +- modules/addrecharge/api_receive.go | 2 +- modules/addrecharge/api_receiveall.go | 2 +- modules/arena/api_buy.go | 4 ++-- modules/arena/api_challenge.go | 2 +- modules/arena/api_challengereward.go | 2 +- modules/arena/api_plot.go | 2 +- modules/arena/api_plotreward.go | 2 +- modules/atlas/api_atlasaward.go | 2 +- modules/caninerabbit/api_award.go | 2 +- modules/capturesheep/api_allweekreward.go | 2 +- modules/capturesheep/api_over.go | 2 +- modules/capturesheep/api_weekreward.go | 2 +- modules/caravan/api_buyorsell.go | 4 ++-- modules/caravan/api_getreward.go | 2 +- modules/caravan/api_gotocity.go | 2 +- modules/caravan/module.go | 6 +++--- modules/catchbugs/api_award.go | 2 +- modules/combat/api_ask.go | 2 +- modules/combat/api_challengereceive.go | 2 +- modules/combat/api_drop.go | 2 +- modules/dailytask/api_receive.go | 2 +- modules/dcolor/api_award.go | 2 +- modules/dispatch/api_autoreceive.go | 2 +- modules/dispatch/api_do.go | 2 +- modules/dispatch/api_notice.go | 2 +- modules/dispatch/api_receive.go | 2 +- modules/dispatch/api_refresh.go | 2 +- modules/dispatch/api_week.go | 2 +- modules/dragon/api_lvitem.go | 2 +- modules/dragon/api_train.go | 4 ++-- modules/egghunt/api_award.go | 2 +- modules/enchant/api_challengeover.go | 6 +++--- modules/entertainment/api_boxreward.go | 2 +- modules/entertainment/api_create.go | 2 +- modules/entertainment/api_getreward.go | 2 +- modules/entertainment/api_joinroom.go | 2 +- modules/entertainment/api_match.go | 2 +- modules/entertainment/room.go | 2 +- modules/equipment/api_ench.go | 2 +- modules/equipment/api_forg.go | 2 +- modules/equipment/api_sellI.go | 2 +- modules/equipment/api_upgrade.go | 2 +- modules/equipment/api_wash.go | 2 +- modules/equipment/module.go | 4 ++-- modules/friend/api_cross_getreward.go | 2 +- modules/friend/api_cross_zan.go | 2 +- modules/gourmet/api_activateatlas.go | 2 +- modules/gourmet/api_createfood.go | 4 ++-- modules/growtask/api_advreceive.go | 2 +- modules/growtask/api_receive.go | 2 +- modules/guildgve/api_challengefinish.go | 2 +- modules/guildgve/api_roulette.go | 4 ++-- modules/hero/api_awaken.go | 2 +- modules/hero/api_drawCard.go | 10 +++++----- modules/hero/api_peachreward.go | 2 +- modules/hero/api_strengthenUpSkill.go | 2 +- modules/hero/api_strengthenUpStar.go | 4 ++-- modules/hero/api_strengthenUplv.go | 2 +- modules/hero/api_talentlearn.go | 2 +- modules/hero/api_talentreset.go | 4 ++-- modules/hero/model_hero.go | 4 ++-- modules/herotask/api_receive.go | 2 +- modules/horoscope/api_rest.go | 4 ++-- modules/horoscope/api_upgrade.go | 2 +- modules/hunting/api_challenge.go | 2 +- modules/hunting/api_challengeover.go | 2 +- modules/integral/api_challengeover.go | 2 +- modules/island/api_buy.go | 2 +- modules/island/api_complete.go | 2 +- modules/island/api_receive.go | 2 +- modules/island/api_upgrade.go | 2 +- modules/items/api_buyphysical.go | 4 ++-- modules/items/api_decompose.go | 2 +- modules/items/api_potionsynthesis.go | 2 +- modules/items/api_sellItem.go | 2 +- modules/items/api_sellinbulk.go | 2 +- modules/items/modelitems.go | 12 ++++++------ modules/items/module.go | 2 +- modules/jielong/api_reward.go | 2 +- modules/jielong/api_start.go | 2 +- modules/kftask/api_receive.go | 2 +- modules/library/api_getstoryreward.go | 2 +- modules/library/api_lvreward.go | 2 +- modules/library/api_usegift.go | 2 +- modules/linestory/api_receive.go | 2 +- modules/mail/api_getAttachment.go | 4 ++-- modules/mainline/api_booschallengeover.go | 2 +- modules/mainline/api_challenge.go | 2 +- modules/mainline/api_challengeover.go | 4 ++-- modules/mainline/api_levelpass.go | 2 +- modules/mainline/api_receiveaward.go | 2 +- modules/mainline/api_shopbuy.go | 4 ++-- modules/mainline/api_taskchaptereward.go | 2 +- modules/mainline/api_taskreceive.go | 2 +- modules/modeluserlog.go | 12 +++++++++++- modules/modulebase.go | 4 ++-- modules/moonfantasy/api_buy.go | 2 +- modules/moonfantasy/api_receive.go | 4 ++-- modules/moonlv/api_receive.go | 2 +- modules/oldtimes/api_receive.go | 2 +- modules/pagoda/api_challengeover.go | 2 +- modules/pagoda/api_getReward.go | 2 +- modules/pagoda/api_racechallengeover.go | 2 +- modules/parkour/api_allweekreward.go | 2 +- modules/parkour/api_weekreward.go | 2 +- modules/parkour/module.go | 2 +- modules/passon/api_clearcd.go | 2 +- modules/pay/api_activitybuy.go | 2 +- modules/pay/api_dailybuy.go | 2 +- modules/pay/modelActivity.go | 2 +- modules/pay/modelDaily.go | 2 +- modules/pay/modelDiamond.go | 2 +- modules/pay/module.go | 2 +- modules/practice/api_getgymbuff.go | 2 +- modules/practice/api_gymrefresh.go | 2 +- modules/practice/api_npcbattklefinish.go | 2 +- modules/practice/api_receive.go | 2 +- modules/practice/api_unLock.go | 2 +- modules/practice/api_upgrade.go | 2 +- modules/privilege/api_buygift.go | 4 ++-- modules/privilege/module.go | 4 ++-- modules/pushgiftbag/module.go | 2 +- modules/questionnaire/api_answer.go | 2 +- modules/reputation/module.go | 3 ++- modules/shop/api_buy.go | 2 +- modules/shopcenter/api_receive.go | 2 +- modules/smithy/api_atlasaward.go | 2 +- modules/smithy/api_forgeequip.go | 2 +- modules/smithy/api_receive.go | 2 +- modules/smithy/api_trade.go | 2 +- modules/smithy/module.go | 2 +- modules/sociaty/api_cross_activityreceive.go | 2 +- modules/sociaty/api_cross_buy.go | 2 +- modules/sociaty/api_cross_receive.go | 2 +- modules/sociaty/api_cross_sign.go | 2 +- modules/stonehenge/api_bookaward.go | 2 +- modules/stonehenge/api_enterlevel.go | 2 +- modules/stonehenge/api_event.go | 4 ++-- modules/stonehenge/api_finish.go | 2 +- modules/stonehenge/api_taskreceive.go | 2 +- modules/stonehenge/api_weekAward.go | 2 +- modules/storyline/api_complete.go | 2 +- modules/turntable/api_draw.go | 4 ++-- modules/uigame/api_latticefinish.go | 2 +- modules/uigame/api_latticegrid.go | 2 +- modules/uigame/api_latticereward.go | 2 +- modules/uigame/api_minerfinish.go | 2 +- modules/uigame/api_minergrid.go | 4 ++-- modules/uigame/api_puzzlegrid.go | 4 ++-- modules/uigame/api_puzzlereward.go | 2 +- modules/uigame/module.go | 6 +++--- modules/user/api_changetips.go | 2 +- modules/user/api_create.go | 2 +- modules/user/api_deposit.go | 2 +- modules/user/api_modifyname.go | 2 +- modules/user/api_puzzleaward.go | 2 +- modules/user/model_user.go | 8 ++++++-- modules/venture/api_lvreward.go | 2 +- modules/venture/api_signreward.go | 2 +- modules/viking/api_challenge.go | 2 +- modules/viking/api_challengeover.go | 4 ++-- modules/warorder/api_buylv.go | 2 +- modules/warorder/api_receive.go | 2 +- modules/weektask/api_activityreceive.go | 2 +- modules/weektask/api_receive.go | 2 +- modules/whackamole/api_award.go | 2 +- modules/wtask/api_accept.go | 2 +- modules/wtask/api_battlefinish.go | 2 +- modules/wtask/api_boxreceive.go | 2 +- modules/wtask/api_chapterreward.go | 2 +- modules/wtask/api_eventcomplete.go | 2 +- modules/wtask/api_exchange.go | 4 ++-- modules/wtask/api_finish.go | 4 ++-- pb/userexpand.pb.go | 15 ++++++++++++--- 178 files changed, 245 insertions(+), 221 deletions(-) diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index e95575b9f..321f17fb0 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -69,7 +69,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveRe go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype151, 1)) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AcademyReceiveReq", level.Award) + this.module.WriteUserLog(session.GetUserId(),req, comm.GMResAddType, "AcademyReceiveReq", level.Award) }) } diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index c106790e6..1066fa478 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -67,7 +67,7 @@ func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyT this.module.DispenseRes(session, level.Award, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AcademyTeachingReceiveReq", level.Award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AcademyTeachingReceiveReq", level.Award) }) } session.SendMsg(string(this.module.GetType()), "teachingreceive", &pb.AcademyTeachingReceiveResp{Issucc: true}) diff --git a/modules/achieve/api_award.go b/modules/achieve/api_award.go index 9dfd39e8d..c08bd5864 100644 --- a/modules/achieve/api_award.go +++ b/modules/achieve/api_award.go @@ -81,7 +81,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AchieveAwardReq) ( session.SendMsg(string(this.module.GetType()), "award", &pb.AchieveAwardResp{Id: req.Id, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AchieveAwardReq", conf.TaskReward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AchieveAwardReq", conf.TaskReward) }) return } diff --git a/modules/activity/api_getreward.go b/modules/activity/api_getreward.go index c4d0a530a..448cbfb99 100644 --- a/modules/activity/api_getreward.go +++ b/modules/activity/api_getreward.go @@ -99,7 +99,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.ActivityGetRew }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ActivityGetRewardReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ActivityGetRewardReq", reward) }) return } diff --git a/modules/addrecharge/api_receive.go b/modules/addrecharge/api_receive.go index f04929340..219ed7e22 100644 --- a/modules/addrecharge/api_receive.go +++ b/modules/addrecharge/api_receive.go @@ -77,7 +77,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.AddRechargeRecei session.SendMsg(string(this.module.GetType()), "receive", &pb.AddRechargeReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AddRechargeReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AddRechargeReceiveReq", award) }) return } diff --git a/modules/addrecharge/api_receiveall.go b/modules/addrecharge/api_receiveall.go index bed907c78..ae698bc95 100644 --- a/modules/addrecharge/api_receiveall.go +++ b/modules/addrecharge/api_receiveall.go @@ -79,7 +79,7 @@ func (this *apiComp) ReceiveAll(session comm.IUserSession, req *pb.AddRechargeRe }) session.SendMsg(string(this.module.GetType()), "receiveall", &pb.AddRechargeReceiveAllResp{Record: info.Record, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AddRechargeReceiveAllReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AddRechargeReceiveAllReq", award) }) return } diff --git a/modules/arena/api_buy.go b/modules/arena/api_buy.go index 743bc1c1b..62d2d4af9 100644 --- a/modules/arena/api_buy.go +++ b/modules/arena/api_buy.go @@ -99,8 +99,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (errdat session.SendMsg(string(this.module.GetType()), "buy", &pb.MoonfantasyBuyResp{Issucc: true, BattleNum: info.Buynum}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonfantasyBuyReq", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "MoonfantasyBuyReq", need) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MoonfantasyBuyReq", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: req.BuyNum}}) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "MoonfantasyBuyReq", need) // 消耗资源 }) return } diff --git a/modules/arena/api_challenge.go b/modules/arena/api_challenge.go index bdd759d1b..ce04c9197 100644 --- a/modules/arena/api_challenge.go +++ b/modules/arena/api_challenge.go @@ -55,7 +55,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallenge return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "ArenaChallengeReq", this.module.ModuleTools.GetGlobalConf().ArenaTicketCos) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "ArenaChallengeReq", this.module.ModuleTools.GetGlobalConf().ArenaTicketCos) // 消耗资源 }) if red.Attack != nil { for i, v := range req.Battle.Format { diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 2bd0ca57b..58cb29f28 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -289,7 +289,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) if bReward { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ArenaChallengeRewardReq", reward.WinReward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ArenaChallengeRewardReq", reward.WinReward) } }) diff --git a/modules/arena/api_plot.go b/modules/arena/api_plot.go index 188be1519..8d513d083 100644 --- a/modules/arena/api_plot.go +++ b/modules/arena/api_plot.go @@ -45,7 +45,7 @@ func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (errd return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "ArenaPlotReq", this.module.ModuleTools.GetGlobalConf().ArenaTicketCos) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "ArenaPlotReq", this.module.ModuleTools.GetGlobalConf().ArenaTicketCos) // 消耗资源 }) if errdata, record = this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{ diff --git a/modules/arena/api_plotreward.go b/modules/arena/api_plotreward.go index 5d3a834cf..191dc0e2e 100644 --- a/modules/arena/api_plotreward.go +++ b/modules/arena/api_plotreward.go @@ -98,7 +98,7 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ArenaPlotRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ArenaPlotRewardReq", atno) }) return } diff --git a/modules/atlas/api_atlasaward.go b/modules/atlas/api_atlasaward.go index ba8c4949f..7e9127062 100644 --- a/modules/atlas/api_atlasaward.go +++ b/modules/atlas/api_atlasaward.go @@ -73,7 +73,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (er Res: respRes, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "AtlasAwardReq", respRes) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "AtlasAwardReq", respRes) }) return } diff --git a/modules/caninerabbit/api_award.go b/modules/caninerabbit/api_award.go index 43ae6a3ac..34d081019 100644 --- a/modules/caninerabbit/api_award.go +++ b/modules/caninerabbit/api_award.go @@ -63,7 +63,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CanineRabbitAwardR session.SendMsg(string(this.module.GetType()), "award", &pb.CanineRabbitAwardResp{Type: req.Type, Awardmap: info.Award, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CanineRabbitAwardReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CanineRabbitAwardReq", res) }) return } diff --git a/modules/capturesheep/api_allweekreward.go b/modules/capturesheep/api_allweekreward.go index 18219d428..046e020a8 100644 --- a/modules/capturesheep/api_allweekreward.go +++ b/modules/capturesheep/api_allweekreward.go @@ -71,7 +71,7 @@ func (this *apiComp) AllWeekReward(session comm.IUserSession, req *pb.Captureshe } session.SendMsg(string(this.module.GetType()), "allweekreward", &pb.CapturesheepAllWeekRewardResp{Weekreward: info.Weekreward, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepAllWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CapturesheepAllWeekRewardReq", award) }) return } diff --git a/modules/capturesheep/api_over.go b/modules/capturesheep/api_over.go index 10584f5db..1f158295d 100644 --- a/modules/capturesheep/api_over.go +++ b/modules/capturesheep/api_over.go @@ -134,7 +134,7 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepOverReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CapturesheepOverReq", award) }) return } diff --git a/modules/capturesheep/api_weekreward.go b/modules/capturesheep/api_weekreward.go index 799287728..5a0d001ce 100644 --- a/modules/capturesheep/api_weekreward.go +++ b/modules/capturesheep/api_weekreward.go @@ -74,7 +74,7 @@ func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.CapturesheepW session.SendMsg(string(this.module.GetType()), "weekreward", &pb.CapturesheepWeekRewardResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CapturesheepWeekRewardReq", award) }) return } diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go index a58a6b2ab..2d84e7e2d 100644 --- a/modules/caravan/api_buyorsell.go +++ b/modules/caravan/api_buyorsell.go @@ -116,7 +116,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe this.module.Errorf("获得虚拟币失败:%v", errdata) } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "troll sell", addRes) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "troll sell", addRes) }) this.module.ArrayBag(caravan) @@ -228,7 +228,7 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe this.module.Errorf("获得虚拟币失败:%v", errdata) } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "troll buy", []*cfg.Gameatn{{ + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "troll buy", []*cfg.Gameatn{{ A: "attr", T: "merchantmoney", N: addScore, diff --git a/modules/caravan/api_getreward.go b/modules/caravan/api_getreward.go index 74a8092ba..fd5a9d4de 100644 --- a/modules/caravan/api_getreward.go +++ b/modules/caravan/api_getreward.go @@ -99,7 +99,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.CaravanGetRewa }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CaravanGetRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CaravanGetRewardReq", atno) }) return } diff --git a/modules/caravan/api_gotocity.go b/modules/caravan/api_gotocity.go index cc4b4bdf3..74c89d227 100644 --- a/modules/caravan/api_gotocity.go +++ b/modules/caravan/api_gotocity.go @@ -133,7 +133,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "CaravanGotoCityReq", res) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "CaravanGotoCityReq", res) // 消耗资源 }) return } diff --git a/modules/caravan/module.go b/modules/caravan/module.go index 749ef8b9e..5972c5fa5 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -222,7 +222,7 @@ func (this *Caravan) InitCaravanTicket(session comm.IUserSession, conf *cfg.Game errdata = this.DispenseRes(session, res, true) // 推送门票和虚拟币资源 go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "InitCaravanTicket", res) + this.WriteUserLog(session.GetUserId(), "", 0, "InitCaravanTicket", res) }) return } @@ -340,7 +340,7 @@ func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCara O: "", }) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), comm.GMResDelType, "CheckCaravanTask", resp.Reward) // 消耗资源 + this.WriteUserLog(session.GetUserId(), "", comm.GMResDelType, "CheckCaravanTask", resp.Reward) // 消耗资源 }) } session.SendMsg(string(this.GetType()), "taskcomplete", resp) @@ -387,7 +387,7 @@ func (this *Caravan) TaskComplete(session comm.IUserSession, taskid ...int32) { } session.SendMsg(string(this.GetType()), "taskcomplete", resp) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "TaskComplete", conf.Reword) + this.WriteUserLog(session.GetUserId(), taskid, 0, "TaskComplete", conf.Reword) }) } } diff --git a/modules/catchbugs/api_award.go b/modules/catchbugs/api_award.go index befa4e226..4c8652cc2 100644 --- a/modules/catchbugs/api_award.go +++ b/modules/catchbugs/api_award.go @@ -75,7 +75,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.CatchbugsAwardReq) session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsAwardResp{Atype: req.Atype, Award: atno, Awardmap: awards}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CatchbugsAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CatchbugsAwardReq", atno) }) return } diff --git a/modules/combat/api_ask.go b/modules/combat/api_ask.go index 63a3eb01b..edb8541ff 100644 --- a/modules/combat/api_ask.go +++ b/modules/combat/api_ask.go @@ -153,7 +153,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.CombatAskReq) (errda session.SendMsg(string(this.module.GetType()), "ask", &pb.CombatAskResp{Level: pitem}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CombatAskReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatAskReq", reward) }) return } diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index da5505f5d..d98516e3c 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -101,7 +101,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CombatChallengeReceiveReq", atns) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatChallengeReceiveReq", atns) }) } session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Level: req.Level, Manster: req.Manster, Atns: atns}) diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index c8e59b821..1034d4186 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -114,7 +114,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Level: req.Level, Atns: atns}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CombatDropReq", atns) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CombatDropReq", atns) }) return } diff --git a/modules/dailytask/api_receive.go b/modules/dailytask/api_receive.go index 863bf9bac..7f0d41408 100644 --- a/modules/dailytask/api_receive.go +++ b/modules/dailytask/api_receive.go @@ -58,7 +58,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.DailytaskReceive session.SendMsg(string(this.module.GetType()), "receive", &pb.DailytaskReceiveResp{Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DailytaskReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DailytaskReceiveReq", atno) }) return } diff --git a/modules/dcolor/api_award.go b/modules/dcolor/api_award.go index 46b95b046..78ba63658 100644 --- a/modules/dcolor/api_award.go +++ b/modules/dcolor/api_award.go @@ -81,7 +81,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.DColorAwardReq) (e session.SendMsg(string(this.module.GetType()), "award", &pb.DColorAwardResp{Atype: req.Atype, Award: atno, Awardmap: awards}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DColorAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DColorAwardReq", atno) }) return } diff --git a/modules/dispatch/api_autoreceive.go b/modules/dispatch/api_autoreceive.go index 9576fad4f..c3aba5f83 100644 --- a/modules/dispatch/api_autoreceive.go +++ b/modules/dispatch/api_autoreceive.go @@ -71,7 +71,7 @@ func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoRec session.SendMsg(string(a.module.GetType()), "autoreceive", rsp) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DispatchAutoReceiveReq", res) + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchAutoReceiveReq", res) }) return } diff --git a/modules/dispatch/api_do.go b/modules/dispatch/api_do.go index 319f69c61..81d9f8080 100644 --- a/modules/dispatch/api_do.go +++ b/modules/dispatch/api_do.go @@ -122,7 +122,7 @@ func (this *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (errda } tasks = append(tasks, comm.GetBuriedParam(comm.Rtype186, 1)) this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "DispatchDoReq", ticketAtn) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "DispatchDoReq", ticketAtn) // 消耗资源 }) return } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index aed4b2e3c..31fc07c66 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -69,7 +69,7 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) ( a.module.DispenseRes(session, []*cfg.Gameatn{atn}, true) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "恢复门票", atn) + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "恢复门票", atn) }) } } diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go index a4356b4c7..0753e8984 100644 --- a/modules/dispatch/api_receive.go +++ b/modules/dispatch/api_receive.go @@ -94,7 +94,7 @@ func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) session.SendMsg(string(a.module.GetType()), "receive", rsp) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DispatchReceiveReq", res) + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchReceiveReq", res) }) return } diff --git a/modules/dispatch/api_refresh.go b/modules/dispatch/api_refresh.go index 3dcb0b1bf..c8d8030b0 100644 --- a/modules/dispatch/api_refresh.go +++ b/modules/dispatch/api_refresh.go @@ -103,7 +103,7 @@ func (this *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshR if len(need) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "DispatchRefreshReq", need) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "DispatchRefreshReq", need) // 消耗资源 }) } return diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index fb8e0deb3..d41588638 100644 --- a/modules/dispatch/api_week.go +++ b/modules/dispatch/api_week.go @@ -59,7 +59,7 @@ func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReci if len(res) > 0 { a.module.DispenseRes(session, res, true) go a.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - a.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DispatchWeekReciveReq", res) + a.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DispatchWeekReciveReq", res) }) } session.SendMsg(string(a.module.GetType()), "weekrecive", rsp) diff --git a/modules/dragon/api_lvitem.go b/modules/dragon/api_lvitem.go index 2353f89de..6d93ab296 100644 --- a/modules/dragon/api_lvitem.go +++ b/modules/dragon/api_lvitem.go @@ -97,7 +97,7 @@ func (this *apiComp) LvItem(session comm.IUserSession, req *pb.DragonLvItemReq) session.SendMsg(string(this.module.GetType()), "lvitem", rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "DragonLvItemReq", curLvConf.Item) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "DragonLvItemReq", curLvConf.Item) // 消耗资源 }) return } diff --git a/modules/dragon/api_train.go b/modules/dragon/api_train.go index 0f98c580b..8c00f01c5 100644 --- a/modules/dragon/api_train.go +++ b/modules/dragon/api_train.go @@ -170,8 +170,8 @@ func (this *apiComp) Train(session comm.IUserSession, req *pb.DragonTrainReq) (e if curLv > preLv { // 升级后统计任务 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype235, dragon.Lv, utils.ToInt32(dragon.Dragonid))) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "DragonTrainReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "DragonTrainReq", playConf.Deplete) // 消耗资源 + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "DragonTrainReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "DragonTrainReq", playConf.Deplete) // 消耗资源 }) } return diff --git a/modules/egghunt/api_award.go b/modules/egghunt/api_award.go index c3419a267..2e6fa6e93 100644 --- a/modules/egghunt/api_award.go +++ b/modules/egghunt/api_award.go @@ -58,7 +58,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.EgghuntAwardReq) ( session.SendMsg(string(this.module.GetType()), "award", &pb.EgghuntAwardResp{Id: req.Id, Award: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EgghuntAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EgghuntAwardReq", atno) }) return } diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index 0489d2ac9..ff229fc27 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -64,7 +64,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha } session.SendMsg(string(this.module.GetType()), EnchantChallengeOverResp, &pb.EnchantChallengeOverResp{Data: enchant}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EnchantChallengeOverReq", cfgEnchant[0].PsMg) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EnchantChallengeOverReq", cfgEnchant[0].PsMg) }) return } @@ -72,7 +72,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EnchantChallengeOverReq", cfgEnchant[0].PsConsume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EnchantChallengeOverReq", cfgEnchant[0].PsConsume) }) userinfo, err := this.module.ModuleUser.GetUser(session.GetUserId()) if err != nil { @@ -106,7 +106,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantCha return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EnchantChallengeOverReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EnchantChallengeOverReq", res) }) } diff --git a/modules/entertainment/api_boxreward.go b/modules/entertainment/api_boxreward.go index 8e27d2bc2..23eb70dde 100644 --- a/modules/entertainment/api_boxreward.go +++ b/modules/entertainment/api_boxreward.go @@ -88,7 +88,7 @@ func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EntertainBoxRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EntertainBoxRewardReq", atno) }) return } diff --git a/modules/entertainment/api_create.go b/modules/entertainment/api_create.go index e7472521e..47a005451 100644 --- a/modules/entertainment/api_create.go +++ b/modules/entertainment/api_create.go @@ -52,7 +52,7 @@ func (this *apiComp) CreateRoom(session comm.IUserSession, req *pb.EntertainCrea return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EntertainCreateRoomReq", conf.Consume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EntertainCreateRoomReq", conf.Consume) }) list.Card[req.Idcard] += 1 this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{ diff --git a/modules/entertainment/api_getreward.go b/modules/entertainment/api_getreward.go index 1b7e8fa20..86e861ba5 100644 --- a/modules/entertainment/api_getreward.go +++ b/modules/entertainment/api_getreward.go @@ -66,7 +66,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.EntertainRewardRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(),0, "EntertainRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, 0, "EntertainRewardReq", atno) }) return } diff --git a/modules/entertainment/api_joinroom.go b/modules/entertainment/api_joinroom.go index 93b7e57ae..c1fcf80a8 100644 --- a/modules/entertainment/api_joinroom.go +++ b/modules/entertainment/api_joinroom.go @@ -50,7 +50,7 @@ func (this *apiComp) JoinRoom(session comm.IUserSession, req *pb.EntertainJoinRo return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EntertainJoinRoomReq", conf.Consume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EntertainJoinRoomReq", conf.Consume) }) list.Card[req.Idcard] += 1 this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{ diff --git a/modules/entertainment/api_match.go b/modules/entertainment/api_match.go index eec455a35..1a1b24df0 100644 --- a/modules/entertainment/api_match.go +++ b/modules/entertainment/api_match.go @@ -50,7 +50,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq) return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EntertainMatchReq", conf.Consume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EntertainMatchReq", conf.Consume) }) list.Card[req.Idcard] += 1 this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{ diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go index a1703c65d..32fe734ac 100644 --- a/modules/entertainment/room.go +++ b/modules/entertainment/room.go @@ -538,7 +538,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) { if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil { return } - go this.module.WriteUserLog(winner.Userinfo.Uid, comm.GMResAddType, "xxlGameReward", atno) + go this.module.WriteUserLog(winner.Userinfo.Uid, "GameOver", comm.GMResAddType, "xxlGameReward", atno) this.szSession[winindex].Push() } diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go index e397be642..263b51894 100644 --- a/modules/equipment/api_ench.go +++ b/modules/equipment/api_ench.go @@ -116,7 +116,7 @@ func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) ( go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype94, 1)) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EquipmentEnchReq", need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EquipmentEnchReq", need) }) return diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go index e8cb7719a..e15c51b84 100644 --- a/modules/equipment/api_forg.go +++ b/modules/equipment/api_forg.go @@ -75,7 +75,7 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) ( session.SendMsg(string(this.module.GetType()), "forg", &pb.EquipmentForgResp{Issucc: true, Reward: reward}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EquipmentForgReq", need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EquipmentForgReq", need) }) return } diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 0ea322664..753f4509a 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -110,7 +110,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) ( } session.SendMsg(string(this.module.GetType()), "sell", &pb.EquipmentSellResp{IsSucc: true, Reward: reward}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "EquipmentSellReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "EquipmentSellReq", reward) }) return } diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 9a1aa7f80..1f359144c 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -293,7 +293,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EquipmentUpgradeReq", intensify.Need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EquipmentUpgradeReq", intensify.Need) }) return } diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index 1f3f2e833..1b08f76e3 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -83,7 +83,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype95, 1)) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "EquipmentWashReq", &cfg.Gameatn{A: comm.AttrType, T: comm.ResGold, N: gole}) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "EquipmentWashReq", &cfg.Gameatn{A: comm.AttrType, T: comm.ResGold, N: gole}) }) return } diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 4e87e9332..3fcc1be9d 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -418,7 +418,7 @@ func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) } go func() { - this.WriteUserLog(session.GetUserId(), 0, "SellEquipments", atno) + this.WriteUserLog(session.GetUserId(), equs, 0, "SellEquipments", atno) }() return } @@ -515,7 +515,7 @@ func (this *Equipment) RecycleEquipments(session comm.IUserSession, equs []strin return } go func() { - this.WriteUserLog(session.GetUserId(), 0, "RecycleEquipments", atno) + this.WriteUserLog(session.GetUserId(), equs, 0, "RecycleEquipments", atno) }() return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index 9cbebd80c..be630be3d 100644 --- a/modules/friend/api_cross_getreward.go +++ b/modules/friend/api_cross_getreward.go @@ -61,7 +61,7 @@ func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewar session.SendMsg(string(this.module.GetType()), "getreward", rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "FriendGetrewardReq", globalConf.FriendPeize) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "FriendGetrewardReq", globalConf.FriendPeize) }) return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index b9e1e45b4..0839ff69c 100644 --- a/modules/friend/api_cross_zan.go +++ b/modules/friend/api_cross_zan.go @@ -133,7 +133,7 @@ func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (errda // 赠送X次友情点 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype11, 1)) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "FriendGetrewardReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "FriendGetrewardReq", res) }) return } diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index 2861feb2b..df0cd7cab 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -62,7 +62,7 @@ func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetAct }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GourmetActivateAtlasReq", conf.Unlockreward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GourmetActivateAtlasReq", conf.Unlockreward) }) return } diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index ddd89ae57..ccb08547a 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -100,8 +100,8 @@ func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreate }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype150, 1)) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GourmetCreateFoodReq", atn) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "GourmetCreateFoodReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GourmetCreateFoodReq", atn) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "GourmetCreateFoodReq", res) }) return } diff --git a/modules/growtask/api_advreceive.go b/modules/growtask/api_advreceive.go index 243b2d9ef..ed4b21eee 100644 --- a/modules/growtask/api_advreceive.go +++ b/modules/growtask/api_advreceive.go @@ -116,7 +116,7 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GrowtaskAdvReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GrowtaskAdvReceiveReq", atno) }) return } diff --git a/modules/growtask/api_receive.go b/modules/growtask/api_receive.go index 1d81c8313..27a8c5411 100644 --- a/modules/growtask/api_receive.go +++ b/modules/growtask/api_receive.go @@ -77,7 +77,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GrowtaskReceiveReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GrowtaskReceiveReq", reward) }) return } diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go index 4b75fe56a..663d6bfeb 100644 --- a/modules/guildgve/api_challengefinish.go +++ b/modules/guildgve/api_challengefinish.go @@ -206,7 +206,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve Boosticket: member.Boosticket, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GuildGveChallengeFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GuildGveChallengeFinishReq", award) }) return } diff --git a/modules/guildgve/api_roulette.go b/modules/guildgve/api_roulette.go index edc03aad6..36ae9b7eb 100644 --- a/modules/guildgve/api_roulette.go +++ b/modules/guildgve/api_roulette.go @@ -73,8 +73,8 @@ func (this *apiComp) Roulette(session comm.IUserSession, req *pb.GuildGveRoulett session.SendMsg(string(this.module.GetType()), "roulette", &pb.GuildGveRouletteResp{Cid: confs[index].Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GuildGveRouletteReq", confs[index].Reward) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "GuildGveRouletteReq", need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "GuildGveRouletteReq", confs[index].Reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "GuildGveRouletteReq", need) }) return } diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 18023ba34..3732ada8b 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -148,7 +148,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroAwakenReq", awakenData.Phaseneed) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroAwakenReq", awakenData.Phaseneed) }) return } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index d0c1b64ec..078ecccd7 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -330,12 +330,12 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq // 任务统计 this.module.SendTaskMsg(session, szStar, req.DrawCount, req.DrawType, szCards) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroDrawCardReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroDrawCardReq", costRes) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroDrawCardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroDrawCardReq", costRes) }) } else { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroDrawCardReq", costRes) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroDrawCardReq", costRes) }) } @@ -420,8 +420,8 @@ func (this *apiComp) wishDrawCard(session comm.IUserSession, heroRecord *pb.DBHe rsp.Record = heroRecord session.SendMsg(string(this.module.GetType()), DrawCard, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroDrawCardReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroDrawCardReq", costRes) + this.module.WriteUserLog(session.GetUserId(), heroRecord.WishHero, comm.GMResAddType, "HeroDrawCardReq", atno) + this.module.WriteUserLog(session.GetUserId(), heroRecord.WishHero, comm.GMResDelType, "HeroDrawCardReq", costRes) }) return } diff --git a/modules/hero/api_peachreward.go b/modules/hero/api_peachreward.go index c67e875fa..614274ac4 100644 --- a/modules/hero/api_peachreward.go +++ b/modules/hero/api_peachreward.go @@ -100,7 +100,7 @@ func (this *apiComp) PeachReward(session comm.IUserSession, req *pb.HeroPeachRew session.SendMsg(string(this.module.GetType()), HeroPeachRewardReq, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroPeachRewardReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroPeachRewardReq", reward) }) return } diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 3fe1c33c8..0f242a0f6 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -155,7 +155,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt tasks = append(tasks, comm.GetBuriedParam(comm.Rtype117, lvUpCount, utils.ToInt32(_hero.HeroID))) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroStrengthenUpSkillReq", cost) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroStrengthenUpSkillReq", cost) }) return } diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 9602739e6..2a614a085 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -117,9 +117,9 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) if len(starConf.Starup) > 0 { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroStrengthenUpStarReq", starConf.Starup) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroStrengthenUpStarReq", starConf.Starup) } - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroStrengthenUpStarReq", starConf.Needrace) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroStrengthenUpStarReq", starConf.Needrace) }) return } diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index da2bbf258..145cd0de2 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -103,7 +103,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroStrengthenUplvReq", cost) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroStrengthenUplvReq", cost) }) return } diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index 81bdf57c4..88160946c 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -220,7 +220,7 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe tasks = append(tasks, comm.GetBuriedParam(comm.Rtype199, 1)) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroTalentLearnReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroTalentLearnReq", res) }) } diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index e3ea56362..139f7f638 100644 --- a/modules/hero/api_talentreset.go +++ b/modules/hero/api_talentreset.go @@ -73,7 +73,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe this.module.Errorf("DispenseRes err,uid:%s,item:%v", session.GetUserId(), res) } // 返还升级的天赋点数 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroTalentResetReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroTalentResetReq", res) }) } @@ -100,7 +100,7 @@ func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentRe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HeroTalentResetReq", this.module.ModuleTools.GetGlobalConf().TalentReset) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HeroTalentResetReq", this.module.ModuleTools.GetGlobalConf().TalentReset) }) return } diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 759ffb06e..de6e549bd 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -824,7 +824,7 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c if len(res) > 0 { // 资源统一发放 this.module.DispenseRes(session, res, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "create hero", res) + this.module.WriteUserLog(session.GetUserId(), heroCfgId, comm.GMResAddType, "create hero", res) }) } return @@ -910,7 +910,7 @@ func (this *ModelHero) GetDrawCardReward(session comm.IUserSession, szCards []st rsp = append(rsp, &pb.AtnoData{Atno: atno}) } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "GetDrawCardReward", rsp) + this.module.WriteUserLog(session.GetUserId(), szCards, comm.GMResAddType, "GetDrawCardReward", rsp) }) return } diff --git a/modules/herotask/api_receive.go b/modules/herotask/api_receive.go index 3fb432623..68332fd95 100644 --- a/modules/herotask/api_receive.go +++ b/modules/herotask/api_receive.go @@ -108,7 +108,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.HeroTaskReceiveR } session.SendMsg(string(this.module.GetType()), "receive", &pb.HeroTaskReceiveResp{Hero: req.Hero, Stage: req.Stage, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HeroTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HeroTaskReceiveReq", award) }) return diff --git a/modules/horoscope/api_rest.go b/modules/horoscope/api_rest.go index 3401b4550..f1972adaa 100644 --- a/modules/horoscope/api_rest.go +++ b/modules/horoscope/api_rest.go @@ -71,8 +71,8 @@ func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) } session.SendMsg(string(this.module.GetType()), "reset", &pb.HoroscopeResetResp{Issucc: true, Info: info, Award: consume}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HoroscopeResetReq", res) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HoroscopeResetReq", conf.HoroscopeResetCost) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HoroscopeResetReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HoroscopeResetReq", conf.HoroscopeResetCost) }) return diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go index a4ccf9ef7..b11936cd9 100644 --- a/modules/horoscope/api_upgrade.go +++ b/modules/horoscope/api_upgrade.go @@ -108,7 +108,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade if len(tasks) > 0 { this.module.ModuleBuried.TriggerBuried(session, tasks...) } - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HoroscopeUpgradeReq", conf.CostItem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HoroscopeUpgradeReq", conf.CostItem) }) return diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index ce2eca0d6..513a39ec5 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -133,7 +133,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen } if ps > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "HuntingChallengeReq", &cfg.Gameatn{ + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "HuntingChallengeReq", &cfg.Gameatn{ A: "attr", T: "ps", N: ps, diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index 41ac48e01..ba288e664 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -204,7 +204,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1)) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "HuntingChallengeOverReq", szAtno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "HuntingChallengeOverReq", szAtno) }) return } diff --git a/modules/integral/api_challengeover.go b/modules/integral/api_challengeover.go index 518db86cd..a6ef46cf4 100644 --- a/modules/integral/api_challengeover.go +++ b/modules/integral/api_challengeover.go @@ -96,7 +96,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "IntegralChallengeOverReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "IntegralChallengeOverReq", res) }) } diff --git a/modules/island/api_buy.go b/modules/island/api_buy.go index 4da56d467..97b112c69 100644 --- a/modules/island/api_buy.go +++ b/modules/island/api_buy.go @@ -116,7 +116,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.IsLandBuyReq) (errda session.SendMsg(string(this.module.GetType()), "buy", &pb.IsLandBuyResp{Hero: hero}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "IsLandBuyReq", coinconf.Need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "IsLandBuyReq", coinconf.Need) }) return } diff --git a/modules/island/api_complete.go b/modules/island/api_complete.go index b7feb140b..5c5de66d5 100644 --- a/modules/island/api_complete.go +++ b/modules/island/api_complete.go @@ -110,7 +110,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR session.SendMsg(string(this.module.GetType()), "complete", &pb.IsLandCompleteResp{Level: req.Level, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "IsLandCompleteReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "IsLandCompleteReq", award) }) return } diff --git a/modules/island/api_receive.go b/modules/island/api_receive.go index bf4f41048..8632569c0 100644 --- a/modules/island/api_receive.go +++ b/modules/island/api_receive.go @@ -70,7 +70,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq session.SendMsg(string(this.module.GetType()), "receive", &pb.IsLandReceiveResp{Info: info, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "IsLandReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "IsLandReceiveReq", award) }) return } diff --git a/modules/island/api_upgrade.go b/modules/island/api_upgrade.go index c47b9f55f..7ef2952a9 100644 --- a/modules/island/api_upgrade.go +++ b/modules/island/api_upgrade.go @@ -77,7 +77,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.IsLandUpgradeReq }) session.SendMsg(string(this.module.GetType()), "upgrade", &pb.IsLandUpgradeResp{Nid: conf.NodeId, Lv: info.Nodes[conf.NodeId]}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "IsLandUpgradeReq", conf.CostItem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "IsLandUpgradeReq", conf.CostItem) }) return } diff --git a/modules/items/api_buyphysical.go b/modules/items/api_buyphysical.go index b4763eac8..1751ff96d 100644 --- a/modules/items/api_buyphysical.go +++ b/modules/items/api_buyphysical.go @@ -109,8 +109,8 @@ func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhys }) session.SendMsg(string(this.module.GetType()), "buyphysical", &pb.ItemsBuyPhysicalResp{Issucc: true, PhysicalBuyNum: user.Physicalbuynum, Asets: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsBuyPhysicalReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "ItemsBuyPhysicalReq", need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ItemsBuyPhysicalReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "ItemsBuyPhysicalReq", need) }) return } diff --git a/modules/items/api_decompose.go b/modules/items/api_decompose.go index 56bd0982a..7db45de9c 100644 --- a/modules/items/api_decompose.go +++ b/modules/items/api_decompose.go @@ -81,7 +81,7 @@ func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecompose session.SendMsg(string(this.module.GetType()), "decompose", &pb.ItemsDecomposeResp{GridId: req.GridId, Amount: req.Amount, Issucc: true, Asets: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsDecomposeReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ItemsDecomposeReq", atno) }) return } diff --git a/modules/items/api_potionsynthesis.go b/modules/items/api_potionsynthesis.go index e55975bc5..827b68166 100644 --- a/modules/items/api_potionsynthesis.go +++ b/modules/items/api_potionsynthesis.go @@ -71,7 +71,7 @@ func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPot session.SendMsg(string(this.module.GetType()), "potionsynthesis", &pb.ItemsPotionSynthesisResp{Succ: true, Id: req.Id, Num: req.Num}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsPotionSynthesisReq", give) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ItemsPotionSynthesisReq", give) }) return diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index bd75096bb..189014b55 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -73,7 +73,7 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe } session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellItemResp{GridId: req.GridId, Amount: req.Amount, Issucc: true, Asets: atno}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsSellItemReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ItemsSellItemReq", atno) }) return } diff --git a/modules/items/api_sellinbulk.go b/modules/items/api_sellinbulk.go index 906e394f4..bdbfab3d1 100644 --- a/modules/items/api_sellinbulk.go +++ b/modules/items/api_sellinbulk.go @@ -88,7 +88,7 @@ func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbu session.SendMsg(string(this.module.GetType()), "sellitem", &pb.ItemsSellinbulkResp{Grids: req.Grids, Amount: req.Amount, Issucc: issucc}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ItemsSellinbulkReq", sale) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ItemsSellinbulkReq", sale) }) return } diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go index 123e4efe9..fc20c7b9d 100644 --- a/modules/items/modelitems.go +++ b/modules/items/modelitems.go @@ -546,8 +546,8 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "buyTicket", res) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "buyTicket", needs) + this.module.WriteUserLog(session.GetUserId(), buy, comm.GMResAddType, "buyTicket", res) + this.module.WriteUserLog(session.GetUserId(), buy, comm.GMResDelType, "buyTicket", needs) }) return } @@ -605,7 +605,7 @@ func (this *ModelItemsComp) recoverTicket(session comm.IUserSession) (errdata *p this.module.DispenseRes(session, []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}, true) info.Recovertimeunifiedticket = time.Unix(info.Recovertimeunifiedticket, 0).Add(time.Duration(ticketNum) * time.Minute).Unix() go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "recoverTicket", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}) + this.module.WriteUserLog(session.GetUserId(), "", comm.GMResAddType, "recoverTicket", []*cfg.Gameatn{{A: ticketitem.A, T: ticketitem.T, N: ticketNum}}) }) } } @@ -669,7 +669,7 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "itemuse_exchange", sale) + this.module.WriteUserLog(session.GetUserId(), slt, comm.GMResDelType, "itemuse_exchange", sale) }) if errdata = this.module.AddItemforGrid(session, gid, -1*itemcf.SynthetizeNum*int32(amount), true); errdata != nil { return @@ -715,7 +715,7 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "itemuse_heroexchange", sale) + this.module.WriteUserLog(session.GetUserId(), slt, comm.GMResDelType, "itemuse_heroexchange", sale) }) if errdata = this.module.AddItemforGrid(session, gid, -1*int32(amount), true); errdata != nil { return @@ -834,7 +834,7 @@ func (this *ModelItemsComp) useitem(session comm.IUserSession, gid string, amoun } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "useitem", atno) + this.module.WriteUserLog(session.GetUserId(), itemcf.Usetype, comm.GMResAddType, "useitem", atno) }) return } diff --git a/modules/items/module.go b/modules/items/module.go index 621989efd..a3ca37220 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -365,7 +365,7 @@ func (this *Items) SellItem(session comm.IUserSession, items map[string]int32, b this.itemsChangePush(session, change) //推送道具背包变化 } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "SellItem", atno) + this.WriteUserLog(session.GetUserId(), "", 0, "SellItem", atno) }) return } diff --git a/modules/jielong/api_reward.go b/modules/jielong/api_reward.go index d5adf9fa6..bee3092ae 100644 --- a/modules/jielong/api_reward.go +++ b/modules/jielong/api_reward.go @@ -91,7 +91,7 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq) }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "JielongRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "JielongRewardReq", atno) }) return } diff --git a/modules/jielong/api_start.go b/modules/jielong/api_start.go index 754d47eac..2b99844cc 100644 --- a/modules/jielong/api_start.go +++ b/modules/jielong/api_start.go @@ -50,7 +50,7 @@ func (this *apiComp) StartGame(session comm.IUserSession, req *pb.JielongStartGa }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "JielongStartGameReq", jielongItem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "JielongStartGameReq", jielongItem) }) return } diff --git a/modules/kftask/api_receive.go b/modules/kftask/api_receive.go index cff4c9d70..4f9d2b70b 100644 --- a/modules/kftask/api_receive.go +++ b/modules/kftask/api_receive.go @@ -104,7 +104,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq }) session.SendMsg(string(this.module.GetType()), "receive", &pb.KFTaskReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "KFTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "KFTaskReceiveReq", award) }) return diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index 106db0222..a69b4e762 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -108,7 +108,7 @@ func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGe }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "LibraryGetStoryRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "LibraryGetStoryRewardReq", atno) }) return } diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 9cc7435d8..12250aed6 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -73,7 +73,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvReward Reward: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "LibraryLvRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "LibraryLvRewardReq", atno) }) return } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 017c0d0b2..e53cf9ae0 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -201,7 +201,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe if len(tasks) > 0 { this.module.ModuleBuried.TriggerBuried(session, tasks...) } - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "LibraryUseGiftReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "LibraryUseGiftReq", res) }) return diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index ff5f8cb69..d10b30d0b 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -69,7 +69,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceive } session.SendMsg(string(this.module.GetType()), LinestorySubTypeReceive, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "LinestoryReceiveReq", conf.Reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "LinestoryReceiveReq", conf.Reward) }) return } diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index b3cc34a42..c72bbe450 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -61,7 +61,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma session.SendMsg(string(this.module.GetType()), "getusermailattachment", &pb.MailGetUserMailAttachmentResp{Mail: mail}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MailGetUserMailAttachmentReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MailGetUserMailAttachmentReq", res) }) return } @@ -124,7 +124,7 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai Ids: mailIds, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MailGetAllMailAttachmentReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MailGetAllMailAttachmentReq", atno) }) return } diff --git a/modules/mainline/api_booschallengeover.go b/modules/mainline/api_booschallengeover.go index 46debc445..7191babfd 100644 --- a/modules/mainline/api_booschallengeover.go +++ b/modules/mainline/api_booschallengeover.go @@ -88,7 +88,7 @@ func (this *apiComp) BoosChallengeOver(session comm.IUserSession, req *pb.Mainli Reward: aeward, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineBoosChallengeOverReq", aeward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineBoosChallengeOverReq", aeward) }) return } diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go index 0e111d131..1583d8f22 100644 --- a/modules/mainline/api_challenge.go +++ b/modules/mainline/api_challenge.go @@ -104,7 +104,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle }) if ps > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "MainlineChallengeReq", psAnt) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "MainlineChallengeReq", psAnt) }) } return diff --git a/modules/mainline/api_challengeover.go b/modules/mainline/api_challengeover.go index 6c7880d3e..60dddde97 100644 --- a/modules/mainline/api_challengeover.go +++ b/modules/mainline/api_challengeover.go @@ -82,7 +82,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh }) // 数据推送 go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineChallengeOverReq false", conf.PsConsume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineChallengeOverReq false", conf.PsConsume) }) return } @@ -204,7 +204,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineChallengeOverReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineChallengeOverReq", reward) }) return } diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go index 88ff51938..89792f27d 100644 --- a/modules/mainline/api_levelpass.go +++ b/modules/mainline/api_levelpass.go @@ -145,7 +145,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineLevelPassReq", aeward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineLevelPassReq", aeward) }) return } diff --git a/modules/mainline/api_receiveaward.go b/modules/mainline/api_receiveaward.go index d66c113bd..94671fbc5 100644 --- a/modules/mainline/api_receiveaward.go +++ b/modules/mainline/api_receiveaward.go @@ -156,7 +156,7 @@ func (this *apiComp) ReceiveAward(session comm.IUserSession, req *pb.MainlineRec }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineReceiveAwardReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineReceiveAwardReq", reward) }) return } diff --git a/modules/mainline/api_shopbuy.go b/modules/mainline/api_shopbuy.go index 4d24e61f2..c5224ebbd 100644 --- a/modules/mainline/api_shopbuy.go +++ b/modules/mainline/api_shopbuy.go @@ -92,8 +92,8 @@ func (this *apiComp) ShopBuy(session comm.IUserSession, req *pb.MainlineShopBuyR go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineShopBuyReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "MainlineShopBuyReq", shopConf.Need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineShopBuyReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "MainlineShopBuyReq", shopConf.Need) }) return } diff --git a/modules/mainline/api_taskchaptereward.go b/modules/mainline/api_taskchaptereward.go index bd275e03d..53be4a5f1 100644 --- a/modules/mainline/api_taskchaptereward.go +++ b/modules/mainline/api_taskchaptereward.go @@ -96,7 +96,7 @@ func (this *apiComp) TaskChapteReward(session comm.IUserSession, req *pb.Mainlin }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineTaskChapteRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineTaskChapteRewardReq", award) }) return } diff --git a/modules/mainline/api_taskreceive.go b/modules/mainline/api_taskreceive.go index d41d79608..6a4b73fce 100644 --- a/modules/mainline/api_taskreceive.go +++ b/modules/mainline/api_taskreceive.go @@ -78,7 +78,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.MainlineTask session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.MainlineTaskReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MainlineTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineTaskReceiveReq", award) }) return } diff --git a/modules/modeluserlog.go b/modules/modeluserlog.go index 6dee0b2bb..dedc4085b 100644 --- a/modules/modeluserlog.go +++ b/modules/modeluserlog.go @@ -40,12 +40,13 @@ func (this *modelUserLog) Init(service core.IService, module core.IModule, comp } // 用户操作明细数据记录 -func (this *modelUserLog) AddUserLog(uid string, itype int32, tag string, data interface{}) { +func (this *modelUserLog) AddUserLog(uid string, req interface{}, itype int32, tag string, data interface{}) { var ( dbModel *db.DBModel err error jsonStr []byte logType string + jsonReq []byte ) if data == nil { // 过滤空数据 return @@ -54,6 +55,13 @@ func (this *modelUserLog) AddUserLog(uid string, itype int32, tag string, data i log.Errorln(err) return } + if len(jsonStr) == 0 { + return + } + if jsonReq, err = json.Marshal(req); err != nil { + log.Errorln(err) + return + } if itype == 0 { logType = "add" // 新增资源类型 } else if itype == 1 { @@ -74,6 +82,7 @@ func (this *modelUserLog) AddUserLog(uid string, itype int32, tag string, data i Tag: tag, Data: string(jsonStr), Ctime: configure.Now().Unix(), + Req: string(jsonReq), }); err != nil { log.Errorln(err) return @@ -89,6 +98,7 @@ func (this *modelUserLog) AddUserLog(uid string, itype int32, tag string, data i Tag: tag, Data: string(jsonStr), Ctime: configure.Now().Unix(), + Req: string(jsonReq), }); err != nil { log.Errorln(err) return diff --git a/modules/modulebase.go b/modules/modulebase.go index 704dd5f39..10b7e9a36 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -955,6 +955,6 @@ func (this *ModuleBase) AsynHandleSession(session comm.IUserSession, handle func } //写用户日志 -func (this *ModuleBase) WriteUserLog(uid string, itype int32, tag string, data interface{}) { - this.userlog.AddUserLog(uid, itype, tag, data) +func (this *ModuleBase) WriteUserLog(uid string, req interface{}, itype int32, tag string, data interface{}) { + this.userlog.AddUserLog(uid, req, itype, tag, data) } diff --git a/modules/moonfantasy/api_buy.go b/modules/moonfantasy/api_buy.go index acae227c9..648c896e9 100644 --- a/modules/moonfantasy/api_buy.go +++ b/modules/moonfantasy/api_buy.go @@ -97,7 +97,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) ( session.SendMsg(string(this.module.GetType()), "buy", &pb.MoonfantasyBuyResp{Issucc: true, BattleNum: req.BuyNum}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "MoonfantasyBuyReq", need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "MoonfantasyBuyReq", need) }) return } diff --git a/modules/moonfantasy/api_receive.go b/modules/moonfantasy/api_receive.go index 20ec7f159..c5ed04748 100644 --- a/modules/moonfantasy/api_receive.go +++ b/modules/moonfantasy/api_receive.go @@ -44,7 +44,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonfantasyReceiveReq", boss.PsMg) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MoonfantasyReceiveReq", boss.PsMg) }) return } else { @@ -54,7 +54,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei this.module.DispenseRes(session, boss.Prize, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonfantasyReceiveReq", boss.Prize) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MoonfantasyReceiveReq", boss.Prize) }) } diff --git a/modules/moonlv/api_receive.go b/modules/moonlv/api_receive.go index 55764f018..eac8af8a1 100644 --- a/modules/moonlv/api_receive.go +++ b/modules/moonlv/api_receive.go @@ -75,7 +75,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.MoonlvTaskAwar }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "MoonlvTaskAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MoonlvTaskAwardReq", atno) }) return } diff --git a/modules/oldtimes/api_receive.go b/modules/oldtimes/api_receive.go index 6fd8a2957..454e93583 100644 --- a/modules/oldtimes/api_receive.go +++ b/modules/oldtimes/api_receive.go @@ -63,7 +63,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.OldtimesReceiveR if len(res) > 0 { this.module.DispenseRes(session, res, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "OldtimesReceiveReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "OldtimesReceiveReq", res) }) } session.SendMsg(string(this.module.GetType()), "receive", rsp) diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index ab600d7f3..d890df9a5 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -192,7 +192,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypePagoda, conf.Key) this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab)) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaChallengeOverReq", conf.Reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PagodaChallengeOverReq", conf.Reward) }) return } diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go index af15000bd..c9473a13d 100644 --- a/modules/pagoda/api_getReward.go +++ b/modules/pagoda/api_getReward.go @@ -79,7 +79,7 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewar Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaGetRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PagodaGetRewardReq", atno) }) return diff --git a/modules/pagoda/api_racechallengeover.go b/modules/pagoda/api_racechallengeover.go index 660be00cd..906a02332 100644 --- a/modules/pagoda/api_racechallengeover.go +++ b/modules/pagoda/api_racechallengeover.go @@ -188,7 +188,7 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaChallengeRaceOverReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PagodaChallengeRaceOverReq", atno) }) return } diff --git a/modules/parkour/api_allweekreward.go b/modules/parkour/api_allweekreward.go index 6857a3594..42f9d96e1 100644 --- a/modules/parkour/api_allweekreward.go +++ b/modules/parkour/api_allweekreward.go @@ -71,7 +71,7 @@ func (this *apiComp) AllWeekReward(session comm.IUserSession, req *pb.ParkourAll } session.SendMsg(string(this.module.GetType()), "allweekreward", &pb.CapturesheepAllWeekRewardResp{Weekreward: info.Weekreward, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepAllWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CapturesheepAllWeekRewardReq", award) }) return } diff --git a/modules/parkour/api_weekreward.go b/modules/parkour/api_weekreward.go index 0a06440d2..d6a4173eb 100644 --- a/modules/parkour/api_weekreward.go +++ b/modules/parkour/api_weekreward.go @@ -74,7 +74,7 @@ func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.ParkourWeekRe } session.SendMsg(string(this.module.GetType()), "weekreward", &pb.CapturesheepWeekRewardResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "CapturesheepWeekRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "CapturesheepWeekRewardReq", award) }) return } diff --git a/modules/parkour/module.go b/modules/parkour/module.go index fdb3db5db..fb79c4cc9 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -588,7 +588,7 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) { Award: award[v.GetUserId()], }) go this.AsynHandleSession(v, func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "ParkourRaceOverPush", award[v.GetUserId()]) + this.WriteUserLog(session.GetUserId(), "", 0, "ParkourRaceOverPush", award[v.GetUserId()]) }) sessions = append(sessions, v) } diff --git a/modules/passon/api_clearcd.go b/modules/passon/api_clearcd.go index 4bcc24bcc..147d83414 100644 --- a/modules/passon/api_clearcd.go +++ b/modules/passon/api_clearcd.go @@ -59,7 +59,7 @@ func (this *apiComp) ClearCD(session comm.IUserSession, req *pb.PassonClearCDReq } session.SendMsg(string(this.module.GetType()), "clearcd", &pb.PassonClearCDResp{Index: req.Index}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PassonClearCDReq", conf.Remake) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "PassonClearCDReq", conf.Remake) }) return } diff --git a/modules/pay/api_activitybuy.go b/modules/pay/api_activitybuy.go index 1fc1a10df..06917c04b 100644 --- a/modules/pay/api_activitybuy.go +++ b/modules/pay/api_activitybuy.go @@ -93,7 +93,7 @@ func (this *apiComp) ActivityBuy(session comm.IUserSession, req *pb.PayActivityB } session.SendMsg(string(this.module.GetType()), "activitybuy", &pb.PayDailyBuyResp{Isucc: true, Items: items}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PayDailyBuyReq", conf.Costitem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "PayDailyBuyReq", conf.Costitem) }) return } diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index 3daa99998..8fa5912ae 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -68,7 +68,7 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) session.SendMsg(string(this.module.GetType()), "dailybuy", &pb.PayDailyBuyResp{Isucc: true, Items: items}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PayDailyBuyReq", conf.Costitem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "PayDailyBuyReq", conf.Costitem) }) return } diff --git a/modules/pay/modelActivity.go b/modules/pay/modelActivity.go index 6946190e9..72eda4292 100644 --- a/modules/pay/modelActivity.go +++ b/modules/pay/modelActivity.go @@ -135,7 +135,7 @@ func (this *modelActivityComp) delivery(session comm.IUserSession, pid int32) (e return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "delivery", conf.Item) + this.module.WriteUserLog(session.GetUserId(), pid, comm.GMResAddType, "delivery", conf.Item) }) return } diff --git a/modules/pay/modelDaily.go b/modules/pay/modelDaily.go index 692ad4baf..806999164 100644 --- a/modules/pay/modelDaily.go +++ b/modules/pay/modelDaily.go @@ -99,7 +99,7 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid int32) (errd return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "delivery", conf.Item) + this.module.WriteUserLog(session.GetUserId(), pid, comm.GMResAddType, "delivery", conf.Item) }) return } diff --git a/modules/pay/modelDiamond.go b/modules/pay/modelDiamond.go index 0baa6f19b..28d756709 100644 --- a/modules/pay/modelDiamond.go +++ b/modules/pay/modelDiamond.go @@ -94,7 +94,7 @@ func (this *modelDiamondComp) delivery(session comm.IUserSession, id int32) (err return } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "deliverybyid", items) + this.module.WriteUserLog(session.GetUserId(), id, comm.GMResAddType, "deliverybyid", items) }) return } diff --git a/modules/pay/module.go b/modules/pay/module.go index b251d48d1..0b6eb420a 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -224,7 +224,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype229, 1, conf.Pid)) - this.WriteUserLog(session.GetUserId(), 0, "Rpc_ModulePayDelivery", res) + this.WriteUserLog(session.GetUserId(), args, 0, "Rpc_ModulePayDelivery", res) }) return } diff --git a/modules/practice/api_getgymbuff.go b/modules/practice/api_getgymbuff.go index 1a4392d0a..9f336cf19 100644 --- a/modules/practice/api_getgymbuff.go +++ b/modules/practice/api_getgymbuff.go @@ -64,7 +64,7 @@ func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGy session.SendMsg(string(this.module.GetType()), "getgymbuff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeGetGymBuffReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PracticeGetGymBuffReq", award) }) return } diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index 438460db5..731eaa2f2 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -86,7 +86,7 @@ func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRe session.SendMsg(string(this.module.GetType()), "gymrefresh", &pb.PracticeGymRefreshResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PracticeGymRefreshReq", atn) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "PracticeGymRefreshReq", atn) }) return } diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index 830ede40c..1a23e5265 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -91,7 +91,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeNPCBattkleFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PracticeNPCBattkleFinishReq", award) }) return } diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index dd9814f36..42e62a89e 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -305,7 +305,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PracticeReceiveReq", award) }) return } diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index 33121ae16..856af17b3 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -81,7 +81,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PracticeUnLockReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PracticeUnLockReq", res) }) return diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index b146f5f3d..a9475b782 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -89,7 +89,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeR }) session.SendMsg(string(this.module.GetType()), "upgrade", &pb.PracticeUpgradeResp{Index: req.Index, Lv: pillar.Lv}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "PracticeUpgradeReq", pillarconfigure.UpLvConsume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "PracticeUpgradeReq", pillarconfigure.UpLvConsume) }) return } diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index 1ba8df24a..a873da81e 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -88,9 +88,9 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PrivilegeBuyGiftReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PrivilegeBuyGiftReq", atno) if conf.PriceDiscount.N > 0 { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PrivilegeBuyGiftReq", conf.PriceDiscount) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PrivilegeBuyGiftReq", conf.PriceDiscount) } }) return diff --git a/modules/privilege/module.go b/modules/privilege/module.go index a81e88799..795752a70 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -187,7 +187,7 @@ func (this *Privilege) Delivery(session comm.IUserSession, pId int32) (errdata * // 推送 session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeBuyYuekaResp{Data: list}) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "PrivilegeBuyYuekaReq", items) + this.WriteUserLog(session.GetUserId(), pId, 0, "PrivilegeBuyYuekaReq", items) }) return } @@ -221,7 +221,7 @@ func (this *Privilege) RenewPrivilegeCard(session comm.IUserSession, cId int32) } session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeGetListResp{Data: list}) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "PrivilegeGetListReq", conf.DisposableReward) + this.WriteUserLog(session.GetUserId(), cId, 0, "PrivilegeGetListReq", conf.DisposableReward) }) } else { errdata = &pb.ErrorData{ diff --git a/modules/pushgiftbag/module.go b/modules/pushgiftbag/module.go index 947fb7a95..5f274728c 100644 --- a/modules/pushgiftbag/module.go +++ b/modules/pushgiftbag/module.go @@ -97,7 +97,7 @@ func (this *PushGiftbag) Delivery(session comm.IUserSession, pId int32) (errdata }) session.SendMsg(string(this.GetType()), "chanage", &pb.PushGiftbagChanagePush{Item: info.Item}) go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "PushGiftbagChanagePush", items) + this.WriteUserLog(session.GetUserId(), pId, 0, "PushGiftbagChanagePush", items) }) return } diff --git a/modules/questionnaire/api_answer.go b/modules/questionnaire/api_answer.go index 86d5eed18..c5b236d1e 100644 --- a/modules/questionnaire/api_answer.go +++ b/modules/questionnaire/api_answer.go @@ -93,7 +93,7 @@ func (this *apiComp) Answer(session comm.IUserSession, req *pb.QuestionnaireAnsw } this.module.DispenseRes(session, groupconfig.Reward, true) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "QuestionnaireAnswerReq", groupconfig.Reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "QuestionnaireAnswerReq", groupconfig.Reward) }) } tasks = append(tasks, comm.GetBuriedParam(comm.Rtype203, 1, req.Group)) diff --git a/modules/reputation/module.go b/modules/reputation/module.go index 8490fd1e7..0406a19fb 100644 --- a/modules/reputation/module.go +++ b/modules/reputation/module.go @@ -1,6 +1,7 @@ package reputation import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" @@ -125,7 +126,7 @@ func (this *Reputation) Upgrade(session comm.IUserSession, raceType int32, fv in this.DispenseRes(session, []*cfg.Gameatn{reward}, false) } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "ReputationUpgrade", reward) + this.WriteUserLog(session.GetUserId(), fmt.Sprintf("raceType:%d,fv:%d,", raceType, fv), 0, "ReputationUpgrade", reward) }) } diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index f34bbbd4a..4d7e7a97c 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -201,7 +201,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ShopBuyResq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ShopBuyResq", award) }) } return diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go index 1f4a30d90..068da8bd7 100644 --- a/modules/shopcenter/api_receive.go +++ b/modules/shopcenter/api_receive.go @@ -169,7 +169,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv } session.SendMsg(string(this.module.GetType()), "receive", &pb.ShopCenterReceiveResp{Fid: req.Fid, Pid: req.Pid, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "ShopCenterReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "ShopCenterReceiveReq", award) }) return } diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go index 2b10f76d8..7964f93ff 100644 --- a/modules/smithy/api_atlasaward.go +++ b/modules/smithy/api_atlasaward.go @@ -60,7 +60,7 @@ func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAw Reward: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithyAtlasAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SmithyAtlasAwardReq", atno) }) return } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 8108f5c3b..9fd9a7180 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -374,7 +374,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithyForgeEquipReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SmithyForgeEquipReq", atno) }) return diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go index dcd19eecd..16ba3a82e 100644 --- a/modules/smithy/api_receive.go +++ b/modules/smithy/api_receive.go @@ -62,7 +62,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwar }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithyTaskAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SmithyTaskAwardReq", atno) }) return } diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index c01094b6e..74018a4a5 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -75,7 +75,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err session.SendMsg(string(this.module.GetType()), "sell", rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SmithySellReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SmithySellReq", atno) }) return } diff --git a/modules/smithy/module.go b/modules/smithy/module.go index 9516f17fa..a6884533d 100644 --- a/modules/smithy/module.go +++ b/modules/smithy/module.go @@ -315,7 +315,7 @@ func (this *Smithy) GmSmithyAtlas(session comm.IUserSession) { this.modelAtlas.CheckActivateEquipAtlas(session.GetUserId(), equip, 1) } go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(session.GetUserId(), 0, "GmSmithyAtlas", atno) + this.WriteUserLog(session.GetUserId(), "gm", 0, "GmSmithyAtlas", atno) }) } diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index 77946af32..91a3a7447 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -93,7 +93,7 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatyActivityReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SociatyActivityReceiveReq", atno) }) return } diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index 34aa6c772..d351b7a9b 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -99,7 +99,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (errd session.SendMsg(string(this.module.GetType()), SociatySubTypeBuy, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatyBuyReq", atn) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SociatyBuyReq", atn) }) return } diff --git a/modules/sociaty/api_cross_receive.go b/modules/sociaty/api_cross_receive.go index dc995b535..ed06d3a0e 100644 --- a/modules/sociaty/api_cross_receive.go +++ b/modules/sociaty/api_cross_receive.go @@ -123,7 +123,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveRe session.SendMsg(string(this.module.GetType()), SociatySubTypeReceive, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatyReceiveReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SociatyReceiveReq", atno) }) return } diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go index 02d211cbf..51f5ec76f 100644 --- a/modules/sociaty/api_cross_sign.go +++ b/modules/sociaty/api_cross_sign.go @@ -109,7 +109,7 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er session.SendMsg(string(this.module.GetType()), SociatySubTypeSign, rsp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "SociatySignReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SociatySignReq", atno) }) return } diff --git a/modules/stonehenge/api_bookaward.go b/modules/stonehenge/api_bookaward.go index acef92853..6aaca6dd7 100644 --- a/modules/stonehenge/api_bookaward.go +++ b/modules/stonehenge/api_bookaward.go @@ -96,7 +96,7 @@ func (this *apiComp) BookAward(session comm.IUserSession, req *pb.StonehengeBook session.SendMsg(string(this.module.GetType()), "bookaward", &pb.StonehengeBookAwardResp{Btype: req.Btype, Stage: req.Stage, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeBookAwardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StonehengeBookAwardReq", atno) }) return } diff --git a/modules/stonehenge/api_enterlevel.go b/modules/stonehenge/api_enterlevel.go index e8eff061e..9823fe521 100644 --- a/modules/stonehenge/api_enterlevel.go +++ b/modules/stonehenge/api_enterlevel.go @@ -186,7 +186,7 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt this.module.ModuleBuried.TriggerBuried(session, tasks...) } if len(reward) > 0 { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeEnterLevelReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StonehengeEnterLevelReq", reward) } }) return diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go index c273eb33c..becb4d96d 100644 --- a/modules/stonehenge/api_event.go +++ b/modules/stonehenge/api_event.go @@ -621,9 +621,9 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq this.module.ModuleBuried.TriggerBuried(session, tasks...) } if len(reward) > 0 { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeEventReq", reward) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StonehengeEventReq", reward) if len(eventConf.CostItem) > 0 { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "StonehengeEventReq", eventConf.CostItem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "StonehengeEventReq", eventConf.CostItem) } } }) diff --git a/modules/stonehenge/api_finish.go b/modules/stonehenge/api_finish.go index b77cb7122..2e8cb9379 100644 --- a/modules/stonehenge/api_finish.go +++ b/modules/stonehenge/api_finish.go @@ -111,7 +111,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StonehengeFinishReq", atno) }) return } diff --git a/modules/stonehenge/api_taskreceive.go b/modules/stonehenge/api_taskreceive.go index ae68780c4..2e8cf5277 100644 --- a/modules/stonehenge/api_taskreceive.go +++ b/modules/stonehenge/api_taskreceive.go @@ -95,7 +95,7 @@ func (this *apiComp) TaskReceive(session comm.IUserSession, req *pb.StonehengeTa session.SendMsg(string(this.module.GetType()), "taskreceive", &pb.StonehengeTaskReceiveResp{Task: info.Task, Award: award}) if len(award) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StonehengeTaskReceiveReq", award) }) } diff --git a/modules/stonehenge/api_weekAward.go b/modules/stonehenge/api_weekAward.go index 34ef75827..91815a73e 100644 --- a/modules/stonehenge/api_weekAward.go +++ b/modules/stonehenge/api_weekAward.go @@ -94,7 +94,7 @@ func (this *apiComp) WeekAward(session comm.IUserSession, req *pb.StonehengeWeek session.SendMsg(string(this.module.GetType()), "weekaward", &pb.StonehengeWeekAwardResp{Id: req.Id, Weeklyreward: info.Weeklyreward, Award: award}) if len(award) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StonehengeWeekAwardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StonehengeWeekAwardReq", award) }) } diff --git a/modules/storyline/api_complete.go b/modules/storyline/api_complete.go index c206b9dd9..3cd558cf4 100644 --- a/modules/storyline/api_complete.go +++ b/modules/storyline/api_complete.go @@ -190,7 +190,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.StorylineComple session.SendMsg(string(this.module.GetType()), "complete", &pb.StorylineCompleteResp{Level: req.Level, Story: req.Story, Award: award}) if len(award) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "StorylineCompleteReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "StorylineCompleteReq", award) }) } return diff --git a/modules/turntable/api_draw.go b/modules/turntable/api_draw.go index c54366516..6b6affe57 100644 --- a/modules/turntable/api_draw.go +++ b/modules/turntable/api_draw.go @@ -83,8 +83,8 @@ func (this *apiComp) Draw(session comm.IUserSession, req *pb.TurntableDrawReq) ( }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "TurntableDrawReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "TurntableDrawReq", need) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "TurntableDrawReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "TurntableDrawReq", need) }) return } diff --git a/modules/uigame/api_latticefinish.go b/modules/uigame/api_latticefinish.go index 2937a3893..191832ecd 100644 --- a/modules/uigame/api_latticefinish.go +++ b/modules/uigame/api_latticefinish.go @@ -57,7 +57,7 @@ func (this *apiComp) LatticeFinish(session comm.IUserSession, req *pb.UiGameLatt Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameLatticeFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGameLatticeFinishReq", atno) }) return } diff --git a/modules/uigame/api_latticegrid.go b/modules/uigame/api_latticegrid.go index 9322bdc39..2d42e9f45 100644 --- a/modules/uigame/api_latticegrid.go +++ b/modules/uigame/api_latticegrid.go @@ -139,7 +139,7 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameLatticeGridReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGameLatticeGridReq", atno) }) return } diff --git a/modules/uigame/api_latticereward.go b/modules/uigame/api_latticereward.go index ae918ede6..95d537b17 100644 --- a/modules/uigame/api_latticereward.go +++ b/modules/uigame/api_latticereward.go @@ -65,7 +65,7 @@ func (this *apiComp) LatticeReward(session comm.IUserSession, req *pb.UiGameLatt Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameLatticeRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGameLatticeRewardReq", atno) }) return } diff --git a/modules/uigame/api_minerfinish.go b/modules/uigame/api_minerfinish.go index f38e95aa7..3d7c744b3 100644 --- a/modules/uigame/api_minerfinish.go +++ b/modules/uigame/api_minerfinish.go @@ -57,7 +57,7 @@ func (this *apiComp) MinerFinish(session comm.IUserSession, req *pb.UiGameMinerF Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameMinerFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGameMinerFinishReq", atno) }) return } diff --git a/modules/uigame/api_minergrid.go b/modules/uigame/api_minergrid.go index 9f4f5f1ce..1ce8d0482 100644 --- a/modules/uigame/api_minergrid.go +++ b/modules/uigame/api_minergrid.go @@ -63,8 +63,8 @@ func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyR Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGameMinerKeyReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UiGameMinerKeyReq", conf.Cost) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGameMinerKeyReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "UiGameMinerKeyReq", conf.Cost) }) return } diff --git a/modules/uigame/api_puzzlegrid.go b/modules/uigame/api_puzzlegrid.go index 09eca9014..455365d6e 100644 --- a/modules/uigame/api_puzzlegrid.go +++ b/modules/uigame/api_puzzlegrid.go @@ -69,8 +69,8 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGamePuzzleGridReq", atno) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UiGamePuzzleGridReq", conf.Cost) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGamePuzzleGridReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "UiGamePuzzleGridReq", conf.Cost) }) return } diff --git a/modules/uigame/api_puzzlereward.go b/modules/uigame/api_puzzlereward.go index a7e14b6ba..895d5cbdc 100644 --- a/modules/uigame/api_puzzlereward.go +++ b/modules/uigame/api_puzzlereward.go @@ -50,7 +50,7 @@ func (this *apiComp) PuzzleReward(session comm.IUserSession, req *pb.UiGamePuzzl }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UiGamePuzzleRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UiGamePuzzleRewardReq", atno) }) return } diff --git a/modules/uigame/module.go b/modules/uigame/module.go index eaedc3573..c3877c769 100644 --- a/modules/uigame/module.go +++ b/modules/uigame/module.go @@ -94,7 +94,7 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { this.DispenseRes(s, []*cfg.Gameatn{res}, true) go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(s.GetUserId(), 0, "HDPSTodayConsum", res) + this.WriteUserLog(s.GetUserId(), ps, 0, "HDPSTodayConsum", res) }) } @@ -145,7 +145,7 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { } this.DispenseRes(s, []*cfg.Gameatn{res}, true) go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(s.GetUserId(), 0, "HDPSTodayConsum", res) + this.WriteUserLog(s.GetUserId(), ps, 0, "HDPSTodayConsum", res) }) } @@ -196,7 +196,7 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { } this.DispenseRes(s, []*cfg.Gameatn{res}, true) go this.AsynHandleSession(s.Clone(), func(session comm.IUserSession) { - this.WriteUserLog(s.GetUserId(), 0, "HDPSTodayConsum", res) + this.WriteUserLog(s.GetUserId(), ps, 0, "HDPSTodayConsum", res) }) } diff --git a/modules/user/api_changetips.go b/modules/user/api_changetips.go index 5eddf282a..cf4ded5fd 100644 --- a/modules/user/api_changetips.go +++ b/modules/user/api_changetips.go @@ -34,7 +34,7 @@ func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTip Data: sign, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UserChangeTipsReq", consume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "UserChangeTipsReq", consume) }) } diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 42ce1efb3..1c5532878 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -122,7 +122,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e if len(tasks) > 0 { this.module.ModuleBuried.TriggerBuried(session, tasks...) } - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserCreateReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UserCreateReq", award) this.module.modelUser.ResAutoReplies(session, user.Resreplies) }) return diff --git a/modules/user/api_deposit.go b/modules/user/api_deposit.go index 22896bc33..6868bbfe4 100644 --- a/modules/user/api_deposit.go +++ b/modules/user/api_deposit.go @@ -75,7 +75,7 @@ func (this *apiComp) Deposit(session comm.IUserSession, req *pb.UserDepositReq) }, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserDepositReq", atn) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UserDepositReq", atn) }) return } diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index d7b144ad5..d061736d7 100644 --- a/modules/user/api_modifyname.go +++ b/modules/user/api_modifyname.go @@ -99,7 +99,7 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam //resp.Count = uint32(left) this.sendMsg(session, UserSubTypeModifyName, resp) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "UserModifynameReq", this.module.globalConf.ChangeName) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "UserModifynameReq", this.module.globalConf.ChangeName) }) return } diff --git a/modules/user/api_puzzleaward.go b/modules/user/api_puzzleaward.go index ed688dba0..5e601ab20 100644 --- a/modules/user/api_puzzleaward.go +++ b/modules/user/api_puzzleaward.go @@ -71,7 +71,7 @@ func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAw Index: req.Index, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "UserPuzzleAwardReq", res) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "UserPuzzleAwardReq", res) }) return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 4553df579..da33f1366 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -288,6 +288,10 @@ func (this *ModelUser) computeLevel(change *pb.UserResChangedPush) (lvchange boo } func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64, name string, rewards []*cfg.Gameatn) { + var ( + atno []*pb.UserAtno + errdata *pb.ErrorData + ) defer this.module.PutUserSession(session) if err := session.SendMsg(string(this.module.GetType()), UserSubTypeLvChangedPush, &pb.UserLvChangedPush{Uid: session.GetUserId(), Exp: exp, Lv: lv}); err != nil { @@ -297,7 +301,7 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64, log.Field{Key: "lv", Value: lv}, ) } - if errdata := this.module.DispenseRes(session, rewards, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, rewards, true); errdata != nil { this.module.Error("资源发放", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "rewards", Value: rewards}, @@ -306,7 +310,7 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64, this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "changelv", rewards) + this.module.WriteUserLog(session.GetUserId(), fmt.Sprintf(" lv :%d, exp %d, name %s", lv, exp, name), comm.GMResAddType, "changelv", atno) }) session.Push() diff --git a/modules/venture/api_lvreward.go b/modules/venture/api_lvreward.go index f7dc183b1..d75f4e4c3 100644 --- a/modules/venture/api_lvreward.go +++ b/modules/venture/api_lvreward.go @@ -81,7 +81,7 @@ func (this *apiComp) LvReward(session comm.IUserSession, req *pb.VentureLvReward Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VentureLvRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "VentureLvRewardReq", atno) }) return } diff --git a/modules/venture/api_signreward.go b/modules/venture/api_signreward.go index c9a8252ca..aa77b536c 100644 --- a/modules/venture/api_signreward.go +++ b/modules/venture/api_signreward.go @@ -71,7 +71,7 @@ func (this *apiComp) SignReward(session comm.IUserSession, req *pb.VentureSignRe Atno: atno, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VentureSignRewardReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "VentureSignRewardReq", atno) }) return } diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 0f42b3433..e4ac0b59d 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -136,7 +136,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng T: "ps", N: ps, } - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "VikingChallengeReq", psAnt) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "VikingChallengeReq", psAnt) }) } diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 6ec5efab0..36c71a40d 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -94,7 +94,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal Data: viking, }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VikingChallengeOverReq", vikingCfg.PsConsume) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "VikingChallengeOverReq", vikingCfg.PsConsume) }) return } @@ -254,7 +254,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "VikingChallengeOverReq", szAtno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "VikingChallengeOverReq", szAtno) }) } return diff --git a/modules/warorder/api_buylv.go b/modules/warorder/api_buylv.go index 817a65c9f..6a62afaa9 100644 --- a/modules/warorder/api_buylv.go +++ b/modules/warorder/api_buylv.go @@ -109,7 +109,7 @@ func (this *apiComp) BuyLv(session comm.IUserSession, req *pb.WarorderBuyLvReq) } session.SendMsg(string(this.module.GetType()), "buylv", &pb.WarorderBuyLvResp{Rtype: req.Rtype, Lv: req.Lv, Info: dwarorder}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WarorderBuyLvReq", consum) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "WarorderBuyLvReq", consum) }) return } diff --git a/modules/warorder/api_receive.go b/modules/warorder/api_receive.go index 7f5a942ec..1a42fae14 100644 --- a/modules/warorder/api_receive.go +++ b/modules/warorder/api_receive.go @@ -122,7 +122,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Warorder: warorder, Dwarorder: dwarorder, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WarorderReceiveReq", awards) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WarorderReceiveReq", awards) }) return } diff --git a/modules/weektask/api_activityreceive.go b/modules/weektask/api_activityreceive.go index ae8dd8013..062129e3c 100644 --- a/modules/weektask/api_activityreceive.go +++ b/modules/weektask/api_activityreceive.go @@ -78,7 +78,7 @@ func (this *apiComp) ActivityReceive(session comm.IUserSession, req *pb.WeekTask }) session.SendMsg(string(this.module.GetType()), "activityreceive", &pb.WeekTaskActivityReceiveResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WeekTaskActivityReceiveReq", conf.Reword) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WeekTaskActivityReceiveReq", conf.Reword) }) return } diff --git a/modules/weektask/api_receive.go b/modules/weektask/api_receive.go index 368b5d5e0..a2bbd6074 100644 --- a/modules/weektask/api_receive.go +++ b/modules/weektask/api_receive.go @@ -106,7 +106,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR }) session.SendMsg(string(this.module.GetType()), "receive", &pb.WeekTaskReceiveResp{Tid: req.Tid, Activity: info.Activity, Tasks: info.Tasks, Progress: progress, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WeekTaskReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WeekTaskReceiveReq", award) }) return } diff --git a/modules/whackamole/api_award.go b/modules/whackamole/api_award.go index 906290d06..6f50a7ca7 100644 --- a/modules/whackamole/api_award.go +++ b/modules/whackamole/api_award.go @@ -57,7 +57,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.WhackamoleAwardReq session.SendMsg(string(this.module.GetType()), "award", &pb.WhackamoleAwardResp{Id: req.Id, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WhackamoleAwardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WhackamoleAwardReq", award) }) return } diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go index c9c90fd09..31b43132e 100644 --- a/modules/wtask/api_accept.go +++ b/modules/wtask/api_accept.go @@ -111,7 +111,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) ( } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskAcceptReq", conf.GetItem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskAcceptReq", conf.GetItem) }) return } diff --git a/modules/wtask/api_battlefinish.go b/modules/wtask/api_battlefinish.go index 6bbe99b42..538786242 100644 --- a/modules/wtask/api_battlefinish.go +++ b/modules/wtask/api_battlefinish.go @@ -102,7 +102,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskBattleFinishReq", atno) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskBattleFinishReq", atno) }) } return diff --git a/modules/wtask/api_boxreceive.go b/modules/wtask/api_boxreceive.go index 9aed73260..fbd48b023 100644 --- a/modules/wtask/api_boxreceive.go +++ b/modules/wtask/api_boxreceive.go @@ -117,7 +117,7 @@ func (this *apiComp) BoxReceive(session comm.IUserSession, req *pb.WTaskBoxRecei if len(tasks) > 0 { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskBoxReceiveReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskBoxReceiveReq", award) }) } return diff --git a/modules/wtask/api_chapterreward.go b/modules/wtask/api_chapterreward.go index 0584f18ee..3332d7fe9 100644 --- a/modules/wtask/api_chapterreward.go +++ b/modules/wtask/api_chapterreward.go @@ -72,7 +72,7 @@ func (this *apiComp) ChapterReward(session comm.IUserSession, req *pb.WTaskChapt // } session.SendMsg(string(this.module.GetType()), "chapterreward", &pb.WTaskChapterRewardResp{Group: req.Group, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskChapterRewardReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskChapterRewardReq", award) }) return } diff --git a/modules/wtask/api_eventcomplete.go b/modules/wtask/api_eventcomplete.go index 619bd0111..183e03019 100644 --- a/modules/wtask/api_eventcomplete.go +++ b/modules/wtask/api_eventcomplete.go @@ -94,7 +94,7 @@ func (this *apiComp) EventComplete(session comm.IUserSession, req *pb.WTaskEvent go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleBuried.TriggerBuried(session, tasks...) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskEventCompleteReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskEventCompleteReq", award) }) return } diff --git a/modules/wtask/api_exchange.go b/modules/wtask/api_exchange.go index d92eec884..097b545aa 100644 --- a/modules/wtask/api_exchange.go +++ b/modules/wtask/api_exchange.go @@ -87,8 +87,8 @@ func (this *apiComp) Exchange(session comm.IUserSession, req *pb.WTaskExchangeRe session.SendMsg(string(this.module.GetType()), "exchange", &pb.WTaskExchangeResp{Eid: req.Eid, Award: award}) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskExchangeReq", award) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WTaskExchangeReq", money) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskExchangeReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "WTaskExchangeReq", money) }) return } diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index 8ab129925..f18594ce8 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -157,8 +157,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( } go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeWorldtaskid, req.Tid) - this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WTaskFinishReq", award) - this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "WTaskFinishReq", conf.TaskendRemoveitem) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskFinishReq", award) + this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "WTaskFinishReq", conf.TaskendRemoveitem) this.module.ModuleBuried.TriggerBuried(session, tasks...) }) return diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index a532d15e5..5ba271a7d 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -354,6 +354,7 @@ type DBUserLog struct { Tag string `protobuf:"bytes,5,opt,name=tag,proto3" json:"tag"` Data string `protobuf:"bytes,6,opt,name=data,proto3" json:"data"` Ctime int64 `protobuf:"varint,7,opt,name=ctime,proto3" json:"ctime"` // 写日志的时间 + Req string `protobuf:"bytes,8,opt,name=req,proto3" json:"req"` // 请求参数 } func (x *DBUserLog) Reset() { @@ -437,6 +438,13 @@ func (x *DBUserLog) GetCtime() int64 { return 0 } +func (x *DBUserLog) GetReq() string { + if x != nil { + return x.Req + } + return "" +} + var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ @@ -534,7 +542,7 @@ var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x72, 0x61, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9f, 0x01, 0x0a, 0x09, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb1, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, @@ -544,8 +552,9 @@ var file_userexpand_proto_rawDesc = []byte{ 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x72, 0x65, 0x71, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x65, 0x71, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (