williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://101.43.70.124:3000/williamet/cas_tt_cloud_backend

Browse Source
This commit is contained in:
henry
2022-03-07 13:47:03 +08:00
parent 3e432b2a65 60adce4d54
commit be526eb2a7
26 changed files with 380 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/api/admin/controller/account.go
View File

@ -20,6 +20,12 @@ type Account struct {
type AccountHandle func(session *session.Admin, tenantID uint64) *Account
type (
// loginHandleReturn 登陆操作返回信息
loginHandleReturn struct {
*model.SysUser
TenantID uint64 `json:"tenant_id"`
TenantIdentity model2.SysUserTenantIdentity
}
// AccountLoginParams 登陆参数
AccountLoginParams struct {
Account, Password, Captcha string
@ -32,12 +38,12 @@ type (
)
// loginHandle 登陆操作，1：账户密码登陆，2：短信验证登陆
var loginHandle = map[int]func(params *AccountLoginParams, tenantID uint64) (*model.SysUser, error){
var loginHandle = map[int]func(params *AccountLoginParams, tenantID uint64) (*loginHandleReturn, error){
1: loginForPassword, 2: loginForSmsCaptcha,
}
// loginForPassword 密码登陆
func loginForPassword(params *AccountLoginParams, tenantID uint64) (*model.SysUser, error) {
func loginForPassword(params *AccountLoginParams, tenantID uint64) (*loginHandleReturn, error) {
if params.Password == "" {
return nil, errors.New("操作错误，密码不可为空")
}
@ -53,11 +59,28 @@ func loginForPassword(params *AccountLoginParams, tenantID uint64) (*model.SysUs
if !mSysUser.ValidatePassword(params.Password) {
return nil, errors.New("操作错误，用户名或密码错误")
}
return mSysUser, nil
out := &loginHandleReturn{SysUser: mSysUser, TenantIdentity: 0}
if !mSysUser.IsAdminUser() {
// 查询用户租户信息
mSysUserTenant := model.NewSysUserTenant()
if isExist, err = model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity"},
model2.NewWhere("uid", mSysUser.UUID),
model2.NewWhere("tenant_id", tenantID)); err != nil {
return nil, err
} else if !isExist {
return nil, errors.New("操作错误，无权限登陆此后台，请联系管理员")
}
out.TenantID = tenantID
out.TenantIdentity = mSysUserTenant.Identity
}
return out, nil
}
// loginForSmsCaptcha 短信验证码登陆
func loginForSmsCaptcha(params *AccountLoginParams, tenantID uint64) (*model.SysUser, error) {
func loginForSmsCaptcha(params *AccountLoginParams, tenantID uint64) (*loginHandleReturn, error) {
if params.Captcha == "" {
return nil, errors.New("操作错误，验证码不可为空")
}
@ -68,15 +91,31 @@ func loginForSmsCaptcha(params *AccountLoginParams, tenantID uint64) (*model.Sys
mSysUser := model.NewSysUser()
isExist, err := model2.FirstField(mSysUser.SysUser, []string{
"id", "uuid", "tenant_id", "name", "mobile", "is_admin", "status",
}, model2.NewWhere("tenant_id", tenantID), model2.NewWhere("mobile", params.Account))
"id", "uuid", "name", "mobile", "is_admin", "status",
}, model2.NewWhere("mobile", params.Account))
if err != nil {
return nil, err
} else if !isExist {
return nil, errors.New("操作错误，当前帐号信息不存在或已被删除")
}
return mSysUser, nil
out := &loginHandleReturn{SysUser: mSysUser, TenantIdentity: 0}
if !mSysUser.IsAdminUser() {
// 查询用户租户信息
mSysUserTenant := model.NewSysUserTenant()
if isExist, err = model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity"},
model2.NewWhere("uid", mSysUser.UUID),
model2.NewWhere("tenant_id", tenantID)); err != nil {
return nil, err
} else if !isExist {
return nil, errors.New("操作错误，无权限登陆此后台，请联系管理员")
}
out.TenantID = tenantID
out.TenantIdentity = mSysUserTenant.Identity
}
return out, nil
}
// Login 登录请求
@ -99,6 +138,7 @@ func (c *Account) Login(mode int, params *AccountLoginParams, equipment, ip stri
_session.Name = data.Name
_session.Mobile = data.Mobile
_session.IsAdmin = data.IsAdminUser()
_session.IsSystemAdmin = data.TenantIdentity == model2.SysUserTenantIdentityForSystemAdmin
_uid := data.UUIDString()

80
app/api/admin/controller/tenant/member.go
View File

@ -4,7 +4,9 @@ import (
"SciencesServer/app/api/admin/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"SciencesServer/serve/orm"
"errors"
"gorm.io/gorm"
)
// Member 人员信息
@ -17,10 +19,8 @@ type MemberHandle func(session *session.Admin) *Member
type (
// MemberInfo 人员信息
MemberInfo struct {
ID string `json:"id"`
Name string `json:"name"`
Account string `json:"account"`
Mobile string `json:"mobile"`
ID string `json:"id"`
*model.SysUserTenantBasic
}
// MemberParams 人员参数信息
MemberParams struct {
@ -30,50 +30,74 @@ type (
// Instance 人员信息
func (c *Member) Instance(tenantID uint64) (*MemberInfo, error) {
mSysUser := model.NewSysUser()
mSysUserTenant := model.NewSysUserTenant()
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "name", "account", "mobile"},
model2.NewWhere("tenant_id", tenantID),
model2.NewWhere("is_admin", model2.SysUserAdministratorForAdmin))
out, err := mSysUserTenant.User(model2.NewWhere("u_t.tenant_id", tenantID),
model2.NewWhere("u_t.identity", model2.SysUserTenantIdentityForSystemUser))
if err != nil {
return nil, err
}
out := new(MemberInfo)
res := new(MemberInfo)
if !isExist {
if out == nil && out.ID <= 0 {
goto RETURNS
}
out.ID = mSysUser.GetEncodeID()
out.Name = mSysUser.Name
out.Account = mSysUser.Account
out.Mobile = mSysUser.Mobile
res.ID = out.GetEncodeID()
res.SysUserTenantBasic = out
RETURNS:
return out, nil
return res, nil
}
// Form 数据操作
func (c *Member) Form(tenantID uint64, params *MemberParams) error {
mSysUser := model.NewSysUser()
mSysUserTenant := model.NewSysUserTenant()
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "name", "account", "mobile"},
model2.NewWhere("tenant_id", tenantID),
model2.NewWhere("is_admin", model2.SysUserAdministratorForAdmin))
var count int64
err := model2.Count(mSysUserTenant.SysUserTenant, &count, model2.NewWhere("tenant_id", tenantID),
model2.NewWhere("identity", model2.SysUserTenantIdentityForSystemAdmin))
if err != nil {
return err
} else if isExist {
} else if count > 0 {
return errors.New("操作错误，当前平台已存在管理员")
}
mSysUser.TenantID = tenantID
mSysUser.Account = params.Mobile
mSysUser.Name = params.Mobile
mSysUser.Mobile = params.Mobile
mSysUser.Password = params.Password
mSysUser.IsAdmin = model2.SysUserAdministratorForAdmin
mSysUser.Remark = "子平台管理员"
// 用户信息
mSysUser := model.NewSysUser()
return model2.Create(mSysUser.SysUser)
// 查询手机号码是否存在
isExist := false
if isExist, err = model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "name", "account", "mobile"},
model2.NewWhere("mobile", params.Mobile)); err != nil {
return err
}
if isExist {
mSysUserTenant.TenantID = tenantID
mSysUserTenant.UID = mSysUser.UUID
mSysUserTenant.Identity = model2.SysUserTenantIdentityForSystemUser
return model2.Create(mSysUserTenant.SysUserTenant)
}
if params.Password == "" {
return errors.New("操作错误，密码不能为空")
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mSysUser.Account = params.Mobile
mSysUser.Name = params.Mobile
mSysUser.Mobile = params.Mobile
mSysUser.Password = params.Password
mSysUser.Remark = "子平台管理员"
if err = model2.Create(mSysUser.SysUser, tx); err != nil {
return err
}
mSysUserTenant.TenantID = tenantID
mSysUserTenant.UID = mSysUser.UUID
mSysUserTenant.Identity = model2.SysUserTenantIdentityForSystemUser
return model2.Create(mSysUserTenant.SysUserTenant, tx)
})
}
func NewMember() MemberHandle {

136
app/api/admin/controller/user/instance.go
View File

@ -66,7 +66,7 @@ type InstanceForm struct {
RoleIDs []uint64
}
func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error {
func (c *InstanceForm) sync(tx *gorm.DB, first bool, userTenantID, tenantID uint64) error {
var err error
mSysUserDepartment := model.NewSysUserDepartment()
@ -74,26 +74,26 @@ func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error
permission := service.NewPermission(
service.WithAuthTenant(fmt.Sprintf("%d", tenantID)),
service.WithAuthUser(fmt.Sprintf("%d", uid)),
service.WithAuthUser(fmt.Sprintf("%d", userTenantID)),
)
if !first {
if err = model2.DeleteWhere(mSysUserDepartment.SysUserDepartment, []*model2.ModelWhere{
model2.NewWhere("uid", uid)}, tx); err != nil {
model2.NewWhere("user_tenant_id", userTenantID)}, tx); err != nil {
return err
}
if err = model2.DeleteWhere(mSysUserRole.SysUserRole, []*model2.ModelWhere{
model2.NewWhere("uid", uid)}, tx); err != nil {
model2.NewWhere("user_tenant_id", userTenantID)}, tx); err != nil {
return err
}
go utils.TryCatch(func() {
if _, err = permission.DeleteRolesForUser(false); err != nil {
logger.ErrorF("Casbin 删除用户【%d】权限错误：%v", uid, err)
logger.ErrorF("Casbin 删除用户【%d】权限错误：%v", userTenantID, err)
}
})
}
if c.DepartmentID > 0 {
mSysUserDepartment.UID = uid
mSysUserDepartment.UserTenantID = userTenantID
mSysUserDepartment.DepartmentID = c.DepartmentID
if err = model2.Create(mSysUserDepartment.SysUserDepartment, tx); err != nil {
@ -107,8 +107,8 @@ func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error
for _, v := range c.RoleIDs {
roles = append(roles, &model2.SysUserRole{
UID: uid,
RoleID: v,
UserTenantID: userTenantID,
RoleID: v,
})
rolesIDs = append(rolesIDs, fmt.Sprintf("%d", v))
}
@ -119,7 +119,7 @@ func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error
service.WithAuthRoles(rolesIDs)(permission)
if _, err = permission.AddRoleForUser(); err != nil {
logger.ErrorF("Casbin 给予用户【%d】权限错误：%v", uid, err)
logger.ErrorF("Casbin 给予用户【%d】权限错误：%v", userTenantID, err)
}
})
}
@ -143,7 +143,7 @@ func (c *Instance) Info() (*InstanceUserInfo, error) {
// Index 列表信息
func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, page, pageSize int) (*controller.ReturnPages, error) {
where := []*model2.ModelWhere{model2.NewWhere("u.tenant_id", c.TenantID)}
where := []*model2.ModelWhere{model2.NewWhere("u_t.tenant_id", c.TenantID)}
if name != "" {
where = append(where, model2.NewWhereLike("u.name", name))
@ -157,11 +157,11 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
if status > 0 {
where = append(where, model2.NewWhere("u.status", status))
}
mSysUser := model.NewSysUser()
var count int64
out, err := mSysUser.Users(page, pageSize, &count, where...)
mSysUserTenant := model.NewSysUserTenant()
out, err := mSysUserTenant.Users(page, pageSize, &count, where...)
if err != nil {
return nil, err
@ -176,7 +176,6 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
UID: v.UUIDString(), Avatar: v.Avatar, Name: v.Name, Email: v.Email, Mobile: v.Mobile,
},
Account: v.Account, Gender: v.Gender.Gender, IsAdmin: v.IsAdmin, Status: v.Status, CreatedAt: v.CreatedAt,
//Role: make([]*InstanceRoleInfo, 0),
RoleIDs: make([]string, 0),
Remark: v.Remark,
}
@ -195,10 +194,6 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
obj.ID = utils.StringToUnit64(v)
roleIDs = append(roleIDs, obj.GetEncodeID())
}
//roles := &InstanceRoleInfo{
// IDs: roleIDs,
//Names: strings.Split(v.RoleNames, "&&"),
//}
data.RoleIDs = roleIDs
}
list = append(list, data)
@ -206,25 +201,49 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Basic 基本信息
func (c *Instance) Basic(mobile string, tenantID uint64) (*model2.SysUser, error) {
mSysUser := model.NewSysUser()
_, err := mSysUser.GetByAccountOrMobile(mobile, tenantID)
if err != nil {
return nil, err
}
if mSysUser.ID <= 0 {
return nil, nil
}
return mSysUser.SysUser, nil
}
// Add 添加用户
func (c *Instance) Add(params *InstanceForm) error {
if !utils.ValidateMobile(params.Mobile) {
return errors.New("操作错误，手机号码格式错误")
}
mSysUser := model.NewSysUser()
// 查询登录账户或手机号码是否注册
var count int64
mSysUserTenant := model.NewSysUserTenant()
err := model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile),
model2.NewWhere("tenant_id", c.TenantID))
// 查询登录账户或手机号码是否注册
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "name"}, model2.NewWhere("mobile", params.Mobile))
if err != nil {
return err
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
} else if isExist {
// 判断当前人员是否已经注册了租户身份
var count int64
if err = model2.Count(mSysUserTenant.SysUserTenant, &count, model2.NewWhere("uid", mSysUser.UUID)); err != nil {
return err
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
}
mSysUserTenant.TenantID = c.TenantID
mSysUserTenant.UID = mSysUser.UUID
return model2.Create(mSysUserTenant.SysUserTenant)
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mSysUser.TenantID = c.TenantID
mSysUser.Account = params.Account
mSysUser.Name = params.Name
mSysUser.Mobile = params.Mobile
@ -237,8 +256,13 @@ func (c *Instance) Add(params *InstanceForm) error {
if err = model2.Create(mSysUser.SysUser, tx); err != nil {
return err
}
mSysUserTenant.TenantID = c.TenantID
mSysUserTenant.UID = mSysUser.UUID
if err = params.sync(tx, true, mSysUser.UUID, c.TenantID); err != nil {
if err = model2.Create(mSysUserTenant.SysUserTenant, tx); err != nil {
return err
}
if err = params.sync(tx, true, mSysUserTenant.ID, c.TenantID); err != nil {
return err
}
return nil
@ -247,26 +271,30 @@ func (c *Instance) Add(params *InstanceForm) error {
// Edit 修改用户信息
func (c *Instance) Edit(params *InstanceForm) error {
mSysUser := model.NewSysUser()
mSysUser.ID = params.ID
mSysUserTenant := model.NewSysUserTenant()
mSysUserTenant.ID = params.ID
isExist, err := model2.First(mSysUser.SysUser)
isExist, err := model2.First(mSysUserTenant.SysUserTenant)
if err != nil {
return nil
} else if !isExist {
return errors.New("操作错误，用户信息不存在或已被删除")
} else if c.TenantID > 0 && mSysUser.TenantID != c.TenantID {
} else if c.TenantID > 0 && mSysUserTenant.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
mSysUser := model.NewSysUser()
if _, err = model2.FirstWhere(mSysUser.SysUser, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
return err
}
if mSysUser.Mobile != params.Mobile {
if !utils.ValidateMobile(params.Mobile) {
return errors.New("操作错误，手机号码格式错误")
}
var count int64
if err = model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile),
model2.NewWhere("tenant_id", c.TenantID)); err != nil {
if err = model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile)); err != nil {
return nil
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
@ -282,7 +310,7 @@ func (c *Instance) Edit(params *InstanceForm) error {
if err = model2.Updates(mSysUser.SysUser, mSysUser.SysUser, tx); err != nil {
return err
}
if err = params.sync(tx, false, mSysUser.UUID, mSysUser.TenantID); err != nil {
if err = params.sync(tx, false, mSysUserTenant.ID, c.TenantID); err != nil {
return err
}
return nil
@ -290,21 +318,23 @@ func (c *Instance) Edit(params *InstanceForm) error {
}
func (c *Instance) Password(id uint64, password, repeatPwd string) error {
//if password != repeatPwd {
// return errors.New("操作错误，两次密码输入不一致")
//}
mSysUser := model.NewSysUser()
mSysUser.ID = id
mSysUserTenant := model.NewSysUserTenant()
mSysUserTenant.ID = id
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"})
isExist, err := model2.First(mSysUserTenant.SysUserTenant)
if err != nil {
return nil
} else if !isExist {
return errors.New("操作错误，用户信息不存在或已被删除")
} else if c.TenantID > 0 && mSysUser.TenantID != c.TenantID {
} else if c.TenantID > 0 && mSysUserTenant.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
mSysUser := model.NewSysUser()
if _, err = model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"}, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
return err
}
mSysUser.Password = password
mSysUser.Pass()
@ -337,21 +367,33 @@ func (c *Person) PasswordEdit(oldPassword, password, repeatPwd string) error {
}
func (c *Instance) Delete(id uint64) error {
mSysUser := model.NewSysUser()
mSysUser.ID = id
mSysUserTenant := model.NewSysUserTenant()
mSysUserTenant.ID = id
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"})
isExist, err := model2.First(mSysUserTenant.SysUserTenant)
if err != nil {
return nil
} else if !isExist {
return errors.New("操作错误，用户信息不存在或已被删除")
} else if c.TenantID > 0 && mSysUser.TenantID != c.TenantID {
} else if c.TenantID > 0 && mSysUserTenant.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
} else if mSysUser.IsAdminUser() {
return errors.New("操作错误，超管用户不允许删除")
}
if err = model2.Delete(mSysUser.SysUser); err != nil {
mSysUser := model.NewSysUser()
if _, err = model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"}, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
return err
}
err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
//if err = model2.Delete(mSysUser.SysUser, tx); err != nil {
// return err
//}
if err = model2.Delete(mSysUserTenant.SysUserTenant, tx); err != nil {
return err
}
return nil
})
if err != nil {
return err
}
service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccountAdmin, utils.UintToString(mSysUser.UUID))

7
app/api/admin/controller/user/menu.go
View File

@ -19,13 +19,12 @@ func (c *Menu) Index() ([]*menu.Tree, error) {
model2.SysMenuKindForCatalogue,
model2.SysMenuKindForMenu,
}
if c.IsAdmin {
if c.TenantID > 0 {
return menu.MenuForTenant(mSysMenu, c.TenantID, model2.NewWhereIn("m.kind", kinds))
}
return menu.MenuForSystem(mSysMenu, model2.NewWhereIn("kind", kinds))
}
if c.IsSystemAdmin {
return menu.MenuForTenant(mSysMenu, c.TenantID, model2.NewWhereIn("m.kind", kinds))
}
return menu.MenuForUser(mSysMenu, c.TenantID, c.UID, model2.NewWhereIn("m.kind", kinds))
}