llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 18:54:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename db to driverName.

Browse Source
This commit is contained in:
Yang Luo 2021-05-02 00:24:34 +08:00
parent d509c61816
commit be0cfa132e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
authz/authz.go
View File

@ -27,7 +27,7 @@ var Enforcer *casbin.Enforcer
func InitAuthz() { func InitAuthz() {
var err error var err error
a, err := xormadapter.NewAdapter(beego.AppConfig.String("db"), beego.AppConfig.String("dataSourceName")+beego.AppConfig.String("dbName"), true) a, err := xormadapter.NewAdapter(beego.AppConfig.String("driverName"), beego.AppConfig.String("dataSourceName")+beego.AppConfig.String("dbName"), true)
if err != nil { if err != nil {
panic(err) panic(err)
} }

2
conf/app.conf
View File

@ -3,7 +3,7 @@ httpport = 8000
runmode = dev runmode = dev
SessionOn = true SessionOn = true
copyrequestbody = true copyrequestbody = true
db = mysql driverName = mysql
dataSourceName = root:123@tcp(localhost:3306)/ dataSourceName = root:123@tcp(localhost:3306)/
dbName = casdoor dbName = casdoor
AuthState = "casdoor" AuthState = "casdoor"

12
object/adapter.go
View File

@ -36,13 +36,14 @@ func InitConfig() {
} }
func InitAdapter() { func InitAdapter() {
adapter = NewAdapter(beego.AppConfig.String("db"), beego.AppConfig.String("dataSourceName")) adapter = NewAdapter(beego.AppConfig.String("driverName"), beego.AppConfig.String("dataSourceName"), beego.AppConfig.String("dbName"))
} }
// Adapter represents the MySQL adapter for policy storage. // Adapter represents the MySQL adapter for policy storage.
type Adapter struct { type Adapter struct {
driverName string driverName string
dataSourceName string dataSourceName string
dbName string
engine *xorm.Engine engine *xorm.Engine
} }
@ -55,10 +56,11 @@ func finalizer(a *Adapter) {
} }
// NewAdapter is the constructor for Adapter. // NewAdapter is the constructor for Adapter.
func NewAdapter(driverName string, dataSourceName string) *Adapter { func NewAdapter(driverName string, dataSourceName string, dbName string) *Adapter {
a := &Adapter{} a := &Adapter{}
a.driverName = driverName a.driverName = driverName
a.dataSourceName = dataSourceName a.dataSourceName = dataSourceName
a.dbName = dbName
// Open the DB, create it if not existed. // Open the DB, create it if not existed.
a.open() a.open()
@ -76,18 +78,18 @@ func (a *Adapter) createDatabase() error {
} }
defer engine.Close() defer engine.Close()
_, err = engine.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci", beego.AppConfig.String("dbName"))) _, err = engine.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci", a.dbName))
return err return err
} }
func (a *Adapter) open() { func (a *Adapter) open() {
if beego.AppConfig.String("db") != "postgres" { if a.driverName != "postgres" {
if err := a.createDatabase(); err != nil { if err := a.createDatabase(); err != nil {
panic(err) panic(err)
} }
} }
engine, err := xorm.NewEngine(a.driverName, a.dataSourceName+beego.AppConfig.String("dbName")) engine, err := xorm.NewEngine(a.driverName, a.dataSourceName+a.dbName)
if err != nil { if err != nil {
panic(err) panic(err)
} }