diff --git a/authz/authz.go b/authz/authz.go index a615b2f9..43027791 100644 --- a/authz/authz.go +++ b/authz/authz.go @@ -27,7 +27,7 @@ var Enforcer *casbin.Enforcer func InitAuthz() { var err error - a, err := xormadapter.NewAdapter("mysql", beego.AppConfig.String("dataSourceName")+beego.AppConfig.String("dbName"), true) + a, err := xormadapter.NewAdapter(beego.AppConfig.String("db"), beego.AppConfig.String("dataSourceName")+beego.AppConfig.String("dbName"), true) if err != nil { panic(err) } diff --git a/conf/app.conf b/conf/app.conf index 4a801370..a28f15a6 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -3,6 +3,7 @@ httpport = 8000 runmode = dev SessionOn = true copyrequestbody = true +db = mysql dataSourceName = root:123@tcp(localhost:3306)/ dbName = casdoor AuthState = "casdoor" diff --git a/go.mod b/go.mod index 77f5f3cb..363a52a8 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( github.com/google/uuid v1.2.0 github.com/jinzhu/configor v1.2.1 // indirect github.com/qiangmzsx/string-adapter/v2 v2.1.0 - github.com/qiniu/api.v7 v7.2.5+incompatible // indirect github.com/qor/oss v0.0.0-20191031055114-aef9ba66bf76 github.com/satori/go.uuid v1.2.0 // indirect github.com/smartystreets/goconvey v1.6.4 // indirect diff --git a/go.sum b/go.sum index df4ba542..40b48ff2 100644 --- a/go.sum +++ b/go.sum @@ -13,7 +13,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= -github.com/aliyun/aliyun-oss-go-sdk v1.9.8 h1:BOflvK0Zs/zGmoabyFIzTg5c3kguktWTXEwewwbuba0= github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible h1:Ft+KeWIJxFP76LqgJbvtOA1qBIoC8vGkTV3QeCOeJC4= github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= @@ -165,9 +164,6 @@ github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFB github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/qiangmzsx/string-adapter/v2 v2.1.0 h1:q0y8TPa/sTwtriJPRe8gWL++PuZ+XbOUuvKU+hvtTYs= github.com/qiangmzsx/string-adapter/v2 v2.1.0/go.mod h1:PElPB7b7HnGKTsuADAffFpOQXHqjEGJz1+U1a6yR5wA= -github.com/qiniu/api.v7 v7.2.5+incompatible h1:6KKaGt7MbFzVGSniwzv7qsM/Qv0or4SkRJfmak8LqZE= -github.com/qiniu/api.v7 v7.2.5+incompatible/go.mod h1:V8/EzlTgLN6q0s0CJmg/I81ytsvldSF22F7h6MI02+c= -github.com/qiniu/x v1.11.5 h1:TYr5cl4g2yoHAZeDK4MTjKF6CMoG+IHlCDvvM5qym6U= github.com/qor/oss v0.0.0-20191031055114-aef9ba66bf76 h1:J2Xj92efYLxPl3BiibgEDEUiMsCBzwTurE/8JjD8CG4= github.com/qor/oss v0.0.0-20191031055114-aef9ba66bf76/go.mod h1:JhtPzUhP5KGtCB2yksmxuYAD4hEWw4qGQJpucjsm3U0= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= @@ -243,8 +239,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= diff --git a/object/adapter.go b/object/adapter.go index 74abadb1..bd34aae4 100644 --- a/object/adapter.go +++ b/object/adapter.go @@ -19,7 +19,8 @@ import ( "runtime" "github.com/astaxie/beego" - _ "github.com/go-sql-driver/mysql" + _ "github.com/go-sql-driver/mysql" // db = mysql + //_ "github.com/lib/pq" // db = postgres "xorm.io/xorm" ) @@ -35,7 +36,7 @@ func InitConfig() { } func InitAdapter() { - adapter = NewAdapter("mysql", beego.AppConfig.String("dataSourceName")) + adapter = NewAdapter(beego.AppConfig.String("db"), beego.AppConfig.String("dataSourceName")) } // Adapter represents the MySQL adapter for policy storage. @@ -80,8 +81,10 @@ func (a *Adapter) createDatabase() error { } func (a *Adapter) open() { - if err := a.createDatabase(); err != nil { - panic(err) + if beego.AppConfig.String("db") != "postgres" { + if err := a.createDatabase(); err != nil { + panic(err) + } } engine, err := xorm.NewEngine(a.driverName, a.dataSourceName+beego.AppConfig.String("dbName"))