feat: Database type support
This commit is contained in:
1 parent
ab34ba8aad
commit
a6970e9c67
20 files changed
+190
-301
No files matched your search
@@ -4,14 +4,19 @@ import "go-admin/tools/config"
|
||||
|
||||
|
||||
func Setup() {
|
||||
dbType := config.DatabaseConfig.Dbtype
|
||||
dbType := config.DatabaseConfig.DbType
|
||||
if dbType == "mysql" {
|
||||
var db = new(Mysql)
|
||||
db.Setup()
|
||||
}
|
||||
|
||||
if dbType == "sqlite" {
|
||||
if dbType == "sqlite3" {
|
||||
var db = new(SqLite)
|
||||
db.Setup()
|
||||
}
|
||||
|
||||
if dbType == "pgsql" {
|
||||
var db = new(PgSql)
|
||||
db.Setup()
|
||||
}
|
||||
}
|
||||
+4
-35
@@ -1,22 +1,11 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||
"github.com/jinzhu/gorm"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/tools/config"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
var (
|
||||
DbType string
|
||||
Host string
|
||||
Port int
|
||||
Name string
|
||||
Username string
|
||||
Password string
|
||||
)
|
||||
|
||||
func (e *Mysql) Setup() {
|
||||
@@ -27,12 +16,12 @@ func (e *Mysql) Setup() {
|
||||
db = new(Mysql)
|
||||
orm.MysqlConn = db.GetConnect()
|
||||
log.Info(orm.MysqlConn)
|
||||
orm.Eloquent, err = db.Open(DbType, orm.MysqlConn)
|
||||
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.MysqlConn)
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", DbType, err)
|
||||
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", DbType)
|
||||
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
|
||||
}
|
||||
|
||||
if orm.Eloquent.Error != nil {
|
||||
@@ -50,25 +39,5 @@ func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
}
|
||||
|
||||
func (e *Mysql) GetConnect() string {
|
||||
|
||||
DbType = config.DatabaseConfig.Dbtype
|
||||
Host = config.DatabaseConfig.Host
|
||||
Port = config.DatabaseConfig.Port
|
||||
Name = config.DatabaseConfig.Name
|
||||
Username = config.DatabaseConfig.Username
|
||||
Password = config.DatabaseConfig.Password
|
||||
|
||||
var conn bytes.Buffer
|
||||
conn.WriteString(Username)
|
||||
conn.WriteString(":")
|
||||
conn.WriteString(Password)
|
||||
conn.WriteString("@tcp(")
|
||||
conn.WriteString(Host)
|
||||
conn.WriteString(":")
|
||||
conn.WriteString(strconv.Itoa(Port))
|
||||
conn.WriteString(")")
|
||||
conn.WriteString("/")
|
||||
conn.WriteString(Name)
|
||||
conn.WriteString("?charset=utf8&parseTime=True&loc=Local&timeout=1000ms")
|
||||
return conn.String()
|
||||
return config.DatabaseConfig.Mysql.MasterConn
|
||||
}
|
||||
+6
-5
@@ -5,6 +5,7 @@ import (
|
||||
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
type PgSql struct {
|
||||
@@ -17,7 +18,7 @@ func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
|
||||
func (e *PgSql) GetConnect() string {
|
||||
|
||||
return ""
|
||||
return config.DatabaseConfig.PgSql.MasterConn
|
||||
}
|
||||
|
||||
func (e *PgSql) Setup() {
|
||||
@@ -28,12 +29,12 @@ func (e *PgSql) Setup() {
|
||||
db = new(PgSql)
|
||||
orm.PgSqlConn = db.GetConnect()
|
||||
log.Info(orm.PgSqlConn)
|
||||
orm.Eloquent, err = db.Open(DbType, orm.PgSqlConn)
|
||||
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.PgSqlConn)
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", DbType, err)
|
||||
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", DbType)
|
||||
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
|
||||
}
|
||||
|
||||
if orm.Eloquent.Error != nil {
|
||||
@@ -41,4 +42,4 @@ func (e *PgSql) Setup() {
|
||||
}
|
||||
|
||||
orm.Eloquent.LogMode(true)
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -5,6 +5,7 @@ import (
|
||||
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go-admin/global/orm"
|
||||
"go-admin/tools/config"
|
||||
)
|
||||
|
||||
type SqLite struct {
|
||||
@@ -16,8 +17,7 @@ func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
}
|
||||
|
||||
func (e *SqLite) GetConnect() string {
|
||||
|
||||
return ""
|
||||
return config.DatabaseConfig.SqLite.MasterConn
|
||||
}
|
||||
|
||||
func (e *SqLite) Setup() {
|
||||
@@ -28,12 +28,12 @@ func (e *SqLite) Setup() {
|
||||
db = new(SqLite)
|
||||
orm.SqLiteConn = db.GetConnect()
|
||||
log.Info(orm.SqLiteConn)
|
||||
orm.Eloquent, err = db.Open(DbType, orm.SqLiteConn)
|
||||
orm.Eloquent, err = db.Open(config.DatabaseConfig.DbType, orm.SqLiteConn)
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", DbType, err)
|
||||
log.Fatalf("%s connect error %v", config.DatabaseConfig.DbType, err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", DbType)
|
||||
log.Printf("%s connect success!", config.DatabaseConfig.DbType)
|
||||
}
|
||||
|
||||
if orm.Eloquent.Error != nil {
|
||||
|
||||
Reference in new issue
Block a user