diff --git a/app/admin/middleware/db.go b/app/admin/middleware/db.go index 1cf494d..03f509f 100644 --- a/app/admin/middleware/db.go +++ b/app/admin/middleware/db.go @@ -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() { diff --git a/app/admin/middleware/db_other.go b/app/admin/middleware/db_other.go new file mode 100644 index 0000000..d0eacbe --- /dev/null +++ b/app/admin/middleware/db_other.go @@ -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") + } +} diff --git a/app/admin/middleware/db_sqlite3.go b/app/admin/middleware/db_sqlite3.go new file mode 100644 index 0000000..f2e2bde --- /dev/null +++ b/app/admin/middleware/db_sqlite3.go @@ -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") + } +} diff --git a/pkg/logger/setup.go b/pkg/logger/setup.go index c1bd913..33990aa 100644 --- a/pkg/logger/setup.go +++ b/pkg/logger/setup.go @@ -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