昔念
f8ba7988d0
feat(pet): 优化宠物融合错误码并记录原始捕获时间 - 将宠物融合过程中的错误码从 ErrSystemBusy 细分为多个更具体的错误码， 如 ErrPokemonNotFusionReady、ErrPokemonNotFusionReady2 等，便于问题定位。 - 在融合成功后，新增记录主宠的旧捕捉时间（OldCatchTime）字段。 - 调整战斗捕捉逻辑，使用对手玩家的第一个宠物信息进行添加，并重置战斗结束原因。 refactor(service): 移除未使用的管理员会话结构体字段和清理部分冗余代码 - 注释掉 base_sys_user.go
82 lines
1.8 KiB
Go
82 lines
1.8 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
|
|
"blazing/common/data/share"
|
|
"blazing/cool"
|
|
|
|
"blazing/modules/base/service"
|
|
|
|
blazing_service "blazing/modules/blazing/service"
|
|
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
)
|
|
|
|
type BaseSysUserController struct {
|
|
*cool.Controller
|
|
}
|
|
|
|
func init() {
|
|
var base_sys_user_controller = &BaseSysUserController{
|
|
&cool.Controller{
|
|
Prefix: "/admin/base/sys/user",
|
|
Api: []string{"Add", "Delete", "Update", "Info", "List", "Page", "Move"},
|
|
Service: service.NewBaseSysUserService(),
|
|
},
|
|
}
|
|
// 注册路由
|
|
cool.RegisterController(base_sys_user_controller)
|
|
}
|
|
|
|
type UserMoveReq struct {
|
|
g.Meta `path:"/move" method:"GET"`
|
|
Authorization string `json:"Authorization" in:"header"`
|
|
}
|
|
type SessionReq struct {
|
|
g.Meta `path:"/getSession" method:"GET"`
|
|
Authorization string `json:"Authorization" in:"header"`
|
|
}
|
|
|
|
func (c *BaseSysUserController) Move(ctx context.Context, req *UserMoveReq) (res *cool.BaseRes, err error) {
|
|
err = service.NewBaseSysUserService().Move(ctx)
|
|
res = cool.Ok(nil)
|
|
return
|
|
}
|
|
|
|
func (c *BaseSysUserController) GetSession(ctx context.Context, req *SessionReq) (res *SessionRes, err error) {
|
|
|
|
t := cool.GetAdmin(ctx)
|
|
if t == nil || t.UserId == 0 {
|
|
|
|
return &SessionRes{}, nil
|
|
}
|
|
retsid, sid, err := blazing_service.NewLoginServiceService().GetSessionId(t.UserId)
|
|
if err != nil {
|
|
return &SessionRes{}, nil
|
|
|
|
}
|
|
res = &SessionRes{}
|
|
|
|
t1 := service.NewBaseSysUserService().GetPerson(t.UserId)
|
|
|
|
res.Session = retsid
|
|
|
|
if !blazing_service.NewUserService(uint32(t1.ID)).Info.IsReg() {
|
|
res.UserID = int(t1.ID)
|
|
|
|
}
|
|
|
|
if err := share.ShareManager.SaveSession(sid, uint32(t.UserId)); err != nil {
|
|
return &SessionRes{}, nil
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
type SessionRes struct {
|
|
UserID int `json:"userid"`
|
|
Session string `json:"session"`
|
|
//Server model.ServerList `json:"server"`
|
|
}
|