diff --git a/logic/controller/CreatePlayer.go b/logic/controller/CreatePlayer.go new file mode 100644 index 000000000..5fe940d1d --- /dev/null +++ b/logic/controller/CreatePlayer.go @@ -0,0 +1,15 @@ +package controller + +import ( + "blazing/common/data/entity" + "blazing/common/socket/errorcode" + "blazing/logic/service/login" + "blazing/modules/blazing/service" +) + +// 处理命令: 1001 +func (h *Controller) CreatePlayer(data *login.CreatePlayerInboundInfo, c *entity.Conn) (result *login.CreatePlayerOutInfo, err errorcode.ErrorCode) { + + service.NewPlayerService().Reg(uint(data.Head.UserID), data.Nickname, data.Color) + return result, 0 +} diff --git a/logic/controller/controller.go b/logic/controller/controller.go index 9d53a63d9..2d6b6756c 100644 --- a/logic/controller/controller.go +++ b/logic/controller/controller.go @@ -86,15 +86,9 @@ func init() { //默认初始化扫描 for i := 0; i < typ.NumMethod(); i++ { method := typ.Method(i) - // TODO 接收者 + 2个参数 一个是类型,一个是player - //method.Type.In(1) == reflect.TypeOf([]byte{} - - // 获取方法值 methodValue := value.MethodByName(method.Name) methodValue.Type().NumIn() - var func_cmd uint32 - - func_cmd = getcmd(methodValue.Type().In(0)) + var func_cmd uint32 = getcmd(methodValue.Type().In(0)) if func_cmd == 0 { //说明不是注册方法 glog.Warning(context.Background(), "方法参数必须是结构体", method.Name, "跳过注册") continue diff --git a/logic/controller/login.go b/logic/controller/login.go index de232d3c6..27797c22d 100644 --- a/logic/controller/login.go +++ b/logic/controller/login.go @@ -7,7 +7,7 @@ import ( "blazing/logic/service" "blazing/logic/service/login" "blazing/logic/service/space" - "blazing/modules/blazing/model" + blservice "blazing/modules/blazing/service" "context" "time" @@ -28,20 +28,24 @@ func (h *Controller) Login(data *login.InInfo, c *entity.Conn) (result *login.Ou t.MapId = 1 space.GetSpace(t.MapId).Set(t.UserID, t) //添加玩家 glog.Debug(context.Background(), "登录成功,初始地图 人数:", space.GetSpace(1).Len()) + playerinfo := blservice.NewPlayerService().Person(uint(t.UserID)) + t.Nick = playerinfo.Nick + // blservice.NewPlayerService().ProcessAndSave(t.UserID, func(t *model.PlayerInfo) error { - t.Nick = "测试" - + // t.Nick = t.Nick + " (在线)" + // return nil + // }) result = login.NewOutInfo() //设置登录消息 - result.UserID = 10001 //注释掉就能进入 + result.UserID = t.UserID result.RegisterTime = uint32(time.Now().Unix()) - result.Nick = "骄阳号" - result.Color = 0x00FF00 - result.Pos = model.Pos{X: 500, Y: 400} - result.Clothes = append(result.Clothes, model.PeopleItemInfo{ID: 100717, Level: 1}) + result.Nick = t.Nick + result.Color = playerinfo.Color + result.Pos = playerinfo.Pos + result.Clothes = playerinfo.Clothes ///append(result.Clothes, model.PeopleItemInfo{ID: 100717, Level: 1}) result.MapID = t.MapId - result.TimeLimit = 43200 - result.TimeToday = 339 - result.PetList = append(result.PetList, model.PetInfo{ID: 100, Level: 1}) + result.TimeLimit = playerinfo.TimeLimit + result.TimeToday = playerinfo.TimeToday + result.PetList = playerinfo.PetList return result, 0 diff --git a/logic/service/login/LoginSidInfo.go b/logic/service/login/LoginSidInfo.go index 5539645af..ead611be8 100644 --- a/logic/service/login/LoginSidInfo.go +++ b/logic/service/login/LoginSidInfo.go @@ -6,9 +6,7 @@ import ( "blazing/modules/blazing/model" "context" "encoding/hex" - "fmt" - "github.com/creasty/defaults" "github.com/gogf/gf/v2/os/glog" ) @@ -20,19 +18,6 @@ type InInfo struct { //这里直接使用组合来实现将传入的原始头部 } -func (s *InInfo) Def() []byte { //默认返回方法 - t1, _ := hex.DecodeString("0000045D37000003E9000027110000000000002711683F89CF6E69656F0000000000000000000000000008000F00000000000000000000000000000000000000000000000000000001000001DB0000018B000000000000A8C000000000000000000000000000000000000000080001388000000001000000017FFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030000000000000000000000000000000000000064000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001FFFFFFFF000000004E4F4E4F0000000000000000000000000000000000000001000000010000000100000001000000010000000100000001000000000003030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030000000100000064000000000000000000000000000000000000001F000000000000006400000000000093F4000093F4000000D5000000F7000000AD00000088000000920000008C0000009C00000000000000000000000000000000000000000000000000000004000027900000001B00004E6200000014000028380000002800004E3E0000002368493DC60000000000000000000000000000000000000000000100000000000000A937000007D10000271100000000000027116E69656F00000000000000000000000000000000000000000000000F0000000000000000000001DB0000018B0000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFF0000000000000001000000000000000000000000000000000000000000000000000000000000000000000000") - //t1 = t1[17:] - fmt.Println(t1[:40]) - return t1 - s.Head.Version = "7" - s.Head.UserID = 10001 - s.Head.Result = 0 - //s //return data.Head.Pack(t1[17:])[:40] - return s.Head.Pack(t1[17:]) //返回传参 - //return t1[:40] - -} func (l *InInfo) CheakSession() bool { // tt, _ := cool.CacheManager.Keys(context.Background()) //g.Dump(tt) @@ -52,40 +37,10 @@ type OutInfo struct { } func NewOutInfo() *OutInfo { + l := &OutInfo{ - PlayerInfo: model.PlayerInfo{ - Clothes: make([]model.PeopleItemInfo, 0), - PetList: make([]model.PetInfo, 0), - }, + PlayerInfo: *model.NewPlayerInfo(), } - // 自动填充 struct tag 里的 default 值 - if err := defaults.Set(l); err != nil { - panic(err) // 方便发现 default 设置错误 - } - - // 填充需要重复值的数组 - fillBytes(&l.DailyResArr, 3) - fillBytes(&l.Reserved1, 3) - fillBytes(&l.TaskList, 3) - return l } - -// 工具函数：给数组/切片批量赋同一个 byte 值 -func fillBytes(arr any, val byte) { - switch a := arr.(type) { - case *[50]byte: - for i := range a { - a[i] = val - } - case *[27]byte: - for i := range a { - a[i] = val - } - case *[500]byte: - for i := range a { - a[i] = val - } - } -} diff --git a/logic/service/login/create_player.go b/logic/service/login/create_player.go new file mode 100644 index 000000000..d4f17c97e --- /dev/null +++ b/logic/service/login/create_player.go @@ -0,0 +1,17 @@ +package login + +import "blazing/common/socket/handler" + +type CreatePlayerInboundInfo struct { //这里直接使用组合来实现将传入的原始头部数据和结构体参数序列化 + Head handler.TomeeHeader `cmd:"108" struc:"[0]pad"` //玩家登录 + + // 玩家昵称，对应Java的@ArraySerialize注解 + Nickname string `struc:"[16]byte"` // 固定长度16字节 + // 机器人人物颜色 rgb，对应Java的@UInt注解 + Color uint32 `fieldDescription:"机器人人物颜色 rgb" uint:"true"` +} +type CreatePlayerOutInfo struct { + + //不用回包,因为前端已经处理了 + +} diff --git a/modules/base/controller/admin/base_sys_user.go b/modules/base/controller/admin/base_sys_user.go index e0cff9645..1713ed917 100644 --- a/modules/base/controller/admin/base_sys_user.go +++ b/modules/base/controller/admin/base_sys_user.go @@ -44,24 +44,37 @@ func (c *BaseSysUserController) Move(ctx context.Context, req *UserMoveReq) (res return } -func (c *BaseSysUserController) GetSession(ctx context.Context, req *SessionReq) (res *cool.BaseRes, err error) { +func (c *BaseSysUserController) GetSession(ctx context.Context, req *SessionReq) (res *SessionRes, err error) { t := cool.GetAdmin(ctx) if t == nil || t.UserId == 0 { - return cool.Fail("未登录"), nil + return &SessionRes{}, nil } retsid, sid, err := blazing_service.NewLoginServiceService().GetSessionId(t.UserId) if err != nil { - return cool.Fail(err.Error()), nil + return &SessionRes{}, nil + + } + res = &SessionRes{} + + t1 := service.NewBaseSysUserService().GetPerson(t.UserId) + + res.Session = retsid + + if !blazing_service.NewPlayerService().IsReg(t1.ID) { + res.UserID = int(t1.ID) } - res = cool.Ok(nil) - res.Data = retsid if err := share.ShareManager.SaveSession(sid, uint32(t.UserId)); err != nil { - return cool.Fail(err.Error()), nil + return &SessionRes{}, nil } return } + +type SessionRes struct { + UserID int `json:"userid"` + Session string `json:"session"` +} diff --git a/modules/base/model/base_sys_user.go b/modules/base/model/base_sys_user.go index 11ce7c9bb..e0298e953 100644 --- a/modules/base/model/base_sys_user.go +++ b/modules/base/model/base_sys_user.go @@ -12,12 +12,13 @@ type BaseSysUser struct { Username string `gorm:"column:username;type:varchar(100);not null;Index" json:"username"` // 用户名 Password string `gorm:"column:password;type:varchar(255);not null" json:"password"` // 密码 PasswordV *int32 `gorm:"column:passwordV;type:int;not null;default:1" json:"passwordV"` // 密码版本, 作用是改完密码，让原来的token失效 - NickName *string `gorm:"column:nickName;type:varchar(255)" json:"nickName"` // 昵称 - HeadImg *string `gorm:"column:headImg;type:varchar(255)" json:"headImg"` // 头像 - Phone *string `gorm:"column:phone;type:varchar(20);index" json:"phone"` // 手机 - Email *string `gorm:"column:email;type:varchar(255)" json:"email"` // 邮箱 - Status *int32 `gorm:"column:status;not null;default:1" json:"status"` // 状态 0:禁用 1：启用 - Remark *string `gorm:"column:remark;type:varchar(255)" json:"remark"` // 备注 + + HeadImg *string `gorm:"column:headImg;type:varchar(255)" json:"headImg"` // 头像 + //Phone *string `gorm:"column:phone;type:varchar(20);index" json:"phone"` // 手机 + Email *string `gorm:"column:email;type:varchar(255)" json:"email"` // 邮箱 + Status *int32 `gorm:"column:status;not null;default:1" json:"status"` // 状态 0:禁用 1：启用 + Remark *string `gorm:"column:remark;type:varchar(255)" json:"remark"` // 备注 + //Role bool `gorm:"column:isNew;type:bool;not null;default:0" json:"isNew"` // //SocketID *string `gorm:"column:socketId;type:varchar(255)" json:"socketId"` // socketId } diff --git a/modules/base/service/base_sys_user.go b/modules/base/service/base_sys_user.go index 8270777ea..fec893acb 100644 --- a/modules/base/service/base_sys_user.go +++ b/modules/base/service/base_sys_user.go @@ -38,6 +38,12 @@ func (s *BaseSysUserService) GetSession(email string, password string) (res *mod return } +func (s *BaseSysUserService) GetPerson(userId uint) (res *model.BaseSysUser) { + m := cool.DBM(s.Model) + m.Where("id", userId).FieldsEx("password").Scan(&res) + + return +} func (s *BaseSysUserService) ModifyBefore(ctx context.Context, method string, param g.MapStrAny) (err error) { if method == "Delete" { // 禁止删除超级管理员 diff --git a/modules/blazing/model/player.go b/modules/blazing/model/player.go index 187f09997..ccb976c49 100644 --- a/modules/blazing/model/player.go +++ b/modules/blazing/model/player.go @@ -2,6 +2,8 @@ package model import ( "blazing/cool" + + "github.com/creasty/defaults" ) const TableNamePlayerInfo = "player_info" @@ -26,6 +28,43 @@ type PeopleItemInfo struct { func (p *PeopleItemInfo) InitDefaults() { p.Level = 1 // 未知字段默认值1，与Java的@Builder.Default保持一致 } +func NewPlayerInfo() *PlayerInfo { + l := &PlayerInfo{ + + Clothes: make([]PeopleItemInfo, 0), + PetList: make([]PetInfo, 0), + } + + // 自动填充 struct tag 里的 default 值 + if err := defaults.Set(l); err != nil { + panic(err) // 方便发现 default 设置错误 + } + + // 填充需要重复值的数组 + fillBytes(&l.DailyResArr, 3) + fillBytes(&l.Reserved1, 3) + fillBytes(&l.TaskList, 3) + + return l +} + +// 工具函数：给数组/切片批量赋同一个 byte 值 +func fillBytes(arr any, val byte) { + switch a := arr.(type) { + case *[50]byte: + for i := range a { + a[i] = val + } + case *[27]byte: + for i := range a { + a[i] = val + } + case *[500]byte: + for i := range a { + a[i] = val + } + } +} type PlayerInfo struct { GoldBean int32 `struc:"skip" json:"nieo_gold_bean"` // 金豆(特殊货币) @@ -46,8 +85,8 @@ type PlayerInfo struct { FightBadge uint32 `struc:"uint32" json:"fight_badge"` // 固定0 MapID uint32 `struc:"uint32" default:"1" json:"map_id"` // 上线地图ID Pos Pos `json:"pos"` // 坐标 - TimeToday uint32 `struc:"uint32" json:"time_today"` // 已消耗时间（秒） - TimeLimit uint32 `struc:"uint32" json:"time_limit"` // 总电池限制（秒） + TimeToday uint32 `struc:"uint32" default:"43200" json:"time_today"` // 已消耗时间（秒） + TimeLimit uint32 `struc:"uint32" default:"339" json:"time_limit"` // 总电池限制（秒） IsClothHalfDay byte `struc:"byte" json:"is_cloth_half_day"` // 活动标志0/1 IsRoomHalfDay byte `struc:"byte" json:"is_room_half_day"` // 活动标志0/1 IFortressHalfDay byte `struc:"byte" json:"i_fortress_half_day"` // 活动标志0/1 diff --git a/modules/blazing/service/isreg.go b/modules/blazing/service/isreg.go new file mode 100644 index 000000000..0171a281d --- /dev/null +++ b/modules/blazing/service/isreg.go @@ -0,0 +1,102 @@ +package service + +import ( + "blazing/cool" + "blazing/modules/blazing/model" + "context" + "encoding/json" + "strings" + + "github.com/gogf/gf/v2/os/glog" +) + +type PlayerService struct { + *cool.Service +} + +func NewPlayerService() *PlayerService { + return &PlayerService{ + &cool.Service{ + Model: model.NewPlayer(), + }, + } +} + +// 是否注册,如果注册过,那么就会产生用户player信息 +func (s *PlayerService) IsReg(accountID uint) bool { + + m := cool.DBM(s.Model).Where("player_id", accountID) + + record, err := m.One() + if err != nil { + return false + } + if record != nil { + return true + } + return false +} + +// 实现注册,id+昵称+颜色 +func (s *PlayerService) Reg(accountID uint, nick string, color uint32) { + + nick = strings.TrimSpace(nick) + + t := model.NewPlayer() + t.PlayerID = uint64(accountID) + //设置用户信息 + t1 := model.NewPlayerInfo() + t1.Nick = nick + + t1.Color = color + + t22, err := json.Marshal(t1) + if err != nil { + return + } + t.Data = string(t22) + _, err = cool.DBM(s.Model).Data(t).Insert() + if err != nil { + glog.Error(context.Background(), err) + return + } + +} +func (s *PlayerService) Person(accountID uint) (ret *model.PlayerInfo) { + + m := cool.DBM(s.Model).Where("player_id", accountID) + var tt model.Player + m.Scan(&tt) + json.Unmarshal([]byte(tt.Data), &ret) + + return + +} +func (s *PlayerService) Save(data *model.PlayerInfo) { + + m := cool.DBM(s.Model).Where("player_id", data.UserID) + var tt model.Player + m.Scan(&tt) + //todo 待测试 + + temp, _ := json.Marshal(data) + tt.Data = string(temp) + m.Save(tt) + + return + +} + +func (s *PlayerService) ProcessAndSave(playerID uint32, processFunc func(*model.PlayerInfo) error) error { + //todo待测试 + var player model.Player + m1 := cool.DBM(s.Model).Where("player_id", playerID) + m1.Scan(&player) + var tt model.PlayerInfo + json.Unmarshal([]byte(player.Data), &tt) + processFunc(&tt) + tmep, _ := json.Marshal(tt) + player.Data = string(tmep) + m1.Save(player) + return nil +} diff --git a/modules/blazing/service/login.go b/modules/blazing/service/login.go index 284bfb5b7..f0e222c8a 100644 --- a/modules/blazing/service/login.go +++ b/modules/blazing/service/login.go @@ -24,6 +24,7 @@ func NewLoginServiceService() *LoginService { } } +// 生成session func (s *LoginService) GetSessionId(accountID uint) (string, string, error) { t1, _ := uuid.NewV7()