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
2021-12-01 14:12:23 +08:00
parent c27e115517
commit 3abfe92add
32 changed files with 397 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/enterprise/controller/account/instance.go
View File

@ -15,7 +15,7 @@ type InstanceLoginCallback func(params *InstanceLoginParams) *InstanceLoginRetur
type (
InstanceLoginParams struct {
UID, TenantID, ManageUID uint64
UID uint64
Name, Mobile string
Identity, SelectIdentity int
Status model.AccountStatusKind
@ -34,8 +34,6 @@ func (c *Instance) Login() InstanceLoginCallback {
session := service.NewSessionEnterprise()
session.Token = token
session.UID = params.UID
session.TenantID = params.TenantID
session.ManageUID = params.ManageUID
session.Name = params.Name
session.Mobile = params.Mobile
session.Identity = params.Identity

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

@ -63,11 +63,11 @@ func loginForSmsCaptcha(params *LoginParams, local string) (*InstanceLoginParams
model2.NewWhere("mobile", params.Captcha.Mobile), model2.NewWhere("local", local)); err != nil {
return nil, err
}
mUserManage := model3.NewUserManage()
mUserIdentity := model3.NewUserIdentity()
if isExist {
// 查询该区域下最后一次选中的信息
if err = mUserManage.LastChooseInfo(mUserInstance.UUID); err != nil {
if err = mUserIdentity.LastChooseInfo(mUserInstance.UUID); err != nil {
return nil, err
}
goto RETURNS
@ -79,9 +79,9 @@ func loginForSmsCaptcha(params *LoginParams, local string) (*InstanceLoginParams
}
RETURNS:
return &InstanceLoginParams{
UID: mUserInstance.UUID, ManageUID: mUserManage.UUID,
UID: mUserInstance.UUID,
Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Identity: mUserInstance.Identity, SelectIdentity: mUserManage.Identity,
Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
Status: mUserInstance.Status,
}, nil
}
@ -105,15 +105,16 @@ func loginForPassword(params *LoginParams, local string) (*InstanceLoginParams,
return nil, errors.New("账户或密码错误")
}
// 最后一次选中的身份信息
mUserManage := model3.NewUserManage()
mUserIdentity := model3.NewUserIdentity()
if err = mUserManage.LastChooseInfo(mUserInstance.UUID); err != nil {
if err = mUserIdentity.LastChooseInfo(mUserInstance.UUID); err != nil {
return nil, err
}
return &InstanceLoginParams{
UID: mUserInstance.UUID, ManageUID: mUserManage.UUID,
UID: mUserInstance.UUID,
Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Identity: mUserInstance.Identity, SelectIdentity: mUserManage.Identity,
Identity: mUserInstance.Identity, SelectIdentity: mUserIdentity.Identity,
Status: mUserInstance.Status,
}, nil
}

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

@ -17,7 +17,6 @@ type RegisterHandle func(local string) *Register
type (
RegisterParams struct {
Name, Mobile, Captcha, Password, RepeatPass string
Identity int
}
)
@ -66,25 +65,18 @@ func (c *Register) Launch(params *RegisterParams) (*InstanceLoginReturn, error)
mUserInstance.Password = utils.GetRandomString(12)
mUserInstance.Mobile = params.Mobile
mUserInstance.Password = params.Password
mUserInstance.Identity = params.Identity
mUserManage := model3.NewUserManage()
if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
if err = model2.Create(mUserInstance.UserInstance, tx); err != nil {
return err
}
mUserManage.UID = mUserInstance.UUID
mUserManage.Name = params.Name
mUserManage.Identity = params.Identity
mUserManage.IsSelected = model2.UserManageSelectedForYes
return model2.Create(mUserManage.UserManage, tx)
return nil
}); err != nil {
return nil, err
}
return NewInstance()().Login()(&InstanceLoginParams{
UID: mUserManage.UUID, Name: mUserManage.Name, Mobile: mUserInstance.Mobile,
Identity: mUserInstance.Identity, SelectIdentity: params.Identity,
UID: mUserInstance.UUID, Name: mUserInstance.Name, Mobile: mUserInstance.Mobile,
Identity: mUserInstance.Identity,
}), err
}