数据库连接初始化优化
权限部分修改
This commit is contained in:
1 parent
4979fd659f
commit
deeb82048b
37 files changed
+726
-721
No files matched your search
@@ -1,7 +1,6 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/robfig/cron/v3"
|
||||
"gorm.io/gorm"
|
||||
@@ -15,10 +14,9 @@ const (
|
||||
Version = "1.2.3"
|
||||
)
|
||||
|
||||
var Cfg config.Conf = config.DefaultConfig()
|
||||
var Cfg config.Conf = config.NewConfig()
|
||||
|
||||
var GinEngine *gin.Engine
|
||||
var CasbinEnforcer *casbin.SyncedEnforcer
|
||||
var Eloquent *gorm.DB
|
||||
|
||||
var GADMCron *cron.Cron
|
||||
|
||||
@@ -3,13 +3,17 @@ package global
|
||||
import (
|
||||
"github.com/casbin/casbin/v2"
|
||||
"github.com/casbin/casbin/v2/log"
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
func LoadPolicy() (*casbin.SyncedEnforcer, error) {
|
||||
if err := CasbinEnforcer.LoadPolicy(); err == nil {
|
||||
return CasbinEnforcer, err
|
||||
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
|
||||
} else {
|
||||
log.LogPrintf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
log.LogPrintf("msgID[%s] casbin rbac_model or policy init error, message: %v \r\n", msgID, err.Error())
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user