gdxz/hepa-calc-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取出测试环境验证码判断

Browse Source
This commit is contained in:
wucongxing8150 2024-07-29 15:52:29 +08:00
parent 502908b4e5
commit 090cfce650
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/controller/Login.go
View File

@ -9,6 +9,7 @@ import (
"hepa-calc-api/api/requests"
"hepa-calc-api/api/responses"
"hepa-calc-api/api/service"
"hepa-calc-api/config"
"hepa-calc-api/extend/weChat"
"hepa-calc-api/global"
"hepa-calc-api/utils"
@ -33,15 +34,17 @@ func (r *Login) LoginPhone(c *gin.Context) {
}
// 检测验证码
code, _ := global.Redis.Get(c, "login_code_count_"+req.Mobile).Result()
if code == "" {
responses.FailWithMessage("验证码失效", c)
return
}
if config.C.Env != "dev" {
code, _ := global.Redis.Get(c, "login_code_count_"+req.Mobile).Result()
if code == "" {
responses.FailWithMessage("验证码失效", c)
return
}
if req.Code != code {
responses.FailWithMessage("验证码错误", c)
return
if req.Code != code {
responses.FailWithMessage("验证码错误", c)
return
}
}
// 检测用户信息
@ -60,8 +63,13 @@ func (r *Login) LoginPhone(c *gin.Context) {
}
}()
// 头像
avatar := "www.baidu.com"
// 登录ip
publicService := service.PublicService{}
loginIp := publicService.GetUserIP(c.Request)
// 新增用户
user = &model.User{
UserName: "",
@ -75,7 +83,7 @@ func (r *Login) LoginPhone(c *gin.Context) {
IsMember: 0,
MemberExpireDate: nil,
LoginAt: model.LocalTime(time.Now()),
LoginIp: req.LoginIp,
LoginIp: loginIp,
}
user, err := userDao.AddUser(tx, user)
if err != nil {
@ -171,6 +179,10 @@ func (r *Login) LoginWx(c *gin.Context) {
return
}
// 登录ip
publicService := service.PublicService{}
loginIp := publicService.GetUserIP(c.Request)
// 新增用户
user = &model.User{
UserName: userInfo.Nickname,
@ -184,7 +196,7 @@ func (r *Login) LoginWx(c *gin.Context) {
IsMember: 0,
MemberExpireDate: nil,
LoginAt: model.LocalTime(time.Now()),
LoginIp: req.LoginIp,
LoginIp: loginIp,
}
user, err = userDao.AddUser(tx, user)
if err != nil {

12
api/requests/Login.go
View File

@ -7,15 +7,13 @@ type LoginRequest struct {
// LoginWx 微信授权登录
type LoginWx struct {
Code string `json:"code" form:"code" label:"授权码" validate:"required"`
Source int `json:"source" form:"source" label:"来源" validate:"required,oneof=1 2"` // （1：app 2：公众号
LoginIp string `json:"login_ip" form:"login_ip" label:"登录ip"`
Code string `json:"code" form:"code" label:"授权码" validate:"required"`
Source int `json:"source" form:"source" label:"来源" validate:"required,oneof=1 2"` // （1：app 2：公众号
}
// LoginPhone 手机号登录
type LoginPhone struct {
Mobile string `json:"mobile" form:"mobile" label:"手机号" validate:"required"`
Code string `json:"code" form:"code" label:"手机号" validate:"required"`
Source int `json:"source" form:"source" label:"来源）" validate:"required"` // （1：app 2：公众号
LoginIp string `json:"login_ip" form:"login_ip" label:"登录ip"`
Mobile string `json:"mobile" form:"mobile" label:"手机号" validate:"required"`
Code string `json:"code" form:"code" label:"手机号" validate:"required"`
Source int `json:"source" form:"source" label:"来源）" validate:"required"` // （1：app 2：公众号
}