feat:Extract global configuration

This commit is contained in:
zhangwenjian committed 2020-07-06 07:53:34 +08:00
1 parent a6970e9c67
commit bfbc5081ea
15 files changed
+155 -207

No files matched your search

+2 -4
View File
@@ -1,10 +1,8 @@
package database
import "go-admin/tools/config"
func Setup() {
dbType := config.DatabaseConfig.DbType
func Setup(driver string) {
dbType := driver
if dbType == "mysql" {
var db = new(Mysql)
db.Setup()
+1
View File
@@ -3,6 +3,7 @@ package database
import "github.com/jinzhu/gorm"
type Database interface {
Setup()
Open(dbType string, conn string) (db *gorm.DB, err error)
GetConnect() string
}
+21 -24
View File
@@ -8,36 +8,33 @@ import (
"go-admin/tools/config"
)
func (e *Mysql) Setup() {
var err error
var db Database
db = new(Mysql)
orm.MysqlConn = db.GetConnect()
log.Info(orm.MysqlConn)
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.MysqlConn)
if err != nil {
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
} else {
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
}
if orm.Eloquent.Error != nil {
log.Fatalf("database error %v", orm.Eloquent.Error)
}
orm.Eloquent.LogMode(true)
}
type Mysql struct {
}
func (e *Mysql) Setup() {
var err error
var db Database
db = new(Mysql)
orm.Source = db.GetConnect()
log.Info(orm.Source)
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
if err != nil {
log.Fatalf("%s connect error %v", orm.Driver, err)
} else {
log.Printf("%s connect success!", orm.Driver)
}
if orm.Eloquent.Error != nil {
log.Fatalf("database error %v", orm.Eloquent.Error)
}
orm.Eloquent.LogMode(true)
}
// 打开数据库连接
func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
return gorm.Open(dbType, conn)
}
// 获取数据库连接
func (e *Mysql) GetConnect() string {
return config.DatabaseConfig.Mysql.MasterConn
return config.DatabaseConfig.Source
}
+16 -15
View File
@@ -11,30 +11,20 @@ import (
type PgSql struct {
}
func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
eloquent, err := gorm.Open(dbType, conn)
return eloquent, err
}
func (e *PgSql) GetConnect() string {
return config.DatabaseConfig.PgSql.MasterConn
}
func (e *PgSql) Setup() {
var err error
var db Database
db = new(PgSql)
orm.PgSqlConn = db.GetConnect()
log.Info(orm.PgSqlConn)
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.PgSqlConn)
orm.Source = db.GetConnect()
log.Info(orm.Source)
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
if err != nil {
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
log.Fatalf("%s connect error %v", orm.Driver, err)
} else {
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
log.Printf("%s connect success!", orm.Driver)
}
if orm.Eloquent.Error != nil {
@@ -43,3 +33,14 @@ func (e *PgSql) Setup() {
orm.Eloquent.LogMode(true)
}
// 打开数据库连接
func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
eloquent, err := gorm.Open(dbType, conn)
return eloquent, err
}
func (e *PgSql) GetConnect() string {
return config.DatabaseConfig.Source
}
@@ -11,29 +11,20 @@ import (
type SqLite struct {
}
func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
eloquent, err := gorm.Open(dbType, conn)
return eloquent, err
}
func (e *SqLite) GetConnect() string {
return config.DatabaseConfig.SqLite.MasterConn
}
func (e *SqLite) Setup() {
var err error
var db Database
db = new(SqLite)
orm.SqLiteConn = db.GetConnect()
log.Info(orm.SqLiteConn)
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.SqLiteConn)
orm.Source = db.GetConnect()
log.Info(orm.Source)
orm.Eloquent, err = db.Open(orm.Driver, orm.Source)
if err != nil {
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
log.Fatalf("%s connect error %v", orm.Driver, err)
} else {
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
log.Printf("%s connect success!", orm.Driver)
}
if orm.Eloquent.Error != nil {
@@ -41,4 +32,14 @@ func (e *SqLite) Setup() {
}
orm.Eloquent.LogMode(true)
}
// 打开数据库连接
func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
eloquent, err := gorm.Open(dbType, conn)
return eloquent, err
}
func (e *SqLite) GetConnect() string {
return config.DatabaseConfig.Source
}