From 4e1e05dc792a2bca1d1720b5474df04650b9078a Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 4 Jul 2022 14:18:31 +0800
Subject: [PATCH] =?UTF-8?q?check=20=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_awaken.go          | 15 ++++++++++-----
 modules/hero/api_resonance.go       |  4 ++++
 modules/hero/api_resonanceReset.go  | 15 ++++++++++-----
 modules/hero/api_resonanceSelect.go |  1 +
 modules/hero/api_skillUp.go         | 15 ++++++++++-----
 modules/hero/api_starUp.go          |  4 ++++
 modules/hero/api_strengthen.go      | 17 +++++++++++------
 modules/hero/model_hero.go          |  1 +
 modules/mail/api_delmail.go         |  9 +++++++--
 modules/mail/api_getAttachment.go   | 10 +++++++---
 modules/mail/api_getmail.go         |  6 +++---
 modules/mail/api_readmail.go        | 11 +++++++----
 12 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 31ad3f7f3..614bf4582 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -35,6 +35,15 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 		code = pb.ErrorCode_HeroNoExist
 		return
 	}
+	defer func() {
+		if code == pb.ErrorCode_Success {
+			session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroAwakenResp{Hero: _hero})
+		}
+	}()
+	code = this.AwakenCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	AwakenConfig, err1 := this.module.configure.GetHeroAwakenConfig()
 	if err1 != nil {
 		code = pb.ErrorCode_ConfigNoFound
@@ -78,11 +87,6 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 		code = pb.ErrorCode_HeroNoExist
 		return
 	}
-	defer func() {
-		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroAwakenResp{Hero: _hero})
-		}
-	}()
 
 	for _, v := range awakenData.Phaseneed {
 		if v.A == "attr" { // 消耗玩家身上资源
@@ -140,5 +144,6 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 	if err1 != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
+
 	return
 }
diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go
index bd9fc68ef..f47e3cdca 100644
--- a/modules/hero/api_resonance.go
+++ b/modules/hero/api_resonance.go
@@ -31,6 +31,10 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 			session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero})
 		}
 	}()
+	code = this.ResonanceCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	_costHero, code := this.module.GetHero(session.GetUserId(), req.CostObjID) // 查询消耗卡是否存在
 	if code != pb.ErrorCode_Success {
 		code = pb.ErrorCode_HeroNoEnough
diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go
index 3ab7f82fe..81d161cb9 100644
--- a/modules/hero/api_resonanceReset.go
+++ b/modules/hero/api_resonanceReset.go
@@ -22,6 +22,15 @@ func (this *apiComp) ResonanceResetCheck(session comm.IUserSession, req *pb.Hero
 func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroResonanceResetReq) (code pb.ErrorCode, data proto.Message) {
 
 	_hero, code := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在
+	defer func() {
+		if code == pb.ErrorCode_Success {
+			session.SendMsg(string(this.module.GetType()), ResonanceReset, &pb.HeroResonanceResetResp{Hero: _hero, Energy: _hero.ResonateNum})
+		}
+	}()
+	code = this.ResonanceResetCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	if code != pb.ErrorCode_Success {
 		return
 	}
@@ -29,11 +38,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 		code = pb.ErrorCode_HeroNoResonate
 		return
 	}
-	defer func() {
-		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.module.GetType()), ResonanceReset, &pb.HeroResonanceResetResp{Hero: _hero, Energy: _hero.ResonateNum})
-		}
-	}()
+
 	// 共鸣次数判断
 	resonConfig, errr := this.module.configure.GetHeroResonanceConfig(_hero.HeroID)
 	if errr != nil {
diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go
index 30ba57e5f..d9ad511b3 100644
--- a/modules/hero/api_resonanceSelect.go
+++ b/modules/hero/api_resonanceSelect.go
@@ -25,6 +25,7 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR
 			session.SendMsg(string(this.module.GetType()), ResonanceUseEnergy, &pb.HeroResonanceUseEnergyResp{Hero: _hero})
 		}
 	}()
+	code = this.ResonanceUseEnergyCheck(session, req) // check
 	if code != pb.ErrorCode_Success {
 		return
 	}
diff --git a/modules/hero/api_skillUp.go b/modules/hero/api_skillUp.go
index e505ae800..f2d2138be 100644
--- a/modules/hero/api_skillUp.go
+++ b/modules/hero/api_skillUp.go
@@ -33,10 +33,20 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 	tmpUpSkillID = make(map[int32]*pb.SkillData, 0)
 	probability = make(map[int32]int32, 0)
 	_hero, err := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在
+	defer func() {
+		if code == pb.ErrorCode_Success {
+			session.SendMsg(string(this.module.GetType()), StrengthenUpSkill, &pb.HeroStrengthenUpSkillResp{Hero: _hero})
+		}
+	}()
+	code = this.StrengthenUpSkillCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	if err != pb.ErrorCode_Success {
 		code = pb.ErrorCode_HeroNoExist
 		return
 	}
+
 	_costHero, err := this.module.GetHero(session.GetUserId(), req.CostCardObj) // 查询消耗卡是否存在
 	if err != pb.ErrorCode_Success {
 		code = pb.ErrorCode_HeroNoExist
@@ -59,11 +69,6 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
 		code = pb.ErrorCode_HeroColorErr
 		return
 	}
-	defer func() {
-		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.module.GetType()), StrengthenUpSkill, &pb.HeroStrengthenUpSkillResp{Hero: _hero})
-		}
-	}()
 
 	config, err1 := this.module.configure.GetHeroSkillUpConfig()
 	if err1 != nil {
diff --git a/modules/hero/api_starUp.go b/modules/hero/api_starUp.go
index 7c2cef976..8ac88c55f 100644
--- a/modules/hero/api_starUp.go
+++ b/modules/hero/api_starUp.go
@@ -29,6 +29,10 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
 			session.SendMsg(string(this.module.GetType()), StrengthenUpStar, &pb.HeroStrengthenUpStarResp{Hero: _hero})
 		}
 	}()
+	code = this.StrengthenUpStarCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	if err != pb.ErrorCode_Success {
 		code = pb.ErrorCode_HeroNoExist
 		return
diff --git a/modules/hero/api_strengthen.go b/modules/hero/api_strengthen.go
index 7a05bd7d9..24526612a 100644
--- a/modules/hero/api_strengthen.go
+++ b/modules/hero/api_strengthen.go
@@ -30,11 +30,20 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 	curRes = make(map[string]int32, 0)
 	costRes = make(map[string]int32, 0)
 	_hero, err := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 校验升级的对象是否存在
-
+	defer func() {
+		if code == pb.ErrorCode_Success {
+			session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero})
+		}
+	}()
+	code = this.StrengthenUplvCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
+		return
+	}
 	if err != pb.ErrorCode_Success {
 		code = pb.ErrorCode_HeroNoExist
 		return
 	}
+
 	_expHero, err := this.module.GetHero(session.GetUserId(), req.ExpCardID) // 校验需要消耗经验卡牌的对象是否存在
 
 	if err != pb.ErrorCode_Success {
@@ -111,11 +120,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 		code = pb.ErrorCode_HeroNoExist
 		return
 	}
-	defer func() {
-		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero})
-		}
-	}()
+
 	log.Debugf("升级后当前等级: %d,经验: %d,需要消耗的金币: %d,增加的经验: %d", curLv, curExp, costRes["gold"], addExp)
 	// 执行升级逻辑
 	code = this.module.AddCardExp(session.GetUserId(), req.HeroObjID, addExp) // 加经验
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 400b72482..1b2cf080d 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -304,6 +304,7 @@ func (this *ModelHero) HeroStarUp(session comm.IUserSession, hero *pb.DBHero) (c
 	data := make(map[string]int32, 0)
 	newConfig := this.moduleHero.configure.GetHeroStar(hero.Star - 1)
 	if newConfig == nil {
+
 		code = pb.ErrorCode_ConfigurationException
 		return
 	}
diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go
index 4bf9a4c55..3c5efcbc5 100644
--- a/modules/mail/api_delmail.go
+++ b/modules/mail/api_delmail.go
@@ -10,18 +10,23 @@ import (
 
 //参数校验
 func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode) {
+	if session.GetUserId() == "" || req.ObjID == "" {
+		code = pb.ErrorCode_NoLogin
+		return
+	}
 	return
 }
 
 // 删除邮件
 func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode, data proto.Message) {
+
 	var err error
 	mailinfo := make([]*pb.DBMailData, 0)
 	defer func() {
 		session.SendMsg(string(this.module.GetType()), DelUserMailResp, &pb.MailDelMailResp{Mail: mailinfo})
 	}()
-	if session.GetUserId() == "" {
-		code = pb.ErrorCode_NoLogin
+	code = this.DelMailCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
 		return
 	}
 	bRet := this.module.modelMail.Mail_DelUserMail(req.ObjID)
diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go
index 7be7db77f..28c2f2fe1 100644
--- a/modules/mail/api_getAttachment.go
+++ b/modules/mail/api_getAttachment.go
@@ -4,10 +4,13 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func (this *apiComp) GetUserMailAttachmentCheck(session comm.IUserSession, req *pb.MailGetUserMailAttachmentReq) (code pb.ErrorCode) {
+	if req.ObjID == "" {
+		return pb.ErrorCode_ReqParameterError
+	}
 	return
 }
 
@@ -20,8 +23,9 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
 	defer func() {
 		session.SendMsg(string(this.module.GetType()), GetUserMailAttachmentResp, &pb.MailGetUserMailAttachmentResp{Mail: mail})
 	}()
-	if session.GetUserId() == "" {
-		code = pb.ErrorCode_NoLogin
+
+	code = this.GetUserMailAttachmentCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
 		return
 	}
 	_bGet := this.module.modelMail.Mail_GetMailAttachmentState(req.ObjID)
diff --git a/modules/mail/api_getmail.go b/modules/mail/api_getmail.go
index dc452dd09..56af62a0f 100644
--- a/modules/mail/api_getmail.go
+++ b/modules/mail/api_getmail.go
@@ -5,7 +5,7 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.MailGetListReq) (code pb.ErrorCode) {
@@ -20,8 +20,8 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq)
 	defer func() {
 		session.SendMsg(string(this.module.GetType()), QueryUserMailResp, &pb.MailGetListResp{Mails: mailinfo})
 	}()
-	if session.GetUserId() == "" {
-		code = pb.ErrorCode_NoLogin
+	code = this.GetListCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
 		return
 	}
 	if mailinfo, err = this.module.modelMail.Mail_QueryUserMail(session.GetUserId()); err != nil {
diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go
index f2b85790a..81d222aca 100644
--- a/modules/mail/api_readmail.go
+++ b/modules/mail/api_readmail.go
@@ -4,10 +4,14 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode) {
+	if session.GetUserId() == "" || req.ObjID == "" {
+		code = pb.ErrorCode_NoLogin
+		return
+	}
 	return
 }
 
@@ -20,11 +24,10 @@ func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq
 	defer func() {
 		session.SendMsg(string(this.module.GetType()), ReadUserMailResp, &pb.MailReadMailResp{Mail: mail})
 	}()
-	if session.GetUserId() == "" {
-		code = pb.ErrorCode_NoLogin
+	code = this.ReadMailCheck(session, req) // check
+	if code != pb.ErrorCode_Success {
 		return
 	}
-
 	mail, err = this.module.modelMail.Mail_ReadOneMail(req.ObjID)
 	if err != nil {
 		code = pb.ErrorCode_ReqParameterError