diff --git a/modules/sociaty/api_cross_Formation.go b/modules/sociaty/api_cross_Formation.go index d7fe79532..5b6d4277a 100644 --- a/modules/sociaty/api_cross_Formation.go +++ b/modules/sociaty/api_cross_Formation.go @@ -15,7 +15,7 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormat if code = this.FormationCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() user := this.module.ModuleUser.GetUser(uid) if user == nil { @@ -29,6 +29,7 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormat ggd := this.module.ModuleTools.GetGlobalConf() if ggd == nil { code = pb.ErrorCode_ConfigNoFound + data.Title = code.ToString() return } @@ -36,6 +37,7 @@ func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormat if _, ok := req.Teams[2]; ok { if user.Lv < ggd.GuildBossTroop2 { code = pb.ErrorCode_SociatyTeamUnlock + data.Title = code.ToString() return } } diff --git a/modules/sociaty/api_cross_agree.go b/modules/sociaty/api_cross_agree.go index 71583e5ea..521be91fa 100644 --- a/modules/sociaty/api_cross_agree.go +++ b/modules/sociaty/api_cross_agree.go @@ -26,7 +26,9 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound - this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) + data.Title = code.ToString() + data.Datastring = uid + data.Message = SociatyNoFound return } @@ -36,6 +38,8 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) ( pb.SociatyJob_VICEPRESIDENT, pb.SociatyJob_ADMIN) { code = pb.ErrorCode_SociatyNoRight + data.Title = code.ToString() + data.Message = SociatyNoRight return } diff --git a/modules/sociaty/api_cross_apply.go b/modules/sociaty/api_cross_apply.go index 1f56cf992..2bacafb0f 100644 --- a/modules/sociaty/api_cross_apply.go +++ b/modules/sociaty/api_cross_apply.go @@ -2,6 +2,7 @@ package sociaty import ( "errors" + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" @@ -23,11 +24,14 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) ( return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound + data.Title = code.ToString() + data.Datastring = req.SociatyId this.module.Error("公会未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: req.SociatyId}) return } @@ -37,17 +41,21 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) ( if err != nil { this.module.Error("GetRemoteUserExpand", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) code = pb.ErrorCode_UserSessionNobeing + data.Title = code.ToString() return } if utils.IsInCDHour(userEx.SociatyCd) { code = pb.ErrorCode_SociatyCDLimit + data.Title = code.ToString() + data.Message = fmt.Sprintf("CD内") return } // 是否公会成员 if this.module.modelSociaty.isMember(uid, sociaty) { code = pb.ErrorCode_SociatyBelongTo + data.Title = code.ToString() return } diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go index 38a3b74ea..5550e8371 100644 --- a/modules/sociaty/api_cross_applycancel.go +++ b/modules/sociaty/api_cross_applycancel.go @@ -20,11 +20,13 @@ func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApply if code = this.ApplyCancelCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) if sociaty != nil && sociaty.Id == "" { code = pb.ErrorCode_SociatyNoFound + data.Title = code.ToString() this.module.Error("公会未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: req.SociatyId}) return } diff --git a/modules/sociaty/api_cross_applylist.go b/modules/sociaty/api_cross_applylist.go index 0f7014f1f..15e5576b7 100644 --- a/modules/sociaty/api_cross_applylist.go +++ b/modules/sociaty/api_cross_applylist.go @@ -20,6 +20,7 @@ func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.SociatyApplyLi if code = this.ApplyListCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) if sociaty == nil { diff --git a/modules/sociaty/api_cross_assign.go b/modules/sociaty/api_cross_assign.go index 72d3df984..c42230f10 100644 --- a/modules/sociaty/api_cross_assign.go +++ b/modules/sociaty/api_cross_assign.go @@ -20,7 +20,7 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) if code = this.AssignCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() if uid == req.TargetId { code = pb.ErrorCode_ReqParameterError diff --git a/modules/sociaty/api_cross_bossmain.go b/modules/sociaty/api_cross_bossmain.go index ce3dcc59e..e408119af 100644 --- a/modules/sociaty/api_cross_bossmain.go +++ b/modules/sociaty/api_cross_bossmain.go @@ -15,7 +15,7 @@ func (this *apiComp) BossmainCheck(session comm.IUserSession, req *pb.SociatyBMa func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() - + data = &pb.ErrorData{} ggd := this.module.ModuleTools.GetGlobalConf() if ggd == nil { code = pb.ErrorCode_ConfigNoFound @@ -51,6 +51,7 @@ func (this *apiComp) Bossmain(session comm.IUserSession, req *pb.SociatyBMainReq sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound + data.Title = code.ToString() this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) return } diff --git a/modules/sociaty/api_cross_bossrank.go b/modules/sociaty/api_cross_bossrank.go index f3d8bad0a..538895a70 100644 --- a/modules/sociaty/api_cross_bossrank.go +++ b/modules/sociaty/api_cross_bossrank.go @@ -19,10 +19,12 @@ func (this *apiComp) Brank(session comm.IUserSession, req *pb.SociatyBRankReq) ( if code = this.BrankCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound + data.Title = code.ToString() this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) return } diff --git a/modules/sociaty/api_cross_breceive.go b/modules/sociaty/api_cross_breceive.go index 109b23eb8..27fc5122c 100644 --- a/modules/sociaty/api_cross_breceive.go +++ b/modules/sociaty/api_cross_breceive.go @@ -19,10 +19,12 @@ func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceive if code = this.BreceiveCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound + data.Title = code.ToString() this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) return } diff --git a/modules/sociaty/api_cross_buy.go b/modules/sociaty/api_cross_buy.go index ea0139f1f..117d042e9 100644 --- a/modules/sociaty/api_cross_buy.go +++ b/modules/sociaty/api_cross_buy.go @@ -18,7 +18,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} ggd := this.module.ModuleTools.GetGlobalConf() if ggd == nil { code = pb.ErrorCode_ConfigNoFound @@ -28,6 +28,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound + data.Title = code.ToString() this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) return } @@ -57,6 +58,8 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code ex, err := iuser.GetUserExpand(uid) if err != nil { code = pb.ErrorCode_UserSessionNobeing + data.Title = code.ToString() + data.Message = err.Error() return } @@ -74,6 +77,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.SociatyBuyReq) (code //扣除资源 if code = this.module.DispenseRes(session, atn, true); code != pb.ErrorCode_Success { + data.Title =code.ToString() return } diff --git a/modules/sociaty/api_cross_challengefinish.go b/modules/sociaty/api_cross_challengefinish.go index 66c9c0a07..06d22d599 100644 --- a/modules/sociaty/api_cross_challengefinish.go +++ b/modules/sociaty/api_cross_challengefinish.go @@ -15,6 +15,7 @@ func (this *apiComp) Challengefinish(session comm.IUserSession, req *pb.SociatyB if code = this.ChallengefinishCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_challengestart.go b/modules/sociaty/api_cross_challengestart.go index ce01977fb..1ede70fea 100644 --- a/modules/sociaty/api_cross_challengestart.go +++ b/modules/sociaty/api_cross_challengestart.go @@ -16,7 +16,7 @@ func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBC if code = this.ChallengestartCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { @@ -32,6 +32,8 @@ func (this *apiComp) Challengestart(session comm.IUserSession, req *pb.SociatyBC log.Field{Key: "err", Value: err.Error()}, ) code = pb.ErrorCode_UserSessionNobeing + data.Title = code.ToString() + data.Message = err.Error() return } if userEx.SociatyTicket <= 0 { diff --git a/modules/sociaty/api_cross_create.go b/modules/sociaty/api_cross_create.go index 1ff0dfc0a..1bbe40ec3 100644 --- a/modules/sociaty/api_cross_create.go +++ b/modules/sociaty/api_cross_create.go @@ -26,7 +26,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) if code = this.CreateCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() user := this.module.ModuleUser.GetUser(uid) if user == nil { @@ -38,12 +38,14 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq) userExpand, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { code = pb.ErrorCode_DBError + data.Title = code.ToString() return } // CD校验 if utils.IsInCDHour(userExpand.SociatyCd) { code = pb.ErrorCode_SociatyCDLimit + data.Title = code.ToString() return } diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 5fcf8405b..12c3a9a2d 100644 --- a/modules/sociaty/api_cross_discharge.go +++ b/modules/sociaty/api_cross_discharge.go @@ -21,6 +21,7 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar if code = this.DischargeCheck(session, req); code != pb.ErrorCode_Success { return } + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { @@ -45,6 +46,8 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar } else { code = pb.ErrorCode_DBError } + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("踢出公会", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go index 3b2a8e3ba..99a33e283 100644 --- a/modules/sociaty/api_cross_dismiss.go +++ b/modules/sociaty/api_cross_dismiss.go @@ -21,6 +21,8 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe if code = this.DismissCheck(session, req); code != pb.ErrorCode_Success { return } + + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_list.go b/modules/sociaty/api_cross_list.go index 30dcb58d8..e3467720a 100644 --- a/modules/sociaty/api_cross_list.go +++ b/modules/sociaty/api_cross_list.go @@ -16,9 +16,6 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.SociatyListReq } 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 - } if code = this.ListCheck(session, req); code != pb.ErrorCode_Success { return } diff --git a/modules/sociaty/api_cross_mine.go b/modules/sociaty/api_cross_mine.go index 0ad347d2b..f1c05bcfb 100644 --- a/modules/sociaty/api_cross_mine.go +++ b/modules/sociaty/api_cross_mine.go @@ -14,7 +14,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.SociatyMineReq } func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (code pb.ErrorCode, data *pb.ErrorData) { - + data = &pb.ErrorData{} uid := session.GetUserId() userEx, err := this.module.ModuleUser.GetUserExpand(uid) if err != nil { @@ -45,6 +45,7 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (co //判断公会是否解散（公会解散非立即执行） if this.module.modelSociaty.isDismiss(sociaty) { code = pb.ErrorCode_SociatyDismissed + data.Title = code.ToString() return } @@ -78,6 +79,8 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (co master = this.module.modelSociaty.getMasterInfo(sociaty) } else { code = pb.ErrorCode_DBError + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("会长弹劾", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_quit.go b/modules/sociaty/api_cross_quit.go index 50fac352b..02593cfc3 100644 --- a/modules/sociaty/api_cross_quit.go +++ b/modules/sociaty/api_cross_quit.go @@ -14,6 +14,7 @@ func (this *apiComp) QuitCheck(session comm.IUserSession, req *pb.SociatyQuitReq } func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (code pb.ErrorCode, data *pb.ErrorData) { + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { @@ -44,6 +45,8 @@ func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (co if err := this.module.ModuleUser.ChangeUserExpand(uid, update); err != nil { code = pb.ErrorCode_DBError + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("退出公会,更新玩家公会ID", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_refuse.go b/modules/sociaty/api_cross_refuse.go index e16a2df87..84f2ece25 100644 --- a/modules/sociaty/api_cross_refuse.go +++ b/modules/sociaty/api_cross_refuse.go @@ -20,6 +20,8 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success { return } + + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { @@ -40,12 +42,15 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.SociatyRefuseReq) // 已是公会成员 if this.module.modelSociaty.isMember(uid, sociaty) { code = pb.ErrorCode_SociatyAdded + data.Title = code.ToString() return } // 拒绝公会申请 if err := this.module.modelSociaty.refuse(req.Uid, sociaty); err != nil { code = pb.ErrorCode_SociatyRefuse + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("申请拒绝", log.Field{Key: "uid", Value: uid}, log.Field{Key: "拒绝目标人", Value: req.Uid}, diff --git a/modules/sociaty/api_cross_search.go b/modules/sociaty/api_cross_search.go index 8724e51d9..f89fa39e5 100644 --- a/modules/sociaty/api_cross_search.go +++ b/modules/sociaty/api_cross_search.go @@ -19,7 +19,7 @@ func (this *apiComp) Search(session comm.IUserSession, req *pb.SociatySearchReq) if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} rsp := &pb.SociatySearchResp{} sociaty := this.module.modelSociaty.findByName(req.Name) if sociaty != nil && sociaty.Id != "" { diff --git a/modules/sociaty/api_cross_setting.go b/modules/sociaty/api_cross_setting.go index d9a8155b4..6787a5c67 100644 --- a/modules/sociaty/api_cross_setting.go +++ b/modules/sociaty/api_cross_setting.go @@ -20,7 +20,7 @@ func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingRe if code = this.SettingCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { @@ -44,6 +44,8 @@ func (this *apiComp) Setting(session comm.IUserSession, req *pb.SociatySettingRe // 更新设置 if err := this.module.modelSociaty.setting(sociaty); err != nil { code = pb.ErrorCode_SociatySetting + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("公会修改", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, diff --git a/modules/sociaty/api_cross_settingjob.go b/modules/sociaty/api_cross_settingjob.go index 7d9591dab..4c6b28135 100644 --- a/modules/sociaty/api_cross_settingjob.go +++ b/modules/sociaty/api_cross_settingjob.go @@ -19,7 +19,7 @@ func (this *apiComp) SettingJob(session comm.IUserSession, req *pb.SociatySettin if code = this.SettingJobCheck(session, req); code != pb.ErrorCode_Success { return } - + data = &pb.ErrorData{} uid := session.GetUserId() sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { diff --git a/modules/sociaty/api_cross_sign.go b/modules/sociaty/api_cross_sign.go index 6971771e7..e660e1915 100644 --- a/modules/sociaty/api_cross_sign.go +++ b/modules/sociaty/api_cross_sign.go @@ -16,7 +16,7 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (co return } uid := session.GetUserId() - + data = &pb.ErrorData{} sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound @@ -39,6 +39,8 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (co // 签到 if err := this.module.modelSociaty.sign(uid, sociaty); err != nil { code = pb.ErrorCode_SociatySign + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("签到失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, log.Field{Key: "err", Value: err.Error()}) return } diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go index c3d8d9a1a..3f564a3a7 100644 --- a/modules/sociaty/api_cross_tasklist.go +++ b/modules/sociaty/api_cross_tasklist.go @@ -14,6 +14,7 @@ func (this *apiComp) TaskListCheck(session comm.IUserSession, req *pb.SociatyTas func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskListReq) (code pb.ErrorCode, data *pb.ErrorData) { uid := session.GetUserId() + data = &pb.ErrorData{} sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound @@ -41,6 +42,9 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList rsp.List = taskList if err := this.module.modelSociatyTask.updateTaskList(sociaty.Id, uid, taskList); err != nil { + code = pb.ErrorCode_DBError + data.Title = code.ToString() + data.Message = err.Error() this.module.Error("更新公会任务列表失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id},