feat:Extraction of configuration parameters
This commit is contained in:
1 parent
bfbc5081ea
commit
8a1614f64d
34 files changed
+99
-79
No files matched your search
+13
-13
@@ -2,9 +2,8 @@ package database
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
@@ -12,26 +11,24 @@ type PgSql struct {
|
||||
}
|
||||
|
||||
func (e *PgSql) Setup() {
|
||||
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(PgSql)
|
||||
orm.Source = db.GetConnect()
|
||||
log.Info(orm.Source)
|
||||
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
|
||||
|
||||
global.Source = db.GetConnect()
|
||||
log.Info(global.Source)
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", orm.Driver, err)
|
||||
log.Fatalf("%s connect error %v", db.GetDriver(), err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", orm.Driver)
|
||||
log.Printf("%s connect success!", db.GetDriver())
|
||||
}
|
||||
|
||||
if orm.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", orm.Eloquent.Error)
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
orm.Eloquent.LogMode(true)
|
||||
global.Eloquent.LogMode(true)
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
@@ -41,6 +38,9 @@ func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
}
|
||||
|
||||
func (e *PgSql) GetConnect() string {
|
||||
|
||||
return config.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *PgSql) GetDriver() string {
|
||||
return config.DatabaseConfig.Driver
|
||||
}
|
||||
Reference in new issue
Block a user