reactor: dir; Account loginrsp uid->token

zhangqijia
1 parent 54b3f133
Showing 17 changed files with 97 additions and 166 deletions Show diff stats
cmd/gameserver/action/RoleAction.go
cmd/gameserver/game.go
cmd/gameserver/plugin/plugin.go
cmd/httpserver/AccountAction.go
cmd/httpserver/http.go
common/conf.go
common/db/mongo.go -> common/db/mongoproxy/mongo.go
common/db/mongoplugin.go -> common/db/mongoproxy/mongoplugin.go
common/db/redis.go -> common/db/redisproxy/redis.go
common/snowflake.go -> common/snow/snowflake.go
models/init.go
models/role.go
models/role_test.go
models/schema.go
pb/account.pb.go
pb/game.pb.go
protos
@@ -42,7 +42,7 @@ func LoginRpc(msg components.IMessage) (int32, interface{}) {
 		return 1, nil
 	}
-	role := models.RoleExistByUid(req.Uid)
+	role := models.RoleExistByUid(req.Token)
 	if role == nil {
 		return 2, nil
 	}
@@ -6,7 +6,7 @@ import (
 	"pro2d/cmd/gameserver/action"
 	"pro2d/common"
 	"pro2d/common/components"
-	"pro2d/common/db"
+	"pro2d/common/db/mongoproxy"
 	"pro2d/models"
 	"pro2d/common/etcd"
@@ -34,7 +34,7 @@ func NewGameServer(sconf *common.SConf) (*GameServer, error) {
 	s.IServer = iserver
 	//mgo init
-	err := db.ConnectMongo(sconf.MongoConf)
+	err := mongoproxy.ConnectMongo(sconf.MongoConf)
 	if err != nil {
 		return nil, err
 	}
@@ -57,7 +57,7 @@ func (s *GameServer) Start() error {
 func (s *GameServer) Stop() {
 	s.IServer.Stop()
-	db.CloseMongo()
+	mongoproxy.CloseMongo()
 	s.EtcdClient.Close()
 }
@@ -28,7 +28,7 @@ func LoginRpc(msg components.IMessage) (int32, interface{}) {
 		return 1, nil
 	}
-	role := models.RoleExistByUid(req.Uid)
+	role := models.RoleExistByUid(req.Token)
 	if role == nil {
 		return 2, nil
 	}
@@ -15,35 +15,39 @@ type AccountAction struct {
 func (h *AccountAction) Register(c *gin.Context) (int, interface{}){
 	var register pb.Register
 	if err := c.ShouldBindJSON(&register); err != nil {
-		return -1, err.Error()
+		return 1, err.Error()
+	}
+
+	if register.Code != "0000" {
+		return 2, "code error"
 	}
 	account := models.NewAccount(register.Phone)
 	if err := account.Load(); err == nil {
-		return -2 , "account exists: " + register.Phone
+		return 3 , "account exists: " + register.Phone
 	}
 	account.Uid = common.SnowFlack.NextValStr()
 	account.Password = utils.Md5V(register.Password)
 	if  err := account.Create(); err != nil{
-		return -3, "account register err: " + err.Error()
+		return 4, "account register err: " + err.Error()
 	}
 	account.Password = register.Password
-	return 0, account.Account
+	return 0, "success"
 }
 func (h *AccountAction) Login(c *gin.Context) (int,interface{}) {
 	var login pb.Account
 	if err := c.ShouldBindJSON(&login); err != nil {
-		return -1, err.Error()
+		return 1, err.Error()
 	}
 	account := models.NewAccount(login.Phone)
 	if err := account.Load(); err != nil {
-		return -2, err.Error()
+		return 2, err.Error()
 	}
 	if utils.Md5V(login.Password) != account.Password {
-		return -3, "password error"
+		return 3, "password error"
 	}
 	var gs []*pb.ServiceInfo
@@ -55,7 +59,7 @@ func (h *AccountAction) Login(c *gin.Context) (int,interface{}) {
 		})
 	}
 	rsp := &pb.LoginRsp{
-		Uid:         account.Uid,
+		Token:         account.Uid,
 		GameService: gs,
 	}
 	return 0, rsp
@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"pro2d/common"
 	"pro2d/common/components"
-	"pro2d/common/db"
+	"pro2d/common/db/mongoproxy"
 	"pro2d/common/etcd"
 	"pro2d/common/logger"
 	"syscall"
@@ -23,7 +23,7 @@ func NewAccountServer(version string, port ...string) *AccountServer {
 func (s *AccountServer) Init() error {
 	//mgo init
-	err := db.ConnectMongo(common.GlobalConf.AccountConf.MongoConf)
+	err := mongoproxy.ConnectMongo(common.GlobalConf.AccountConf.MongoConf)
 	//Etcd 初始化
 	s.EtcdClient, err = etcd.NewEtcdClient(common.GlobalConf.Etcd)
@@ -6,6 +6,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
 	"pro2d/common/logger"
+	"pro2d/common/snow"
 	"strings"
 )
@@ -92,7 +93,7 @@ type ServerConf struct {
 var(
 	GlobalConf ServerConf
-	SnowFlack  *Snowflake
+	SnowFlack  *snow.Snowflake
 )
 func init() {
@@ -120,5 +121,5 @@ func init() {
 	}
 	//初始化雪花算法
-	SnowFlack = NewSnowflake(GlobalConf.WorkerID, GlobalConf.DatacenterID)
+	SnowFlack = snow.NewSnowflake(GlobalConf.WorkerID, GlobalConf.DatacenterID)
 }
 \ No newline at end of file
-package db
+package mongoproxy
 import (
 	"context"
@@ -28,7 +28,7 @@ type MgoColl struct {
 func NewMongoColl(dbname string, schema components.ISchema) *MgoColl {
 	m := &MgoColl{
 		dbname: dbname,
-		coll: DB().Collection(dbname),
+		coll:   DB().Collection(dbname),
 		Schema: schema,
 	}
 	return m
-package db
+package mongoproxy
 import (
 	"context"
-package db
+package redisproxy
 import (
 	"github.com/garyburd/redigo/redis"
-package common
+package snow
 import (
 	"fmt"
@@ -29,8 +29,6 @@ const (
 	timestampShift    = sequenceBits + workeridBits + datacenteridBits // 时间戳左移位数
 )
-
-
 func NewSnowflake(workerid, datacenterid int64) *Snowflake {
 	return &Snowflake{
 		Mutex:        new(sync.Mutex),
@@ -45,7 +43,6 @@ func (s *Snowflake) NextValStr() string {
 	return fmt.Sprintf("%d", s.NextVal())
 }
-
 func (s *Snowflake) NextVal() int64 {
 	s.Lock()
 	now := time.Now().UnixNano() / 1000000 // 转毫秒
 package models
 import (
-	"pro2d/common/db"
+	"pro2d/common/db/mongoproxy"
 	"pro2d/pb"
 )
@@ -14,5 +14,5 @@ func InitModels()  {
 		pb.Role{},
 		pb.Team{},
 	}
-	db.InitDoc(schema...)
+	mongoproxy.InitDoc(schema...)
 }
@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 	"pro2d/common"
-	"pro2d/common/db"
+	"pro2d/common/db/mongoproxy"
 	"pro2d/common/logger"
 	"pro2d/pb"
 	"pro2d/utils"
@@ -24,7 +24,7 @@ type RoleModel struct {
 func RoleExistByUid(uid string) *RoleModel {
 	data := &pb.Role{Uid: uid}
-	if err := db.FindOne(db.GetBsonM("uid", uid), data); err != nil {
+	if err := mongoproxy.FindOne(mongoproxy.GetBsonM("uid", uid), data); err != nil {
 		logger.Error("Role exist err: %v", err)
 		return nil
 	}
@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 	"pro2d/common"
-	"pro2d/common/db"
+	"pro2d/common/db/mongoproxy"
 	"pro2d/common/logger"
 	"pro2d/pb"
 	"pro2d/utils"
@@ -11,7 +11,7 @@ import (
 )
 func TestNewRole(t *testing.T) {
-	err := db.ConnectMongo(common.GlobalConf.MongoConf)
+	err := mongoproxy.ConnectMongo(common.GlobalConf.MongoConf)
 	if err != nil {
 		logger.Error(err)
 		return
@@ -2,7 +2,7 @@ package models
 import (
 	"pro2d/common/components"
-	"pro2d/common/db"
+	"pro2d/common/db/mongoproxy"
 	"pro2d/common/logger"
 	"reflect"
 	"strings"
@@ -39,8 +39,8 @@ func NewSchema(key string, schema interface{}) *Schema {
 		schema: schema,
 	}
-	sch.db = db.NewMongoColl(sch.GetSchemaName(), sch)
-	sch.pri =  db.GetBsonD(sch.getPriTag(), key)
+	sch.db = mongoproxy.NewMongoColl(sch.GetSchemaName(), sch)
+	sch.pri =  mongoproxy.GetBsonD(sch.getPriTag(), key)
 	return sch
 }
@@ -88,7 +88,7 @@ type LoginRsp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Uid         string         `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`
+	Token       string         `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
 	GameService []*ServiceInfo `protobuf:"bytes,2,rep,name=game_service,json=gameService,proto3" json:"game_service,omitempty"`
 }
@@ -124,9 +124,9 @@ func (*LoginRsp) Descriptor() ([]byte, []int) {
 	return file_account_proto_rawDescGZIP(), []int{1}
 }
-func (x *LoginRsp) GetUid() string {
+func (x *LoginRsp) GetToken() string {
 	if x != nil {
-		return x.Uid
+		return x.Token
 	}
 	return ""
 }
@@ -145,7 +145,7 @@ type Register struct {
 	Phone    string `protobuf:"bytes,1,opt,name=phone,proto3" json:"phone,omitempty" binding:"required"`       // @inject_tag: binding:"required"
 	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty" binding:"required"` // @inject_tag: binding:"required"
-	Code     int32  `protobuf:"varint,3,opt,name=code,proto3" json:"code,omitempty" binding:"required"`        // @inject_tag: binding:"required"
+	Code     string `protobuf:"bytes,3,opt,name=code,proto3" json:"code,omitempty" binding:"required"`         // @inject_tag: binding:"required"
 }
 func (x *Register) Reset() {
@@ -194,11 +194,11 @@ func (x *Register) GetPassword() string {
 	return ""
 }
-func (x *Register) GetCode() int32 {
+func (x *Register) GetCode() string {
 	if x != nil {
 		return x.Code
 	}
-	return 0
+	return ""
 }
 var File_account_proto protoreflect.FileDescriptor
@@ -210,19 +210,19 @@ var file_account_proto_rawDesc = []byte{
 	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61,
 	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x55, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x73,
-	0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x12, 0x37, 0x0a, 0x0c, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x0b, 0x67, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08,
-	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a,
-	0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x0a,
-	0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x59, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x73,
+	0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x37, 0x0a, 0x0c, 0x67, 0x61, 0x6d, 0x65, 0x5f,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x67, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x22, 0x50, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05,
+	0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f,
+	0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f,
+	0x64, 0x65, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 var (
@@ -73,7 +73,7 @@ type LoginReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Uid    string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`
+	Token  string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
 	Device string `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
 }
@@ -109,9 +109,9 @@ func (*LoginReq) Descriptor() ([]byte, []int) {
 	return file_game_proto_rawDescGZIP(), []int{1}
 }
-func (x *LoginReq) GetUid() string {
+func (x *LoginReq) GetToken() string {
 	if x != nil {
-		return x.Uid
+		return x.Token
 	}
 	return ""
 }
@@ -123,61 +123,6 @@ func (x *LoginReq) GetDevice() string {
 	return ""
 }
-type LoginResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Uid    string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`
-	Device string `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
-}
-
-func (x *LoginResponse) Reset() {
-	*x = LoginResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_game_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LoginResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LoginResponse) ProtoMessage() {}
-
-func (x *LoginResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_game_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LoginResponse.ProtoReflect.Descriptor instead.
-func (*LoginResponse) Descriptor() ([]byte, []int) {
-	return file_game_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *LoginResponse) GetUid() string {
-	if x != nil {
-		return x.Uid
-	}
-	return ""
-}
-
-func (x *LoginResponse) GetDevice() string {
-	if x != nil {
-		return x.Device
-	}
-	return ""
-}
-
 type CreateReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -190,7 +135,7 @@ type CreateReq struct {
 func (x *CreateReq) Reset() {
 	*x = CreateReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_game_proto_msgTypes[3]
+		mi := &file_game_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -203,7 +148,7 @@ func (x *CreateReq) String() string {
 func (*CreateReq) ProtoMessage() {}
 func (x *CreateReq) ProtoReflect() protoreflect.Message {
-	mi := &file_game_proto_msgTypes[3]
+	mi := &file_game_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -216,7 +161,7 @@ func (x *CreateReq) ProtoReflect() protoreflect.Message {
 // Deprecated: Use CreateReq.ProtoReflect.Descriptor instead.
 func (*CreateReq) Descriptor() ([]byte, []int) {
-	return file_game_proto_rawDescGZIP(), []int{3}
+	return file_game_proto_rawDescGZIP(), []int{2}
 }
 func (x *CreateReq) GetUid() string {
@@ -247,7 +192,7 @@ type RoleRsp struct {
 func (x *RoleRsp) Reset() {
 	*x = RoleRsp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_game_proto_msgTypes[4]
+		mi := &file_game_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -260,7 +205,7 @@ func (x *RoleRsp) String() string {
 func (*RoleRsp) ProtoMessage() {}
 func (x *RoleRsp) ProtoReflect() protoreflect.Message {
-	mi := &file_game_proto_msgTypes[4]
+	mi := &file_game_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -273,7 +218,7 @@ func (x *RoleRsp) ProtoReflect() protoreflect.Message {
 // Deprecated: Use RoleRsp.ProtoReflect.Descriptor instead.
 func (*RoleRsp) Descriptor() ([]byte, []int) {
-	return file_game_proto_rawDescGZIP(), []int{4}
+	return file_game_proto_rawDescGZIP(), []int{3}
 }
 func (x *RoleRsp) GetRole() *Role {
@@ -311,28 +256,25 @@ var file_game_proto_rawDesc = []byte{
 	0x6d, 0x65, 0x1a, 0x0c, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x22, 0x1e, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
 	0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65,
-	0x22, 0x34, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
-	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x22, 0x38, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x35, 0x0a, 0x09, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76,
 	0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63,
-	0x65, 0x22, 0x35, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x9a, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c,
-	0x65, 0x52, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65,
-	0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65,
-	0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e,
-	0x54, 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x29, 0x0a, 0x06, 0x65, 0x71,
-	0x75, 0x69, 0x70, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64,
-	0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65,
-	0x71, 0x75, 0x69, 0x70, 0x73, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x22, 0x9a, 0x01, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x73, 0x70, 0x12, 0x20, 0x0a,
+	0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x6f,
+	0x64, 0x65, 0x6c, 0x73, 0x2e, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12,
+	0x20, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
+	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72,
+	0x6f, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0c, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x04, 0x74,
+	0x65, 0x61, 0x6d, 0x12, 0x29, 0x0a, 0x06, 0x65, 0x71, 0x75, 0x69, 0x70, 0x73, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x45, 0x71, 0x75,
+	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x65, 0x71, 0x75, 0x69, 0x70, 0x73, 0x42, 0x0a,
+	0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 var (
@@ -347,23 +289,22 @@ func file_game_proto_rawDescGZIP() []byte {
 	return file_game_proto_rawDescData
 }
-var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_game_proto_goTypes = []interface{}{
-	(*HeartReq)(nil),      // 0: game.HeartReq
-	(*LoginReq)(nil),      // 1: game.LoginReq
-	(*LoginResponse)(nil), // 2: game.LoginResponse
-	(*CreateReq)(nil),     // 3: game.CreateReq
-	(*RoleRsp)(nil),       // 4: game.RoleRsp
-	(*Role)(nil),          // 5: models.Role
-	(*Hero)(nil),          // 6: models.Hero
-	(*Team)(nil),          // 7: models.Team
-	(*Equipment)(nil),     // 8: models.Equipment
+	(*HeartReq)(nil),  // 0: game.HeartReq
+	(*LoginReq)(nil),  // 1: game.LoginReq
+	(*CreateReq)(nil), // 2: game.CreateReq
+	(*RoleRsp)(nil),   // 3: game.RoleRsp
+	(*Role)(nil),      // 4: models.Role
+	(*Hero)(nil),      // 5: models.Hero
+	(*Team)(nil),      // 6: models.Team
+	(*Equipment)(nil), // 7: models.Equipment
 }
 var file_game_proto_depIdxs = []int32{
-	5, // 0: game.RoleRsp.role:type_name -> models.Role
-	6, // 1: game.RoleRsp.hero:type_name -> models.Hero
-	7, // 2: game.RoleRsp.team:type_name -> models.Team
-	8, // 3: game.RoleRsp.equips:type_name -> models.Equipment
+	4, // 0: game.RoleRsp.role:type_name -> models.Role
+	5, // 1: game.RoleRsp.hero:type_name -> models.Hero
+	6, // 2: game.RoleRsp.team:type_name -> models.Team
+	7, // 3: game.RoleRsp.equips:type_name -> models.Equipment
 	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
@@ -403,18 +344,6 @@ func file_game_proto_init() {
 			}
 		}
 		file_game_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LoginResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_game_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateReq); i {
 			case 0:
 				return &v.state
@@ -426,7 +355,7 @@ func file_game_proto_init() {
 				return nil
 			}
 		}
-		file_game_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_game_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RoleRsp); i {
 			case 0:
 				return &v.state
@@ -445,7 +374,7 @@ func file_game_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_game_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   5,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-Subproject commit 7257f0e1d7cbce636e95993247107ca58fd5e374
+Subproject commit f725ea29c1806f14c15502406a83b4269193f76b