diff --git a/modules/base/model/base_sys_user.go b/modules/base/model/base_sys_user.go index 7819a4baa..11ce7c9bb 100644 --- a/modules/base/model/base_sys_user.go +++ b/modules/base/model/base_sys_user.go @@ -18,7 +18,7 @@ type BaseSysUser struct { 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"` // 备注 - SocketID *string `gorm:"column:socketId;type:varchar(255)" json:"socketId"` // socketId + //SocketID *string `gorm:"column:socketId;type:varchar(255)" json:"socketId"` // socketId } // TableName BaseSysUser's table name diff --git a/modules/blazing/controller/admin/login.go b/modules/blazing/controller/admin/login.go index 73b07a6d4..e9588567c 100644 --- a/modules/blazing/controller/admin/login.go +++ b/modules/blazing/controller/admin/login.go @@ -1,7 +1,7 @@ package admin import ( - "blazing/common/data/cache" + "blazing/common/data/share" "blazing/cool" baseservice "blazing/modules/base/service" "blazing/modules/blazing/service" @@ -10,7 +10,6 @@ import ( "fmt" "github.com/gogf/gf/v2/frame/g" - "github.com/gogf/gf/v2/util/gconv" ) type SessionReq struct { @@ -58,15 +57,12 @@ func (c *BlazingController) GetSession(ctx context.Context, req *SessionReq) (re } res1, err := baseservice.NewBaseSysUserService().GetSession(req.Email, req.Password) - if err != nil { - res.Code = 400 - res.Msg = err.Error() - } - if res1 == nil { + if err != nil || res1 == nil { res.Code = 400 res.Msg = err.Error() return } + accountID := res1.ID retsid, sid, err := biazing_service.GetSessionId(accountID) if err != nil { @@ -77,7 +73,7 @@ func (c *BlazingController) GetSession(ctx context.Context, req *SessionReq) (re res.Session = retsid - if err := cache.NewSessionManager().SaveSession(sid, gconv.String(accountID)); err != nil { + if err := share.ShareManager.SaveSession(sid, uint32(accountID)); err != nil { res.Code = 400 res.Msg = err.Error() }