liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复check校验函数格式优化

Browse Source
This commit is contained in:
liwei1dao 2022-06-28 17:14:31 +08:00
parent 09ecaa3207
commit 9089ab2344
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/equipment/api_equip.go
View File

@ -8,7 +8,7 @@ import (
) )
//参数校验 //参数校验
func (this *apiComp) Equip_Check(session comm.IUserSession, req *pb.Equipment_Equip_Req) (result map[string]interface{}, code comm.ErrorCode) { func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.Equipment_Equip_Req) (result map[string]interface{}, code comm.ErrorCode) {
var ( var (
err error err error
errorCode pb.ErrorCode errorCode pb.ErrorCode
@ -20,7 +20,7 @@ func (this *apiComp) Equip_Check(session comm.IUserSession, req *pb.Equipment_Eq
equipments = make([]*pb.DB_Equipment, len(req.EquipmentId)) equipments = make([]*pb.DB_Equipment, len(req.EquipmentId))
for i, v := range req.EquipmentId { for i, v := range req.EquipmentId {
if v != "" { if v != "" {
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { if equipments[i], err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
log.Errorf("Equip_Check err:%v", err) log.Errorf("Equip_Check err:%v", err)
code.Code = pb.ErrorCode_EquipmentOnFoundEquipment code.Code = pb.ErrorCode_EquipmentOnFoundEquipment
return return
@ -64,7 +64,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{
for i, v := range hero.EquipID { for i, v := range hero.EquipID {
if v != "" { if v != "" {
if equipments[i] != nil && v != equipments[i].Id { if equipments[i] != nil && v != equipments[i].Id {
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err)
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return
@ -73,7 +73,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{
equipments[i].HeroId = hero.Id equipments[i].HeroId = hero.Id
updatequipment = append(updatequipment, equipment, equipments[i]) updatequipment = append(updatequipment, equipment, equipments[i])
} else if equipments[i] == nil { } else if equipments[i] == nil {
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err) log.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err)
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return
@ -96,7 +96,7 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{
} }
} }
if code = this.module.hero.UpdateEquipment(hero, equipments); code == pb.ErrorCode_Success { if code = this.module.hero.UpdateEquipment(hero, equipments); code == pb.ErrorCode_Success {
if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { if err = this.module.modelequipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil {
log.Errorf("Equip err%v", err) log.Errorf("Equip err%v", err)
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

2
modules/equipment/api_getlist.go
View File

@ -7,7 +7,7 @@ import (
) )
//参数校验 //参数校验
func (this *apiComp) Getlist_Check(session comm.IUserSession, req *pb.Equipment_GetList_Req) (result map[string]interface{}, code comm.ErrorCode) { func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.Equipment_GetList_Req) (result map[string]interface{}, code comm.ErrorCode) {
return return
} }

16
modules/equipment/api_upgrade.go
View File

@ -12,7 +12,7 @@ import (
) )
//参数校验 //参数校验
func (this *apiComp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment_Upgrade_Req) (result map[string]interface{}, code comm.ErrorCode) { func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.Equipment_Upgrade_Req) (result map[string]interface{}, code comm.ErrorCode) {
var ( var (
err error err error
conf *cfg.Game_equipData conf *cfg.Game_equipData
@ -24,7 +24,7 @@ func (this *apiComp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment_
code.Code = pb.ErrorCode_ReqParameterError code.Code = pb.ErrorCode_ReqParameterError
return return
} }
if equipment, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil { if equipment, err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), req.EquipmentId); err != nil {
log.Errorf("Equip_Check err:%v", err) log.Errorf("Equip_Check err:%v", err)
code.Code = pb.ErrorCode_EquipmentOnFoundEquipment code.Code = pb.ErrorCode_EquipmentOnFoundEquipment
return return
@ -85,7 +85,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac
//叠加装备 拆分处理 //叠加装备 拆分处理
if equipment.IsInitialState && equipment.OverlayNum > 1 { if equipment.IsInitialState && equipment.OverlayNum > 1 {
equipment.OverlayNum-- equipment.OverlayNum--
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ if err = this.module.modelequipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{
"overlayNum": equipment.OverlayNum, "overlayNum": equipment.OverlayNum,
"heroId": "", "heroId": "",
}); err != nil { }); err != nil {
@ -97,24 +97,24 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac
equipment.Id = primitive.NewObjectID().Hex() equipment.Id = primitive.NewObjectID().Hex()
equipment.IsInitialState = false equipment.IsInitialState = false
equipment.OverlayNum = 1 equipment.OverlayNum = 1
if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { if err = this.module.modelequipment.upgradeEquipment(equipment, conf, intensify); err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
log.Errorf("Upgrade err:%v", err) log.Errorf("Upgrade err:%v", err)
return return
} }
if err = this.module.modelEquipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil { if err = this.module.modelequipment.AddList(session.GetUserId(), equipment.Id, equipment); err != nil {
log.Errorf("Upgrade err:%v", err) log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return
} }
} else { } else {
equipment.IsInitialState = false equipment.IsInitialState = false
if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil { if err = this.module.modelequipment.upgradeEquipment(equipment, conf, intensify); err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
log.Errorf("Upgrade err:%v", err) log.Errorf("Upgrade err:%v", err)
return return
} }
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{ if err = this.module.modelequipment.ChangeList(session.GetUserId(), equipment.Id, map[string]interface{}{
"lv": equipment.Lv, "lv": equipment.Lv,
"mainEntry": equipment.MainEntry, "mainEntry": equipment.MainEntry,
"adverbEntry": equipment.AdverbEntry, "adverbEntry": equipment.AdverbEntry,
@ -136,7 +136,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac
for i, v := range hero.EquipID { for i, v := range hero.EquipID {
if v != "" { if v != "" {
if v != equipment.Id { if v != equipment.Id {
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil { if equipments[i], err = this.module.modelequipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
log.Errorf("Upgrade err:%v", err) log.Errorf("Upgrade err:%v", err)
code = pb.ErrorCode_EquipmentOnFoundEquipment code = pb.ErrorCode_EquipmentOnFoundEquipment
return return

10
modules/equipment/module.go
View File

@ -25,7 +25,7 @@ type Equipment struct {
service core.IService service core.IService
api *apiComp api *apiComp
configure *configureComp configure *configureComp
modelEquipment *modelEquipmentComp modelequipment *modelEquipmentComp
hero comm.IHero hero comm.IHero
} }
@ -57,7 +57,7 @@ func (this *Equipment) Start() (err error) {
func (this *Equipment) OnInstallComp() { func (this *Equipment) OnInstallComp() {
this.ModuleBase.OnInstallComp() this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.modelEquipment = this.RegisterComp(new(modelEquipmentComp)).(*modelEquipmentComp) this.modelequipment = this.RegisterComp(new(modelEquipmentComp)).(*modelEquipmentComp)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
} }
@ -65,7 +65,7 @@ func (this *Equipment) OnInstallComp() {
//查询武器信息 //查询武器信息
func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, Id string) (equipment *pb.DB_Equipment, code pb.ErrorCode) { func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, Id string) (equipment *pb.DB_Equipment, code pb.ErrorCode) {
var err error var err error
if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, Id); err != nil { if equipment, err = this.modelequipment.QueryUserEquipmentsById(uid, Id); err != nil {
if err == redis.Nil { if err == redis.Nil {
code = pb.ErrorCode_EquipmentOnFoundEquipment code = pb.ErrorCode_EquipmentOnFoundEquipment
} else { } else {
@ -77,14 +77,14 @@ func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string,
//查询卡片数量 //查询卡片数量
func (this *Equipment) QueryEquipmentAmount(source *comm.ModuleCallSource, uid string, equipmentId int32) (amount uint32) { func (this *Equipment) QueryEquipmentAmount(source *comm.ModuleCallSource, uid string, equipmentId int32) (amount uint32) {
amount = this.modelEquipment.QueryEquipmentAmount(uid, equipmentId) amount = this.modelequipment.QueryEquipmentAmount(uid, equipmentId)
return return
} }
//添加武器 //添加武器
func (this *Equipment) AddNewEquipments(source *comm.ModuleCallSource, uid string, cIds map[int32]uint32) (code pb.ErrorCode) { func (this *Equipment) AddNewEquipments(source *comm.ModuleCallSource, uid string, cIds map[int32]uint32) (code pb.ErrorCode) {
var err error var err error
if err = this.modelEquipment.AddEquipments(uid, cIds); err != nil { if err = this.modelequipment.AddEquipments(uid, cIds); err != nil {
log.Errorf("err%v", err) log.Errorf("err%v", err)
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
} }

2
modules/friend/model_friend.go
View File

@ -19,7 +19,7 @@ type ModelFriend struct {
} }
func (this *ModelFriend) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *ModelFriend) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.Model_Comp.Init(service, module, comp, options) err = this.MCompModel.Init(service, module, comp, options)
this.TableName = string(TableFriend) this.TableName = string(TableFriend)
return return
} }

12
modules/game/api.go
View File

@ -9,21 +9,21 @@ import (
/* /*
API API
*/ */
type Api_Comp struct { type ApiComp struct {
modules.MComp_GateComp modules.MCompGate
service core.IService service core.IService
module *Game module *Game
} }
//组件初始化接口 //组件初始化接口
func (this *Api_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *ApiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MComp_GateComp.Init(service, module, comp, options) this.MCompGate.Init(service, module, comp, options)
this.module = module.(*Game) this.module = module.(*Game)
this.service = service this.service = service
return return
} }
func (this *Api_Comp) Start() (err error) { func (this *ApiComp) Start() (err error) {
err = this.MComp_GateComp.Start() err = this.MCompGate.Start()
return return
} }

6
modules/game/configure_comp.go
View File

@ -11,12 +11,12 @@ const (
) )
///配置管理组件 ///配置管理组件
type Configure_Comp struct { type ConfigureComp struct {
modules.MComp_Configure modules.MCompConfigure
} }
//组件初始化接口 //组件初始化接口
func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options) this.ModuleCompBase.Init(service, module, comp, options)
return return

8
modules/gateway/configure_comp.go
View File

@ -12,19 +12,19 @@ const (
) )
///背包配置管理组件 ///背包配置管理组件
type Configure_Comp struct { type ConfigureComp struct {
modules.MComp_Configure modules.MCompConfigure
} }
//组件初始化接口 //组件初始化接口
func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options) this.ModuleCompBase.Init(service, module, comp, options)
this.LoadConfigure(game_msgdistrib, cfg.NewGame_msgDistrib) this.LoadConfigure(game_msgdistrib, cfg.NewGame_msgDistrib)
return return
} }
//获取消息分发规则读取配置表 //获取消息分发规则读取配置表
func (this *Configure_Comp) GetMsgDistribRule(mtype, stype string) (rule string, ok bool) { func (this *ConfigureComp) GetMsgDistribRule(mtype, stype string) (rule string, ok bool) {
var ( var (
err error err error
v interface{} v interface{}

2
modules/items/api_useItem.go
View File

@ -6,7 +6,7 @@ import (
) )
//参数校验 //参数校验
func (this *apiComp) Useitem_Check(session comm.IUserSession, req *pb.Items_UseItem_Req) (result map[string]interface{}, code comm.ErrorCode) { func (this *apiComp) UseitemCheck(session comm.IUserSession, req *pb.Items_UseItem_Req) (result map[string]interface{}, code comm.ErrorCode) {
return return
} }

4
modules/mail/model_mail.go
View File

@ -19,11 +19,11 @@ const (
) )
type ModelMail struct { type ModelMail struct {
modules.Model_Comp modules.MCompModel
} }
func (this *ModelMail) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *ModelMail) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.Model_Comp.Init(service, module, comp, options) this.MCompModel.Init(service, module, comp, options)
this.TableName = "mail" this.TableName = "mail"
//创建uid索引 //创建uid索引
this.DB.CreateIndex(core.SqlTable(DB_MailTable), mongo.IndexModel{ this.DB.CreateIndex(core.SqlTable(DB_MailTable), mongo.IndexModel{