From 012a82821efb7ba5d348af3490ef40b20fbb3839 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Mon, 27 Jul 2020 22:37:50 +0800 Subject: [PATCH] log : update log import --- handler/nofound.go | 2 +- middleware/permission.go | 11 ++++++++--- models/sysuser.go | 2 +- pkg/casbin/mycasbin.go | 2 +- pkg/cronjob/testjob.go | 2 +- tools/user.go | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/handler/nofound.go b/handler/nofound.go index 46ee59b8..093cd28a 100644 --- a/handler/nofound.go +++ b/handler/nofound.go @@ -2,8 +2,8 @@ package handler import ( "github.com/gin-gonic/gin" - log "github.com/sirupsen/logrus" jwt "go-admin/pkg/jwtauth" + "log" "net/http" ) diff --git a/middleware/permission.go b/middleware/permission.go index 99a48262..ade29ff8 100644 --- a/middleware/permission.go +++ b/middleware/permission.go @@ -1,8 +1,8 @@ package middleware import ( + "fmt" "github.com/gin-gonic/gin" - log "github.com/sirupsen/logrus" mycasbin "go-admin/pkg/casbin" "go-admin/pkg/jwtauth" _ "go-admin/pkg/jwtauth" @@ -19,10 +19,15 @@ func AuthCheckRole() gin.HandlerFunc { tools.HasError(err, "", 500) //检查权限 res, err := e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method) - log.Println("----------------", v["rolekey"], c.Request.URL.Path, c.Request.Method) - tools.HasError(err, "", 500) + fmt.Printf("%s [INFO] %s %s %s \r\n", + tools.GetCurrentTimeStr(), + c.Request.Method, + c.Request.URL.Path, + v["rolekey"], + ) + if res { c.Next() } else { diff --git a/models/sysuser.go b/models/sysuser.go index b373e946..2688af29 100644 --- a/models/sysuser.go +++ b/models/sysuser.go @@ -2,7 +2,7 @@ package models import ( "errors" - log "github.com/sirupsen/logrus" + "log" orm "go-admin/global" "go-admin/tools" "golang.org/x/crypto/bcrypt" diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go index 31407613..759ee46d 100644 --- a/pkg/casbin/mycasbin.go +++ b/pkg/casbin/mycasbin.go @@ -5,7 +5,7 @@ import ( "github.com/casbin/casbin/v2/model" gormAdapter "github.com/casbin/gorm-adapter/v2" _ "github.com/go-sql-driver/mysql" - log "github.com/sirupsen/logrus" + "log" "go-admin/global" ) diff --git a/pkg/cronjob/testjob.go b/pkg/cronjob/testjob.go index 08e680f6..1d397742 100644 --- a/pkg/cronjob/testjob.go +++ b/pkg/cronjob/testjob.go @@ -2,7 +2,7 @@ package cronjob import ( "github.com/robfig/cron/v3" - log "github.com/sirupsen/logrus" + "log" tools2 "go-admin/tools" ) diff --git a/tools/user.go b/tools/user.go index 0ab50ec7..526ae38a 100644 --- a/tools/user.go +++ b/tools/user.go @@ -3,7 +3,7 @@ package tools import ( "fmt" "github.com/gin-gonic/gin" - log "github.com/sirupsen/logrus" + "log" jwt "go-admin/pkg/jwtauth" )