From 4b49f25c16b427fa8dc01fba831b226d6fa9b82a Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 14 Apr 2023 12:21:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=94=99=E8=AF=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/academy/api_challenge.go | 4 +- modules/academy/api_info.go | 4 +- modules/academy/api_receive.go | 4 +- modules/academy/api_teaching.go | 4 +- modules/academy/api_teachingreceive.go | 4 +- modules/arena/api_buy.go | 4 +- modules/arena/api_challenge.go | 4 +- modules/arena/api_challengereward.go | 4 +- modules/arena/api_delreward.go | 4 +- modules/arena/api_info.go | 4 +- modules/arena/api_matche.go | 4 +- modules/arena/api_otherinfo.go | 4 +- modules/arena/api_plot.go | 4 +- modules/arena/api_plotreward.go | 4 +- modules/arena/api_rank.go | 4 +- modules/arena/api_setdattformt.go | 4 +- modules/arena/api_setdefformt.go | 4 +- modules/atlas/api_atlasactivate.go | 4 +- modules/atlas/api_atlasaward.go | 9 +- modules/atlas/api_getatlas.go | 4 +- modules/autoBattle/api_autochallenge.go | 3 +- modules/autoBattle/api_autoover.go | 4 +- modules/autoBattle/api_autostop.go | 4 +- modules/chat/api_chanagechannel.go | 4 +- modules/chat/api_crosschannel.go | 4 +- modules/chat/api_getlist.go | 4 +- modules/chat/api_send.go | 3 +- modules/combat/api_challenge.go | 4 +- modules/combat/api_challengereceive.go | 4 +- modules/combat/api_drop.go | 4 +- modules/combat/api_in.go | 4 +- modules/combat/api_updatelevel.go | 4 +- modules/comp_gate.go | 3 +- modules/dispatch/api_autoreceive.go | 4 +- modules/dispatch/api_do.go | 4 +- modules/dispatch/api_notice.go | 4 +- modules/dispatch/api_receive.go | 4 +- modules/dispatch/api_refresh.go | 4 +- modules/dispatch/api_week.go | 4 +- modules/enchant/api_buy.go | 4 +- modules/enchant/api_challenge.go | 4 +- modules/enchant/api_challengeover.go | 4 +- modules/enchant/api_getlist.go | 3 +- modules/enchant/api_ranklist.go | 3 +- modules/equipment/api_ench.go | 4 +- modules/equipment/api_equip.go | 4 +- modules/equipment/api_forg.go | 4 +- modules/equipment/api_getlist.go | 4 +- modules/equipment/api_lock.go | 4 +- modules/equipment/api_sellI.go | 4 +- modules/equipment/api_upgrade.go | 3 +- modules/equipment/api_wash.go | 4 +- modules/equipment/api_washconfirm.go | 4 +- modules/forum/api_getlist.go | 4 +- modules/forum/api_like.go | 4 +- modules/forum/api_releasecomment.go | 3 +- modules/forum/api_watchhero.go | 4 +- modules/friend/api_cross_accept.go | 4 +- modules/friend/api_cross_addblack.go | 4 +- modules/friend/api_cross_agree.go | 4 +- modules/friend/api_cross_apply.go | 4 +- modules/friend/api_cross_applylist.go | 4 +- modules/friend/api_cross_assisthero.go | 4 +- modules/friend/api_cross_assistherolist.go | 4 +- modules/friend/api_cross_assistlist.go | 4 +- modules/friend/api_cross_blacklist.go | 6 +- modules/friend/api_cross_del.go | 4 +- modules/friend/api_cross_delblack.go | 4 +- modules/friend/api_cross_getrelation.go | 4 +- modules/friend/api_cross_getreward.go | 4 +- modules/friend/api_cross_list.go | 4 +- modules/friend/api_cross_qiecuo.go | 4 +- modules/friend/api_cross_randlist.go | 4 +- modules/friend/api_cross_refuse.go | 4 +- modules/friend/api_cross_search.go | 4 +- modules/friend/api_cross_stop.go | 4 +- modules/friend/api_cross_zan.go | 4 +- modules/friend/api_cross_zanlist.go | 4 +- modules/friend/api_cross_zanreceive.go | 4 +- modules/gateway/agent.go | 8 +- modules/gm/api_cmd.go | 4 +- modules/gourmet/api_activateatlas.go | 4 +- modules/gourmet/api_createfood.go | 4 +- modules/gourmet/api_getatlas.go | 4 +- modules/gourmet/api_getranduser.go | 3 +- modules/growtask/api_advreceive.go | 4 +- modules/growtask/api_receive.go | 4 +- modules/growtask/api_tasklist.go | 4 +- modules/hero/api_awaken.go | 4 +- modules/hero/api_buy.go | 4 +- modules/hero/api_drawCard.go | 4 +- modules/hero/api_drawCardFloor.go | 4 +- modules/hero/api_fusion.go | 4 +- modules/hero/api_info.go | 4 +- modules/hero/api_list.go | 4 +- modules/hero/api_lock.go | 4 +- modules/hero/api_specified.go | 4 +- modules/hero/api_strengthenUpSkill.go | 4 +- modules/hero/api_strengthenUpStar.go | 4 +- modules/hero/api_strengthenUplv.go | 4 +- modules/hero/api_talentlearn.go | 4 +- modules/hero/api_talentlist.go | 4 +- modules/hero/api_talentreset.go | 4 +- modules/horoscope/api_info.go | 4 +- modules/horoscope/api_rest.go | 4 +- modules/horoscope/api_upgrade.go | 4 +- modules/hunting/api_buy.go | 4 +- modules/hunting/api_challenge.go | 4 +- modules/hunting/api_challengeover.go | 4 +- modules/hunting/api_getlist.go | 4 +- modules/hunting/api_ranklist.go | 3 +- modules/items/api_buyphysical.go | 4 +- modules/items/api_buyunifiedticket.go | 4 +- modules/items/api_decompose.go | 4 +- modules/items/api_getlist.go | 10 +- modules/items/api_potionsynthesis.go | 4 +- modules/items/api_refreshunifiedticket.go | 4 +- modules/items/api_sellItem.go | 4 +- modules/items/api_sellinbulk.go | 4 +- modules/items/api_useItem.go | 4 +- modules/library/api_activationfetter.go | 4 +- modules/library/api_getfetterlist.go | 4 +- modules/library/api_getlist.go | 4 +- modules/library/api_getreward.go | 4 +- modules/library/api_getstoryreward.go | 4 +- modules/library/api_lvreward.go | 4 +- modules/library/api_maintask.go | 4 +- modules/library/api_usegift.go | 4 +- modules/linestory/api_chapter.go | 4 +- modules/linestory/api_maintask.go | 4 +- modules/linestory/api_receive.go | 4 +- modules/mail/api_delallmail.go | 4 +- modules/mail/api_delmail.go | 4 +- modules/mail/api_getAttachment.go | 6 +- modules/mail/api_getmail.go | 4 +- modules/mail/api_readmail.go | 4 +- modules/mline/api_challenge.go | 3 +- modules/mline/api_challengeover.go | 4 +- modules/mline/api_cleanstage.go | 4 +- modules/mline/api_getReward.go | 4 +- modules/mline/api_getlist.go | 3 +- modules/moonfantasy/api_ask.go | 4 +- modules/moonfantasy/api_battle.go | 4 +- modules/moonfantasy/api_buy.go | 4 +- modules/moonfantasy/api_getlist.go | 4 +- modules/moonfantasy/api_receive.go | 4 +- modules/notify/api_getlist.go | 4 +- modules/pagoda/api_activate.go | 4 +- modules/pagoda/api_challenge.go | 4 +- modules/pagoda/api_challengeover.go | 3 +- modules/pagoda/api_getReward.go | 4 +- modules/pagoda/api_getlist.go | 4 +- modules/pagoda/api_queryrecord.go | 3 +- modules/pagoda/api_ranklist.go | 3 +- modules/pagoda/api_warorder.go | 4 +- modules/pay/api_dailybuy.go | 4 +- modules/pay/api_delivery.go | 3 +- modules/pay/api_info.go | 4 +- modules/pay/api_record.go | 6 +- modules/practice/api_accept.go | 4 +- modules/practice/api_enrolled.go | 4 +- modules/practice/api_expulsion.go | 4 +- modules/practice/api_friendromm.go | 4 +- modules/practice/api_getgymbuff.go | 4 +- modules/practice/api_gymconfirm.go | 4 +- modules/practice/api_gyminfo.go | 4 +- modules/practice/api_gymrefresh.go | 4 +- modules/practice/api_info.go | 4 +- modules/practice/api_loot.go | 4 +- modules/practice/api_npcbattkle.go | 4 +- modules/practice/api_npcbattklefinish.go | 4 +- modules/practice/api_npcdialog.go | 4 +- modules/practice/api_practice.go | 4 +- modules/practice/api_qiecuo.go | 4 +- modules/practice/api_receive.go | 4 +- modules/practice/api_refuse.go | 4 +- modules/practice/api_unLock.go | 4 +- modules/practice/api_upgrade.go | 4 +- modules/privilege/api_buygift.go | 4 +- modules/privilege/api_buyyueka.go | 4 +- modules/privilege/api_getlist.go | 4 +- modules/privilege/api_viplist.go | 4 +- modules/pvp/api_activecancel.go | 4 +- modules/pvp/api_formation.go | 4 +- modules/pvp/api_incmd.go | 4 +- modules/pvp/api_into.go | 4 +- modules/pvp/api_list.go | 4 +- modules/pvp/api_loadcomplete.go | 4 +- modules/reddot/api_get.go | 4 +- modules/reddot/api_getall.go | 4 +- modules/rtask/api_tasktest.go | 3 +- modules/shop/api_buy.go | 4 +- modules/shop/api_getlist.go | 4 +- modules/smithy/api_atlasactivate.go | 4 +- modules/smithy/api_atlasaward.go | 4 +- modules/smithy/api_forgeequip.go | 4 +- modules/smithy/api_getCustomer.go | 3 +- modules/smithy/api_getatlas.go | 4 +- modules/smithy/api_getstoveinfo.go | 4 +- modules/smithy/api_receive.go | 4 +- modules/smithy/api_refuse.go | 4 +- modules/smithy/api_rise.go | 4 +- modules/smithy/api_stoveup.go | 4 +- modules/smithy/api_tasklist.go | 3 +- modules/smithy/api_toolsup.go | 4 +- modules/smithy/api_trade.go | 4 +- modules/sociaty/api_cross_Formation.go | 4 +- modules/sociaty/api_cross_accuse.go | 4 +- modules/sociaty/api_cross_activitylist.go | 4 +- modules/sociaty/api_cross_activityreceive.go | 4 +- modules/sociaty/api_cross_agree.go | 4 +- modules/sociaty/api_cross_apply.go | 4 +- modules/sociaty/api_cross_applycancel.go | 4 +- modules/sociaty/api_cross_applylist.go | 4 +- modules/sociaty/api_cross_assign.go | 6 +- modules/sociaty/api_cross_bossmain.go | 4 +- modules/sociaty/api_cross_bossrank.go | 4 +- modules/sociaty/api_cross_breceive.go | 4 +- modules/sociaty/api_cross_buy.go | 4 +- modules/sociaty/api_cross_challengefinish.go | 4 +- modules/sociaty/api_cross_challengestart.go | 4 +- modules/sociaty/api_cross_create.go | 10 +- modules/sociaty/api_cross_discharge.go | 4 +- modules/sociaty/api_cross_dismiss.go | 4 +- modules/sociaty/api_cross_list.go | 4 +- modules/sociaty/api_cross_log.go | 4 +- modules/sociaty/api_cross_members.go | 4 +- modules/sociaty/api_cross_mine.go | 4 +- modules/sociaty/api_cross_quit.go | 4 +- modules/sociaty/api_cross_rank.go | 4 +- modules/sociaty/api_cross_receive.go | 4 +- modules/sociaty/api_cross_recommend.go | 4 +- modules/sociaty/api_cross_refuse.go | 4 +- modules/sociaty/api_cross_search.go | 4 +- modules/sociaty/api_cross_setting.go | 4 +- modules/sociaty/api_cross_settingjob.go | 6 +- modules/sociaty/api_cross_sign.go | 4 +- modules/sociaty/api_cross_tasklist.go | 4 +- modules/sys/api_activate.go | 4 +- modules/sys/api_func.go | 4 +- modules/sys/api_getlist.go | 4 +- modules/task/api_activelist.go | 4 +- modules/task/api_activereceive.go | 4 +- modules/task/api_getrecord.go | 4 +- modules/task/api_list.go | 4 +- modules/task/api_receive.go | 4 +- modules/task/api_send.go | 4 +- modules/troll/api_afkset.go | 4 +- modules/troll/api_buyorsell.go | 4 +- modules/troll/api_getReward.go | 4 +- modules/troll/api_getlist.go | 4 +- modules/troll/api_ranklist.go | 4 +- modules/troll/api_recordlist.go | 4 +- modules/troll/api_surpriseid.go | 4 +- modules/user/api_battlerecord.go | 4 +- modules/user/api_changetips.go | 4 +- modules/user/api_create.go | 4 +- modules/user/api_getserverdata.go | 3 +- modules/user/api_getsetting.go | 4 +- modules/user/api_gettujian.go | 4 +- modules/user/api_info.go | 4 +- modules/user/api_initdata.go | 4 +- modules/user/api_login.go | 3 +- modules/user/api_logout.go | 4 +- modules/user/api_modifyavatar.go | 4 +- modules/user/api_modifybgp.go | 4 +- modules/user/api_modifyfigure.go | 4 +- modules/user/api_modifyname.go | 4 +- modules/user/api_modifysign.go | 4 +- modules/user/api_puzzleaward.go | 4 +- modules/user/api_settingteam.go | 4 +- modules/user/api_showteam.go | 4 +- modules/user/api_sign.go | 4 +- modules/user/api_updatesetting.go | 4 +- modules/user/api_vericode.go | 4 +- modules/viking/api_buy.go | 4 +- modules/viking/api_challenge.go | 4 +- modules/viking/api_challengeover.go | 4 +- modules/viking/api_getlist.go | 4 +- modules/viking/api_ranklist.go | 3 +- modules/worldtask/api_accept.go | 4 +- modules/worldtask/api_battlefinish.go | 4 +- modules/worldtask/api_battlestart.go | 4 +- modules/worldtask/api_chapterreward.go | 4 +- modules/worldtask/api_completetask.go | 4 +- modules/worldtask/api_finish.go | 4 +- modules/worldtask/api_mine.go | 4 +- pb/comm.pb.go | 769 ++++++++++--------- pb/notify_msg.pb.go | 82 +- services/comp_gateroute.go | 5 +- 290 files changed, 733 insertions(+), 1281 deletions(-) diff --git a/modules/academy/api_challenge.go b/modules/academy/api_challenge.go index b0f535d0b..b9c693543 100644 --- a/modules/academy/api_challenge.go +++ b/modules/academy/api_challenge.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.AcademyCh } ///挑战 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( level *cfg.GameTeachingData record *pb.DBBattleRecord diff --git a/modules/academy/api_info.go b/modules/academy/api_info.go index 0842db7aa..1339aba84 100644 --- a/modules/academy/api_info.go +++ b/modules/academy/api_info.go @@ -3,8 +3,6 @@ package academy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AcademyInfoReq } ///获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBAcademy err error diff --git a/modules/academy/api_receive.go b/modules/academy/api_receive.go index 99ad27cd4..4181f50f2 100644 --- a/modules/academy/api_receive.go +++ b/modules/academy/api_receive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AcademyRece } ///奖励领取 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( iswin bool level *cfg.GameTeachingData diff --git a/modules/academy/api_teaching.go b/modules/academy/api_teaching.go index 1d28f0166..9ae976269 100644 --- a/modules/academy/api_teaching.go +++ b/modules/academy/api_teaching.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) TeachingCheck(session comm.IUserSession, req *pb.AcademyTea } ///挑战 -func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( level *cfg.GameHeroStrategyData record *pb.DBBattleRecord diff --git a/modules/academy/api_teachingreceive.go b/modules/academy/api_teachingreceive.go index 2d851162d..007133b6f 100644 --- a/modules/academy/api_teachingreceive.go +++ b/modules/academy/api_teachingreceive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) TeachingReceiveCheck(session comm.IUserSession, req *pb.Aca } ///奖励领取 -func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( iswin bool level *cfg.GameHeroStrategyData diff --git a/modules/arena/api_buy.go b/modules/arena/api_buy.go index 34f76a884..e57b1252a 100644 --- a/modules/arena/api_buy.go +++ b/modules/arena/api_buy.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (c } ///获取自己的排行榜信息 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( // global *cfg.GameGlobalData info *pb.DBArenaUser diff --git a/modules/arena/api_challenge.go b/modules/arena/api_challenge.go index e4a37d4ab..ed7e27a97 100644 --- a/modules/arena/api_challenge.go +++ b/modules/arena/api_challenge.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChal } ///挑战 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( red *pb.DBArenaUser bule *pb.ArenaPlayer diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 29ff7120d..8e0dd6f62 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.Are } ///挑战奖励领取 -func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( reward *cfg.GameArenaActiveRewardData info *pb.DBArenaUser diff --git a/modules/arena/api_delreward.go b/modules/arena/api_delreward.go index 15111fad4..beadda2de 100644 --- a/modules/arena/api_delreward.go +++ b/modules/arena/api_delreward.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelR } ///删除战斗记录 -func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBArenaUser err error diff --git a/modules/arena/api_info.go b/modules/arena/api_info.go index 5ace53d97..8aa979b42 100644 --- a/modules/arena/api_info.go +++ b/modules/arena/api_info.go @@ -7,8 +7,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq) } ///获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( global *cfg.GameGlobalData info *pb.DBArenaUser diff --git a/modules/arena/api_matche.go b/modules/arena/api_matche.go index 64cea09f8..22306d358 100644 --- a/modules/arena/api_matche.go +++ b/modules/arena/api_matche.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.ArenaMatcheR } ///匹配 -func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBArenaUser active *cfg.GameArenaActiveRewardData diff --git a/modules/arena/api_otherinfo.go b/modules/arena/api_otherinfo.go index 4cb570d70..02e017daf 100644 --- a/modules/arena/api_otherinfo.go +++ b/modules/arena/api_otherinfo.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOthe } ///获取自己的排行榜信息 -func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBArenaUser err error diff --git a/modules/arena/api_plot.go b/modules/arena/api_plot.go index b9af3f8ea..a0ed443a0 100644 --- a/modules/arena/api_plot.go +++ b/modules/arena/api_plot.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq) } ///获取自己的排行榜信息 -func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( npc *cfg.GameArenaChallengeNpcData info *pb.DBArenaUser diff --git a/modules/arena/api_plotreward.go b/modules/arena/api_plotreward.go index ae8f0d8a6..c80f7b87f 100644 --- a/modules/arena/api_plotreward.go +++ b/modules/arena/api_plotreward.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlo } ///领取战斗奖励 -func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( npc *cfg.GameArenaChallengeNpcData info *pb.DBArenaUser diff --git a/modules/arena/api_rank.go b/modules/arena/api_rank.go index 8f112e126..ed21fadc4 100644 --- a/modules/arena/api_rank.go +++ b/modules/arena/api_rank.go @@ -3,8 +3,6 @@ package arena import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq) } ///排行榜获取 -func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBArenaUser uids []string diff --git a/modules/arena/api_setdattformt.go b/modules/arena/api_setdattformt.go index e39f315e7..1bb2ef8c6 100644 --- a/modules/arena/api_setdattformt.go +++ b/modules/arena/api_setdattformt.go @@ -3,8 +3,6 @@ package arena import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSe } ///设置防守阵型 -func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBArenaUser heros []*pb.DBHero diff --git a/modules/arena/api_setdefformt.go b/modules/arena/api_setdefformt.go index 32af8559e..c369519c0 100644 --- a/modules/arena/api_setdefformt.go +++ b/modules/arena/api_setdefformt.go @@ -3,8 +3,6 @@ package arena import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSe } ///设置防守阵型 -func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBArenaUser heros []*pb.DBHero diff --git a/modules/atlas/api_atlasactivate.go b/modules/atlas/api_atlasactivate.go index b84f591e0..b269e5ee2 100644 --- a/modules/atlas/api_atlasactivate.go +++ b/modules/atlas/api_atlasactivate.go @@ -3,8 +3,6 @@ package atlas import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv } // 激活图鉴信息 -func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/atlas/api_atlasaward.go b/modules/atlas/api_atlasaward.go index 0de2eb3ee..b8b766f67 100644 --- a/modules/atlas/api_atlasaward.go +++ b/modules/atlas/api_atlasaward.go @@ -1,12 +1,10 @@ package atlas import ( - "fmt" "go_dreamfactory/comm" + "go_dreamfactory/lego/utils/codec/json" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.AtlasAwardReq } // 一键领取所有可以领取的奖励 -func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( res []*cfg.Gameatn respRes []*pb.UserAssets @@ -38,7 +36,8 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (co return } if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { - data = &pb.ErrorData{Pstring: fmt.Sprintf("%v", res)} + buff, _ := json.Marshal(res) + data = &pb.ErrorData{Title: "图鉴奖励领取失败!", Datastring: string(buff)} return } diff --git a/modules/atlas/api_getatlas.go b/modules/atlas/api_getatlas.go index be9a78cf5..da24d0115 100644 --- a/modules/atlas/api_getatlas.go +++ b/modules/atlas/api_getatlas.go @@ -3,8 +3,6 @@ package atlas import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.AtlasGetLis } // 获取铁匠铺图鉴信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId()) if err != nil { diff --git a/modules/autoBattle/api_autochallenge.go b/modules/autoBattle/api_autochallenge.go index 320f1e1b7..9b7281315 100644 --- a/modules/autoBattle/api_autochallenge.go +++ b/modules/autoBattle/api_autochallenge.go @@ -5,7 +5,6 @@ import ( "go_dreamfactory/pb" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +16,7 @@ func (this *apiComp) AutoChallengeCheck(session comm.IUserSession, req *pb.AutoB return } -func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.AutoBattleChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.AutoBattleChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( battleInfo *pb.BattleInfo ) diff --git a/modules/autoBattle/api_autoover.go b/modules/autoBattle/api_autoover.go index f84fadba2..ec3eb3010 100644 --- a/modules/autoBattle/api_autoover.go +++ b/modules/autoBattle/api_autoover.go @@ -3,8 +3,6 @@ package autoBattle import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +18,7 @@ func (this *apiComp) AutoOverCheck(session comm.IUserSession, req *pb.AutoBattle return } -func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( autoBattle *pb.DBAutoBattle atno []*pb.UserAtno diff --git a/modules/autoBattle/api_autostop.go b/modules/autoBattle/api_autostop.go index 9549ec216..2963c5cff 100644 --- a/modules/autoBattle/api_autostop.go +++ b/modules/autoBattle/api_autostop.go @@ -3,8 +3,6 @@ package autoBattle import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) AutoStopCheck(session comm.IUserSession, req *pb.AutoBattle return } -func (this *apiComp) AutoStop(session comm.IUserSession, req *pb.AutoBattleStopReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AutoStop(session comm.IUserSession, req *pb.AutoBattleStopReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( autoBattle *pb.DBAutoBattle ) diff --git a/modules/chat/api_chanagechannel.go b/modules/chat/api_chanagechannel.go index 045d686b0..221e36513 100644 --- a/modules/chat/api_chanagechannel.go +++ b/modules/chat/api_chanagechannel.go @@ -3,8 +3,6 @@ package chat import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.Chat } ///改变跨服聊天频道 -func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error ok bool diff --git a/modules/chat/api_crosschannel.go b/modules/chat/api_crosschannel.go index 747776afc..614dd0432 100644 --- a/modules/chat/api_crosschannel.go +++ b/modules/chat/api_crosschannel.go @@ -3,8 +3,6 @@ package chat import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) CrossChannelCheck(session comm.IUserSession, req *pb.ChatCr } ///请求跨服聊天频道 -func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( channel int32 err error diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index 51a9cea60..c9fe29da8 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -3,8 +3,6 @@ package chat import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetList } ///获取本服聊天消息记录 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error result *pb.DBUserExpand diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index 7bac939e4..427de0a6c 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -8,7 +8,6 @@ import ( "time" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +19,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) ( } ///消息发送请求 -func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error msg *pb.DBChat diff --git a/modules/combat/api_challenge.go b/modules/combat/api_challenge.go index cea9ee9b9..b452fff49 100644 --- a/modules/combat/api_challenge.go +++ b/modules/combat/api_challenge.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.CombatCha } ///挑战 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( manster *cfg.GameCombatMansterData record *pb.DBBattleRecord diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go index d5dc89794..f3c7481f9 100644 --- a/modules/combat/api_challengereceive.go +++ b/modules/combat/api_challengereceive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) ChallengeReceiveCheck(session comm.IUserSession, req *pb.Co } ///奖励领取 -func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( iswin bool info *pb.DBCombatUser diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go index 63bcb8a23..039c71af7 100644 --- a/modules/combat/api_drop.go +++ b/modules/combat/api_drop.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq) } ///奖励领取 -func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBCombatUser lv *pb.DBCombatLevel diff --git a/modules/combat/api_in.go b/modules/combat/api_in.go index 1e48a606c..52e1288f5 100644 --- a/modules/combat/api_in.go +++ b/modules/combat/api_in.go @@ -3,8 +3,6 @@ package combat import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (co } ///获取自己的排行榜信息 -func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBCombatUser level *pb.DBCombatLevel diff --git a/modules/combat/api_updatelevel.go b/modules/combat/api_updatelevel.go index ae7efb708..65a14a545 100644 --- a/modules/combat/api_updatelevel.go +++ b/modules/combat/api_updatelevel.go @@ -3,8 +3,6 @@ package combat import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) UpdateLevelCheck(session comm.IUserSession, req *pb.CombatU } ///获取自己的排行榜信息 -func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBCombatUser level *pb.DBCombatLevel diff --git a/modules/comp_gate.go b/modules/comp_gate.go index 0a3fbb23f..a9703ce41 100644 --- a/modules/comp_gate.go +++ b/modules/comp_gate.go @@ -25,6 +25,7 @@ import ( var typeOfSession = reflect.TypeOf((*comm.IUserSession)(nil)).Elem() var typeOfMessage = reflect.TypeOf((*proto.Message)(nil)).Elem() var typeOfErrorCode = reflect.TypeOf((*pb.ErrorCode)(nil)).Elem() +var typeOfErrorData = reflect.TypeOf((*pb.ErrorData)(nil)) var typeOfError = reflect.TypeOf((*error)(nil)).Elem() /* @@ -110,7 +111,7 @@ func (this *MCompGate) reflectionRouteHandle(typ reflect.Type, method reflect.Me return } returnDataType := mtype.Out(1) - if !returnDataType.Implements(typeOfMessage) { + if returnDataType != typeOfErrorData { log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname) return } diff --git a/modules/dispatch/api_autoreceive.go b/modules/dispatch/api_autoreceive.go index 6c8b7cfe2..aa279ff19 100644 --- a/modules/dispatch/api_autoreceive.go +++ b/modules/dispatch/api_autoreceive.go @@ -4,15 +4,13 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode) { return } -func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.DispatchAutoReceiveResp{} d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { diff --git a/modules/dispatch/api_do.go b/modules/dispatch/api_do.go index 11ece36f3..38e2931db 100644 --- a/modules/dispatch/api_do.go +++ b/modules/dispatch/api_do.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) // 派遣 @@ -27,7 +25,7 @@ func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (cod return } -func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = a.DoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index 26b956bd0..78f9635fa 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 公告板信息 @@ -16,7 +14,7 @@ func (a *apiComp) NoticeCheck(session comm.IUserSession, req *pb.DispatchNoticeR return } -func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode, data *pb.ErrorData) { d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { code = pb.ErrorCode_DataNotFound diff --git a/modules/dispatch/api_receive.go b/modules/dispatch/api_receive.go index 239c88a31..c757fb234 100644 --- a/modules/dispatch/api_receive.go +++ b/modules/dispatch/api_receive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 领取派遣奖励 @@ -17,7 +15,7 @@ func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiv return } -func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = a.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/dispatch/api_refresh.go b/modules/dispatch/api_refresh.go index c2d21acf2..268002b0c 100644 --- a/modules/dispatch/api_refresh.go +++ b/modules/dispatch/api_refresh.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) // 刷新 @@ -15,7 +13,7 @@ func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefres return } -func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode, data *pb.ErrorData) { d := a.module.modelDispatch.getDBDispatch(session.GetUserId()) if d == nil { diff --git a/modules/dispatch/api_week.go b/modules/dispatch/api_week.go index e8e7fe997..a61e24390 100644 --- a/modules/dispatch/api_week.go +++ b/modules/dispatch/api_week.go @@ -3,8 +3,6 @@ package dispatch import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode) { @@ -14,7 +12,7 @@ func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWee return } -func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = a.WeekreciveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/enchant/api_buy.go b/modules/enchant/api_buy.go index e13129d37..3cd139386 100644 --- a/modules/enchant/api_buy.go +++ b/modules/enchant/api_buy.go @@ -3,8 +3,6 @@ package enchant import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq) } // 协议废除 走通用购买逻辑 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { session.SendMsg(string(this.module.GetType()), EnchantBuyResp, &pb.EnchantBuyResp{}) return diff --git a/modules/enchant/api_challenge.go b/modules/enchant/api_challenge.go index e95749b22..f5e01662b 100644 --- a/modules/enchant/api_challenge.go +++ b/modules/enchant/api_challenge.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantCh } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.ChallengeCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/enchant/api_challengeover.go b/modules/enchant/api_challengeover.go index a1aa44f30..4e45222be 100644 --- a/modules/enchant/api_challengeover.go +++ b/modules/enchant/api_challengeover.go @@ -3,8 +3,6 @@ package enchant import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Encha } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mapData map[string]interface{} bWin bool // 战斗是否胜利 diff --git a/modules/enchant/api_getlist.go b/modules/enchant/api_getlist.go index bbc176f38..de2ffcae6 100644 --- a/modules/enchant/api_getlist.go +++ b/modules/enchant/api_getlist.go @@ -6,7 +6,6 @@ import ( "go_dreamfactory/pb" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetL return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { // 刷新挑战卷 if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success { diff --git a/modules/enchant/api_ranklist.go b/modules/enchant/api_ranklist.go index fde9690b9..357ba2f03 100644 --- a/modules/enchant/api_ranklist.go +++ b/modules/enchant/api_ranklist.go @@ -9,7 +9,6 @@ import ( "strconv" "github.com/go-redis/redis/v8" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +17,7 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRan return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( szRank []*pb.DBEnchantRank rd *redis.StringSliceCmd diff --git a/modules/equipment/api_ench.go b/modules/equipment/api_ench.go index 02cc5cfee..bf5540d43 100644 --- a/modules/equipment/api_ench.go +++ b/modules/equipment/api_ench.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "math/rand" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchR } //附魔 -func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( equip *pb.DB_Equipment conf *cfg.GameEquipEnchantingData diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 71ec0907e..532ebb4fe 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -6,8 +6,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "math" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui } ///英雄挂在装备 code 错误码信息 data 错误附加数据 -func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error confs []*cfg.GameEquipData diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go index 2e715bca0..0851a1efb 100644 --- a/modules/equipment/api_forg.go +++ b/modules/equipment/api_forg.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgR } //锻造 -func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( conf *cfg.GameEquipSComposeData need []*cfg.Gameatn diff --git a/modules/equipment/api_getlist.go b/modules/equipment/api_getlist.go index 949759c87..b61780cc1 100644 --- a/modules/equipment/api_getlist.go +++ b/modules/equipment/api_getlist.go @@ -3,8 +3,6 @@ package equipment import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.EquipmentGe } ///获取用户装备列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error items []*pb.DB_Equipment diff --git a/modules/equipment/api_lock.go b/modules/equipment/api_lock.go index 141745059..3eb100e00 100644 --- a/modules/equipment/api_lock.go +++ b/modules/equipment/api_lock.go @@ -3,8 +3,6 @@ package equipment import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockR } ///获取用户装备列表 -func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error equipment *pb.DB_Equipment diff --git a/modules/equipment/api_sellI.go b/modules/equipment/api_sellI.go index 593259191..87806e9d8 100644 --- a/modules/equipment/api_sellI.go +++ b/modules/equipment/api_sellI.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "math" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellR } //出售 -func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error equipments []*pb.DB_Equipment diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 284c4b506..2adb0e434 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -10,7 +10,6 @@ import ( "math/big" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -23,7 +22,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp } ///英雄挂在装备 -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error conf *cfg.GameEquipData diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index e7888f1e5..cdf202b69 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "math/rand" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashR } //锻造 -func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( equip *pb.DB_Equipment conf *cfg.GameEquipData diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go index de24be1c3..84cd66f6d 100644 --- a/modules/equipment/api_washconfirm.go +++ b/modules/equipment/api_washconfirm.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.Equipme } //锻造 -func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( equip *pb.DB_Equipment attrlibrary *cfg.GameEquipAttrlibraryData diff --git a/modules/forum/api_getlist.go b/modules/forum/api_getlist.go index da75b57f3..6e38c11b1 100644 --- a/modules/forum/api_getlist.go +++ b/modules/forum/api_getlist.go @@ -3,8 +3,6 @@ package forum import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetLis } ///获取本服聊天消息记录 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error list []*pb.DBComment diff --git a/modules/forum/api_like.go b/modules/forum/api_like.go index c2a39710f..66e329499 100644 --- a/modules/forum/api_like.go +++ b/modules/forum/api_like.go @@ -3,8 +3,6 @@ package forum import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq) } ///获取本服聊天消息记录 -func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error ) diff --git a/modules/forum/api_releasecomment.go b/modules/forum/api_releasecomment.go index 9e767ea78..0178b3916 100644 --- a/modules/forum/api_releasecomment.go +++ b/modules/forum/api_releasecomment.go @@ -6,7 +6,6 @@ import ( "time" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +17,7 @@ func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.Foru } ///发布评论 -func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error comment *pb.DBComment diff --git a/modules/forum/api_watchhero.go b/modules/forum/api_watchhero.go index b39021438..18edb40fa 100644 --- a/modules/forum/api_watchhero.go +++ b/modules/forum/api_watchhero.go @@ -3,8 +3,6 @@ package forum import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatc } ///获取本服聊天消息记录 -func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( hero *pb.DBHero err error diff --git a/modules/friend/api_cross_accept.go b/modules/friend/api_cross_accept.go index 4a30b59aa..d37db2cd1 100644 --- a/modules/friend/api_cross_accept.go +++ b/modules/friend/api_cross_accept.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - - "google.golang.org/protobuf/proto" ) //接受切磋 @@ -18,7 +16,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAccept return } -func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_addblack.go b/modules/friend/api_cross_addblack.go index 54aec3446..6ab7a94b6 100644 --- a/modules/friend/api_cross_addblack.go +++ b/modules/friend/api_cross_addblack.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //加入黑名单 @@ -19,7 +17,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddB return } -func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AddblackCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go index 216c6838e..46ffb2f10 100644 --- a/modules/friend/api_cross_agree.go +++ b/modules/friend/api_cross_agree.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //单个/批量同意 @@ -20,7 +18,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeRe return } -func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_apply.go b/modules/friend/api_cross_apply.go index 6a1d5068d..a01338ace 100644 --- a/modules/friend/api_cross_apply.go +++ b/modules/friend/api_cross_apply.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //好友申请 @@ -19,7 +17,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe return } -func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_applylist.go b/modules/friend/api_cross_applylist.go index fd35e6244..6b3b27866 100644 --- a/modules/friend/api_cross_applylist.go +++ b/modules/friend/api_cross_applylist.go @@ -3,8 +3,6 @@ package friend import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //申请列表 @@ -13,7 +11,7 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApp return } -func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( self *pb.DBFriend list []*pb.FriendBase diff --git a/modules/friend/api_cross_assisthero.go b/modules/friend/api_cross_assisthero.go index 0eb79df7d..164d1188d 100644 --- a/modules/friend/api_cross_assisthero.go +++ b/modules/friend/api_cross_assisthero.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 设置助战英雄 @@ -19,7 +17,7 @@ func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAs return } -func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AssistheroCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_assistherolist.go b/modules/friend/api_cross_assistherolist.go index b12a270d3..4ffa3e7ed 100644 --- a/modules/friend/api_cross_assistherolist.go +++ b/modules/friend/api_cross_assistherolist.go @@ -3,8 +3,6 @@ package friend import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 好友助战英雄列表 @@ -13,7 +11,7 @@ func (this *apiComp) AssistHeroListCheck(session comm.IUserSession, req *pb.Frie return } -func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode, data *pb.ErrorData) { //获取玩家自己好友数据 self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_cross_assistlist.go b/modules/friend/api_cross_assistlist.go index f5c8117b1..44284095b 100644 --- a/modules/friend/api_cross_assistlist.go +++ b/modules/friend/api_cross_assistlist.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/utils" "sort" - - "google.golang.org/protobuf/proto" ) // 助战列表 @@ -15,7 +13,7 @@ func (this *apiComp) AssistlistCheck(session comm.IUserSession, req *pb.FriendAs return } -func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode, data *pb.ErrorData) { var list []*pb.FriendBase //获取玩家自己好友数据 self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_cross_blacklist.go b/modules/friend/api_cross_blacklist.go index 3fcb18539..6338745e7 100644 --- a/modules/friend/api_cross_blacklist.go +++ b/modules/friend/api_cross_blacklist.go @@ -3,8 +3,6 @@ package friend import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //黑名单列表 @@ -12,7 +10,7 @@ func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBla return } -func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( self *pb.DBFriend list []*pb.FriendBase @@ -30,7 +28,7 @@ func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackLis list = append(list, base) } } - + resp := &pb.FriendBlackListResp{ Friends: list, } diff --git a/modules/friend/api_cross_del.go b/modules/friend/api_cross_del.go index 4dd316eff..3ef198d5f 100644 --- a/modules/friend/api_cross_del.go +++ b/modules/friend/api_cross_del.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //删除好友 @@ -18,7 +16,7 @@ func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) ( return } -func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.DelCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_delblack.go b/modules/friend/api_cross_delblack.go index feafbf4e7..a4ed7df4b 100644 --- a/modules/friend/api_cross_delblack.go +++ b/modules/friend/api_cross_delblack.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //删除黑名单 @@ -18,7 +16,7 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelB return } -func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.DelblackCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_getrelation.go b/modules/friend/api_cross_getrelation.go index ebe08b560..3e7330b5b 100644 --- a/modules/friend/api_cross_getrelation.go +++ b/modules/friend/api_cross_getrelation.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 获取好友关系 @@ -18,7 +16,7 @@ func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendG return } -func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.GetRelationCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_getreward.go b/modules/friend/api_cross_getreward.go index 19825cd08..4ced03578 100644 --- a/modules/friend/api_cross_getreward.go +++ b/modules/friend/api_cross_getreward.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 领取奖励 @@ -13,7 +11,7 @@ func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGet return } -func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() //获取玩家自己好友数据 self := this.moduleFriend.modelFriend.GetFriend(uid) diff --git a/modules/friend/api_cross_list.go b/modules/friend/api_cross_list.go index 5a1c8975c..5a4d4857f 100644 --- a/modules/friend/api_cross_list.go +++ b/modules/friend/api_cross_list.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //好友列表 @@ -14,7 +12,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) return } -func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( self *pb.DBFriend list []*pb.FriendBase diff --git a/modules/friend/api_cross_qiecuo.go b/modules/friend/api_cross_qiecuo.go index 7f7a4c55c..637c575f1 100644 --- a/modules/friend/api_cross_qiecuo.go +++ b/modules/friend/api_cross_qiecuo.go @@ -4,8 +4,6 @@ import ( "errors" "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 踢馆(熊猫武馆) @@ -16,7 +14,7 @@ func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuo return } -func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.QiecuoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_randlist.go b/modules/friend/api_cross_randlist.go index c0d022d2a..154125fb7 100644 --- a/modules/friend/api_cross_randlist.go +++ b/modules/friend/api_cross_randlist.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 好友推荐 @@ -15,7 +13,7 @@ func (this *apiComp) RandlistCheck(session comm.IUserSession, req *pb.FriendRand return } -func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode, data *pb.ErrorData) { // 当前玩家好友数据 self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_cross_refuse.go b/modules/friend/api_cross_refuse.go index 1cda35cf8..a73ff321b 100644 --- a/modules/friend/api_cross_refuse.go +++ b/modules/friend/api_cross_refuse.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 好友审核-拒绝 @@ -20,7 +18,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse } //单个/批量拒绝 -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_search.go b/modules/friend/api_cross_search.go index 74e387216..5c5e0c6be 100644 --- a/modules/friend/api_cross_search.go +++ b/modules/friend/api_cross_search.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //搜索 @@ -19,7 +17,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch return } -func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_stop.go b/modules/friend/api_cross_stop.go index eb764cbab..e8a524432 100644 --- a/modules/friend/api_cross_stop.go +++ b/modules/friend/api_cross_stop.go @@ -3,8 +3,6 @@ package friend import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 切磋终止 @@ -12,7 +10,7 @@ func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) return } -func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.StopCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_zan.go b/modules/friend/api_cross_zan.go index 87097b44c..13aa770d6 100644 --- a/modules/friend/api_cross_zan.go +++ b/modules/friend/api_cross_zan.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 点赞 @@ -18,7 +16,7 @@ func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) ( return } -func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ZanCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_zanlist.go b/modules/friend/api_cross_zanlist.go index a454c24a9..f215033c4 100644 --- a/modules/friend/api_cross_zanlist.go +++ b/modules/friend/api_cross_zanlist.go @@ -3,8 +3,6 @@ package friend import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 点赞列表 @@ -13,7 +11,7 @@ func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanli } // Deprecated: -func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ZanlistCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/friend/api_cross_zanreceive.go b/modules/friend/api_cross_zanreceive.go index 11f7a5a14..d0c246f18 100644 --- a/modules/friend/api_cross_zanreceive.go +++ b/modules/friend/api_cross_zanreceive.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 领取点赞奖励 @@ -19,7 +17,7 @@ func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZa return } -func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ZanreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go index 97ba89bb8..13690a916 100644 --- a/modules/gateway/agent.go +++ b/modules/gateway/agent.go @@ -103,7 +103,7 @@ locp: ReqSubType: msg.SubType, Arg: msg.Data, Code: pb.ErrorCode_GatewayException, - Message: err.Error(), + Err: &pb.ErrorData{Title: "用户消息处理失败!", Datastring: err.Error()}, }) err = this.WriteMsg(&pb.UserMessage{ MainType: comm.MainTypeNotify, @@ -116,7 +116,7 @@ locp: } else { this.gateway.Errorf("agent:%s uId:%s 密钥无效 err:%v", this.sessionId, this.uId, err) - data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: code, Message: err.Error()}) + data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: code, Err: &pb.ErrorData{Title: "用户消息验证失败!", Datastring: err.Error()}}) if err = this.WriteMsg(&pb.UserMessage{ MainType: comm.MainTypeNotify, SubType: comm.SubTypeErrorNotify, @@ -366,8 +366,8 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { ReqMainType: msg.MainType, ReqSubType: msg.SubType, Arg: msg.Data, - Data: reply.ErrorData, - Code: pb.ErrorCode(reply.Code.Number())}) + Code: pb.ErrorCode(reply.Code.Number()), + Err: reply.ErrorData}) err = this.WriteMsg(&pb.UserMessage{ MainType: comm.MainTypeNotify, SubType: comm.SubTypeErrorNotify, diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index ad23e8ad0..e04b85013 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -3,8 +3,6 @@ package gm import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) /* GM 在控制台输入的字符串类型 @@ -49,7 +47,7 @@ func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code } ///解析GM 指令 -func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/gourmet/api_activateatlas.go b/modules/gourmet/api_activateatlas.go index 773a2a8fe..7e0c37858 100644 --- a/modules/gourmet/api_activateatlas.go +++ b/modules/gourmet/api_activateatlas.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm return } -func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.ActivateAtlasCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/gourmet/api_createfood.go b/modules/gourmet/api_createfood.go index 9cb98d71e..64c3553a8 100644 --- a/modules/gourmet/api_createfood.go +++ b/modules/gourmet/api_createfood.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetC } ///获取美食城基本信息 -func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( res []*cfg.Gameatn curFood string // 做出来的食物ID diff --git a/modules/gourmet/api_getatlas.go b/modules/gourmet/api_getatlas.go index 65b6fa7e2..7976ad9db 100644 --- a/modules/gourmet/api_getatlas.go +++ b/modules/gourmet/api_getatlas.go @@ -3,8 +3,6 @@ package gourmet import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasR } ///获取美食城基本信息 -func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.AtlasCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/gourmet/api_getranduser.go b/modules/gourmet/api_getranduser.go index dcaa0b710..0167b8f35 100644 --- a/modules/gourmet/api_getranduser.go +++ b/modules/gourmet/api_getranduser.go @@ -11,7 +11,6 @@ import ( "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo/options" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -24,7 +23,7 @@ func (this *apiComp) GetRandUserCheck(session comm.IUserSession, req *pb.Gourmet } /// 获取一些玩家数据 -func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( szDbUser []*pb.DBUser mapUser map[string]struct{} diff --git a/modules/growtask/api_advreceive.go b/modules/growtask/api_advreceive.go index 77081e76c..651126c8d 100644 --- a/modules/growtask/api_advreceive.go +++ b/modules/growtask/api_advreceive.go @@ -3,8 +3,6 @@ package growtask import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //进阶奖励领取 @@ -16,7 +14,7 @@ func (this *apiComp) AdvreceiveCheck(session comm.IUserSession, req *pb.Growtask return } -func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AdvreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/growtask/api_receive.go b/modules/growtask/api_receive.go index 13754314b..0fdd66557 100644 --- a/modules/growtask/api_receive.go +++ b/modules/growtask/api_receive.go @@ -3,8 +3,6 @@ package growtask import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 子任务奖励领取 @@ -16,7 +14,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.GrowtaskRec return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/growtask/api_tasklist.go b/modules/growtask/api_tasklist.go index 4ce670591..ea2b1193a 100644 --- a/modules/growtask/api_tasklist.go +++ b/modules/growtask/api_tasklist.go @@ -3,8 +3,6 @@ package growtask import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 成长任务列表 @@ -16,7 +14,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.GrowtaskListRe return } -func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() gt, err := this.module.modelGrowtask.getUserGrowtask(uid) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 414c778df..14adf7e56 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -6,8 +6,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "strconv" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -21,7 +19,7 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe } /// 英雄觉醒 -func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( awakenData *cfg.GameHeroAwakenData _hero *pb.DBHero diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index ae7da09b7..68793866b 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -6,8 +6,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "math" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HeroBuyReq) (co } ///获取用户商品列表 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error conf *cfg.GameShopitemData diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index ebf4a8703..542f1e0bf 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "math/big" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode) { @@ -18,7 +16,7 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa } //抽卡 -func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( szCards []string // 最终抽到的卡牌 drawCount int32 // 抽卡次数 diff --git a/modules/hero/api_drawCardFloor.go b/modules/hero/api_drawCardFloor.go index 9da1158ed..b39aa66fd 100644 --- a/modules/hero/api_drawCardFloor.go +++ b/modules/hero/api_drawCardFloor.go @@ -3,8 +3,6 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode) { @@ -13,7 +11,7 @@ func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroD } //抽卡 -func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.HeroDrawCardFloorResp{} if heroRecord, err := this.module.modelRecord.GetHeroRecord(session.GetUserId()); err == nil { rsp.Star4 = heroRecord.Star4 diff --git a/modules/hero/api_fusion.go b/modules/hero/api_fusion.go index 8658c4d04..979905ba6 100644 --- a/modules/hero/api_fusion.go +++ b/modules/hero/api_fusion.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) FusionCheck(session comm.IUserSession, req *pb.HeroFusionRe return } -func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( totalCount int32 mapHero map[string]int32 diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go index 582d38da9..b8ee0758d 100644 --- a/modules/hero/api_info.go +++ b/modules/hero/api_info.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/db" "go_dreamfactory/utils" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) ( return } -func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( uid string ) diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go index eaf6881a2..c85458b0c 100644 --- a/modules/hero/api_list.go +++ b/modules/hero/api_list.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.HeroListReq) ( return } -func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.HeroListResp{} rsp.List = this.module.GetHeroList(session.GetUserId()) diff --git a/modules/hero/api_lock.go b/modules/hero/api_lock.go index 549afdadf..2514fb9b2 100644 --- a/modules/hero/api_lock.go +++ b/modules/hero/api_lock.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.HeroLockReq) ( } /// 英雄锁定 -func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( _hero *pb.DBHero ) diff --git a/modules/hero/api_specified.go b/modules/hero/api_specified.go index 4d4f63ad8..64072037a 100644 --- a/modules/hero/api_specified.go +++ b/modules/hero/api_specified.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGe } /// 获取指定星级或等级的英雄 GM 协议 -func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetSpecifiedCheck(session, req) // check if code != pb.ErrorCode_Success { diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index 4c839a13a..04bd8f7ff 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +18,7 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H } /// 英雄技能升级 -func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( upSkillPos int32 // 升级的技能位置 _hero *pb.DBHero // 操作的英雄 diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index f434a9174..478886d66 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He } /// 英雄升星 -func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( starConf *cfg.GameHeroStarupData // 配置表目标升星英雄信息 _hero *pb.DBHero // 目标英雄 diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index bb5a5af98..673cacf49 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero } /// 英雄升级 -func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( addExp int32 // 需要增加的经验 diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go index bb2aa3abb..e3c6eeca7 100644 --- a/modules/hero/api_talentlearn.go +++ b/modules/hero/api_talentlearn.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) TalentLearnCheck(session comm.IUserSession, req *pb.HeroTal } // 天赋学习 -func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLearnReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLearnReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( talent *pb.DBHeroTalent err error diff --git a/modules/hero/api_talentlist.go b/modules/hero/api_talentlist.go index ced66ce4c..3400eeaff 100644 --- a/modules/hero/api_talentlist.go +++ b/modules/hero/api_talentlist.go @@ -4,8 +4,6 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) TalentListCheck(session comm.IUserSession, req *pb.HeroTale return } -func (this *apiComp) TalentList(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) TalentList(session comm.IUserSession, req *pb.HeroTalentListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error ) diff --git a/modules/hero/api_talentreset.go b/modules/hero/api_talentreset.go index 2e5e70a7f..164c2f594 100644 --- a/modules/hero/api_talentreset.go +++ b/modules/hero/api_talentreset.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) TalentResetCheck(session comm.IUserSession, req *pb.HeroTal return } -func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentResetReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) TalentReset(session comm.IUserSession, req *pb.HeroTalentResetReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( heroList []*pb.DBHero chanegCard []*pb.DBHero // 推送属性变化 diff --git a/modules/horoscope/api_info.go b/modules/horoscope/api_info.go index 62ac50093..a9afc514f 100644 --- a/modules/horoscope/api_info.go +++ b/modules/horoscope/api_info.go @@ -3,8 +3,6 @@ package horoscope import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HoroscopeInfoR } ///获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBHoroscope err error diff --git a/modules/horoscope/api_rest.go b/modules/horoscope/api_rest.go index bfecf18ff..1ec9754c4 100644 --- a/modules/horoscope/api_rest.go +++ b/modules/horoscope/api_rest.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ResetCheck(session comm.IUserSession, req *pb.HoroscopeRese } ///获取自己的排行榜信息 -func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Reset(session comm.IUserSession, req *pb.HoroscopeResetReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBHoroscope conf *cfg.GameGlobalData diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go index c871ab083..eea20bc7d 100644 --- a/modules/horoscope/api_upgrade.go +++ b/modules/horoscope/api_upgrade.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.HoroscopeUp } ///获取自己的排行榜信息 -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBHoroscope conf *cfg.GameHoroscopeData diff --git a/modules/hunting/api_buy.go b/modules/hunting/api_buy.go index 5223b29b7..9cee7c0d2 100644 --- a/modules/hunting/api_buy.go +++ b/modules/hunting/api_buy.go @@ -3,8 +3,6 @@ package hunting import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HuntingBuyReq) return } -func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.HuntingBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { session.SendMsg(string(this.module.GetType()), HuntingBuyResp, &pb.HuntingBuyResp{}) return diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index b5dd31681..f84c17f99 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -3,8 +3,6 @@ package hunting import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.HuntingCh } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.ChallengeCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index 0f30905f1..7e38912d1 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "strconv" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Hunti } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingChallengeOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mapData map[string]interface{} newChallenge bool // 新的关卡 diff --git a/modules/hunting/api_getlist.go b/modules/hunting/api_getlist.go index a86d43ecf..a53fce463 100644 --- a/modules/hunting/api_getlist.go +++ b/modules/hunting/api_getlist.go @@ -3,8 +3,6 @@ package hunting import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.HuntingGetL return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/hunting/api_ranklist.go b/modules/hunting/api_ranklist.go index 13ec32e4e..db65105c9 100644 --- a/modules/hunting/api_ranklist.go +++ b/modules/hunting/api_ranklist.go @@ -9,7 +9,6 @@ import ( "strconv" "github.com/go-redis/redis/v8" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +17,7 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.HuntingRan return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.HuntingRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( szRank []*pb.DBHuntingRank rd *redis.StringSliceCmd diff --git a/modules/items/api_buyphysical.go b/modules/items/api_buyphysical.go index 883e638e1..edcee2ef4 100644 --- a/modules/items/api_buyphysical.go +++ b/modules/items/api_buyphysical.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) BuyPhysicalCheck(session comm.IUserSession, req *pb.ItemsBu } //出售道具 -func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhysicalReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) BuyPhysical(session comm.IUserSession, req *pb.ItemsBuyPhysicalReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error user *pb.DBUserExpand diff --git a/modules/items/api_buyunifiedticket.go b/modules/items/api_buyunifiedticket.go index 4f20d40e0..2555c0450 100644 --- a/modules/items/api_buyunifiedticket.go +++ b/modules/items/api_buyunifiedticket.go @@ -3,8 +3,6 @@ package items import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) BuyUnifiedTicketCheck(session comm.IUserSession, req *pb.It } //购买 -func (this *apiComp) BuyUnifiedTicket(session comm.IUserSession, req *pb.ItemsBuyUnifiedTicketReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) BuyUnifiedTicket(session comm.IUserSession, req *pb.ItemsBuyUnifiedTicketReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBUserExpand ) diff --git a/modules/items/api_decompose.go b/modules/items/api_decompose.go index 2a38d49c9..d78a7a3a0 100644 --- a/modules/items/api_decompose.go +++ b/modules/items/api_decompose.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) DecomposeCheck(session comm.IUserSession, req *pb.ItemsDeco } //出售道具 -func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Decompose(session comm.IUserSession, req *pb.ItemsDecomposeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error item *pb.DB_UserItemData diff --git a/modules/items/api_getlist.go b/modules/items/api_getlist.go index 874dc9ef2..3bf0566d0 100644 --- a/modules/items/api_getlist.go +++ b/modules/items/api_getlist.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,11 +13,11 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ItemsGetlis } ///获取用户道具 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ItemsGetlistReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ItemsGetlistReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( - err error - items []*pb.DB_UserItemData - nt int64 + err error + items []*pb.DB_UserItemData + nt int64 grids []*pb.DB_UserItemData modifys []*pb.DB_UserItemData dels []*pb.DB_UserItemData diff --git a/modules/items/api_potionsynthesis.go b/modules/items/api_potionsynthesis.go index e88df9f51..1e894c0d5 100644 --- a/modules/items/api_potionsynthesis.go +++ b/modules/items/api_potionsynthesis.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) PotionSynthesisCheck(session comm.IUserSession, req *pb.Ite } //魔药合成 -func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPotionSynthesisReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) PotionSynthesis(session comm.IUserSession, req *pb.ItemsPotionSynthesisReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( configure *cfg.GamePotionsData need []*cfg.Gameatn diff --git a/modules/items/api_refreshunifiedticket.go b/modules/items/api_refreshunifiedticket.go index 24aa098d8..23062ed9d 100644 --- a/modules/items/api_refreshunifiedticket.go +++ b/modules/items/api_refreshunifiedticket.go @@ -3,8 +3,6 @@ package items import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) RefreshUnifiedTicketCheck(session comm.IUserSession, req *p } //购买 -func (this *apiComp) RefreshUnifiedTicket(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RefreshUnifiedTicket(session comm.IUserSession, req *pb.ItemsRefreshUnifiedTicketReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefreshUnifiedTicketCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index 852e6bca2..605cf5d37 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.ItemsSellI } //分解道具 -func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error item *pb.DB_UserItemData diff --git a/modules/items/api_sellinbulk.go b/modules/items/api_sellinbulk.go index 2e31761e5..a5da6890a 100644 --- a/modules/items/api_sellinbulk.go +++ b/modules/items/api_sellinbulk.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) SellinbulkCheck(session comm.IUserSession, req *pb.ItemsSel } //批量出售 -func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbulkReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Sellinbulk(session comm.IUserSession, req *pb.ItemsSellinbulkReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error items []*pb.DB_UserItemData diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 537b6b78e..71d36e482 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.ItemsUseIte } //使用道具 -func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error item *pb.DB_UserItemData diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index 6dadef94b..d59d9b97e 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -3,8 +3,6 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) ActivationFetterCheck(session comm.IUserSession, req *pb.Li return } -func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.LibraryActivationFetterReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.ActivationFetterCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go index 87ab18d1f..3abb2142a 100644 --- a/modules/library/api_getfetterlist.go +++ b/modules/library/api_getfetterlist.go @@ -3,8 +3,6 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.Libra return } -func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetFetterListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/library/api_getlist.go b/modules/library/api_getlist.go index f1ee0d830..1d25a74da 100644 --- a/modules/library/api_getlist.go +++ b/modules/library/api_getlist.go @@ -3,8 +3,6 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.LibraryGetL return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.LibraryGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.LibraryGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/library/api_getreward.go b/modules/library/api_getreward.go index f4b5cdbf2..7cfb4c9bc 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_getreward.go @@ -3,8 +3,6 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.LibraryGe return } -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetRewardCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/library/api_getstoryreward.go b/modules/library/api_getstoryreward.go index 0ab119814..f351bfdf6 100644 --- a/modules/library/api_getstoryreward.go +++ b/modules/library/api_getstoryreward.go @@ -10,8 +10,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "strconv" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -22,7 +20,7 @@ func (this *apiComp) GetStoryRewardCheck(session comm.IUserSession, req *pb.Libr return } -func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { resp := &pb.LibraryGetStoryRewardResp{} code = this.GetStoryRewardCheck(session, req) diff --git a/modules/library/api_lvreward.go b/modules/library/api_lvreward.go index 5cb611307..077b87fd4 100644 --- a/modules/library/api_lvreward.go +++ b/modules/library/api_lvreward.go @@ -7,8 +7,6 @@ package library import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) LvRewardCheck(session comm.IUserSession, req *pb.LibraryLvR return } -func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) LvReward(session comm.IUserSession, req *pb.LibraryLvRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { resp := &pb.LibraryLvRewardResp{} code = this.LvRewardCheck(session, req) diff --git a/modules/library/api_maintask.go b/modules/library/api_maintask.go index dd273647a..1ab3f4b4e 100644 --- a/modules/library/api_maintask.go +++ b/modules/library/api_maintask.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 羁绊剧情-我的主线任务 @@ -17,7 +15,7 @@ func (this *apiComp) FetterstoryTaskCheck(session comm.IUserSession, req *pb.Lib return } -func (this *apiComp) FetterstoryTask(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) FetterstoryTask(session comm.IUserSession, req *pb.LibraryFetterstoryTaskReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.FetterstoryTaskCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/library/api_usegift.go b/modules/library/api_usegift.go index 130fab6ba..a3fbfa515 100644 --- a/modules/library/api_usegift.go +++ b/modules/library/api_usegift.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) UseGiftCheck(session comm.IUserSession, req *pb.LibraryUseG return } -func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( res []*cfg.Gameatn totalExp int32 diff --git a/modules/linestory/api_chapter.go b/modules/linestory/api_chapter.go index 2f15cd1ea..3cd18431b 100644 --- a/modules/linestory/api_chapter.go +++ b/modules/linestory/api_chapter.go @@ -3,8 +3,6 @@ package linestory import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 支线剧情任务-章节 @@ -12,7 +10,7 @@ func (this *apiComp) ChapterCheck(session comm.IUserSession, req *pb.LinestoryCh return } -func (this *apiComp) Chapter(session comm.IUserSession, req *pb.LinestoryChapterReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Chapter(session comm.IUserSession, req *pb.LinestoryChapterReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() taskMap := this.moduleLinestory.modelLinestory.getChapters(uid) rsp := &pb.LinestoryChapterResp{ diff --git a/modules/linestory/api_maintask.go b/modules/linestory/api_maintask.go index c0b3c65d5..43d74668a 100644 --- a/modules/linestory/api_maintask.go +++ b/modules/linestory/api_maintask.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 支线剧情-我的主线任务 @@ -17,7 +15,7 @@ func (this *apiComp) MaintaskCheck(session comm.IUserSession, req *pb.LinestoryM return } -func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Maintask(session comm.IUserSession, req *pb.LinestoryMaintaskReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.MaintaskCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/linestory/api_receive.go b/modules/linestory/api_receive.go index 06d4d3baf..0c0e987fc 100644 --- a/modules/linestory/api_receive.go +++ b/modules/linestory/api_receive.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 章节奖励领取 @@ -19,7 +17,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.LinestoryRe return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.LinestoryReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/mail/api_delallmail.go b/modules/mail/api_delallmail.go index 4eb713cc1..8bd448f7c 100644 --- a/modules/mail/api_delallmail.go +++ b/modules/mail/api_delallmail.go @@ -3,8 +3,6 @@ package mail import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) DelAllMailCheck(session comm.IUserSession, req *pb.MailDelA } // 删除邮件 -func (this *apiComp) DelAllMail(session comm.IUserSession, req *pb.MailDelAllMailReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) DelAllMail(session comm.IUserSession, req *pb.MailDelAllMailReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mailinfo []*pb.DBMailData err error diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go index 5b99602f8..d009c1b00 100644 --- a/modules/mail/api_delmail.go +++ b/modules/mail/api_delmail.go @@ -3,8 +3,6 @@ package mail import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMail } // 删除邮件 -func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.DelMailCheck(session, req) // check if code != pb.ErrorCode_Success { return diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index e40729d9d..baf10d3a7 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode) { @@ -16,7 +14,7 @@ func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req * } // 领取附件 -func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetUserMailAttachmentCheck(session, req) // check if code != pb.ErrorCode_Success { @@ -59,7 +57,7 @@ func (this *apiComp) GetAllMailAttachmentCheck(session comm.IUserSession, req *p return } -func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.MailGetAllMailAttachmentReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mailIds []string diff --git a/modules/mail/api_getmail.go b/modules/mail/api_getmail.go index 27d77b1e0..5dd49fcdb 100644 --- a/modules/mail/api_getmail.go +++ b/modules/mail/api_getmail.go @@ -3,8 +3,6 @@ package mail import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode) { @@ -12,7 +10,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetList } // 查看所有邮件信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var err error mailinfo := make([]*pb.DBMailData, 0) diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index 6f0d09609..caf1ce615 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -3,8 +3,6 @@ package mail import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode) { @@ -16,7 +14,7 @@ func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMa } // 查看某一封邮件 -func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error mail *pb.DBMailData diff --git a/modules/mline/api_challenge.go b/modules/mline/api_challenge.go index ce08a05cb..a22a56ae2 100644 --- a/modules/mline/api_challenge.go +++ b/modules/mline/api_challenge.go @@ -6,7 +6,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +17,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.MlineChal } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 ps int32 // 消耗的体力 diff --git a/modules/mline/api_challengeover.go b/modules/mline/api_challengeover.go index 87273782e..0642dc564 100644 --- a/modules/mline/api_challengeover.go +++ b/modules/mline/api_challengeover.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Mline } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChallengeOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 stageConf *cfg.GameMainStageData diff --git a/modules/mline/api_cleanstage.go b/modules/mline/api_cleanstage.go index fcd8c7c84..df66a0df8 100644 --- a/modules/mline/api_cleanstage.go +++ b/modules/mline/api_cleanstage.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) CleanStageCheck(session comm.IUserSession, req *pb.MlineCle } ///挑战主线关卡 -func (this *apiComp) CleanStage(session comm.IUserSession, req *pb.MlineCleanStageReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) CleanStage(session comm.IUserSession, req *pb.MlineCleanStageReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 stageConf *cfg.GameMainStageData diff --git a/modules/mline/api_getReward.go b/modules/mline/api_getReward.go index 668f947dc..185680de1 100644 --- a/modules/mline/api_getReward.go +++ b/modules/mline/api_getReward.go @@ -3,8 +3,6 @@ package mline import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.MlineGetR } // 领取奖励 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MlineGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( curChapter *pb.DBMline // 当前章节信息 update map[string]interface{} diff --git a/modules/mline/api_getlist.go b/modules/mline/api_getlist.go index f7b3fd57a..4970676dd 100644 --- a/modules/mline/api_getlist.go +++ b/modules/mline/api_getlist.go @@ -5,7 +5,6 @@ import ( "go_dreamfactory/pb" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +16,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MlineGetLis } ///获取主线关卡信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.MlineGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.MlineGetListResp{} code = this.GetListCheck(session, req) diff --git a/modules/moonfantasy/api_ask.go b/modules/moonfantasy/api_ask.go index cb3366de0..a89800c0c 100644 --- a/modules/moonfantasy/api_ask.go +++ b/modules/moonfantasy/api_ask.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/redis" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) AskCheck(session comm.IUserSession, req *pb.MoonfantasyAskR } ///询问怪物是否可以挑战 -func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mdata *pb.DBMoonFantasy lock *redis.RedisMutex diff --git a/modules/moonfantasy/api_battle.go b/modules/moonfantasy/api_battle.go index a5acd22c2..052564c13 100644 --- a/modules/moonfantasy/api_battle.go +++ b/modules/moonfantasy/api_battle.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) BattleCheck(session comm.IUserSession, req *pb.MoonfantasyB } ///挑战怪物请求 -func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattleReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattleReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( boss *cfg.GameDreamlandBoosData // umfantasy *pb.DBUserMFantasy diff --git a/modules/moonfantasy/api_buy.go b/modules/moonfantasy/api_buy.go index 5372168ec..dcf6a1ca1 100644 --- a/modules/moonfantasy/api_buy.go +++ b/modules/moonfantasy/api_buy.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.MoonfantasyBuyR } ///询问怪物是否可以挑战 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.MoonfantasyBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBUserMFantasy challengeD *cfg.GameDreamlandChallengeData diff --git a/modules/moonfantasy/api_getlist.go b/modules/moonfantasy/api_getlist.go index a13d3626f..2d6a3860e 100644 --- a/modules/moonfantasy/api_getlist.go +++ b/modules/moonfantasy/api_getlist.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.Moonfantasy } ///获取用户秘境列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.MoonfantasyGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.MoonfantasyGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error info *pb.DBUserMFantasy diff --git a/modules/moonfantasy/api_receive.go b/modules/moonfantasy/api_receive.go index 4fdd68fad..d2958521a 100644 --- a/modules/moonfantasy/api_receive.go +++ b/modules/moonfantasy/api_receive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.Moonfantasy } ///领取战斗奖励 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( boss *cfg.GameDreamlandBoosData iswin bool diff --git a/modules/notify/api_getlist.go b/modules/notify/api_getlist.go index 372cb1d12..097c712cb 100644 --- a/modules/notify/api_getlist.go +++ b/modules/notify/api_getlist.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.NotifyGetLi } ///获取系统公告 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.NotifyGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.NotifyGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error userexpand *pb.DBUserExpand diff --git a/modules/pagoda/api_activate.go b/modules/pagoda/api_activate.go index 722ca7083..1b7c8f38e 100644 --- a/modules/pagoda/api_activate.go +++ b/modules/pagoda/api_activate.go @@ -3,8 +3,6 @@ package pagoda import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.PagodaActi } ///获取主线关卡信息 -func (this *apiComp) Activate(session comm.IUserSession, req *pb.PagodaActivateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Activate(session comm.IUserSession, req *pb.PagodaActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( list *pb.DBPagoda ) diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go index 00df2c9a9..aacce0046 100644 --- a/modules/pagoda/api_challenge.go +++ b/modules/pagoda/api_challenge.go @@ -3,8 +3,6 @@ package pagoda import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.PagodaCha } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( pagoda *pb.DBPagoda err error diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index 250b1fe18..0c240ab7c 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -9,7 +9,6 @@ import ( "time" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -22,7 +21,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Pagod } ///挑战主线关卡 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mapData map[string]interface{} pagoda *pb.DBPagoda diff --git a/modules/pagoda/api_getReward.go b/modules/pagoda/api_getReward.go index 95ec11e23..4732e6dcf 100644 --- a/modules/pagoda/api_getReward.go +++ b/modules/pagoda/api_getReward.go @@ -3,8 +3,6 @@ package pagoda import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGet } ///获取主线关卡信息 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetRewardCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go index 8c2c5dbc3..5f6566736 100644 --- a/modules/pagoda/api_getlist.go +++ b/modules/pagoda/api_getlist.go @@ -3,8 +3,6 @@ package pagoda import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetLi } ///获取主线关卡信息 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { list, err := this.module.modelPagoda.getPagodaList(session.GetUserId()) if err != nil { diff --git a/modules/pagoda/api_queryrecord.go b/modules/pagoda/api_queryrecord.go index 19b21ba81..6cc7b4ec9 100644 --- a/modules/pagoda/api_queryrecord.go +++ b/modules/pagoda/api_queryrecord.go @@ -5,7 +5,6 @@ import ( "go_dreamfactory/pb" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +14,7 @@ func (this *apiComp) QueryRecordCheck(session comm.IUserSession, req *pb.PagodaQ } ///获取主线关卡信息 -func (this *apiComp) QueryRecord(session comm.IUserSession, req *pb.PagodaQueryRecordReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) QueryRecord(session comm.IUserSession, req *pb.PagodaQueryRecordReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( record *pb.DBPagodaRecord ) diff --git a/modules/pagoda/api_ranklist.go b/modules/pagoda/api_ranklist.go index 2e8ebb379..1b5768936 100644 --- a/modules/pagoda/api_ranklist.go +++ b/modules/pagoda/api_ranklist.go @@ -9,7 +9,6 @@ import ( "strconv" "github.com/go-redis/redis/v8" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +17,7 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.PagodaRank return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( szRank []*pb.DBPagodaRecord rd *redis.StringSliceCmd diff --git a/modules/pagoda/api_warorder.go b/modules/pagoda/api_warorder.go index bf7662f92..c88fe894a 100644 --- a/modules/pagoda/api_warorder.go +++ b/modules/pagoda/api_warorder.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) WarOrderCheck(session comm.IUserSession, req *pb.PagodaWarO } // 战令领取 -func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( list *pb.DBPagoda resCfg []*cfg.Gameatn diff --git a/modules/pay/api_dailybuy.go b/modules/pay/api_dailybuy.go index 5832cfaab..2baf0cea8 100644 --- a/modules/pay/api_dailybuy.go +++ b/modules/pay/api_dailybuy.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) DailyBuyCheck(session comm.IUserSession, req *pb.PayDailyBu } ///获取系统公告 -func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBPayDaily conf *cfg.GamePayPackageData diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go index 97b008919..80c57ef59 100644 --- a/modules/pay/api_delivery.go +++ b/modules/pay/api_delivery.go @@ -6,7 +6,6 @@ import ( "go_dreamfactory/pb" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +15,7 @@ func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliver } ///模拟充值 -func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error ) diff --git a/modules/pay/api_info.go b/modules/pay/api_info.go index de80cef78..2e8261ef9 100644 --- a/modules/pay/api_info.go +++ b/modules/pay/api_info.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PayInfoReq) (c } ///获取系统公告 -func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.PayInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBPayDaily goods []*cfg.GamePayPackageData diff --git a/modules/pay/api_record.go b/modules/pay/api_record.go index 511b5ba1b..15085170e 100644 --- a/modules/pay/api_record.go +++ b/modules/pay/api_record.go @@ -3,18 +3,16 @@ package pay import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 func (this *apiComp) RecordCheck(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode) { - + return } ///获取系统公告 -func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Record(session comm.IUserSession, req *pb.PayRecordReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBUserPay err error diff --git a/modules/practice/api_accept.go b/modules/practice/api_accept.go index 051afb29a..f095e9c8c 100644 --- a/modules/practice/api_accept.go +++ b/modules/practice/api_accept.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "time" - - "google.golang.org/protobuf/proto" ) //接受切磋 @@ -19,7 +17,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.PracticeAcce return } -func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/practice/api_enrolled.go b/modules/practice/api_enrolled.go index 90deb4906..0051f7f76 100644 --- a/modules/practice/api_enrolled.go +++ b/modules/practice/api_enrolled.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) EnrolledCheck(session comm.IUserSession, req *pb.PracticeEn } ///练功请求 -func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolledReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolledReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error diff --git a/modules/practice/api_expulsion.go b/modules/practice/api_expulsion.go index bde5f7b6a..5f2b2e2a1 100644 --- a/modules/practice/api_expulsion.go +++ b/modules/practice/api_expulsion.go @@ -8,8 +8,6 @@ import ( "math" "math/rand" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) ExpulsionCheck(session comm.IUserSession, req *pb.PracticeE } ///练功请求 驱逐 -func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpulsionReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error ok bool diff --git a/modules/practice/api_friendromm.go b/modules/practice/api_friendromm.go index 61f9452f3..be71d6445 100644 --- a/modules/practice/api_friendromm.go +++ b/modules/practice/api_friendromm.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) FriendRommCheck(session comm.IUserSession, req *pb.Practice } ///练功请求 -func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFriendRommReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error rooms []*pb.DBPracticeRoom diff --git a/modules/practice/api_getgymbuff.go b/modules/practice/api_getgymbuff.go index eb0ccf63f..801a64f41 100644 --- a/modules/practice/api_getgymbuff.go +++ b/modules/practice/api_getgymbuff.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) GetGymBuffCheck(session comm.IUserSession, req *pb.Practice } ///练功请求 -func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGymBuffReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mryl *cfg.GamePandamasMrylData buff *cfg.GamePandamasBuffData diff --git a/modules/practice/api_gymconfirm.go b/modules/practice/api_gymconfirm.go index 95831a679..7c8f11fb7 100644 --- a/modules/practice/api_gymconfirm.go +++ b/modules/practice/api_gymconfirm.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GymConfirmCheck(session comm.IUserSession, req *pb.Practice } ///练功请求 -func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (code pb.ErrorCode, data *pb.ErrorData) { this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ "globalbuff": req.Buffid, diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go index 3d6a09bc5..c4d403af4 100644 --- a/modules/practice/api_gyminfo.go +++ b/modules/practice/api_gyminfo.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) GymInfoCheck(session comm.IUserSession, req *pb.PracticeGym } ///练功请求 -func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index 186dc1039..ae74e406f 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "math/rand" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.Practice } ///练功请求 -func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_info.go b/modules/practice/api_info.go index db173e497..fb46b9e85 100644 --- a/modules/practice/api_info.go +++ b/modules/practice/api_info.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PracticeInfoRe } ///练功请求 -func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_loot.go b/modules/practice/api_loot.go index 2b1eb86fe..6d5f9c30f 100644 --- a/modules/practice/api_loot.go +++ b/modules/practice/api_loot.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) LootCheck(session comm.IUserSession, req *pb.PracticeLootRe } ///练功请求 蹭馆 -func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error froom *pb.DBPracticeRoom diff --git a/modules/practice/api_npcbattkle.go b/modules/practice/api_npcbattkle.go index 65680b15f..18bee529f 100644 --- a/modules/practice/api_npcbattkle.go +++ b/modules/practice/api_npcbattkle.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) NPCBattkleCheck(session comm.IUserSession, req *pb.Practice } ///npc 战斗请求 -func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBattkleReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) NPCBattkle(session comm.IUserSession, req *pb.PracticeNPCBattkleReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index df7fe408e..3891fb8ef 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) NPCBattkleFinishCheck(session comm.IUserSession, req *pb.Pr } ///npc 战斗结果请求 -func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.PracticeNPCBattkleFinishReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.PracticeNPCBattkleFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go index e455fc4bd..49420f1e1 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN } ///npc 领取对白奖励 -func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_practice.go b/modules/practice/api_practice.go index ce970cffd..55b274102 100644 --- a/modules/practice/api_practice.go +++ b/modules/practice/api_practice.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) PracticeCheck(session comm.IUserSession, req *pb.PracticePr } ///练功请求 练功 -func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePracticeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePracticeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_qiecuo.go b/modules/practice/api_qiecuo.go index 6ad376a2a..2807a832c 100644 --- a/modules/practice/api_qiecuo.go +++ b/modules/practice/api_qiecuo.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "time" - - "google.golang.org/protobuf/proto" ) // 踢馆(熊猫武馆) @@ -18,7 +16,7 @@ func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.PracticeQiec return } -func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.PracticeQiecuoReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.QiecuoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index 16f85b941..1cafb3e25 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -9,8 +9,6 @@ import ( "math" "math/rand" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +18,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.PracticeRec } ///练功请求 奖励 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error diff --git a/modules/practice/api_refuse.go b/modules/practice/api_refuse.go index 09da43116..81ba7db8d 100644 --- a/modules/practice/api_refuse.go +++ b/modules/practice/api_refuse.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 切磋终止 @@ -13,7 +11,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.PracticeRefu } //拒绝切磋 -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.PracticeRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index 9d56af4e8..57a308784 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -3,8 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) UnLockCheck(session comm.IUserSession, req *pb.PracticeUnLo } ///练功请求 解锁木桩 -func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/practice/api_upgrade.go b/modules/practice/api_upgrade.go index 854c2640a..dbb58e636 100644 --- a/modules/practice/api_upgrade.go +++ b/modules/practice/api_upgrade.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.PracticeUpg } ///练功请求 蹭馆 -func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.PracticeUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error room *pb.DBPracticeRoom diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index 584ce6cec..00e98ca38 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -18,7 +16,7 @@ func (this *apiComp) BuyGiftCheck(session comm.IUserSession, req *pb.PrivilegeBu } ///获取特权列表 -func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BuyGiftCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/privilege/api_buyyueka.go b/modules/privilege/api_buyyueka.go index 6d55d911c..270ff69cc 100644 --- a/modules/privilege/api_buyyueka.go +++ b/modules/privilege/api_buyyueka.go @@ -3,8 +3,6 @@ package privilege import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) BuyYuekaCheck(session comm.IUserSession, req *pb.PrivilegeB } ///获取特权列表 -func (this *apiComp) BuyYueka(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) BuyYueka(session comm.IUserSession, req *pb.PrivilegeBuyYuekaReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BuyYuekaCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/privilege/api_getlist.go b/modules/privilege/api_getlist.go index 78cb1d36f..4d808f007 100644 --- a/modules/privilege/api_getlist.go +++ b/modules/privilege/api_getlist.go @@ -3,8 +3,6 @@ package privilege import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.PrivilegeGe } ///获取特权列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.PrivilegeGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.PrivilegeGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { list, _ := this.module.modelPrivilege.getPrivilegeList(session.GetUserId()) session.SendMsg(string(this.module.GetType()), PrivilegeGetListResp, &pb.PrivilegeGetListResp{Data: list}) diff --git a/modules/privilege/api_viplist.go b/modules/privilege/api_viplist.go index 3e6d5ead1..9b3b208ce 100644 --- a/modules/privilege/api_viplist.go +++ b/modules/privilege/api_viplist.go @@ -3,8 +3,6 @@ package privilege import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) VipListCheck(session comm.IUserSession, req *pb.PrivilegeVi } ///获取特权列表 -func (this *apiComp) VipList(session comm.IUserSession, req *pb.PrivilegeVipListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) VipList(session comm.IUserSession, req *pb.PrivilegeVipListReq) (code pb.ErrorCode, data *pb.ErrorData) { list, _ := this.module.modelVip.getVipList(session.GetUserId()) session.SendMsg(string(this.module.GetType()), PrivilegeVipListResp, &pb.PrivilegeVipListResp{Data: list}) diff --git a/modules/pvp/api_activecancel.go b/modules/pvp/api_activecancel.go index d356cf18f..f74b2a77d 100644 --- a/modules/pvp/api_activecancel.go +++ b/modules/pvp/api_activecancel.go @@ -4,8 +4,6 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) ActiveCancelCheck(session comm.IUserSession, req *pb.PvpAct } ///设置战斗阵型 -func (this *apiComp) ActiveCancel(session comm.IUserSession, req *pb.PvpActiveCancelReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ActiveCancel(session comm.IUserSession, req *pb.PvpActiveCancelReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( battle *BattleItem ok bool diff --git a/modules/pvp/api_formation.go b/modules/pvp/api_formation.go index dfff7601a..1fa3e7854 100644 --- a/modules/pvp/api_formation.go +++ b/modules/pvp/api_formation.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/timewheel" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.PvpFormat } ///设置战斗阵型 -func (this *apiComp) Formation(session comm.IUserSession, req *pb.PvpFormationReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Formation(session comm.IUserSession, req *pb.PvpFormationReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( battle *BattleItem ok bool diff --git a/modules/pvp/api_incmd.go b/modules/pvp/api_incmd.go index 38ead601b..58517dee4 100644 --- a/modules/pvp/api_incmd.go +++ b/modules/pvp/api_incmd.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/timewheel" "go_dreamfactory/pb" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) InCmdCheck(session comm.IUserSession, req *pb.PvpInCmdReq) } ///设置战斗阵型 -func (this *apiComp) InCmd(session comm.IUserSession, req *pb.PvpInCmdReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) InCmd(session comm.IUserSession, req *pb.PvpInCmdReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( battle *BattleItem side int32 diff --git a/modules/pvp/api_into.go b/modules/pvp/api_into.go index 7a2e853b6..7a804ef85 100644 --- a/modules/pvp/api_into.go +++ b/modules/pvp/api_into.go @@ -3,8 +3,6 @@ package pvp import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) IntoCheck(session comm.IUserSession, req *pb.PvpIntoReq) (c } ///设置战斗阵型 -func (this *apiComp) Into(session comm.IUserSession, req *pb.PvpIntoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Into(session comm.IUserSession, req *pb.PvpIntoReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( battle *BattleItem resp *pb.BattleGetInfoResp = &pb.BattleGetInfoResp{} diff --git a/modules/pvp/api_list.go b/modules/pvp/api_list.go index 687bf39b6..2961cc346 100644 --- a/modules/pvp/api_list.go +++ b/modules/pvp/api_list.go @@ -3,8 +3,6 @@ package pvp import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.PvpListReq) (c } ///设置战斗阵型 -func (this *apiComp) List(session comm.IUserSession, req *pb.PvpListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) List(session comm.IUserSession, req *pb.PvpListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( result []*pb.DBPvpBattle userpvp []*pb.DBPvpBattle diff --git a/modules/pvp/api_loadcomplete.go b/modules/pvp/api_loadcomplete.go index 6a5ac0d36..cd1b37c38 100644 --- a/modules/pvp/api_loadcomplete.go +++ b/modules/pvp/api_loadcomplete.go @@ -3,8 +3,6 @@ package pvp import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) LoadCompleteCheck(session comm.IUserSession, req *pb.PvpLoa } ///设置战斗阵型 -func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.PvpLoadCompleteReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.PvpLoadCompleteReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( battle *BattleItem err error diff --git a/modules/reddot/api_get.go b/modules/reddot/api_get.go index 77867a99b..31b4f30c6 100644 --- a/modules/reddot/api_get.go +++ b/modules/reddot/api_get.go @@ -3,8 +3,6 @@ package reddot import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetCheck(session comm.IUserSession, req *pb.ReddotGetReq) ( } ///获取系统公告 -func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Get(session comm.IUserSession, req *pb.ReddotGetReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( reddot map[int32]bool = make(map[int32]bool) ) diff --git a/modules/reddot/api_getall.go b/modules/reddot/api_getall.go index 384be0dc3..698392dbf 100644 --- a/modules/reddot/api_getall.go +++ b/modules/reddot/api_getall.go @@ -3,8 +3,6 @@ package reddot import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetAllCheck(session comm.IUserSession, req *pb.ReddotGetAll } ///获取系统公告 -func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetAll(session comm.IUserSession, req *pb.ReddotGetAllReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( reddot map[int32]bool = make(map[int32]bool) ) diff --git a/modules/rtask/api_tasktest.go b/modules/rtask/api_tasktest.go index ab6707a6a..1bc507377 100644 --- a/modules/rtask/api_tasktest.go +++ b/modules/rtask/api_tasktest.go @@ -8,14 +8,13 @@ import ( "github.com/pkg/errors" "github.com/spf13/cast" - "google.golang.org/protobuf/proto" ) func (this *apiComp) RtestCheck(session comm.IUserSession, req *pb.RtaskTestReq) (code pb.ErrorCode) { return } -func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.RtaskTestResp{Flag: true} if req.CondiId != 0 { if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), req.CondiId); !ok { diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 58dc0a6cf..9d473f9ba 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -6,8 +6,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "math" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (co } ///获取用户商品列表 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error conf *cfg.GameShopitemData diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 882ac2b5c..831d6509a 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -7,8 +7,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "time" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +18,7 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetList } ///获取用户商品列表 -func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( err error filed string diff --git a/modules/smithy/api_atlasactivate.go b/modules/smithy/api_atlasactivate.go index 4e06fd45d..e53d2d3e6 100644 --- a/modules/smithy/api_atlasactivate.go +++ b/modules/smithy/api_atlasactivate.go @@ -3,8 +3,6 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) AtlasActivateCheck(session comm.IUserSession, req *pb.Smith } // 获取铁匠铺图鉴信息 -func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AtlasActivate(session comm.IUserSession, req *pb.SmithyAtlasActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( addScore int32 // 更新图鉴增加的积分 ) diff --git a/modules/smithy/api_atlasaward.go b/modules/smithy/api_atlasaward.go index efcc769a7..185e972af 100644 --- a/modules/smithy/api_atlasaward.go +++ b/modules/smithy/api_atlasaward.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) AtlasAwardCheck(session comm.IUserSession, req *pb.SmithyAt } // 一键领取所有可以领取的奖励 -func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AtlasAward(session comm.IUserSession, req *pb.SmithyAtlasAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( res []*cfg.Gameatn respRes []*pb.UserAssets diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 378a51ae5..f8c05dc4f 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) ForgeEquipCheck(session comm.IUserSession, req *pb.SmithyFo } // 打造装备 -func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEquipReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( stove *pb.DBStove err error diff --git a/modules/smithy/api_getCustomer.go b/modules/smithy/api_getCustomer.go index abb0838a4..0b54923a9 100644 --- a/modules/smithy/api_getCustomer.go +++ b/modules/smithy/api_getCustomer.go @@ -6,14 +6,13 @@ import ( "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/mongo" - "google.golang.org/protobuf/proto" ) func (this *apiComp) CustomerCheck(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode) { return } -func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode, data *pb.ErrorData) { customerCount := this.module.ModuleTools.GetGlobalConf().SmithyMaxNpc if customerCount <= 0 { code = pb.ErrorCode_ConfigNoFound diff --git a/modules/smithy/api_getatlas.go b/modules/smithy/api_getatlas.go index dbd7511af..8fd34de49 100644 --- a/modules/smithy/api_getatlas.go +++ b/modules/smithy/api_getatlas.go @@ -3,8 +3,6 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) AtlasListCheck(session comm.IUserSession, req *pb.SmithyAtl } // 获取铁匠铺图鉴信息 -func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AtlasList(session comm.IUserSession, req *pb.SmithyAtlasListReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.AtlasListCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/smithy/api_getstoveinfo.go b/modules/smithy/api_getstoveinfo.go index 2d8ab6c1c..342ffdd09 100644 --- a/modules/smithy/api_getstoveinfo.go +++ b/modules/smithy/api_getstoveinfo.go @@ -3,8 +3,6 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) GetStoveInfoCheck(session comm.IUserSession, req *pb.Smithy } // 获取铁匠铺信息 -func (this *apiComp) GetStoveInfo(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetStoveInfo(session comm.IUserSession, req *pb.SmithyGetStoveInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetStoveInfoCheck(session, req) if code != pb.ErrorCode_Success { diff --git a/modules/smithy/api_receive.go b/modules/smithy/api_receive.go index 70f4e4733..1c19ec7d2 100644 --- a/modules/smithy/api_receive.go +++ b/modules/smithy/api_receive.go @@ -4,8 +4,6 @@ import ( "errors" "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 图鉴任务奖励领取 @@ -16,7 +14,7 @@ func (this *apiComp) TaskAwardCheck(session comm.IUserSession, req *pb.SmithyTas return } -func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.SmithyTaskAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.TaskAwardCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/api_refuse.go b/modules/smithy/api_refuse.go index 3439578dd..cc957a6d7 100644 --- a/modules/smithy/api_refuse.go +++ b/modules/smithy/api_refuse.go @@ -3,8 +3,6 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode) { @@ -14,7 +12,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SmithyRefuse return } -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SmithyRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 2a704ba84..5d9917971 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) RiseCheck(session comm.IUserSession, req *pb.SmithyRiseReq) } // 炉子升温 -func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( cost []*cfg.Gameatn // 消耗材料 ) diff --git a/modules/smithy/api_stoveup.go b/modules/smithy/api_stoveup.go index db8a60005..c7336cfdb 100644 --- a/modules/smithy/api_stoveup.go +++ b/modules/smithy/api_stoveup.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -15,7 +13,7 @@ func (this *apiComp) StoveUpCheck(session comm.IUserSession, req *pb.SmithyStove } // 炉子升级 -func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.StoveUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/smithy/api_tasklist.go b/modules/smithy/api_tasklist.go index edb8e01ee..8c84cd041 100644 --- a/modules/smithy/api_tasklist.go +++ b/modules/smithy/api_tasklist.go @@ -5,14 +5,13 @@ import ( "go_dreamfactory/pb" "go.mongodb.org/mongo-driver/mongo" - "google.golang.org/protobuf/proto" ) func (a *apiComp) TasklistCheck(session comm.IUserSession, req *pb.SmithyTasklistReq) (code pb.ErrorCode) { return } -func (a *apiComp) Tasklist(session comm.IUserSession, req *pb.SmithyTasklistReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Tasklist(session comm.IUserSession, req *pb.SmithyTasklistReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = a.TasklistCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/smithy/api_toolsup.go b/modules/smithy/api_toolsup.go index 95ea5d7a5..8d127484c 100644 --- a/modules/smithy/api_toolsup.go +++ b/modules/smithy/api_toolsup.go @@ -3,8 +3,6 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ToolsUpCheck(session comm.IUserSession, req *pb.SmithyTools } // 工具升级 -func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ToolsUp(session comm.IUserSession, req *pb.SmithyToolsUpReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.ToolsUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/smithy/api_trade.go b/modules/smithy/api_trade.go index 9b2160a5e..421574f66 100644 --- a/modules/smithy/api_trade.go +++ b/modules/smithy/api_trade.go @@ -3,8 +3,6 @@ package smithy import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 贸易 @@ -16,7 +14,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) return } -func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SellCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_Formation.go b/modules/sociaty/api_cross_Formation.go index c335c87e9..d7fe79532 100644 --- a/modules/sociaty/api_cross_Formation.go +++ b/modules/sociaty/api_cross_Formation.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 设置阵容 @@ -13,7 +11,7 @@ func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.SociatyBF return } -func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormationReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormationReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.FormationCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index b41781bd6..95778bc21 100644 --- a/modules/sociaty/api_cross_accuse.go +++ b/modules/sociaty/api_cross_accuse.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 弹劾会长 @@ -15,7 +13,7 @@ func (this *apiComp) AccuseCheck(session comm.IUserSession, req *pb.SociatyAccus return } -func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AccuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_activitylist.go b/modules/sociaty/api_cross_activitylist.go index 621561df4..10508c355 100644 --- a/modules/sociaty/api_cross_activitylist.go +++ b/modules/sociaty/api_cross_activitylist.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 活跃度列表 @@ -14,7 +12,7 @@ func (this *apiComp) ActivitylistCheck(session comm.IUserSession, req *pb.Sociat return } -func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index 07d8b9891..6126e8466 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 活跃度领取 @@ -17,7 +15,7 @@ func (this *apiComp) ActivityreceiveCheck(session comm.IUserSession, req *pb.Soc return } -func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyActivityReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ActivityreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index 21489652d..0a7c7569b 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会申请-同意 @@ -19,7 +17,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.SociatyAgreeR return } -func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index 677568ed8..c8f52495e 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 公会申请 @@ -20,7 +18,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.SociatyApplyR return } -func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go index 10dfac468..38a3b74ea 100644 --- a/modules/sociaty/api_cross_applycancel.go +++ b/modules/sociaty/api_cross_applycancel.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 取消公会申请 @@ -18,7 +16,7 @@ func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.Sociaty return } -func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ApplyCancelCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_applylist.go b/modules/sociaty/api_cross_applylist.go index 9bacfcbad..0f7014f1f 100644 --- a/modules/sociaty/api_cross_applylist.go +++ b/modules/sociaty/api_cross_applylist.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 申请列表 @@ -18,7 +16,7 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.SociatyAp return } -func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyListReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ApplyListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_assign.go b/modules/sociaty/api_cross_assign.go index 3a6280b1c..72d3df984 100644 --- a/modules/sociaty/api_cross_assign.go +++ b/modules/sociaty/api_cross_assign.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会转让 @@ -18,7 +16,7 @@ func (this *apiComp) AssignCheck(session comm.IUserSession, req *pb.SociatyAssig return } -func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.AssignCheck(session, req); code != pb.ErrorCode_Success { return } @@ -31,7 +29,7 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) } sociaty := this.module.modelSociaty.getUserSociaty(uid) - if sociaty == nil { + if sociaty == nil { code = pb.ErrorCode_SociatyNoFound this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) return diff --git a/modules/sociaty/api_cross_bossmain.go b/modules/sociaty/api_cross_bossmain.go index f7b2b847e..ce3dcc59e 100644 --- a/modules/sociaty/api_cross_bossmain.go +++ b/modules/sociaty/api_cross_bossmain.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会BOSS入口 @@ -15,7 +13,7 @@ func (this *apiComp) BossmainCheck(session comm.IUserSession, req *pb.SociatyBMa return } -func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() ggd := this.module.ModuleTools.GetGlobalConf() diff --git a/modules/sociaty/api_cross_bossrank.go b/modules/sociaty/api_cross_bossrank.go index cb07bb8f8..f3d8bad0a 100644 --- a/modules/sociaty/api_cross_bossrank.go +++ b/modules/sociaty/api_cross_bossrank.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会BOSS 赛季排行榜 @@ -17,7 +15,7 @@ func (this *apiComp) BrankCheck(session comm.IUserSession, req *pb.SociatyBRankR return } -func (this *apiComp) Brank(session comm.IUserSession, req *pb.SociatyBRankReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Brank(session comm.IUserSession, req *pb.SociatyBRankReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BrankCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_breceive.go b/modules/sociaty/api_cross_breceive.go index 4a59f3d43..109b23eb8 100644 --- a/modules/sociaty/api_cross_breceive.go +++ b/modules/sociaty/api_cross_breceive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会BOSS 积分奖励领取 @@ -17,7 +15,7 @@ func (this *apiComp) BreceiveCheck(session comm.IUserSession, req *pb.SociatyBRe return } -func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BreceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index e3a83f9af..ea0139f1f 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.SociatyBuyReq) (code pb.ErrorCode) { @@ -16,7 +14,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.SociatyBuyReq) return } -func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_challengefinish.go b/modules/sociaty/api_cross_challengefinish.go index a2fde41be..66c9c0a07 100644 --- a/modules/sociaty/api_cross_challengefinish.go +++ b/modules/sociaty/api_cross_challengefinish.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 结束挑战 @@ -13,7 +11,7 @@ func (this *apiComp) ChallengefinishCheck(session comm.IUserSession, req *pb.Soc return } -func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyBChallengeFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ChallengefinishCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_challengestart.go b/modules/sociaty/api_cross_challengestart.go index 3574419e3..ce01977fb 100644 --- a/modules/sociaty/api_cross_challengestart.go +++ b/modules/sociaty/api_cross_challengestart.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 开始挑战 @@ -14,7 +12,7 @@ func (this *apiComp) ChallengestartCheck(session comm.IUserSession, req *pb.Soci return } -func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBChallengeStartReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ChallengestartCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index 15e008564..1b3c3c2ad 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -10,8 +10,6 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) // 公会创建 @@ -23,7 +21,7 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreat return } -func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { return } @@ -86,9 +84,9 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) //会长 sociaty.Members = append(sociaty.Members, &pb.SociatyMember{ - Uid: user.Uid, - Job: pb.SociatyJob_PRESIDENT, //创建人是会长 - Ctime: configure.Now().Unix(), + Uid: user.Uid, + Job: pb.SociatyJob_PRESIDENT, //创建人是会长 + Ctime: configure.Now().Unix(), }) if err := this.module.modelSociaty.create(sociaty); err != nil { var customError = new(comm.CustomError) diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 722e0141d..5fcf8405b 100644 --- a/modules/sociaty/api_cross_discharge.go +++ b/modules/sociaty/api_cross_discharge.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 踢出公会 @@ -19,7 +17,7 @@ func (this *apiComp) DischargeCheck(session comm.IUserSession, req *pb.SociatyDi return } -func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischargeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischargeReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.DischargeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go index 1d6bed4ab..c329438f2 100644 --- a/modules/sociaty/api_cross_dismiss.go +++ b/modules/sociaty/api_cross_dismiss.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 公会解散 @@ -19,7 +17,7 @@ func (this *apiComp) DismissCheck(session comm.IUserSession, req *pb.SociatyDism return } -func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.DismissCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_list.go b/modules/sociaty/api_cross_list.go index 862e41443..425a62f84 100644 --- a/modules/sociaty/api_cross_list.go +++ b/modules/sociaty/api_cross_list.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会列表 @@ -17,7 +15,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq return } -func (this *apiComp) List(session comm.IUserSession, req *pb.SociatyListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) List(session comm.IUserSession, req *pb.SociatyListReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.module.ModuleSys.IsAccess(comm.Guild, session.GetUserId()); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_log.go b/modules/sociaty/api_cross_log.go index f6e7cf126..deac3cd7d 100644 --- a/modules/sociaty/api_cross_log.go +++ b/modules/sociaty/api_cross_log.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会日志 @@ -14,7 +12,7 @@ func (this *apiComp) LogCheck(session comm.IUserSession, req *pb.SociatyLogReq) return } -func (this *apiComp) Log(session comm.IUserSession, req *pb.SociatyLogReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Log(session comm.IUserSession, req *pb.SociatyLogReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_members.go b/modules/sociaty/api_cross_members.go index fee77661d..50f5fe032 100644 --- a/modules/sociaty/api_cross_members.go +++ b/modules/sociaty/api_cross_members.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会成员列表 @@ -14,7 +12,7 @@ func (this *apiComp) MembersCheck(session comm.IUserSession, req *pb.SociatyMemb return } -func (this *apiComp) Members(session comm.IUserSession, req *pb.SociatyMembersReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Members(session comm.IUserSession, req *pb.SociatyMembersReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index 1431ae40a..0ad347d2b 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 我的公会 @@ -15,7 +13,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq return } -func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() userEx, err := this.module.ModuleUser.GetUserExpand(uid) diff --git a/modules/sociaty/api_cross_quit.go b/modules/sociaty/api_cross_quit.go index c7e543b5e..50fac352b 100644 --- a/modules/sociaty/api_cross_quit.go +++ b/modules/sociaty/api_cross_quit.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 退出公会 @@ -15,7 +13,7 @@ func (this *apiComp) QuitCheck(session comm.IUserSession, req *pb.SociatyQuitReq return } -func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_rank.go b/modules/sociaty/api_cross_rank.go index 34e5c1d36..409aba5a6 100644 --- a/modules/sociaty/api_cross_rank.go +++ b/modules/sociaty/api_cross_rank.go @@ -3,8 +3,6 @@ package sociaty import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会排行榜 @@ -13,7 +11,7 @@ func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.SociatyRankReq return } -func (this *apiComp) Rank(session comm.IUserSession, req *pb.SociatyRankReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Rank(session comm.IUserSession, req *pb.SociatyRankReq) (code pb.ErrorCode, data *pb.ErrorData) { // 排行榜 list := this.module.modelSociaty.rank() rsp := &pb.SociatyRankResp{ diff --git a/modules/sociaty/api_cross_receive.go b/modules/sociaty/api_cross_receive.go index 5fc33d057..8d1effe17 100644 --- a/modules/sociaty/api_cross_receive.go +++ b/modules/sociaty/api_cross_receive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会任务奖励领取 @@ -18,7 +16,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.SociatyRece return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.SociatyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_recommend.go b/modules/sociaty/api_cross_recommend.go index 92b5785ed..41a924a76 100644 --- a/modules/sociaty/api_cross_recommend.go +++ b/modules/sociaty/api_cross_recommend.go @@ -3,8 +3,6 @@ package sociaty import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会BOSS 推荐 @@ -15,7 +13,7 @@ func (this *apiComp) RecommendCheck(session comm.IUserSession, req *pb.SociatyRe return } -func (this *apiComp) Recommend(session comm.IUserSession, req *pb.SociatyRecommendReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Recommend(session comm.IUserSession, req *pb.SociatyRecommendReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RecommendCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_refuse.go b/modules/sociaty/api_cross_refuse.go index d9f324cfe..e16a2df87 100644 --- a/modules/sociaty/api_cross_refuse.go +++ b/modules/sociaty/api_cross_refuse.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会申请审核-拒绝 @@ -18,7 +16,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.SociatyRefus return } -func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_search.go b/modules/sociaty/api_cross_search.go index 9eb9d83f9..e9c8e65b2 100644 --- a/modules/sociaty/api_cross_search.go +++ b/modules/sociaty/api_cross_search.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会搜索 @@ -17,7 +15,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.SociatySearc return } -func (this *apiComp) Search(session comm.IUserSession, req *pb.SociatySearchReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Search(session comm.IUserSession, req *pb.SociatySearchReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_setting.go b/modules/sociaty/api_cross_setting.go index 01dc758dc..d9a8155b4 100644 --- a/modules/sociaty/api_cross_setting.go +++ b/modules/sociaty/api_cross_setting.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 公会设置 @@ -18,7 +16,7 @@ func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySett return } -func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SettingCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_settingjob.go b/modules/sociaty/api_cross_settingjob.go index 56ea5ad16..7d9591dab 100644 --- a/modules/sociaty/api_cross_settingjob.go +++ b/modules/sociaty/api_cross_settingjob.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 设置职位 @@ -17,14 +15,14 @@ func (this *apiComp) SettingJobCheck(session comm.IUserSession, req *pb.SociatyS return } -func (this *apiComp) SettingJob(session comm.IUserSession, req *pb.SociatySettingJobReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) SettingJob(session comm.IUserSession, req *pb.SociatySettingJobReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SettingJobCheck(session, req); code != pb.ErrorCode_Success { return } uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) - if sociaty == nil{ + if sociaty == nil { code = pb.ErrorCode_SociatyNoFound this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) return diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go index fc75544cb..6971771e7 100644 --- a/modules/sociaty/api_cross_sign.go +++ b/modules/sociaty/api_cross_sign.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 签到 @@ -13,7 +11,7 @@ func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.SociatySignReq return } -func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SignCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go index 003735d0d..5f327306f 100644 --- a/modules/sociaty/api_cross_tasklist.go +++ b/modules/sociaty/api_cross_tasklist.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 任务列表 @@ -14,7 +12,7 @@ func (this *apiComp) TaskListCheck(session comm.IUserSession, req *pb.SociatyTas return } -func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sys/api_activate.go b/modules/sys/api_activate.go index d4e1ca3dc..aad7a6c73 100644 --- a/modules/sys/api_activate.go +++ b/modules/sys/api_activate.go @@ -4,15 +4,13 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) FuncActivateCheck(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode) { return } -func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActivateReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.SysFuncActivateResp{} diff --git a/modules/sys/api_func.go b/modules/sys/api_func.go index e2e554828..150410944 100644 --- a/modules/sys/api_func.go +++ b/modules/sys/api_func.go @@ -3,15 +3,13 @@ package sys import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) FunclistCheck(session comm.IUserSession, req *pb.SysFuncListReq) (code pb.ErrorCode) { return } -func (this *apiComp) Funclist(session comm.IUserSession, req *pb.SysFuncListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Funclist(session comm.IUserSession, req *pb.SysFuncListReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.SysFuncListResp{} iuser := this.module.ModuleUser diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go index f8ee29fd1..7799eb3ed 100644 --- a/modules/sys/api_getlist.go +++ b/modules/sys/api_getlist.go @@ -3,15 +3,13 @@ package sys import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) FuncGetListCheck(session comm.IUserSession, req *pb.SysFuncGetListReq) (code pb.ErrorCode) { return } -func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.SysFuncGetListResp{} rsp.Cond = make(map[string]int32, 0) diff --git a/modules/task/api_activelist.go b/modules/task/api_activelist.go index ece0be0bc..01a656a1e 100644 --- a/modules/task/api_activelist.go +++ b/modules/task/api_activelist.go @@ -3,8 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //活跃度列表 @@ -15,7 +13,7 @@ func (this *apiComp) ActiveListCheck(session comm.IUserSession, req *pb.TaskActi return } -func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ActiveList(session comm.IUserSession, req *pb.TaskActiveListReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ActiveListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 16f0bb31b..a4df5b9eb 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - - "google.golang.org/protobuf/proto" ) //活跃度领取 @@ -19,7 +17,7 @@ func (this *apiComp) ActiveReceiveCheck(session comm.IUserSession, req *pb.TaskA return } -func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActiveReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ActiveReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_getrecord.go b/modules/task/api_getrecord.go index 9910fdb20..cabd0565b 100644 --- a/modules/task/api_getrecord.go +++ b/modules/task/api_getrecord.go @@ -3,8 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode) { @@ -13,7 +11,7 @@ func (this *apiComp) GetrecordCheck(session comm.IUserSession, req *pb.TaskGetre // 获取玩家任务条件记录 // 客户端会在登录时拉取此数据 -func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getrecord(session comm.IUserSession, req *pb.TaskGetrecordReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.TaskGetrecordResp{} if imodule, err := this.service.GetModule(comm.ModuleRtask); err == nil { if itask, ok := imodule.(comm.IRtask); ok { diff --git a/modules/task/api_list.go b/modules/task/api_list.go index 1a9a8cf1d..259d293f7 100644 --- a/modules/task/api_list.go +++ b/modules/task/api_list.go @@ -3,8 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 任务列表 @@ -16,7 +14,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.TaskListReq) ( return } -func (this *apiComp) List(session comm.IUserSession, req *pb.TaskListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) List(session comm.IUserSession, req *pb.TaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index bcb1abd54..10e5e69af 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //任务奖励领取 @@ -19,7 +17,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceive return } -func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/task/api_send.go b/modules/task/api_send.go index 3091f5fdc..99cfe8429 100644 --- a/modules/task/api_send.go +++ b/modules/task/api_send.go @@ -3,8 +3,6 @@ package task import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.TaskSendReq) (code pb.ErrorCode) { @@ -14,7 +12,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.TaskSendReq) ( return } -func (this *apiComp) Send(session comm.IUserSession, req *pb.TaskSendReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Send(session comm.IUserSession, req *pb.TaskSendReq) (code pb.ErrorCode, data *pb.ErrorData) { if imodule, err := this.service.GetModule(comm.ModuleRtask); err == nil { if itask, ok := imodule.(comm.IRtask); ok { itask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.TaskType(req.TaskType), req.Params...)) diff --git a/modules/troll/api_afkset.go b/modules/troll/api_afkset.go index d8dd13c2e..318c6ebc0 100644 --- a/modules/troll/api_afkset.go +++ b/modules/troll/api_afkset.go @@ -3,8 +3,6 @@ package troll import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) AfkSetCheck(session comm.IUserSession, req *pb.TrollAfkSetReq) (code pb.ErrorCode) { @@ -13,7 +11,7 @@ func (this *apiComp) AfkSetCheck(session comm.IUserSession, req *pb.TrollAfkSetR } // 设置挂机规则 -func (this *apiComp) AfkSet(session comm.IUserSession, req *pb.TrollAfkSetReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) AfkSet(session comm.IUserSession, req *pb.TrollAfkSetReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( update map[string]interface{} ) diff --git a/modules/troll/api_buyorsell.go b/modules/troll/api_buyorsell.go index 54812627e..63d8088a7 100644 --- a/modules/troll/api_buyorsell.go +++ b/modules/troll/api_buyorsell.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "math" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) BuyOrSellCheck(session comm.IUserSession, req *pb.TrollBuyO return } -func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.TrollBuyOrSellReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.TrollBuyOrSellReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( bSell bool // 是否有出售 gold int32 // 当次交易 获得的金币 diff --git a/modules/troll/api_getReward.go b/modules/troll/api_getReward.go index bd76e2fdd..7f0fa5b66 100644 --- a/modules/troll/api_getReward.go +++ b/modules/troll/api_getReward.go @@ -3,8 +3,6 @@ package troll import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) NpcRewardCheck(session comm.IUserSession, req *pb.TrollNpcR } ///美食城领取奖励 -func (this *apiComp) NpcReward(session comm.IUserSession, req *pb.TrollNpcRewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) NpcReward(session comm.IUserSession, req *pb.TrollNpcRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( update map[string]interface{} ) diff --git a/modules/troll/api_getlist.go b/modules/troll/api_getlist.go index 1c649f1f8..1b88f0347 100644 --- a/modules/troll/api_getlist.go +++ b/modules/troll/api_getlist.go @@ -7,8 +7,6 @@ import ( "go_dreamfactory/sys/configure" "go_dreamfactory/utils" "math/big" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.TrollGetLis return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.TrollGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.TrollGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( update map[string]interface{} maxCoefficient int32 diff --git a/modules/troll/api_ranklist.go b/modules/troll/api_ranklist.go index 609b44bef..ce019b799 100644 --- a/modules/troll/api_ranklist.go +++ b/modules/troll/api_ranklist.go @@ -3,15 +3,13 @@ package troll import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.TrollRankListReq) (code pb.ErrorCode) { return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.TrollRankListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.TrollRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( rank []*pb.RankData ) diff --git a/modules/troll/api_recordlist.go b/modules/troll/api_recordlist.go index dd83c6f6c..aedb87735 100644 --- a/modules/troll/api_recordlist.go +++ b/modules/troll/api_recordlist.go @@ -3,15 +3,13 @@ package troll import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) RecordListCheck(session comm.IUserSession, req *pb.TrollRecordListReq) (code pb.ErrorCode) { return } -func (this *apiComp) RecordList(session comm.IUserSession, req *pb.TrollRecordListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RecordList(session comm.IUserSession, req *pb.TrollRecordListReq) (code pb.ErrorCode, data *pb.ErrorData) { if list, err := this.module.record.GetTrollRecord(session.GetUserId()); err == nil { session.SendMsg(string(this.module.GetType()), TrollRecordListResp, &pb.TrollRecordListResp{ diff --git a/modules/troll/api_surpriseid.go b/modules/troll/api_surpriseid.go index 76348352e..1ef84d6af 100644 --- a/modules/troll/api_surpriseid.go +++ b/modules/troll/api_surpriseid.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "math/big" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -16,7 +14,7 @@ func (this *apiComp) SurpriseIdCheck(session comm.IUserSession, req *pb.TrollSur return } -func (this *apiComp) SurpriseId(session comm.IUserSession, req *pb.TrollSurpriseIdReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) SurpriseId(session comm.IUserSession, req *pb.TrollSurpriseIdReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( circletime int32 // 循环一个周期的时间 circleCount int32 // 循环的次数 diff --git a/modules/user/api_battlerecord.go b/modules/user/api_battlerecord.go index 5e4687d39..b7c6e3ea0 100644 --- a/modules/user/api_battlerecord.go +++ b/modules/user/api_battlerecord.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 玩家战斗记录 @@ -12,7 +10,7 @@ func (this *apiComp) BattlerecordCheck(session comm.IUserSession, req *pb.UserBa return } -func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattlerecordReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Battlerecord(session comm.IUserSession, req *pb.UserBattlerecordReq) (code pb.ErrorCode, data *pb.ErrorData) { var uid string if req.Uid == "" { uid = session.GetUserId() diff --git a/modules/user/api_changetips.go b/modules/user/api_changetips.go index 80903eb2a..60213a505 100644 --- a/modules/user/api_changetips.go +++ b/modules/user/api_changetips.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) ChangeTipsCheck(session comm.IUserSession, req *pb.UserChan } //修改提示次数 -func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTipsReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChangeTips(session comm.IUserSession, req *pb.UserChangeTipsReq) (code pb.ErrorCode, data *pb.ErrorData) { update := make(map[string]interface{}, 0) if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 2a43592e1..3a72330a2 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -6,8 +6,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "strings" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateReq) (code pb.ErrorCode) { @@ -24,7 +22,7 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateRe } // 创角 -func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_getserverdata.go b/modules/user/api_getserverdata.go index 6a3aa88c2..d3383c022 100644 --- a/modules/user/api_getserverdata.go +++ b/modules/user/api_getserverdata.go @@ -7,14 +7,13 @@ import ( "time" "go.mongodb.org/mongo-driver/bson" - "google.golang.org/protobuf/proto" ) func (this *apiComp) GetServerDataCheck(session comm.IUserSession, req *pb.UserGetServerDataReq) (code pb.ErrorCode) { return } -func (this *apiComp) GetServerData(session comm.IUserSession, req *pb.UserGetServerDataReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetServerData(session comm.IUserSession, req *pb.UserGetServerDataReq) (code pb.ErrorCode, data *pb.ErrorData) { rsp := &pb.UserGetServerDataResp{ Data: &pb.DBServerData{}, diff --git a/modules/user/api_getsetting.go b/modules/user/api_getsetting.go index 999eed784..ffa4c969f 100644 --- a/modules/user/api_getsetting.go +++ b/modules/user/api_getsetting.go @@ -3,15 +3,13 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) GetsettingCheck(session comm.IUserSession, req *pb.UserGetSettingReq) (code pb.ErrorCode) { return } -func (this *apiComp) Getsetting(session comm.IUserSession, req *pb.UserGetSettingReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Getsetting(session comm.IUserSession, req *pb.UserGetSettingReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.GetsettingCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_gettujian.go b/modules/user/api_gettujian.go index 81b3b193b..b5e31343e 100644 --- a/modules/user/api_gettujian.go +++ b/modules/user/api_gettujian.go @@ -3,15 +3,13 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) GetTujianCheck(session comm.IUserSession, req *pb.UserGetTujianReq) (code pb.ErrorCode) { return } -func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.GetTujianCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_info.go b/modules/user/api_info.go index 9c3980e94..1ffebf20c 100644 --- a/modules/user/api_info.go +++ b/modules/user/api_info.go @@ -3,15 +3,13 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UserInfoReq) (code pb.ErrorCode) { return } -func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_initdata.go b/modules/user/api_initdata.go index 988fa444c..d88a4348d 100644 --- a/modules/user/api_initdata.go +++ b/modules/user/api_initdata.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //初始化账号数据 恢复到创角前 @@ -15,7 +13,7 @@ func (this *apiComp) InitdataCheck(session comm.IUserSession, req *pb.UserInitda return } -func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Initdata(session comm.IUserSession, req *pb.UserInitdataReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.InitdataCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_login.go b/modules/user/api_login.go index e6a4ee288..df0ecebd6 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -8,7 +8,6 @@ import ( "go_dreamfactory/utils" "go.mongodb.org/mongo-driver/mongo" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +19,7 @@ func (this *apiComp) LoginCheck(session comm.IUserSession, req *pb.UserLoginReq) } //登录 -func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.LoginCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_logout.go b/modules/user/api_logout.go index b2172c72e..a35a0097e 100644 --- a/modules/user/api_logout.go +++ b/modules/user/api_logout.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) LogoutCheck(session comm.IUserSession, req *pb.UserLoginReq) (code pb.ErrorCode) { @@ -13,7 +11,7 @@ func (this *apiComp) LogoutCheck(session comm.IUserSession, req *pb.UserLoginReq } //注销 -func (this *apiComp) Logout(session comm.IUserSession, rsp *pb.UserLoginReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Logout(session comm.IUserSession, rsp *pb.UserLoginReq) (code pb.ErrorCode, data *pb.ErrorData) { log.Debugf("User - Logout: session:%v rsp:%v", session.ToString(), rsp) return diff --git a/modules/user/api_modifyavatar.go b/modules/user/api_modifyavatar.go index 62aa2aea3..3d097f4fd 100644 --- a/modules/user/api_modifyavatar.go +++ b/modules/user/api_modifyavatar.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 修改主角头像 @@ -16,7 +14,7 @@ func (this *apiComp) ModifyavatarCheck(session comm.IUserSession, req *pb.UserMo return } -func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifyavatarReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifyavatarReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ModifyavatarCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifybgp.go b/modules/user/api_modifybgp.go index b63570df9..726e71c42 100644 --- a/modules/user/api_modifybgp.go +++ b/modules/user/api_modifybgp.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) ModifybgpCheck(session comm.IUserSession, req *pb.UserModifybgpReq) (code pb.ErrorCode) { @@ -14,7 +12,7 @@ func (this *apiComp) ModifybgpCheck(session comm.IUserSession, req *pb.UserModif return } -func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ModifybgpCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifyfigure.go b/modules/user/api_modifyfigure.go index 5b146201e..216d6e51a 100644 --- a/modules/user/api_modifyfigure.go +++ b/modules/user/api_modifyfigure.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) ModifyfigureCheck(session comm.IUserSession, req *pb.UserModifyfigureReq) (code pb.ErrorCode) { @@ -14,7 +12,7 @@ func (this *apiComp) ModifyfigureCheck(session comm.IUserSession, req *pb.UserMo return } -func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyfigureReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyfigureReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ModifyfigureCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go index 3ccf9143c..e11199aed 100644 --- a/modules/user/api_modifyname.go +++ b/modules/user/api_modifyname.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "strings" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) ModifynameCheck(session comm.IUserSession, req *pb.UserModifynameReq) (code pb.ErrorCode) { @@ -15,7 +13,7 @@ func (this *apiComp) ModifynameCheck(session comm.IUserSession, req *pb.UserModi return } -func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynameReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynameReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ModifynameCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_modifysign.go b/modules/user/api_modifysign.go index 17637cc9d..4424402b1 100644 --- a/modules/user/api_modifysign.go +++ b/modules/user/api_modifysign.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 修改签名 @@ -16,7 +14,7 @@ func (this *apiComp) ModifysignCheck(session comm.IUserSession, req *pb.UserModi return } -func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysignReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Modifysign(session comm.IUserSession, req *pb.UserModifysignReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ModifysignCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_puzzleaward.go b/modules/user/api_puzzleaward.go index 1563401cf..f9d4a82bb 100644 --- a/modules/user/api_puzzleaward.go +++ b/modules/user/api_puzzleaward.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) PuzzleAwardCheck(session comm.IUserSession, req *pb.UserPuz } //拼图领奖 -func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAwardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) PuzzleAward(session comm.IUserSession, req *pb.UserPuzzleAwardReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( sign *pb.DBSign err error diff --git a/modules/user/api_settingteam.go b/modules/user/api_settingteam.go index 2768e4937..7691ff20a 100644 --- a/modules/user/api_settingteam.go +++ b/modules/user/api_settingteam.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) SettingteamCheck(session comm.IUserSession, req *pb.UserSettingteamReq) (code pb.ErrorCode) { @@ -14,7 +12,7 @@ func (this *apiComp) SettingteamCheck(session comm.IUserSession, req *pb.UserSet return } -func (this *apiComp) Settingteam(session comm.IUserSession, req *pb.UserSettingteamReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Settingteam(session comm.IUserSession, req *pb.UserSettingteamReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.SettingteamCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_showteam.go b/modules/user/api_showteam.go index 743e9279d..88d20e5cf 100644 --- a/modules/user/api_showteam.go +++ b/modules/user/api_showteam.go @@ -3,15 +3,13 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) ShowteamCheck(session comm.IUserSession, req *pb.UserShowteamReq) (code pb.ErrorCode) { return } -func (this *apiComp) Showteam(session comm.IUserSession, req *pb.UserShowteamReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Showteam(session comm.IUserSession, req *pb.UserShowteamReq) (code pb.ErrorCode, data *pb.ErrorData) { result, err := this.module.modelExpand.GetUserExpand(session.GetUserId()) if err != nil { this.module.Errorf("uid:%v err: %v", session.GetUserId(), err) diff --git a/modules/user/api_sign.go b/modules/user/api_sign.go index 9ab18b6d2..b93e19ab2 100644 --- a/modules/user/api_sign.go +++ b/modules/user/api_sign.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -14,7 +12,7 @@ func (this *apiComp) SignCheck(session comm.IUserSession, req *pb.UserSignReq) ( } //登录 -func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code pb.ErrorCode, data *pb.ErrorData) { if sign, err := this.module.modelSign.GetUserSign(session.GetUserId()); err == nil { session.SendMsg(string(this.module.GetType()), "sign", &pb.UserSignResp{ diff --git a/modules/user/api_updatesetting.go b/modules/user/api_updatesetting.go index 5a68f3cc1..7b4dffe1b 100644 --- a/modules/user/api_updatesetting.go +++ b/modules/user/api_updatesetting.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) UpdatesettingCheck(session comm.IUserSession, req *pb.UserUpdateSettingReq) (code pb.ErrorCode) { @@ -15,7 +13,7 @@ func (this *apiComp) UpdatesettingCheck(session comm.IUserSession, req *pb.UserU return } -func (this *apiComp) Updatesetting(session comm.IUserSession, req *pb.UserUpdateSettingReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Updatesetting(session comm.IUserSession, req *pb.UserUpdateSettingReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.UpdatesettingCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/user/api_vericode.go b/modules/user/api_vericode.go index dd9d5749e..b22b3431b 100644 --- a/modules/user/api_vericode.go +++ b/modules/user/api_vericode.go @@ -3,8 +3,6 @@ package user import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 验证码 @@ -13,7 +11,7 @@ func (this *apiComp) VericodeCheck(session comm.IUserSession, req *pb.UserVeriCo return } -func (this *apiComp) Vericode(session comm.IUserSession, req *pb.UserVeriCodeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Vericode(session comm.IUserSession, req *pb.UserVeriCodeReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.VericodeCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/viking/api_buy.go b/modules/viking/api_buy.go index 6e235b756..209d444d8 100644 --- a/modules/viking/api_buy.go +++ b/modules/viking/api_buy.go @@ -3,8 +3,6 @@ package viking import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.VikingBuyReq) ( } // 协议废弃 走通用字段 -func (this *apiComp) Buy(session comm.IUserSession, req *pb.VikingBuyReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Buy(session comm.IUserSession, req *pb.VikingBuyReq) (code pb.ErrorCode, data *pb.ErrorData) { session.SendMsg(string(this.module.GetType()), VikingBuyResp, &pb.VikingBuyResp{}) return diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 08dc8c518..7674f1ec3 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -3,8 +3,6 @@ package viking import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -17,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingCha } ///挑战主线关卡 -func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.ChallengeCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index d81b9fd8d..34dfd2b75 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "strconv" - - "google.golang.org/protobuf/proto" ) // 参数校验 @@ -19,7 +17,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Vikin } // /挑战完成 -func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( mapData map[string]interface{} reward []*cfg.Gameatn diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index 132e0f1dc..c40c4a422 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -3,8 +3,6 @@ package viking import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) //参数校验 @@ -13,7 +11,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.VikingGetLi return } -func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq) (code pb.ErrorCode, data *pb.ErrorData) { code = this.GetListCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 diff --git a/modules/viking/api_ranklist.go b/modules/viking/api_ranklist.go index b71250fa6..7b3ccee24 100644 --- a/modules/viking/api_ranklist.go +++ b/modules/viking/api_ranklist.go @@ -9,7 +9,6 @@ import ( "strconv" "github.com/go-redis/redis/v8" - "google.golang.org/protobuf/proto" ) //参数校验 @@ -20,7 +19,7 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.VikingRank return } -func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) RankList(session comm.IUserSession, req *pb.VikingRankListReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( szRank []*pb.DBVikingRank rd *redis.StringSliceCmd diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index fc0c191eb..bd70aa6c5 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (code pb.ErrorCode) { @@ -15,7 +13,7 @@ func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAccept return } -func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (code pb.ErrorCode, data proto.Message) { +func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = a.AcceptCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 09d108af9..9bb14f0c3 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -7,8 +7,6 @@ import ( "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 战斗结束的请求 @@ -23,7 +21,7 @@ func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.Worldt return } -func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BattlefinishCheck(session, req); code != pb.ErrorCode_Success { return diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index 7ab890a39..e96e65d6d 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 战斗开始 @@ -20,7 +18,7 @@ func (this *apiComp) BattlestartCheck(session comm.IUserSession, req *pb.Worldta return } -func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBattleStartReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go index 36a3518b8..624454eb8 100644 --- a/modules/worldtask/api_chapterreward.go +++ b/modules/worldtask/api_chapterreward.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) func (this *apiComp) ChapterrewardCheck(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (code pb.ErrorCode) { @@ -15,7 +13,7 @@ func (this *apiComp) ChapterrewardCheck(session comm.IUserSession, req *pb.World return } -func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskChapterrewardReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.ChapterrewardCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 8f5391346..b4ab3fdff 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" ) // 任务完成条件 @@ -17,7 +15,7 @@ func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.World return } -func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.CompleteCondiCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index fbff25c14..6e293d4b7 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -5,8 +5,6 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) // 世界任务完成 @@ -19,7 +17,7 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFin return } -func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishReq) (code pb.ErrorCode, data *pb.ErrorData) { if code = this.FinishCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go index 5e43b2b54..2c5074634 100644 --- a/modules/worldtask/api_mine.go +++ b/modules/worldtask/api_mine.go @@ -4,8 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" ) var ( @@ -18,7 +16,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineR return } -func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() user := this.module.ModuleUser.GetUser(uid) diff --git a/pb/comm.pb.go b/pb/comm.pb.go index bb7e394d0..fd7e113b5 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -77,6 +77,69 @@ func (HeroAttributesType) EnumDescriptor() ([]byte, []int) { return file_comm_proto_rawDescGZIP(), []int{0} } +type ErrorData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title"` + Dataint int32 `protobuf:"varint,2,opt,name=dataint,proto3" json:"dataint"` + Datastring string `protobuf:"bytes,3,opt,name=datastring,proto3" json:"datastring"` +} + +func (x *ErrorData) Reset() { + *x = ErrorData{} + if protoimpl.UnsafeEnabled { + mi := &file_comm_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ErrorData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ErrorData) ProtoMessage() {} + +func (x *ErrorData) ProtoReflect() protoreflect.Message { + mi := &file_comm_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ErrorData.ProtoReflect.Descriptor instead. +func (*ErrorData) Descriptor() ([]byte, []int) { + return file_comm_proto_rawDescGZIP(), []int{0} +} + +func (x *ErrorData) GetTitle() string { + if x != nil { + return x.Title + } + return "" +} + +func (x *ErrorData) GetDataint() int32 { + if x != nil { + return x.Dataint + } + return 0 +} + +func (x *ErrorData) GetDatastring() string { + if x != nil { + return x.Datastring + } + return "" +} + //用户消息流结构1 type UserMessage struct { state protoimpl.MessageState @@ -94,7 +157,7 @@ type UserMessage struct { func (x *UserMessage) Reset() { *x = UserMessage{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[0] + mi := &file_comm_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -107,7 +170,7 @@ func (x *UserMessage) String() string { func (*UserMessage) ProtoMessage() {} func (x *UserMessage) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[0] + mi := &file_comm_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -120,7 +183,7 @@ func (x *UserMessage) ProtoReflect() protoreflect.Message { // Deprecated: Use UserMessage.ProtoReflect.Descriptor instead. func (*UserMessage) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{0} + return file_comm_proto_rawDescGZIP(), []int{1} } func (x *UserMessage) GetMainType() string { @@ -177,7 +240,7 @@ type AgentMessage struct { func (x *AgentMessage) Reset() { *x = AgentMessage{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[1] + mi := &file_comm_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -190,7 +253,7 @@ func (x *AgentMessage) String() string { func (*AgentMessage) ProtoMessage() {} func (x *AgentMessage) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[1] + mi := &file_comm_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -203,7 +266,7 @@ func (x *AgentMessage) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentMessage.ProtoReflect.Descriptor instead. func (*AgentMessage) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{1} + return file_comm_proto_rawDescGZIP(), []int{2} } func (x *AgentMessage) GetIp() string { @@ -270,14 +333,14 @@ type RPCMessageReply struct { Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` ErrorMessage string `protobuf:"bytes,2,opt,name=ErrorMessage,proto3" json:"ErrorMessage"` - ErrorData *anypb.Any `protobuf:"bytes,3,opt,name=ErrorData,proto3" json:"ErrorData"` + ErrorData *ErrorData `protobuf:"bytes,3,opt,name=ErrorData,proto3" json:"ErrorData"` Reply []*UserMessage `protobuf:"bytes,4,rep,name=Reply,proto3" json:"Reply"` } func (x *RPCMessageReply) Reset() { *x = RPCMessageReply{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[2] + mi := &file_comm_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -290,7 +353,7 @@ func (x *RPCMessageReply) String() string { func (*RPCMessageReply) ProtoMessage() {} func (x *RPCMessageReply) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[2] + mi := &file_comm_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -303,7 +366,7 @@ func (x *RPCMessageReply) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCMessageReply.ProtoReflect.Descriptor instead. func (*RPCMessageReply) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{2} + return file_comm_proto_rawDescGZIP(), []int{3} } func (x *RPCMessageReply) GetCode() ErrorCode { @@ -320,7 +383,7 @@ func (x *RPCMessageReply) GetErrorMessage() string { return "" } -func (x *RPCMessageReply) GetErrorData() *anypb.Any { +func (x *RPCMessageReply) GetErrorData() *ErrorData { if x != nil { return x.ErrorData } @@ -348,7 +411,7 @@ type AgentBuildReq struct { func (x *AgentBuildReq) Reset() { *x = AgentBuildReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[3] + mi := &file_comm_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -361,7 +424,7 @@ func (x *AgentBuildReq) String() string { func (*AgentBuildReq) ProtoMessage() {} func (x *AgentBuildReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[3] + mi := &file_comm_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -374,7 +437,7 @@ func (x *AgentBuildReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentBuildReq.ProtoReflect.Descriptor instead. func (*AgentBuildReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{3} + return file_comm_proto_rawDescGZIP(), []int{4} } func (x *AgentBuildReq) GetUserSessionId() string { @@ -410,7 +473,7 @@ type AgentUnBuildReq struct { func (x *AgentUnBuildReq) Reset() { *x = AgentUnBuildReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[4] + mi := &file_comm_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -423,7 +486,7 @@ func (x *AgentUnBuildReq) String() string { func (*AgentUnBuildReq) ProtoMessage() {} func (x *AgentUnBuildReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[4] + mi := &file_comm_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -436,7 +499,7 @@ func (x *AgentUnBuildReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentUnBuildReq.ProtoReflect.Descriptor instead. func (*AgentUnBuildReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{4} + return file_comm_proto_rawDescGZIP(), []int{5} } func (x *AgentUnBuildReq) GetUserSessionId() string { @@ -459,7 +522,7 @@ type AgentSendMessageReq struct { func (x *AgentSendMessageReq) Reset() { *x = AgentSendMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[5] + mi := &file_comm_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -472,7 +535,7 @@ func (x *AgentSendMessageReq) String() string { func (*AgentSendMessageReq) ProtoMessage() {} func (x *AgentSendMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[5] + mi := &file_comm_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -485,7 +548,7 @@ func (x *AgentSendMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentSendMessageReq.ProtoReflect.Descriptor instead. func (*AgentSendMessageReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{5} + return file_comm_proto_rawDescGZIP(), []int{6} } func (x *AgentSendMessageReq) GetUserSessionId() string { @@ -517,7 +580,7 @@ type BatchMessageReq struct { func (x *BatchMessageReq) Reset() { *x = BatchMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[6] + mi := &file_comm_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -530,7 +593,7 @@ func (x *BatchMessageReq) String() string { func (*BatchMessageReq) ProtoMessage() {} func (x *BatchMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[6] + mi := &file_comm_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -543,7 +606,7 @@ func (x *BatchMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BatchMessageReq.ProtoReflect.Descriptor instead. func (*BatchMessageReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{6} + return file_comm_proto_rawDescGZIP(), []int{7} } func (x *BatchMessageReq) GetUserSessionIds() []string { @@ -588,7 +651,7 @@ type BroadCastMessageReq struct { func (x *BroadCastMessageReq) Reset() { *x = BroadCastMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[7] + mi := &file_comm_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -601,7 +664,7 @@ func (x *BroadCastMessageReq) String() string { func (*BroadCastMessageReq) ProtoMessage() {} func (x *BroadCastMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[7] + mi := &file_comm_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -614,7 +677,7 @@ func (x *BroadCastMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BroadCastMessageReq.ProtoReflect.Descriptor instead. func (*BroadCastMessageReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{7} + return file_comm_proto_rawDescGZIP(), []int{8} } func (x *BroadCastMessageReq) GetMainType() string { @@ -650,7 +713,7 @@ type AgentCloseeReq struct { func (x *AgentCloseeReq) Reset() { *x = AgentCloseeReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[8] + mi := &file_comm_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -663,7 +726,7 @@ func (x *AgentCloseeReq) String() string { func (*AgentCloseeReq) ProtoMessage() {} func (x *AgentCloseeReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[8] + mi := &file_comm_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -676,7 +739,7 @@ func (x *AgentCloseeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AgentCloseeReq.ProtoReflect.Descriptor instead. func (*AgentCloseeReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{8} + return file_comm_proto_rawDescGZIP(), []int{9} } func (x *AgentCloseeReq) GetUserSessionId() string { @@ -702,7 +765,7 @@ type NoticeUserLoginReq struct { func (x *NoticeUserLoginReq) Reset() { *x = NoticeUserLoginReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[9] + mi := &file_comm_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -715,7 +778,7 @@ func (x *NoticeUserLoginReq) String() string { func (*NoticeUserLoginReq) ProtoMessage() {} func (x *NoticeUserLoginReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[9] + mi := &file_comm_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -728,7 +791,7 @@ func (x *NoticeUserLoginReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NoticeUserLoginReq.ProtoReflect.Descriptor instead. func (*NoticeUserLoginReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{9} + return file_comm_proto_rawDescGZIP(), []int{10} } func (x *NoticeUserLoginReq) GetIp() string { @@ -782,7 +845,7 @@ type NoticeUserCreateReq struct { func (x *NoticeUserCreateReq) Reset() { *x = NoticeUserCreateReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[10] + mi := &file_comm_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -795,7 +858,7 @@ func (x *NoticeUserCreateReq) String() string { func (*NoticeUserCreateReq) ProtoMessage() {} func (x *NoticeUserCreateReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[10] + mi := &file_comm_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -808,7 +871,7 @@ func (x *NoticeUserCreateReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NoticeUserCreateReq.ProtoReflect.Descriptor instead. func (*NoticeUserCreateReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{10} + return file_comm_proto_rawDescGZIP(), []int{11} } func (x *NoticeUserCreateReq) GetIp() string { @@ -862,7 +925,7 @@ type NoticeUserCloseReq struct { func (x *NoticeUserCloseReq) Reset() { *x = NoticeUserCloseReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[11] + mi := &file_comm_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -875,7 +938,7 @@ func (x *NoticeUserCloseReq) String() string { func (*NoticeUserCloseReq) ProtoMessage() {} func (x *NoticeUserCloseReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[11] + mi := &file_comm_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -888,7 +951,7 @@ func (x *NoticeUserCloseReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NoticeUserCloseReq.ProtoReflect.Descriptor instead. func (*NoticeUserCloseReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{11} + return file_comm_proto_rawDescGZIP(), []int{12} } func (x *NoticeUserCloseReq) GetIp() string { @@ -938,7 +1001,7 @@ type SkillData struct { func (x *SkillData) Reset() { *x = SkillData{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[12] + mi := &file_comm_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -951,7 +1014,7 @@ func (x *SkillData) String() string { func (*SkillData) ProtoMessage() {} func (x *SkillData) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[12] + mi := &file_comm_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -964,7 +1027,7 @@ func (x *SkillData) ProtoReflect() protoreflect.Message { // Deprecated: Use SkillData.ProtoReflect.Descriptor instead. func (*SkillData) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{12} + return file_comm_proto_rawDescGZIP(), []int{13} } func (x *SkillData) GetSkillID() int32 { @@ -995,7 +1058,7 @@ type UserAssets struct { func (x *UserAssets) Reset() { *x = UserAssets{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[13] + mi := &file_comm_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1008,7 +1071,7 @@ func (x *UserAssets) String() string { func (*UserAssets) ProtoMessage() {} func (x *UserAssets) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[13] + mi := &file_comm_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1021,7 +1084,7 @@ func (x *UserAssets) ProtoReflect() protoreflect.Message { // Deprecated: Use UserAssets.ProtoReflect.Descriptor instead. func (*UserAssets) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{13} + return file_comm_proto_rawDescGZIP(), []int{14} } func (x *UserAssets) GetA() string { @@ -1060,7 +1123,7 @@ type UserAtno struct { func (x *UserAtno) Reset() { *x = UserAtno{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[14] + mi := &file_comm_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1073,7 +1136,7 @@ func (x *UserAtno) String() string { func (*UserAtno) ProtoMessage() {} func (x *UserAtno) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[14] + mi := &file_comm_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1086,7 +1149,7 @@ func (x *UserAtno) ProtoReflect() protoreflect.Message { // Deprecated: Use UserAtno.ProtoReflect.Descriptor instead. func (*UserAtno) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{14} + return file_comm_proto_rawDescGZIP(), []int{15} } func (x *UserAtno) GetA() string { @@ -1129,7 +1192,7 @@ type TaskParam struct { func (x *TaskParam) Reset() { *x = TaskParam{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[15] + mi := &file_comm_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1142,7 +1205,7 @@ func (x *TaskParam) String() string { func (*TaskParam) ProtoMessage() {} func (x *TaskParam) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[15] + mi := &file_comm_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1155,7 +1218,7 @@ func (x *TaskParam) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskParam.ProtoReflect.Descriptor instead. func (*TaskParam) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{15} + return file_comm_proto_rawDescGZIP(), []int{16} } func (x *TaskParam) GetFirst() int32 { @@ -1185,7 +1248,7 @@ type RtaskParam struct { func (x *RtaskParam) Reset() { *x = RtaskParam{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[16] + mi := &file_comm_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1198,7 +1261,7 @@ func (x *RtaskParam) String() string { func (*RtaskParam) ProtoMessage() {} func (x *RtaskParam) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[16] + mi := &file_comm_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1211,7 +1274,7 @@ func (x *RtaskParam) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskParam.ProtoReflect.Descriptor instead. func (*RtaskParam) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{16} + return file_comm_proto_rawDescGZIP(), []int{17} } func (x *RtaskParam) GetParam1() int32 { @@ -1246,7 +1309,7 @@ type UIdReq struct { func (x *UIdReq) Reset() { *x = UIdReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[17] + mi := &file_comm_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1259,7 +1322,7 @@ func (x *UIdReq) String() string { func (*UIdReq) ProtoMessage() {} func (x *UIdReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[17] + mi := &file_comm_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1272,7 +1335,7 @@ func (x *UIdReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UIdReq.ProtoReflect.Descriptor instead. func (*UIdReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{17} + return file_comm_proto_rawDescGZIP(), []int{18} } func (x *UIdReq) GetUid() string { @@ -1293,7 +1356,7 @@ type NameReq struct { func (x *NameReq) Reset() { *x = NameReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[18] + mi := &file_comm_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1306,7 +1369,7 @@ func (x *NameReq) String() string { func (*NameReq) ProtoMessage() {} func (x *NameReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[18] + mi := &file_comm_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1319,7 +1382,7 @@ func (x *NameReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NameReq.ProtoReflect.Descriptor instead. func (*NameReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{18} + return file_comm_proto_rawDescGZIP(), []int{19} } func (x *NameReq) GetName() string { @@ -1338,7 +1401,7 @@ type EmptyReq struct { func (x *EmptyReq) Reset() { *x = EmptyReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[19] + mi := &file_comm_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1351,7 +1414,7 @@ func (x *EmptyReq) String() string { func (*EmptyReq) ProtoMessage() {} func (x *EmptyReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[19] + mi := &file_comm_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1364,7 +1427,7 @@ func (x *EmptyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use EmptyReq.ProtoReflect.Descriptor instead. func (*EmptyReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{19} + return file_comm_proto_rawDescGZIP(), []int{20} } type EmptyResp struct { @@ -1376,7 +1439,7 @@ type EmptyResp struct { func (x *EmptyResp) Reset() { *x = EmptyResp{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[20] + mi := &file_comm_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1389,7 +1452,7 @@ func (x *EmptyResp) String() string { func (*EmptyResp) ProtoMessage() {} func (x *EmptyResp) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[20] + mi := &file_comm_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1402,7 +1465,7 @@ func (x *EmptyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use EmptyResp.ProtoReflect.Descriptor instead. func (*EmptyResp) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{20} + return file_comm_proto_rawDescGZIP(), []int{21} } // rpc 通用请求消息 1 @@ -1417,7 +1480,7 @@ type RPCGeneralReqA1 struct { func (x *RPCGeneralReqA1) Reset() { *x = RPCGeneralReqA1{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[21] + mi := &file_comm_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1430,7 +1493,7 @@ func (x *RPCGeneralReqA1) String() string { func (*RPCGeneralReqA1) ProtoMessage() {} func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[21] + mi := &file_comm_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1443,7 +1506,7 @@ func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA1.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA1) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{21} + return file_comm_proto_rawDescGZIP(), []int{22} } func (x *RPCGeneralReqA1) GetParam1() string { @@ -1466,7 +1529,7 @@ type RPCGeneralReqA2 struct { func (x *RPCGeneralReqA2) Reset() { *x = RPCGeneralReqA2{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[22] + mi := &file_comm_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1479,7 +1542,7 @@ func (x *RPCGeneralReqA2) String() string { func (*RPCGeneralReqA2) ProtoMessage() {} func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[22] + mi := &file_comm_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1492,7 +1555,7 @@ func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA2.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA2) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{22} + return file_comm_proto_rawDescGZIP(), []int{23} } func (x *RPCGeneralReqA2) GetParam1() string { @@ -1523,7 +1586,7 @@ type RPCGeneralReqA3 struct { func (x *RPCGeneralReqA3) Reset() { *x = RPCGeneralReqA3{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[23] + mi := &file_comm_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1536,7 +1599,7 @@ func (x *RPCGeneralReqA3) String() string { func (*RPCGeneralReqA3) ProtoMessage() {} func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[23] + mi := &file_comm_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1549,7 +1612,7 @@ func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA3.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA3) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{23} + return file_comm_proto_rawDescGZIP(), []int{24} } func (x *RPCGeneralReqA3) GetParam1() string { @@ -1588,7 +1651,7 @@ type RPCGeneralReqA4 struct { func (x *RPCGeneralReqA4) Reset() { *x = RPCGeneralReqA4{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[24] + mi := &file_comm_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1601,7 +1664,7 @@ func (x *RPCGeneralReqA4) String() string { func (*RPCGeneralReqA4) ProtoMessage() {} func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[24] + mi := &file_comm_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1614,7 +1677,7 @@ func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCGeneralReqA4.ProtoReflect.Descriptor instead. func (*RPCGeneralReqA4) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{24} + return file_comm_proto_rawDescGZIP(), []int{25} } func (x *RPCGeneralReqA4) GetParam1() string { @@ -1659,7 +1722,7 @@ type RPCRTaskReq struct { func (x *RPCRTaskReq) Reset() { *x = RPCRTaskReq{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[25] + mi := &file_comm_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1672,7 +1735,7 @@ func (x *RPCRTaskReq) String() string { func (*RPCRTaskReq) ProtoMessage() {} func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[25] + mi := &file_comm_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1685,7 +1748,7 @@ func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RPCRTaskReq.ProtoReflect.Descriptor instead. func (*RPCRTaskReq) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{25} + return file_comm_proto_rawDescGZIP(), []int{26} } func (x *RPCRTaskReq) GetUid() string { @@ -1733,7 +1796,7 @@ type ServiceDBInfo struct { func (x *ServiceDBInfo) Reset() { *x = ServiceDBInfo{} if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[26] + mi := &file_comm_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1746,7 +1809,7 @@ func (x *ServiceDBInfo) String() string { func (*ServiceDBInfo) ProtoMessage() {} func (x *ServiceDBInfo) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[26] + mi := &file_comm_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1759,7 +1822,7 @@ func (x *ServiceDBInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ServiceDBInfo.ProtoReflect.Descriptor instead. func (*ServiceDBInfo) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{26} + return file_comm_proto_rawDescGZIP(), []int{27} } func (x *ServiceDBInfo) GetServerid() string { @@ -1853,167 +1916,95 @@ func (x *ServiceDBInfo) GetMongodbDatabase() string { return "" } -type ErrorData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Pint int32 `protobuf:"varint,1,opt,name=pint,proto3" json:"pint"` - Pstring string `protobuf:"bytes,2,opt,name=pstring,proto3" json:"pstring"` -} - -func (x *ErrorData) Reset() { - *x = ErrorData{} - if protoimpl.UnsafeEnabled { - mi := &file_comm_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ErrorData) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ErrorData) ProtoMessage() {} - -func (x *ErrorData) ProtoReflect() protoreflect.Message { - mi := &file_comm_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ErrorData.ProtoReflect.Descriptor instead. -func (*ErrorData) Descriptor() ([]byte, []int) { - return file_comm_proto_rawDescGZIP(), []int{27} -} - -func (x *ErrorData) GetPint() int32 { - if x != nil { - return x.Pint - } - return 0 -} - -func (x *ErrorData) GetPstring() string { - if x != nil { - return x.Pstring - } - return "" -} - var File_comm_proto protoreflect.FileDescriptor var file_comm_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, - 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa1, 0x01, 0x0a, 0x0b, 0x55, 0x73, 0x65, - 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, - 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, - 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, - 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x8e, 0x02, 0x0a, - 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, - 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, - 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, - 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, - 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xad, 0x01, - 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, - 0x79, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, - 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x32, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, - 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, - 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, - 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, - 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, - 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, - 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, - 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, - 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, - 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, - 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, - 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, + 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, + 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, + 0x61, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x61, + 0x74, 0x61, 0x69, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x73, + 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xa1, 0x01, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, - 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, - 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, - 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, - 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, - 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, - 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, - 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, - 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, - 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, - 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, - 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, - 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, - 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, + 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x28, 0x0a, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x8e, 0x02, 0x0a, 0x0c, 0x41, 0x67, + 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, + 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0xa3, 0x01, 0x0a, 0x0f, 0x52, + 0x50, 0x43, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1e, + 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x22, + 0x0a, 0x0c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, + 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, + 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, + 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, + 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, + 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, + 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, + 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, + 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, + 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, + 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, + 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, + 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, + 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, + 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, + 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, @@ -2023,93 +2014,111 @@ var file_comm_proto_rawDesc = []byte{ 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, - 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, - 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, - 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, - 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, - 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, - 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, - 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, - 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, - 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, - 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, - 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, - 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, - 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, - 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, - 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, - 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, - 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, - 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, - 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, + 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, + 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, + 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, + 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, + 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, + 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, + 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, + 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, + 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, + 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, + 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, + 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, + 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, + 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, + 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, + 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, + 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, + 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, - 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, - 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, - 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, - 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, - 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, - 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, - 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, - 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, - 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, - 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, - 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, - 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, - 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, - 0x0a, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, - 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, - 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, - 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, - 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, - 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x22, 0x39, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, - 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x70, 0x69, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x73, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, - 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, - 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, - 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, + 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, + 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, + 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, + 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x34, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, + 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, + 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, + 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, + 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, + 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, + 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, + 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, + 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, + 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, + 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, + 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, + 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, + 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, + 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2128,34 +2137,34 @@ var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 28) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType - (*UserMessage)(nil), // 1: UserMessage - (*AgentMessage)(nil), // 2: AgentMessage - (*RPCMessageReply)(nil), // 3: RPCMessageReply - (*AgentBuildReq)(nil), // 4: AgentBuildReq - (*AgentUnBuildReq)(nil), // 5: AgentUnBuildReq - (*AgentSendMessageReq)(nil), // 6: AgentSendMessageReq - (*BatchMessageReq)(nil), // 7: BatchMessageReq - (*BroadCastMessageReq)(nil), // 8: BroadCastMessageReq - (*AgentCloseeReq)(nil), // 9: AgentCloseeReq - (*NoticeUserLoginReq)(nil), // 10: NoticeUserLoginReq - (*NoticeUserCreateReq)(nil), // 11: NoticeUserCreateReq - (*NoticeUserCloseReq)(nil), // 12: NoticeUserCloseReq - (*SkillData)(nil), // 13: SkillData - (*UserAssets)(nil), // 14: UserAssets - (*UserAtno)(nil), // 15: UserAtno - (*TaskParam)(nil), // 16: TaskParam - (*RtaskParam)(nil), // 17: RtaskParam - (*UIdReq)(nil), // 18: UIdReq - (*NameReq)(nil), // 19: NameReq - (*EmptyReq)(nil), // 20: EmptyReq - (*EmptyResp)(nil), // 21: EmptyResp - (*RPCGeneralReqA1)(nil), // 22: RPCGeneralReqA1 - (*RPCGeneralReqA2)(nil), // 23: RPCGeneralReqA2 - (*RPCGeneralReqA3)(nil), // 24: RPCGeneralReqA3 - (*RPCGeneralReqA4)(nil), // 25: RPCGeneralReqA4 - (*RPCRTaskReq)(nil), // 26: RPCRTaskReq - (*ServiceDBInfo)(nil), // 27: ServiceDBInfo - (*ErrorData)(nil), // 28: ErrorData + (*ErrorData)(nil), // 1: ErrorData + (*UserMessage)(nil), // 2: UserMessage + (*AgentMessage)(nil), // 3: AgentMessage + (*RPCMessageReply)(nil), // 4: RPCMessageReply + (*AgentBuildReq)(nil), // 5: AgentBuildReq + (*AgentUnBuildReq)(nil), // 6: AgentUnBuildReq + (*AgentSendMessageReq)(nil), // 7: AgentSendMessageReq + (*BatchMessageReq)(nil), // 8: BatchMessageReq + (*BroadCastMessageReq)(nil), // 9: BroadCastMessageReq + (*AgentCloseeReq)(nil), // 10: AgentCloseeReq + (*NoticeUserLoginReq)(nil), // 11: NoticeUserLoginReq + (*NoticeUserCreateReq)(nil), // 12: NoticeUserCreateReq + (*NoticeUserCloseReq)(nil), // 13: NoticeUserCloseReq + (*SkillData)(nil), // 14: SkillData + (*UserAssets)(nil), // 15: UserAssets + (*UserAtno)(nil), // 16: UserAtno + (*TaskParam)(nil), // 17: TaskParam + (*RtaskParam)(nil), // 18: RtaskParam + (*UIdReq)(nil), // 19: UIdReq + (*NameReq)(nil), // 20: NameReq + (*EmptyReq)(nil), // 21: EmptyReq + (*EmptyResp)(nil), // 22: EmptyResp + (*RPCGeneralReqA1)(nil), // 23: RPCGeneralReqA1 + (*RPCGeneralReqA2)(nil), // 24: RPCGeneralReqA2 + (*RPCGeneralReqA3)(nil), // 25: RPCGeneralReqA3 + (*RPCGeneralReqA4)(nil), // 26: RPCGeneralReqA4 + (*RPCRTaskReq)(nil), // 27: RPCRTaskReq + (*ServiceDBInfo)(nil), // 28: ServiceDBInfo (*anypb.Any)(nil), // 29: google.protobuf.Any (ErrorCode)(0), // 30: ErrorCode } @@ -2163,9 +2172,9 @@ var file_comm_proto_depIdxs = []int32{ 29, // 0: UserMessage.data:type_name -> google.protobuf.Any 29, // 1: AgentMessage.Message:type_name -> google.protobuf.Any 30, // 2: RPCMessageReply.Code:type_name -> ErrorCode - 29, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any - 1, // 4: RPCMessageReply.Reply:type_name -> UserMessage - 1, // 5: AgentSendMessageReq.Reply:type_name -> UserMessage + 1, // 3: RPCMessageReply.ErrorData:type_name -> ErrorData + 2, // 4: RPCMessageReply.Reply:type_name -> UserMessage + 2, // 5: AgentSendMessageReq.Reply:type_name -> UserMessage 29, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any 29, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any 8, // [8:8] is the sub-list for method output_type @@ -2183,7 +2192,7 @@ func file_comm_proto_init() { file_errorcode_proto_init() if !protoimpl.UnsafeEnabled { file_comm_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserMessage); i { + switch v := v.(*ErrorData); i { case 0: return &v.state case 1: @@ -2195,7 +2204,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentMessage); i { + switch v := v.(*UserMessage); i { case 0: return &v.state case 1: @@ -2207,7 +2216,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCMessageReply); i { + switch v := v.(*AgentMessage); i { case 0: return &v.state case 1: @@ -2219,7 +2228,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentBuildReq); i { + switch v := v.(*RPCMessageReply); i { case 0: return &v.state case 1: @@ -2231,7 +2240,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentUnBuildReq); i { + switch v := v.(*AgentBuildReq); i { case 0: return &v.state case 1: @@ -2243,7 +2252,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentSendMessageReq); i { + switch v := v.(*AgentUnBuildReq); i { case 0: return &v.state case 1: @@ -2255,7 +2264,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BatchMessageReq); i { + switch v := v.(*AgentSendMessageReq); i { case 0: return &v.state case 1: @@ -2267,7 +2276,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BroadCastMessageReq); i { + switch v := v.(*BatchMessageReq); i { case 0: return &v.state case 1: @@ -2279,7 +2288,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AgentCloseeReq); i { + switch v := v.(*BroadCastMessageReq); i { case 0: return &v.state case 1: @@ -2291,7 +2300,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NoticeUserLoginReq); i { + switch v := v.(*AgentCloseeReq); i { case 0: return &v.state case 1: @@ -2303,7 +2312,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NoticeUserCreateReq); i { + switch v := v.(*NoticeUserLoginReq); i { case 0: return &v.state case 1: @@ -2315,7 +2324,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NoticeUserCloseReq); i { + switch v := v.(*NoticeUserCreateReq); i { case 0: return &v.state case 1: @@ -2327,7 +2336,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SkillData); i { + switch v := v.(*NoticeUserCloseReq); i { case 0: return &v.state case 1: @@ -2339,7 +2348,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserAssets); i { + switch v := v.(*SkillData); i { case 0: return &v.state case 1: @@ -2351,7 +2360,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserAtno); i { + switch v := v.(*UserAssets); i { case 0: return &v.state case 1: @@ -2363,7 +2372,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TaskParam); i { + switch v := v.(*UserAtno); i { case 0: return &v.state case 1: @@ -2375,7 +2384,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskParam); i { + switch v := v.(*TaskParam); i { case 0: return &v.state case 1: @@ -2387,7 +2396,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UIdReq); i { + switch v := v.(*RtaskParam); i { case 0: return &v.state case 1: @@ -2399,7 +2408,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NameReq); i { + switch v := v.(*UIdReq); i { case 0: return &v.state case 1: @@ -2411,7 +2420,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmptyReq); i { + switch v := v.(*NameReq); i { case 0: return &v.state case 1: @@ -2423,7 +2432,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EmptyResp); i { + switch v := v.(*EmptyReq); i { case 0: return &v.state case 1: @@ -2435,7 +2444,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA1); i { + switch v := v.(*EmptyResp); i { case 0: return &v.state case 1: @@ -2447,7 +2456,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA2); i { + switch v := v.(*RPCGeneralReqA1); i { case 0: return &v.state case 1: @@ -2459,7 +2468,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA3); i { + switch v := v.(*RPCGeneralReqA2); i { case 0: return &v.state case 1: @@ -2471,7 +2480,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCGeneralReqA4); i { + switch v := v.(*RPCGeneralReqA3); i { case 0: return &v.state case 1: @@ -2483,7 +2492,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPCRTaskReq); i { + switch v := v.(*RPCGeneralReqA4); i { case 0: return &v.state case 1: @@ -2495,7 +2504,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceDBInfo); i { + switch v := v.(*RPCRTaskReq); i { case 0: return &v.state case 1: @@ -2507,7 +2516,7 @@ func file_comm_proto_init() { } } file_comm_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ErrorData); i { + switch v := v.(*ServiceDBInfo); i { case 0: return &v.state case 1: diff --git a/pb/notify_msg.pb.go b/pb/notify_msg.pb.go index ce6de2279..2254865ac 100644 --- a/pb/notify_msg.pb.go +++ b/pb/notify_msg.pb.go @@ -30,10 +30,9 @@ type NotifyErrorNotifyPush struct { ReqMainType string `protobuf:"bytes,1,opt,name=ReqMainType,proto3" json:"ReqMainType"` // 请求协议模块 模块名 例如:user 对应项目中 user的模块 ReqSubType string `protobuf:"bytes,2,opt,name=ReqSubType,proto3" json:"ReqSubType"` // 请求协议函数 例如:login 对应项目中 user的模块中 // api_login 的处理函数 - Code ErrorCode `protobuf:"varint,3,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` // 执行返回错误码 对应 errorcode.proto 枚举 - Message string `protobuf:"bytes,4,opt,name=Message,proto3" json:"Message"` // 错误消息 - Arg *anypb.Any `protobuf:"bytes,5,opt,name=arg,proto3" json:"arg"` //参数信息 - Data *anypb.Any `protobuf:"bytes,6,opt,name=Data,proto3" json:"Data"` // 错误数据 + Code ErrorCode `protobuf:"varint,3,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` // 执行返回错误码 对应 errorcode.proto 枚举 + Arg *anypb.Any `protobuf:"bytes,4,opt,name=arg,proto3" json:"arg"` //参数信息 + Err *ErrorData `protobuf:"bytes,5,opt,name=err,proto3" json:"err"` //错误数据 } func (x *NotifyErrorNotifyPush) Reset() { @@ -89,13 +88,6 @@ func (x *NotifyErrorNotifyPush) GetCode() ErrorCode { return ErrorCode_Success } -func (x *NotifyErrorNotifyPush) GetMessage() string { - if x != nil { - return x.Message - } - return "" -} - func (x *NotifyErrorNotifyPush) GetArg() *anypb.Any { if x != nil { return x.Arg @@ -103,9 +95,9 @@ func (x *NotifyErrorNotifyPush) GetArg() *anypb.Any { return nil } -func (x *NotifyErrorNotifyPush) GetData() *anypb.Any { +func (x *NotifyErrorNotifyPush) GetErr() *ErrorData { if x != nil { - return x.Data + return x.Err } return nil } @@ -209,35 +201,33 @@ var File_notify_notify_msg_proto protoreflect.FileDescriptor var file_notify_notify_msg_proto_rawDesc = []byte{ 0x0a, 0x17, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x5f, - 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, - 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6e, 0x6f, 0x74, 0x69, - 0x66, 0x79, 0x2f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe5, 0x01, - 0x0a, 0x15, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x71, 0x4d, 0x61, - 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, - 0x71, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x65, 0x71, - 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, - 0x65, 0x71, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, - 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x12, 0x26, 0x0a, 0x03, 0x61, 0x72, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x03, 0x61, 0x72, 0x67, 0x12, 0x28, 0x0a, 0x04, 0x44, - 0x61, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, - 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x47, - 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x66, 0x0a, 0x11, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, - 0x0a, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, - 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x09, 0x53, 0x79, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x52, 0x09, 0x53, 0x79, 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, - 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6e, + 0x6f, 0x74, 0x69, 0x66, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, + 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbf, 0x01, 0x0a, 0x15, 0x4e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x71, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, 0x71, 0x4d, 0x61, 0x69, + 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x65, 0x71, 0x53, 0x75, 0x62, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, 0x65, 0x71, 0x53, 0x75, + 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, + 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x26, 0x0a, 0x03, 0x61, 0x72, 0x67, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x03, 0x61, 0x72, 0x67, 0x12, 0x1c, 0x0a, + 0x03, 0x65, 0x72, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x65, 0x72, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x4e, + 0x6f, 0x74, 0x69, 0x66, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, + 0x66, 0x0a, 0x11, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x61, 0x64, + 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x4c, 0x61, 0x73, 0x74, + 0x52, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x09, 0x53, 0x79, 0x73, 0x4e, + 0x6f, 0x74, 0x69, 0x66, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, + 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x52, 0x09, 0x53, 0x79, + 0x73, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -259,13 +249,14 @@ var file_notify_notify_msg_proto_goTypes = []interface{}{ (*NotifyGetListResp)(nil), // 2: NotifyGetListResp (ErrorCode)(0), // 3: ErrorCode (*anypb.Any)(nil), // 4: google.protobuf.Any - (*DBSystemNotify)(nil), // 5: DBSystemNotify + (*ErrorData)(nil), // 5: ErrorData + (*DBSystemNotify)(nil), // 6: DBSystemNotify } var file_notify_notify_msg_proto_depIdxs = []int32{ 3, // 0: NotifyErrorNotifyPush.Code:type_name -> ErrorCode 4, // 1: NotifyErrorNotifyPush.arg:type_name -> google.protobuf.Any - 4, // 2: NotifyErrorNotifyPush.Data:type_name -> google.protobuf.Any - 5, // 3: NotifyGetListResp.SysNotify:type_name -> DBSystemNotify + 5, // 2: NotifyErrorNotifyPush.err:type_name -> ErrorData + 6, // 3: NotifyGetListResp.SysNotify:type_name -> DBSystemNotify 4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -278,6 +269,7 @@ func file_notify_notify_msg_proto_init() { if File_notify_notify_msg_proto != nil { return } + file_comm_proto_init() file_errorcode_proto_init() file_notify_notify_db_proto_init() if !protoimpl.UnsafeEnabled { diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index f679ec100..c6c773e13 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -19,7 +19,6 @@ import ( "go_dreamfactory/lego/utils/mapstructure" "google.golang.org/protobuf/proto" - "google.golang.org/protobuf/types/known/anypb" ) // 用户协议处理函数注册的反射对象 @@ -160,8 +159,8 @@ func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessag reply.Code = errcode reply.ErrorMessage = pb.GetErrorCodeMsg(errcode) if errdata != nil { - data, _ := anypb.New(errdata.(proto.Message)) - reply.ErrorData = data + //data, _ := anypb.New(errdata.(proto.Message)) + reply.ErrorData = errdata.(*pb.ErrorData) } // log.Errorf("[Handle Api] t:%v m:%s req:%v reply:%v", time.Since(stime), method, msg, reply) log.Error("[Handle Api]",