Merge pull request #309 from go-admin-team/dev

feat✨ 增加条件编译,修复windows下gcc依赖问题
This commit is contained in:
wenjianzhang authored and GitHub committed 2020-11-25 23:51:50 +08:00
commit 9d6e3598c0
4 files changed
+51 -46

No files matched your search

-19
View File
@@ -1,12 +1,6 @@
package middleware
import (
"database/sql"
"errors"
"gorm.io/driver/mysql"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
"gorm.io/gorm/schema"
@@ -18,19 +12,6 @@ import (
var WithContextDb = middleware.WithContextDb
func getGormFromDb(driver string, db *sql.DB, config *gorm.Config) (*gorm.DB, error) {
switch driver {
case "mysql":
return gorm.Open(mysql.New(mysql.Config{Conn: db}), config)
case "postgres":
return gorm.Open(postgres.New(postgres.Config{Conn: db}), config)
case "sqlite3":
return gorm.Open(sqlite.Open(global.Source), config)
default:
return nil, errors.New("not support this db driver")
}
}
func GetGormFromConfig(cfg config.Conf) map[string]*gorm.DB {
gormDB := make(map[string]*gorm.DB)
if cfg.GetSaas() {
+23
View File
@@ -0,0 +1,23 @@
// +build !sqlite3
package middleware
import (
"database/sql"
"errors"
"gorm.io/driver/mysql"
"gorm.io/driver/postgres"
"gorm.io/gorm"
)
func getGormFromDb(driver string, db *sql.DB, config *gorm.Config) (*gorm.DB, error) {
switch driver {
case "mysql":
return gorm.Open(mysql.New(mysql.Config{Conn: db}), config)
case "postgres":
return gorm.Open(postgres.New(postgres.Config{Conn: db}), config)
default:
return nil, errors.New("not support this db driver")
}
}
+28
View File
@@ -0,0 +1,28 @@
// +build sqlite3
package middleware
import (
"database/sql"
"errors"
"gorm.io/driver/mysql"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
"go-admin/common/global"
)
func getGormFromDb(driver string, db *sql.DB, config *gorm.Config) (*gorm.DB, error) {
switch driver {
case "mysql":
return gorm.Open(mysql.New(mysql.Config{Conn: db}), config)
case "postgres":
return gorm.Open(postgres.New(postgres.Config{Conn: db}), config)
case "sqlite3":
return gorm.Open(sqlite.Open(global.Source), config)
default:
return nil, errors.New("not support this db driver")
}
}
-27
View File
@@ -10,33 +10,6 @@ import (
"go-admin/common/log"
)
//func Setup() (*glog.Logger, *glog.Logger) {
// var Logger *glog.Logger
// var JobLogger *glog.Logger
// var RequestLogger *glog.Logger
//
// Logger = glog.New()
// _ = Logger.SetPath(config.LoggerConfig.Path + "/bus")
// Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS && config.LoggerConfig.Stdout)
// Logger.SetFile("bus-{Ymd}.log")
// _ = Logger.SetLevelStr(config.LoggerConfig.Level)
//
// JobLogger = glog.New()
// _ = JobLogger.SetPath(config.LoggerConfig.Path + "/job")
// JobLogger.SetStdoutPrint(false)
// JobLogger.SetFile("db-{Ymd}.log")
// _ = JobLogger.SetLevelStr(config.LoggerConfig.Level)
//
// RequestLogger = glog.New()
// _ = RequestLogger.SetPath(config.LoggerConfig.Path + "/request")
// RequestLogger.SetStdoutPrint(false)
// RequestLogger.SetFile("access-{Ymd}.log")
// _ = RequestLogger.SetLevelStr(config.LoggerConfig.Level)
//
// Logger.Info(tools.Green("Logger init success!"))
// return Logger, JobLogger
//}
// SetupLogger 日志
func SetupLogger(path string, subPath string) logger.Logger {
var setLogger logger.Logger