From a1e45e526e9538f04471335d95a7b4621d484fcf Mon Sep 17 00:00:00 2001 From: 1 <1@72wo.cn> Date: Tue, 15 Jul 2025 19:27:27 +0000 Subject: [PATCH] =?UTF-8?q?"refactor(base):=20=E7=A7=BB=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=A8=A1=E5=9E=8B=E4=B8=AD=E7=9A=84SocketID=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E9=87=8D=E6=9E=84=E7=99=BB=E5=BD=95=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E7=AE=A1=E7=90=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/base/model/base_sys_user.go | 2 +- modules/blazing/controller/admin/login.go | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/base/model/base_sys_user.go b/modules/base/model/base_sys_user.go index 7819a4ba..11ce7c9b 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 73b07a6d..e9588567 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() }