bugfix: https://github.com/go-admin-team/go-admin/issues/539 修复角色新增、修改时,sys_casbin_rule表drop,然后重新create的问题
This commit is contained in:
1 parent
62ab985050
commit
0d6b347d7e
2 files changed
+24
-22
No files matched your search
@@ -2,10 +2,11 @@ package apis
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin/binding"
|
"github.com/gin-gonic/gin/binding"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk"
|
"github.com/go-admin-team/go-admin-core/sdk"
|
||||||
"go-admin/app/admin/models"
|
"go-admin/app/admin/models"
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||||
@@ -14,7 +15,6 @@ import (
|
|||||||
|
|
||||||
"go-admin/app/admin/service"
|
"go-admin/app/admin/service"
|
||||||
"go-admin/app/admin/service/dto"
|
"go-admin/app/admin/service/dto"
|
||||||
"go-admin/common/global"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type SysRole struct {
|
type SysRole struct {
|
||||||
@@ -128,11 +128,7 @@ func (e SysRole) Insert(c *gin.Context) {
|
|||||||
e.Error(500, err, "创建失败,"+err.Error())
|
e.Error(500, err, "创建失败,"+err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_, err = global.LoadPolicy(c)
|
|
||||||
if err != nil {
|
|
||||||
e.Error(500, err, "")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
e.OK(req.GetId(), "创建成功")
|
e.OK(req.GetId(), "创建成功")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -168,11 +164,7 @@ func (e SysRole) Update(c *gin.Context) {
|
|||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_, err = global.LoadPolicy(c)
|
|
||||||
if err != nil {
|
|
||||||
e.Error(500, err, "")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
e.OK(req.GetId(), "更新成功")
|
e.OK(req.GetId(), "更新成功")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,17 +190,14 @@ func (e SysRole) Delete(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = s.Remove(&req)
|
cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
|
||||||
|
err = s.Remove(&req, cb)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.Logger.Error(err)
|
e.Logger.Error(err)
|
||||||
e.Error(500, err, "")
|
e.Error(500, err, "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_, err = global.LoadPolicy(c)
|
|
||||||
if err != nil {
|
|
||||||
e.Error(500, err, fmt.Sprintf("删除角色 %v 失败,失败信息 %s", req.GetId(), err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功!", req.GetId()))
|
e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功!", req.GetId()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/config"
|
"github.com/go-admin-team/go-admin-core/sdk/config"
|
||||||
"gorm.io/gorm/clause"
|
"gorm.io/gorm/clause"
|
||||||
|
|
||||||
@@ -102,12 +103,21 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mp := make(map[string]interface{}, 0)
|
||||||
|
polices := make([][]string, 0)
|
||||||
for _, menu := range dataMenu {
|
for _, menu := range dataMenu {
|
||||||
for _, api := range menu.SysApi {
|
for _, api := range menu.SysApi {
|
||||||
_, err = cb.AddNamedPolicy("p", data.RoleKey, api.Path, api.Action)
|
if mp[data.RoleKey+"-"+api.Path+"-"+api.Action] != "" {
|
||||||
|
mp[data.RoleKey+"-"+api.Path+"-"+api.Action] = ""
|
||||||
|
polices = append(polices, []string{data.RoleKey, api.Path, api.Action})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ = cb.SavePolicy()
|
_, err = cb.AddNamedPolicies("p", polices)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
//if len(c.MenuIds) > 0 {
|
//if len(c.MenuIds) > 0 {
|
||||||
// s := SysRoleMenu{}
|
// s := SysRoleMenu{}
|
||||||
// s.Orm = e.Orm
|
// s.Orm = e.Orm
|
||||||
@@ -176,12 +186,12 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
_ = cb.SavePolicy()
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove 删除SysRole
|
// Remove 删除SysRole
|
||||||
func (e *SysRole) Remove(c *dto.SysRoleDeleteReq) error {
|
func (e *SysRole) Remove(c *dto.SysRoleDeleteReq, cb *casbin.SyncedEnforcer) error {
|
||||||
var err error
|
var err error
|
||||||
tx := e.Orm
|
tx := e.Orm
|
||||||
if config.DatabaseConfig.Driver != "sqlite3" {
|
if config.DatabaseConfig.Driver != "sqlite3" {
|
||||||
@@ -205,6 +215,9 @@ func (e *SysRole) Remove(c *dto.SysRoleDeleteReq) error {
|
|||||||
if db.RowsAffected == 0 {
|
if db.RowsAffected == 0 {
|
||||||
return errors.New("无权更新该数据")
|
return errors.New("无权更新该数据")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_, _ = cb.RemoveFilteredPolicy(0, model.RoleKey)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user