diff --git a/core/comms/db.go b/core/comms/db.go index f0e18c1..db81a1f 100644 --- a/core/comms/db.go +++ b/core/comms/db.go @@ -2,6 +2,7 @@ package comms import ( "context" + _ "github.com/go-sql-driver/mysql" gocloud "github.com/mgr9525/go-cloud" "github.com/qiniu/qmgo" @@ -36,6 +37,7 @@ func InitXorm(key string, pdb **gocloud.DBHelper) error { if err != nil { return err } + db.ShowSQL(true) /*err = db.RegisterSqlTemplate(xorm.Pongo2("./../sqltpls", ".stpl")) if err != nil { diff --git a/core/comms/xorms.go b/core/comms/xorms.go index db2059c..aa18ab1 100644 --- a/core/comms/xorms.go +++ b/core/comms/xorms.go @@ -1,20 +1,20 @@ package comms import ( - gocloud "github.com/mgr9525/go-cloud" "github.com/sirupsen/logrus" + "xorm.io/xorm" ) // columns 第一个参数为where条件,(可选:第二个参数为表结构体或名称,第三个参数为单独获取的列名) func XormOne(id, data interface{}, columns ...interface{}) bool { - return XormOneDb(DbSysHelper, id, data, columns...) + ses := DbSysHelper.GetDB().NewSession() + defer ses.Close() + return XormOneDb(ses, id, data, columns...) } -func XormOneDb(db *gocloud.DBHelper, id, data interface{}, columns ...interface{}) bool { +func XormOneDb(ses *xorm.Session, id, data interface{}, columns ...interface{}) bool { if id == nil { return false } - ses := db.GetDB().NewSession() - defer ses.Close() col := "id" if len(columns) > 0 {