diff --git a/data/view/genfunc/genfunc_test.go b/data/view/genfunc/genfunc_test.go index c8ef238..93c9ddb 100644 --- a/data/view/genfunc/genfunc_test.go +++ b/data/view/genfunc/genfunc_test.go @@ -6,6 +6,7 @@ import ( "time" "github.com/xxjwxc/gormt/data/view/genfunc/model" + "github.com/xxjwxc/public/mysqldb" "gorm.io/gorm" "gorm.io/driver/mysql" @@ -73,14 +74,14 @@ func TestFuncGet(t *testing.T) { // TestFuncOption 功能选项方式获取 func TestFuncOption(t *testing.T) { - db := GetGorm("root:qwer@tcp(127.0.0.1:3306)/matrix?charset=utf8&parseTime=True&loc=Local&interpolateParams=True") - defer func() { - sqldb, _ := db.DB() - sqldb.Close() - }() - // orm := mysqldb.OnInitDBOrm("root:qwer@tcp(127.0.0.1:3306)/matrix?charset=utf8&parseTime=True&loc=Local&interpolateParams=True") // 推荐方式 - // defer orm.OnDestoryDB() - // db := orm.DB + // db := GetGorm("root:qwer@tcp(127.0.0.1:3306)/matrix?charset=utf8&parseTime=True&loc=Local&interpolateParams=True") + // defer func() { + // sqldb, _ := db.DB() + // sqldb.Close() + // }() + orm := mysqldb.OnInitDBOrm("root:123456@tcp(127.0.0.1:3306)/matrix?charset=utf8&parseTime=True&loc=Local&interpolateParams=True") // 推荐方式 + defer orm.OnDestoryDB() + db := orm.DB accountMgr := model.AccountMgr(db) accountMgr.SetIsRelated(true) // 打开预加载 (外键) diff --git a/go.mod b/go.mod index a3f5e87..3eace85 100644 --- a/go.mod +++ b/go.mod @@ -11,13 +11,13 @@ require ( github.com/mattn/go-sqlite3 v2.0.1+incompatible github.com/nicksnyder/go-i18n/v2 v2.0.3 github.com/spf13/cobra v1.0.0 - github.com/xxjwxc/public v0.0.0-20200605161710-72fc28675475 + github.com/xxjwxc/public v0.0.0-20200928064309-56390a763e14 golang.org/x/text v0.3.2 gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/validator.v9 v9.30.2 gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2 gorm.io/driver/mysql v1.0.1 - gorm.io/gorm v1.20.1 + gorm.io/gorm v1.20.2 ) // replace github.com/xxjwxc/public => ../public diff --git a/go.sum b/go.sum index cb376c6..226be90 100644 --- a/go.sum +++ b/go.sum @@ -210,6 +210,8 @@ github.com/xxjwxc/public v0.0.0-20200604090416-5afd146414d5/go.mod h1:0BFWVHqt7n github.com/xxjwxc/public v0.0.0-20200605161710-72fc28675475 h1:VDny2T9+fQwq9WZkwrnD7hfANzX5lUOx53l31NPA9T8= github.com/xxjwxc/public v0.0.0-20200605161710-72fc28675475/go.mod h1:0BFWVHqt7nKW8MtIx7R7bOkoGQFFnKsaJeeVbkzY88E= github.com/xxjwxc/public v0.0.0-20200921104903-7ca9b2863090 h1:cmzvPQvZ94OAA6SY2JWvFr8BKJxFd6pa/TEC7ZZkATs= +github.com/xxjwxc/public v0.0.0-20200928064309-56390a763e14 h1:oOHZrCjoj9pL+EBiQlgpB1E0+WsbhSxwY9HUSsAZMGw= +github.com/xxjwxc/public v0.0.0-20200928064309-56390a763e14/go.mod h1:E8+hfDT+dh3uoJ40kWqTcvnpDv1DJIMTFySzPZd8rTs= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= @@ -316,6 +318,8 @@ gorm.io/driver/mysql v1.0.1/go.mod h1:KtqSthtg55lFp3S5kUXqlGaelnWpKitn4k1xZTnoiP gorm.io/gorm v1.9.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.20.1 h1:+hOwlHDqvqmBIMflemMVPLJH7tZYK4RxFDBHEfJTup0= gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.20.2 h1:bZzSEnq7NDGsrd+n3evOOedDrY5oLM5QPlCjZJUK2ro= +gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=