Merge branch 'master' into processconflict

.example/container/garray/basic_array.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/garray"
+	"github.com/gogf/gf/v2/container/garray"
 )
 
 func main() {

.example/container/garray/json_marshal.go

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

.example/container/garray/json_unmarshal.go

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

.example/container/garray/sorted_array_basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/garray"
+	"github.com/gogf/gf/v2/container/garray"
 )
 
 func main() {

.example/container/garray/sorted_string_array.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/garray"
+	"github.com/gogf/gf/v2/container/garray"
 )
 
 func main() {

.example/container/glist/basic.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/container/glist"
+	"github.com/gogf/gf/v2/container/glist"
 )
 
 func main() {

.example/container/glist/json_marshal.go

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

.example/container/glist/json_unmarshal.go

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

.example/container/gmap/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/v2/container/gmap"
 )
 
 func main() {

.example/container/gmap/gmap_json_marshal.go

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

.example/container/gmap/gmap_json_unmarshal.go

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

.example/container/gmap/gmap_map_clone_safe.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/container/gmap/gmap_maps.go

@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/util/gutil"
+	"github.com/gogf/gf/v2/util/gutil"
 )
 
 func main() {

.example/container/gmap/gmap_treemap.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/v2/container/gmap"
-	"github.com/gogf/gf/util/gutil"
+	"github.com/gogf/gf/v2/util/gutil"
 )
 
 func main() {

.example/container/gpool/gpool.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogf/gf/container/gpool"
+	"github.com/gogf/gf/v2/container/gpool"
 )
 
 func main() {

.example/container/gpool/gpool_expirefunc.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogf/gf/container/gpool"
+	"github.com/gogf/gf/v2/container/gpool"
-	"github.com/gogf/gf/net/gtcp"
+	"github.com/gogf/gf/v2/net/gtcp"
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/v2/os/glog"
 )
 
 func main() {

.example/container/gqueue/gqueue.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/v2/container/gqueue"
-	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/os/gtimer"
+	"github.com/gogf/gf/v2/os/gtimer"
 )
 
 func main() {

.example/container/gqueue/gqueue2.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/v2/container/gqueue"
-	"github.com/gogf/gf/os/gtimer"
+	"github.com/gogf/gf/v2/os/gtimer"
 )
 
 func main() {

.example/container/gqueue/gqueue3.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/v2/container/gqueue"
-	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/os/gtimer"
+	"github.com/gogf/gf/v2/os/gtimer"
 )
 
 func main() {

.example/container/gring/gring.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gring"
+	"github.com/gogf/gf/v2/container/gring"
 )
 
 func main() {

.example/container/gring/gring_josephus.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gring"
+	"github.com/gogf/gf/v2/container/gring"
 )
 
 type Player struct {

.example/container/gset/gset1.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gset"
+	"github.com/gogf/gf/v2/container/gset"
 )
 
 func main() {

.example/container/gset/gset2.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gset"
+	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/container/gset/json_marshal.go

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

.example/container/gset/json_unmarshal.go

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

.example/container/gtree/gtree_avltree.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/v2/container/gtree"
-	"github.com/gogf/gf/util/gutil"
+	"github.com/gogf/gf/v2/util/gutil"
 )
 
 func main() {

.example/container/gtree/gtree_btree.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/v2/container/gtree"
 )
 
 func main() {

.example/container/gtree/gtree_redblackmap.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/v2/container/gtree"
-	"github.com/gogf/gf/util/gutil"
+	"github.com/gogf/gf/v2/util/gutil"
 )
 
 func main() {

.example/container/gtree/gtree_redblacktree.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/v2/container/gtree"
 )
 
 func main() {

.example/container/gtype/gtype_int.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/container/gtype"
+	"github.com/gogf/gf/v2/container/gtype"
 )
 
 func main() {

.example/container/gtype/json_marshal.go

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

.example/container/gtype/json_unmarshal.go

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

.example/container/gvar/json_marshal.go

@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/container/gvar/json_unmarshal.go

@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/container/gvar/var.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/driver/driver/driver.go

@@ -3,8 +3,8 @@ package driver
 import (
 	"context"
 	"database/sql"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/v2/os/gtime"
 )
 
 // MyDriver is a custom database driver, which is used for testing only.

.example/database/gdb/mssql/gdb_all.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/v2/os/gtime"
 
 	_ "github.com/denisenkom/go-mssqldb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mssql/gdb_sqlserver.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	//_ "github.com/denisenkom/go-mssqldb"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 // 本文件用于gf框架的mssql数据库操作示例，不作为单元测试使用

.example/database/gdb/mysql/config/gdb.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 	"sync"
 	"time"
 )

.example/database/gdb/mysql/gdb_all.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_args_slice.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_batch_insert.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_binary.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 
-	"github.com/gogf/gf/crypto/gaes"
+	"github.com/gogf/gf/v2/crypto/gaes"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_bit.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_cache.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/util/gutil"
+	"github.com/gogf/gf/v2/util/gutil"
 	"time"
 )
 

.example/database/gdb/mysql/gdb_complecated.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_config.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_config2.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_config3.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_ctx.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"context"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_ctx_model.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"context"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_datetime.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/v2/os/gtime"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_debug1.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/v2/os/glog"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_debug2.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_distinct.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_insert.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_issue_278.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 var (

.example/database/gdb/mysql/gdb_json_xml.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/os/gctx"
 
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/encoding/gparser"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
@@ -34,8 +34,8 @@ func main() {
 	fmt.Println(one.Xml())
 
 	// 自定义方法方法转换为json/xml
-	jsonContent, _ := gparser.VarToJson(one.Map())
+	jsonContent, _ := gjson.New(one.Map()).ToJson()
 	fmt.Println(string(jsonContent))
-	xmlContent, _ := gparser.VarToXml(one.Map())
+	xmlContent, _ := gjson.New(one.Map()).ToJson()
 	fmt.Println(string(xmlContent))
 }

.example/database/gdb/mysql/gdb_pool.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 	"time"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_reconnect.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 	"time"
 )
 

.example/database/gdb/mysql/gdb_struct.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_tables.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_tables_fields.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_transaction.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_transaction_closure.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"context"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_transaction_savepoint.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_update_field.go

@@ -3,10 +3,10 @@ package main
 import (
 	"database/sql"
 
-	"github.com/gogf/gf/os/gfile"
+	"github.com/gogf/gf/v2/os/gfile"
 
-	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_update_union.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_value.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_with_insert.go

@@ -3,10 +3,10 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/gctx"
+	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/util/gmeta"
+	"github.com/gogf/gf/v2/util/gmeta"
 )
 
 func main() {

.example/database/gdb/mysql/gdb_with_slect.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/util/gmeta"
+	"github.com/gogf/gf/v2/util/gmeta"
 )
 
 func main() {

.example/database/gdb/mysql/issue364.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 	"time"
 )
 

.example/database/gdb/oracle/gdb.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	//_ "github.com/mattn/go-oci8"
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 // 本文件用于gf框架的mysql数据库操作示例，不作为单元测试使用

.example/database/gdb/sqlite/sqlite.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 	_ "github.com/mattn/go-sqlite3"
 )
 

.example/database/gredis/gredis.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/database/gredis"
+	"github.com/gogf/gf/v2/database/gredis"
-	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 // 使用原生gredis.New操作redis，但是注意需要自己调用Close方法关闭redis链接池

.example/database/gredis/gredis2.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 // 使用框架封装的g.Redis()方法获得redis操作对象单例，不需要开发者显示调用Close方法

.example/database/gredis/gredis_conn_do.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func main() {

.example/database/gredis/gredis_conn_do_var.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gredis/gredis_conn_send.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func main() {

.example/database/gredis/gredis_conn_send_var.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/database/gredis/gredis_conn_subscribe.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func main() {

.example/database/gredis/gredis_conn_subscribe_var.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/debug/gdebug/gdebug.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/debug/gdebug"
+	"github.com/gogf/gf/v2/debug/gdebug"
 )
 
 func main() {

.example/debug/gdebug/gdebug_info.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/debug/gdebug"
+	"github.com/gogf/gf/v2/debug/gdebug"
 )
 
 func main() {

.example/encoding/gbase64/gbase64.go

@@ -3,7 +3,7 @@ package gbase64
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gbase64"
+	"github.com/gogf/gf/v2/encoding/gbase64"
 )
 
 func main() {

.example/encoding/gbinary/binary.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gbinary"
+	"github.com/gogf/gf/v2/encoding/gbinary"
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/v2/os/glog"
 )
 
 func main() {

.example/encoding/gbinary/bits1.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gbinary"
+	"github.com/gogf/gf/v2/encoding/gbinary"
 )
 
 func main() {

.example/encoding/gbinary/bits2.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gbinary"
+	"github.com/gogf/gf/v2/encoding/gbinary"
 )
 
 func main() {

.example/encoding/gcfg/gcfg1.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 func main() {

.example/encoding/gcharset/gcharset.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gcharset"
+	"github.com/gogf/gf/v2/encoding/gcharset"
 )
 
 func main() {

.example/encoding/gcompress/unzip.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gcompress"
+	"github.com/gogf/gf/v2/encoding/gcompress"
 )
 
 func main() {

.example/encoding/gcompress/unzip_content.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gcompress"
+	"github.com/gogf/gf/v2/encoding/gcompress"
-	"github.com/gogf/gf/os/gfile"
+	"github.com/gogf/gf/v2/os/gfile"
 )
 
 func main() {

.example/encoding/gcompress/zip.go

@@ -3,7 +3,7 @@ package main
 import (
 	"archive/zip"
 	"fmt"
-	"github.com/gogf/gf/encoding/gcompress"
+	"github.com/gogf/gf/v2/encoding/gcompress"
 	"io"
 	"os"
 	"path/filepath"

.example/encoding/ghash/ghash_repeat_check.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/gogf/gf/encoding/ghash"
+	"github.com/gogf/gf/v2/encoding/ghash"
 )
 
 func main() {

.example/encoding/gini/gini.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/encoding/gini"
+	"github.com/gogf/gf/v2/encoding/gini"
 )
 
 func main() {

.example/encoding/gjson/gjson.go

@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/v2/os/glog"
-	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/v2/os/gtime"
 )
 
 func getByPattern() {

.example/encoding/gjson/issue#IZXU2.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/v2/encoding/gjson"
 )
 
 type XinYanModel struct {

.example/encoding/gjson/issue283.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/v2/os/glog"
 )
 
 type GameUser struct {

.example/encoding/gjson/issue360.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/v2/encoding/gjson"
 )
 
 func main() {

.example/encoding/gparser/config.yaml

@@ -1,44 +0,0 @@
-
-broker:
-  ip: "127.0.0.1"
-  tcpport: "4222"
-  httpport: "8222"
-  user: "alfxnats"
-  pwd: "alfxnats"
-  clusterid: "alfxnats"
-database:
-  ip: "110.1.1.227"
-  port: "27017"
-  user: "alfxdev"
-  pwd: "alfxdev"
-  dbname: "alfxdev"
-scheduler:
-  a2rparallel: 4
-  sleeptime: 300
-worker:
-  name: "worker1"
-  domains:
-    officenet: 3
-    producnet: 3
-    free: 3
-  temppath: "/home/alfx/proc"
-common:
-  filepath: "/home/alfx/file"
-  logpath: "home/alfx/log"
-  logdebug: true
-  logtrace: true
-report:
-  localip: "127.0.0.1"
-  localport: ""
-
-
-
-
-
-
-
-
-
-
-
-