feat:完善项目信息

This commit is contained in:
henry
2022-01-07 17:24:39 +08:00
parent 2bf3c01702
commit 119857bfdb
12 changed files with 295 additions and 175 deletions

View File

@ -1,13 +1,14 @@
package role
import (
auth2 "SciencesServer/app/api/admin/controller/auth"
model3 "SciencesServer/app/api/admin/model"
"SciencesServer/app/api/admin/controller/auth"
"SciencesServer/app/api/admin/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/service"
"SciencesServer/app/session"
"SciencesServer/serve/orm"
"SciencesServer/utils"
"errors"
"fmt"
"gorm.io/gorm"
)
@ -16,67 +17,86 @@ type Auth struct{ *session.Admin }
type AuthHandle func(session *session.Admin) *Auth
// Index 角色权限列表
func (c *Auth) Index(roleID uint64) ([]*auth2.TreeChecked, error) {
mSysAuth := model3.NewSysAuth()
// Instance 角色权限列表
func (c *Auth) Instance(roleID uint64) ([]*auth.TreeChecked, error) {
mSysAuth := model.NewSysAuth()
out, err := mSysAuth.RoleAuth(c.TenantID, roleID)
if err != nil {
return nil, err
}
return auth2.TreeCheckedFunc(out, 0), nil
return auth.TreeCheckedFunc(out, 0), nil
}
// Bind 角色权限绑定
func (c *Auth) Bind(roleID uint64, authIDs []uint64) error {
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mSysRoleAuth := model3.NewSysRoleAuth()
if c.TenantID > 0 {
// 查询该租户下绑定的菜单信息
mSysTenantAuth := model.NewSysTenantAuth()
var count int64
if err := model2.Count(mSysTenantAuth.SysTenantAuth, &count, model2.NewWhere("tenant_id", c.TenantID),
model2.NewWhereNotIn("auth_id", authIDs)); err != nil {
return err
} else if count > 0 {
return errors.New("操作异常,菜单权限异常")
}
}
mSysRoleAuth := model.NewSysRoleAuth()
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
err := model2.DeleteWhere(mSysRoleAuth.SysRoleAuth, []*model2.ModelWhere{model2.NewWhere("role_id", roleID)}, tx)
if err != nil {
return err
}
permission := service.NewPermission(
service.WithAuthTenant(fmt.Sprintf("%d", c.TenantID)),
service.WithAuthRoles([]string{fmt.Sprintf("%d", roleID)}),
)
if len(authIDs) <= 0 {
_, err = permission.RemoveSingleRolePolicy()
return err
}
// 查询权限信息
mSysAuth := model3.NewSysAuth()
mSysAuth := model.NewSysAuth()
auths := make([]*model2.SysAuth, 0)
if err = model2.Find(mSysAuth.SysAuth, &auths, &model2.ModelWhereOrder{Where: model2.NewWhereIn("id", authIDs)}); err != nil {
if err = model2.ScanFields(mSysAuth.SysAuth, &auths, []string{"id", "kind", "auth"}, &model2.ModelWhereOrder{
Where: model2.NewWhereIn("id", authIDs),
}); err != nil {
return err
}
authRequests := make([]*service.AuthRequest, 0)
data := make([]*model2.SysRoleAuth, 0)
roles := make([]*model2.SysRoleAuth, 0)
request := make([]*service.AuthRequest, 0)
for _, v := range auths {
roles = append(roles, &model2.SysRoleAuth{
ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, AuthID: v.ID,
data = append(data, &model2.SysRoleAuth{
RoleID: roleID,
AuthID: v.ID,
})
if v.Auth == "" {
if v.Kind == model2.SysAuthKindForModule || v.Auth == "" {
continue
}
authRequests = append(authRequests, &service.AuthRequest{Url: v.Auth, Method: "*"})
mSysAuth.Auth = v.Auth
request = append(request, &service.AuthRequest{
Url: mSysAuth.FilterAuth(),
Method: "*",
})
}
if err = model2.Creates(mSysRoleAuth.SysRoleAuth, roles, tx); err != nil {
if err = model2.Creates(mSysRoleAuth.SysRoleAuth, data); err != nil {
return err
}
go utils.TryCatch(func() {
//permission := service.NewPermission([]string{utils.UintToString(roleID)}, authRequests...)(c.TenantKey, "")
//// 删除角色权限
//if _, err = permission.RemoveRolePolicy(); err != nil {
// logger.ErrorF("删除角色【%d】规则信息错误%v", roleID, err)
// return
//}
//if len(authRequests) > 0 {
// if _, err = permission.AddPolicies(); err != nil {
// logger.ErrorF("创建角色【%d】规则信息错误%v", roleID, err)
// return
// }
//}
})
return nil
permission.AddRequest(request)
_, err = permission.AddPolicies()
return err
})
}