Merge branch 'dev' of https://github.com/go-admin-team/go-admin into go-admin-team-dev

This commit is contained in:
zhangwenjian
2020-10-27 11:39:49 +08:00
31 changed files with 129 additions and 796 deletions
+4 -4
View File
@@ -2,9 +2,9 @@ package system
import (
"github.com/gin-gonic/gin"
mycasbin "go-admin/pkg/casbin"
"go-admin/app/admin/models"
"go-admin/common/global"
"go-admin/tools"
"go-admin/tools/app"
)
@@ -88,7 +88,7 @@ func InsertRole(c *gin.Context) {
tools.HasError(err, "", -1)
}
_, err = mycasbin.LoadPolicy()
_, err = global.LoadPolicy()
tools.HasError(err, "", -1)
app.OK(c, data, "添加成功")
@@ -118,7 +118,7 @@ func UpdateRole(c *gin.Context) {
tools.HasError(err2, "修改失败(insert", -1)
}
_, err = mycasbin.LoadPolicy()
_, err = global.LoadPolicy()
tools.HasError(err, "", -1)
app.OK(c, result, "修改成功")
@@ -156,7 +156,7 @@ func DeleteRole(c *gin.Context) {
_, err := Role.BatchDelete(IDS)
tools.HasError(err, "删除失败", -1)
_, err = mycasbin.LoadPolicy()
_, err = global.LoadPolicy()
tools.HasError(err, "", -1)
app.OK(c, "", "删除成功")