feat:注释不用的代码

This commit is contained in:
henry
2021-11-24 11:12:46 +08:00
parent 0862142ef0
commit 5475320171
19 changed files with 74 additions and 71 deletions

View File

@ -6,7 +6,6 @@ import (
model3 "SciencesServer/app/api/manage/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/service"
"SciencesServer/serve/logger"
"SciencesServer/serve/orm"
"SciencesServer/utils"
@ -64,18 +63,18 @@ func (c *Auth) Bind(roleID uint64, authIDs []uint64) error {
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
}
}
//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
})

View File

@ -5,7 +5,6 @@ import (
"SciencesServer/app/api/manage/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/service"
"SciencesServer/serve/logger"
"SciencesServer/utils"
"errors"
"time"
@ -157,12 +156,12 @@ func (c *Instance) Delete(id uint64) error {
return err
}
go utils.TryCatch(func() {
permission := service.NewPermission([]string{utils.UintToString(id)})(c.TenantKey, "")
// 删除角色权限
if _, err = permission.RemoveRolePolicy(); err != nil {
logger.ErrorF("删除租户【%s】下角色【%d】权限信息错误%v", c.TenantKey, id, err)
return
}
//permission := service.NewPermission([]string{utils.UintToString(id)})(c.TenantKey, "")
//// 删除角色权限
//if _, err = permission.RemoveRolePolicy(); err != nil {
// logger.ErrorF("删除租户【%s】下角色【%d】权限信息错误%v", c.TenantKey, id, err)
// return
//}
})
return nil
}

View File

@ -4,8 +4,6 @@ import (
"SciencesServer/app/api/manage/controller"
model3 "SciencesServer/app/api/manage/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/serve/logger"
"SciencesServer/app/service"
"SciencesServer/serve/orm"
"SciencesServer/utils"
@ -59,16 +57,16 @@ func (c *User) Bind(uid uint64, roleIDs []uint64) error {
return err
}
go utils.TryCatch(func() {
permission := service.NewPermission(obj)(c.TenantKey, utils.UintToString(uid))
if _, err = permission.DeleteRolesForUser(false); err != nil {
logger.ErrorF("删除用户【%d】角色权限错误%v", uid, err)
return
}
if _, err = permission.AddRoleForUser(); err != nil {
logger.ErrorF("添加用户【%d】角色权限错误%v", uid, err)
return
}
//permission := service.NewPermission(obj)(c.TenantKey, utils.UintToString(uid))
//
//if _, err = permission.DeleteRolesForUser(false); err != nil {
// logger.ErrorF("删除用户【%d】角色权限错误%v", uid, err)
// return
//}
//if _, err = permission.AddRoleForUser(); err != nil {
// logger.ErrorF("添加用户【%d】角色权限错误%v", uid, err)
// return
//}
})
return nil
})

View File

@ -64,12 +64,12 @@ func (c *Auth) revoke(tenantID uint64, tenantKey string, authIDs []uint64, tx *g
return err
}
go utils.TryCatch(func() {
permission := service.NewPermission(roleIDs, auths...)(c.TenantKey, "")
// 删除角色权限
if _, err = permission.RemoveNamedGroupingPolicies(); err != nil {
logger.ErrorF("删除租户【%s】下角色权限错误%v", tenantKey, err)
return
}
//permission := service.NewPermission(roleIDs, auths...)(c.TenantKey, "")
//// 删除角色权限
//if _, err = permission.RemoveNamedGroupingPolicies(); err != nil {
// logger.ErrorF("删除租户【%s】下角色权限错误%v", tenantKey, err)
// return
//}
})
return nil
}