diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 5193e2d51..06d8b9a70 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -6,33 +6,38 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"strconv"
+
+	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
-func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenReq) (result map[string]interface{}, code comm.ErrorCode) {
-	var (
-		costRes map[string]int32
-	)
-	costRes = make(map[string]int32, 0)
+func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenReq) (code comm.ErrorCode) {
 	if req.HeroObjID == "" {
 		code.Code = pb.ErrorCode_ReqParameterError
 		return
 	}
+
+	return
+}
+
+/// 英雄觉醒
+func (this *apiComp) Awaken(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroAwakenReq) (code pb.ErrorCode, data proto.Message) {
 	var (
 		awakenData *cfg.Game_heroAwakenData
 		bCheckOk   bool
+		costRes    map[string]int32
 	)
+	costRes = make(map[string]int32, 0)
 	bCheckOk = true
-
 	_hero, err := this.moduleHero.GetHero(session.GetUserId(), req.HeroObjID)
 
 	if err != pb.ErrorCode_Success {
-		code.Code = pb.ErrorCode_HeroNoExist
+		code = pb.ErrorCode_HeroNoExist
 		return
 	}
 	AwakenConfig, err1 := this.moduleHero.configure.GetHeroAwakenConfig()
 	if err1 != nil {
-		code.Code = pb.ErrorCode_ConfigNoFound
+		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
 	for _, v := range AwakenConfig.GetDataMap() {
@@ -42,7 +47,7 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe
 		}
 	}
 	if awakenData == nil {
-		code.Code = pb.ErrorCode_ConfigNoFound
+		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
 	// 参数校验
@@ -66,23 +71,9 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe
 		}
 	}
 	if !bCheckOk {
-		code.Code = pb.ErrorCode_GoldNoEnough
+		code = pb.ErrorCode_GoldNoEnough
 		return
 	}
-	result = map[string]interface{}{
-		"awakenData": awakenData,
-		"heroObj":    _hero,
-		"costRes":    costRes,
-	}
-	return
-}
-
-/// 英雄觉醒
-func (this *apiComp) Awaken(session comm.IUserSession, agrs map[string]interface{}, req *pb.HeroAwakenReq) (code pb.ErrorCode) {
-
-	awakenData := agrs["awakenData"].(*cfg.Game_heroAwakenData)
-	_hero := agrs["heroObj"].(*pb.DBHero)
-	costRes := agrs["costRes"].(map[string]int32)
 	if _hero == nil || awakenData == nil {
 		code = pb.ErrorCode_HeroNoExist
 		return
@@ -95,8 +86,8 @@ func (this *apiComp) Awaken(session comm.IUserSession, agrs map[string]interface
 
 	for _, v := range awakenData.Phaseneed {
 		if v.A == "attr" { // 消耗玩家身上资源
-			if data, ok := costRes[v.T]; ok {
-				code = this.user.AddAttributeValue(session.GetUserId(), v.T, data)
+			if _data, ok := costRes[v.T]; ok {
+				code = this.user.AddAttributeValue(session.GetUserId(), v.T, _data)
 				if code != pb.ErrorCode_Success {
 					return
 				}
@@ -113,8 +104,8 @@ func (this *apiComp) Awaken(session comm.IUserSession, agrs map[string]interface
 		}
 	}
 
-	err := this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
-	if err != nil {
+	err1 = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	if err1 != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
 	return
diff --git a/modules/hero/api_chouka.go b/modules/hero/api_chouka.go
index 74aba8336..1cf63df3d 100644
--- a/modules/hero/api_chouka.go
+++ b/modules/hero/api_chouka.go
@@ -26,12 +26,12 @@ func (this *apiComp) Chouka(session comm.IUserSession, result map[string]interfa
 	}()
 
 	heroCfgIds := req.HeroIds
-	if err := this.moduleHero.modelHero.createMultiHero(session.GetUserId(), heroCfgIds...); err != nil {
+	if err := this.moduleHero.hero.createMultiHero(session.GetUserId(), heroCfgIds...); err != nil {
 		code = pb.ErrorCode_HeroCreate
 		return
 	}
 
-	heroes, err := this.moduleHero.modelHero.getHeroList(session.GetUserId())
+	heroes, err := this.moduleHero.hero.getHeroList(session.GetUserId())
 	if err != nil {
 		log.Errorf("%v", err)
 		code = pb.ErrorCode_DBError
diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go
index d8e7c16f3..bc6b74f90 100644
--- a/modules/hero/api_info.go
+++ b/modules/hero/api_info.go
@@ -9,7 +9,7 @@ import (
 //参数校验
 func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (result map[string]interface{}, code comm.ErrorCode) {
 	result = map[string]interface{}{}
-	hero := this.moduleHero.modelHero.getOneHero(session.GetUserId(), req.HeroId)
+	hero := this.moduleHero.hero.getOneHero(session.GetUserId(), req.HeroId)
 	if hero == nil {
 		code = comm.ErrorCode{Code: pb.ErrorCode_HeroNoExist}
 	}
diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go
index 048de9cb5..133a064e5 100644
--- a/modules/hero/api_list.go
+++ b/modules/hero/api_list.go
@@ -22,7 +22,7 @@ func (this *apiComp) List(session comm.IUserSession, result map[string]interface
 		utils.TraceFunc(session.GetUserId(), string(this.moduleHero.GetType()), HeroSubTypeList, req, rsp)
 	}()
 
-	list, err := this.moduleHero.modelHero.getHeroList(session.GetUserId())
+	list, err := this.moduleHero.hero.getHeroList(session.GetUserId())
 	if err != nil {
 		code = pb.ErrorCode_DBError
 		return
diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go
index be2401391..ee8057bc2 100644
--- a/modules/hero/api_resonance.go
+++ b/modules/hero/api_resonance.go
@@ -118,7 +118,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, agrs map[string]interf
 	_heroMap := map[string]interface{}{
 		"resonateNum": _hero.ResonateNum + resonConfig.Energy,
 	}
-	err := this.moduleHero.modelHero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
+	err := this.moduleHero.hero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
 	if err != nil {
 		log.Errorf("update hero skill failed:%v", err)
 	}
@@ -131,11 +131,11 @@ func (this *apiComp) Resonance(session comm.IUserSession, agrs map[string]interf
 				return
 			}
 			for i := 0; i < int(v.N); i++ { // 有多少张加多少次
-				this.moduleHero.modelHero.createOneHero(session.GetUserId(), int32(value))
+				this.moduleHero.hero.createOneHero(session.GetUserId(), int32(value))
 			}
 		}
 	}
-	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	err = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go
index 308085c2d..3a230bd30 100644
--- a/modules/hero/api_resonanceReset.go
+++ b/modules/hero/api_resonanceReset.go
@@ -84,11 +84,11 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, agrs map[string]i
 		"Energy":               _hero.Energy,
 	}
 
-	err := this.moduleHero.modelHero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
+	err := this.moduleHero.hero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
 	if err != nil {
 		log.Errorf("update hero skill failed:%v", err)
 	}
-	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	err = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go
index 1b35de107..23a0db76f 100644
--- a/modules/hero/api_resonanceSelect.go
+++ b/modules/hero/api_resonanceSelect.go
@@ -47,13 +47,13 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, agrs map[stri
 		"Energy":               _hero.Energy,
 	}
 
-	err := this.moduleHero.modelHero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
+	err := this.moduleHero.hero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
 	if err != nil {
 		code = pb.ErrorCode_DBError
 		log.Errorf("update hero skill failed:%v", err)
 	}
 
-	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	err = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
diff --git a/modules/hero/api_skillUp.go b/modules/hero/api_skillUp.go
index 7979fa6b3..a6bbe853a 100644
--- a/modules/hero/api_skillUp.go
+++ b/modules/hero/api_skillUp.go
@@ -126,7 +126,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, agrs map[strin
 	_heroMap := map[string]interface{}{
 		"normalSkill": _hero.NormalSkill,
 	}
-	err = this.moduleHero.modelHero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
+	err = this.moduleHero.hero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
 	if err != nil {
 		log.Errorf("update hero skill failed:%v", err)
 	}
@@ -136,7 +136,7 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, agrs map[strin
 		code = pb.ErrorCode_DBError
 		return
 	}
-	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	err = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
diff --git a/modules/hero/api_starUp.go b/modules/hero/api_starUp.go
index 3a9e44b16..2c2d305ae 100644
--- a/modules/hero/api_starUp.go
+++ b/modules/hero/api_starUp.go
@@ -148,12 +148,12 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, agrs map[string
 		"star": _hero.Star,
 	}
 	// 保存数据
-	err := this.moduleHero.modelHero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap)
+	err := this.moduleHero.hero.modifyHeroData(session.GetUserId(), req.HeroObjID, _heroMap)
 	if err != nil {
 		code = pb.ErrorCode_DBError
 		log.Errorf("update hero skill failed:%v", err)
 	}
-	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	err = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
diff --git a/modules/hero/api_strengthen.go b/modules/hero/api_strengthen.go
index 49482e332..0a996367b 100644
--- a/modules/hero/api_strengthen.go
+++ b/modules/hero/api_strengthen.go
@@ -154,13 +154,13 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, agrs map[string]i
 		return
 	}
 	// 删除经验卡
-	err := this.moduleHero.modelHero.consumeOneHeroCard(session.GetUserId(), req.ExpCardID, req.Amount)
+	err := this.moduleHero.hero.consumeOneHeroCard(session.GetUserId(), req.ExpCardID, req.Amount)
 	if err != nil {
 		log.Errorf("delete err failed err:%T!", err)
 		return
 	}
 
-	err = this.moduleHero.modelHero.PushHeroProperty(session, _hero.Id) // 推送属性变化
+	err = this.moduleHero.hero.PushHeroProperty(session, _hero.Id) // 推送属性变化
 	if err != nil {
 		log.Errorf("PushHeroProperty err!")
 	}
diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go
index 6f2f760a1..d853d14ce 100644
--- a/modules/hero/hero_test.go
+++ b/modules/hero/hero_test.go
@@ -70,23 +70,23 @@ func TestMain(m *testing.M) {
 
 //创建一个英雄s
 func TestCreateOneHero(t *testing.T) {
-	err := module.modelHero.createOneHero("u1", 25001)
+	err := module.hero.createOneHero("u1", 25001)
 	fmt.Println(err)
 }
 
 //获取玩家英雄
 func TestGetOneHero(t *testing.T) {
-	d := module.modelHero.getOneHero("u1", "62b534bebf4745d4117acabe")
+	d := module.hero.getOneHero("u1", "62b534bebf4745d4117acabe")
 	fmt.Printf("%v", d)
 }
 
 func TestPropertyCompute(t *testing.T) {
-	m := module.modelHero.PropertyCompute("u1", "62b534bebf4745d4117acabe")
+	m := module.hero.PropertyCompute("u1", "62b534bebf4745d4117acabe")
 	fmt.Println(m)
 }
 
 func TestHeroList(t *testing.T) {
-	heroes, err := module.modelHero.getHeroList("u1")
+	heroes, err := module.hero.getHeroList("u1")
 	fmt.Printf("%v %v", heroes, err)
 }
 
@@ -95,6 +95,6 @@ func TestModify(t *testing.T) {
 		"lv":  2,
 		"exp": 1000,
 	}
-	err := module.modelHero.modifyHeroData("u1", "62b534bebf4745d4117acabe", data)
+	err := module.hero.modifyHeroData("u1", "62b534bebf4745d4117acabe", data)
 	fmt.Printf("%v ", err)
 }
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 3c84c5dfa..47746a9e2 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -57,7 +57,7 @@ func (this *ModelHero) initHero(uid string, heroCfgId int32) *pb.DBHero {
 func (this *ModelHero) createOneHero(uid string, heroCfgId int32) (err error) {
 	hero := this.initHero(uid, heroCfgId)
 	if hero != nil {
-		if err = this.moduleHero.modelHero.AddList(uid, hero.Id, hero); err != nil {
+		if err = this.moduleHero.hero.AddList(uid, hero.Id, hero); err != nil {
 			log.Errorf("%v", err)
 			return
 		}
@@ -67,7 +67,7 @@ func (this *ModelHero) createOneHero(uid string, heroCfgId int32) (err error) {
 
 //创建多个指定的英雄 heroCfgIds可填入多个英雄ID
 func (this *ModelHero) createMultiHero(uid string, heroCfgIds ...int32) error {
-	heroes, err := this.moduleHero.modelHero.getHeroList(uid)
+	heroes, err := this.moduleHero.hero.getHeroList(uid)
 	if err != nil {
 		return err
 	}
@@ -111,7 +111,7 @@ func (this *ModelHero) createMultiHero(uid string, heroCfgIds ...int32) error {
 //获取一个英雄
 func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
 	hero := &pb.DBHero{}
-	err := this.moduleHero.modelHero.GetListObj(uid, heroId, hero)
+	err := this.moduleHero.hero.GetListObj(uid, heroId, hero)
 	if err != nil {
 		return nil
 	}
@@ -121,7 +121,7 @@ func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
 //消耗一张英雄卡
 func (this *ModelHero) consumeOneHeroCard(uid, heroId string, count int32) (err error) {
 	for i := 0; i < int(count); i++ {
-		if err := this.moduleHero.modelHero.DelListlds(uid, heroId); err != nil {
+		if err := this.moduleHero.hero.DelListlds(uid, heroId); err != nil {
 			log.Errorf("%v", err)
 			break
 		}
@@ -131,7 +131,7 @@ func (this *ModelHero) consumeOneHeroCard(uid, heroId string, count int32) (err
 
 //更新英雄数据
 func (this *ModelHero) modifyHeroData(uid, heroId string, data map[string]interface{}) error {
-	return this.moduleHero.modelHero.ChangeList(uid, heroId, data)
+	return this.moduleHero.hero.ChangeList(uid, heroId, data)
 }
 
 //获取玩家的英雄列表
diff --git a/modules/hero/module.go b/modules/hero/module.go
index b053180c4..148e85329 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -16,7 +16,7 @@ type Hero struct {
 	modules.ModuleBase
 	api       *apiComp
 	configure *configureComp
-	modelHero *ModelHero
+	hero      *ModelHero
 	items     comm.IItems
 }
 
@@ -35,13 +35,13 @@ func (this *Hero) Init(service core.IService, module core.IModule, options core.
 func (this *Hero) OnInstallComp() {
 	this.ModuleBase.OnInstallComp()
 	this.api = this.RegisterComp(new(apiComp)).(*apiComp)
-	this.modelHero = this.RegisterComp(new(ModelHero)).(*ModelHero)
+	this.hero = this.RegisterComp(new(ModelHero)).(*ModelHero)
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
 }
 
 //创建新英雄
 func (this *Hero) CreateHero(uid string, heroCfgId ...int32) error {
-	return this.modelHero.createMultiHero(uid, heroCfgId...)
+	return this.hero.createMultiHero(uid, heroCfgId...)
 }
 
 //消耗英雄卡
@@ -58,7 +58,7 @@ func (this *Hero) ChangeCard(uId string, heroCfgId int32, count int32) (code pb.
 	}
 
 	for _, v := range curList {
-		err := this.modelHero.consumeOneHeroCard(v.Uid, v.Id, count)
+		err := this.hero.consumeOneHeroCard(v.Uid, v.Id, count)
 		if err != nil {
 			return pb.ErrorCode_DBError
 		}
@@ -69,7 +69,7 @@ func (this *Hero) ChangeCard(uId string, heroCfgId int32, count int32) (code pb.
 
 //获取英雄
 func (this *Hero) GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode) {
-	hero := this.modelHero.getOneHero(uid, heroId)
+	hero := this.hero.getOneHero(uid, heroId)
 	if hero == nil {
 		return nil, pb.ErrorCode_HeroNoExist
 	}
@@ -91,14 +91,14 @@ func (this *Hero) UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (co
 		}
 	}
 
-	this.modelHero.mergeMainProperty(hero.Uid, hero.Id, property)
-	this.modelHero.mergeAddProperty(hero.Uid, hero.Id, addProperty)
-	return this.modelHero.setEquipment(hero.Uid, hero.Id, equipIds)
+	this.hero.mergeMainProperty(hero.Uid, hero.Id, property)
+	this.hero.mergeAddProperty(hero.Uid, hero.Id, addProperty)
+	return this.hero.setEquipment(hero.Uid, hero.Id, equipIds)
 }
 
 //英雄列表
 func (this *Hero) GetHeroList(uid string) []*pb.DBHero {
-	list, err := this.modelHero.getHeroList(uid)
+	list, err := this.hero.getHeroList(uid)
 	if err != nil {
 		return nil
 	}
@@ -166,7 +166,7 @@ func (this *Hero) AddCardExp(uid string, heroId string, exp int32) (code pb.Erro
 			"exp": curExp,
 		}
 
-		if err := this.modelHero.modifyHeroData(uid, heroId, update); err != nil {
+		if err := this.hero.modifyHeroData(uid, heroId, update); err != nil {
 			code = pb.ErrorCode_DBError
 		} // 修改英雄数据
 	} else {