diff --git a/api/v1/common/captcha.go b/api/v1/common/captcha.go index f0c525a..a79f860 100644 --- a/api/v1/common/captcha.go +++ b/api/v1/common/captcha.go @@ -12,11 +12,11 @@ import ( ) type CaptchaReq struct { - g.Meta `path:"/get" tags:"通用接口/通用接口/验证码" method:"get" summary:"获取验证码"` + g.Meta `path:"/get" tags:"通用接口/验证码" method:"get" summary:"获取验证码"` } type CaptchaV2Req struct { - g.Meta `path:"/v2" tags:"通用接口/通用接口/验证码" method:"get" summary:"获取v2验证码"` + g.Meta `path:"/v2" tags:"通用接口/验证码" method:"get" summary:"获取v2验证码"` } type CheckCaptchaV2Req struct { diff --git a/internal/app/system/controller/personal.go b/internal/app/system/controller/personal.go index b09a95f..5538315 100644 --- a/internal/app/system/controller/personal.go +++ b/internal/app/system/controller/personal.go @@ -11,6 +11,7 @@ import ( "context" "github.com/gogf/gf/v2/crypto/gmd5" "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/util/gconv" "github.com/tiger1103/gfast/v3/api/v1/system" "github.com/tiger1103/gfast/v3/internal/app/system/service" @@ -37,7 +38,7 @@ func (c *personalController) EditPersonal(ctx context.Context, req *system.Perso } key := gconv.String(res.UserInfo.Id) + "-" + gmd5.MustEncryptString(res.UserInfo.UserName) + gmd5.MustEncryptString(res.UserInfo.UserPassword) if g.Cfg().MustGet(ctx, "gfToken.multiLogin").Bool() { - key = gconv.String(res.UserInfo.Id) + "-" + gmd5.MustEncryptString(res.UserInfo.UserName) + gmd5.MustEncryptString(res.UserInfo.UserPassword+ip+userAgent) + key = gconv.String(res.UserInfo.Id) + "-" + gmd5.MustEncryptString(res.UserInfo.UserName) + gmd5.MustEncryptString(res.UserInfo.UserPassword+ip+userAgent+gtime.Now().String()) } res.UserInfo.UserPassword = "" res.Token, err = service.GfToken().GenerateToken(ctx, key, res.UserInfo) diff --git a/internal/app/system/controller/sys_login.go b/internal/app/system/controller/sys_login.go index 04b03c7..c6d749b 100644 --- a/internal/app/system/controller/sys_login.go +++ b/internal/app/system/controller/sys_login.go @@ -66,7 +66,7 @@ func (c *loginController) Login(ctx context.Context, req *system.UserLoginReq) ( user, err = service.SysUser().GetAdminUserByUsernamePassword(ctx, req) if err != nil { // 保存登录失败的日志信息 - service.SysLoginLog().Invoke(ctx, &model.LoginLogParams{ + service.SysLoginLog().Invoke(gctx.New(), &model.LoginLogParams{ Status: 0, Username: req.Username, Ip: ip, diff --git a/internal/consts/version.go b/internal/consts/version.go index 2f28099..f96bcd6 100644 --- a/internal/consts/version.go +++ b/internal/consts/version.go @@ -9,5 +9,5 @@ package consts const ( Logo = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg` - Version = "3.2.20" + Version = "3.2.21" )