williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：优化项目信息

Browse Source
This commit is contained in:
henry
2022-02-10 18:42:52 +08:00
parent 412aaaf1af
commit 95f1401468
14 changed files with 365 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/enterprise/controller/account/login.go
View File

@ -47,7 +47,7 @@ var loginHandle = map[LoginMode]func(*LoginParams, uint64) (*InstanceLoginParams
// loginForSmsCaptcha 短信验证码登陆
func loginForSmsCaptcha(params *LoginParams, tenantID uint64) (*InstanceLoginParams, error) {
if !utils.ValidateMobile(params.Captcha.Mobile) {
return nil, errors.New("操作错误，手机号码格式异常")
return nil, errors.New("手机号码格式异常")
}
pass, err := handle.NewCaptcha().Validate(&handle.CaptchaSms{
Mobile: params.Captcha.Mobile, Captcha: params.Captcha.Captcha,
@ -55,14 +55,14 @@ func loginForSmsCaptcha(params *LoginParams, tenantID uint64) (*InstanceLoginPar
if err != nil {
return nil, err
} else if !pass {
return nil, errors.New("操作错误，验证码错误或已过期")
return nil, errors.New("验证码错误或已过期")
}
var isExist bool
// 查询账号信息
mUserInstance := model.NewUserInstance()
if isExist, err = model2.FirstField(mUserInstance.UserInstance, []string{"id", "uuid", "avatar", "name", "mobile",
"identity", "is_vip", "vip_deadline", "status"},
"identity", "vip", "vip_deadline", "status"},
model2.NewWhere("mobile", params.Captcha.Mobile)); err != nil {
return nil, err
}
@ -75,7 +75,6 @@ func loginForSmsCaptcha(params *LoginParams, tenantID uint64) (*InstanceLoginPar
if err = mUserIdentity.LastChooseInfo(mUserInstance.UUID); err != nil {
return nil, err
}
if mUserAssets, err = model.NewUserAssets().Assets(mUserInstance.UUID); err != nil {
return nil, err
}
@ -113,7 +112,7 @@ func loginForPassword(params *LoginParams, tenantID uint64) (*InstanceLoginParam
mUserInstance := model.NewUserInstance()
isExist, err := model2.FirstField(mUserInstance.UserInstance, []string{"id", "uuid", "name", "avatar", "mobile",
"identity", "is_vip", "vip_deadline", "password", "salt", "status"},
"identity", "vip", "vip_deadline", "password", "salt", "status"},
model2.NewWhere("mobile", params.Password.Account))
if err != nil {

8
app/api/enterprise/controller/account/register.go
View File

@ -1,7 +1,7 @@
package account
import (
model3 "SciencesServer/app/api/enterprise/model"
"SciencesServer/app/api/enterprise/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/handle"
"SciencesServer/serve/orm"
@ -40,6 +40,9 @@ func (c *RegisterParams) checkUserExist(mUserInstance *model2.UserInstance, tena
// Launch 发起注册
func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error) {
if !utils.ValidateMobile(params.Mobile) {
return nil, errors.New("手机号码错误")
}
// 验证密码
if !params.checkPassword() {
return nil, errors.New("两次密码不一致")
@ -53,7 +56,7 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
return nil, errors.New("验证码错误或已过期")
}
// 验证账号信息
mUserInstance := model3.NewUserInstance()
mUserInstance := model.NewUserInstance()
if pass, err = params.checkUserExist(mUserInstance.UserInstance, c.tenantID); err != nil {
return nil, err
@ -64,7 +67,6 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
params.Name = params.Mobile
}
mUserInstance.Source = model2.UserInstanceSourceForLocal
mUserInstance.Password = utils.GetRandomString(12)
mUserInstance.Mobile = params.Mobile
mUserInstance.Name = params.Name
mUserInstance.Password = params.Password