diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go
index 5c57ef68c..f17577b20 100644
--- a/cmd/robot/friend.go
+++ b/cmd/robot/friend.go
@@ -15,14 +15,14 @@ var (
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeList,
 			req:      &pb.FriendListReq{},
-			rsp:      &pb.FriendListRsp{},
-			enabled:  true,
+			rsp:      &pb.FriendListResp{},
+			// enabled:  true,
 		}, {
 			//blacklist
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeBlacklist,
 			req:      &pb.FriendBlackListReq{},
-			rsp:      &pb.FriendBlackListRsp{},
+			rsp:      &pb.FriendBlackListResp{},
 		}, {
 			//search
 			mainType: string(comm.ModuleFriend),
@@ -30,33 +30,33 @@ var (
 			req: &pb.FriendSearchReq{
 				NickName: "", //设置测试参数
 			},
-			rsp:     &pb.FriendSearchRsp{},
-			enabled: true,
+			rsp:     &pb.FriendSearchResp{},
+			// enabled: true,
 		}, {
 			//apply
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeApply,
 			req:      &pb.FriendApplyReq{},
-			rsp:      &pb.FriendApplyRsp{},
+			rsp:      &pb.FriendApplyResp{},
 			// enabled:  true,
 		}, {
 			//applylist
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeApplyList,
 			req:      &pb.FriendApplyListReq{},
-			rsp:      &pb.FriendApplyListRsp{},
+			rsp:      &pb.FriendApplyListResp{},
 		}, {
 			//agree
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeAgree,
 			req:      &pb.FriendAgreeReq{},
-			rsp:      &pb.FriendAgreeRsp{},
+			rsp:      &pb.FriendAgreeResp{},
 		}, {
 			//refuse
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeRefuse,
 			req:      &pb.FriendAgreeReq{},
-			rsp:      &pb.FriendAgreeRsp{},
+			rsp:      &pb.FriendAgreeResp{},
 		}, {
 			//addblack
 			mainType: string(comm.ModuleFriend),
@@ -64,14 +64,14 @@ var (
 			req: &pb.FriendBlackAddReq{
 				FriendId: "0_62be9f40f67327fb53039b70",
 			},
-			rsp: &pb.FriendBlackAddRsp{},
+			rsp: &pb.FriendBlackAddResp{},
 			// enabled: true,
 		}, {
 			//delblack
 			mainType: string(comm.ModuleFriend),
 			subType:  friend.FriendSubTypeDelBlack,
 			req:      &pb.FriendDelBlackReq{},
-			rsp:      &pb.FriendDelBlackRsp{},
+			rsp:      &pb.FriendDelBlackResp{},
 		},
 	}
 )
diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go
index e131373af..667e7cadd 100644
--- a/cmd/robot/hero.go
+++ b/cmd/robot/hero.go
@@ -17,21 +17,21 @@ var (
 			mainType: string(comm.ModuleHero),
 			subType:  hero.HeroSubTypeList,
 			req:      &pb.HeroListReq{},
-			rsp:      &pb.HeroListRsp{},
+			rsp:     &pb.HeroListResp{},
 			print: func(rsp proto.Message) {
-				out := rsp.(*pb.HeroListRsp)
+				out := rsp.(*pb.HeroListResp)
 				for i, v := range out.List {
 					fmt.Printf("%d- %v\n", (i + 1), v)
 				}
 			},
-			// enabled: true,
+			enabled: true,
 		}, {
 			mainType: string(comm.ModuleHero),
 			subType:  hero.HeroSubTypeInfo,
 			req: &pb.HeroInfoReq{
 				HeroId: "62baac19aa7c09b3679be57c",
 			},
-			rsp: &pb.HeroInfoRsp{},
+			rsp: &pb.HeroInfoResp{},
 			// enabled: true,
 		}, {
 			mainType: string(comm.ModuleHero),
diff --git a/cmd/robot/login.go b/cmd/robot/login.go
index 7100eaf65..e700d5de9 100644
--- a/cmd/robot/login.go
+++ b/cmd/robot/login.go
@@ -43,7 +43,7 @@ func (r *Robot) AccountLogin() {
 				Account: r.opts.Account,
 				Sid:     r.opts.ServerId,
 			},
-			rsp:     &pb.UserLoginResp{},
+			rsp:    &pb.UserLoginResp{},
 			enabled: true,
 		},
 	}
diff --git a/cmd/robot/notify.go b/cmd/robot/notify.go
index effd2412e..345c3b547 100644
--- a/cmd/robot/notify.go
+++ b/cmd/robot/notify.go
@@ -10,7 +10,7 @@ var notify_builders = []*TestCase{
 		//create
 		mainType: comm.MainTypeNotify,
 		subType:  comm.SubTypeErrorNotify,
-		rsp:      &pb.NotifyErrorNotifyPush{},
+		rsp:     &pb.NotifyErrorNotifyPush{},
 		enabled:  true,
 	},
 }
diff --git a/cmd/robot/pack.go b/cmd/robot/pack.go
index 565b8b2dc..6b2ac010c 100644
--- a/cmd/robot/pack.go
+++ b/cmd/robot/pack.go
@@ -12,7 +12,7 @@ var pack_builders = []*TestCase{
 		mainType: string(comm.ModulePack),
 		subType:  "queryuserpackreq",
 		// req:      &pb.Pack_Getlist_Req{IType: 1},
-		rsp:     &pb.UserCreateRsp{},
+		rsp:    &pb.UserCreateResp{},
 		enabled: true,
 	},
 }
diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go
index a3a54be59..02ff0c90c 100644
--- a/cmd/robot/robot.go
+++ b/cmd/robot/robot.go
@@ -201,7 +201,7 @@ func (r *Robot) AccountRegister(account string, sid int32) {
 	defer rsp.Body.Close()
 
 	body, _ := ioutil.ReadAll(rsp.Body)
-	regRsp := &pb.UserRegisterRsp{}
+	regRsp := &pb.UserRegisterResp{}
 	err = jsoniter.Unmarshal(body, regRsp)
 
 	if regRsp.Code == pb.ErrorCode_Success { //注册成功
diff --git a/cmd/robot/user.go b/cmd/robot/user.go
index e69d0d740..bc5bc73d1 100644
--- a/cmd/robot/user.go
+++ b/cmd/robot/user.go
@@ -16,8 +16,8 @@ var user_builders = []*TestCase{
 		req: &pb.UserCreateReq{ //设置请求参数
 			NickName: "乐谷6301",
 		},
-		rsp: &pb.UserCreateRsp{},
-		// enabled: true,
+		rsp:     &pb.UserCreateResp{},
+		enabled: true,
 	}, {
 		Desc:     "添加资源",
 		mainType: string(comm.ModuleUser),
@@ -26,8 +26,8 @@ var user_builders = []*TestCase{
 			ResType: comm.ResGold,
 			Count:   100,
 		},
-		rsp:     &pb.UserAddResResp{},
-		enabled: true,
+		rsp: &pb.UserAddResResp{},
+		// enabled: true,
 	},
 }
 
diff --git a/modules/equipment/api_getlist.go b/modules/equipment/api_getlist.go
index 8656cf0b7..1c6c5a7ca 100644
--- a/modules/equipment/api_getlist.go
+++ b/modules/equipment/api_getlist.go
@@ -22,7 +22,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetList
 	)
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.module.GetType()), "", &pb.EquipmentGetListResp{Equipments: items})
+			session.SendMsg(string(this.module.GetType()), "getlist", &pb.EquipmentGetListResp{Equipments: items})
 		}
 	}()
 	if items, err = this.module.modelEquipment.QueryUserEquipments(session.GetUserId()); err != nil {
diff --git a/modules/friend/api_addblack.go b/modules/friend/api_addblack.go
index 71d29b83e..6fb568712 100644
--- a/modules/friend/api_addblack.go
+++ b/modules/friend/api_addblack.go
@@ -21,15 +21,15 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendBlackAddR
 		err    error
 		self   *pb.DBFriend
 		target *pb.DBFriend
-		rsp    *pb.FriendBlackAddRsp
+		Resp    *pb.FriendBlackAddResp
 	)
 
 	defer func() {
-		rsp = &pb.FriendBlackAddRsp{
+		Resp = &pb.FriendBlackAddResp{
 			FriendId: req.FriendId,
 			UserId:   session.GetUserId(),
 		}
-		session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, rsp)
+		session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, Resp)
 	}()
 
 	self = this.module.modelFriend.GetFriend(session.GetUserId())
diff --git a/modules/friend/api_agree.go b/modules/friend/api_agree.go
index b013ea8aa..a6a0225ed 100644
--- a/modules/friend/api_agree.go
+++ b/modules/friend/api_agree.go
@@ -22,15 +22,15 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (c
 		err    error
 		self   *pb.DBFriend
 		target *pb.DBFriend
-		rsp    *pb.FriendAgreeRsp
+		Resp    *pb.FriendAgreeResp
 		optNum int32
 	)
 
 	defer func() {
-		rsp = &pb.FriendAgreeRsp{
+		Resp = &pb.FriendAgreeResp{
 			Num: optNum,
 		}
-		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, Resp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/friend/api_apply.go b/modules/friend/api_apply.go
index 938997d1d..444d30955 100644
--- a/modules/friend/api_apply.go
+++ b/modules/friend/api_apply.go
@@ -22,21 +22,21 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (c
 		err    error
 		self   *pb.DBFriend
 		target *pb.DBFriend
-		rsp    *pb.FriendApplyRsp
+		Resp    *pb.FriendApplyResp
 	)
 
 	defer func() {
-		utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, rsp)
+		utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, Resp)
 	}()
 
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.FriendApplyRsp{
+			Resp = &pb.FriendApplyResp{
 				UserId:   session.GetUserId(),
 				FriendId: req.FriendId,
 			}
 		}
-		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, Resp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/friend/api_applylist.go b/modules/friend/api_applylist.go
index eb06c5ab3..b7c235208 100644
--- a/modules/friend/api_applylist.go
+++ b/modules/friend/api_applylist.go
@@ -15,17 +15,17 @@ func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyLis
 	var (
 		err  error
 		self *pb.DBFriend
-		rsp  *pb.FriendApplyListRsp
+		Resp  *pb.FriendApplyListResp
 		list []*pb.FriendBase
 	)
 
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.FriendApplyListRsp{
+			Resp = &pb.FriendApplyListResp{
 				List: list,
 			}
 		}
-		if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApplyList, rsp); err != nil {
+		if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApplyList, Resp); err != nil {
 			code = pb.ErrorCode_SystemError
 		}
 	}()
diff --git a/modules/friend/api_blacklist.go b/modules/friend/api_blacklist.go
index 000f5c957..91c9174d6 100644
--- a/modules/friend/api_blacklist.go
+++ b/modules/friend/api_blacklist.go
@@ -16,16 +16,16 @@ func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackLis
 	var (
 		err  error
 		self *pb.DBFriend
-		rsp  *pb.FriendBlackListRsp
+		Resp  *pb.FriendBlackListResp
 		list []*pb.FriendBase
 	)
 
 	defer func() {
-		rsp = &pb.FriendBlackListRsp{
+		Resp = &pb.FriendBlackListResp{
 			Friends: list,
 		}
 
-		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, Resp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/friend/api_delblack.go b/modules/friend/api_delblack.go
index 91f579c1c..bd4cbaf59 100644
--- a/modules/friend/api_delblack.go
+++ b/modules/friend/api_delblack.go
@@ -20,16 +20,16 @@ func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackR
 	var (
 		err  error
 		self *pb.DBFriend
-		rsp  *pb.FriendDelBlackRsp
+		Resp  *pb.FriendDelBlackResp
 	)
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.FriendDelBlackRsp{
+			Resp = &pb.FriendDelBlackResp{
 				FriendId: req.FriendId,
 				UserId:   session.GetUserId(),
 			}
 		}
-		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, Resp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/friend/api_list.go b/modules/friend/api_list.go
index dec98cbd3..e625e5414 100644
--- a/modules/friend/api_list.go
+++ b/modules/friend/api_list.go
@@ -15,15 +15,15 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq)
 func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data proto.Message) {
 	var (
 		self *pb.DBFriend
-		rsp  *pb.FriendListRsp
+		Resp  *pb.FriendListResp
 		list []*pb.FriendBase
 	)
 
 	defer func() {
-		rsp = &pb.FriendListRsp{
+		Resp = &pb.FriendListResp{
 			List: list,
 		}
-		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, Resp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/friend/api_refuse.go b/modules/friend/api_refuse.go
index 95b9f5ea9..c84b7d14a 100644
--- a/modules/friend/api_refuse.go
+++ b/modules/friend/api_refuse.go
@@ -22,15 +22,15 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq)
 	var (
 		err    error
 		self   *pb.DBFriend
-		rsp    *pb.FriendRefuseRsp
+		Resp    *pb.FriendRefuseResp
 		optNum int32
 	)
 	defer func() {
-		rsp = &pb.FriendRefuseRsp{
+		Resp = &pb.FriendRefuseResp{
 			Num: optNum,
 		}
 
-		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, rsp)
+		err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, Resp)
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 			return
diff --git a/modules/friend/api_search.go b/modules/friend/api_search.go
index eada9698d..6c649c314 100644
--- a/modules/friend/api_search.go
+++ b/modules/friend/api_search.go
@@ -18,16 +18,16 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch
 //搜索
 func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		rsp    *pb.FriendSearchRsp
+		Resp    *pb.FriendSearchResp
 		friend *pb.FriendBase
 	)
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			rsp = &pb.FriendSearchRsp{
+			Resp = &pb.FriendSearchResp{
 				Friend: friend,
 			}
 		}
-		if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeSearch, rsp); err != nil {
+		if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeSearch, Resp); err != nil {
 			code = pb.ErrorCode_SystemError
 		}
 	}()
diff --git a/modules/hero/api_info.go b/modules/hero/api_info.go
index fc7fceea2..f303e20e1 100644
--- a/modules/hero/api_info.go
+++ b/modules/hero/api_info.go
@@ -14,7 +14,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (
 }
 
 func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data proto.Message) {
-	rsp := &pb.HeroInfoRsp{}
+	rsp := &pb.HeroInfoResp{}
 	defer func() {
 		err := session.SendMsg(string(this.module.GetType()), HeroSubTypeInfo, rsp)
 		if err != nil {
diff --git a/modules/hero/api_list.go b/modules/hero/api_list.go
index 397c6bbc2..32c4928ab 100644
--- a/modules/hero/api_list.go
+++ b/modules/hero/api_list.go
@@ -14,7 +14,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.HeroListReq) (
 }
 
 func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data proto.Message) {
-	rsp := &pb.HeroListRsp{}
+	rsp := &pb.HeroListResp{}
 
 	defer func() {
 		err := session.SendMsg(string(this.module.GetType()), HeroSubTypeList, rsp)
diff --git a/modules/user/api_create.go b/modules/user/api_create.go
index d3819c255..5a8e6f034 100644
--- a/modules/user/api_create.go
+++ b/modules/user/api_create.go
@@ -22,7 +22,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c
 	defer utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), UserSubTypeCreate, req, nil)
 
 	defer func() {
-		err := session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateRsp{})
+		err := session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{})
 		if err != nil {
 			code = pb.ErrorCode_SystemError
 		}
diff --git a/modules/web/api_comp.go b/modules/web/api_comp.go
index f208480fe..741a823e1 100644
--- a/modules/web/api_comp.go
+++ b/modules/web/api_comp.go
@@ -34,7 +34,7 @@ func (this *Api_Comp) Init(service core.IService, module core.IModule, comp core
 //模拟账户注册
 func (this *Api_Comp) Register(c *engine.Context) {
 	var req pb.UserRegisterReq
-	rsp := &pb.UserRegisterRsp{}
+	rsp := &pb.UserRegisterResp{}
 	err := c.BindJSON(&req)
 	if err == nil {
 		err := this.module.modelUser.User_Create(&pb.DBUser{
diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go
index 2c393abc6..efee3d021 100644
--- a/pb/friend_msg.pb.go
+++ b/pb/friend_msg.pb.go
@@ -154,7 +154,7 @@ func (*FriendListReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{1}
 }
 
-type FriendListRsp struct {
+type FriendListResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -162,8 +162,8 @@ type FriendListRsp struct {
 	List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
-func (x *FriendListRsp) Reset() {
-	*x = FriendListRsp{}
+func (x *FriendListResp) Reset() {
+	*x = FriendListResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -171,13 +171,13 @@ func (x *FriendListRsp) Reset() {
 	}
 }
 
-func (x *FriendListRsp) String() string {
+func (x *FriendListResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendListRsp) ProtoMessage() {}
+func (*FriendListResp) ProtoMessage() {}
 
-func (x *FriendListRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendListResp) 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 *FriendListRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendListRsp.ProtoReflect.Descriptor instead.
-func (*FriendListRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendListResp.ProtoReflect.Descriptor instead.
+func (*FriendListResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *FriendListRsp) GetList() []*FriendBase {
+func (x *FriendListResp) GetList() []*FriendBase {
 	if x != nil {
 		return x.List
 	}
@@ -249,7 +249,7 @@ func (x *FriendApplyReq) GetFriendId() string {
 	return ""
 }
 
-type FriendApplyRsp struct {
+type FriendApplyResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -258,8 +258,8 @@ type FriendApplyRsp struct {
 	FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID
 }
 
-func (x *FriendApplyRsp) Reset() {
-	*x = FriendApplyRsp{}
+func (x *FriendApplyResp) Reset() {
+	*x = FriendApplyResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -267,13 +267,13 @@ func (x *FriendApplyRsp) Reset() {
 	}
 }
 
-func (x *FriendApplyRsp) String() string {
+func (x *FriendApplyResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendApplyRsp) ProtoMessage() {}
+func (*FriendApplyResp) ProtoMessage() {}
 
-func (x *FriendApplyRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendApplyResp) 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 *FriendApplyRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendApplyRsp.ProtoReflect.Descriptor instead.
-func (*FriendApplyRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendApplyResp.ProtoReflect.Descriptor instead.
+func (*FriendApplyResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *FriendApplyRsp) GetUserId() string {
+func (x *FriendApplyResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
 	return ""
 }
 
-func (x *FriendApplyRsp) GetFriendId() string {
+func (x *FriendApplyResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
@@ -352,7 +352,7 @@ func (x *FriendDelReq) GetFriendId() string {
 	return ""
 }
 
-type FriendDelRsp struct {
+type FriendDelResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -361,8 +361,8 @@ type FriendDelRsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`     //用户ID
 }
 
-func (x *FriendDelRsp) Reset() {
-	*x = FriendDelRsp{}
+func (x *FriendDelResp) Reset() {
+	*x = FriendDelResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -370,13 +370,13 @@ func (x *FriendDelRsp) Reset() {
 	}
 }
 
-func (x *FriendDelRsp) String() string {
+func (x *FriendDelResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendDelRsp) ProtoMessage() {}
+func (*FriendDelResp) ProtoMessage() {}
 
-func (x *FriendDelRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendDelResp) 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 *FriendDelRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendDelRsp.ProtoReflect.Descriptor instead.
-func (*FriendDelRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendDelResp.ProtoReflect.Descriptor instead.
+func (*FriendDelResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *FriendDelRsp) GetFriendId() string {
+func (x *FriendDelResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendDelRsp) GetUserId() string {
+func (x *FriendDelResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -455,7 +455,7 @@ func (x *FriendAgreeReq) GetFriendIds() []string {
 	return nil
 }
 
-type FriendAgreeRsp struct {
+type FriendAgreeResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -463,8 +463,8 @@ type FriendAgreeRsp struct {
 	Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量
 }
 
-func (x *FriendAgreeRsp) Reset() {
-	*x = FriendAgreeRsp{}
+func (x *FriendAgreeResp) Reset() {
+	*x = FriendAgreeResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -472,13 +472,13 @@ func (x *FriendAgreeRsp) Reset() {
 	}
 }
 
-func (x *FriendAgreeRsp) String() string {
+func (x *FriendAgreeResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendAgreeRsp) ProtoMessage() {}
+func (*FriendAgreeResp) ProtoMessage() {}
 
-func (x *FriendAgreeRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendAgreeResp) 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 *FriendAgreeRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendAgreeRsp.ProtoReflect.Descriptor instead.
-func (*FriendAgreeRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendAgreeResp.ProtoReflect.Descriptor instead.
+func (*FriendAgreeResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *FriendAgreeRsp) GetNum() int32 {
+func (x *FriendAgreeResp) GetNum() int32 {
 	if x != nil {
 		return x.Num
 	}
@@ -550,7 +550,7 @@ func (x *FriendRefuseReq) GetFriendIds() []string {
 	return nil
 }
 
-type FriendRefuseRsp struct {
+type FriendRefuseResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -558,8 +558,8 @@ type FriendRefuseRsp struct {
 	Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量
 }
 
-func (x *FriendRefuseRsp) Reset() {
-	*x = FriendRefuseRsp{}
+func (x *FriendRefuseResp) Reset() {
+	*x = FriendRefuseResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -567,13 +567,13 @@ func (x *FriendRefuseRsp) Reset() {
 	}
 }
 
-func (x *FriendRefuseRsp) String() string {
+func (x *FriendRefuseResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendRefuseRsp) ProtoMessage() {}
+func (*FriendRefuseResp) ProtoMessage() {}
 
-func (x *FriendRefuseRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendRefuseResp) 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 *FriendRefuseRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendRefuseRsp.ProtoReflect.Descriptor instead.
-func (*FriendRefuseRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendRefuseResp.ProtoReflect.Descriptor instead.
+func (*FriendRefuseResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *FriendRefuseRsp) GetNum() int32 {
+func (x *FriendRefuseResp) GetNum() int32 {
 	if x != nil {
 		return x.Num
 	}
@@ -636,7 +636,7 @@ func (*FriendApplyListReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{11}
 }
 
-type FriendApplyListRsp struct {
+type FriendApplyListResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -644,8 +644,8 @@ type FriendApplyListRsp struct {
 	List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
-func (x *FriendApplyListRsp) Reset() {
-	*x = FriendApplyListRsp{}
+func (x *FriendApplyListResp) Reset() {
+	*x = FriendApplyListResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -653,13 +653,13 @@ func (x *FriendApplyListRsp) Reset() {
 	}
 }
 
-func (x *FriendApplyListRsp) String() string {
+func (x *FriendApplyListResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendApplyListRsp) ProtoMessage() {}
+func (*FriendApplyListResp) ProtoMessage() {}
 
-func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendApplyListResp) 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 *FriendApplyListRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendApplyListRsp.ProtoReflect.Descriptor instead.
-func (*FriendApplyListRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendApplyListResp.ProtoReflect.Descriptor instead.
+func (*FriendApplyListResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *FriendApplyListRsp) GetList() []*FriendBase {
+func (x *FriendApplyListResp) GetList() []*FriendBase {
 	if x != nil {
 		return x.List
 	}
@@ -731,7 +731,7 @@ func (x *FriendSearchReq) GetNickName() string {
 	return ""
 }
 
-type FriendSearchRsp struct {
+type FriendSearchResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -739,8 +739,8 @@ type FriendSearchRsp struct {
 	Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"`
 }
 
-func (x *FriendSearchRsp) Reset() {
-	*x = FriendSearchRsp{}
+func (x *FriendSearchResp) Reset() {
+	*x = FriendSearchResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -748,13 +748,13 @@ func (x *FriendSearchRsp) Reset() {
 	}
 }
 
-func (x *FriendSearchRsp) String() string {
+func (x *FriendSearchResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendSearchRsp) ProtoMessage() {}
+func (*FriendSearchResp) ProtoMessage() {}
 
-func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendSearchResp) 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 *FriendSearchRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendSearchRsp.ProtoReflect.Descriptor instead.
-func (*FriendSearchRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendSearchResp.ProtoReflect.Descriptor instead.
+func (*FriendSearchResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *FriendSearchRsp) GetFriend() *FriendBase {
+func (x *FriendSearchResp) GetFriend() *FriendBase {
 	if x != nil {
 		return x.Friend
 	}
@@ -817,7 +817,7 @@ func (*FriendBlackListReq) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{15}
 }
 
-type FriendBlackListRsp struct {
+type FriendBlackListResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -825,8 +825,8 @@ type FriendBlackListRsp struct {
 	Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"`
 }
 
-func (x *FriendBlackListRsp) Reset() {
-	*x = FriendBlackListRsp{}
+func (x *FriendBlackListResp) Reset() {
+	*x = FriendBlackListResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -834,13 +834,13 @@ func (x *FriendBlackListRsp) Reset() {
 	}
 }
 
-func (x *FriendBlackListRsp) String() string {
+func (x *FriendBlackListResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendBlackListRsp) ProtoMessage() {}
+func (*FriendBlackListResp) ProtoMessage() {}
 
-func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendBlackListResp) 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 *FriendBlackListRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendBlackListRsp.ProtoReflect.Descriptor instead.
-func (*FriendBlackListRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendBlackListResp.ProtoReflect.Descriptor instead.
+func (*FriendBlackListResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{16}
 }
 
-func (x *FriendBlackListRsp) GetFriends() []*FriendBase {
+func (x *FriendBlackListResp) GetFriends() []*FriendBase {
 	if x != nil {
 		return x.Friends
 	}
@@ -912,7 +912,7 @@ func (x *FriendBlackAddReq) GetFriendId() string {
 	return ""
 }
 
-type FriendBlackAddRsp struct {
+type FriendBlackAddResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -921,8 +921,8 @@ type FriendBlackAddRsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *FriendBlackAddRsp) Reset() {
-	*x = FriendBlackAddRsp{}
+func (x *FriendBlackAddResp) Reset() {
+	*x = FriendBlackAddResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -930,13 +930,13 @@ func (x *FriendBlackAddRsp) Reset() {
 	}
 }
 
-func (x *FriendBlackAddRsp) String() string {
+func (x *FriendBlackAddResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendBlackAddRsp) ProtoMessage() {}
+func (*FriendBlackAddResp) ProtoMessage() {}
 
-func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendBlackAddResp) 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 *FriendBlackAddRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendBlackAddRsp.ProtoReflect.Descriptor instead.
-func (*FriendBlackAddRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendBlackAddResp.ProtoReflect.Descriptor instead.
+func (*FriendBlackAddResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{18}
 }
 
-func (x *FriendBlackAddRsp) GetFriendId() string {
+func (x *FriendBlackAddResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendBlackAddRsp) GetUserId() string {
+func (x *FriendBlackAddResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1015,7 +1015,7 @@ func (x *FriendDelBlackReq) GetFriendId() string {
 	return ""
 }
 
-type FriendDelBlackRsp struct {
+type FriendDelBlackResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1024,8 +1024,8 @@ type FriendDelBlackRsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *FriendDelBlackRsp) Reset() {
-	*x = FriendDelBlackRsp{}
+func (x *FriendDelBlackResp) Reset() {
+	*x = FriendDelBlackResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1033,13 +1033,13 @@ func (x *FriendDelBlackRsp) Reset() {
 	}
 }
 
-func (x *FriendDelBlackRsp) String() string {
+func (x *FriendDelBlackResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendDelBlackRsp) ProtoMessage() {}
+func (*FriendDelBlackResp) ProtoMessage() {}
 
-func (x *FriendDelBlackRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendDelBlackResp) 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 *FriendDelBlackRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendDelBlackRsp.ProtoReflect.Descriptor instead.
-func (*FriendDelBlackRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendDelBlackResp.ProtoReflect.Descriptor instead.
+func (*FriendDelBlackResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *FriendDelBlackRsp) GetFriendId() string {
+func (x *FriendDelBlackResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendDelBlackRsp) GetUserId() string {
+func (x *FriendDelBlackResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1118,7 +1118,7 @@ func (x *FriendReceiveReq) GetFriendId() string {
 	return ""
 }
 
-type FriendReceiveRsp struct {
+type FriendReceiveResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1127,8 +1127,8 @@ type FriendReceiveRsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *FriendReceiveRsp) Reset() {
-	*x = FriendReceiveRsp{}
+func (x *FriendReceiveResp) Reset() {
+	*x = FriendReceiveResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1136,13 +1136,13 @@ func (x *FriendReceiveRsp) Reset() {
 	}
 }
 
-func (x *FriendReceiveRsp) String() string {
+func (x *FriendReceiveResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendReceiveRsp) ProtoMessage() {}
+func (*FriendReceiveResp) ProtoMessage() {}
 
-func (x *FriendReceiveRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendReceiveResp) 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 *FriendReceiveRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendReceiveRsp.ProtoReflect.Descriptor instead.
-func (*FriendReceiveRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendReceiveResp.ProtoReflect.Descriptor instead.
+func (*FriendReceiveResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *FriendReceiveRsp) GetFriendId() string {
+func (x *FriendReceiveResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendReceiveRsp) GetUserId() string {
+func (x *FriendReceiveResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1221,7 +1221,7 @@ func (x *FriendGiveReq) GetFriendId() string {
 	return ""
 }
 
-type FriendGiveRsp struct {
+type FriendGiveResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1230,8 +1230,8 @@ type FriendGiveRsp struct {
 	UserId   string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
 }
 
-func (x *FriendGiveRsp) Reset() {
-	*x = FriendGiveRsp{}
+func (x *FriendGiveResp) Reset() {
+	*x = FriendGiveResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1239,13 +1239,13 @@ func (x *FriendGiveRsp) Reset() {
 	}
 }
 
-func (x *FriendGiveRsp) String() string {
+func (x *FriendGiveResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendGiveRsp) ProtoMessage() {}
+func (*FriendGiveResp) ProtoMessage() {}
 
-func (x *FriendGiveRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendGiveResp) 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 *FriendGiveRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendGiveRsp.ProtoReflect.Descriptor instead.
-func (*FriendGiveRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendGiveResp.ProtoReflect.Descriptor instead.
+func (*FriendGiveResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *FriendGiveRsp) GetFriendId() string {
+func (x *FriendGiveResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendGiveRsp) GetUserId() string {
+func (x *FriendGiveResp) GetUserId() string {
 	if x != nil {
 		return x.UserId
 	}
@@ -1324,7 +1324,7 @@ func (x *FriendTotalReq) GetFriendId() string {
 	return ""
 }
 
-type FriendTotalRsp struct {
+type FriendTotalResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -1333,8 +1333,8 @@ type FriendTotalRsp struct {
 	Total    int32  `protobuf:"varint,2,opt,name=total,proto3" json:"total"` //好友数量
 }
 
-func (x *FriendTotalRsp) Reset() {
-	*x = FriendTotalRsp{}
+func (x *FriendTotalResp) Reset() {
+	*x = FriendTotalResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_friend_friend_msg_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1342,13 +1342,13 @@ func (x *FriendTotalRsp) Reset() {
 	}
 }
 
-func (x *FriendTotalRsp) String() string {
+func (x *FriendTotalResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*FriendTotalRsp) ProtoMessage() {}
+func (*FriendTotalResp) ProtoMessage() {}
 
-func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message {
+func (x *FriendTotalResp) 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 *FriendTotalRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use FriendTotalRsp.ProtoReflect.Descriptor instead.
-func (*FriendTotalRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use FriendTotalResp.ProtoReflect.Descriptor instead.
+func (*FriendTotalResp) Descriptor() ([]byte, []int) {
 	return file_friend_friend_msg_proto_rawDescGZIP(), []int{26}
 }
 
-func (x *FriendTotalRsp) GetFriendId() string {
+func (x *FriendTotalResp) GetFriendId() string {
 	if x != nil {
 		return x.FriendId
 	}
 	return ""
 }
 
-func (x *FriendTotalRsp) GetTotal() int32 {
+func (x *FriendTotalResp) GetTotal() int32 {
 	if x != nil {
 		return x.Total
 	}
@@ -1397,89 +1397,90 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	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, 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,
+	0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 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, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 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, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69,
+	0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 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, 0x23,
+	0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x4e, 0x75, 0x6d, 0x22, 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, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65,
+	0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 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, 0x36, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 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, 0x37, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e,
+	0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 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, 0x3c, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
+	0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 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, 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, 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,
+	0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42,
+	0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 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, 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,
-	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, 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, 0x47, 0x0a,
-	0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52,
+	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, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61,
+	0x63, 0x6b, 0x52, 0x65, 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, 0x47, 0x0a, 0x11, 0x46, 0x72,
+	0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 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, 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, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65,
 	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, 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, 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,
+	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, 0x43, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f,
+	0x74, 0x61, 0x6c, 0x52, 0x65, 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 (
@@ -1496,39 +1497,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
-	(*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
+	(*FriendBase)(nil),          // 0: FriendBase
+	(*FriendListReq)(nil),       // 1: FriendListReq
+	(*FriendListResp)(nil),      // 2: FriendListResp
+	(*FriendApplyReq)(nil),      // 3: FriendApplyReq
+	(*FriendApplyResp)(nil),     // 4: FriendApplyResp
+	(*FriendDelReq)(nil),        // 5: FriendDelReq
+	(*FriendDelResp)(nil),       // 6: FriendDelResp
+	(*FriendAgreeReq)(nil),      // 7: FriendAgreeReq
+	(*FriendAgreeResp)(nil),     // 8: FriendAgreeResp
+	(*FriendRefuseReq)(nil),     // 9: FriendRefuseReq
+	(*FriendRefuseResp)(nil),    // 10: FriendRefuseResp
+	(*FriendApplyListReq)(nil),  // 11: FriendApplyListReq
+	(*FriendApplyListResp)(nil), // 12: FriendApplyListResp
+	(*FriendSearchReq)(nil),     // 13: FriendSearchReq
+	(*FriendSearchResp)(nil),    // 14: FriendSearchResp
+	(*FriendBlackListReq)(nil),  // 15: FriendBlackListReq
+	(*FriendBlackListResp)(nil), // 16: FriendBlackListResp
+	(*FriendBlackAddReq)(nil),   // 17: FriendBlackAddReq
+	(*FriendBlackAddResp)(nil),  // 18: FriendBlackAddResp
+	(*FriendDelBlackReq)(nil),   // 19: FriendDelBlackReq
+	(*FriendDelBlackResp)(nil),  // 20: FriendDelBlackResp
+	(*FriendReceiveReq)(nil),    // 21: FriendReceiveReq
+	(*FriendReceiveResp)(nil),   // 22: FriendReceiveResp
+	(*FriendGiveReq)(nil),       // 23: FriendGiveReq
+	(*FriendGiveResp)(nil),      // 24: FriendGiveResp
+	(*FriendTotalReq)(nil),      // 25: FriendTotalReq
+	(*FriendTotalResp)(nil),     // 26: FriendTotalResp
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
-	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
+	0, // 0: FriendListResp.list:type_name -> FriendBase
+	0, // 1: FriendApplyListResp.list:type_name -> FriendBase
+	0, // 2: FriendSearchResp.friend:type_name -> FriendBase
+	0, // 3: FriendBlackListResp.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
@@ -1567,7 +1568,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.(*FriendListRsp); i {
+			switch v := v.(*FriendListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1591,7 +1592,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.(*FriendApplyRsp); i {
+			switch v := v.(*FriendApplyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1615,7 +1616,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.(*FriendDelRsp); i {
+			switch v := v.(*FriendDelResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1639,7 +1640,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.(*FriendAgreeRsp); i {
+			switch v := v.(*FriendAgreeResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1663,7 +1664,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.(*FriendRefuseRsp); i {
+			switch v := v.(*FriendRefuseResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1687,7 +1688,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.(*FriendApplyListRsp); i {
+			switch v := v.(*FriendApplyListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1711,7 +1712,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.(*FriendSearchRsp); i {
+			switch v := v.(*FriendSearchResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1735,7 +1736,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.(*FriendBlackListRsp); i {
+			switch v := v.(*FriendBlackListResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1759,7 +1760,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.(*FriendBlackAddRsp); i {
+			switch v := v.(*FriendBlackAddResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1783,7 +1784,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.(*FriendDelBlackRsp); i {
+			switch v := v.(*FriendDelBlackResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1807,7 +1808,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.(*FriendReceiveRsp); i {
+			switch v := v.(*FriendReceiveResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1831,7 +1832,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.(*FriendGiveRsp); i {
+			switch v := v.(*FriendGiveResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1855,7 +1856,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.(*FriendTotalRsp); i {
+			switch v := v.(*FriendTotalResp); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index 1fa8bc268..e4b177c6f 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -99,7 +99,7 @@ type DBHero struct {
 	EquipID              []string         `protobuf:"bytes,17,rep,name=equipID,proto3" json:"equipID" bson:"equipID"`                                                                                                      //装备 objID
 	ResonateNum          int32            `protobuf:"varint,18,opt,name=resonateNum,proto3" json:"resonateNum" bson:"resonateNum"`                                                                                         //共鸣次数
 	DistributionResonate int32            `protobuf:"varint,19,opt,name=distributionResonate,proto3" json:"distributionResonate" bson:"distributionResonate"`                                                              //分配的共鸣能量
-	Energy               map[int32]int32  `protobuf:"bytes,20,rep,name=energy,proto3" json:"energy" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`                             // @go_tags(`bson:"energy"`)能量分配到哪里
+	Energy               map[int32]int32  `protobuf:"bytes,20,rep,name=energy,proto3" json:"energy" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`                             // @go_tags(`bson:"energy"`)能量分配到哪里[1,0]
 	SameCount            int32            `protobuf:"varint,21,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"`                                                                                               // 卡片叠加数量
 	SuiteId              int32            `protobuf:"varint,22,opt,name=suiteId,proto3" json:"suiteId" bson:"suiteId"`                                                                                                     // 套装Id
 	SuiteExtId           int32            `protobuf:"varint,23,opt,name=suiteExtId,proto3" json:"suiteExtId"`                                                                                                              // go_tags(`bson:"suiteExtId"`) 扩展套装Id
diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go
index 6b46ddbd2..09cfd4f33 100644
--- a/pb/hero_msg.pb.go
+++ b/pb/hero_msg.pb.go
@@ -68,7 +68,7 @@ func (x *HeroInfoReq) GetHeroId() string {
 	return ""
 }
 
-type HeroInfoRsp struct {
+type HeroInfoResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -76,8 +76,8 @@ type HeroInfoRsp struct {
 	Base *DBHero `protobuf:"bytes,1,opt,name=base,proto3" json:"base"`
 }
 
-func (x *HeroInfoRsp) Reset() {
-	*x = HeroInfoRsp{}
+func (x *HeroInfoResp) Reset() {
+	*x = HeroInfoResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_hero_hero_msg_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -85,13 +85,13 @@ func (x *HeroInfoRsp) Reset() {
 	}
 }
 
-func (x *HeroInfoRsp) String() string {
+func (x *HeroInfoResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*HeroInfoRsp) ProtoMessage() {}
+func (*HeroInfoResp) ProtoMessage() {}
 
-func (x *HeroInfoRsp) ProtoReflect() protoreflect.Message {
+func (x *HeroInfoResp) ProtoReflect() protoreflect.Message {
 	mi := &file_hero_hero_msg_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -103,12 +103,12 @@ func (x *HeroInfoRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use HeroInfoRsp.ProtoReflect.Descriptor instead.
-func (*HeroInfoRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use HeroInfoResp.ProtoReflect.Descriptor instead.
+func (*HeroInfoResp) Descriptor() ([]byte, []int) {
 	return file_hero_hero_msg_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *HeroInfoRsp) GetBase() *DBHero {
+func (x *HeroInfoResp) GetBase() *DBHero {
 	if x != nil {
 		return x.Base
 	}
@@ -154,7 +154,7 @@ func (*HeroListReq) Descriptor() ([]byte, []int) {
 	return file_hero_hero_msg_proto_rawDescGZIP(), []int{2}
 }
 
-type HeroListRsp struct {
+type HeroListResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -162,8 +162,8 @@ type HeroListRsp struct {
 	List []*DBHero `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
 }
 
-func (x *HeroListRsp) Reset() {
-	*x = HeroListRsp{}
+func (x *HeroListResp) Reset() {
+	*x = HeroListResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_hero_hero_msg_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -171,13 +171,13 @@ func (x *HeroListRsp) Reset() {
 	}
 }
 
-func (x *HeroListRsp) String() string {
+func (x *HeroListResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*HeroListRsp) ProtoMessage() {}
+func (*HeroListResp) ProtoMessage() {}
 
-func (x *HeroListRsp) ProtoReflect() protoreflect.Message {
+func (x *HeroListResp) ProtoReflect() protoreflect.Message {
 	mi := &file_hero_hero_msg_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -189,12 +189,12 @@ func (x *HeroListRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use HeroListRsp.ProtoReflect.Descriptor instead.
-func (*HeroListRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use HeroListResp.ProtoReflect.Descriptor instead.
+func (*HeroListResp) Descriptor() ([]byte, []int) {
 	return file_hero_hero_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *HeroListRsp) GetList() []*DBHero {
+func (x *HeroListResp) GetList() []*DBHero {
 	if x != nil {
 		return x.List
 	}
@@ -1243,117 +1243,117 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72,
 	0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f,
 	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
-	0x22, 0x2a, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x73, 0x70, 0x12,
-	0x1b, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0d, 0x0a, 0x0b,
-	0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x2a, 0x0a, 0x0b, 0x48,
-	0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69,
-	0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
-	0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x44,
-	0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e,
-	0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 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, 0x65, 0x78,
-	0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65,
-	0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x22, 0x35, 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68,
-	0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65,
-	0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
-	0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x43,
-	0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 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, 0x85, 0x01, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67,
-	0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 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, 0x21, 0x0a, 0x04, 0x68,
-	0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74,
-	0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x29,
-	0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48, 0x65, 0x72,
-	0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65,
-	0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67,
-	0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c,
+	0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x1b, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07,
+	0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0d, 0x0a,
+	0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x2b, 0x0a, 0x0c,
+	0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
+	0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
+	0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3a, 0x0a, 0x08, 0x49, 0x74, 0x65,
+	0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a,
+	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72,
+	0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 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, 0x20, 0x0a, 0x0b,
-	0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x22, 0x38,
-	0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e,
-	0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68,
-	0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65,
-	0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f,
-	0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x27, 0x0a, 0x0a, 0x75, 0x70,
-	0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07,
-	0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43,
-	0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e,
-	0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 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, 0x4d, 0x0a, 0x16, 0x48, 0x65,
-	0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x71, 0x0a, 0x19, 0x48, 0x65, 0x72,
-	0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65,
-	0x72, 0x67, 0x79, 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, 0x39, 0x0a, 0x1a,
-	0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65,
-	0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65,
-	0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
-	0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41,
-	0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
+	0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09,
+	0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
+	0x6e, 0x74, 0x22, 0x35, 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67,
+	0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
+	0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
+	0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73,
+	0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 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, 0x85, 0x01, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65,
+	0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 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, 0x21, 0x0a,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f,
+	0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f,
+	0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74,
+	0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48,
+	0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53,
+	0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
+	0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65,
+	0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 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, 0x20,
+	0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a,
+	0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68,
+	0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
+	0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65,
+	0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 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, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
+	0x6e, 0x74, 0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61,
+	0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x27, 0x0a, 0x0a,
+	0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61,
+	0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73,
+	0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 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, 0x4d, 0x0a, 0x16,
+	0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 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, 0x71, 0x0a, 0x19, 0x48,
+	0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45,
+	0x6e, 0x65, 0x72, 0x67, 0x79, 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, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77,
-	0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52,
-	0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f,
-	0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73,
-	0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72,
-	0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x37, 0x0a, 0x08,
-	0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b,
-	0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x50, 0x72,
-	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x48, 0x65, 0x72,
-	0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50,
-	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65,
-	0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65,
-	0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	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, 0x39,
+	0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55,
+	0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
+	0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
+	0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72,
+	0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 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, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f,
+	0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65,
+	0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
+	0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43,
+	0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f,
+	0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49,
+	0x64, 0x73, 0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68,
+	0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x37,
+	0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x1b, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e,
+	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x48,
+	0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64,
+	0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f,
+	0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f,
+	0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1371,9 +1371,9 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte {
 var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
 var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*HeroInfoReq)(nil),                // 0: HeroInfoReq
-	(*HeroInfoRsp)(nil),                // 1: HeroInfoRsp
+	(*HeroInfoResp)(nil),               // 1: HeroInfoResp
 	(*HeroListReq)(nil),                // 2: HeroListReq
-	(*HeroListRsp)(nil),                // 3: HeroListRsp
+	(*HeroListResp)(nil),               // 3: HeroListResp
 	(*ItemData)(nil),                   // 4: ItemData
 	(*HeroStrengthenUplvReq)(nil),      // 5: HeroStrengthenUplvReq
 	(*HeroStrengthenUplvResp)(nil),     // 6: HeroStrengthenUplvResp
@@ -1398,8 +1398,8 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
 	(*DBHero)(nil),                     // 25: DBHero
 }
 var file_hero_hero_msg_proto_depIdxs = []int32{
-	25, // 0: HeroInfoRsp.base:type_name -> DBHero
-	25, // 1: HeroListRsp.list:type_name -> DBHero
+	25, // 0: HeroInfoResp.base:type_name -> DBHero
+	25, // 1: HeroListResp.list:type_name -> DBHero
 	25, // 2: HeroStrengthenUplvResp.hero:type_name -> DBHero
 	7,  // 3: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
 	7,  // 4: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
@@ -1440,7 +1440,7 @@ func file_hero_hero_msg_proto_init() {
 			}
 		}
 		file_hero_hero_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeroInfoRsp); i {
+			switch v := v.(*HeroInfoResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1464,7 +1464,7 @@ func file_hero_hero_msg_proto_init() {
 			}
 		}
 		file_hero_hero_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeroListRsp); i {
+			switch v := v.(*HeroListResp); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/pb/proto/friend/friend_msg.proto b/pb/proto/friend/friend_msg.proto
index 5b25eacdb..86ca75635 100644
--- a/pb/proto/friend/friend_msg.proto
+++ b/pb/proto/friend/friend_msg.proto
@@ -14,13 +14,13 @@ message FriendBase {
 //好友列表
 message FriendListReq {}
 
-message FriendListRsp { repeated FriendBase list = 1; }
+message FriendListResp { repeated FriendBase list = 1; }
 
 //申请好友
 message FriendApplyReq {
   string friendId = 1; //好友ID
 }
-message FriendApplyRsp {
+message FriendApplyResp {
   string userId = 1;   //用户ID
   string friendId = 2; //好友ID
 }
@@ -30,7 +30,7 @@ message FriendDelReq {
   string friendId = 1; //好友ID
 }
 
-message FriendDelRsp {
+message FriendDelResp {
   string friendId = 1; //好友ID
   string userId = 2;   //用户ID
 }
@@ -39,7 +39,7 @@ message FriendDelRsp {
 message FriendAgreeReq {
   repeated string friendIds = 1; //被同意的用户
 }
-message FriendAgreeRsp {
+message FriendAgreeResp {
   int32 Num = 1; //操作的数量
 }
 
@@ -47,30 +47,30 @@ message FriendAgreeRsp {
 message FriendRefuseReq {
   repeated string friendIds = 1; //被拒绝的用户
 }
-message FriendRefuseRsp {
+message FriendRefuseResp {
   int32 Num = 1; //操作的数量
 }
 
 //好友申请列表
 message FriendApplyListReq {}
-message FriendApplyListRsp { repeated FriendBase list = 1; }
+message FriendApplyListResp { repeated FriendBase list = 1; }
 
 //好友搜索
 message FriendSearchReq {
   string nickName = 1; //好友昵称
 }
 
-message FriendSearchRsp { FriendBase friend = 1; }
+message FriendSearchResp { FriendBase friend = 1; }
 
 //黑名单
 message FriendBlackListReq {}
 
-message FriendBlackListRsp { repeated FriendBase friends = 1; }
+message FriendBlackListResp { repeated FriendBase friends = 1; }
 
 //添加黑名单
 message FriendBlackAddReq { string friendId = 1; }
 
-message FriendBlackAddRsp {
+message FriendBlackAddResp {
   string friendId = 1;
   string userId = 2;
 }
@@ -78,7 +78,7 @@ message FriendBlackAddRsp {
 //删除黑名单
 message FriendDelBlackReq { string friendId = 1; }
 
-message FriendDelBlackRsp {
+message FriendDelBlackResp {
   string friendId = 1;
   string userId = 2;
 }
@@ -86,7 +86,7 @@ message FriendDelBlackRsp {
 //接收
 message FriendReceiveReq { string friendId = 1; }
 
-message FriendReceiveRsp {
+message FriendReceiveResp {
   string friendId = 1;
   string userId = 2;
 }
@@ -94,7 +94,7 @@ message FriendReceiveRsp {
 //赠送
 message FriendGiveReq { string friendId = 1; }
 
-message FriendGiveRsp {
+message FriendGiveResp {
   string friendId = 1;
   string userId = 2;
 }
@@ -102,7 +102,7 @@ message FriendGiveRsp {
 //好友数量
 message FriendTotalReq { string friendId = 1; }
 
-message FriendTotalRsp {
+message FriendTotalResp {
   string friendId = 1;
   int32 total = 2; //好友数量
 }
\ No newline at end of file
diff --git a/pb/proto/hero/hero_msg.proto b/pb/proto/hero/hero_msg.proto
index 693ec100d..d726a3644 100644
--- a/pb/proto/hero/hero_msg.proto
+++ b/pb/proto/hero/hero_msg.proto
@@ -6,12 +6,12 @@ import "hero/hero_db.proto";
 message HeroInfoReq {
   string heroId = 1; //英雄唯一ID
 }
-message HeroInfoRsp { DBHero base = 1; }
+message HeroInfoResp { DBHero base = 1; }
 
 //英雄列表
 message HeroListReq {}
 
-message HeroListRsp { repeated DBHero list = 1; }
+message HeroListResp { repeated DBHero list = 1; }
 
 /// 卡牌养成: 强化(卡牌升级、卡牌升星、技能升级)
 /// 卡牌养成: 共鸣(共鸣消耗、材料返回、能量点使用)
diff --git a/pb/proto/user/user_msg.proto b/pb/proto/user/user_msg.proto
index 791486aae..cd8642b23 100644
--- a/pb/proto/user/user_msg.proto
+++ b/pb/proto/user/user_msg.proto
@@ -16,19 +16,19 @@ message UserRegisterReq {
   int32 sid = 2;
 }
 
-message UserRegisterRsp {
+message UserRegisterResp {
   ErrorCode Code = 1;
   string account = 2;
 }
 
-message UserLoadRsp { CacheUser data = 1; }
+message UserLoadResp { CacheUser data = 1; }
 
 //创角
 message UserCreateReq {
   string NickName = 1; //昵称
 }
 
-message UserCreateRsp {}
+message UserCreateResp {}
 
 //添加用户资源
 message UserAddResReq {
diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go
index ddaa8ce3a..a40aff39d 100644
--- a/pb/user_msg.pb.go
+++ b/pb/user_msg.pb.go
@@ -178,7 +178,7 @@ func (x *UserRegisterReq) GetSid() int32 {
 	return 0
 }
 
-type UserRegisterRsp struct {
+type UserRegisterResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -187,8 +187,8 @@ type UserRegisterRsp struct {
 	Account string    `protobuf:"bytes,2,opt,name=account,proto3" json:"account"`
 }
 
-func (x *UserRegisterRsp) Reset() {
-	*x = UserRegisterRsp{}
+func (x *UserRegisterResp) Reset() {
+	*x = UserRegisterResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_user_user_msg_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -196,13 +196,13 @@ func (x *UserRegisterRsp) Reset() {
 	}
 }
 
-func (x *UserRegisterRsp) String() string {
+func (x *UserRegisterResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UserRegisterRsp) ProtoMessage() {}
+func (*UserRegisterResp) ProtoMessage() {}
 
-func (x *UserRegisterRsp) ProtoReflect() protoreflect.Message {
+func (x *UserRegisterResp) ProtoReflect() protoreflect.Message {
 	mi := &file_user_user_msg_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -214,26 +214,26 @@ func (x *UserRegisterRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UserRegisterRsp.ProtoReflect.Descriptor instead.
-func (*UserRegisterRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use UserRegisterResp.ProtoReflect.Descriptor instead.
+func (*UserRegisterResp) Descriptor() ([]byte, []int) {
 	return file_user_user_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *UserRegisterRsp) GetCode() ErrorCode {
+func (x *UserRegisterResp) GetCode() ErrorCode {
 	if x != nil {
 		return x.Code
 	}
 	return ErrorCode_Success
 }
 
-func (x *UserRegisterRsp) GetAccount() string {
+func (x *UserRegisterResp) GetAccount() string {
 	if x != nil {
 		return x.Account
 	}
 	return ""
 }
 
-type UserLoadRsp struct {
+type UserLoadResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -241,8 +241,8 @@ type UserLoadRsp struct {
 	Data *CacheUser `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
 }
 
-func (x *UserLoadRsp) Reset() {
-	*x = UserLoadRsp{}
+func (x *UserLoadResp) Reset() {
+	*x = UserLoadResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_user_user_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -250,13 +250,13 @@ func (x *UserLoadRsp) Reset() {
 	}
 }
 
-func (x *UserLoadRsp) String() string {
+func (x *UserLoadResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UserLoadRsp) ProtoMessage() {}
+func (*UserLoadResp) ProtoMessage() {}
 
-func (x *UserLoadRsp) ProtoReflect() protoreflect.Message {
+func (x *UserLoadResp) ProtoReflect() protoreflect.Message {
 	mi := &file_user_user_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -268,12 +268,12 @@ func (x *UserLoadRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UserLoadRsp.ProtoReflect.Descriptor instead.
-func (*UserLoadRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use UserLoadResp.ProtoReflect.Descriptor instead.
+func (*UserLoadResp) Descriptor() ([]byte, []int) {
 	return file_user_user_msg_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UserLoadRsp) GetData() *CacheUser {
+func (x *UserLoadResp) GetData() *CacheUser {
 	if x != nil {
 		return x.Data
 	}
@@ -328,14 +328,14 @@ func (x *UserCreateReq) GetNickName() string {
 	return ""
 }
 
-type UserCreateRsp struct {
+type UserCreateResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }
 
-func (x *UserCreateRsp) Reset() {
-	*x = UserCreateRsp{}
+func (x *UserCreateResp) Reset() {
+	*x = UserCreateResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_user_user_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -343,13 +343,13 @@ func (x *UserCreateRsp) Reset() {
 	}
 }
 
-func (x *UserCreateRsp) String() string {
+func (x *UserCreateResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UserCreateRsp) ProtoMessage() {}
+func (*UserCreateResp) ProtoMessage() {}
 
-func (x *UserCreateRsp) ProtoReflect() protoreflect.Message {
+func (x *UserCreateResp) ProtoReflect() protoreflect.Message {
 	mi := &file_user_user_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -361,8 +361,8 @@ func (x *UserCreateRsp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UserCreateRsp.ProtoReflect.Descriptor instead.
-func (*UserCreateRsp) Descriptor() ([]byte, []int) {
+// Deprecated: Use UserCreateResp.ProtoReflect.Descriptor instead.
+func (*UserCreateResp) Descriptor() ([]byte, []int) {
 	return file_user_user_msg_proto_rawDescGZIP(), []int{6}
 }
 
@@ -494,27 +494,28 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75,
 	0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
 	0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x73, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73,
-	0x74, 0x65, 0x72, 0x52, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65,
-	0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x22, 0x2d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x73, 0x70, 0x12,
-	0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
-	0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
-	0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d,
-	0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x73, 0x70, 0x22, 0x3f, 0x0a,
-	0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18,
-	0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x40,
-	0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73,
+	0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64,
+	0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x10,
+	0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x22, 0x3f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x22, 0x40, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
+	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -531,23 +532,23 @@ func file_user_user_msg_proto_rawDescGZIP() []byte {
 
 var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_user_user_msg_proto_goTypes = []interface{}{
-	(*UserLoginReq)(nil),    // 0: UserLoginReq
-	(*UserLoginResp)(nil),   // 1: UserLoginResp
-	(*UserRegisterReq)(nil), // 2: UserRegisterReq
-	(*UserRegisterRsp)(nil), // 3: UserRegisterRsp
-	(*UserLoadRsp)(nil),     // 4: UserLoadRsp
-	(*UserCreateReq)(nil),   // 5: UserCreateReq
-	(*UserCreateRsp)(nil),   // 6: UserCreateRsp
-	(*UserAddResReq)(nil),   // 7: UserAddResReq
-	(*UserAddResResp)(nil),  // 8: UserAddResResp
-	(*DBUser)(nil),          // 9: DBUser
-	(ErrorCode)(0),          // 10: ErrorCode
-	(*CacheUser)(nil),       // 11: CacheUser
+	(*UserLoginReq)(nil),     // 0: UserLoginReq
+	(*UserLoginResp)(nil),    // 1: UserLoginResp
+	(*UserRegisterReq)(nil),  // 2: UserRegisterReq
+	(*UserRegisterResp)(nil), // 3: UserRegisterResp
+	(*UserLoadResp)(nil),     // 4: UserLoadResp
+	(*UserCreateReq)(nil),    // 5: UserCreateReq
+	(*UserCreateResp)(nil),   // 6: UserCreateResp
+	(*UserAddResReq)(nil),    // 7: UserAddResReq
+	(*UserAddResResp)(nil),   // 8: UserAddResResp
+	(*DBUser)(nil),           // 9: DBUser
+	(ErrorCode)(0),           // 10: ErrorCode
+	(*CacheUser)(nil),        // 11: CacheUser
 }
 var file_user_user_msg_proto_depIdxs = []int32{
 	9,  // 0: UserLoginResp.data:type_name -> DBUser
-	10, // 1: UserRegisterRsp.Code:type_name -> ErrorCode
-	11, // 2: UserLoadRsp.data:type_name -> CacheUser
+	10, // 1: UserRegisterResp.Code:type_name -> ErrorCode
+	11, // 2: UserLoadResp.data:type_name -> CacheUser
 	3,  // [3:3] is the sub-list for method output_type
 	3,  // [3:3] is the sub-list for method input_type
 	3,  // [3:3] is the sub-list for extension type_name
@@ -600,7 +601,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserRegisterRsp); i {
+			switch v := v.(*UserRegisterResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -612,7 +613,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserLoadRsp); i {
+			switch v := v.(*UserLoadResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -636,7 +637,7 @@ func file_user_user_msg_proto_init() {
 			}
 		}
 		file_user_user_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UserCreateRsp); i {
+			switch v := v.(*UserCreateResp); i {
 			case 0:
 				return &v.state
 			case 1:
diff --git a/sys/cache/cache.go b/sys/cache/cache.go
index b7d2476ae..42258b190 100644
--- a/sys/cache/cache.go
+++ b/sys/cache/cache.go
@@ -28,7 +28,9 @@ func (this *Cache) init() (err error) {
 		this.redis, err = redis.NewSys(
 			redis.SetRedisType(redis.Redis_Single),
 			redis.SetRedis_Single_Addr(this.options.Redis_Addr[0]),
-			redis.SetRedis_Single_Password(this.options.Redis_Password))
+			redis.SetRedis_Single_Password(this.options.Redis_Password),
+			redis.SetRedis_Single_DB(this.options.Redis_DB),
+		)
 	}
 	return
 }
diff --git a/sys/cache/options.go b/sys/cache/options.go
index 921448905..2e73cc5e3 100644
--- a/sys/cache/options.go
+++ b/sys/cache/options.go
@@ -14,6 +14,7 @@ type Options struct {
 	Redis_IsCluster bool     //是否是集群
 	Redis_Addr      []string //redis 的集群地址
 	Redis_Password  string   //redis的密码
+	Redis_DB        int      //数据库位置
 }
 
 //设置系统的集群地址
@@ -37,9 +38,18 @@ func Set_Redis_Password(v string) Option {
 	}
 }
 
+//设置redis的数据存储卷
+func Set_Redis_DB(v int) Option {
+	return func(o *Options) {
+		o.Redis_DB = v
+	}
+}
+
 //更具 map对象或者Option 序列化 系统参数对象
 func newOptions(config map[string]interface{}, opts ...Option) (Options, error) {
-	options := Options{}
+	options := Options{
+		Redis_DB: 1,
+	}
 	if config != nil {
 		mapstructure.Decode(config, &options)
 	}
@@ -54,7 +64,9 @@ func newOptions(config map[string]interface{}, opts ...Option) (Options, error)
 
 //更具 Option 序列化 系统参数对象
 func newOptionsByOption(opts ...Option) (Options, error) {
-	options := Options{}
+	options := Options{
+		Redis_DB: 1,
+	}
 	for _, o := range opts {
 		o(&options)
 	}