hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 个人中心修改用户信息同步

Browse Source
This commit is contained in:
yxh 2024-03-25 17:54:51 +08:00
parent 17bd446b29
commit 9f3eeb8b0f
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/v1/common/captcha.go
View File

@ -12,11 +12,11 @@ import (
) )
type CaptchaReq struct { type CaptchaReq struct {
g.Meta `path:"/get" tags:"通用接口/通用接口/验证码" method:"get" summary:"获取验证码"` g.Meta `path:"/get" tags:"通用接口/验证码" method:"get" summary:"获取验证码"`
} }
type CaptchaV2Req struct { type CaptchaV2Req struct {
g.Meta `path:"/v2" tags:"通用接口/通用接口/验证码" method:"get" summary:"获取v2验证码"` g.Meta `path:"/v2" tags:"通用接口/验证码" method:"get" summary:"获取v2验证码"`
} }
type CheckCaptchaV2Req struct { type CheckCaptchaV2Req struct {

3
internal/app/system/controller/personal.go
View File

@ -11,6 +11,7 @@ import (
"context" "context"
"github.com/gogf/gf/v2/crypto/gmd5" "github.com/gogf/gf/v2/crypto/gmd5"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
"github.com/tiger1103/gfast/v3/api/v1/system" "github.com/tiger1103/gfast/v3/api/v1/system"
"github.com/tiger1103/gfast/v3/internal/app/system/service" "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) key := gconv.String(res.UserInfo.Id) + "-" + gmd5.MustEncryptString(res.UserInfo.UserName) + gmd5.MustEncryptString(res.UserInfo.UserPassword)
if g.Cfg().MustGet(ctx, "gfToken.multiLogin").Bool() { 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.UserInfo.UserPassword = ""
res.Token, err = service.GfToken().GenerateToken(ctx, key, res.UserInfo) res.Token, err = service.GfToken().GenerateToken(ctx, key, res.UserInfo)

2
internal/app/system/controller/sys_login.go
View File

@ -66,7 +66,7 @@ func (c *loginController) Login(ctx context.Context, req *system.UserLoginReq) (
user, err = service.SysUser().GetAdminUserByUsernamePassword(ctx, req) user, err = service.SysUser().GetAdminUserByUsernamePassword(ctx, req)
if err != nil { if err != nil {
// 保存登录失败的日志信息 // 保存登录失败的日志信息
service.SysLoginLog().Invoke(ctx, &model.LoginLogParams{ service.SysLoginLog().Invoke(gctx.New(), &model.LoginLogParams{
Status: 0, Status: 0,
Username: req.Username, Username: req.Username,
Ip: ip, Ip: ip,

2
internal/consts/version.go
View File

@ -9,5 +9,5 @@ package consts
const ( const (
Logo = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg` Logo = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg`
Version = "3.2.20" Version = "3.2.21"
) )