调整log代码,兼容zap扩展支持fields
This commit is contained in:
1 parent
39dd1ee6f8
commit
75711922b4
47 files changed
+267
-275
No files matched your search
@@ -1,18 +0,0 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"github.com/go-admin-team/go-admin-core/tools/runtime"
|
||||
)
|
||||
|
||||
const (
|
||||
// go-admin Version Info
|
||||
Version = "1.2.3"
|
||||
)
|
||||
|
||||
var Runtime runtime.Runtime = runtime.NewConfig()
|
||||
|
||||
var (
|
||||
Source string
|
||||
Driver string
|
||||
DBName string
|
||||
)
|
||||
@@ -3,13 +3,14 @@ package global
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
"go-admin/pkg/logger"
|
||||
"go-admin/common/apis"
|
||||
"go-admin/tools/app"
|
||||
)
|
||||
|
||||
func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
|
||||
log := logger.GetRequestLogger(c)
|
||||
if err := Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
|
||||
return Runtime.GetCasbinKey(c.Request.Host), err
|
||||
log := apis.GetRequestLogger(c)
|
||||
if err := app.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
|
||||
return app.Runtime.GetCasbinKey(c.Request.Host), err
|
||||
} else {
|
||||
log.Errorf("casbin rbac_model or policy init error, %s ", err.Error())
|
||||
return nil, err
|
||||
|
||||
Reference in new issue
Block a user