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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2022-07-04 10:50:02 +08:00
commit 4a17e34518
30 changed files with 538 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/robot/friend.go
View File

@ -15,14 +15,14 @@ var (
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeList, subType: friend.FriendSubTypeList,
req: &pb.FriendListReq{}, req: &pb.FriendListReq{},
rsp: &pb.FriendListRsp{}, rsp: &pb.FriendListResp{},
enabled: true, // enabled: true,
}, { }, {
//blacklist //blacklist
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeBlacklist, subType: friend.FriendSubTypeBlacklist,
req: &pb.FriendBlackListReq{}, req: &pb.FriendBlackListReq{},
rsp: &pb.FriendBlackListRsp{}, rsp: &pb.FriendBlackListResp{},
}, { }, {
//search //search
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
@ -30,33 +30,33 @@ var (
req: &pb.FriendSearchReq{ req: &pb.FriendSearchReq{
NickName: "", //设置测试参数 NickName: "", //设置测试参数
}, },
rsp: &pb.FriendSearchRsp{}, rsp: &pb.FriendSearchResp{},
enabled: true, // enabled: true,
}, { }, {
//apply //apply
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeApply, subType: friend.FriendSubTypeApply,
req: &pb.FriendApplyReq{}, req: &pb.FriendApplyReq{},
rsp: &pb.FriendApplyRsp{}, rsp: &pb.FriendApplyResp{},
// enabled: true, // enabled: true,
}, { }, {
//applylist //applylist
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeApplyList, subType: friend.FriendSubTypeApplyList,
req: &pb.FriendApplyListReq{}, req: &pb.FriendApplyListReq{},
rsp: &pb.FriendApplyListRsp{}, rsp: &pb.FriendApplyListResp{},
}, { }, {
//agree //agree
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeAgree, subType: friend.FriendSubTypeAgree,
req: &pb.FriendAgreeReq{}, req: &pb.FriendAgreeReq{},
rsp: &pb.FriendAgreeRsp{}, rsp: &pb.FriendAgreeResp{},
}, { }, {
//refuse //refuse
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeRefuse, subType: friend.FriendSubTypeRefuse,
req: &pb.FriendAgreeReq{}, req: &pb.FriendAgreeReq{},
rsp: &pb.FriendAgreeRsp{}, rsp: &pb.FriendAgreeResp{},
}, { }, {
//addblack //addblack
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
@ -64,14 +64,14 @@ var (
req: &pb.FriendBlackAddReq{ req: &pb.FriendBlackAddReq{
FriendId: "0_62be9f40f67327fb53039b70", FriendId: "0_62be9f40f67327fb53039b70",
}, },
rsp: &pb.FriendBlackAddRsp{}, rsp: &pb.FriendBlackAddResp{},
// enabled: true, // enabled: true,
}, { }, {
//delblack //delblack
mainType: string(comm.ModuleFriend), mainType: string(comm.ModuleFriend),
subType: friend.FriendSubTypeDelBlack, subType: friend.FriendSubTypeDelBlack,
req: &pb.FriendDelBlackReq{}, req: &pb.FriendDelBlackReq{},
rsp: &pb.FriendDelBlackRsp{}, rsp: &pb.FriendDelBlackResp{},
}, },
} }
) )

8
cmd/robot/hero.go
View File

@ -17,21 +17,21 @@ var (
mainType: string(comm.ModuleHero), mainType: string(comm.ModuleHero),
subType: hero.HeroSubTypeList, subType: hero.HeroSubTypeList,
req: &pb.HeroListReq{}, req: &pb.HeroListReq{},
rsp: &pb.HeroListRsp{}, rsp: &pb.HeroListResp{},
print: func(rsp proto.Message) { print: func(rsp proto.Message) {
out := rsp.(*pb.HeroListRsp) out := rsp.(*pb.HeroListResp)
for i, v := range out.List { for i, v := range out.List {
fmt.Printf("%d- %v\n", (i + 1), v) fmt.Printf("%d- %v\n", (i + 1), v)
} }
}, },
// enabled: true, enabled: true,
}, { }, {
mainType: string(comm.ModuleHero), mainType: string(comm.ModuleHero),
subType: hero.HeroSubTypeInfo, subType: hero.HeroSubTypeInfo,
req: &pb.HeroInfoReq{ req: &pb.HeroInfoReq{
HeroId: "62baac19aa7c09b3679be57c", HeroId: "62baac19aa7c09b3679be57c",
}, },
rsp: &pb.HeroInfoRsp{}, rsp: &pb.HeroInfoResp{},
// enabled: true, // enabled: true,
}, { }, {
mainType: string(comm.ModuleHero), mainType: string(comm.ModuleHero),

2
cmd/robot/login.go
View File

@ -43,7 +43,7 @@ func (r *Robot) AccountLogin() {
Account: r.opts.Account, Account: r.opts.Account,
Sid: r.opts.ServerId, Sid: r.opts.ServerId,
}, },
rsp: &pb.UserLoginResp{}, rsp: &pb.UserLoginResp{},
enabled: true, enabled: true,
}, },
} }

2
cmd/robot/notify.go
View File

@ -10,7 +10,7 @@ var notify_builders = []*TestCase{
//create //create
mainType: comm.MainTypeNotify, mainType: comm.MainTypeNotify,
subType: comm.SubTypeErrorNotify, subType: comm.SubTypeErrorNotify,
rsp: &pb.NotifyErrorNotifyPush{}, rsp: &pb.NotifyErrorNotifyPush{},
enabled: true, enabled: true,
}, },
} }

2
cmd/robot/pack.go
View File

@ -12,7 +12,7 @@ var pack_builders = []*TestCase{
mainType: string(comm.ModulePack), mainType: string(comm.ModulePack),
subType: "queryuserpackreq", subType: "queryuserpackreq",
// req: &pb.Pack_Getlist_Req{IType: 1}, // req: &pb.Pack_Getlist_Req{IType: 1},
rsp: &pb.UserCreateRsp{}, rsp: &pb.UserCreateResp{},
enabled: true, enabled: true,
}, },
} }

2
cmd/robot/robot.go
View File

@ -201,7 +201,7 @@ func (r *Robot) AccountRegister(account string, sid int32) {
defer rsp.Body.Close() defer rsp.Body.Close()
body, _ := ioutil.ReadAll(rsp.Body) body, _ := ioutil.ReadAll(rsp.Body)
regRsp := &pb.UserRegisterRsp{} regRsp := &pb.UserRegisterResp{}
err = jsoniter.Unmarshal(body, regRsp) err = jsoniter.Unmarshal(body, regRsp)
if regRsp.Code == pb.ErrorCode_Success { //注册成功 if regRsp.Code == pb.ErrorCode_Success { //注册成功

8
cmd/robot/user.go
View File

@ -16,8 +16,8 @@ var user_builders = []*TestCase{
req: &pb.UserCreateReq{ //设置请求参数 req: &pb.UserCreateReq{ //设置请求参数
NickName: "乐谷6301", NickName: "乐谷6301",
}, },
rsp: &pb.UserCreateRsp{}, rsp: &pb.UserCreateResp{},
// enabled: true, enabled: true,
}, { }, {
Desc: "添加资源", Desc: "添加资源",
mainType: string(comm.ModuleUser), mainType: string(comm.ModuleUser),
@ -26,8 +26,8 @@ var user_builders = []*TestCase{
ResType: comm.ResGold, ResType: comm.ResGold,
Count: 100, Count: 100,
}, },
rsp: &pb.UserAddResResp{}, rsp: &pb.UserAddResResp{},
enabled: true, // enabled: true,
}, },
} }

2
modules/equipment/api_getlist.go
View File

@ -22,7 +22,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetList
) )
defer func() { defer func() {
if code == pb.ErrorCode_Success { 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 { if items, err = this.module.modelEquipment.QueryUserEquipments(session.GetUserId()); err != nil {

6
modules/friend/api_addblack.go
View File

@ -21,15 +21,15 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendBlackAddR
err error err error
self *pb.DBFriend self *pb.DBFriend
target *pb.DBFriend target *pb.DBFriend
rsp *pb.FriendBlackAddRsp Resp *pb.FriendBlackAddResp
) )
defer func() { defer func() {
rsp = &pb.FriendBlackAddRsp{ Resp = &pb.FriendBlackAddResp{
FriendId: req.FriendId, FriendId: req.FriendId,
UserId: session.GetUserId(), 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()) self = this.module.modelFriend.GetFriend(session.GetUserId())

6
modules/friend/api_agree.go
View File

@ -22,15 +22,15 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (c
err error err error
self *pb.DBFriend self *pb.DBFriend
target *pb.DBFriend target *pb.DBFriend
rsp *pb.FriendAgreeRsp Resp *pb.FriendAgreeResp
optNum int32 optNum int32
) )
defer func() { defer func() {
rsp = &pb.FriendAgreeRsp{ Resp = &pb.FriendAgreeResp{
Num: optNum, Num: optNum,
} }
err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, rsp) err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, Resp)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

8
modules/friend/api_apply.go
View File

@ -22,21 +22,21 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (c
err error err error
self *pb.DBFriend self *pb.DBFriend
target *pb.DBFriend target *pb.DBFriend
rsp *pb.FriendApplyRsp Resp *pb.FriendApplyResp
) )
defer func() { 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() { defer func() {
if code == pb.ErrorCode_Success { if code == pb.ErrorCode_Success {
rsp = &pb.FriendApplyRsp{ Resp = &pb.FriendApplyResp{
UserId: session.GetUserId(), UserId: session.GetUserId(),
FriendId: req.FriendId, FriendId: req.FriendId,
} }
} }
err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, rsp) err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, Resp)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

6
modules/friend/api_applylist.go
View File

@ -15,17 +15,17 @@ func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyLis
var ( var (
err error err error
self *pb.DBFriend self *pb.DBFriend
rsp *pb.FriendApplyListRsp Resp *pb.FriendApplyListResp
list []*pb.FriendBase list []*pb.FriendBase
) )
defer func() { defer func() {
if code == pb.ErrorCode_Success { if code == pb.ErrorCode_Success {
rsp = &pb.FriendApplyListRsp{ Resp = &pb.FriendApplyListResp{
List: list, 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 code = pb.ErrorCode_SystemError
} }
}() }()

6
modules/friend/api_blacklist.go
View File

@ -16,16 +16,16 @@ func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackLis
var ( var (
err error err error
self *pb.DBFriend self *pb.DBFriend
rsp *pb.FriendBlackListRsp Resp *pb.FriendBlackListResp
list []*pb.FriendBase list []*pb.FriendBase
) )
defer func() { defer func() {
rsp = &pb.FriendBlackListRsp{ Resp = &pb.FriendBlackListResp{
Friends: list, Friends: list,
} }
err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, rsp) err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, Resp)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

6
modules/friend/api_delblack.go
View File

@ -20,16 +20,16 @@ func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackR
var ( var (
err error err error
self *pb.DBFriend self *pb.DBFriend
rsp *pb.FriendDelBlackRsp Resp *pb.FriendDelBlackResp
) )
defer func() { defer func() {
if code == pb.ErrorCode_Success { if code == pb.ErrorCode_Success {
rsp = &pb.FriendDelBlackRsp{ Resp = &pb.FriendDelBlackResp{
FriendId: req.FriendId, FriendId: req.FriendId,
UserId: session.GetUserId(), UserId: session.GetUserId(),
} }
} }
err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, rsp) err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, Resp)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

6
modules/friend/api_list.go
View File

@ -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) { func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data proto.Message) {
var ( var (
self *pb.DBFriend self *pb.DBFriend
rsp *pb.FriendListRsp Resp *pb.FriendListResp
list []*pb.FriendBase list []*pb.FriendBase
) )
defer func() { defer func() {
rsp = &pb.FriendListRsp{ Resp = &pb.FriendListResp{
List: list, List: list,
} }
err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, rsp) err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, Resp)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

6
modules/friend/api_refuse.go
View File

@ -22,15 +22,15 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq)
var ( var (
err error err error
self *pb.DBFriend self *pb.DBFriend
rsp *pb.FriendRefuseRsp Resp *pb.FriendRefuseResp
optNum int32 optNum int32
) )
defer func() { defer func() {
rsp = &pb.FriendRefuseRsp{ Resp = &pb.FriendRefuseResp{
Num: optNum, Num: optNum,
} }
err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, rsp) err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, Resp)
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return

6
modules/friend/api_search.go
View File

@ -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) { func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data proto.Message) {
var ( var (
rsp *pb.FriendSearchRsp Resp *pb.FriendSearchResp
friend *pb.FriendBase friend *pb.FriendBase
) )
defer func() { defer func() {
if code == pb.ErrorCode_Success { if code == pb.ErrorCode_Success {
rsp = &pb.FriendSearchRsp{ Resp = &pb.FriendSearchResp{
Friend: friend, 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 code = pb.ErrorCode_SystemError
} }
}() }()

2
modules/hero/api_info.go
View File

@ -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) { func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data proto.Message) {
rsp := &pb.HeroInfoRsp{} rsp := &pb.HeroInfoResp{}
defer func() { defer func() {
err := session.SendMsg(string(this.module.GetType()), HeroSubTypeInfo, rsp) err := session.SendMsg(string(this.module.GetType()), HeroSubTypeInfo, rsp)
if err != nil { if err != nil {

2
modules/hero/api_list.go
View File

@ -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) { func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data proto.Message) {
rsp := &pb.HeroListRsp{} rsp := &pb.HeroListResp{}
defer func() { defer func() {
err := session.SendMsg(string(this.module.GetType()), HeroSubTypeList, rsp) err := session.SendMsg(string(this.module.GetType()), HeroSubTypeList, rsp)

2
modules/user/api_create.go
View File

@ -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 utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), UserSubTypeCreate, req, nil)
defer func() { 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 { if err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
} }

2
modules/web/api_comp.go
View File

@ -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) { func (this *Api_Comp) Register(c *engine.Context) {
var req pb.UserRegisterReq var req pb.UserRegisterReq
rsp := &pb.UserRegisterRsp{} rsp := &pb.UserRegisterResp{}
err := c.BindJSON(&req) err := c.BindJSON(&req)
if err == nil { if err == nil {
err := this.module.modelUser.User_Create(&pb.DBUser{ err := this.module.modelUser.User_Create(&pb.DBUser{

493
pb/friend_msg.pb.go
View File

File diff suppressed because it is too large Load Diff

2
pb/hero_db.pb.go
View File

@ -99,7 +99,7 @@ type DBHero struct {
EquipID []string `protobuf:"bytes,17,rep,name=equipID,proto3" json:"equipID" bson:"equipID"` //装备 objID 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"` //共鸣次数 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"` //分配的共鸣能量 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"` // 卡片叠加数量 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 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 SuiteExtId int32 `protobuf:"varint,23,opt,name=suiteExtId,proto3" json:"suiteExtId"` // go_tags(`bson:"suiteExtId"`) 扩展套装Id

266
pb/hero_msg.pb.go
View File

@ -68,7 +68,7 @@ func (x *HeroInfoReq) GetHeroId() string {
return "" return ""
} }
type HeroInfoRsp struct { type HeroInfoResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -76,8 +76,8 @@ type HeroInfoRsp struct {
Base *DBHero `protobuf:"bytes,1,opt,name=base,proto3" json:"base"` Base *DBHero `protobuf:"bytes,1,opt,name=base,proto3" json:"base"`
} }
func (x *HeroInfoRsp) Reset() { func (x *HeroInfoResp) Reset() {
*x = HeroInfoRsp{} *x = HeroInfoResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_hero_hero_msg_proto_msgTypes[1] mi := &file_hero_hero_msg_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 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) 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] mi := &file_hero_hero_msg_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -103,12 +103,12 @@ func (x *HeroInfoRsp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use HeroInfoRsp.ProtoReflect.Descriptor instead. // Deprecated: Use HeroInfoResp.ProtoReflect.Descriptor instead.
func (*HeroInfoRsp) Descriptor() ([]byte, []int) { func (*HeroInfoResp) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{1} return file_hero_hero_msg_proto_rawDescGZIP(), []int{1}
} }
func (x *HeroInfoRsp) GetBase() *DBHero { func (x *HeroInfoResp) GetBase() *DBHero {
if x != nil { if x != nil {
return x.Base return x.Base
} }
@ -154,7 +154,7 @@ func (*HeroListReq) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{2} return file_hero_hero_msg_proto_rawDescGZIP(), []int{2}
} }
type HeroListRsp struct { type HeroListResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -162,8 +162,8 @@ type HeroListRsp struct {
List []*DBHero `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` List []*DBHero `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
} }
func (x *HeroListRsp) Reset() { func (x *HeroListResp) Reset() {
*x = HeroListRsp{} *x = HeroListResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_hero_hero_msg_proto_msgTypes[3] mi := &file_hero_hero_msg_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 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) 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] mi := &file_hero_hero_msg_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -189,12 +189,12 @@ func (x *HeroListRsp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use HeroListRsp.ProtoReflect.Descriptor instead. // Deprecated: Use HeroListResp.ProtoReflect.Descriptor instead.
func (*HeroListRsp) Descriptor() ([]byte, []int) { func (*HeroListResp) Descriptor() ([]byte, []int) {
return file_hero_hero_msg_proto_rawDescGZIP(), []int{3} return file_hero_hero_msg_proto_rawDescGZIP(), []int{3}
} }
func (x *HeroListRsp) GetList() []*DBHero { func (x *HeroListResp) GetList() []*DBHero {
if x != nil { if x != nil {
return x.List 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, 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, 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, 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, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
0x1b, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x12, 0x1b, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07,
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0d, 0x0a,
0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x2a, 0x0a, 0x0b, 0x48, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x2b, 0x0a, 0x0c,
0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3a, 0x0a, 0x08, 0x49, 0x74, 0x65,
0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18,
0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a,
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61,
0x75, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72,
0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1c,
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,
0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 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, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09,
0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, 0x01, 0x28, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x22, 0x38, 0x09, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d,
0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x6e, 0x74, 0x22, 0x35, 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67,
0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73,
0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73,
0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61,
0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f,
0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x75, 0x6e, 0x74, 0x22, 0x85, 0x01, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65,
0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12,
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x21, 0x0a,
0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f,
0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x27, 0x0a, 0x0a, 0x75, 0x70, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f,
0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03,
0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74,
0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48,
0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53,
0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x4d, 0x0a, 0x16, 0x48, 0x65, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65,
0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71,
0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20,
0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x20,
0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x71, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20,
0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a,
0x72, 0x67, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68,
0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a,
0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65,
0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c,
0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x1a, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09,
0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d,
0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 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, 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, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65,
0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18,
0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39,
0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55,
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72,
0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65,
0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68,
0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x37, 0x0a, 0x08, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65,
0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43,
0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f,
0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49,
0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x48, 0x65, 0x72, 0x64, 0x73, 0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61,
0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01,
0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68,
0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72,
0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x37,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x32, 0x1b, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e,
0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x48,
0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50,
0x6f, 0x74, 0x6f, 0x33, 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 ( 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_msgTypes = make([]protoimpl.MessageInfo, 25)
var file_hero_hero_msg_proto_goTypes = []interface{}{ var file_hero_hero_msg_proto_goTypes = []interface{}{
(*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoReq)(nil), // 0: HeroInfoReq
(*HeroInfoRsp)(nil), // 1: HeroInfoRsp (*HeroInfoResp)(nil), // 1: HeroInfoResp
(*HeroListReq)(nil), // 2: HeroListReq (*HeroListReq)(nil), // 2: HeroListReq
(*HeroListRsp)(nil), // 3: HeroListRsp (*HeroListResp)(nil), // 3: HeroListResp
(*ItemData)(nil), // 4: ItemData (*ItemData)(nil), // 4: ItemData
(*HeroStrengthenUplvReq)(nil), // 5: HeroStrengthenUplvReq (*HeroStrengthenUplvReq)(nil), // 5: HeroStrengthenUplvReq
(*HeroStrengthenUplvResp)(nil), // 6: HeroStrengthenUplvResp (*HeroStrengthenUplvResp)(nil), // 6: HeroStrengthenUplvResp
@ -1398,8 +1398,8 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{
(*DBHero)(nil), // 25: DBHero (*DBHero)(nil), // 25: DBHero
} }
var file_hero_hero_msg_proto_depIdxs = []int32{ var file_hero_hero_msg_proto_depIdxs = []int32{
25, // 0: HeroInfoRsp.base:type_name -> DBHero 25, // 0: HeroInfoResp.base:type_name -> DBHero
25, // 1: HeroListRsp.list:type_name -> DBHero 25, // 1: HeroListResp.list:type_name -> DBHero
25, // 2: HeroStrengthenUplvResp.hero:type_name -> DBHero 25, // 2: HeroStrengthenUplvResp.hero:type_name -> DBHero
7, // 3: HeroStrengthenUpStarReq.hero:type_name -> CostCardData 7, // 3: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
7, // 4: HeroStrengthenUpStarReq.heroRace: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{} { 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: case 0:
return &v.state return &v.state
case 1: 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{} { 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: case 0:
return &v.state return &v.state
case 1: case 1:

26
pb/proto/friend/friend_msg.proto
View File

@ -14,13 +14,13 @@ message FriendBase {
//好友列表 //好友列表
message FriendListReq {} message FriendListReq {}
message FriendListRsp { repeated FriendBase list = 1; } message FriendListResp { repeated FriendBase list = 1; }
//申请好友 //申请好友
message FriendApplyReq { message FriendApplyReq {
string friendId = 1; //好友ID string friendId = 1; //好友ID
} }
message FriendApplyRsp { message FriendApplyResp {
string userId = 1; //用户ID string userId = 1; //用户ID
string friendId = 2; //好友ID string friendId = 2; //好友ID
} }
@ -30,7 +30,7 @@ message FriendDelReq {
string friendId = 1; //好友ID string friendId = 1; //好友ID
} }
message FriendDelRsp { message FriendDelResp {
string friendId = 1; //好友ID string friendId = 1; //好友ID
string userId = 2; //用户ID string userId = 2; //用户ID
} }
@ -39,7 +39,7 @@ message FriendDelRsp {
message FriendAgreeReq { message FriendAgreeReq {
repeated string friendIds = 1; //被同意的用户 repeated string friendIds = 1; //被同意的用户
} }
message FriendAgreeRsp { message FriendAgreeResp {
int32 Num = 1; //操作的数量 int32 Num = 1; //操作的数量
} }
@ -47,30 +47,30 @@ message FriendAgreeRsp {
message FriendRefuseReq { message FriendRefuseReq {
repeated string friendIds = 1; //被拒绝的用户 repeated string friendIds = 1; //被拒绝的用户
} }
message FriendRefuseRsp { message FriendRefuseResp {
int32 Num = 1; //操作的数量 int32 Num = 1; //操作的数量
} }
//好友申请列表 //好友申请列表
message FriendApplyListReq {} message FriendApplyListReq {}
message FriendApplyListRsp { repeated FriendBase list = 1; } message FriendApplyListResp { repeated FriendBase list = 1; }
//好友搜索 //好友搜索
message FriendSearchReq { message FriendSearchReq {
string nickName = 1; //好友昵称 string nickName = 1; //好友昵称
} }
message FriendSearchRsp { FriendBase friend = 1; } message FriendSearchResp { FriendBase friend = 1; }
//黑名单 //黑名单
message FriendBlackListReq {} message FriendBlackListReq {}
message FriendBlackListRsp { repeated FriendBase friends = 1; } message FriendBlackListResp { repeated FriendBase friends = 1; }
//添加黑名单 //添加黑名单
message FriendBlackAddReq { string friendId = 1; } message FriendBlackAddReq { string friendId = 1; }
message FriendBlackAddRsp { message FriendBlackAddResp {
string friendId = 1; string friendId = 1;
string userId = 2; string userId = 2;
} }
@ -78,7 +78,7 @@ message FriendBlackAddRsp {
//删除黑名单 //删除黑名单
message FriendDelBlackReq { string friendId = 1; } message FriendDelBlackReq { string friendId = 1; }
message FriendDelBlackRsp { message FriendDelBlackResp {
string friendId = 1; string friendId = 1;
string userId = 2; string userId = 2;
} }
@ -86,7 +86,7 @@ message FriendDelBlackRsp {
//接收 //接收
message FriendReceiveReq { string friendId = 1; } message FriendReceiveReq { string friendId = 1; }
message FriendReceiveRsp { message FriendReceiveResp {
string friendId = 1; string friendId = 1;
string userId = 2; string userId = 2;
} }
@ -94,7 +94,7 @@ message FriendReceiveRsp {
//赠送 //赠送
message FriendGiveReq { string friendId = 1; } message FriendGiveReq { string friendId = 1; }
message FriendGiveRsp { message FriendGiveResp {
string friendId = 1; string friendId = 1;
string userId = 2; string userId = 2;
} }
@ -102,7 +102,7 @@ message FriendGiveRsp {
//好友数量 //好友数量
message FriendTotalReq { string friendId = 1; } message FriendTotalReq { string friendId = 1; }
message FriendTotalRsp { message FriendTotalResp {
string friendId = 1; string friendId = 1;
int32 total = 2; //好友数量 int32 total = 2; //好友数量
} }

4
pb/proto/hero/hero_msg.proto
View File

@ -6,12 +6,12 @@ import "hero/hero_db.proto";
message HeroInfoReq { message HeroInfoReq {
string heroId = 1; //英雄唯一ID string heroId = 1; //英雄唯一ID
} }
message HeroInfoRsp { DBHero base = 1; } message HeroInfoResp { DBHero base = 1; }
//英雄列表 //英雄列表
message HeroListReq {} message HeroListReq {}
message HeroListRsp { repeated DBHero list = 1; } message HeroListResp { repeated DBHero list = 1; }
/// 卡牌养成: 强化(卡牌升级、卡牌升星、技能升级) /// 卡牌养成: 强化(卡牌升级、卡牌升星、技能升级)
/// 卡牌养成: 共鸣(共鸣消耗、材料返回、能量点使用) /// 卡牌养成: 共鸣(共鸣消耗、材料返回、能量点使用)

6
pb/proto/user/user_msg.proto
View File

@ -16,19 +16,19 @@ message UserRegisterReq {
int32 sid = 2; int32 sid = 2;
} }
message UserRegisterRsp { message UserRegisterResp {
ErrorCode Code = 1; ErrorCode Code = 1;
string account = 2; string account = 2;
} }
message UserLoadRsp { CacheUser data = 1; } message UserLoadResp { CacheUser data = 1; }
//创角 //创角
message UserCreateReq { message UserCreateReq {
string NickName = 1; //昵称 string NickName = 1; //昵称
} }
message UserCreateRsp {} message UserCreateResp {}
//添加用户资源 //添加用户资源
message UserAddResReq { message UserAddResReq {

131
pb/user_msg.pb.go
View File

@ -178,7 +178,7 @@ func (x *UserRegisterReq) GetSid() int32 {
return 0 return 0
} }
type UserRegisterRsp struct { type UserRegisterResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -187,8 +187,8 @@ type UserRegisterRsp struct {
Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account"` Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account"`
} }
func (x *UserRegisterRsp) Reset() { func (x *UserRegisterResp) Reset() {
*x = UserRegisterRsp{} *x = UserRegisterResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[3] mi := &file_user_user_msg_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 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) 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] mi := &file_user_user_msg_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -214,26 +214,26 @@ func (x *UserRegisterRsp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use UserRegisterRsp.ProtoReflect.Descriptor instead. // Deprecated: Use UserRegisterResp.ProtoReflect.Descriptor instead.
func (*UserRegisterRsp) Descriptor() ([]byte, []int) { func (*UserRegisterResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{3} return file_user_user_msg_proto_rawDescGZIP(), []int{3}
} }
func (x *UserRegisterRsp) GetCode() ErrorCode { func (x *UserRegisterResp) GetCode() ErrorCode {
if x != nil { if x != nil {
return x.Code return x.Code
} }
return ErrorCode_Success return ErrorCode_Success
} }
func (x *UserRegisterRsp) GetAccount() string { func (x *UserRegisterResp) GetAccount() string {
if x != nil { if x != nil {
return x.Account return x.Account
} }
return "" return ""
} }
type UserLoadRsp struct { type UserLoadResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
@ -241,8 +241,8 @@ type UserLoadRsp struct {
Data *CacheUser `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` Data *CacheUser `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
} }
func (x *UserLoadRsp) Reset() { func (x *UserLoadResp) Reset() {
*x = UserLoadRsp{} *x = UserLoadResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[4] mi := &file_user_user_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 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) 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] mi := &file_user_user_msg_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -268,12 +268,12 @@ func (x *UserLoadRsp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use UserLoadRsp.ProtoReflect.Descriptor instead. // Deprecated: Use UserLoadResp.ProtoReflect.Descriptor instead.
func (*UserLoadRsp) Descriptor() ([]byte, []int) { func (*UserLoadResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{4} return file_user_user_msg_proto_rawDescGZIP(), []int{4}
} }
func (x *UserLoadRsp) GetData() *CacheUser { func (x *UserLoadResp) GetData() *CacheUser {
if x != nil { if x != nil {
return x.Data return x.Data
} }
@ -328,14 +328,14 @@ func (x *UserCreateReq) GetNickName() string {
return "" return ""
} }
type UserCreateRsp struct { type UserCreateResp struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
} }
func (x *UserCreateRsp) Reset() { func (x *UserCreateResp) Reset() {
*x = UserCreateRsp{} *x = UserCreateResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[6] mi := &file_user_user_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) 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) 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] mi := &file_user_user_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -361,8 +361,8 @@ func (x *UserCreateRsp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x) return mi.MessageOf(x)
} }
// Deprecated: Use UserCreateRsp.ProtoReflect.Descriptor instead. // Deprecated: Use UserCreateResp.ProtoReflect.Descriptor instead.
func (*UserCreateRsp) Descriptor() ([]byte, []int) { func (*UserCreateResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{6} 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, 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, 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, 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, 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, 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, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18,
0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64,
0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75,
0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e,
0x22, 0x2d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x73, 0x70, 0x12, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73,
0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74,
0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01,
0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x10,
0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x73, 0x70, 0x22, 0x3f, 0x0a, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18, 0x22, 0x3f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65,
0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x40, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x74, 0x22, 0x40, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52,
0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x75, 0x6e, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
} }
var ( 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_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_user_user_msg_proto_goTypes = []interface{}{ var file_user_user_msg_proto_goTypes = []interface{}{
(*UserLoginReq)(nil), // 0: UserLoginReq (*UserLoginReq)(nil), // 0: UserLoginReq
(*UserLoginResp)(nil), // 1: UserLoginResp (*UserLoginResp)(nil), // 1: UserLoginResp
(*UserRegisterReq)(nil), // 2: UserRegisterReq (*UserRegisterReq)(nil), // 2: UserRegisterReq
(*UserRegisterRsp)(nil), // 3: UserRegisterRsp (*UserRegisterResp)(nil), // 3: UserRegisterResp
(*UserLoadRsp)(nil), // 4: UserLoadRsp (*UserLoadResp)(nil), // 4: UserLoadResp
(*UserCreateReq)(nil), // 5: UserCreateReq (*UserCreateReq)(nil), // 5: UserCreateReq
(*UserCreateRsp)(nil), // 6: UserCreateRsp (*UserCreateResp)(nil), // 6: UserCreateResp
(*UserAddResReq)(nil), // 7: UserAddResReq (*UserAddResReq)(nil), // 7: UserAddResReq
(*UserAddResResp)(nil), // 8: UserAddResResp (*UserAddResResp)(nil), // 8: UserAddResResp
(*DBUser)(nil), // 9: DBUser (*DBUser)(nil), // 9: DBUser
(ErrorCode)(0), // 10: ErrorCode (ErrorCode)(0), // 10: ErrorCode
(*CacheUser)(nil), // 11: CacheUser (*CacheUser)(nil), // 11: CacheUser
} }
var file_user_user_msg_proto_depIdxs = []int32{ var file_user_user_msg_proto_depIdxs = []int32{
9, // 0: UserLoginResp.data:type_name -> DBUser 9, // 0: UserLoginResp.data:type_name -> DBUser
10, // 1: UserRegisterRsp.Code:type_name -> ErrorCode 10, // 1: UserRegisterResp.Code:type_name -> ErrorCode
11, // 2: UserLoadRsp.data:type_name -> CacheUser 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 output_type
3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name 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{} { 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: case 0:
return &v.state return &v.state
case 1: 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{} { 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: case 0:
return &v.state return &v.state
case 1: 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{} { 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: case 0:
return &v.state return &v.state
case 1: case 1:

4
sys/cache/cache.go vendored
View File

@ -28,7 +28,9 @@ func (this *Cache) init() (err error) {
this.redis, err = redis.NewSys( this.redis, err = redis.NewSys(
redis.SetRedisType(redis.Redis_Single), redis.SetRedisType(redis.Redis_Single),
redis.SetRedis_Single_Addr(this.options.Redis_Addr[0]), 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 return
} }

16
sys/cache/options.go vendored
View File

@ -14,6 +14,7 @@ type Options struct {
Redis_IsCluster bool //是否是集群 Redis_IsCluster bool //是否是集群
Redis_Addr []string //redis 的集群地址 Redis_Addr []string //redis 的集群地址
Redis_Password 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 序列化 系统参数对象 //更具 map对象或者Option 序列化 系统参数对象
func newOptions(config map[string]interface{}, opts ...Option) (Options, error) { func newOptions(config map[string]interface{}, opts ...Option) (Options, error) {
options := Options{} options := Options{
Redis_DB: 1,
}
if config != nil { if config != nil {
mapstructure.Decode(config, &options) mapstructure.Decode(config, &options)
} }
@ -54,7 +64,9 @@ func newOptions(config map[string]interface{}, opts ...Option) (Options, error)
//更具 Option 序列化 系统参数对象 //更具 Option 序列化 系统参数对象
func newOptionsByOption(opts ...Option) (Options, error) { func newOptionsByOption(opts ...Option) (Options, error) {
options := Options{} options := Options{
Redis_DB: 1,
}
for _, o := range opts { for _, o := range opts {
o(&options) o(&options)
} }