X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=toolbar%2Fcommon%2Fdb.go;fp=federation%2Fdatabase%2Fdb.go;h=6519445fbf03151166af6b64fe119afe563766da;hp=2005b37db471ac2b240043b47ce505e872356549;hb=6d682944981f67700aba26df064e3dd91d3603e5;hpb=a6be86325c56b458295c163200c295b43c44f2e0 diff --git a/federation/database/db.go b/toolbar/common/db.go similarity index 83% rename from federation/database/db.go rename to toolbar/common/db.go index 2005b37d..6519445f 100644 --- a/federation/database/db.go +++ b/toolbar/common/db.go @@ -1,4 +1,4 @@ -package database +package common import ( "fmt" @@ -7,10 +7,9 @@ import ( "github.com/jinzhu/gorm" "github.com/vapor/errors" - "github.com/vapor/federation/config" ) -func NewMySQLDB(cfg config.MySQLConfig) (*gorm.DB, error) { +func NewMySQLDB(cfg MySQLConfig) (*gorm.DB, error) { dsnTemplate := "%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=Local" dsn := fmt.Sprintf(dsnTemplate, cfg.Connection.Username, cfg.Connection.Password, cfg.Connection.Host, cfg.Connection.Port, cfg.Connection.DbName) db, err := gorm.Open("mysql", dsn)