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
}

21
app/api/enterprise/controller/identity/instance.go
View File

@ -3,10 +3,8 @@ package identity
import (
"SciencesServer/app/api/enterprise/model"
"SciencesServer/app/api/manage/controller"
"SciencesServer/app/basic/config"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"strings"
)
type Instance struct {
@ -19,15 +17,14 @@ type InstanceHandle func(session *session.Enterprise, local string) *Instance
type (
// InstanceForExpert 专家信息
InstanceForExpert struct {
*model.UserManageForExpert
ID string `json:"id"`
Industry string `json:"industry"`
ID string `json:"id"`
*model.UserIdentityForExpert
}
)
// Expert 专家列表
func (c *Instance) Expert(name, mobile string, page, pageSize int) (*controller.ReturnPages, error) {
mUserManage := model.NewUserManage()
mUserIdentity := model.NewUserIdentity()
where := make([]*model2.ModelWhere, 0)
@ -39,7 +36,7 @@ func (c *Instance) Expert(name, mobile string, page, pageSize int) (*controller.
}
var count int64
out, err := mUserManage.Expert(page, pageSize, &count, where...)
out, err := mUserIdentity.Expert(page, pageSize, &count, where...)
if err != nil {
return nil, err
@ -48,16 +45,10 @@ func (c *Instance) Expert(name, mobile string, page, pageSize int) (*controller.
list := make([]*InstanceForExpert, 0)
for _, v := range out {
mUserManage.ID = v.ID
mUserManage.IdentityInfo = v.IdentityInfo
obj := mUserManage.GetIdentityInfoAttribute().(*model2.UserIdentityForExpert)
industry := make([]string, 0)
mUserIdentity.ID = v.ID
for _, v := range strings.Split(obj.Industry, ";") {
industry = append(industry, config.GetIndustryInfo(v, "-"))
}
list = append(list, &InstanceForExpert{
UserManageForExpert: v, ID: mUserManage.GetEncodeID(), Industry: strings.Join(industry, "；"),
ID: mUserIdentity.GetEncodeID(), UserIdentityForExpert: v,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil

24
app/api/enterprise/controller/user/bank.go
View File

@ -19,7 +19,7 @@ type (
// BankInfo 银行卡信息
BankInfo struct {
ID string `json:"id"`
*model2.UserManageBank
*model2.UserBank
}
// BankParams 银行卡参数信息
BankParams struct {
@ -39,21 +39,21 @@ func (c *BankParams) checkBankCard() bool {
// List 列表信息
func (c *Bank) List() ([]*BankInfo, error) {
mUserManageBank := model.NewUserManageBank()
mUserManageBank := model.NewUserBank()
out := make([]*model2.UserManageBank, 0)
out := make([]*model2.UserBank, 0)
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
Where: model2.NewWhere("uid", c.UID),
Order: model2.NewOrder("is_default", model2.OrderModeToDesc),
}}
if err := model2.Find(mUserManageBank.UserManageBank, &out, where...); err != nil {
if err := model2.Find(mUserManageBank.UserBank, &out, where...); err != nil {
return nil, err
}
list := make([]*BankInfo, 0)
for _, v := range out {
list = append(list, &BankInfo{ID: v.GetEncodeID(), UserManageBank: v})
list = append(list, &BankInfo{ID: v.GetEncodeID(), UserBank: v})
}
return list, nil
}
@ -75,11 +75,11 @@ func (c *Bank) Bind(params *BankParams, captcha string) error {
if !params.checkBankCard() {
return errors.New("银行卡信息错误")
}
mUserManageBank := model.NewUserManageBank()
mUserManageBank := model.NewUserBank()
var count int64
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("bank_card", params.BankCard)); err != nil {
if err = model2.Count(mUserManageBank.UserBank, &count, model2.NewWhere("bank_card", params.BankCard)); err != nil {
return err
} else if count > 0 {
return errors.New("当前银行卡已被注册")
@ -90,20 +90,20 @@ func (c *Bank) Bind(params *BankParams, captcha string) error {
mUserManageBank.BankCard = params.BankCard
mUserManageBank.BankName = params.BankName
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("uid", c.UID)); err != nil {
if err = model2.Count(mUserManageBank.UserBank, &count, model2.NewWhere("uid", c.UID)); err != nil {
return err
} else if count <= 0 {
mUserManageBank.IsDefault = model2.UserManageBankDefaultForYes
mUserManageBank.IsDefault = model2.UserBankDefaultForYes
}
return model2.Create(mUserManageBank.UserManageBank)
return model2.Create(mUserManageBank.UserBank)
}
// Unbind 解绑，直接删除
func (c *Bank) Unbind(id uint64) error {
mUserManageBank := model.NewUserManageBank()
mUserManageBank := model.NewUserBank()
mUserManageBank.ID = id
isExist, err := model2.FirstField(mUserManageBank.UserManageBank, []string{"id", "uid"})
isExist, err := model2.FirstField(mUserManageBank.UserBank, []string{"id", "uid"})
if err != nil {
return err

93
app/api/enterprise/controller/user/identity.go Normal file
View File

@ -0,0 +1,93 @@
package user
import (
"SciencesServer/app/api/enterprise/model"
"SciencesServer/app/basic/config"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/service"
"SciencesServer/app/session"
config2 "SciencesServer/config"
"SciencesServer/serve/orm"
"errors"
"gorm.io/gorm"
"time"
)
type Identity struct{ *session.Enterprise }
type IdentityHandle func(session *session.Enterprise) *Identity
// Basic 详细信息
func (c *Identity) Basic() (*InstanceDetailInfo, error) {
resp := &InstanceDetailInfo{InstanceInfo: InstanceInfo{Name: c.Name, Identity: c.Identity, SelectIdentity: c.SelectIdentity}}
mUserIdentity := model.NewUserIdentity()
isExist, err := model2.FirstField(mUserIdentity.UserIdentity, []string{"id", "tenant_id", "uuid", "name",
"email", "job", "fixed_phone"},
model2.NewWhere("uid", c.UID), model2.NewWhere("identity", c.SelectIdentity))
if err != nil {
return nil, err
} else if !!isExist {
return nil, errors.New("操作错误，用户身份信息不存在或已被删除")
}
resp.Name = mUserIdentity.Name
resp.Email = mUserIdentity.Email
resp.Job = mUserIdentity.Job
resp.FixedPhone = mUserIdentity.FixedPhone
return resp, nil
}
// Detail 详细信息
func (c *Identity) Detail() (*InstanceDetailInfo, error) {
return nil, nil
}
// Switch 切换身份
func (c *Identity) Switch(identity int) error {
if _, has := config.TenantUserIdentityData[identity]; !has {
return errors.New("未知的身份信息")
}
if c.SelectIdentity == identity {
return nil
}
c.ManageUID = 0
// 已存在相应的身份，更新最后
if c.Identity&identity > 0 {
mUserIdentity := model.NewUserIdentity()
// 查询用户身份
isExist, err := model2.FirstField(mUserIdentity.UserIdentity, []string{"id", "tenant_id", "name", "uuid"},
model2.NewWhere("uid", c.UID), model2.NewWhere("identity", identity))
if err != nil {
return err
} else if isExist {
now := time.Now()
if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
if err = model2.UpdatesWhere(mUserIdentity.UserIdentity, map[string]interface{}{
"is_selected": model2.UserIdentitySelectedForNo, "updated_at": now,
}, []*model2.ModelWhere{model2.NewWhere("uid", c.ManageUID)}, tx); err != nil {
return err
}
return model2.Updates(mUserIdentity.UserIdentity, map[string]interface{}{
"is_selected": model2.UserIdentitySelectedForYes, "updated_at": now,
}, tx)
}); err != nil {
return err
}
}
c.ManageUID = mUserIdentity.UUID
c.SelectIdentity = identity
service.Publish(config2.EventForAccountLoginProduce, config2.RedisKeyForAccount, c.UIDToString(), c.Enterprise)
return nil
}
return errors.New("操作错误，无效的身份信息")
}
func NewIdentity() IdentityHandle {
return func(session *session.Enterprise) *Identity {
return &Identity{Enterprise: session}
}
}

68
app/api/enterprise/controller/user/instance.go
View File

@ -2,16 +2,11 @@ package user
import (
"SciencesServer/app/api/enterprise/model"
"SciencesServer/app/basic/config"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/handle"
"SciencesServer/app/service"
"SciencesServer/app/session"
config2 "SciencesServer/config"
"SciencesServer/serve/orm"
"SciencesServer/utils"
"errors"
"gorm.io/gorm"
"time"
)
@ -40,27 +35,6 @@ func (c *Instance) Info() *InstanceInfo {
return &InstanceInfo{Name: c.Name, Identity: c.Identity, SelectIdentity: c.SelectIdentity}
}
// Detail 详细信息
func (c *Instance) Detail() (*InstanceDetailInfo, error) {
resp := &InstanceDetailInfo{InstanceInfo: InstanceInfo{Name: c.Name, Identity: c.Identity, SelectIdentity: c.SelectIdentity}}
mUserManage := model.NewUserManage()
isExist, err := model2.FirstField(mUserManage.UserManage, []string{"id", "tenant_id", "uuid", "name",
"email", "job", "fixed_phone", "other"},
model2.NewWhere("uid", c.UID), model2.NewWhere("identity", c.SelectIdentity))
if err != nil {
return nil, err
} else if isExist {
resp.Name = mUserManage.Name
resp.Email = mUserManage.Email
resp.Job = mUserManage.Job
resp.FixedPhone = mUserManage.FixedPhone
}
return resp, nil
}
// BindMobile 绑定手机号码
func (c *Instance) BindMobile(mobile, captcha string) error {
if !utils.ValidateMobile(mobile) {
@ -91,48 +65,6 @@ func (c *Instance) BindMobile(mobile, captcha string) error {
return nil
}
// SwitchIdentity 切换身份
func (c *Instance) SwitchIdentity(identity int) error {
if _, has := config.TenantUserIdentityData[identity]; !has {
return errors.New("未知的身份信息")
}
if c.SelectIdentity == identity {
return nil
}
c.ManageUID = 0
// 已存在相应的身份，更新最后
if c.Identity&identity > 0 {
mUserManage := model.NewUserManage()
// 查询用户身份
isExist, err := model2.FirstField(mUserManage.UserManage, []string{"id", "tenant_id", "name", "uuid"},
model2.NewWhere("uid", c.UID), model2.NewWhere("identity", identity))
if err != nil {
return err
} else if isExist {
now := time.Now()
if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
if err = model2.UpdatesWhere(mUserManage.UserManage, map[string]interface{}{
"is_selected": model2.UserManageSelectedForNo, "updated_at": now,
}, []*model2.ModelWhere{model2.NewWhere("uid", c.ManageUID)}, tx); err != nil {
return err
}
return model2.Updates(mUserManage.UserManage, map[string]interface{}{
"is_selected": model2.UserManageSelectedForYes, "updated_at": now,
}, tx)
}); err != nil {
return err
}
}
c.ManageUID = mUserManage.UUID
c.SelectIdentity = identity
service.Publish(config2.EventForAccountLoginProduce, config2.RedisKeyForAccount, c.UIDToString(), c.Enterprise)
return nil
}
return errors.New("操作错误，无效的身份信息")
}
func NewInstance() InstanceHandle {
return func(session *session.Enterprise) *Instance {
return &Instance{Enterprise: session}

4
app/api/enterprise/controller/user/settled.go
View File

@ -178,8 +178,8 @@ func (c *Settled) Laboratory(params *SettledParams, other *config.IdentityForLab
}
// Agent 经纪人
func (c *Settled) Agent() {
func (c *Settled) Agent(params *SettledParams) error {
return nil
}
func NewSettled() SettledHandle {