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-01-15 16:48:49 +08:00
parent 57daf5119d
commit 6d075dab4f
33 changed files with 196 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,10 +11,10 @@ import (
"gorm.io/gorm"
)
type Login struct{ local string }
type Login struct{ tenantID uint64 }
type (
LoginHandle func(local string) *Login
LoginHandle func(tenantID uint64) *Login
)
type (
@ -41,12 +41,12 @@ const (
LoginModeForQQ // QQ登陆
)
var loginHandle = map[LoginMode]func(*LoginParams, string) (*InstanceLoginParams, error){
var loginHandle = map[LoginMode]func(*LoginParams, uint64) (*InstanceLoginParams, error){
LoginModeForSmsCaptcha: loginForSmsCaptcha, LoginModeForPassword: loginForPassword,
}
// loginForSmsCaptcha 短信验证码登陆
func loginForSmsCaptcha(params *LoginParams, local string) (*InstanceLoginParams, error) {
func loginForSmsCaptcha(params *LoginParams, tenantID uint64) (*InstanceLoginParams, error) {
if !utils.ValidateMobile(params.Captcha.Mobile) {
return nil, errors.New("操作错误，手机号码格式异常")
}
@ -107,7 +107,7 @@ RETURNS:
}
// loginForPassword 密码登陆
func loginForPassword(params *LoginParams, local string) (*InstanceLoginParams, error) {
func loginForPassword(params *LoginParams, tenantID uint64) (*InstanceLoginParams, error) {
if !utils.ValidateMobile(params.Password.Account) {
return nil, errors.New("操作错误，手机号码格式异常")
}
@ -156,7 +156,7 @@ func (c *Login) Launch(mode LoginMode, params *LoginParams) (*InstanceLoginRetur
if !has {
return nil, errors.New("操作错误，未知的登陆模式")
}
ret, err := _handle(params, c.local)
ret, err := _handle(params, c.tenantID)
if err != nil {
return nil, err
@ -168,7 +168,7 @@ func (c *Login) Launch(mode LoginMode, params *LoginParams) (*InstanceLoginRetur
}
func NewLogin() LoginHandle {
return func(local string) *Login {
return &Login{local: local}
return func(tenantID uint64) *Login {
return &Login{tenantID: tenantID}
}
}

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

@ -10,9 +10,9 @@ import (
"gorm.io/gorm"
)
type Register struct{ local string }
type Register struct{ tenantID uint64 }
type RegisterHandle func(local string) *Register
type RegisterHandle func(tenantID uint64) *Register
type (
RegisterParams struct {
@ -28,7 +28,7 @@ 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 string) (bool, error) {
func (c *RegisterParams) checkUserExist(mUserInstance *model2.UserInstance, tenantID uint64) (bool, error) {
var count int64
if err := model2.Count(mUserInstance, &count, model2.NewWhere("mobile", c.Mobile)); //model2.NewWhere("local", local)
@ -55,7 +55,7 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
// 验证账号信息
mUserInstance := model3.NewUserInstance()
if pass, err = params.checkUserExist(mUserInstance.UserInstance, c.local); err != nil {
if pass, err = params.checkUserExist(mUserInstance.UserInstance, c.tenantID); err != nil {
return nil, err
} else if !pass {
return nil, errors.New("当前手机号码已注册")
@ -84,7 +84,7 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
}
func NewRegister() RegisterHandle {
return func(local string) *Register {
return &Register{local: local}
return func(tenantID uint64) *Register {
return &Register{tenantID: tenantID}
}
}