gorm升级到v2版本
This commit is contained in:
1 parent
93cfe443d6
commit
60c7496f7b
56 files changed
+630
-477
No files matched your search
@@ -1,10 +1,10 @@
|
||||
package database
|
||||
|
||||
import "github.com/jinzhu/gorm"
|
||||
import "gorm.io/gorm"
|
||||
|
||||
type Database interface {
|
||||
Setup()
|
||||
Open(dbType string, conn string) (db *gorm.DB, err error)
|
||||
Open(conn string, cfg *gorm.Config) (db *gorm.DB, err error)
|
||||
GetConnect() string
|
||||
GetDriver() string
|
||||
}
|
||||
+25
-11
@@ -1,11 +1,17 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||
"github.com/jinzhu/gorm"
|
||||
"gorm.io/gorm/schema"
|
||||
"log"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"go-admin/global"
|
||||
"go-admin/tools"
|
||||
"go-admin/tools/config"
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
type Mysql struct {
|
||||
@@ -13,28 +19,36 @@ type Mysql struct {
|
||||
|
||||
func (e *Mysql) Setup() {
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(Mysql)
|
||||
global.Source = db.GetConnect()
|
||||
global.Source = e.GetConnect()
|
||||
global.Logger.Info(tools.Green(global.Source))
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
global.Eloquent, err = e.Open(e.GetConnect(), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
global.Logger.Fatal(tools.Red(db.GetDriver()+" connect error :"), err)
|
||||
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
|
||||
} else {
|
||||
global.Logger.Info(tools.Green(db.GetDriver() + " connect success !"))
|
||||
global.Logger.Info(tools.Green(e.GetDriver() + " connect success !"))
|
||||
}
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
global.Logger.Fatal(tools.Red(" database error :"), global.Eloquent.Error)
|
||||
}
|
||||
|
||||
global.Eloquent.LogMode(config.LoggerConfig.EnabledDB)
|
||||
if config.LoggerConfig.EnabledDB {
|
||||
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.Info,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
func (e *Mysql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
return gorm.Open(dbType, conn)
|
||||
func (e *Mysql) Open(conn string, cfg *gorm.Config) (db *gorm.DB, err error) {
|
||||
return gorm.Open(mysql.Open(conn), cfg)
|
||||
}
|
||||
|
||||
// 获取数据库连接
|
||||
|
||||
+25
-12
@@ -1,11 +1,16 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
_ "github.com/jinzhu/gorm/dialects/postgres"
|
||||
"gorm.io/gorm/logger"
|
||||
"gorm.io/gorm/schema"
|
||||
"log"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
"log"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type PgSql struct {
|
||||
@@ -13,28 +18,36 @@ type PgSql struct {
|
||||
|
||||
func (e *PgSql) Setup() {
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(PgSql)
|
||||
global.Source = db.GetConnect()
|
||||
global.Source = e.GetConnect()
|
||||
log.Println(global.Source)
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
global.Eloquent, err = e.Open(e.GetDriver(), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", db.GetDriver(), err)
|
||||
log.Fatalf("%s connect error %v", e.GetDriver(), err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", db.GetDriver())
|
||||
log.Printf("%s connect success!", e.GetDriver())
|
||||
}
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
global.Eloquent.LogMode(true)
|
||||
if config.LoggerConfig.EnabledDB {
|
||||
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.Info,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
func (*PgSql) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
eloquent, err := gorm.Open(dbType, conn)
|
||||
func (*PgSql) Open(conn string, cfg *gorm.Config) (db *gorm.DB, err error) {
|
||||
eloquent, err := gorm.Open(postgres.Open(conn), cfg)
|
||||
return eloquent, err
|
||||
}
|
||||
|
||||
|
||||
+26
-13
@@ -1,13 +1,18 @@
|
||||
// +build sqlite3
|
||||
// build sqlite3
|
||||
|
||||
package database
|
||||
|
||||
import (
|
||||
"github.com/jinzhu/gorm"
|
||||
_ "github.com/jinzhu/gorm/dialects/sqlite"
|
||||
"gorm.io/gorm/schema"
|
||||
"log"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"go-admin/global"
|
||||
"go-admin/tools/config"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
type SqLite struct {
|
||||
@@ -15,29 +20,37 @@ type SqLite struct {
|
||||
|
||||
func (e *SqLite) Setup() {
|
||||
var err error
|
||||
var db Database
|
||||
|
||||
db = new(SqLite)
|
||||
global.Source = db.GetConnect()
|
||||
log.Info(global.Source)
|
||||
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
|
||||
global.Source = e.GetConnect()
|
||||
log.Println(global.Source)
|
||||
global.Eloquent, err = e.Open(e.GetDriver(), &gorm.Config{
|
||||
NamingStrategy: schema.NamingStrategy{
|
||||
SingularTable: true,
|
||||
},
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("%s connect error %v", db.GetDriver(), err)
|
||||
log.Fatalf("%s connect error %v", e.GetDriver(), err)
|
||||
} else {
|
||||
log.Printf("%s connect success!", db.GetDriver())
|
||||
log.Printf("%s connect success!", e.GetDriver())
|
||||
}
|
||||
|
||||
if global.Eloquent.Error != nil {
|
||||
log.Fatalf("database error %v", global.Eloquent.Error)
|
||||
}
|
||||
|
||||
global.Eloquent.LogMode(true)
|
||||
if config.LoggerConfig.EnabledDB {
|
||||
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
|
||||
SlowThreshold: time.Second,
|
||||
Colorful: true,
|
||||
LogLevel: logger.Info,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// 打开数据库连接
|
||||
func (*SqLite) Open(dbType string, conn string) (db *gorm.DB, err error) {
|
||||
eloquent, err := gorm.Open(dbType, conn)
|
||||
func (*SqLite) Open(conn string, cfg *gorm.Config) (db *gorm.DB, err error) {
|
||||
eloquent, err := gorm.Open(sqlite.Open(conn), cfg)
|
||||
return eloquent, err
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user