feat:完善信息
This commit is contained in:
@ -10,9 +10,9 @@ import (
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Register struct{}
|
||||
type Register struct{ local uint64 }
|
||||
|
||||
type RegisterHandle func() *Register
|
||||
type RegisterHandle func(local uint64) *Register
|
||||
|
||||
type (
|
||||
RegisterParams struct {
|
||||
@ -25,65 +25,70 @@ func (c *RegisterParams) checkPassword() bool {
|
||||
return c.Password == c.RepeatPass
|
||||
}
|
||||
|
||||
func (c *RegisterParams) checkUserExist(mUserInstance *model2.UserInstance) (bool, error) {
|
||||
var count int64
|
||||
|
||||
if err := model2.Count(mUserInstance, &count, model2.NewWhere("mobile", c.Mobile)); err != nil {
|
||||
return false, err
|
||||
}
|
||||
return count > 0, nil
|
||||
}
|
||||
|
||||
func (c *RegisterParams) checkCaptcha() (bool, error) {
|
||||
return handle.NewCaptcha().Validate(&handle.CaptchaSms{Captcha: c.Captcha, Mobile: c.Mobile})
|
||||
}
|
||||
|
||||
func (c *RegisterParams) checkUserExist(mUserInstance *model2.UserInstance, local uint64) (bool, error) {
|
||||
var count int64
|
||||
|
||||
if err := model2.Count(mUserInstance, &count, model2.NewWhere("mobile", c.Mobile),
|
||||
model2.NewWhere("local", local)); err != nil {
|
||||
return false, err
|
||||
}
|
||||
return count <= 0, nil
|
||||
}
|
||||
|
||||
// Launch 发起注册
|
||||
func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error) {
|
||||
// 验证密码
|
||||
if params.checkPassword() {
|
||||
return nil, errors.New("两次密码不一致")
|
||||
}
|
||||
mUserInstance := model.NewUserInstance()
|
||||
|
||||
pass, err := params.checkUserExist(mUserInstance.UserInstance)
|
||||
// 验证验证码
|
||||
pass, err := params.checkCaptcha()
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
} else if pass {
|
||||
return nil, errors.New("当前手机号码已注册")
|
||||
}
|
||||
if pass, err = params.checkCaptcha(); err != nil {
|
||||
return nil, err
|
||||
} else if !pass {
|
||||
return nil, errors.New("验证码错误或已过期")
|
||||
}
|
||||
// 验证账号信息
|
||||
mUserInstance := model.NewUserInstance()
|
||||
|
||||
if pass, err = params.checkUserExist(mUserInstance.UserInstance, c.local); err != nil {
|
||||
return nil, err
|
||||
} else if !pass {
|
||||
return nil, errors.New("当前手机号码已注册")
|
||||
}
|
||||
mUserInstance.Local.Local = c.local
|
||||
mUserInstance.Password = utils.GetRandomString(12)
|
||||
mUserInstance.Mobile = params.Mobile
|
||||
mUserInstance.Password = params.Password
|
||||
mUserInstance.Identity = params.Identity
|
||||
|
||||
mUserTenant := model.NewUserTenant()
|
||||
mUserManage := model.NewUserManage()
|
||||
|
||||
if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
|
||||
if err = model2.Create(mUserInstance.UserInstance, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
mUserTenant.UID = mUserInstance.UUID
|
||||
mUserTenant.Name = params.Name
|
||||
mUserTenant.Identity = params.Identity
|
||||
mUserTenant.Selected = model2.UserTenantSelectedForYes
|
||||
return model2.Create(mUserTenant.UserTenant, tx)
|
||||
mUserManage.UID = mUserInstance.UUID
|
||||
mUserManage.Name = params.Name
|
||||
mUserManage.Identity = params.Identity
|
||||
mUserManage.Selected = model2.UserManageSelectedForYes
|
||||
return model2.Create(mUserManage.UserManage, tx)
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return NewInstance()().Login()(&InstanceLoginParams{
|
||||
UID: mUserTenant.UUID, Name: mUserTenant.Name, Mobile: mUserInstance.Mobile,
|
||||
UID: mUserManage.UUID, Name: mUserManage.Name, Mobile: mUserInstance.Mobile,
|
||||
Identity: mUserInstance.Identity, SelectIdentity: params.Identity,
|
||||
}), err
|
||||
}
|
||||
|
||||
func NewRegister() RegisterHandle {
|
||||
return func() *Register {
|
||||
return &Register{}
|
||||
return func(local uint64) *Register {
|
||||
return &Register{local: local}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user