Merge branch 'dev' into master

This commit is contained in:
wenjianzhang authored and GitHub committed 2020-04-18 10:41:25 +08:00
commit d61a9f6bc0
71 files changed
+795 -555

No files matched your search

+43 -30
View File
@@ -2,70 +2,83 @@ package database
import (
"bytes"
"fmt"
_ "github.com/go-sql-driver/mysql" //加载mysql
"github.com/jinzhu/gorm"
config2 "go-admin/config"
"log"
"strconv"
)
var Eloquent *gorm.DB
func init() {
var (
DbType string
Host string
Port int
Name string
Username string
Password string
)
dbType := config2.DatabaseConfig.Dbtype
host := config2.DatabaseConfig.Host
port := config2.DatabaseConfig.Port
database := config2.DatabaseConfig.Database
username := config2.DatabaseConfig.Username
password := config2.DatabaseConfig.Password
func Setup() {
if dbType != "mysql" && dbType != "sqlite3" {
fmt.Println("db type unknow")
DbType = config.DatabaseConfig.Dbtype
Host = config.DatabaseConfig.Host
Port = config.DatabaseConfig.Port
Name = config.DatabaseConfig.Name
Username = config.DatabaseConfig.Username
Password = config.DatabaseConfig.Password
if DbType != "mysql" && DbType != "sqlite3" {
log.Println("db type unknow")
}
var err error
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(database)
conn.WriteString("?charset=utf8&parseTime=True&loc=Local&timeout=1000ms")
conn := GetMysqlConnect()
log.Println(conn.String())
log.Println(conn)
var db Database
if dbType == "mysql" {
if DbType == "mysql" {
db = new(Mysql)
Eloquent, err = db.Open(DbType, conn)
Eloquent, err = db.Open(dbType, conn.String())
} else if dbType == "sqlite3" {
} else if DbType == "sqlite3" {
db = new(SqlLite)
Eloquent, err = db.Open(dbType, host)
Eloquent, err = db.Open(DbType, Host)
} else {
panic("db type unknow")
}
Eloquent.LogMode(true)
if err != nil {
log.Fatalln("%s connect error %v", dbType, err)
} else {
log.Println("%s connect success!", dbType)
}
log.Println("%s connect success!", DbType)
if Eloquent.Error != nil {
log.Fatalln("database error %v", Eloquent.Error)
}
Eloquent.LogMode(true)
}
func GetMysqlConnect() string {
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()
}
type Database interface {