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

修正了登录1

Browse Source
This commit is contained in:
wucongxing8150 2024-08-19 17:32:37 +08:00
parent 85b01f9002
commit bc13339355
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/controller/Login.go
View File

@ -32,6 +32,11 @@ func (r *Login) Login(c *gin.Context) {
return return
} }
if req.OpenId == "" && req.Mobile == "" {
responses.FailWithMessage("登陆失败", c)
return
}
// 开始事务 // 开始事务
tx := global.Db.Begin() tx := global.Db.Begin()
defer func() { defer func() {
@ -47,11 +52,18 @@ func (r *Login) Login(c *gin.Context) {
// 检测用户信息 // 检测用户信息
userDao := dao.UserDao{} userDao := dao.UserDao{}
maps := make(map[string]interface{}) maps := make(map[string]interface{})
if req.OpenId != "" {
maps["open_id"] = req.OpenId
}
if req.Mobile != "" {
maps["mobile"] = req.Mobile maps["mobile"] = req.Mobile
}
user, _ := userDao.GetUser(maps) user, _ := userDao.GetUser(maps)
// 新用户处理方式 // 新用户处理方式
if user == nil { if user == nil {
// 检测验证码 // 检测验证码
if req.Mobile != "" {
if config.C.Env != "dev" { if config.C.Env != "dev" {
code, _ := global.Redis.Get(c, "login_code_count_"+req.Mobile).Result() code, _ := global.Redis.Get(c, "login_code_count_"+req.Mobile).Result()
if code == "" { if code == "" {
@ -64,6 +76,7 @@ func (r *Login) Login(c *gin.Context) {
return return
} }
} }
}
// 登录ip // 登录ip
publicService := service.PublicService{} publicService := service.PublicService{}

4
api/requests/Login.go
View File

@ -6,10 +6,10 @@ type LoginRequest struct {
// Login 登录 // Login 登录
type Login struct { type Login struct {
Mobile string `json:"mobile" form:"mobile" label:"手机号" validate:"required"` Mobile string `json:"mobile" form:"mobile" label:"手机号"`
Code string `json:"code" form:"code" label:"验证码"` Code string `json:"code" form:"code" label:"验证码"`
Source int `json:"source" form:"source" label:"来源" validate:"required"` // （1：app 2：公众号 Source int `json:"source" form:"source" label:"来源" validate:"required"` // （1：app 2：公众号
OpenId string `json:"openid" form:"openid" label:"openid" validate:"required"` OpenId string `json:"openid" form:"openid" label:"openid"`
Nickname string `json:"nickname" form:"nickname" label:"用户昵称"` Nickname string `json:"nickname" form:"nickname" label:"用户昵称"`
HeadImgUrl string `json:"headimgurl" form:"headimgurl" label:"头像"` HeadImgUrl string `json:"headimgurl" form:"headimgurl" label:"头像"`
UnionId string `json:"unionid" form:"unionid" label:"unionid"` UnionId string `json:"unionid" form:"unionid" label:"unionid"`