From 91d902389a8fece0aef939fb01f79df4cba3ab26 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Mon, 7 Jun 2021 20:37:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=88=E6=9D=83=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/sys_role.go | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index 470e57e..251032c 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -58,7 +58,7 @@ func (e *SysRole) Get(d *dto.SysRoleById, model *models.SysRole) error { } // Insert 创建SysRole对象 -func (e *SysRole) Insert(c *dto.SysRoleControl) error { +func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error { var err error var data models.SysRole var dataMenu []models.SysMenu @@ -78,22 +78,28 @@ func (e *SysRole) Insert(c *dto.SysRoleControl) error { } }() - err = tx.Model(&data). - Create(c).Error + err = tx.Create(&data).Error if err != nil { e.Log.Errorf("db error:%s", err) return err } - if len(c.MenuIds) > 0 { - s := SysRoleMenu{} - s.Orm = e.Orm - s.Log = e.Log - err = s.ReloadRule(tx, c.RoleId, c.MenuIds) - if err != nil { - e.Log.Errorf("reload casbin rule error, %", err.Error()) - return err + + for _, menu := range dataMenu { + for _, api := range menu.SysApi { + _, err = cb.AddNamedPolicy("p", data.RoleKey, api.Path, api.Action) } } + _ = cb.SavePolicy() + //if len(c.MenuIds) > 0 { + // s := SysRoleMenu{} + // s.Orm = e.Orm + // s.Log = e.Log + // err = s.ReloadRule(tx, c.RoleId, c.MenuIds) + // if err != nil { + // e.Log.Errorf("reload casbin rule error, %", err.Error()) + // return err + // } + //} return nil } @@ -230,4 +236,4 @@ func (e *SysRole) UpdateDataScope(c *models.SysRole) (err error) { } } return err -} +} \ No newline at end of file