diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go
index 81935515a..f55119e8b 100644
--- a/cmd/robot/friend.go
+++ b/cmd/robot/friend.go
@@ -8,73 +8,73 @@ import (
 
 var (
 	//friend
-	friend_builders = []*builder{
+	friendBuilders = []*builder{
 		{
 			//list
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_List,
-			req:      &pb.Friend_List_Req{},
-			rsp:      &pb.Friend_List_Rsp{},
+			subType:  friend.FriendSubTypeList,
+			req:      &pb.FriendListReq{},
+			rsp:      &pb.FriendListRsp{},
 			enabled:  true,
 		}, {
 			//blacklist
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_Blacklist,
-			req:      &pb.Friend_BlackList_Req{},
-			rsp:      &pb.Friend_BlackList_Rsp{},
+			subType:  friend.FriendSubTypeBlacklist,
+			req:      &pb.FriendBlackListReq{},
+			rsp:      &pb.FriendBlackListRsp{},
 		}, {
 			//search
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_Search,
-			req: &pb.Friend_Search_Req{
+			subType:  friend.FriendSubTypeSearch,
+			req: &pb.FriendSearchReq{
 				NickName: "", //设置测试参数
 			},
-			rsp: &pb.Friend_Search_Rsp{},
+			rsp: &pb.FriendSearchRsp{},
 		}, {
 			//apply
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_Apply,
-			req:      &pb.Friend_Apply_Req{},
-			rsp:      &pb.Friend_Apply_Rsp{},
+			subType:  friend.FriendSubTypeApply,
+			req:      &pb.FriendApplyReq{},
+			rsp:      &pb.FriendApplyRsp{},
 			enabled:  true,
 		}, {
 			//applylist
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_ApplyList,
-			req:      &pb.Friend_ApplyList_Req{},
-			rsp:      &pb.Friend_ApplyList_Rsp{},
+			subType:  friend.FriendSubTypeApplyList,
+			req:      &pb.FriendApplyListReq{},
+			rsp:      &pb.FriendApplyListRsp{},
 		}, {
 			//agree
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_Agree,
-			req:      &pb.Friend_Agree_Req{},
-			rsp:      &pb.Friend_Agree_Rsp{},
+			subType:  friend.FriendSubTypeAgree,
+			req:      &pb.FriendAgreeReq{},
+			rsp:      &pb.FriendAgreeRsp{},
 		}, {
 			//refuse
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_Refuse,
-			req:      &pb.Friend_Agree_Req{},
-			rsp:      &pb.Friend_Agree_Rsp{},
+			subType:  friend.FriendSubTypeRefuse,
+			req:      &pb.FriendAgreeReq{},
+			rsp:      &pb.FriendAgreeRsp{},
 		}, {
 			//addblack
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_AddBlack,
-			req: &pb.Friend_BlackAdd_Req{
+			subType:  friend.FriendSubTypeAddBlack,
+			req: &pb.FriendBlackAddReq{
 				FriendId: "",
 			},
-			rsp: &pb.Friend_BlackAdd_Rsp{},
+			rsp: &pb.FriendBlackAddRsp{},
 		}, {
 			//delblack
 			mainType: string(comm.SM_FriendModule),
-			subType:  friend.Friend_SubType_DelBlack,
-			req:      &pb.Friend_DelBlack_Req{},
-			rsp:      &pb.Friend_DelBlack_Rsp{},
+			subType:  friend.FriendSubTypeDelBlack,
+			req:      &pb.FriendDelBlackReq{},
+			rsp:      &pb.FriendDelBlackRsp{},
 		},
 	}
 )
 
 //声明加入到构建器并发起请求
 func (r *Robot) RunFriend() {
-	r.addBuilders(friend_builders)
+	r.addBuilders(friendBuilders)
 	r.handleReq()
 }
diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go
index a8c8fc147..4d21147c0 100644
--- a/cmd/robot/hero.go
+++ b/cmd/robot/hero.go
@@ -8,19 +8,21 @@ import (
 
 var (
 	//hero
-	hero_builders = []*builder{
+	heroBuilders = []*builder{
 		{
 			mainType: string(comm.SM_HeroModule),
-			subType:  hero.Hero_SubType_List,
+			subType:  hero.HeroSubTypeList,
 			req:      &pb.Hero_List_Req{},
 			rsp:      &pb.Hero_List_Rsp{},
 			enabled:  true,
+		}, {
+			mainType: string(comm.SM_HeroModule),
 		},
 	}
 )
 
 //声明加入到构建器并发起请求
 func (r *Robot) RunHero() {
-	r.addBuilders(hero_builders)
+	r.addBuilders(heroBuilders)
 	r.handleReq()
 }
diff --git a/modules/friend/api.go b/modules/friend/api.go
index b9e8176f6..e5c19fb69 100644
--- a/modules/friend/api.go
+++ b/modules/friend/api.go
@@ -6,15 +6,15 @@ import (
 )
 
 const (
-	Friend_SubType_List      = "list"
-	Friend_SubType_Apply     = "apply"
-	Friend_SubType_ApplyList = "applylist"
-	Friend_SubType_AddBlack  = "addblack"
-	Friend_SubType_DelBlack  = "delblack"
-	Friend_SubType_Blacklist = "blacklist"
-	Friend_SubType_Agree     = "agree"
-	Friend_SubType_Refuse    = "refuse"
-	Friend_SubType_Search    = "search"
+	FriendSubTypeList      = "list"
+	FriendSubTypeApply     = "apply"
+	FriendSubTypeApplyList = "applylist"
+	FriendSubTypeAddBlack  = "addblack"
+	FriendSubTypeDelBlack  = "delblack"
+	FriendSubTypeBlacklist = "blacklist"
+	FriendSubTypeAgree     = "agree"
+	FriendSubTypeRefuse    = "refuse"
+	FriendSubTypeSearch    = "search"
 )
 
 type apiComp struct {
diff --git a/modules/friend/api_addblack.go b/modules/friend/api_addblack.go
index 0d20edf6c..0eccd3039 100644
--- a/modules/friend/api_addblack.go
+++ b/modules/friend/api_addblack.go
@@ -6,14 +6,14 @@ import (
 	"go_dreamfactory/utils"
 )
 
-func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.Friend_BlackAdd_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendBlackAddReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
 	var (
 		err         error
 		blackNumMax = 50 //TODO 从配置中读取
 	)
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
-	target := &pb.DB_FriendData{UId: req.FriendId}
+	self := &pb.DBFriend{UId: session.GetUserId()}
+	target := &pb.DBFriend{UId: req.FriendId}
 
 	err = this.module.modelFriend.Get(session.GetUserId(), self)
 	if self == nil || err != nil {
@@ -58,22 +58,22 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.Friend_Bla
 }
 
 //加入黑名单
-func (this *apiComp) Addblack(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_BlackAdd_Req) (code pb.ErrorCode) {
+func (this *apiComp) Addblack(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendBlackAddReq) (code pb.ErrorCode) {
 	var (
-		self *pb.DB_FriendData
-		rsp  *pb.Friend_BlackAdd_Rsp
+		self *pb.DBFriend
+		rsp  *pb.FriendBlackAddRsp
 	)
 
 	defer func() {
-		rsp = &pb.Friend_BlackAdd_Rsp{
+		rsp = &pb.FriendBlackAddRsp{
 			FriendId: req.FriendId,
 			UserId:   session.GetUserId(),
 		}
-		session.SendMsg(string(this.module.GetType()), Friend_SubType_AddBlack, rsp)
+		session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, rsp)
 	}()
 
 	if v, ok := chk["self"]; ok {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 		//将目标加入黑名单
 		self.BlackIds = append(self.BlackIds, req.FriendId)
 
diff --git a/modules/friend/api_agree.go b/modules/friend/api_agree.go
index 0fda04344..af036ec68 100644
--- a/modules/friend/api_agree.go
+++ b/modules/friend/api_agree.go
@@ -6,10 +6,10 @@ import (
 	"go_dreamfactory/utils"
 )
 
-func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.Friend_Agree_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
 	var err error
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
+	self := &pb.DBFriend{UId: session.GetUserId()}
 
 	//获取玩家自己好友数据
 	err = this.module.modelFriend.Get(session.GetUserId(), self)
@@ -34,18 +34,18 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.Friend_Agree_
 }
 
 //单个/批量同意
-func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Agree_Req) (code pb.ErrorCode) {
+func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendAgreeReq) (code pb.ErrorCode) {
 	var (
-		self   *pb.DB_FriendData
-		rsp    *pb.Friend_Agree_Rsp
+		self   *pb.DBFriend
+		rsp    *pb.FriendAgreeRsp
 		optNum int32
 	)
 
 	defer func() {
-		rsp = &pb.Friend_Agree_Rsp{
+		rsp = &pb.FriendAgreeRsp{
 			Num: optNum,
 		}
-		err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Agree, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
@@ -56,7 +56,7 @@ func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{}
 		code = pb.ErrorCode_FriendTargetNoData
 		return
 	} else {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 	}
 
 	if agreeIds, ok := chk["agreeIds"]; ok {
@@ -70,7 +70,7 @@ func (this *apiComp) Agree(session comm.IUserSession, chk map[string]interface{}
 			}
 
 			//双向添加：将自己加入到申请人的好友列表中
-			target := &pb.DB_FriendData{}
+			target := &pb.DBFriend{}
 			err := this.module.modelFriend.Get(userId, target)
 			if target == nil || err != nil {
 				code = pb.ErrorCode_FriendTargetNoData
diff --git a/modules/friend/api_apply.go b/modules/friend/api_apply.go
index fa2b6765f..bedbea659 100644
--- a/modules/friend/api_apply.go
+++ b/modules/friend/api_apply.go
@@ -7,11 +7,11 @@ import (
 	"go_dreamfactory/utils"
 )
 
-func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.Friend_Apply_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
 	var err error
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
-	target := &pb.DB_FriendData{UId: req.FriendId}
+	self := &pb.DBFriend{UId: session.GetUserId()}
+	target := &pb.DBFriend{UId: req.FriendId}
 
 	//获取玩家自己好友数据
 	err = this.module.modelFriend.Get(session.GetUserId(), self)
@@ -79,24 +79,24 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.Friend_Apply_
 }
 
 //好友申请
-func (this *apiComp) Apply(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Apply_Req) (code pb.ErrorCode) {
+func (this *apiComp) Apply(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendApplyReq) (code pb.ErrorCode) {
 	var (
-		target *pb.DB_FriendData
-		rsp    *pb.Friend_Apply_Rsp
+		target *pb.DBFriend
+		rsp    *pb.FriendApplyRsp
 	)
 
 	defer func() {
-		utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), Friend_SubType_Apply, req, rsp)
+		utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, rsp)
 	}()
 
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.Friend_Apply_Rsp{
+			rsp = &pb.FriendApplyRsp{
 				UserId:   session.GetUserId(),
 				FriendId: req.FriendId,
 			}
 		}
-		err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Apply, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
@@ -107,7 +107,7 @@ func (this *apiComp) Apply(session comm.IUserSession, chk map[string]interface{}
 		code = pb.ErrorCode_FriendTargetNoData
 		return
 	} else {
-		target = v.(*pb.DB_FriendData)
+		target = v.(*pb.DBFriend)
 	}
 
 	//将自己加入到目标用户的申请列表中
diff --git a/modules/friend/api_applylist.go b/modules/friend/api_applylist.go
index abb91678b..2c3f8cc93 100644
--- a/modules/friend/api_applylist.go
+++ b/modules/friend/api_applylist.go
@@ -5,9 +5,9 @@ import (
 	"go_dreamfactory/pb"
 )
 
-func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.Friend_ApplyList_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApplyListReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
+	self := &pb.DBFriend{UId: session.GetUserId()}
 	err := this.module.modelFriend.Get(session.GetUserId(), self)
 	if self == nil || err != nil {
 		code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData}
@@ -18,24 +18,24 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.Friend_Ap
 }
 
 //申请列表
-func (this *apiComp) ApplyList(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_ApplyList_Req) (code pb.ErrorCode) {
+func (this *apiComp) ApplyList(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendApplyListReq) (code pb.ErrorCode) {
 	var (
-		self *pb.DB_FriendData
-		rsp  *pb.Friend_ApplyList_Rsp
+		self *pb.DBFriend
+		rsp  *pb.FriendApplyListRsp
 		list []*pb.FriendBase
 	)
 
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.Friend_ApplyList_Rsp{
+			rsp = &pb.FriendApplyListRsp{
 				List: list,
 			}
 		}
-		session.SendMsg(string(this.module.GetType()), Friend_SubType_ApplyList, rsp)
+		session.SendMsg(string(this.module.GetType()), FriendSubTypeApplyList, rsp)
 	}()
 
 	if v, ok := chk["self"]; ok {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 		for _, userId := range self.ApplyIds {
 			//TODO 组装FriendBase明细数据
 			list = append(list, &pb.FriendBase{
diff --git a/modules/friend/api_blacklist.go b/modules/friend/api_blacklist.go
index 7f19c1464..a98850c5a 100644
--- a/modules/friend/api_blacklist.go
+++ b/modules/friend/api_blacklist.go
@@ -5,9 +5,9 @@ import (
 	"go_dreamfactory/pb"
 )
 
-func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.Friend_BlackList_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBlackListReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
+	self := &pb.DBFriend{UId: session.GetUserId()}
 	err := this.module.modelFriend.Get(session.GetUserId(), self)
 	if self == nil || err != nil {
 		code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData}
@@ -18,19 +18,19 @@ func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.Friend_Bl
 }
 
 //黑名单
-func (this *apiComp) Blacklist(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_BlackList_Req) (code pb.ErrorCode) {
+func (this *apiComp) Blacklist(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendBlackListReq) (code pb.ErrorCode) {
 	var (
-		self *pb.DB_FriendData
-		rsp  *pb.Friend_BlackList_Rsp
+		self *pb.DBFriend
+		rsp  *pb.FriendBlackListRsp
 		list []*pb.FriendBase
 	)
 
 	defer func() {
-		rsp = &pb.Friend_BlackList_Rsp{
+		rsp = &pb.FriendBlackListRsp{
 			Friends: list,
 		}
 
-		err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Blacklist, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
@@ -38,7 +38,7 @@ func (this *apiComp) Blacklist(session comm.IUserSession, chk map[string]interfa
 	}()
 
 	if v, ok := chk["self"]; ok {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 		for _, userId := range self.BlackIds {
 			//TODO 完善FriendBase信息
 			list = append(list, &pb.FriendBase{
diff --git a/modules/friend/api_del.go b/modules/friend/api_del.go
index cfed5b67b..5b51be879 100644
--- a/modules/friend/api_del.go
+++ b/modules/friend/api_del.go
@@ -5,11 +5,11 @@ import (
 	"go_dreamfactory/pb"
 )
 
-func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.Friend_Del_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	return
 }
 
 //删除好友
-func (this *apiComp) Del(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Del_Req) error {
+func (this *apiComp) Del(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendDelReq) error {
 	return nil
 }
diff --git a/modules/friend/api_delblack.go b/modules/friend/api_delblack.go
index c74d01d32..9995b4057 100644
--- a/modules/friend/api_delblack.go
+++ b/modules/friend/api_delblack.go
@@ -6,9 +6,9 @@ import (
 	"go_dreamfactory/utils"
 )
 
-func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.Friend_DelBlack_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelBlackReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
+	self := &pb.DBFriend{UId: session.GetUserId()}
 	err := this.module.modelFriend.Get(session.GetUserId(), self)
 	if self == nil || err != nil {
 		code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData}
@@ -19,19 +19,19 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.Friend_Del
 }
 
 //删除黑名单
-func (this *apiComp) Delblack(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_DelBlack_Req) (code pb.ErrorCode) {
+func (this *apiComp) Delblack(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendDelBlackReq) (code pb.ErrorCode) {
 	var (
-		self *pb.DB_FriendData
-		rsp  *pb.Friend_DelBlack_Rsp
+		self *pb.DBFriend
+		rsp  *pb.FriendDelBlackRsp
 	)
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.Friend_DelBlack_Rsp{
+			rsp = &pb.FriendDelBlackRsp{
 				FriendId: req.FriendId,
 				UserId:   session.GetUserId(),
 			}
 		}
-		err := session.SendMsg(string(this.module.GetType()), Friend_SubType_DelBlack, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
@@ -39,7 +39,7 @@ func (this *apiComp) Delblack(session comm.IUserSession, chk map[string]interfac
 	}()
 
 	if v, ok := chk["self"]; ok {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 		//从黑名单列表中删除目标
 		self.BlackIds = utils.DeleteString(self.BlackIds, req.FriendId)
 		//更新黑名单
diff --git a/modules/friend/api_list.go b/modules/friend/api_list.go
index 183ec2fa2..f1fa0b250 100644
--- a/modules/friend/api_list.go
+++ b/modules/friend/api_list.go
@@ -5,9 +5,9 @@ import (
 	"go_dreamfactory/pb"
 )
 
-func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.Friend_List_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
+	self := &pb.DBFriend{UId: session.GetUserId()}
 	err := this.module.modelFriend.Get(session.GetUserId(), self)
 	if self == nil || err != nil {
 		code = comm.ErrorCode{Code: pb.ErrorCode_FriendSelfNoData}
@@ -18,18 +18,18 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.Friend_List_Re
 }
 
 //好友列表
-func (this *apiComp) List(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_List_Req) (code pb.ErrorCode) {
+func (this *apiComp) List(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendListReq) (code pb.ErrorCode) {
 	var (
-		self *pb.DB_FriendData
-		rsp  *pb.Friend_List_Rsp
+		self *pb.DBFriend
+		rsp  *pb.FriendListRsp
 		list []*pb.FriendBase
 	)
 
 	defer func() {
-		rsp = &pb.Friend_List_Rsp{
+		rsp = &pb.FriendListRsp{
 			List: list,
 		}
-		err := session.SendMsg(string(this.module.GetType()), Friend_SubType_List, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
@@ -37,7 +37,7 @@ func (this *apiComp) List(session comm.IUserSession, chk map[string]interface{},
 	}()
 
 	if v, ok := chk["self"]; ok {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 		for _, userId := range self.FriendIds {
 			list = append(list, &pb.FriendBase{
 				UserId: userId,
diff --git a/modules/friend/api_refuse.go b/modules/friend/api_refuse.go
index 4e465f234..a72b106b2 100644
--- a/modules/friend/api_refuse.go
+++ b/modules/friend/api_refuse.go
@@ -6,10 +6,10 @@ import (
 	"go_dreamfactory/utils"
 )
 
-func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.Friend_Refuse_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuseReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	chk = make(map[string]interface{})
 	var err error
-	self := &pb.DB_FriendData{UId: session.GetUserId()}
+	self := &pb.DBFriend{UId: session.GetUserId()}
 
 	//获取玩家自己好友数据
 	err = this.module.modelFriend.Get(session.GetUserId(), self)
@@ -33,19 +33,19 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.Friend_Refus
 }
 
 //单个/批量拒绝
-func (this *apiComp) Refuse(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Refuse_Req) (code pb.ErrorCode) {
+func (this *apiComp) Refuse(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendRefuseReq) (code pb.ErrorCode) {
 	//将申请人从申请列表中删除
 	var (
-		self   *pb.DB_FriendData
-		rsp    *pb.Friend_Refuse_Rsp
+		self   *pb.DBFriend
+		rsp    *pb.FriendRefuseRsp
 		optNum int32
 	)
 	defer func() {
-		rsp = &pb.Friend_Refuse_Rsp{
+		rsp = &pb.FriendRefuseRsp{
 			Num: optNum,
 		}
 
-		err := session.SendMsg(string(this.module.GetType()), Friend_SubType_Refuse, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
@@ -56,7 +56,7 @@ func (this *apiComp) Refuse(session comm.IUserSession, chk map[string]interface{
 		code = pb.ErrorCode_FriendTargetNoData
 		return
 	} else {
-		self = v.(*pb.DB_FriendData)
+		self = v.(*pb.DBFriend)
 
 		if v, ok := chk["refuseIds"]; ok {
 			//将申请人从申请列表中删除
diff --git a/modules/friend/api_search.go b/modules/friend/api_search.go
index 9af50a42a..ae5c0a02e 100644
--- a/modules/friend/api_search.go
+++ b/modules/friend/api_search.go
@@ -5,7 +5,7 @@ import (
 	"go_dreamfactory/pb"
 )
 
-func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.Friend_Search_Req) (chk map[string]interface{}, code comm.ErrorCode) {
+func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearchReq) (chk map[string]interface{}, code comm.ErrorCode) {
 	if req.NickName == "" {
 		code = comm.ErrorCode{Code: pb.ErrorCode_FriendSearchNameEmpty}
 		return
@@ -14,18 +14,18 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.Friend_Searc
 }
 
 //搜索
-func (this *apiComp) Search(session comm.IUserSession, chk map[string]interface{}, req *pb.Friend_Search_Req) (code pb.ErrorCode) {
+func (this *apiComp) Search(session comm.IUserSession, chk map[string]interface{}, req *pb.FriendSearchReq) (code pb.ErrorCode) {
 	var (
-		rsp    *pb.Friend_Search_Rsp
+		rsp    *pb.FriendSearchRsp
 		friend *pb.FriendBase
 	)
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.Friend_Search_Rsp{
+			rsp = &pb.FriendSearchRsp{
 				Friend: friend,
 			}
 		}
-		session.SendMsg(string(this.module.GetType()), Friend_SubType_Search, rsp)
+		session.SendMsg(string(this.module.GetType()), FriendSubTypeSearch, rsp)
 	}()
 
 	user := this.module.modelFriend.Frined_FindCond(req.NickName)
diff --git a/modules/hero/api.go b/modules/hero/api.go
index 7e25a8e85..6083321cb 100644
--- a/modules/hero/api.go
+++ b/modules/hero/api.go
@@ -14,9 +14,9 @@ type apiComp struct {
 }
 
 const ( //消息回复的头名称
-	StrengthenUplv    = "strengthenherolv"
-	Hero_SubType_Info = "info" //英雄卡片信息
-	Hero_SubType_List = "list" //英雄列表
+	StrengthenUplv  = "strengthenherolv"
+	HeroSubTypeInfo = "info" //英雄卡片信息
+	HeroSubTypeList = "list" //英雄列表
 )
 
 //组件初始化接口
diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go
index dc1028543..5005dc24b 100644
--- a/modules/hero/api_info.go
+++ b/modules/hero/api_info.go
@@ -19,7 +19,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.Hero_Info_Req)
 func (this *apiComp) Info(session comm.IUserSession, result map[string]interface{}, req *pb.Hero_Info_Req) (code pb.ErrorCode) {
 	rsp := &pb.Hero_Info_Rsp{}
 	defer func() {
-		err := session.SendMsg(string(this.moduleHero.GetType()), Hero_SubType_Info, rsp)
+		err := session.SendMsg(string(this.moduleHero.GetType()), HeroSubTypeInfo, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go
index ee2e47b63..a6cc3e0f9 100644
--- a/modules/hero/api_list.go
+++ b/modules/hero/api_list.go
@@ -14,7 +14,7 @@ func (this *apiComp) List(session comm.IUserSession, result map[string]interface
 	rsp := &pb.Hero_List_Rsp{}
 
 	defer func() {
-		err := session.SendMsg(this.moduleHero.api.service.GetType(), Hero_SubType_List, rsp)
+		err := session.SendMsg(string(this.moduleHero.GetType()), HeroSubTypeList, rsp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 		}
diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go
index 963204a92..7c020dc96 100644
--- a/pb/friend_db.pb.go
+++ b/pb/friend_db.pb.go
@@ -20,7 +20,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type DB_FriendData struct {
+type DBFriend struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -31,8 +31,8 @@ type DB_FriendData struct {
 	BlackIds  []string `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds" bson:"blackIds"`    //黑名单ID
 }
 
-func (x *DB_FriendData) Reset() {
-	*x = DB_FriendData{}
+func (x *DBFriend) Reset() {
+	*x = DBFriend{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_db_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -40,13 +40,13 @@ func (x *DB_FriendData) Reset() {
 	}
 }
 
-func (x *DB_FriendData) String() string {
+func (x *DBFriend) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*DB_FriendData) ProtoMessage() {}
+func (*DBFriend) ProtoMessage() {}
 
-func (x *DB_FriendData) ProtoReflect() protoreflect.Message {
+func (x *DBFriend) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_db_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -58,33 +58,33 @@ func (x *DB_FriendData) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use DB_FriendData.ProtoReflect.Descriptor instead.
-func (*DB_FriendData) Descriptor() ([]byte, []int) {
+// Deprecated: Use DBFriend.ProtoReflect.Descriptor instead.
+func (*DBFriend) Descriptor() ([]byte, []int) {
 	return file_friend_friend_db_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *DB_FriendData) GetUId() string {
+func (x *DBFriend) GetUId() string {
 	if x != nil {
 		return x.UId
 	}
 	return ""
 }
 
-func (x *DB_FriendData) GetFriendIds() []string {
+func (x *DBFriend) GetFriendIds() []string {
 	if x != nil {
 		return x.FriendIds
 	}
 	return nil
 }
 
-func (x *DB_FriendData) GetApplyIds() []string {
+func (x *DBFriend) GetApplyIds() []string {
 	if x != nil {
 		return x.ApplyIds
 	}
 	return nil
 }
 
-func (x *DB_FriendData) GetBlackIds() []string {
+func (x *DBFriend) GetBlackIds() []string {
 	if x != nil {
 		return x.BlackIds
 	}
@@ -95,16 +95,15 @@ var File_friend_friend_db_proto protoreflect.FileDescriptor
 
 var file_friend_friend_db_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
-	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x77, 0x0a, 0x0d, 0x44, 0x42, 0x5f, 0x46,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
-	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x70, 0x70,
-	0x6c, 0x79, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x61, 0x70, 0x70,
-	0x6c, 0x79, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64,
-	0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x72, 0x0a, 0x08, 0x44, 0x42, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x49, 0x64, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x49, 0x64, 0x73,
+	0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x08, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -121,7 +120,7 @@ func file_friend_friend_db_proto_rawDescGZIP() []byte {
 
 var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_friend_friend_db_proto_goTypes = []interface{}{
-	(*DB_FriendData)(nil), // 0: DB_FriendData
+	(*DBFriend)(nil), // 0: DBFriend
 }
 var file_friend_friend_db_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for method output_type
@@ -138,7 +137,7 @@ func file_friend_friend_db_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_friend_friend_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DB_FriendData); i {
+			switch v := v.(*DBFriend); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index 0564d382d..2c393abc6 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -116,14 +116,14 @@ func (x *FriendBase) GetOfflineTime() int64 {
 }
 
 //好友列表
-type Friend_List_Req struct {
+type FriendListReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *Friend_List_Req) Reset() {
-	*x = Friend_List_Req{}
+func (x *FriendListReq) Reset() {
+	*x = FriendListReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -131,13 +131,13 @@ func (x *Friend_List_Req) Reset() {
 	}
 }
 
-func (x *Friend_List_Req) String() string {
+func (x *FriendListReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_List_Req) ProtoMessage() {}
+func (*FriendListReq) ProtoMessage() {}
 
-func (x *Friend_List_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendListReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -149,12 +149,12 @@ func (x *Friend_List_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_List_Req.ProtoReflect.Descriptor instead.
-func (*Friend_List_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendListReq.ProtoReflect.Descriptor instead.
+func (*FriendListReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{1}
 }
 
-type Friend_List_Rsp struct {
+type FriendListRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -162,8 +162,8 @@ type Friend_List_Rsp struct {
 	List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
-func (x *Friend_List_Rsp) Reset() {
-	*x = Friend_List_Rsp{}
+func (x *FriendListRsp) Reset() {
+	*x = FriendListRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -171,13 +171,13 @@ func (x *Friend_List_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_List_Rsp) String() string {
+func (x *FriendListRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_List_Rsp) ProtoMessage() {}
+func (*FriendListRsp) ProtoMessage() {}
 
-func (x *Friend_List_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendListRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -189,12 +189,12 @@ func (x *Friend_List_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_List_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_List_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendListRsp.ProtoReflect.Descriptor instead.
+func (*FriendListRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Friend_List_Rsp) GetList() []*FriendBase {
+func (x *FriendListRsp) GetList() []*FriendBase {
 	if x != nil {
 		return x.List
 	}
@@ -202,7 +202,7 @@ func (x *Friend_List_Rsp) GetList() []*FriendBase {
 }
 
 //申请好友
-type Friend_Apply_Req struct {
+type FriendApplyReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -210,8 +210,8 @@ type Friend_Apply_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID
 }
 
-func (x *Friend_Apply_Req) Reset() {
-	*x = Friend_Apply_Req{}
+func (x *FriendApplyReq) Reset() {
+	*x = FriendApplyReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -219,13 +219,13 @@ func (x *Friend_Apply_Req) Reset() {
 	}
 }
 
-func (x *Friend_Apply_Req) String() string {
+func (x *FriendApplyReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Apply_Req) ProtoMessage() {}
+func (*FriendApplyReq) ProtoMessage() {}
 
-func (x *Friend_Apply_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendApplyReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -237,19 +237,19 @@ func (x *Friend_Apply_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Apply_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Apply_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendApplyReq.ProtoReflect.Descriptor instead.
+func (*FriendApplyReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *Friend_Apply_Req) GetFriendId() string {
+func (x *FriendApplyReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_Apply_Rsp struct {
+type FriendApplyRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -258,8 +258,8 @@ type Friend_Apply_Rsp struct {
 	FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID
 }
 
-func (x *Friend_Apply_Rsp) Reset() {
-	*x = Friend_Apply_Rsp{}
+func (x *FriendApplyRsp) Reset() {
+	*x = FriendApplyRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -267,13 +267,13 @@ func (x *Friend_Apply_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Apply_Rsp) String() string {
+func (x *FriendApplyRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Apply_Rsp) ProtoMessage() {}
+func (*FriendApplyRsp) ProtoMessage() {}
 
-func (x *Friend_Apply_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendApplyRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -285,19 +285,19 @@ func (x *Friend_Apply_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Apply_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Apply_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendApplyRsp.ProtoReflect.Descriptor instead.
+func (*FriendApplyRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *Friend_Apply_Rsp) GetUserId() string {
+func (x *FriendApplyRsp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
 	return ""
 }
 
-func (x *Friend_Apply_Rsp) GetFriendId() string {
+func (x *FriendApplyRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
@@ -305,7 +305,7 @@ func (x *Friend_Apply_Rsp) GetFriendId() string {
 }
 
 //删除好友
-type Friend_Del_Req struct {
+type FriendDelReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -313,8 +313,8 @@ type Friend_Del_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID
 }
 
-func (x *Friend_Del_Req) Reset() {
-	*x = Friend_Del_Req{}
+func (x *FriendDelReq) Reset() {
+	*x = FriendDelReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -322,13 +322,13 @@ func (x *Friend_Del_Req) Reset() {
 	}
 }
 
-func (x *Friend_Del_Req) String() string {
+func (x *FriendDelReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Del_Req) ProtoMessage() {}
+func (*FriendDelReq) ProtoMessage() {}
 
-func (x *Friend_Del_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendDelReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -340,19 +340,19 @@ func (x *Friend_Del_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Del_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Del_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendDelReq.ProtoReflect.Descriptor instead.
+func (*FriendDelReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *Friend_Del_Req) GetFriendId() string {
+func (x *FriendDelReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_Del_Rsp struct {
+type FriendDelRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -361,8 +361,8 @@ type Friend_Del_Rsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`     //用户ID
 }
 
-func (x *Friend_Del_Rsp) Reset() {
-	*x = Friend_Del_Rsp{}
+func (x *FriendDelRsp) Reset() {
+	*x = FriendDelRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -370,13 +370,13 @@ func (x *Friend_Del_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Del_Rsp) String() string {
+func (x *FriendDelRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Del_Rsp) ProtoMessage() {}
+func (*FriendDelRsp) ProtoMessage() {}
 
-func (x *Friend_Del_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendDelRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -388,19 +388,19 @@ func (x *Friend_Del_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Del_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Del_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendDelRsp.ProtoReflect.Descriptor instead.
+func (*FriendDelRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *Friend_Del_Rsp) GetFriendId() string {
+func (x *FriendDelRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *Friend_Del_Rsp) GetUserId() string {
+func (x *FriendDelRsp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -408,7 +408,7 @@ func (x *Friend_Del_Rsp) GetUserId() string {
 }
 
 //同意
-type Friend_Agree_Req struct {
+type FriendAgreeReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -416,8 +416,8 @@ type Friend_Agree_Req struct {
 	FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds"` //被同意的用户
 }
 
-func (x *Friend_Agree_Req) Reset() {
-	*x = Friend_Agree_Req{}
+func (x *FriendAgreeReq) Reset() {
+	*x = FriendAgreeReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -425,13 +425,13 @@ func (x *Friend_Agree_Req) Reset() {
 	}
 }
 
-func (x *Friend_Agree_Req) String() string {
+func (x *FriendAgreeReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Agree_Req) ProtoMessage() {}
+func (*FriendAgreeReq) ProtoMessage() {}
 
-func (x *Friend_Agree_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendAgreeReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -443,19 +443,19 @@ func (x *Friend_Agree_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Agree_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Agree_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendAgreeReq.ProtoReflect.Descriptor instead.
+func (*FriendAgreeReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *Friend_Agree_Req) GetFriendIds() []string {
+func (x *FriendAgreeReq) GetFriendIds() []string {
 	if x != nil {
 		return x.FriendIds
 	}
 	return nil
 }
 
-type Friend_Agree_Rsp struct {
+type FriendAgreeRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -463,8 +463,8 @@ type Friend_Agree_Rsp struct {
 	Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量
 }
 
-func (x *Friend_Agree_Rsp) Reset() {
-	*x = Friend_Agree_Rsp{}
+func (x *FriendAgreeRsp) Reset() {
+	*x = FriendAgreeRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -472,13 +472,13 @@ func (x *Friend_Agree_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Agree_Rsp) String() string {
+func (x *FriendAgreeRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Agree_Rsp) ProtoMessage() {}
+func (*FriendAgreeRsp) ProtoMessage() {}
 
-func (x *Friend_Agree_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendAgreeRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -490,12 +490,12 @@ func (x *Friend_Agree_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Agree_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Agree_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendAgreeRsp.ProtoReflect.Descriptor instead.
+func (*FriendAgreeRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *Friend_Agree_Rsp) GetNum() int32 {
+func (x *FriendAgreeRsp) GetNum() int32 {
 	if x != nil {
 		return x.Num
 	}
@@ -503,7 +503,7 @@ func (x *Friend_Agree_Rsp) GetNum() int32 {
 }
 
 //拒绝
-type Friend_Refuse_Req struct {
+type FriendRefuseReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -511,8 +511,8 @@ type Friend_Refuse_Req struct {
 	FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds"` //被拒绝的用户
 }
 
-func (x *Friend_Refuse_Req) Reset() {
-	*x = Friend_Refuse_Req{}
+func (x *FriendRefuseReq) Reset() {
+	*x = FriendRefuseReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -520,13 +520,13 @@ func (x *Friend_Refuse_Req) Reset() {
 	}
 }
 
-func (x *Friend_Refuse_Req) String() string {
+func (x *FriendRefuseReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Refuse_Req) ProtoMessage() {}
+func (*FriendRefuseReq) ProtoMessage() {}
 
-func (x *Friend_Refuse_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendRefuseReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -538,19 +538,19 @@ func (x *Friend_Refuse_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Refuse_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Refuse_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendRefuseReq.ProtoReflect.Descriptor instead.
+func (*FriendRefuseReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *Friend_Refuse_Req) GetFriendIds() []string {
+func (x *FriendRefuseReq) GetFriendIds() []string {
 	if x != nil {
 		return x.FriendIds
 	}
 	return nil
 }
 
-type Friend_Refuse_Rsp struct {
+type FriendRefuseRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -558,8 +558,8 @@ type Friend_Refuse_Rsp struct {
 	Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量
 }
 
-func (x *Friend_Refuse_Rsp) Reset() {
-	*x = Friend_Refuse_Rsp{}
+func (x *FriendRefuseRsp) Reset() {
+	*x = FriendRefuseRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -567,13 +567,13 @@ func (x *Friend_Refuse_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Refuse_Rsp) String() string {
+func (x *FriendRefuseRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Refuse_Rsp) ProtoMessage() {}
+func (*FriendRefuseRsp) ProtoMessage() {}
 
-func (x *Friend_Refuse_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendRefuseRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -585,12 +585,12 @@ func (x *Friend_Refuse_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Refuse_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Refuse_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendRefuseRsp.ProtoReflect.Descriptor instead.
+func (*FriendRefuseRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *Friend_Refuse_Rsp) GetNum() int32 {
+func (x *FriendRefuseRsp) GetNum() int32 {
 	if x != nil {
 		return x.Num
 	}
@@ -598,14 +598,14 @@ func (x *Friend_Refuse_Rsp) GetNum() int32 {
 }
 
 //好友申请列表
-type Friend_ApplyList_Req struct {
+type FriendApplyListReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *Friend_ApplyList_Req) Reset() {
-	*x = Friend_ApplyList_Req{}
+func (x *FriendApplyListReq) Reset() {
+	*x = FriendApplyListReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -613,13 +613,13 @@ func (x *Friend_ApplyList_Req) Reset() {
 	}
 }
 
-func (x *Friend_ApplyList_Req) String() string {
+func (x *FriendApplyListReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_ApplyList_Req) ProtoMessage() {}
+func (*FriendApplyListReq) ProtoMessage() {}
 
-func (x *Friend_ApplyList_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendApplyListReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -631,12 +631,12 @@ func (x *Friend_ApplyList_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_ApplyList_Req.ProtoReflect.Descriptor instead.
-func (*Friend_ApplyList_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendApplyListReq.ProtoReflect.Descriptor instead.
+func (*FriendApplyListReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{11}
 }
 
-type Friend_ApplyList_Rsp struct {
+type FriendApplyListRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -644,8 +644,8 @@ type Friend_ApplyList_Rsp struct {
 	List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
-func (x *Friend_ApplyList_Rsp) Reset() {
-	*x = Friend_ApplyList_Rsp{}
+func (x *FriendApplyListRsp) Reset() {
+	*x = FriendApplyListRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -653,13 +653,13 @@ func (x *Friend_ApplyList_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_ApplyList_Rsp) String() string {
+func (x *FriendApplyListRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_ApplyList_Rsp) ProtoMessage() {}
+func (*FriendApplyListRsp) ProtoMessage() {}
 
-func (x *Friend_ApplyList_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -671,12 +671,12 @@ func (x *Friend_ApplyList_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_ApplyList_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_ApplyList_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendApplyListRsp.ProtoReflect.Descriptor instead.
+func (*FriendApplyListRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *Friend_ApplyList_Rsp) GetList() []*FriendBase {
+func (x *FriendApplyListRsp) GetList() []*FriendBase {
 	if x != nil {
 		return x.List
 	}
@@ -684,7 +684,7 @@ func (x *Friend_ApplyList_Rsp) GetList() []*FriendBase {
 }
 
 //好友搜索
-type Friend_Search_Req struct {
+type FriendSearchReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -692,8 +692,8 @@ type Friend_Search_Req struct {
 	NickName string `protobuf:"bytes,1,opt,name=nickName,proto3" json:"nickName"` //好友昵称
 }
 
-func (x *Friend_Search_Req) Reset() {
-	*x = Friend_Search_Req{}
+func (x *FriendSearchReq) Reset() {
+	*x = FriendSearchReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -701,13 +701,13 @@ func (x *Friend_Search_Req) Reset() {
 	}
 }
 
-func (x *Friend_Search_Req) String() string {
+func (x *FriendSearchReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Search_Req) ProtoMessage() {}
+func (*FriendSearchReq) ProtoMessage() {}
 
-func (x *Friend_Search_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendSearchReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -719,19 +719,19 @@ func (x *Friend_Search_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Search_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Search_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendSearchReq.ProtoReflect.Descriptor instead.
+func (*FriendSearchReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *Friend_Search_Req) GetNickName() string {
+func (x *FriendSearchReq) GetNickName() string {
 	if x != nil {
 		return x.NickName
 	}
 	return ""
 }
 
-type Friend_Search_Rsp struct {
+type FriendSearchRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -739,8 +739,8 @@ type Friend_Search_Rsp struct {
 	Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"`
 }
 
-func (x *Friend_Search_Rsp) Reset() {
-	*x = Friend_Search_Rsp{}
+func (x *FriendSearchRsp) Reset() {
+	*x = FriendSearchRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -748,13 +748,13 @@ func (x *Friend_Search_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Search_Rsp) String() string {
+func (x *FriendSearchRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Search_Rsp) ProtoMessage() {}
+func (*FriendSearchRsp) ProtoMessage() {}
 
-func (x *Friend_Search_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -766,12 +766,12 @@ func (x *Friend_Search_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Search_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Search_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendSearchRsp.ProtoReflect.Descriptor instead.
+func (*FriendSearchRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *Friend_Search_Rsp) GetFriend() *FriendBase {
+func (x *FriendSearchRsp) GetFriend() *FriendBase {
 	if x != nil {
 		return x.Friend
 	}
@@ -779,14 +779,14 @@ func (x *Friend_Search_Rsp) GetFriend() *FriendBase {
 }
 
 //黑名单
-type Friend_BlackList_Req struct {
+type FriendBlackListReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *Friend_BlackList_Req) Reset() {
-	*x = Friend_BlackList_Req{}
+func (x *FriendBlackListReq) Reset() {
+	*x = FriendBlackListReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -794,13 +794,13 @@ func (x *Friend_BlackList_Req) Reset() {
 	}
 }
 
-func (x *Friend_BlackList_Req) String() string {
+func (x *FriendBlackListReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_BlackList_Req) ProtoMessage() {}
+func (*FriendBlackListReq) ProtoMessage() {}
 
-func (x *Friend_BlackList_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendBlackListReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -812,12 +812,12 @@ func (x *Friend_BlackList_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_BlackList_Req.ProtoReflect.Descriptor instead.
-func (*Friend_BlackList_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendBlackListReq.ProtoReflect.Descriptor instead.
+func (*FriendBlackListReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{15}
 }
 
-type Friend_BlackList_Rsp struct {
+type FriendBlackListRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -825,8 +825,8 @@ type Friend_BlackList_Rsp struct {
 	Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"`
 }
 
-func (x *Friend_BlackList_Rsp) Reset() {
-	*x = Friend_BlackList_Rsp{}
+func (x *FriendBlackListRsp) Reset() {
+	*x = FriendBlackListRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -834,13 +834,13 @@ func (x *Friend_BlackList_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_BlackList_Rsp) String() string {
+func (x *FriendBlackListRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_BlackList_Rsp) ProtoMessage() {}
+func (*FriendBlackListRsp) ProtoMessage() {}
 
-func (x *Friend_BlackList_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -852,12 +852,12 @@ func (x *Friend_BlackList_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_BlackList_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_BlackList_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendBlackListRsp.ProtoReflect.Descriptor instead.
+func (*FriendBlackListRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{16}
 }
 
-func (x *Friend_BlackList_Rsp) GetFriends() []*FriendBase {
+func (x *FriendBlackListRsp) GetFriends() []*FriendBase {
 	if x != nil {
 		return x.Friends
 	}
@@ -865,7 +865,7 @@ func (x *Friend_BlackList_Rsp) GetFriends() []*FriendBase {
 }
 
 //添加黑名单
-type Friend_BlackAdd_Req struct {
+type FriendBlackAddReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -873,8 +873,8 @@ type Friend_BlackAdd_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"`
 }
 
-func (x *Friend_BlackAdd_Req) Reset() {
-	*x = Friend_BlackAdd_Req{}
+func (x *FriendBlackAddReq) Reset() {
+	*x = FriendBlackAddReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -882,13 +882,13 @@ func (x *Friend_BlackAdd_Req) Reset() {
 	}
 }
 
-func (x *Friend_BlackAdd_Req) String() string {
+func (x *FriendBlackAddReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_BlackAdd_Req) ProtoMessage() {}
+func (*FriendBlackAddReq) ProtoMessage() {}
 
-func (x *Friend_BlackAdd_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -900,19 +900,19 @@ func (x *Friend_BlackAdd_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_BlackAdd_Req.ProtoReflect.Descriptor instead.
-func (*Friend_BlackAdd_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendBlackAddReq.ProtoReflect.Descriptor instead.
+func (*FriendBlackAddReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *Friend_BlackAdd_Req) GetFriendId() string {
+func (x *FriendBlackAddReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_BlackAdd_Rsp struct {
+type FriendBlackAddRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -921,8 +921,8 @@ type Friend_BlackAdd_Rsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *Friend_BlackAdd_Rsp) Reset() {
-	*x = Friend_BlackAdd_Rsp{}
+func (x *FriendBlackAddRsp) Reset() {
+	*x = FriendBlackAddRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -930,13 +930,13 @@ func (x *Friend_BlackAdd_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_BlackAdd_Rsp) String() string {
+func (x *FriendBlackAddRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_BlackAdd_Rsp) ProtoMessage() {}
+func (*FriendBlackAddRsp) ProtoMessage() {}
 
-func (x *Friend_BlackAdd_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -948,19 +948,19 @@ func (x *Friend_BlackAdd_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_BlackAdd_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_BlackAdd_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendBlackAddRsp.ProtoReflect.Descriptor instead.
+func (*FriendBlackAddRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{18}
 }
 
-func (x *Friend_BlackAdd_Rsp) GetFriendId() string {
+func (x *FriendBlackAddRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *Friend_BlackAdd_Rsp) GetUserId() string {
+func (x *FriendBlackAddRsp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -968,7 +968,7 @@ func (x *Friend_BlackAdd_Rsp) GetUserId() string {
 }
 
 //删除黑名单
-type Friend_DelBlack_Req struct {
+type FriendDelBlackReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -976,8 +976,8 @@ type Friend_DelBlack_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"`
 }
 
-func (x *Friend_DelBlack_Req) Reset() {
-	*x = Friend_DelBlack_Req{}
+func (x *FriendDelBlackReq) Reset() {
+	*x = FriendDelBlackReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -985,13 +985,13 @@ func (x *Friend_DelBlack_Req) Reset() {
 	}
 }
 
-func (x *Friend_DelBlack_Req) String() string {
+func (x *FriendDelBlackReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_DelBlack_Req) ProtoMessage() {}
+func (*FriendDelBlackReq) ProtoMessage() {}
 
-func (x *Friend_DelBlack_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendDelBlackReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1003,19 +1003,19 @@ func (x *Friend_DelBlack_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_DelBlack_Req.ProtoReflect.Descriptor instead.
-func (*Friend_DelBlack_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendDelBlackReq.ProtoReflect.Descriptor instead.
+func (*FriendDelBlackReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{19}
 }
 
-func (x *Friend_DelBlack_Req) GetFriendId() string {
+func (x *FriendDelBlackReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_DelBlack_Rsp struct {
+type FriendDelBlackRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1024,8 +1024,8 @@ type Friend_DelBlack_Rsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *Friend_DelBlack_Rsp) Reset() {
-	*x = Friend_DelBlack_Rsp{}
+func (x *FriendDelBlackRsp) Reset() {
+	*x = FriendDelBlackRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1033,13 +1033,13 @@ func (x *Friend_DelBlack_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_DelBlack_Rsp) String() string {
+func (x *FriendDelBlackRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_DelBlack_Rsp) ProtoMessage() {}
+func (*FriendDelBlackRsp) ProtoMessage() {}
 
-func (x *Friend_DelBlack_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendDelBlackRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1051,19 +1051,19 @@ func (x *Friend_DelBlack_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_DelBlack_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_DelBlack_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendDelBlackRsp.ProtoReflect.Descriptor instead.
+func (*FriendDelBlackRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *Friend_DelBlack_Rsp) GetFriendId() string {
+func (x *FriendDelBlackRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *Friend_DelBlack_Rsp) GetUserId() string {
+func (x *FriendDelBlackRsp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1071,7 +1071,7 @@ func (x *Friend_DelBlack_Rsp) GetUserId() string {
 }
 
 //接收
-type Friend_Receive_Req struct {
+type FriendReceiveReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1079,8 +1079,8 @@ type Friend_Receive_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"`
 }
 
-func (x *Friend_Receive_Req) Reset() {
-	*x = Friend_Receive_Req{}
+func (x *FriendReceiveReq) Reset() {
+	*x = FriendReceiveReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1088,13 +1088,13 @@ func (x *Friend_Receive_Req) Reset() {
 	}
 }
 
-func (x *Friend_Receive_Req) String() string {
+func (x *FriendReceiveReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Receive_Req) ProtoMessage() {}
+func (*FriendReceiveReq) ProtoMessage() {}
 
-func (x *Friend_Receive_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendReceiveReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1106,19 +1106,19 @@ func (x *Friend_Receive_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Receive_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Receive_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendReceiveReq.ProtoReflect.Descriptor instead.
+func (*FriendReceiveReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{21}
 }
 
-func (x *Friend_Receive_Req) GetFriendId() string {
+func (x *FriendReceiveReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_Receive_Rsp struct {
+type FriendReceiveRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1127,8 +1127,8 @@ type Friend_Receive_Rsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *Friend_Receive_Rsp) Reset() {
-	*x = Friend_Receive_Rsp{}
+func (x *FriendReceiveRsp) Reset() {
+	*x = FriendReceiveRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1136,13 +1136,13 @@ func (x *Friend_Receive_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Receive_Rsp) String() string {
+func (x *FriendReceiveRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Receive_Rsp) ProtoMessage() {}
+func (*FriendReceiveRsp) ProtoMessage() {}
 
-func (x *Friend_Receive_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendReceiveRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1154,19 +1154,19 @@ func (x *Friend_Receive_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Receive_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Receive_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendReceiveRsp.ProtoReflect.Descriptor instead.
+func (*FriendReceiveRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *Friend_Receive_Rsp) GetFriendId() string {
+func (x *FriendReceiveRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *Friend_Receive_Rsp) GetUserId() string {
+func (x *FriendReceiveRsp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1174,7 +1174,7 @@ func (x *Friend_Receive_Rsp) GetUserId() string {
 }
 
 //赠送
-type Friend_Give_Req struct {
+type FriendGiveReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1182,8 +1182,8 @@ type Friend_Give_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"`
 }
 
-func (x *Friend_Give_Req) Reset() {
-	*x = Friend_Give_Req{}
+func (x *FriendGiveReq) Reset() {
+	*x = FriendGiveReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1191,13 +1191,13 @@ func (x *Friend_Give_Req) Reset() {
 	}
 }
 
-func (x *Friend_Give_Req) String() string {
+func (x *FriendGiveReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Give_Req) ProtoMessage() {}
+func (*FriendGiveReq) ProtoMessage() {}
 
-func (x *Friend_Give_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendGiveReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1209,19 +1209,19 @@ func (x *Friend_Give_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Give_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Give_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendGiveReq.ProtoReflect.Descriptor instead.
+func (*FriendGiveReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{23}
 }
 
-func (x *Friend_Give_Req) GetFriendId() string {
+func (x *FriendGiveReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_Give_Rsp struct {
+type FriendGiveRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1230,8 +1230,8 @@ type Friend_Give_Rsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *Friend_Give_Rsp) Reset() {
-	*x = Friend_Give_Rsp{}
+func (x *FriendGiveRsp) Reset() {
+	*x = FriendGiveRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1239,13 +1239,13 @@ func (x *Friend_Give_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Give_Rsp) String() string {
+func (x *FriendGiveRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Give_Rsp) ProtoMessage() {}
+func (*FriendGiveRsp) ProtoMessage() {}
 
-func (x *Friend_Give_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendGiveRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1257,19 +1257,19 @@ func (x *Friend_Give_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Give_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Give_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendGiveRsp.ProtoReflect.Descriptor instead.
+func (*FriendGiveRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *Friend_Give_Rsp) GetFriendId() string {
+func (x *FriendGiveRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *Friend_Give_Rsp) GetUserId() string {
+func (x *FriendGiveRsp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1277,7 +1277,7 @@ func (x *Friend_Give_Rsp) GetUserId() string {
 }
 
 //好友数量
-type Friend_Total_Req struct {
+type FriendTotalReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1285,8 +1285,8 @@ type Friend_Total_Req struct {
 	FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"`
 }
 
-func (x *Friend_Total_Req) Reset() {
-	*x = Friend_Total_Req{}
+func (x *FriendTotalReq) Reset() {
+	*x = FriendTotalReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1294,13 +1294,13 @@ func (x *Friend_Total_Req) Reset() {
 	}
 }
 
-func (x *Friend_Total_Req) String() string {
+func (x *FriendTotalReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Total_Req) ProtoMessage() {}
+func (*FriendTotalReq) ProtoMessage() {}
 
-func (x *Friend_Total_Req) ProtoReflect() protoreflect.Message {
+func (x *FriendTotalReq) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1312,19 +1312,19 @@ func (x *Friend_Total_Req) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Total_Req.ProtoReflect.Descriptor instead.
-func (*Friend_Total_Req) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendTotalReq.ProtoReflect.Descriptor instead.
+func (*FriendTotalReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{25}
 }
 
-func (x *Friend_Total_Req) GetFriendId() string {
+func (x *FriendTotalReq) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-type Friend_Total_Rsp struct {
+type FriendTotalRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1333,8 +1333,8 @@ type Friend_Total_Rsp struct {
 	Total    int32  `protobuf:"varint,2,opt,name=total,proto3" json:"total"` //好友数量
 }
 
-func (x *Friend_Total_Rsp) Reset() {
-	*x = Friend_Total_Rsp{}
+func (x *FriendTotalRsp) Reset() {
+	*x = FriendTotalRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1342,13 +1342,13 @@ func (x *Friend_Total_Rsp) Reset() {
 	}
 }
 
-func (x *Friend_Total_Rsp) String() string {
+func (x *FriendTotalRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Friend_Total_Rsp) ProtoMessage() {}
+func (*FriendTotalRsp) ProtoMessage() {}
 
-func (x *Friend_Total_Rsp) ProtoReflect() protoreflect.Message {
+func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_friend_friend_msg_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1360,19 +1360,19 @@ func (x *Friend_Total_Rsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Friend_Total_Rsp.ProtoReflect.Descriptor instead.
-func (*Friend_Total_Rsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendTotalRsp.ProtoReflect.Descriptor instead.
+func (*FriendTotalRsp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{26}
 }
 
-func (x *Friend_Total_Rsp) GetFriendId() string {
+func (x *FriendTotalRsp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *Friend_Total_Rsp) GetTotal() int32 {
+func (x *FriendTotalRsp) GetTotal() int32 {
 	if x != nil {
 		return x.Total
 	}
@@ -1396,93 +1396,90 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
 	0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d,
 	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65,
-	0x54, 0x69, 0x6d, 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x4c,
-	0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x5f, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69,
-	0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2e, 0x0a, 0x10, 0x46,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12,
-	0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x10, 0x46,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x52, 0x73, 0x70, 0x12,
-	0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65,
-	0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49,
-	0x64, 0x22, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x6c, 0x5f,
-	0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x5f, 0x41, 0x67, 0x72, 0x65, 0x65, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
-	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x5f, 0x41, 0x67, 0x72, 0x65, 0x65, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a,
+	0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73,
+	0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
+	0x70, 0x70, 0x6c, 0x79, 0x52, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
+	0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x0e, 0x46,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
+	0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x46,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a,
 	0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22,
-	0x31, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65,
-	0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49,
-	0x64, 0x73, 0x22, 0x25, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x66,
-	0x75, 0x73, 0x65, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x16, 0x0a, 0x14, 0x46, 0x72, 0x69,
-	0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65,
-	0x71, 0x22, 0x37, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x70, 0x70, 0x6c,
-	0x79, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73,
-	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x52, 0x65, 0x71, 0x12,
-	0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a, 0x11, 0x46,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x52, 0x73, 0x70,
-	0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66,
-	0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
-	0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x22, 0x3d, 0x0a,
-	0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73,
-	0x74, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73,
+	0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52,
+	0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73,
+	0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65,
+	0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
+	0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x12, 0x46,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73,
+	0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69,
+	0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72,
+	0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d,
+	0x65, 0x22, 0x36, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63,
+	0x68, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73,
+	0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
+	0x3b, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69,
+	0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73,
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42,
-	0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x31, 0x0a, 0x13,
-	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x5f,
-	0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22,
-	0x49, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41,
-	0x64, 0x64, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
-	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x5f, 0x52, 0x65,
+	0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11,
+	0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65,
 	0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x49, 0x0a,
-	0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b,
-	0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a,
+	0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52,
+	0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16,
+	0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
+	0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
+	0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
+	0x22, 0x46, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
+	0x65, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
 	0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65,
-	0x6e, 0x64, 0x5f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a,
-	0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x5f, 0x52, 0x73, 0x70,
-	0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
-	0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73,
-	0x65, 0x72, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47,
-	0x69, 0x76, 0x65, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x64, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, 0x69,
-	0x76, 0x65, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47,
+	0x69, 0x76, 0x65, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
 	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
 	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1a,
-	0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x10, 0x46, 0x72,
-	0x69, 0x65, 0x6e, 0x64, 0x5f, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x52, 0x73, 0x70, 0x12, 0x1a,
-	0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1499,39 +1496,39 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
 
 var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
 var file_friend_friend_msg_proto_goTypes = []interface{}{
-	(*FriendBase)(nil),           // 0: FriendBase
-	(*Friend_List_Req)(nil),      // 1: Friend_List_Req
-	(*Friend_List_Rsp)(nil),      // 2: Friend_List_Rsp
-	(*Friend_Apply_Req)(nil),     // 3: Friend_Apply_Req
-	(*Friend_Apply_Rsp)(nil),     // 4: Friend_Apply_Rsp
-	(*Friend_Del_Req)(nil),       // 5: Friend_Del_Req
-	(*Friend_Del_Rsp)(nil),       // 6: Friend_Del_Rsp
-	(*Friend_Agree_Req)(nil),     // 7: Friend_Agree_Req
-	(*Friend_Agree_Rsp)(nil),     // 8: Friend_Agree_Rsp
-	(*Friend_Refuse_Req)(nil),    // 9: Friend_Refuse_Req
-	(*Friend_Refuse_Rsp)(nil),    // 10: Friend_Refuse_Rsp
-	(*Friend_ApplyList_Req)(nil), // 11: Friend_ApplyList_Req
-	(*Friend_ApplyList_Rsp)(nil), // 12: Friend_ApplyList_Rsp
-	(*Friend_Search_Req)(nil),    // 13: Friend_Search_Req
-	(*Friend_Search_Rsp)(nil),    // 14: Friend_Search_Rsp
-	(*Friend_BlackList_Req)(nil), // 15: Friend_BlackList_Req
-	(*Friend_BlackList_Rsp)(nil), // 16: Friend_BlackList_Rsp
-	(*Friend_BlackAdd_Req)(nil),  // 17: Friend_BlackAdd_Req
-	(*Friend_BlackAdd_Rsp)(nil),  // 18: Friend_BlackAdd_Rsp
-	(*Friend_DelBlack_Req)(nil),  // 19: Friend_DelBlack_Req
-	(*Friend_DelBlack_Rsp)(nil),  // 20: Friend_DelBlack_Rsp
-	(*Friend_Receive_Req)(nil),   // 21: Friend_Receive_Req
-	(*Friend_Receive_Rsp)(nil),   // 22: Friend_Receive_Rsp
-	(*Friend_Give_Req)(nil),      // 23: Friend_Give_Req
-	(*Friend_Give_Rsp)(nil),      // 24: Friend_Give_Rsp
-	(*Friend_Total_Req)(nil),     // 25: Friend_Total_Req
-	(*Friend_Total_Rsp)(nil),     // 26: Friend_Total_Rsp
+	(*FriendBase)(nil),         // 0: FriendBase
+	(*FriendListReq)(nil),      // 1: FriendListReq
+	(*FriendListRsp)(nil),      // 2: FriendListRsp
+	(*FriendApplyReq)(nil),     // 3: FriendApplyReq
+	(*FriendApplyRsp)(nil),     // 4: FriendApplyRsp
+	(*FriendDelReq)(nil),       // 5: FriendDelReq
+	(*FriendDelRsp)(nil),       // 6: FriendDelRsp
+	(*FriendAgreeReq)(nil),     // 7: FriendAgreeReq
+	(*FriendAgreeRsp)(nil),     // 8: FriendAgreeRsp
+	(*FriendRefuseReq)(nil),    // 9: FriendRefuseReq
+	(*FriendRefuseRsp)(nil),    // 10: FriendRefuseRsp
+	(*FriendApplyListReq)(nil), // 11: FriendApplyListReq
+	(*FriendApplyListRsp)(nil), // 12: FriendApplyListRsp
+	(*FriendSearchReq)(nil),    // 13: FriendSearchReq
+	(*FriendSearchRsp)(nil),    // 14: FriendSearchRsp
+	(*FriendBlackListReq)(nil), // 15: FriendBlackListReq
+	(*FriendBlackListRsp)(nil), // 16: FriendBlackListRsp
+	(*FriendBlackAddReq)(nil),  // 17: FriendBlackAddReq
+	(*FriendBlackAddRsp)(nil),  // 18: FriendBlackAddRsp
+	(*FriendDelBlackReq)(nil),  // 19: FriendDelBlackReq
+	(*FriendDelBlackRsp)(nil),  // 20: FriendDelBlackRsp
+	(*FriendReceiveReq)(nil),   // 21: FriendReceiveReq
+	(*FriendReceiveRsp)(nil),   // 22: FriendReceiveRsp
+	(*FriendGiveReq)(nil),      // 23: FriendGiveReq
+	(*FriendGiveRsp)(nil),      // 24: FriendGiveRsp
+	(*FriendTotalReq)(nil),     // 25: FriendTotalReq
+	(*FriendTotalRsp)(nil),     // 26: FriendTotalRsp
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
-	0, // 0: Friend_List_Rsp.list:type_name -> FriendBase
-	0, // 1: Friend_ApplyList_Rsp.list:type_name -> FriendBase
-	0, // 2: Friend_Search_Rsp.friend:type_name -> FriendBase
-	0, // 3: Friend_BlackList_Rsp.friends:type_name -> FriendBase
+	0, // 0: FriendListRsp.list:type_name -> FriendBase
+	0, // 1: FriendApplyListRsp.list:type_name -> FriendBase
+	0, // 2: FriendSearchRsp.friend:type_name -> FriendBase
+	0, // 3: FriendBlackListRsp.friends:type_name -> FriendBase
 	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
@@ -1558,7 +1555,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_List_Req); i {
+			switch v := v.(*FriendListReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1570,7 +1567,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_List_Rsp); i {
+			switch v := v.(*FriendListRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1582,7 +1579,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Apply_Req); i {
+			switch v := v.(*FriendApplyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1594,7 +1591,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Apply_Rsp); i {
+			switch v := v.(*FriendApplyRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1606,7 +1603,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Del_Req); i {
+			switch v := v.(*FriendDelReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1618,7 +1615,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Del_Rsp); i {
+			switch v := v.(*FriendDelRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1630,7 +1627,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Agree_Req); i {
+			switch v := v.(*FriendAgreeReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1642,7 +1639,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Agree_Rsp); i {
+			switch v := v.(*FriendAgreeRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1654,7 +1651,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Refuse_Req); i {
+			switch v := v.(*FriendRefuseReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1666,7 +1663,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Refuse_Rsp); i {
+			switch v := v.(*FriendRefuseRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1678,7 +1675,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_ApplyList_Req); i {
+			switch v := v.(*FriendApplyListReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1690,7 +1687,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_ApplyList_Rsp); i {
+			switch v := v.(*FriendApplyListRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1702,7 +1699,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Search_Req); i {
+			switch v := v.(*FriendSearchReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1714,7 +1711,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Search_Rsp); i {
+			switch v := v.(*FriendSearchRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1726,7 +1723,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_BlackList_Req); i {
+			switch v := v.(*FriendBlackListReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1738,7 +1735,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_BlackList_Rsp); i {
+			switch v := v.(*FriendBlackListRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1750,7 +1747,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_BlackAdd_Req); i {
+			switch v := v.(*FriendBlackAddReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1762,7 +1759,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_BlackAdd_Rsp); i {
+			switch v := v.(*FriendBlackAddRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1774,7 +1771,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_DelBlack_Req); i {
+			switch v := v.(*FriendDelBlackReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1786,7 +1783,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_DelBlack_Rsp); i {
+			switch v := v.(*FriendDelBlackRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1798,7 +1795,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Receive_Req); i {
+			switch v := v.(*FriendReceiveReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1810,7 +1807,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Receive_Rsp); i {
+			switch v := v.(*FriendReceiveRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1822,7 +1819,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Give_Req); i {
+			switch v := v.(*FriendGiveReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1834,7 +1831,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Give_Rsp); i {
+			switch v := v.(*FriendGiveRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1846,7 +1843,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Total_Req); i {
+			switch v := v.(*FriendTotalReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1858,7 +1855,7 @@ func file_friend_friend_msg_proto_init() {
 			}
 		}
 		file_friend_friend_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Friend_Total_Rsp); i {
+			switch v := v.(*FriendTotalRsp); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index 82e092408..7a52ec9e1 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -430,7 +430,8 @@ type Hero_StrengthenUpStar_Req struct {
 	unknownFields protoimpl.UnknownFields
 
 	HeroObjID string          `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID
-	Items     []*CostCardData `protobuf:"bytes,2,rep,name=items,proto3" json:"items"`         // 消耗卡牌对象ID
+	Hero      []*CostCardData `protobuf:"bytes,2,rep,name=hero,proto3" json:"hero"`           // 消耗卡牌对象ID
+	HeroRace  []*CostCardData `protobuf:"bytes,3,rep,name=heroRace,proto3" json:"heroRace"`   // 消耗种族卡牌对象ID
 }
 
 func (x *Hero_StrengthenUpStar_Req) Reset() {
@@ -472,9 +473,16 @@ func (x *Hero_StrengthenUpStar_Req) GetHeroObjID() string {
 	return ""
 }
 
-func (x *Hero_StrengthenUpStar_Req) GetItems() []*CostCardData {
+func (x *Hero_StrengthenUpStar_Req) GetHero() []*CostCardData {
 	if x != nil {
-		return x.Items
+		return x.Hero
+	}
+	return nil
+}
+
+func (x *Hero_StrengthenUpStar_Req) GetHeroRace() []*CostCardData {
+	if x != nil {
+		return x.HeroRace
 	}
 	return nil
 }
@@ -1111,74 +1119,77 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62,
 	0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x61, 0x0a, 0x19, 0x48, 0x65, 0x72,
-	0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74,
-	0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62,
-	0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f,
-	0x62, 0x6a, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20,
+	0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8d, 0x01, 0x0a, 0x19, 0x48, 0x65,
+	0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53,
+	0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f,
+	0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72,
-	0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x41, 0x0a, 0x1a,
-	0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55,
-	0x70, 0x53, 0x74, 0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65,
-	0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42,
-	0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22,
-	0x82, 0x01, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74,
-	0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c,
-	0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a,
-	0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05,
-	0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62,
-	0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69,
-	0x74, 0x65, 0x6d, 0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72,
-	0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f,
-	0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
-	0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63,
-	0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65,
-	0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70,
+	0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x2c, 0x0a, 0x08, 0x68,
+	0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+	0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x41, 0x0a, 0x1a, 0x48, 0x65, 0x72,
+	0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74,
+	0x61, 0x72, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65,
+	0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x82, 0x01, 0x0a,
+	0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e,
+	0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68,
+	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6b, 0x69,
+	0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73,
+	0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x05, 0x69, 0x74, 0x65,
+	0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f,
+	0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d,
+	0x73, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67,
+	0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x5f, 0x52, 0x65, 0x73, 0x70,
 	0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
 	0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a,
-	0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36,
-	0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52,
-	0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
-	0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72,
-	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47,
-	0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61,
-	0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72,
-	0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55,
-	0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09,
-	0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73,
-	0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75,
-	0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54,
-	0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79,
-	0x70, 0x65, 0x22, 0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d,
-	0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61,
-	0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a,
-	0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4f, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f,
+	0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65,
 	0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68,
-	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74,
-	0x49, 0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62,
-	0x2e, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49,
-	0x74, 0x6d, 0x65, 0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65,
-	0x78, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72,
-	0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f,
-	0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74,
+	0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73,
+	0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x82, 0x01, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x5f,
+	0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62,
+	0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65,
+	0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2f, 0x0a, 0x0a, 0x75, 0x70,
+	0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f,
+	0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x36, 0x0a, 0x16, 0x48,
+	0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65,
+	0x74, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62,
+	0x6a, 0x49, 0x44, 0x22, 0x56, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67,
+	0x6d, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23,
+	0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70,
+	0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68,
+	0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x72, 0x0a, 0x1a, 0x48,
+	0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x45,
+	0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72,
+	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65,
+	0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e,
+	0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45,
+	0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22,
+	0x42, 0x0a, 0x1b, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x47, 0x6f, 0x6e, 0x67, 0x6d, 0x69, 0x6e, 0x67,
+	0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23,
+	0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70,
+	0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68,
+	0x65, 0x72, 0x6f, 0x22, 0x5c, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78,
+	0x69, 0x6e, 0x67, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f,
+	0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2a, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d,
+	0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x74,
+	0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x6d, 0x65,
+	0x73, 0x22, 0x38, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x5f, 0x4a, 0x75, 0x65, 0x78, 0x69, 0x6e,
+	0x67, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x5f, 0x48, 0x65, 0x72,
+	0x6f, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1221,21 +1232,22 @@ var file_hero_hero_msg_proto_depIdxs = []int32{
 	20, // 0: pb.Hero_Info_Rsp.base:type_name -> pb.DB_HeroData
 	20, // 1: pb.Hero_List_Rsp.list:type_name -> pb.DB_HeroData
 	20, // 2: pb.Hero_StrengthenUplv_Resp.hero:type_name -> pb.DB_HeroData
-	7,  // 3: pb.Hero_StrengthenUpStar_Req.items:type_name -> pb.CostCardData
-	20, // 4: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData
-	7,  // 5: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData
-	20, // 6: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData
-	20, // 7: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData
-	20, // 8: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData
-	20, // 9: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData
-	20, // 10: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData
-	4,  // 11: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData
-	20, // 12: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData
-	13, // [13:13] is the sub-list for method output_type
-	13, // [13:13] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
+	7,  // 3: pb.Hero_StrengthenUpStar_Req.hero:type_name -> pb.CostCardData
+	7,  // 4: pb.Hero_StrengthenUpStar_Req.heroRace:type_name -> pb.CostCardData
+	20, // 5: pb.Hero_StrengthenUpStar_Resp.hero:type_name -> pb.DB_HeroData
+	7,  // 6: pb.Hero_StrengthenUpSkill_Req.items:type_name -> pb.CostCardData
+	20, // 7: pb.Hero_StrengthenUpSkill_Resp.hero:type_name -> pb.DB_HeroData
+	20, // 8: pb.Hero_Gongming_Resp.hero:type_name -> pb.DB_HeroData
+	20, // 9: pb.Hero_Gongming_Resp.upStarCard:type_name -> pb.DB_HeroData
+	20, // 10: pb.Hero_GongmingReset_Resp.hero:type_name -> pb.DB_HeroData
+	20, // 11: pb.Hero_GongmingUseEnergy_Resp.hero:type_name -> pb.DB_HeroData
+	4,  // 12: pb.Hero_Juexing_Req.costItmes:type_name -> pb.ItemData
+	20, // 13: pb.Hero_Juexing_Resp.hero:type_name -> pb.DB_HeroData
+	14, // [14:14] is the sub-list for method output_type
+	14, // [14:14] is the sub-list for method input_type
+	14, // [14:14] is the sub-list for extension type_name
+	14, // [14:14] is the sub-list for extension extendee
+	0,  // [0:14] is the sub-list for field type_name
 }
 
 func init() { file_hero_hero_msg_proto_init() }
diff --git a/pb/proto/friend/friend_db.proto b/pb/proto/friend/friend_db.proto
index f09779d6a..e4944d2c2 100644
--- a/pb/proto/friend/friend_db.proto
+++ b/pb/proto/friend/friend_db.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 option go_package = ".;pb";
 
-message DB_FriendData {
+message DBFriend {
   string uId = 1;                //@go_tags(`bson:"uId"`) 用户ID
   repeated string friendIds = 2; //@go_tags(`bson:"friendIds"`) 好友ID
   repeated string applyIds = 3;  //@go_tags(`bson:"applyIds"`) 申请用户ID
diff --git a/pb/proto/friend/friend_msg.proto b/pb/proto/friend/friend_msg.proto
index 4498a9984..5b25eacdb 100644
--- a/pb/proto/friend/friend_msg.proto
+++ b/pb/proto/friend/friend_msg.proto
@@ -12,97 +12,97 @@ message FriendBase {
 }
 
 //好友列表
-message Friend_List_Req {}
+message FriendListReq {}
 
-message Friend_List_Rsp { repeated FriendBase list = 1; }
+message FriendListRsp { repeated FriendBase list = 1; }
 
 //申请好友
-message Friend_Apply_Req {
+message FriendApplyReq {
   string friendId = 1; //好友ID
 }
-message Friend_Apply_Rsp {
+message FriendApplyRsp {
   string userId = 1;   //用户ID
   string friendId = 2; //好友ID
 }
 
 //删除好友
-message Friend_Del_Req {
+message FriendDelReq {
   string friendId = 1; //好友ID
 }
 
-message Friend_Del_Rsp {
+message FriendDelRsp {
   string friendId = 1; //好友ID
   string userId = 2;   //用户ID
 }
 
 //同意
-message Friend_Agree_Req {
+message FriendAgreeReq {
   repeated string friendIds = 1; //被同意的用户
 }
-message Friend_Agree_Rsp {
+message FriendAgreeRsp {
   int32 Num = 1; //操作的数量
 }
 
 //拒绝
-message Friend_Refuse_Req {
+message FriendRefuseReq {
   repeated string friendIds = 1; //被拒绝的用户
 }
-message Friend_Refuse_Rsp {
+message FriendRefuseRsp {
   int32 Num = 1; //操作的数量
 }
 
 //好友申请列表
-message Friend_ApplyList_Req {}
-message Friend_ApplyList_Rsp { repeated FriendBase list = 1; }
+message FriendApplyListReq {}
+message FriendApplyListRsp { repeated FriendBase list = 1; }
 
 //好友搜索
-message Friend_Search_Req {
+message FriendSearchReq {
   string nickName = 1; //好友昵称
 }
 
-message Friend_Search_Rsp { FriendBase friend = 1; }
+message FriendSearchRsp { FriendBase friend = 1; }
 
 //黑名单
-message Friend_BlackList_Req {}
+message FriendBlackListReq {}
 
-message Friend_BlackList_Rsp { repeated FriendBase friends = 1; }
+message FriendBlackListRsp { repeated FriendBase friends = 1; }
 
 //添加黑名单
-message Friend_BlackAdd_Req { string friendId = 1; }
+message FriendBlackAddReq { string friendId = 1; }
 
-message Friend_BlackAdd_Rsp {
+message FriendBlackAddRsp {
   string friendId = 1;
   string userId = 2;
 }
 
 //删除黑名单
-message Friend_DelBlack_Req { string friendId = 1; }
+message FriendDelBlackReq { string friendId = 1; }
 
-message Friend_DelBlack_Rsp {
+message FriendDelBlackRsp {
   string friendId = 1;
   string userId = 2;
 }
 
 //接收
-message Friend_Receive_Req { string friendId = 1; }
+message FriendReceiveReq { string friendId = 1; }
 
-message Friend_Receive_Rsp {
+message FriendReceiveRsp {
   string friendId = 1;
   string userId = 2;
 }
 
 //赠送
-message Friend_Give_Req { string friendId = 1; }
+message FriendGiveReq { string friendId = 1; }
 
-message Friend_Give_Rsp {
+message FriendGiveRsp {
   string friendId = 1;
   string userId = 2;
 }
 
 //好友数量
-message Friend_Total_Req { string friendId = 1; }
+message FriendTotalReq { string friendId = 1; }
 
-message Friend_Total_Rsp {
+message FriendTotalRsp {
   string friendId = 1;
   int32 total = 2; //好友数量
 }
\ No newline at end of file