v1.16.9

fix response close of package gclient (#1884 )
v1.16.8
2026-06-10 19:31:44 +08:00 · 2022-05-30 15:49:24 +08:00 · 2022-05-30 15:44:52 +08:00 · 2022-04-28 20:22:22 +08:00 · 2022-04-28 20:17:29 +08:00 · 2022-04-26 14:10:25 +08:00
1183 changed files with 15784 additions and 25052 deletions
--- a/.example/container/garray/basic_array.go
+++ b/.example/container/garray/basic_array.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/container/garray"
 )

 func main() {
--- a/.example/container/garray/json_marshal.go
+++ b/.example/container/garray/json_marshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/container/garray"
 )

 func main() {
--- a/.example/container/garray/json_unmarshal.go
+++ b/.example/container/garray/json_unmarshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/container/garray"
 )

 func main() {
--- a/.example/container/garray/sorted_array_basic.go
+++ b/.example/container/garray/sorted_array_basic.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/container/garray"
 )

 func main() {
--- a/.example/container/garray/sorted_string_array.go
+++ b/.example/container/garray/sorted_string_array.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/container/garray"
 )

 func main() {
--- a/.example/container/glist/basic.go
+++ b/.example/container/glist/basic.go
@ -2,7 +2,7 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/container/glist"
+	"github.com/gogf/gf/container/glist"
 )

 func main() {
--- a/.example/container/glist/json_marshal.go
+++ b/.example/container/glist/json_marshal.go
@ -3,8 +3,8 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/glist"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/container/glist"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/container/glist/json_unmarshal.go
+++ b/.example/container/glist/json_unmarshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/glist"
+	"github.com/gogf/gf/container/glist"
 )

 func main() {
--- a/.example/container/gmap/basic.go
+++ b/.example/container/gmap/basic.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/container/gmap"
 )

 func main() {
--- a/.example/container/gmap/gmap_json_marshal.go
+++ b/.example/container/gmap/gmap_json_marshal.go
@ -3,9 +3,9 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"

-	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/container/gmap"
 )

 func main() {
--- a/.example/container/gmap/gmap_json_unmarshal.go
+++ b/.example/container/gmap/gmap_json_unmarshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/container/gmap"
 )

 func main() {
--- a/.example/container/gmap/gmap_map_clone_safe.go
+++ b/.example/container/gmap/gmap_map_clone_safe.go
@ -1,8 +1,8 @@
 package main

 import (
-	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/container/gmap/gmap_maps.go
+++ b/.example/container/gmap/gmap_maps.go
@ -3,9 +3,9 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gutil"
 )

 func main() {
--- a/.example/container/gmap/gmap_treemap.go
+++ b/.example/container/gmap/gmap_treemap.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/util/gutil"
 )

 func main() {
--- a/.example/container/gpool/gpool.go
+++ b/.example/container/gpool/gpool.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"

-	"github.com/gogf/gf/v2/container/gpool"
+	"github.com/gogf/gf/container/gpool"
 )

 func main() {
--- a/.example/container/gpool/gpool_expirefunc.go
+++ b/.example/container/gpool/gpool_expirefunc.go
@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"

-	"github.com/gogf/gf/v2/container/gpool"
-	"github.com/gogf/gf/v2/net/gtcp"
-	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/container/gpool"
+	"github.com/gogf/gf/net/gtcp"
+	"github.com/gogf/gf/os/glog"
 )

 func main() {
@ -14,7 +14,7 @@ func main() {
 	p := gpool.New(3000*time.Millisecond, func() (interface{}, error) {
 		return gtcp.NewConn("www.baidu.com:80")
 	}, func(i interface{}) {
-		glog.Print("expired")
+		glog.Println("expired")
 		i.(*gtcp.Conn).Close()
 	})
 	conn, err := p.Get()
--- a/.example/container/gqueue/gqueue.go
+++ b/.example/container/gqueue/gqueue.go
@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"

-	"github.com/gogf/gf/v2/container/gqueue"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/os/gtimer"
+	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/os/gtimer"
 )

 func main() {
--- a/.example/container/gqueue/gqueue2.go
+++ b/.example/container/gqueue/gqueue2.go
@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"

-	"github.com/gogf/gf/v2/container/gqueue"
-	"github.com/gogf/gf/v2/os/gtimer"
+	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/os/gtimer"
 )

 func main() {
--- a/.example/container/gqueue/gqueue3.go
+++ b/.example/container/gqueue/gqueue3.go
@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"

-	"github.com/gogf/gf/v2/container/gqueue"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/os/gtimer"
+	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/os/gtimer"
 )

 func main() {
--- a/.example/container/gring/gring.go
+++ b/.example/container/gring/gring.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gring"
+	"github.com/gogf/gf/container/gring"
 )

 func main() {
--- a/.example/container/gring/gring_josephus.go
+++ b/.example/container/gring/gring_josephus.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gring"
+	"github.com/gogf/gf/container/gring"
 )

 type Player struct {
--- a/.example/container/gset/gset1.go
+++ b/.example/container/gset/gset1.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gset"
+	"github.com/gogf/gf/container/gset"
 )

 func main() {
--- a/.example/container/gset/gset2.go
+++ b/.example/container/gset/gset2.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/container/gset"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/container/gset/json_marshal.go
+++ b/.example/container/gset/json_marshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/gset"
+	"github.com/gogf/gf/container/gset"
 )

 func main() {
--- a/.example/container/gset/json_unmarshal.go
+++ b/.example/container/gset/json_unmarshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/gset"
+	"github.com/gogf/gf/container/gset"
 )

 func main() {
--- a/.example/container/gtree/gtree_avltree.go
+++ b/.example/container/gtree/gtree_avltree.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gtree"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/util/gutil"
 )

 func main() {
--- a/.example/container/gtree/gtree_btree.go
+++ b/.example/container/gtree/gtree_btree.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gtree"
+	"github.com/gogf/gf/container/gtree"
 )

 func main() {
--- a/.example/container/gtree/gtree_redblackmap.go
+++ b/.example/container/gtree/gtree_redblackmap.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gtree"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/util/gutil"
 )

 func main() {
--- a/.example/container/gtree/gtree_redblacktree.go
+++ b/.example/container/gtree/gtree_redblacktree.go
@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/gogf/gf/v2/container/gtree"
+	"github.com/gogf/gf/container/gtree"
 )

 func main() {
--- a/.example/container/gtype/gtype_int.go
+++ b/.example/container/gtype/gtype_int.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/container/gtype"
+	"github.com/gogf/gf/container/gtype"
 )

 func main() {
--- a/.example/container/gtype/json_marshal.go
+++ b/.example/container/gtype/json_marshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/gtype"
+	"github.com/gogf/gf/container/gtype"
 )

 func main() {
--- a/.example/container/gtype/json_unmarshal.go
+++ b/.example/container/gtype/json_unmarshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/container/gtype"
+	"github.com/gogf/gf/container/gtype"
 )

 func main() {
--- a/.example/container/gvar/json_marshal.go
+++ b/.example/container/gvar/json_marshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/container/gvar/json_unmarshal.go
+++ b/.example/container/gvar/json_unmarshal.go
@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/container/gvar/var.go
+++ b/.example/container/gvar/var.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/database/gdb/driver/driver/driver.go
+++ b/.example/database/gdb/driver/driver/driver.go
@ -3,8 +3,8 @@ package driver
 import (
 	"context"
 	"database/sql"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/os/gtime"
 )

 // MyDriver is a custom database driver, which is used for testing only.
--- a/.example/database/gdb/mssql/gdb_all.go
+++ b/.example/database/gdb/mssql/gdb_all.go
@ -2,22 +2,22 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/os/gtime"

-	//_ "github.com/denisenkom/go-mssqldb"
-	"github.com/gogf/gf/v2/frame/g"
+	_ "github.com/denisenkom/go-mssqldb"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	type Table2 struct {
 		Id         string     `orm:"id;pr" json:"id"`              //ID
-		CreateTime gtime.Time `orm:"createtime" json:"createtime"` //创建时间
-		UpdateTime gtime.Time `orm:"updatetime" json:"updatetime"` //更新时间
+		Createtime gtime.Time `orm:"createtime" json:"createtime"` //创建时间
+		Updatetime gtime.Time `orm:"updatetime" json:"updatetime"` //更新时间
 	}
 	var table2 Table2
-	err := g.DB().Model("table2").Where("id", 1).Scan(&table2)
+	err := g.DB().Table("table2").Where("id=?", 1).Struct(&table2)
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(table2.CreateTime)
+	fmt.Println(table2.Createtime)
 }
--- a/.example/database/gdb/mssql/gdb_sqlserver.go
+++ b/.example/database/gdb/mssql/gdb_sqlserver.go
@ -5,8 +5,8 @@ import (
 	"time"

 	//_ "github.com/denisenkom/go-mssqldb"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 )

 // 本文件用于gf框架的mssql数据库操作示例，不作为单元测试使用
--- a/.example/database/gdb/mysql/config.toml
+++ b/.example/database/gdb/mysql/config.toml
@ -4,7 +4,7 @@
    [database.logger]
        Level   = "all"
        Stdout  = true
-        CtxKeys = ["RequestId"]
+        CtxKeys = ["Trace-Id"]
    [database.default]
        link   = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
        debug  = true
--- a/.example/database/gdb/mysql/config/gdb.go
+++ b/.example/database/gdb/mysql/config/gdb.go
@ -1,8 +1,7 @@
 package main

 import (
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/database/gdb"
 	"sync"
 	"time"
 )
@ -25,16 +24,13 @@ func init() {
 }

 func main() {
-	var (
-		wg  = sync.WaitGroup{}
-		ctx = gctx.New()
-	)
+	wg := sync.WaitGroup{}
 	for i := 0; i < 100000; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
 			time.Sleep(10 * time.Second)
-			db.Ctx(ctx).Model("user").Where("id=1").All()
+			db.Table("user").Where("id=1").All()
 		}()
 	}
 	wg.Wait()
--- a/.example/database/gdb/mysql/gdb_all.go
+++ b/.example/database/gdb/mysql/gdb_all.go
@ -2,23 +2,27 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()
 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)

-	r, e := db.Ctx(ctx).GetAll("SELECT * from `user` where id in(?)", g.Slice{})
+	r, e := db.GetAll("SELECT * from `user` where id in(?)", g.Slice{})
 	if e != nil {
 		fmt.Println(e)
 	}
 	if r != nil {
 		fmt.Println(r)
 	}
+	return
+	//r, e := db.Table("user").Where("id in(?)", g.Slice{}).All()
+	//if e != nil {
+	//	fmt.Println(e)
+	//}
+	//if r != nil {
+	//	fmt.Println(r.List())
+	//}
 }
--- a/.example/database/gdb/mysql/gdb_args_slice.go
+++ b/.example/database/gdb/mysql/gdb_args_slice.go
@ -1,19 +1,13 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()

-	db.Ctx(ctx).Model("user").
-		Where("nickname like ? and passport like ?", g.Slice{"T3", "t3"}).
-		OrderAsc("id").All()
+	db.Table("user").Where("nickname like ? and passport like ?", g.Slice{"T3", "t3"}).OrderBy("id asc").All()

 	conditions := g.Map{
 		"nickname like ?":    "%T%",
@ -22,8 +16,8 @@ func main() {
 		"create_time > ?":    0,
 		"id in(?)":           g.Slice{1, 2, 3},
 	}
-	db.Ctx(ctx).Model("user").Where(conditions).OrderAsc("id").All()
+	db.Table("user").Where(conditions).OrderBy("id asc").All()

 	var params []interface{}
-	db.Ctx(ctx).Model("user").Where("1=1", params).OrderAsc("id").All()
+	db.Table("user").Where("1=1", params).OrderBy("id asc").All()
 }
--- a/.example/database/gdb/mysql/gdb_batch_insert.go
+++ b/.example/database/gdb/mysql/gdb_batch_insert.go
@ -2,15 +2,11 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()
 	db.SetDebug(true)
 	list := make(g.List, 0)
 	for i := 0; i < 100; i++ {
@ -18,7 +14,7 @@ func main() {
 			"name": fmt.Sprintf(`name_%d`, i),
 		})
 	}
-	r, e := db.Ctx(ctx).Model("user").Data(list).Batch(2).Insert()
+	r, e := db.Table("user").Data(list).Batch(2).Insert()
 	if e != nil {
 		panic(e)
 	}
--- a/.example/database/gdb/mysql/gdb_binary.go
+++ b/.example/database/gdb/mysql/gdb_binary.go
@ -2,11 +2,10 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/os/gctx"

-	"github.com/gogf/gf/v2/crypto/gaes"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/crypto/gaes"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
@ -20,9 +19,6 @@ func main() {
 		Role:    "master",
 		Charset: "utf8",
 	})
-	var (
-		ctx = gctx.New()
-	)
 	db, err := gdb.New()
 	if err != nil {
 		panic(err)
@ -37,7 +33,7 @@ func main() {
 	}

 	// 写入
-	r, err := db.Ctx(ctx).Model("user").Data(g.Map{
+	r, err := db.Table("user").Data(g.Map{
 		"uid":  1,
 		"name": encryptedName,
 	}).Save()
@ -47,9 +43,9 @@ func main() {
 	fmt.Println(r.RowsAffected())

 	// 查询
-	one, err := db.Ctx(ctx).Model("user").Where("name=?", encryptedName).One()
+	one, err := db.Table("user").Where("name=?", encryptedName).One()
 	if err != nil {
 		fmt.Println(err)
 	}
-	fmt.Println(one.Map())
+	fmt.Println(one.ToMap())
 }
--- a/.example/database/gdb/mysql/gdb_bit.go
+++ b/.example/database/gdb/mysql/gdb_bit.go
@ -2,23 +2,19 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/os/gctx"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()
 	db.SetDebug(true)

-	r, e := db.Ctx(ctx).Model("test").All()
+	r, e := db.Table("test").All()
 	if e != nil {
 		panic(e)
 	}
 	if r != nil {
-		fmt.Println(r.List())
+		fmt.Println(r.ToList())
 	}
 }
--- a/.example/database/gdb/mysql/gdb_cache.go
+++ b/.example/database/gdb/mysql/gdb_cache.go
@ -1,9 +1,8 @@
 package main

 import (
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/util/gutil"
 	"time"
 )

@ -18,9 +17,6 @@ func main() {
 		Role:    "master",
 		Charset: "utf8",
 	})
-	var (
-		ctx = gctx.New()
-	)
 	db, err := gdb.New()
 	if err != nil {
 		panic(err)
@ -31,7 +27,7 @@ func main() {

 	// 执行2次查询并将查询结果缓存3秒，并可执行缓存名称(可选)
 	for i := 0; i < 3; i++ {
-		r, _ := db.Ctx(ctx).Model("user").Cache(3000*time.Second).Where("id=?", 1).One()
+		r, _ := db.Table("user").Cache(3000*time.Second).Where("id=?", 1).One()
 		gutil.Dump(r.Map())
 	}

--- a/.example/database/gdb/mysql/gdb_complecated.go
+++ b/.example/database/gdb/mysql/gdb_complecated.go
@ -1,12 +1,12 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	// error!
-	r, err := g.DB().Model("user").Where(g.Map{
+	r, err := g.DB().Table("user").Where(g.Map{
 		"or": g.Map{
 			"nickname":       "jim",
 			"create_time > ": "2019-10-01",
--- a/.example/database/gdb/mysql/gdb_config.go
+++ b/.example/database/gdb/mysql/gdb_config.go
@ -3,11 +3,11 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	if r, err := g.DB().Model("user").Where("uid=?", 1).One(); err == nil {
+	if r, err := g.DB().Table("user").Where("uid=?", 1).One(); err == nil {
 		fmt.Println(r["uid"].Int())
 		fmt.Println(r["name"].String())
 	} else {
--- a/.example/database/gdb/mysql/gdb_config2.go
+++ b/.example/database/gdb/mysql/gdb_config2.go
@ -3,12 +3,12 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	g.Config().SetFileName("config2.toml")
-	if r, err := g.DB().Model("user").Where("uid=?", 1).One(); err == nil {
+	if r, err := g.DB().Table("user").Where("uid=?", 1).One(); err == nil {
 		fmt.Println(r["uid"].Int())
 		fmt.Println(r["name"].String())
 	} else {
--- a/.example/database/gdb/mysql/gdb_config3.go
+++ b/.example/database/gdb/mysql/gdb_config3.go
@ -3,19 +3,19 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	g.Config().SetFileName("config3.toml")
-	if r, err := g.DB().Model("user").Where("uid=?", 1).One(); err == nil {
+	if r, err := g.DB().Table("user").Where("uid=?", 1).One(); err == nil {
 		fmt.Println(r["uid"].Int())
 		fmt.Println(r["name"].String())
 	} else {
 		fmt.Println(err)
 	}

-	if r, err := g.DB("user").Model("user").Where("uid=?", 1).One(); err == nil {
+	if r, err := g.DB("user").Table("user").Where("uid=?", 1).One(); err == nil {
 		fmt.Println(r["uid"].Int())
 		fmt.Println(r["name"].String())
 	} else {
--- a/.example/database/gdb/mysql/gdb_ctx.go
+++ b/.example/database/gdb/mysql/gdb_ctx.go
@ -2,11 +2,11 @@ package main

 import (
 	"context"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	ctx := context.WithValue(context.Background(), "RequestId", "123456789")
+	ctx := context.WithValue(context.Background(), "Trace-Id", "123456789")
 	_, err := g.DB().Ctx(ctx).Query("SELECT 1")
 	if err != nil {
 		panic(err)
--- a/.example/database/gdb/mysql/gdb_ctx_model.go
+++ b/.example/database/gdb/mysql/gdb_ctx_model.go
@ -2,11 +2,11 @@ package main

 import (
 	"context"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	ctx := context.WithValue(context.Background(), "RequestId", "123456789")
+	ctx := context.WithValue(context.Background(), "Trace-Id", "123456789")
 	_, err := g.DB().Model("user").Ctx(ctx).All()
 	if err != nil {
 		panic(err)
--- a/.example/database/gdb/mysql/gdb_datetime.go
+++ b/.example/database/gdb/mysql/gdb_datetime.go
@ -2,20 +2,23 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/os/gctx"

-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gtime"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.Database()
 	db.SetDebug(true)

-	r, err := db.Ctx(ctx).Model("user").Data(g.Map{
+	//r, err := db.Table("user").Data("create_time", gtime.Now().String()).Insert()
+	//if err == nil {
+	//    fmt.Println(r.LastInsertId())
+	//} else {
+	//    panic(err)
+	//}
+
+	r, err := db.Table("user").Data(g.Map{
 		"name":        "john",
 		"create_time": gtime.Now().String(),
 	}).Insert()
--- a/.example/database/gdb/mysql/gdb_debug1.go
+++ b/.example/database/gdb/mysql/gdb_debug1.go
@ -1,10 +1,9 @@
 package main

 import (
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/glog"
 )

 func main() {
@ -18,9 +17,6 @@ func main() {
 		Role:    "master",
 		Charset: "utf8",
 	})
-	var (
-		ctx = gctx.New()
-	)
 	db, err := gdb.New()
 	if err != nil {
 		panic(err)
@ -31,11 +27,11 @@ func main() {

 	// 执行3条SQL查询
 	for i := 1; i <= 3; i++ {
-		db.Ctx(ctx).Model("user").Where("uid=?", i).One()
+		db.Table("user").Where("uid=?", i).One()
 	}
 	// 构造一条错误查询
-	db.Model("user").Where("no_such_field=?", "just_test").One()
+	db.Table("user").Where("no_such_field=?", "just_test").One()

-	db.Ctx(ctx).Model("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()
+	db.Table("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()

 }
--- a/.example/database/gdb/mysql/gdb_debug2.go
+++ b/.example/database/gdb/mysql/gdb_debug2.go
@ -1,22 +1,18 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()

 	// 执行3条SQL查询
 	for i := 1; i <= 3; i++ {
-		db.Ctx(ctx).Model("user").Where("id=?", i).One()
+		db.Table("user").Where("id=?", i).One()
 	}
 	// 构造一条错误查询
-	db.Ctx(ctx).Model("user").Where("no_such_field=?", "just_test").One()
+	db.Table("user").Where("no_such_field=?", "just_test").One()

-	db.Ctx(ctx).Model("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()
+	db.Table("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()
 }
--- a/.example/database/gdb/mysql/gdb_distinct.go
+++ b/.example/database/gdb/mysql/gdb_distinct.go
@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/database/gdb/mysql/gdb_insert.go
+++ b/.example/database/gdb/mysql/gdb_insert.go
@ -2,8 +2,8 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
@ -18,7 +18,7 @@ func main() {

 	db.SetDebug(true)

-	r, e := db.Model("user").Data(g.Map{
+	r, e := db.Table("user").Data(g.Map{
 		"create_at": "now()",
 	}).Unscoped().Insert()
 	if e != nil {
--- a/.example/database/gdb/mysql/gdb_issue_278.go
+++ b/.example/database/gdb/mysql/gdb_issue_278.go
@ -3,12 +3,12 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 var (
 	tableName = "orders"
-	dao       = g.DB().Model(tableName).Safe()
+	dao       = g.DB().Table(tableName).Safe()
 )

 type OrderServiceEntity struct {
--- a/.example/database/gdb/mysql/gdb_json_xml.go
+++ b/.example/database/gdb/mysql/gdb_json_xml.go
@ -2,11 +2,10 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/os/gctx"

-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/encoding/gparser"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
@ -20,22 +19,19 @@ func main() {
 		Role:    "master",
 		Charset: "utf8",
 	})
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
-	one, err := db.Ctx(ctx).Model("user").Where("id=?", 1).One()
+	db := g.DB()
+	one, err := db.Table("user").Where("id=?", 1).One()
 	if err != nil {
 		panic(err)
 	}

 	// 使用内置方法转换为json/xml
-	fmt.Println(one.Json())
-	fmt.Println(one.Xml())
+	fmt.Println(one.ToJson())
+	fmt.Println(one.ToXml())

 	// 自定义方法方法转换为json/xml
-	jsonContent, _ := gjson.New(one.Map()).ToJson()
+	jsonContent, _ := gparser.VarToJson(one.ToMap())
 	fmt.Println(string(jsonContent))
-	xmlContent, _ := gjson.New(one.Map()).ToJson()
+	xmlContent, _ := gparser.VarToXml(one.ToMap())
 	fmt.Println(string(xmlContent))
 }
--- a/.example/database/gdb/mysql/gdb_pool.go
+++ b/.example/database/gdb/mysql/gdb_pool.go
@ -1,24 +1,20 @@
 package main

 import (
-	"github.com/gogf/gf/v2/os/gctx"
 	"time"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()

 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)

 	for {
 		for i := 0; i < 10; i++ {
-			go db.Ctx(ctx).Model("user").All()
+			go db.Table("user").All()
 		}
 		time.Sleep(time.Millisecond * 100)
 	}
--- a/.example/database/gdb/mysql/gdb_reconnect.go
+++ b/.example/database/gdb/mysql/gdb_reconnect.go
@ -2,19 +2,15 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 	"time"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()
 	db.SetDebug(true)
 	for {
-		r, err := db.Ctx(ctx).Model("user").All()
+		r, err := db.Table("user").All()
 		fmt.Println(err)
 		fmt.Println(r)
 		time.Sleep(time.Second * 10)
--- a/.example/database/gdb/mysql/gdb_struct.go
+++ b/.example/database/gdb/mysql/gdb_struct.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
@ -17,7 +17,7 @@ func main() {
 	}
 	user := (*User)(nil)
 	fmt.Println(user)
-	err := db.Model("test").Where("id=1").Scan(&user)
+	err := db.Table("test").Where("id=1").Struct(&user)
 	fmt.Println(err)
 	fmt.Println(user)
 }
--- a/.example/database/gdb/mysql/gdb_tables.go
+++ b/.example/database/gdb/mysql/gdb_tables.go
@ -1,18 +1,14 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()
 	db.SetDebug(true)

-	tables, err := db.Tables(ctx)
+	tables, err := db.Tables()
 	if err != nil {
 		panic(err)
 	}
--- a/.example/database/gdb/mysql/gdb_tables_fields.go
+++ b/.example/database/gdb/mysql/gdb_tables_fields.go
@ -1,25 +1,21 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	var (
-		db  = g.DB()
-		ctx = gctx.New()
-	)
+	db := g.DB()
 	db.SetDebug(true)

-	tables, e := db.Tables(ctx)
+	tables, e := db.Tables()
 	if e != nil {
 		panic(e)
 	}
 	if tables != nil {
 		g.Dump(tables)
 		for _, table := range tables {
-			fields, err := db.TableFields(ctx, table)
+			fields, err := db.TableFields(table)
 			if err != nil {
 				panic(err)
 			}
--- a/.example/database/gdb/mysql/gdb_transaction.go
+++ b/.example/database/gdb/mysql/gdb_transaction.go
@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/database/gdb/mysql/gdb_transaction_closure.go
+++ b/.example/database/gdb/mysql/gdb_transaction_closure.go
@ -1,29 +1,26 @@
 package main

 import (
-	"context"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	var (
 		err   error
 		db    = g.DB()
-		ctx   = gctx.New()
 		table = "user"
 	)
-	if err = db.Transaction(ctx, func(ctx context.Context, tx *gdb.TX) error {
+	if err = db.Transaction(func(tx *gdb.TX) error {
 		// Nested transaction 1.
-		if err = tx.Transaction(ctx, func(ctx context.Context, tx *gdb.TX) error {
+		if err = tx.Transaction(func(tx *gdb.TX) error {
 			_, err = tx.Model(table).Data(g.Map{"id": 1, "name": "john"}).Insert()
 			return err
 		}); err != nil {
 			return err
 		}
 		// Nested transaction 2, panic.
-		if err = tx.Transaction(ctx, func(ctx context.Context, tx *gdb.TX) error {
+		if err = tx.Transaction(func(tx *gdb.TX) error {
 			_, err = tx.Model(table).Data(g.Map{"id": 2, "name": "smith"}).Insert()
 			// Create a panic that can make this transaction rollback automatically.
 			panic("error")
--- a/.example/database/gdb/mysql/gdb_transaction_savepoint.go
+++ b/.example/database/gdb/mysql/gdb_transaction_savepoint.go
@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/database/gdb/mysql/gdb_update_field.go
+++ b/.example/database/gdb/mysql/gdb_update_field.go
@ -3,16 +3,16 @@ package main
 import (
 	"database/sql"

-	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/os/gfile"

-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	db := g.DB()
 	table := "medicine_clinics_upload_yinchuan"
-	list, err := db.Model(table).All()
+	list, err := db.Table(table).All()
 	if err != nil && err != sql.ErrNoRows {
 		panic(err)
 	}
--- a/.example/database/gdb/mysql/gdb_update_union.go
+++ b/.example/database/gdb/mysql/gdb_update_union.go
@ -3,13 +3,13 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
 	db := g.DB()
 	db.SetDebug(true)
-	result, err := db.Model("pw_passageway m,pw_template t").Data("t.status", 99).Where("m.templateId=t.id AND m.status = 0").Update()
+	result, err := db.Table("pw_passageway m,pw_template t").Data("t.status", 99).Where("m.templateId=t.id AND m.status = 0").Update()
 	if err != nil {
 		panic(err)
 	}
--- a/.example/database/gdb/mysql/gdb_value.go
+++ b/.example/database/gdb/mysql/gdb_value.go
@ -2,11 +2,11 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
-	one, err := g.Model("carlist c").
+	one, err := g.DB().Table("carlist c").
 		LeftJoin("cardetail d", "c.postid=d.carid").
 		Where("c.postid", "142039140032006").
 		Fields("c.*,d.*").One()
--- a/.example/database/gdb/mysql/gdb_with_insert.go
+++ b/.example/database/gdb/mysql/gdb_with_insert.go
@ -1,12 +1,10 @@
 package main

 import (
-	"context"
 	"fmt"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/util/gmeta"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gmeta"
 )

 func main() {
@ -32,13 +30,13 @@ func main() {
 	}

 	db := g.DB()
-	err := db.Transaction(gctx.New(), func(ctx context.Context, tx *gdb.TX) error {
+	db.Transaction(func(tx *gdb.TX) error {
 		for i := 1; i <= 5; i++ {
 			// User.
 			user := User{
 				Name: fmt.Sprintf(`name_%d`, i),
 			}
-			lastInsertId, err := db.Ctx(ctx).Model(user).Data(user).OmitEmpty().InsertAndGetId()
+			lastInsertId, err := db.Model(user).Data(user).OmitEmpty().InsertAndGetId()
 			if err != nil {
 				return err
 			}
@ -47,7 +45,7 @@ func main() {
 				Uid:     int(lastInsertId),
 				Address: fmt.Sprintf(`address_%d`, lastInsertId),
 			}
-			_, err = db.Ctx(ctx).Model(userDetail).Data(userDetail).OmitEmpty().Insert()
+			_, err = db.Model(userDetail).Data(userDetail).OmitEmpty().Insert()
 			if err != nil {
 				return err
 			}
@ -57,7 +55,7 @@ func main() {
 					Uid:   int(lastInsertId),
 					Score: j,
 				}
-				_, err = db.Ctx(ctx).Model(userScore).Data(userScore).OmitEmpty().Insert()
+				_, err = db.Model(userScore).Data(userScore).OmitEmpty().Insert()
 				if err != nil {
 					return err
 				}
@ -65,5 +63,4 @@ func main() {
 		}
 		return nil
 	})
-	fmt.Println(err)
 }
--- a/.example/database/gdb/mysql/gdb_with_slect.go
+++ b/.example/database/gdb/mysql/gdb_with_slect.go
@ -1,8 +1,8 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gmeta"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gmeta"
 )

 func main() {
--- a/.example/database/gdb/mysql/issue364.go
+++ b/.example/database/gdb/mysql/issue364.go
@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 	"time"
 )

@ -9,7 +9,7 @@ func test1() {
 	db := g.DB()
 	db.SetDebug(true)
 	time.Sleep(1 * time.Minute)
-	r, e := db.Model("test").Where("id", 10000).Count()
+	r, e := db.Table("test").Where("id", 10000).Count()
 	if e != nil {
 		panic(e)
 	}
@ -19,7 +19,7 @@ func test1() {
 func test2() {
 	db := g.DB()
 	db.SetDebug(true)
-	dao := db.Model("test").Safe()
+	dao := db.Table("test").Safe()
 	time.Sleep(1 * time.Minute)
 	r, e := dao.Where("id", 10000).Count()
 	if e != nil {
--- a/.example/database/gdb/oracle/gdb.go
+++ b/.example/database/gdb/oracle/gdb.go
@ -5,8 +5,8 @@ import (
 	"time"

 	//_ "github.com/mattn/go-oci8"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 )

 // 本文件用于gf框架的mysql数据库操作示例，不作为单元测试使用
--- a/.example/database/gdb/sqlite/sqlite.go
+++ b/.example/database/gdb/sqlite/sqlite.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 	_ "github.com/mattn/go-sqlite3"
 )

--- a/.example/database/gredis/gredis.go
+++ b/.example/database/gredis/gredis.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/database/gredis"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/database/gredis"
+	"github.com/gogf/gf/util/gconv"
 )

 // 使用原生gredis.New操作redis，但是注意需要自己调用Close方法关闭redis链接池
--- a/.example/database/gredis/gredis2.go
+++ b/.example/database/gredis/gredis2.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
 )

 // 使用框架封装的g.Redis()方法获得redis操作对象单例，不需要开发者显示调用Close方法
--- a/.example/database/gredis/gredis_conn_do.go
+++ b/.example/database/gredis/gredis_conn_do.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
 )

 func main() {
--- a/.example/database/gredis/gredis_conn_do_var.go
+++ b/.example/database/gredis/gredis_conn_do_var.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/database/gredis/gredis_conn_send.go
+++ b/.example/database/gredis/gredis_conn_send.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
 )

 func main() {
--- a/.example/database/gredis/gredis_conn_send_var.go
+++ b/.example/database/gredis/gredis_conn_send_var.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/database/gredis/gredis_conn_subscribe.go
+++ b/.example/database/gredis/gredis_conn_subscribe.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
 )

 func main() {
--- a/.example/database/gredis/gredis_conn_subscribe_var.go
+++ b/.example/database/gredis/gredis_conn_subscribe_var.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/debug/gdebug/gdebug.go
+++ b/.example/debug/gdebug/gdebug.go
@ -2,7 +2,7 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/debug/gdebug"
+	"github.com/gogf/gf/debug/gdebug"
 )

 func main() {
--- a/.example/debug/gdebug/gdebug_info.go
+++ b/.example/debug/gdebug/gdebug_info.go
@ -2,7 +2,7 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/debug/gdebug"
+	"github.com/gogf/gf/debug/gdebug"
 )

 func main() {
--- a/.example/encoding/gbase64/gbase64.go
+++ b/.example/encoding/gbase64/gbase64.go
@ -3,7 +3,7 @@ package gbase64
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gbase64"
+	"github.com/gogf/gf/encoding/gbase64"
 )

 func main() {
--- a/.example/encoding/gbinary/binary.go
+++ b/.example/encoding/gbinary/binary.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gbinary"
-	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/encoding/gbinary"
+	"github.com/gogf/gf/os/glog"
 )

 func main() {
--- a/.example/encoding/gbinary/bits1.go
+++ b/.example/encoding/gbinary/bits1.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gbinary"
+	"github.com/gogf/gf/encoding/gbinary"
 )

 func main() {
--- a/.example/encoding/gbinary/bits2.go
+++ b/.example/encoding/gbinary/bits2.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gbinary"
+	"github.com/gogf/gf/encoding/gbinary"
 )

 func main() {
--- a/.example/encoding/gcfg/gcfg1.go
+++ b/.example/encoding/gcfg/gcfg1.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/frame/g"
 )

 func main() {
--- a/.example/encoding/gcharset/gcharset.go
+++ b/.example/encoding/gcharset/gcharset.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gcharset"
+	"github.com/gogf/gf/encoding/gcharset"
 )

 func main() {
--- a/.example/encoding/gcompress/unzip.go
+++ b/.example/encoding/gcompress/unzip.go
@ -3,7 +3,7 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gcompress"
+	"github.com/gogf/gf/encoding/gcompress"
 )

 func main() {
--- a/.example/encoding/gcompress/unzip_content.go
+++ b/.example/encoding/gcompress/unzip_content.go
@ -3,8 +3,8 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gcompress"
-	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/encoding/gcompress"
+	"github.com/gogf/gf/os/gfile"
 )

 func main() {
--- a/.example/encoding/gcompress/zip.go
+++ b/.example/encoding/gcompress/zip.go
@ -3,7 +3,7 @@ package main
 import (
 	"archive/zip"
 	"fmt"
-	"github.com/gogf/gf/v2/encoding/gcompress"
+	"github.com/gogf/gf/encoding/gcompress"
 	"io"
 	"os"
 	"path/filepath"
--- a/.example/encoding/ghash/ghash_repeat_check.go
+++ b/.example/encoding/ghash/ghash_repeat_check.go
@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/gogf/gf/v2/encoding/ghash"
+	"github.com/gogf/gf/encoding/ghash"
 )

 func main() {
--- a/.example/encoding/gini/gini.go
+++ b/.example/encoding/gini/gini.go
@ -2,7 +2,7 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/encoding/gini"
+	"github.com/gogf/gf/encoding/gini"
 )

 func main() {
--- a/.example/encoding/gjson/gjson.go
+++ b/.example/encoding/gjson/gjson.go
@ -3,9 +3,9 @@ package main
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/os/glog"
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/os/gtime"
 )

 func getByPattern() {
--- a/.example/encoding/gjson/issue#IZXU2.go
+++ b/.example/encoding/gjson/issue#IZXU2.go
@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"

-	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/encoding/gjson"
 )

 type XinYanModel struct {
--- a/.example/encoding/gjson/issue283.go
+++ b/.example/encoding/gjson/issue283.go
@ -1,9 +1,9 @@
 package main

 import (
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/glog"
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/glog"
 )

 type GameUser struct {
--- a/.example/encoding/gjson/issue360.go
+++ b/.example/encoding/gjson/issue360.go
@ -2,7 +2,7 @@ package main

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/encoding/gjson"
 )

 func main() {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Guo	8906ff94a1	v1.16.9	2022-05-30 15:49:24 +08:00
汤敏正	191ee39a06	fix response close of package gclient (#1884 )	2022-05-30 15:44:52 +08:00
John Guo	87067e1e8a	v1.16.8	2022-04-28 20:22:22 +08:00
John Guo	edf90799d3	Merge pull request #1788 from gogf/fix/unsafe-daguang no longer use unsafe package for string/bytes conversion	2022-04-28 20:17:29 +08:00
daguang	c8cfa33bc7	add ci test branch	2022-04-26 14:10:25 +08:00
daguang	14ce35f570	add ci test branch	2022-04-26 12:18:24 +08:00
daguang	56db028b21	add ci test branch	2022-04-26 11:55:59 +08:00
daguang	561bc5bc33	no longer use unsafe package for string/bytes conversion	2022-04-21 22:22:00 +08:00
daguang	79ba162156	no longer use unsafe package for string/bytes conversion	2022-04-21 22:17:57 +08:00
daguang	03bcf51a95	add ci test branch	2022-04-21 18:29:29 +08:00
daguang	308fdccf65	no longer use unsafe package for string/bytes conversion	2022-04-19 17:06:27 +08:00
John Guo	fd92fd2409	version updates	2022-03-25 14:13:49 +08:00
John Guo	a2823a501e	upgrade otel to v1.0.0 for compatibility	2022-03-25 11:06:23 +08:00