From 2b92b100e37c84a282602d10e99f92b447fbc806 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Mon, 27 Jul 2020 22:33:00 +0800
Subject: [PATCH] feat : update log import

---
 database/mysql-drive.go    | 13 ++++++-------
 database/pgsql-driver.go   |  4 ++--
 database/sqlite3-driver.go |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/database/mysql-drive.go b/database/mysql-drive.go
index 8776816f..d007839f 100644
--- a/database/mysql-drive.go
+++ b/database/mysql-drive.go
@@ -3,8 +3,8 @@ package database
 import (
 	_ "github.com/go-sql-driver/mysql" //加载mysql
 	"github.com/jinzhu/gorm"
-	log "github.com/sirupsen/logrus"
 	"go-admin/global"
+	"go-admin/tools"
 	"go-admin/tools/config"
 )
 
@@ -17,20 +17,19 @@ func (e *Mysql) Setup() {
 
 	db = new(Mysql)
 	global.Source = db.GetConnect()
-	log.Info(global.Source)
+	global.Logger.Info(tools.Green(global.Source))
 	global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
 	if err != nil {
-		log.Fatalf("%s connect error %v", db.GetDriver(), err)
+		global.Logger.Error(tools.Red(db.GetDriver()+" connect error :"), err)
 	} else {
-		log.Printf("%s connect success!", db.GetDriver())
+		global.Logger.Info(tools.Green(db.GetDriver() + " connect success !"))
 	}
 
 	if global.Eloquent.Error != nil {
-		log.Fatalf("database error %v", global.Eloquent.Error)
+		global.Logger.Error(tools.Red(" database error :"), global.Eloquent.Error)
 	}
 
-	global.Eloquent.LogMode(config.DatabaseConfig.Logger.Enabled)
-	//global.Eloquent.SetLogger(global.DBLogger)
+	global.Eloquent.LogMode(config.LoggerConfig.EnabledDB)
 }
 
 // 打开数据库连接
diff --git a/database/pgsql-driver.go b/database/pgsql-driver.go
index 34094c6c..7dd3e4dd 100644
--- a/database/pgsql-driver.go
+++ b/database/pgsql-driver.go
@@ -3,9 +3,9 @@ package database
 import (
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/postgres"
-	log "github.com/sirupsen/logrus"
 	"go-admin/global"
 	"go-admin/tools/config"
+	"log"
 )
 
 type PgSql struct {
@@ -17,7 +17,7 @@ func (e *PgSql) Setup() {
 
 	db = new(PgSql)
 	global.Source = db.GetConnect()
-	log.Info(global.Source)
+	log.Println(global.Source)
 	global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
 	if err != nil {
 		log.Fatalf("%s connect error %v", db.GetDriver(), err)
diff --git a/database/sqlite3-driver.go b/database/sqlite3-driver.go
index e41266df..dd222778 100644
--- a/database/sqlite3-driver.go
+++ b/database/sqlite3-driver.go
@@ -5,7 +5,7 @@ package database
 import (
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
-	log "github.com/sirupsen/logrus"
+	"log"
 	"go-admin/global"
 	"go-admin/tools/config"
 )