feat:完善信息
This commit is contained in:
@ -22,6 +22,7 @@ type (
|
|||||||
Captcha string `json:"captcha" form:"captcha" binding:"required"`
|
Captcha string `json:"captcha" form:"captcha" binding:"required"`
|
||||||
Password string `json:"password" form:"password" binding:"required"`
|
Password string `json:"password" form:"password" binding:"required"`
|
||||||
RepeatPass string `json:"repeat_pass" form:"repeat_pass" binding:"required"`
|
RepeatPass string `json:"repeat_pass" form:"repeat_pass" binding:"required"`
|
||||||
|
Identity int `json:"identity" form:"identity" binding:"required"`
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -54,7 +55,7 @@ func (a *Account) Register(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
data, err := account.NewRegister()().Launch(&account.RegisterParams{
|
data, err := account.NewRegister()().Launch(&account.RegisterParams{
|
||||||
Name: form.Name, Mobile: form.Mobile, Captcha: form.Captcha,
|
Name: form.Name, Mobile: form.Mobile, Captcha: form.Captcha,
|
||||||
Password: form.Password, RepeatPass: form.RepeatPass,
|
Password: form.Password, RepeatPass: form.RepeatPass, Identity: form.Identity,
|
||||||
})
|
})
|
||||||
api.APIResponse(err, data)
|
api.APIResponse(err, data)
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ type RegisterHandle func() *Register
|
|||||||
type (
|
type (
|
||||||
RegisterParams struct {
|
RegisterParams struct {
|
||||||
Name, Mobile, Captcha, Password, RepeatPass string
|
Name, Mobile, Captcha, Password, RepeatPass string
|
||||||
|
Identity int
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -57,6 +58,7 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
|
|||||||
mUserInstance.Password = utils.GetRandomString(12)
|
mUserInstance.Password = utils.GetRandomString(12)
|
||||||
mUserInstance.Mobile = params.Mobile
|
mUserInstance.Mobile = params.Mobile
|
||||||
mUserInstance.Password = params.Password
|
mUserInstance.Password = params.Password
|
||||||
|
mUserInstance.Identity = params.Identity
|
||||||
|
|
||||||
mUserTenant := model.NewUserTenant()
|
mUserTenant := model.NewUserTenant()
|
||||||
|
|
||||||
@ -66,6 +68,7 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
|
|||||||
}
|
}
|
||||||
mUserTenant.UID = mUserInstance.UUID
|
mUserTenant.UID = mUserInstance.UUID
|
||||||
mUserTenant.Name = params.Name
|
mUserTenant.Name = params.Name
|
||||||
|
mUserTenant.Identity = params.Identity
|
||||||
mUserTenant.Selected = model2.UserTenantSelectedForYes
|
mUserTenant.Selected = model2.UserTenantSelectedForYes
|
||||||
return model2.Create(mUserTenant.UserTenant, tx)
|
return model2.Create(mUserTenant.UserTenant, tx)
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
@ -73,7 +76,7 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
|
|||||||
}
|
}
|
||||||
return NewInstance()().Login()(&InstanceLoginParams{
|
return NewInstance()().Login()(&InstanceLoginParams{
|
||||||
UID: mUserTenant.UUID, Name: mUserTenant.Name, Mobile: mUserInstance.Mobile,
|
UID: mUserTenant.UUID, Name: mUserTenant.Name, Mobile: mUserInstance.Mobile,
|
||||||
Identity: mUserInstance.Identity,
|
Identity: mUserInstance.Identity, SelectIdentity: params.Identity,
|
||||||
}), err
|
}), err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user