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
@@ -8,10 +8,11 @@ func Setup(driver string) {
|
||||
db.Setup()
|
||||
}
|
||||
|
||||
if dbType == "sqlite3" {
|
||||
var db = new(SqLite)
|
||||
db.Setup()
|
||||
}
|
||||
//TODO: 如果需要sqlite3请开启下面注释
|
||||
//if dbType == "sqlite3" {
|
||||
// var db = new(SqLite)
|
||||
// db.Setup()
|
||||
//}
|
||||
|
||||
if dbType == "pgsql" {
|
||||
var db = new(PgSql)
|
||||
|
||||
@@ -6,4 +6,5 @@ type Database interface {
|
||||
Setup()
|
||||
Open(dbType string, conn string) (db *gorm.DB, err error)
|
||||
GetConnect() string
|
||||
GetDriver() string
|
||||
}
|
||||
+16
-9
@@ -4,7 +4,7 @@ import (
|
||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||
"github.com/jinzhu/gorm"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
@@ -14,19 +14,22 @@ 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)
|
||||
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)
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
@@ -38,3 +41,7 @@ func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
func (e *Mysql) GetConnect() string {
|
||||
return config.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *Mysql) GetDriver() string {
|
||||
return config.DatabaseConfig.Driver
|
||||
}
|
||||
+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
|
||||
}
|
||||
+15
-10
@@ -1,10 +1,12 @@
|
||||
// +build sqlite3
|
||||
|
||||
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 +14,25 @@ type SqLite struct {
|
||||
}
|
||||
|
||||
func (e *SqLite) Setup() {
|
||||
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(SqLite)
|
||||
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)
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
@@ -42,4 +43,8 @@ func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
|
||||
func (e *SqLite) GetConnect() string {
|
||||
return config.DatabaseConfig.Source
|
||||
}
|
||||
|
||||
func (e *SqLite) GetDriver() string {
|
||||
return config.DatabaseConfig.Driver
|
||||
}
|
||||
Reference in new issue
Block a user