兼容casbin2.24.0版本log
迁移脚本编译时不打包
This commit is contained in:
1 parent
48f0cb46ec
commit
39dd1ee6f8
56 files changed
+320
-454
No files matched your search
@@ -1,7 +1,7 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"go-admin/common/config"
|
||||
"github.com/go-admin-team/go-admin-core/tools/runtime"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -9,7 +9,7 @@ const (
|
||||
Version = "1.2.3"
|
||||
)
|
||||
|
||||
var Cfg config.Conf = config.NewConfig()
|
||||
var Runtime runtime.Runtime = runtime.NewConfig()
|
||||
|
||||
var (
|
||||
Source string
|
||||
|
||||
@@ -2,18 +2,16 @@ package global
|
||||
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/casbin/casbin/v2/log"
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"go-admin/tools"
|
||||
"go-admin/pkg/logger"
|
||||
)
|
||||
|
||||
func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
|
||||
if err := Cfg.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
|
||||
return Cfg.GetCasbinKey(c.Request.Host), err
|
||||
log := logger.GetRequestLogger(c)
|
||||
if err := Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
|
||||
return Runtime.GetCasbinKey(c.Request.Host), err
|
||||
} else {
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
log.LogPrintf("msgID[%s] casbin rbac_model or policy init error, message: %v \r\n", msgID, err.Error())
|
||||
log.Errorf("casbin rbac_model or policy init error, %s ", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user