From 339a85e4b017fe2865ea03d6675c5a3aad0709a7 Mon Sep 17 00:00:00 2001 From: Gucheng Wang Date: Thu, 20 Jan 2022 14:20:37 +0800 Subject: [PATCH] Support tableNamePrefix in authz table. --- authz/authz.go | 3 ++- conf/app.conf | 2 +- go.mod | 2 +- go.sum | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/authz/authz.go b/authz/authz.go index 2ba6a556..503298ef 100644 --- a/authz/authz.go +++ b/authz/authz.go @@ -28,7 +28,8 @@ var Enforcer *casbin.Enforcer func InitAuthz() { var err error - a, err := xormadapter.NewAdapter(beego.AppConfig.String("driverName"), conf.GetBeegoConfDataSourceName()+beego.AppConfig.String("dbName"), true) + tableNamePrefix := beego.AppConfig.String("tableNamePrefix") + a, err := xormadapter.NewAdapterWithTableName(beego.AppConfig.String("driverName"), conf.GetBeegoConfDataSourceName()+beego.AppConfig.String("dbName"), "casbin_rule", tableNamePrefix, true) if err != nil { panic(err) } diff --git a/conf/app.conf b/conf/app.conf index 1920d9d1..d4e068c1 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -6,7 +6,7 @@ copyrequestbody = true driverName = mysql dataSourceName = root:123456@tcp(localhost:3306)/ dbName = casdoor -tableNamePrefix= +tableNamePrefix = showSql = false redisEndpoint = defaultStorageProvider = diff --git a/go.mod b/go.mod index 977c9a72..7aca1aad 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go v1.37.30 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/casbin/casbin/v2 v2.30.1 - github.com/casbin/xorm-adapter/v2 v2.3.1 + github.com/casbin/xorm-adapter/v2 v2.5.1 github.com/casdoor/go-sms-sender v0.0.5 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df diff --git a/go.sum b/go.sum index 7fb6637c..7c72e976 100644 --- a/go.sum +++ b/go.sum @@ -74,11 +74,11 @@ github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6 github.com/casbin/casbin v1.7.0 h1:PuzlE8w0JBg/DhIqnkF1Dewf3z+qmUZMVN07PonvVUQ= github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE= github.com/casbin/casbin/v2 v2.1.0/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/casbin/casbin/v2 v2.25.5/go.mod h1:wUgota0cQbTXE6Vd+KWpg41726jFRi7upxio0sR+Xd0= +github.com/casbin/casbin/v2 v2.28.3/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeKF0= github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/casbin/xorm-adapter/v2 v2.3.1 h1:RVGsM6KYFP9s4OQJXrP/gv56Wmt5P40mzvcyXgv5xeg= -github.com/casbin/xorm-adapter/v2 v2.3.1/go.mod h1:GZ+nlIdasVFunQ71SlvkL/HcQQBvFncphDf+2Yl167c= +github.com/casbin/xorm-adapter/v2 v2.5.1 h1:BkpIxRHKa0s3bSMx173PpuU7oTs+Zw7XmD0BIta0HGM= +github.com/casbin/xorm-adapter/v2 v2.5.1/go.mod h1:AeH4dBKHC9/zYxzdPVHhPDzF8LYLqjDdb767CWJoV54= github.com/casdoor/go-sms-sender v0.0.5 h1:9qhlMM+UoSOvvY7puUULqSHBBA7fbe02Px/tzchQboo= github.com/casdoor/go-sms-sender v0.0.5/go.mod h1:TMM/BsZQAa+7JVDXl2KqgxnzZgCjmHEX5MBN662mM5M= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=