diff --git a/dsSso/Dao/DaoCache/DaoCache.go b/dsSso/Dao/DaoCache/DaoCache.go index 0957d452..a213c7d2 100644 --- a/dsSso/Dao/DaoCache/DaoCache.go +++ b/dsSso/Dao/DaoCache/DaoCache.go @@ -50,7 +50,7 @@ func fromDb(ids []string, m Model.Selector) []map[string]interface{} { if len(idsStr) > 0 { idsStr = idsStr[1:] } - results, err := DbUtil.Engine.SQL(`select * from `+tableName+` where find_in_set(`+pkField+`,?)`, idsStr).Query().List() + results, err := db.SQL(`select * from `+tableName+` where find_in_set(`+pkField+`,?)`, idsStr).Query().List() if err != nil { LogUtil.Error(ErrorConst.SqlQueryError, "从数据库中读取数据失败:"+err.Error()) } diff --git a/dsSso/Model/Selector.go b/dsSso/Model/Selector.go index 6a25924f..905ea475 100644 --- a/dsSso/Model/Selector.go +++ b/dsSso/Model/Selector.go @@ -9,6 +9,7 @@ import ( "time" ) +var db=DbUtil.Engine /** 功能:用于将interface转为struct的结构体 作者:黄海 @@ -45,7 +46,7 @@ func GetTablePk(tableName string) (bool, string) { pk, err := RedisUtil.GET(key) if err != nil { sql := "select column_name from information_schema.`key_column_usage` where table_name=? and constraint_name='primary'" - list, err := DbUtil.Engine.SQL(sql, tableName).Query().List() + list, err := db.SQL(sql, tableName).Query().List() if err != nil || len(list) == 0 { LogUtil.Error(ErrorConst.SqlQueryError, err.Error()) return false, "" diff --git a/dsSso/Test/PinYin_test.go b/dsSso/Test/PinYin_test.go deleted file mode 100644 index cfe7640d..00000000 --- a/dsSso/Test/PinYin_test.go +++ /dev/null @@ -1,8 +0,0 @@ -package main - -// go get github.com/Chain-zhang/PinYinUtil - -func main(){ - - -} diff --git a/dsSso/Test/XormPlus_test.go b/dsSso/Test/XormPlus_test.go deleted file mode 100644 index 95cbc3a0..00000000 --- a/dsSso/Test/XormPlus_test.go +++ /dev/null @@ -1,82 +0,0 @@ -package main - -/* -go get github.com/go-xorm/cmd/xorm -go get github.com/go-xorm/xorm - -# 注意模板的路径问题,否则无法生成文件 -cd C:\Users\Administrator\go\pkg\mod\github.com\go-xorm\cmd\xorm@v0.0.0-20190426080617-f87981e709a1 -xorm reverse mysql base:dsideal4r5t6y7u@(10.10.6.200:22066)/base_db?charset=utf8 templates/goxorm E:\Work\dsSso\Model - -文档不要看“看云”的,太老了,要看: -https://github.com/xormplus/xorm -*/ -import ( - "dsSso/Model" - "dsSso/Utils/DbUtil" - "fmt" - "github.com/oklog/ulid" - "github.com/rs/xid" - "math/rand" - "strings" - "testing" - "time" -) - -func TestOrmInsert(t *testing.T) { - //1、测试插入 - app := new(Model.TJoinApp) - - ak := xid.New() - app.AppKey = ak.String() - - t2 := time.Now().UTC() - entropy := rand.New(rand.NewSource(t2.UnixNano())) - sk := ulid.MustNew(ulid.Timestamp(t2), entropy) - app.AppSecret = strings.ToLower(sk.String()) - - app.RedirectUri = "http://www.baidu.com" - app.AppName = "黄海测试orm" - app.LastUpdatedTime = time.Now() - affected, err := DbUtil.Engine.Insert(app) - - if err != nil { - fmt.Println(err) - } else { - fmt.Println(affected) - } -} - -func TestOrmUpdate(t *testing.T) { - app := Model.TJoinApp{AppName: "黄海没心"} - affected, err := DbUtil.Engine.Id(1).Cols("app_name").Update(&app) - if err != nil { - fmt.Println(err) - } else { - fmt.Println(affected) - } -} - -func TestOrmSelectSingle(t *testing.T) { - var app Model.TJoinApp - has, err := DbUtil.Engine.Where("app_id = ?", 1).Get(&app) - if err != nil { - fmt.Println(err) - } else { - if has { - fmt.Println(app.AppName, app.AppId, app.AppKey, app.AppSecret) - } else { - fmt.Println("没有找到!") - } - } -} - -func TestOrmSelectMulti(t *testing.T) { - var apps []Model.TJoinApp - err := DbUtil.Engine.Where("redirect_uri = ?", "http://www.baidu.com").And("app_id > 2").Desc("app_id").Limit(10, 0).Find(&apps) - if err != nil { - fmt.Println(err) - } else { - fmt.Println(apps) - } -}