Merge pull request go-admin-team#183 from wenjianzhang/dev

wenjianzhang · web-flow · commit 055a68de7f51 · 2020-08-03T14:25:59.000+08:00
fix: Use NewSyncedEnforcer instead NewEnforcer to solve the thread safe
diff --git a/global/adm.go b/global/adm.go
@@ -8,7 +8,7 @@ import (
 )
 
 var GinEngine *gin.Engine
-var CasbinEnforcer *casbin.Enforcer
+var CasbinEnforcer *casbin.SyncedEnforcer
 var Eloquent *gorm.DB
 
 var (
@@ -21,7 +21,7 @@ var (
 var Version string
 
 func init() {
-	Version = "1.1.1"
+	Version = "1.1.2"
 }
 
 var (
diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go
@@ -33,14 +33,14 @@ func Setup() {
 	if err != nil {
 		panic(err)
 	}
-	e, err := casbin.NewEnforcer(m, Apter)
+	e, err := casbin.NewSyncedEnforcer(m, Apter)
 	if err != nil {
 		panic(err)
 	}
 	global.CasbinEnforcer = e
 }
 
-func Casbin() (*casbin.Enforcer, error) {
+func Casbin() (*casbin.SyncedEnforcer, error) {
 	if err := global.CasbinEnforcer.LoadPolicy(); err == nil {
 		return global.CasbinEnforcer, err
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var GinEngine *gin.Engine`
`11`		`-var CasbinEnforcer *casbin.Enforcer`
	`11`	`+var CasbinEnforcer *casbin.SyncedEnforcer`
`12`	`12`	`var Eloquent *gorm.DB`
`13`	`13`
`14`	`14`	`var (`
`@@ -21,7 +21,7 @@ var (`
`21`	`21`	`var Version string`
`22`	`22`
`23`	`23`	`func init() {`
`24`		`- Version = "1.1.1"`
	`24`	`+ Version = "1.1.2"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@ func Setup() {`
`33`	`33`	`if err != nil {`
`34`	`34`	`panic(err)`
`35`	`35`	`}`
`36`		`- e, err := casbin.NewEnforcer(m, Apter)`
	`36`	`+ e, err := casbin.NewSyncedEnforcer(m, Apter)`
`37`	`37`	`if err != nil {`
`38`	`38`	`panic(err)`
`39`	`39`	`}`
`40`	`40`	`global.CasbinEnforcer = e`
`41`	`41`	`}`
`42`	`42`
`43`		`-func Casbin() (*casbin.Enforcer, error) {`
	`43`	`+func Casbin() (*casbin.SyncedEnforcer, error) {`
`44`	`44`	`if err := global.CasbinEnforcer.LoadPolicy(); err == nil {`
`45`	`45`	`return global.CasbinEnforcer, err`
`46`	`46`	`} else {`