优化日志及config

db/hotimedb.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/sirupsen/logrus"
 	"os"
 	"reflect"
 	"sort"
@@ -19,6 +20,7 @@ type HoTimeDB struct {
 	ContextBase
 	DBName string
 	*cache.HoTimeCache
+	Log         *logrus.Logger
 	Type        string
 	Prefix      string
 	LastQuery   string
@@ -28,6 +30,7 @@ type HoTimeDB struct {
 	limit       Slice
 	*sql.Tx     //事务对象
 	SlaveDB     *sql.DB
+	Mode        int //mode为0生产模式,1、为测试模式、2为开发模式
 }
 
 // SetConnect 设置数据库配置连接
@@ -306,7 +309,11 @@ func (that *HoTimeDB) md5(query string, args ...interface{}) string {
 }
 
 func (that *HoTimeDB) Query(query string, args ...interface{}) []Map {
-
+	defer func() {
+		if that.Mode == 2 {
+			that.Log.Info("SQL:"+that.LastQuery, " DATA:", that.LastData, " ERROR:", that.LastErr.GetError())
+		}
+	}()
 	//fmt.Println(query)
 	var err error
 	var resl *sql.Rows
@@ -348,7 +355,11 @@ func (that *HoTimeDB) Query(query string, args ...interface{}) []Map {
 }
 
 func (that *HoTimeDB) Exec(query string, args ...interface{}) (sql.Result, *Error) {
-
+	defer func() {
+		if that.Mode == 2 {
+			that.Log.Info("SQL: "+that.LastQuery, " DATA: ", that.LastData, " ERROR: ", that.LastErr.GetError())
+		}
+	}()
 	that.LastQuery = query
 	that.LastData = args
 	var e error
@@ -480,7 +491,7 @@ func (that *HoTimeDB) Select(table string, qu ...interface{}) []Map {
 
 	temp, resWhere := that.where(where)
 
-	query += temp
+	query += temp + ";"
 	qs = append(qs, resWhere...)
 	md5 := that.md5(query, qs...)
 
@@ -982,7 +993,7 @@ func (that *HoTimeDB) Update(table string, data Map, where Map) int64 {
 	temp, resWhere := that.where(where)
 	//fmt.Println(resWhere)
 
-	query += temp
+	query += temp + ";"
 	qs = append(qs, resWhere...)
 
 	res, err := that.Exec(query, qs...)
@@ -1007,7 +1018,7 @@ func (that *HoTimeDB) Delete(table string, data map[string]interface{}) int64 {
 	query := "DELETE FROM " + that.Prefix + table + " "
 
 	temp, resWhere := that.where(data)
-	query += temp
+	query += temp + ";"
 
 	res, err := that.Exec(query, resWhere...)
 	rows := int64(0)