Merge branch 'gin-vue-admin_v2_dev' of https://github.com/piexlmax/gin-vue-admin into gin-vue-admin_v2_dev

# Conflicts:
#	server/model/sys_authority.go
#	server/model/sys_authority_menu.go
#	server/model/sys_base_menu.go
This commit is contained in:
rainyan
2020-04-06 00:47:46 +08:00
28 changed files with 259 additions and 315 deletions

View File

@@ -68,8 +68,8 @@ func (c *CasbinModel) UpdateCasbinApi(oldPath string, newPath string) error {
// @title AddCasbin
// @description add casbin authority, 添加权限
// @auth 2020/04/05 20:22
// @param cm CasbinModel
// @return bool
// @param cm CasbinModel
// @return bool
func (c *CasbinModel) AddCasbin(cm CasbinModel) bool {
e := Casbin()
return e.AddPolicy(cm.AuthorityId, cm.Path, cm.Method)
@@ -78,8 +78,8 @@ func (c *CasbinModel) AddCasbin(cm CasbinModel) bool {
// @title GetPolicyPathByAuthorityId
// @description get policy path by authorityId, 获取权限列表
// @auth 2020/04/05 20:22
// @param authorityId string
// @return []string
// @param authorityId string
// @return []string
func (c *CasbinModel) GetPolicyPathByAuthorityId(authorityId string) []string {
e := Casbin()
var pathList []string
@@ -93,9 +93,9 @@ func (c *CasbinModel) GetPolicyPathByAuthorityId(authorityId string) []string {
// @title ClearCasbin
// @description 清除匹配的权限
// @auth 2020/04/05 20:22
// @param v int
// @param p string
// @return bool
// @param v int
// @param p string
// @return bool
func (c *CasbinModel) ClearCasbin(v int, p string) bool {
e := Casbin()
return e.RemoveFilteredPolicy(v, p)
@@ -105,9 +105,9 @@ func (c *CasbinModel) ClearCasbin(v int, p string) bool {
// @title ParamsMatch
// @description customized rule, 自定义规则函数
// @auth 2020/04/05 20:22
// @param fullNameKey1 string
// @param key2 string
// @return bool
// @param fullNameKey1 string
// @param key2 string
// @return bool
func ParamsMatch(fullNameKey1 string, key2 string) bool {
key1 := strings.Split(fullNameKey1, "?")[0]
//剥离路径后再使用casbin的keyMatch2
@@ -117,9 +117,9 @@ func ParamsMatch(fullNameKey1 string, key2 string) bool {
// @title ParamsMatchFunc
// @description customized function, 自定义规则函数
// @auth 2020/04/05 20:22
// @param args ...interface{}
// @return interface{}
// @return error
// @param args ...interface{}
// @return interface{}
// @return error
func ParamsMatchFunc(args ...interface{}) (interface{}, error) {
name1 := args[0].(string)
name2 := args[1].(string)
@@ -128,7 +128,7 @@ func ParamsMatchFunc(args ...interface{}) (interface{}, error) {
}
// @title Casbin
// @description 持久化到数据库 引入自定义规则
// @description store to DB, 持久化到数据库 引入自定义规则
// @auth 2020/04/05 20:22
func Casbin() *casbin.Enforcer {
a := gormadapter.NewAdapterByDB(global.GVA_DB)