兼容casbin2.24.0版本log

迁移脚本编译时不打包
This commit is contained in:
linwenxiang committed 2021-03-05 13:23:21 +08:00
1 parent 48f0cb46ec
commit 39dd1ee6f8
56 files changed
+320 -454

No files matched your search

+6 -1
View File
@@ -22,7 +22,12 @@ func (e *Api) GetLogger(c *gin.Context) logger.Logger {
// GetOrm 获取Orm DB
func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
return tools.GetOrm(c)
db, err := tools.GetOrm(c)
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
return nil, err
}
return db, nil
}
// Error 通常错误数据处理
-94
View File
@@ -1,94 +0,0 @@
package config
import (
"net/http"
"github.com/casbin/casbin/v2"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/robfig/cron/v3"
"gorm.io/gorm"
)
type Config struct {
dbs map[string]*gorm.DB
casbins map[string]*casbin.SyncedEnforcer
engine http.Handler
crontab map[string]*cron.Cron
}
// SetDb 设置对应key的db
func (c *Config) SetDb(key string, db *gorm.DB) {
c.dbs[key] = db
}
// GetDb 获取所有map里的db数据
func (c *Config) GetDb() map[string]*gorm.DB {
return c.dbs
}
// GetDbByKey 根据key获取db
func (c *Config) GetDbByKey(key string) *gorm.DB {
if db, ok := c.dbs["*"]; ok {
return db
}
return c.dbs[key]
}
func (c *Config) SetCasbin(key string, enforcer *casbin.SyncedEnforcer) {
c.casbins[key] = enforcer
}
// GetCasbinKey 根据key获取casbin
func (c *Config) GetCasbinKey(key string) *casbin.SyncedEnforcer {
if e, ok := c.casbins["*"]; ok {
return e
}
return c.casbins[key]
}
// SetEngine 设置路由引擎
func (c *Config) SetEngine(engine http.Handler) {
c.engine = engine
}
// GetEngine 获取路由引擎
func (c *Config) GetEngine() http.Handler {
return c.engine
}
// SetLogger 设置日志组件
func (c *Config) SetLogger(l logger.Logger) {
logger.DefaultLogger = l
}
// GetLogger 获取日志组件
func (c *Config) GetLogger() logger.Logger {
return logger.DefaultLogger
}
// NewConfig 默认值
func NewConfig() *Config {
return &Config{
dbs: make(map[string]*gorm.DB),
casbins: make(map[string]*casbin.SyncedEnforcer),
crontab: make(map[string]*cron.Cron),
}
}
// SetCrontab 设置对应key的crontab
func (c *Config) SetCrontab(key string, crontab *cron.Cron) {
c.crontab[key] = crontab
}
// GetCrontab 获取所有map里的crontab数据
func (c *Config) GetCrontab() map[string]*cron.Cron {
return c.crontab
}
// GetCrontabKey 根据key获取crontab
func (c *Config) GetCrontabKey(key string) *cron.Cron {
if e, ok := c.crontab["*"]; ok {
return e
}
return c.crontab[key]
}
-33
View File
@@ -1,33 +0,0 @@
package config
import (
"github.com/casbin/casbin/v2"
"github.com/robfig/cron/v3"
"net/http"
"github.com/go-admin-team/go-admin-core/logger"
"gorm.io/gorm"
)
type Conf interface {
//多db设置,⚠️SetDbs不允许并发,可以根据自己的业务,例如app分库、host分库
SetDb(key string, db *gorm.DB)
GetDb() map[string]*gorm.DB
GetDbByKey(key string) *gorm.DB
SetCasbin(key string, enforcer *casbin.SyncedEnforcer)
GetCasbinKey(key string) *casbin.SyncedEnforcer
//使用的路由
SetEngine(engine http.Handler)
GetEngine() http.Handler
//使用go-admin定义的logger,参考来源go-micro
SetLogger(logger logger.Logger)
GetLogger() logger.Logger
//crontab
SetCrontab(key string, crontab *cron.Cron)
GetCrontab() map[string]*cron.Cron
GetCrontabKey(key string) *cron.Cron
}
+2 -2
View File
@@ -65,6 +65,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
// global.Eloquent = db
//}
global.Cfg.SetDb(host, db)
global.Cfg.SetCasbin(host, e)
global.Runtime.SetDb(host, db)
global.Runtime.SetCasbin(host, e)
}
+2 -2
View File
@@ -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
+5 -7
View File
@@ -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
}
}
+1 -1
View File
@@ -7,6 +7,6 @@ import (
)
func WithContextDb(c *gin.Context) {
c.Set("db", global.Cfg.GetDbByKey(c.Request.Host))
c.Set("db", global.Runtime.GetDbByKey(c.Request.Host))
c.Next()
}