|
@@ -11,9 +11,12 @@ import (
|
|
|
"context"
|
|
"context"
|
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
|
|
|
+ "github.com/gogf/gf/v2/os/gtime"
|
|
|
|
|
+ "github.com/mssola/user_agent"
|
|
|
"github.com/tiger1103/gfast/v3/apiv1/system"
|
|
"github.com/tiger1103/gfast/v3/apiv1/system"
|
|
|
"github.com/tiger1103/gfast/v3/internal/app/system/model"
|
|
"github.com/tiger1103/gfast/v3/internal/app/system/model"
|
|
|
"github.com/tiger1103/gfast/v3/internal/app/system/service/internal/dao"
|
|
"github.com/tiger1103/gfast/v3/internal/app/system/service/internal/dao"
|
|
|
|
|
+ "github.com/tiger1103/gfast/v3/internal/app/system/service/internal/do"
|
|
|
"github.com/tiger1103/gfast/v3/library/libUtils"
|
|
"github.com/tiger1103/gfast/v3/library/libUtils"
|
|
|
"github.com/tiger1103/gfast/v3/library/liberr"
|
|
"github.com/tiger1103/gfast/v3/library/liberr"
|
|
|
)
|
|
)
|
|
@@ -28,6 +31,8 @@ func User() IUser {
|
|
|
|
|
|
|
|
type IUser interface {
|
|
type IUser interface {
|
|
|
GetAdminUserByUsernamePassword(ctx context.Context, req *system.UserLoginReq) (user *model.LoginUserRes, err error)
|
|
GetAdminUserByUsernamePassword(ctx context.Context, req *system.UserLoginReq) (user *model.LoginUserRes, err error)
|
|
|
|
|
+ LoginLog(ctx context.Context, params *model.LoginLogParams)
|
|
|
|
|
+ UpdateLoginInfo(ctx context.Context, id uint64, ip string) (err error)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
type userImpl struct {
|
|
type userImpl struct {
|
|
@@ -54,8 +59,40 @@ func (s *userImpl) GetAdminUserByUsernamePassword(ctx context.Context, req *syst
|
|
|
func (s *userImpl) GetUserByUsername(ctx context.Context, userName string) (user *model.LoginUserRes, err error) {
|
|
func (s *userImpl) GetUserByUsername(ctx context.Context, userName string) (user *model.LoginUserRes, err error) {
|
|
|
err = g.Try(func() {
|
|
err = g.Try(func() {
|
|
|
user = &model.LoginUserRes{}
|
|
user = &model.LoginUserRes{}
|
|
|
- err = dao.SysUser.Ctx(ctx).Fields(user).Where("a=12").Where(dao.SysUser.Columns().UserName, userName).Scan(user)
|
|
|
|
|
- liberr.ErrIsNil(ctx, err, "获取用户信息失败")
|
|
|
|
|
|
|
+ err = dao.SysUser.Ctx(ctx).Fields(user).Where(dao.SysUser.Columns().UserName, userName).Scan(user)
|
|
|
|
|
+ liberr.ErrIsNil(ctx, err, "账号密码错误")
|
|
|
|
|
+ })
|
|
|
|
|
+ return
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+// LoginLog 记录登录日志
|
|
|
|
|
+func (s *userImpl) LoginLog(ctx context.Context, params *model.LoginLogParams) {
|
|
|
|
|
+ ua := user_agent.New(params.UserAgent)
|
|
|
|
|
+ browser, _ := ua.Browser()
|
|
|
|
|
+ loginData := &do.SysLoginLog{
|
|
|
|
|
+ LoginName: params.Username,
|
|
|
|
|
+ Ipaddr: params.Ip,
|
|
|
|
|
+ LoginLocation: libUtils.GetCityByIp(params.Ip),
|
|
|
|
|
+ Browser: browser,
|
|
|
|
|
+ Os: ua.OS(),
|
|
|
|
|
+ Status: params.Status,
|
|
|
|
|
+ Msg: params.Msg,
|
|
|
|
|
+ LoginTime: gtime.Now(),
|
|
|
|
|
+ Module: params.Module,
|
|
|
|
|
+ }
|
|
|
|
|
+ _, err := dao.SysLoginLog.Ctx(ctx).Insert(loginData)
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ g.Log().Error(ctx, err)
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+func (s *userImpl) UpdateLoginInfo(ctx context.Context, id uint64, ip string) (err error) {
|
|
|
|
|
+ g.Try(func() {
|
|
|
|
|
+ _, err = dao.SysUser.Ctx(ctx).WherePri(id).Update(g.Map{
|
|
|
|
|
+ dao.SysUser.Columns().LastLoginIp: ip,
|
|
|
|
|
+ dao.SysUser.Columns().LastLoginTime: gtime.Now(),
|
|
|
|
|
+ })
|
|
|
|
|
+ liberr.ErrIsNil(ctx, err, "更新用户登录信息失败")
|
|
|
})
|
|
})
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|