logger模块移入go-admin-core仓库,修改log用法暂时折中

fixme:后期要尽快改成统一的log处理方式
This commit is contained in:
linwenxiang
2020-10-26 22:37:44 +08:00
parent a68e58f93b
commit da4637d285
27 changed files with 119 additions and 784 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, "", "删除成功")
+6 -6
View File
@@ -1,15 +1,15 @@
package middleware
import (
"go-admin/common/log"
"go-admin/tools/app"
"net/http"
"github.com/gin-gonic/gin"
mycasbin "go-admin/pkg/casbin"
"go-admin/common/global"
"go-admin/common/log"
"go-admin/pkg/jwtauth"
"go-admin/tools"
"go-admin/tools/app"
)
//权限检查中间件
@@ -17,15 +17,15 @@ func AuthCheckRole() gin.HandlerFunc {
return func(c *gin.Context) {
data, _ := c.Get(jwtauth.JwtPayloadKey)
v := data.(jwtauth.MapClaims)
e := mycasbin.Casbin()
e := global.CasbinEnforcer
var res bool
var err error
msgID := tools.GenerateMsgIDFromContext(c)
//检查权限
if v["rolekey"]=="admin" {
if v["rolekey"] == "admin" {
res = true
log.Infof("msgID[%s] info:%s method:%s path:%s", msgID, v["rolekey"], c.Request.Method, c.Request.URL.Path)
}else {
} else {
res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method)
if err != nil {
log.Errorf("msgID[%s] error:%s method:%s path:%s", msgID, err, c.Request.Method, c.Request.URL.Path)