version updates

add Raw* method in ClientResponse to get request and response string

.example/container/garray/basic_array.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/garray"
+)
+
+func main() {
+	// Create a int array, which is concurrent-unsafe in default.
+	a := garray.NewIntArray()
+
+	// Appending items.
+	for i := 0; i < 10; i++ {
+		a.Append(i)
+	}
+
+	// Get the length of the array.
+	fmt.Println(a.Len())
+
+	// Get the slice of the array.
+	fmt.Println(a.Slice())
+
+	// Get the item of specified index.
+	fmt.Println(a.Get(6))
+
+	// Insert after/before specified index.
+	a.InsertAfter(9, 11)
+	a.InsertBefore(10, 10)
+	fmt.Println(a.Slice())
+
+	a.Set(0, 100)
+	fmt.Println(a.Slice())
+
+	// Searching the item and returning the index.
+	fmt.Println(a.Search(5))
+
+	// Remove item of specified index.
+	a.Remove(0)
+	fmt.Println(a.Slice())
+
+	// Clearing the array.
+	fmt.Println(a.Slice())
+	a.Clear()
+	fmt.Println(a.Slice())
+}

.example/container/garray/json_marshal.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/garray"
+)
+
+func main() {
+	type Student struct {
+		Id     int
+		Name   string
+		Scores *garray.IntArray
+	}
+	s := Student{
+		Id:     1,
+		Name:   "john",
+		Scores: garray.NewIntArrayFrom([]int{100, 99, 98}),
+	}
+	b, _ := json.Marshal(s)
+	fmt.Println(string(b))
+}

.example/container/garray/json_unmarshal.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/garray"
+)
+
+func main() {
+	b := []byte(`{"Id":1,"Name":"john","Scores":[100,99,98]}`)
+	type Student struct {
+		Id     int
+		Name   string
+		Scores *garray.IntArray
+	}
+	s := Student{}
+	json.Unmarshal(b, &s)
+	fmt.Println(s)
+}

.example/container/garray/sorted_array_basic.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/garray"
+)
+
+func main() {
+	// 自定义排序数组，降序排序(SortedIntArray管理的数据是升序)
+	a := garray.NewSortedArray(func(v1, v2 interface{}) int {
+		if v1.(int) < v2.(int) {
+			return 1
+		}
+		if v1.(int) > v2.(int) {
+			return -1
+		}
+		return 0
+	})
+
+	// 添加数据
+	a.Add(2)
+	a.Add(3)
+	a.Add(1)
+	fmt.Println(a.Slice())
+
+	// 添加重复数据
+	a.Add(3)
+	fmt.Println(a.Slice())
+
+	// 检索数据，返回最后对比的索引位置，检索结果
+	// 检索结果：0: 匹配; <0:参数小于对比值; >0:参数大于对比值
+	fmt.Println(a.Search(1))
+
+	// 设置不可重复
+	a.SetUnique(true)
+	fmt.Println(a.Slice())
+	a.Add(1)
+	fmt.Println(a.Slice())
+}

.example/container/garray/sorted_string_array.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/garray"
+)
+
+func main() {
+	array := garray.NewSortedStrArray()
+	array.Add("9")
+	array.Add("8")
+	array.Add("7")
+	array.Add("6")
+	array.Add("5")
+	array.Add("4")
+	array.Add("3")
+	array.Add("2")
+	array.Add("1")
+	fmt.Println(array.Slice())
+	// output:
+	// [1 2 3 4 5 6 7 8 9]
+}

.example/container/glist/basic.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/container/glist"
+)
+
+func main() {
+	l := glist.New()
+	// Push
+	l.PushBack(1)
+	l.PushBack(2)
+	e := l.PushFront(0)
+	// Insert
+	l.InsertBefore(e, -1)
+	l.InsertAfter(e, "a")
+	fmt.Println(l)
+	// Pop
+	fmt.Println(l.PopFront())
+	fmt.Println(l.PopBack())
+	fmt.Println(l)
+}

.example/container/glist/json_marshal.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/glist"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	type Student struct {
+		Id     int
+		Name   string
+		Scores *glist.List
+	}
+	s := Student{
+		Id:     1,
+		Name:   "john",
+		Scores: glist.NewFrom(g.Slice{100, 99, 98}),
+	}
+	b, _ := json.Marshal(s)
+	fmt.Println(string(b))
+}

.example/container/glist/json_unmarshal.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/glist"
+)
+
+func main() {
+	b := []byte(`{"Id":1,"Name":"john","Scores":[100,99,98]}`)
+	type Student struct {
+		Id     int
+		Name   string
+		Scores *glist.List
+	}
+	s := Student{}
+	json.Unmarshal(b, &s)
+	fmt.Println(s)
+}

.example/container/gmap/basic.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/gmap"
+)
+
+func main() {
+	// 创建一个默认的gmap对象，
+	// 默认情况下该gmap对象不支持并发安全特性，
+	// 初始化时可以给定true参数开启并发安全特性，用以并发安全场景。
+	m := gmap.New()
+
+	// 设置键值对
+	for i := 0; i < 10; i++ {
+		m.Set(i, i)
+	}
+	// 查询大小
+	fmt.Println(m.Size())
+	// 批量设置键值对(不同的数据类型对象参数不同)
+	m.Sets(map[interface{}]interface{}{
+		10: 10,
+		11: 11,
+	})
+	fmt.Println(m.Size())
+
+	// 查询是否存在
+	fmt.Println(m.Contains(1))
+
+	// 查询键值
+	fmt.Println(m.Get(1))
+
+	// 删除数据项
+	m.Remove(9)
+	fmt.Println(m.Size())
+
+	// 批量删除
+	m.Removes([]interface{}{10, 11})
+	fmt.Println(m.Size())
+
+	// 当前键名列表(随机排序)
+	fmt.Println(m.Keys())
+	// 当前键值列表(随机排序)
+	fmt.Println(m.Values())
+
+	// 查询键名，当键值不存在时，写入给定的默认值
+	fmt.Println(m.GetOrSet(100, 100))
+
+	// 删除键值对，并返回对应的键值
+	fmt.Println(m.Remove(100))
+
+	// 遍历map
+	m.Iterator(func(k interface{}, v interface{}) bool {
+		fmt.Printf("%v:%v ", k, v)
+		return true
+	})
+
+	// 自定义写锁操作
+	m.LockFunc(func(m map[interface{}]interface{}) {
+		m[99] = 99
+	})
+
+	// 自定义读锁操作
+	m.RLockFunc(func(m map[interface{}]interface{}) {
+		fmt.Println(m[99])
+	})
+
+	// 清空map
+	m.Clear()
+
+	// 判断map是否为空
+	fmt.Println(m.IsEmpty())
+}

.example/container/gmap/gmap_json_marshal.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+
+	"github.com/gogf/gf/container/gmap"
+)
+
+func main() {
+	m := gmap.New()
+	m.Sets(g.MapAnyAny{
+		"name":  "john",
+		"score": 100,
+	})
+	b, _ := json.Marshal(m)
+	fmt.Println(string(b))
+}

.example/container/gmap/gmap_json_unmarshal.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/gmap"
+)
+
+func main() {
+	m := gmap.Map{}
+	s := []byte(`{"name":"john","score":100}`)
+	json.Unmarshal(s, &m)
+	fmt.Println(m.Map())
+}

.example/container/gmap/gmap_map_clone_safe.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	m1 := gmap.New(true)
+	m1.Set("1", "1")
+
+	m2 := m1.Map()
+	m2["2"] = "2"
+
+	g.Dump(m1.Clone())
+	g.Dump(m2)
+	//output:
+	//{
+	//	"1": "1"
+	//}
+	//
+	//{
+	//	"1": "1",
+	//	"2": "2"
+	//}
+}

.example/container/gmap/gmap_maps.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gutil"
+)
+
+func main() {
+	array := g.Slice{2, 3, 1, 5, 4, 6, 8, 7, 9}
+	hashMap := gmap.New()
+	linkMap := gmap.NewListMap()
+	treeMap := gmap.NewTreeMap(gutil.ComparatorInt)
+	for _, v := range array {
+		hashMap.Set(v, v)
+	}
+	for _, v := range array {
+		linkMap.Set(v, v)
+	}
+	for _, v := range array {
+		treeMap.Set(v, v)
+	}
+	fmt.Println("HashMap   Keys:", hashMap.Keys())
+	fmt.Println("HashMap Values:", hashMap.Values())
+	fmt.Println("LinkMap   Keys:", linkMap.Keys())
+	fmt.Println("LinkMap Values:", linkMap.Values())
+	fmt.Println("TreeMap   Keys:", treeMap.Keys())
+	fmt.Println("TreeMap Values:", treeMap.Values())
+}

.example/container/gmap/gmap_treemap.go

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

.example/container/gpool/gpool.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/gogf/gf/container/gpool"
+)
+
+func main() {
+	// 创建一个对象池，过期时间为1000毫秒
+	p := gpool.New(1000*time.Millisecond, nil)
+
+	// 从池中取一个对象，返回nil及错误信息
+	fmt.Println(p.Get())
+
+	// 丢一个对象到池中
+	p.Put(1)
+
+	// 重新从池中取一个对象，返回1
+	fmt.Println(p.Get())
+
+	// 等待1秒后重试，发现对象已过期，返回nil及错误信息
+	time.Sleep(time.Second)
+	fmt.Println(p.Get())
+}

.example/container/gpool/gpool_expirefunc.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/gogf/gf/container/gpool"
+	"github.com/gogf/gf/net/gtcp"
+	"github.com/gogf/gf/os/glog"
+)
+
+func main() {
+	// 创建对象复用池，对象过期时间为3000毫秒，并给定创建及销毁方法
+	p := gpool.New(3000*time.Millisecond, func() (interface{}, error) {
+		return gtcp.NewConn("www.baidu.com:80")
+	}, func(i interface{}) {
+		glog.Println("expired")
+		i.(*gtcp.Conn).Close()
+	})
+	conn, err := p.Get()
+	if err != nil {
+		panic(err)
+	}
+	result, err := conn.(*gtcp.Conn).SendRecv([]byte("HEAD / HTTP/1.1\n\n"), -1)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(string(result))
+	// 丢回池中以便重复使用
+	p.Put(conn)
+	// 等待一定时间观察过期方法调用
+	time.Sleep(4 * time.Second)
+}

.example/container/gqueue/gqueue.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/os/gtimer"
+)
+
+func main() {
+	q := gqueue.New()
+	// 数据生产者，每隔1秒往队列写数据
+	gtimer.SetInterval(time.Second, func() {
+		v := gtime.Now().String()
+		q.Push(v)
+		fmt.Println("Push:", v)
+	})
+
+	// 3秒后关闭队列
+	gtimer.SetTimeout(3*time.Second, func() {
+		q.Close()
+	})
+
+	// 消费者，不停读取队列数据并输出到终端
+	for {
+		if v := q.Pop(); v != nil {
+			fmt.Println(" Pop:", v)
+		} else {
+			break
+		}
+	}
+}

.example/container/gqueue/gqueue2.go

@@ -2,9 +2,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/g/container/gqueue"
-	"github.com/gogf/gf/g/os/gtimer"
 	"time"
+
+	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/os/gtimer"
 )
 
 func main() {

.example/container/gqueue/gqueue3.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/gogf/gf/container/gqueue"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/os/gtimer"
+)
+
+func main() {
+	queue := gqueue.New()
+	// 数据生产者，每隔1秒往队列写数据
+	gtimer.SetInterval(time.Second, func() {
+		queue.Push(gtime.Now().String())
+	})
+
+	// 消费者，不停读取队列数据并输出到终端
+	for {
+		select {
+		case v := <-queue.C:
+			if v != nil {
+				fmt.Println(v)
+			} else {
+				return
+			}
+		}
+	}
+}

.example/container/gring/gring.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/gring"
+)
+
+func main() {
+	r1 := gring.New(10)
+	for i := 0; i < 5; i++ {
+		r1.Set(i).Next()
+	}
+	fmt.Println("Len:", r1.Len())
+	fmt.Println("Cap:", r1.Cap())
+	fmt.Println(r1.SlicePrev())
+	fmt.Println(r1.SliceNext())
+
+	r2 := gring.New(10)
+	for i := 0; i < 10; i++ {
+		r2.Set(i).Next()
+	}
+	fmt.Println("Len:", r2.Len())
+	fmt.Println("Cap:", r2.Cap())
+	fmt.Println(r2.SlicePrev())
+	fmt.Println(r2.SliceNext())
+
+}

.example/container/gring/gring_josephus.go

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

.example/container/gset/gset1.go

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

.example/container/gset/gset2.go

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

.example/container/gset/json_marshal.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/gset"
+)
+
+func main() {
+	type Student struct {
+		Id     int
+		Name   string
+		Scores *gset.IntSet
+	}
+	s := Student{
+		Id:     1,
+		Name:   "john",
+		Scores: gset.NewIntSetFrom([]int{100, 99, 98}),
+	}
+	b, _ := json.Marshal(s)
+	fmt.Println(string(b))
+}

.example/container/gset/json_unmarshal.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/gset"
+)
+
+func main() {
+	b := []byte(`{"Id":1,"Name":"john","Scores":[100,99,98]}`)
+	type Student struct {
+		Id     int
+		Name   string
+		Scores *gset.IntSet
+	}
+	s := Student{}
+	json.Unmarshal(b, &s)
+	fmt.Println(s)
+}

.example/container/gtree/gtree_avltree.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/gtree"
+	"github.com/gogf/gf/util/gutil"
+)
+
+func main() {
+	tree := gtree.NewAVLTree(gutil.ComparatorInt)
+	for i := 0; i < 10; i++ {
+		tree.Set(i, i*10)
+	}
+	// 打印树形
+	tree.Print()
+	// 前序遍历
+	fmt.Println("ASC:")
+	tree.IteratorAsc(func(key, value interface{}) bool {
+		fmt.Println(key, value)
+		return true
+	})
+	// 后续遍历
+	fmt.Println("DESC:")
+	tree.IteratorDesc(func(key, value interface{}) bool {
+		fmt.Println(key, value)
+		return true
+	})
+}

.example/container/gtree/gtree_btree.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/gtree"
+)
+
+func main() {
+	tree := gtree.NewBTree(10, func(v1, v2 interface{}) int {
+		return v1.(int) - v2.(int)
+	})
+	for i := 0; i < 20; i++ {
+		tree.Set(i, i*10)
+	}
+	fmt.Println(tree.String())
+
+	tree.IteratorDesc(func(key, value interface{}) bool {
+		fmt.Println(key, value)
+		return true
+	})
+}

.example/container/gtree/gtree_redblackmap.go

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

.example/container/gtree/gtree_redblacktree.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"github.com/gogf/gf/container/gtree"
+)
+
+func main() {
+	tree := gtree.NewRedBlackTree(func(v1, v2 interface{}) int {
+		return v1.(int) - v2.(int)
+	})
+	for i := 0; i < 10; i++ {
+		tree.Set(i, i)
+	}
+	tree.Print()
+	tree.Flip()
+	tree.Print()
+}

.example/container/gtype/gtype_int.go

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

.example/container/gtype/json_marshal.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/gtype"
+)
+
+func main() {
+	type Student struct {
+		Id     *gtype.Int
+		Name   *gtype.String
+		Scores *gtype.Interface
+	}
+	s := Student{
+		Id:     gtype.NewInt(1),
+		Name:   gtype.NewString("john"),
+		Scores: gtype.NewInterface([]int{100, 99, 98}),
+	}
+	b, _ := json.Marshal(s)
+	fmt.Println(string(b))
+}

.example/container/gtype/json_unmarshal.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/container/gtype"
+)
+
+func main() {
+	b := []byte(`{"Id":1,"Name":"john","Scores":[100,99,98]}`)
+	type Student struct {
+		Id     *gtype.Int
+		Name   *gtype.String
+		Scores *gtype.Interface
+	}
+	s := Student{}
+	json.Unmarshal(b, &s)
+	fmt.Println(s)
+}

.example/container/gvar/json_marshal.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	type Student struct {
+		Id     *g.Var
+		Name   *g.Var
+		Scores *g.Var
+	}
+	s := Student{
+		Id:     g.NewVar(1),
+		Name:   g.NewVar("john"),
+		Scores: g.NewVar([]int{100, 99, 98}),
+	}
+	b, _ := json.Marshal(s)
+	fmt.Println(string(b))
+}

.example/container/gvar/json_unmarshal.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	b := []byte(`{"Id":1,"Name":"john","Scores":[100,99,98]}`)
+	type Student struct {
+		Id     *g.Var
+		Name   *g.Var
+		Scores *g.Var
+	}
+	s := Student{}
+	json.Unmarshal(b, &s)
+	fmt.Println(s)
+}

.example/container/gvar/var.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	var v g.Var
+
+	v.Set("123")
+
+	fmt.Println(v.Val())
+
+	// 基本类型转换
+	fmt.Println(v.Int())
+	fmt.Println(v.Uint())
+	fmt.Println(v.Float64())
+
+	// slice转换
+	fmt.Println(v.Ints())
+	fmt.Println(v.Floats())
+	fmt.Println(v.Strings())
+
+	// struct转换
+	type Score struct {
+		Value int
+	}
+	s := new(Score)
+	v.Struct(s)
+	fmt.Println(s)
+}

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

@@ -0,0 +1,79 @@
+// Copyright 2017 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package driver
+
+import (
+	"database/sql"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gtime"
+)
+
+// MyDriver is a custom database driver, which is used for testing only.
+// For simplifying the unit testing case purpose, MyDriver struct inherits the mysql driver
+// gdb.DriverMysql and overwrites its functions DoQuery and DoExec.
+// So if there's any sql execution, it goes through MyDriver.DoQuery/MyDriver.DoExec firstly
+// and then gdb.DriverMysql.DoQuery/gdb.DriverMysql.DoExec.
+// You can call it sql "HOOK" or "HiJack" as your will.
+type MyDriver struct {
+	*gdb.DriverMysql
+}
+
+var (
+	// customDriverName is my driver name, which is used for registering.
+	customDriverName = "MyDriver"
+)
+
+func init() {
+	// It here registers my custom driver in package initialization function "init".
+	// You can later use this type in the database configuration.
+	if err := gdb.Register(customDriverName, &MyDriver{}); err != nil {
+		panic(err)
+	}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *MyDriver) New(core *gdb.Core, node *gdb.ConfigNode) (gdb.DB, error) {
+	return &MyDriver{
+		&gdb.DriverMysql{
+			Core: core,
+		},
+	}, nil
+}
+
+// DoQuery commits the sql string and its arguments to underlying driver
+// through given link object and returns the execution result.
+func (d *MyDriver) DoQuery(link gdb.Link, sql string, args ...interface{}) (rows *sql.Rows, err error) {
+	tsMilli := gtime.TimestampMilli()
+	rows, err = d.DriverMysql.DoQuery(link, sql, args...)
+	if _, err := d.DriverMysql.InsertIgnore("monitor", g.Map{
+		"sql":   gdb.FormatSqlWithArgs(sql, args),
+		"cost":  gtime.TimestampMilli() - tsMilli,
+		"time":  gtime.Now(),
+		"error": err.Error(),
+	}); err != nil {
+		panic(err)
+	}
+	return
+}
+
+// DoExec commits the query string and its arguments to underlying driver
+// through given link object and returns the execution result.
+func (d *MyDriver) DoExec(link gdb.Link, sql string, args ...interface{}) (result sql.Result, err error) {
+	tsMilli := gtime.TimestampMilli()
+	result, err = d.DriverMysql.DoExec(link, sql, args...)
+	if _, err := d.DriverMysql.InsertIgnore("monitor", g.Map{
+		"sql":   gdb.FormatSqlWithArgs(sql, args),
+		"cost":  gtime.TimestampMilli() - tsMilli,
+		"time":  gtime.Now(),
+		"error": err.Error(),
+	}); err != nil {
+		panic(err)
+	}
+	return
+}

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

@@ -0,0 +1 @@
+package main

.example/database/gdb/mssql/config.toml

@@ -0,0 +1,3 @@
+
+[database]
+    linkinfo = "mssql:user id=test;password=test1;server=122.152.202.91;port=1433;database=test;encrypt=disable"

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

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/os/gtime"
+
+	_ "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"` //更新时间
+	}
+	var table2 Table2
+	err := g.DB().Table("table2").Where("id=?", 1).Struct(&table2)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(table2.Createtime)
+}

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

@@ -3,9 +3,10 @@ package main
 import (
 	"fmt"
 	"time"
+
 	//_ "github.com/denisenkom/go-mssqldb"
-	"github.com/gogf/gf/g"
-	"github.com/gogf/gf/g/database/gdb"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
 )
 
 // 本文件用于gf框架的mssql数据库操作示例，不作为单元测试使用
@@ -26,7 +27,7 @@ func init() {
 	})
 	db, _ = gdb.New()
 
-	//gins.Config().SetPath("/home/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/geg/frame")
+	//gins.Config().SetPath("/home/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/.example/frame")
 	//db = g.Database()
 
 	//gdb.SetConfig(gdb.ConfigNode {
@@ -49,7 +50,7 @@ func init() {
 	//            Name     : "test",
 	//            Type     : "mysql",
 	//            Role     : "master",
-	//            Priority : 100,
+	//            Weight : 100,
 	//        },
 	//        gdb.ConfigNode {
 	//            Host     : "127.0.0.2",
@@ -59,7 +60,7 @@ func init() {
 	//            Name     : "test",
 	//            Type     : "mysql",
 	//            Role     : "master",
-	//            Priority : 100,
+	//            Weight : 100,
 	//        },
 	//        gdb.ConfigNode {
 	//            Host     : "127.0.0.3",
@@ -69,7 +70,7 @@ func init() {
 	//            Name     : "test",
 	//            Type     : "mysql",
 	//            Role     : "master",
-	//            Priority : 100,
+	//            Weight : 100,
 	//        },
 	//        gdb.ConfigNode {
 	//            Host     : "127.0.0.4",
@@ -79,7 +80,7 @@ func init() {
 	//            Name     : "test",
 	//            Type     : "mysql",
 	//            Role     : "master",
-	//            Priority : 100,
+	//            Weight : 100,
 	//        },
 	//    },
 	//})
@@ -518,7 +519,6 @@ func getQueriedSqls() {
 		fmt.Println("Sql  :", v.Sql)
 		fmt.Println("Args :", v.Args)
 		fmt.Println("Error:", v.Error)
-		fmt.Println("Func :", v.Func)
 	}
 }
 

.example/database/gdb/mysql/config.toml

@@ -0,0 +1,16 @@
+
+# MySQL数据库配置
+[database]
+#	debug = true
+    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"
+
+#[database]
+#   [[database.default]]
+#        type = "mysql"
+#        link = "root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"
+#
+
+
+
+
+

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

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"github.com/gogf/gf/database/gdb"
+	"sync"
+	"time"
+)
+
+var db gdb.DB
+
+func init() {
+	gdb.AddDefaultConfigNode(gdb.ConfigNode{
+		Host:             "127.0.0.1",
+		Port:             "3306",
+		User:             "root",
+		Pass:             "12345678",
+		Name:             "test",
+		Type:             "mysql",
+		Role:             "master",
+		Charset:          "utf8",
+		MaxOpenConnCount: 100,
+	})
+	db, _ = gdb.New()
+}
+
+func main() {
+	wg := sync.WaitGroup{}
+	for i := 0; i < 100000; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			time.Sleep(10 * time.Second)
+			db.Table("user").Where("id=1").All()
+		}()
+	}
+	wg.Wait()
+}

.example/database/gdb/mysql/config2.toml

@@ -0,0 +1,4 @@
+
+# MySQL数据库配置
+[database]
+    link = "mysql:root:8692651@tcp(192.168.1.11:3306)/test"

.example/database/gdb/mysql/config3.toml

@@ -0,0 +1,7 @@
+
+# MySQL数据库配置
+[database]
+    [database.default]
+        link = "mysql:root:8692651@tcp(192.168.1.11:3306)/test"
+    [database.user]
+        link = "mysql:root:8692651@tcp(192.168.1.11:3306)/test"

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

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	// 开启调试模式，以便于记录所有执行的SQL
+	db.SetDebug(true)
+
+	r, e := db.Table("test").Order("id asc").All()
+	if e != nil {
+		fmt.Println(e)
+	}
+	if r != nil {
+		fmt.Println(r.List())
+	}
+}

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

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+
+	db.Table("user").Where("nickname like ? and passport like ?", g.Slice{"T3", "t3"}).OrderBy("id asc").All()
+
+	conditions := g.Map{
+		"nickname like ?":    "%T%",
+		"id between ? and ?": g.Slice{1, 3},
+		"id >= ?":            1,
+		"create_time > ?":    0,
+		"id in(?)":           g.Slice{1, 2, 3},
+	}
+	db.Table("user").Where(conditions).OrderBy("id asc").All()
+
+	var params []interface{}
+	db.Table("user").Where("1=1", params).OrderBy("id asc").All()
+}

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

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

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

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	db.SetDebug(true)
+
+	r, e := db.Table("test").All()
+	if e != nil {
+		panic(e)
+	}
+	if r != nil {
+		fmt.Println(r.ToList())
+	}
+}

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

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/gogf/gf/g/database/gdb"
-	"github.com/gogf/gf/g/util/gutil"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/util/gutil"
 )
 
 func main() {

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

@@ -0,0 +1,24 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	// error!
+	r, err := g.DB().Table("user").Where(g.Map{
+		"or": g.Map{
+			"nickname":       "jim",
+			"create_time > ": "2019-10-01",
+		},
+		"and": g.Map{
+			"nickname":       "tom",
+			"create_time > ": "2019-10-01",
+		},
+	}).All()
+	if err != nil {
+		panic(err)
+	}
+	g.Dump(r)
+
+}

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

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	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)
+	}
+}

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

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	g.Config().SetFileName("config2.toml")
+	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)
+	}
+}

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

@@ -0,0 +1,24 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	g.Config().SetFileName("config3.toml")
+	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").Table("user").Where("uid=?", 1).One(); err == nil {
+		fmt.Println(r["uid"].Int())
+		fmt.Println(r["name"].String())
+	} else {
+		fmt.Println(err)
+	}
+}

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

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

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

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/glog"
+)
+
+func main() {
+	gdb.AddDefaultConfigNode(gdb.ConfigNode{
+		Host:    "127.0.0.1",
+		Port:    "3306",
+		User:    "root",
+		Pass:    "12345678",
+		Name:    "test",
+		Type:    "mysql",
+		Role:    "master",
+		Charset: "utf8",
+	})
+	db, err := gdb.New()
+	if err != nil {
+		panic(err)
+	}
+	//db.SetDebug(false)
+
+	glog.SetPath("/tmp")
+
+	// 执行3条SQL查询
+	for i := 1; i <= 3; i++ {
+		db.Table("user").Where("uid=?", i).One()
+	}
+	// 构造一条错误查询
+	db.Table("user").Where("no_such_field=?", "just_test").One()
+
+	db.Table("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()
+
+}

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

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+
+	// 执行3条SQL查询
+	for i := 1; i <= 3; i++ {
+		db.Table("user").Where("id=?", i).One()
+	}
+	// 构造一条错误查询
+	db.Table("user").Where("no_such_field=?", "just_test").One()
+
+	db.Table("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()
+}

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

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/database/gdb"
+	"time"
+)
+
+func main() {
+	//db := g.DB()
+
+	gdb.AddDefaultConfigNode(gdb.ConfigNode{
+		LinkInfo: "root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local",
+		Type:     "mysql",
+		Charset:  "utf8",
+	})
+	db, _ := gdb.New()
+
+	db.SetDebug(true)
+
+	type User struct {
+		CreateTime time.Time `orm:"create_time"`
+	}
+	r, e := db.Table("user").Data(User{CreateTime: time.Now()}).Insert()
+	if e != nil {
+		panic(e)
+	}
+	if r != nil {
+		fmt.Println(r.LastInsertId())
+	}
+}

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

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+var (
+	tableName = "orders"
+	dao       = g.DB().Table(tableName).Safe()
+)
+
+type OrderServiceEntity struct {
+	GoodsPrice float64 `json:"goods_price" gvalid:"required"`
+	PayTo      int8    `json:"payTo" gvalid:"required"`
+	PayStatus  int8    `json:"payStatus" `
+	CreateTime string  `json:"createTime" `
+	AppId      string  `json:"appId" gvalid:"required"`
+	PayUser    string  `json:"pay_user" gvalid:"required"`
+	QrUrl      string  `json:"qr_url" `
+}
+
+type Create struct {
+	Id         int64   `json:"id" gconv:"id"`
+	GoodsPrice float64 `json:"goodsPrice" gconv:"goods_price"`
+	PayTo      int8    `json:"payTo" gconv:"pay_to"`
+	PayStatus  int8    `json:"payStatus" gconv:"pay_status"`
+	CreateTime string  `json:"createTime" gconv:"create_time"`
+	UserId     int     `json:"user_id" `
+	PayUser    string  `json:"pay_user" `
+	QrUrl      string  `json:"qr_url" `
+}
+
+func main() {
+	g.DB().SetDebug(true)
+	userInfo := Create{
+		Id: 3,
+	}
+	orderService := OrderServiceEntity{
+		GoodsPrice: 0.1,
+		PayTo:      1,
+	}
+	size, err := dao.Where("user_id", userInfo.Id).
+		And("goods_price", float64(100.10)).
+		And("pay_status", 0).
+		And("pay_to", orderService.PayTo).Count()
+	fmt.Println(err)
+	fmt.Println(size)
+}

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

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

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

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"time"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	db.SetMaxIdleConnCount(10)
+	db.SetMaxOpenConnCount(10)
+	db.SetMaxConnLifetime(time.Minute)
+
+	// 开启调试模式，以便于记录所有执行的SQL
+	db.SetDebug(true)
+
+	for {
+		for i := 0; i < 10; i++ {
+			go db.Table("user").All()
+		}
+		time.Sleep(time.Second)
+	}
+
+}

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

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+	"time"
+)
+
+func main() {
+	db := g.DB()
+	db.SetDebug(true)
+	for {
+		r, err := db.Table("user").All()
+		fmt.Println(err)
+		fmt.Println(r)
+		time.Sleep(time.Second * 10)
+	}
+}

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

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	// 开启调试模式，以便于记录所有执行的SQL
+	db.SetDebug(true)
+
+	type User struct {
+		Uid  int
+		Name string
+	}
+	user := (*User)(nil)
+	fmt.Println(user)
+	err := db.Table("test").Where("id=1").Struct(&user)
+	fmt.Println(err)
+	fmt.Println(user)
+}

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

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	db.SetDebug(true)
+
+	tables, err := db.Tables()
+	if err != nil {
+		panic(err)
+	}
+	if tables != nil {
+		g.Dump(tables)
+	}
+}

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

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	db.SetDebug(true)
+
+	tables, e := db.Tables()
+	if e != nil {
+		panic(e)
+	}
+	if tables != nil {
+		g.Dump(tables)
+		for _, table := range tables {
+			fields, err := db.TableFields(table)
+			if err != nil {
+				panic(err)
+			}
+			g.Dump(fields)
+		}
+	}
+}

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

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"database/sql"
+
+	"github.com/gogf/gf/os/gfile"
+
+	"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.Table(table).All()
+	if err != nil && err != sql.ErrNoRows {
+		panic(err)
+	}
+	content := ""
+	for _, item := range list {
+		if j, err := gjson.DecodeToJson(item["upload_data"].String()); err != nil {
+			panic(err)
+		} else {
+			s, _ := j.ToJsonIndentString()
+			content += item["id"].String() + "\t" + item["medicine_clinic_id"].String() + "\t"
+			content += s
+			content += "\n\n"
+			//if _, err := db.Table(table).Data("data_decode", s).Where("id", item["id"].Int()).Update(); err != nil {
+			//	panic(err)
+			//}
+		}
+	}
+	gfile.PutContents("/Users/john/Temp/medicine_clinics_upload_yinchuan.txt", content)
+}

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

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

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

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	db.SetDebug(true)
+
+	db.Table("user").Fields("DISTINCT id,nickname").Filter().All()
+}

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

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"time"
+)
+
+func test1() {
+	db := g.DB()
+	db.SetDebug(true)
+	time.Sleep(1 * time.Minute)
+	r, e := db.Table("test").Where("id", 10000).Count()
+	if e != nil {
+		panic(e)
+	}
+	g.Dump(r)
+}
+
+func test2() {
+	db := g.DB()
+	db.SetDebug(true)
+	dao := db.Table("test").Safe()
+	time.Sleep(1 * time.Minute)
+	r, e := dao.Where("id", 10000).Count()
+	if e != nil {
+		panic(e)
+	}
+	g.Dump(r)
+}
+
+func main() {
+	test1()
+	test2()
+}

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

@@ -0,0 +1,575 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	//_ "github.com/mattn/go-oci8"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+)
+
+// 本文件用于gf框架的mysql数据库操作示例，不作为单元测试使用
+
+var db gdb.DB
+
+// 初始化配置及创建数据库
+func init() {
+	gdb.AddDefaultConfigNode(gdb.ConfigNode{
+		Host: "192.168.146.0",
+		Port: "1521",
+		User: "test",
+		Pass: "test",
+		Name: "orcl",
+		Type: "oracle",
+		Role: "master",
+	})
+	db, _ = gdb.New()
+
+	//gins.Config().SetPath("/home/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/.example/frame")
+	//db = g.Database()
+
+	//gdb.SetConfig(gdb.ConfigNode {
+	//    Host : "127.0.0.1",
+	//    Port : 3306,
+	//    User : "root",
+	//    Pass : "123456",
+	//    Name : "test",
+	//    Type : "mysql",
+	//})
+	//db, _ = gdb.Instance()
+
+	//gdb.SetConfig(gdb.Config {
+	//    "default" : gdb.ConfigGroup {
+	//        gdb.ConfigNode {
+	//            Host     : "127.0.0.1",
+	//            Port     : "3306",
+	//            User     : "root",
+	//            Pass     : "123456",
+	//            Name     : "test",
+	//            Type     : "mysql",
+	//            Role     : "master",
+	//            Weight : 100,
+	//        },
+	//        gdb.ConfigNode {
+	//            Host     : "127.0.0.2",
+	//            Port     : "3306",
+	//            User     : "root",
+	//            Pass     : "123456",
+	//            Name     : "test",
+	//            Type     : "mysql",
+	//            Role     : "master",
+	//            Weight : 100,
+	//        },
+	//        gdb.ConfigNode {
+	//            Host     : "127.0.0.3",
+	//            Port     : "3306",
+	//            User     : "root",
+	//            Pass     : "123456",
+	//            Name     : "test",
+	//            Type     : "mysql",
+	//            Role     : "master",
+	//            Weight : 100,
+	//        },
+	//        gdb.ConfigNode {
+	//            Host     : "127.0.0.4",
+	//            Port     : "3306",
+	//            User     : "root",
+	//            Pass     : "123456",
+	//            Name     : "test",
+	//            Type     : "mysql",
+	//            Role     : "master",
+	//            Weight : 100,
+	//        },
+	//    },
+	//})
+	//db, _ = gdb.Instance()
+}
+
+// 创建测试数据库
+func create() error {
+	fmt.Println("drop table aa_user:")
+	_, err := db.Exec("drop table aa_user")
+	if err != nil {
+		fmt.Println("drop table aa_user error.", err)
+	}
+
+	s := `
+        CREATE TABLE aa_user (
+            id  number(10) not null,
+            name VARCHAR2(45),
+            age  number(8),
+            addr varchar2(60),
+            amt  number(12,2),
+            PRIMARY KEY (id)
+        )
+    `
+	fmt.Println("create table aa_user:")
+	_, err = db.Exec(s)
+	if err != nil {
+		fmt.Println("create table error.", err)
+		return err
+	}
+
+	_, err = db.Exec("drop sequence id_seq")
+	if err != nil {
+		fmt.Println("drop sequence id_seq", err)
+	}
+
+	/*fmt.Println("create sequence id_seq")
+	  _, err = db.Exec("create sequence id_seq increment by 1 start with 1 maxvalue 9999999999 cycle cache 10")
+	  if err != nil {
+	      fmt.Println("create sequence id_seq error.", err)
+	      return err
+	  }
+
+	  s = `
+	  CREATE TRIGGER id_trigger before insert on aa_user  for each row
+	  begin
+	  select id_seq.nextval into :new.id from dual;
+	  end;
+	  `
+	  _, err = db.Exec(s)
+	  if err != nil {
+	      fmt.Println("create trigger error.", err)
+	      return err
+	  }*/
+
+	_, err = db.Exec("drop table user_detail")
+	if err != nil {
+		fmt.Println("drop table user_detail", err)
+	}
+
+	s = `
+        CREATE TABLE user_detail (
+            id   number(10) not null,
+            site  VARCHAR2(255),
+            PRIMARY KEY (id)
+        )
+    `
+	fmt.Println("create table user_detail:")
+	_, err = db.Exec(s)
+	if err != nil {
+		fmt.Println("create table user_detail error.", err)
+		return err
+	}
+	fmt.Println("create table success.")
+	return nil
+}
+
+// 数据写入
+func insert(id int) {
+	fmt.Println("insert:")
+
+	r, err := db.Insert("aa_user", gdb.Map{
+		"id":   id,
+		"name": "john",
+		"age":  id,
+	})
+	fmt.Println(r.LastInsertId())
+	fmt.Println(r.RowsAffected())
+	if err == nil {
+		r, err = db.Insert("user_detail", gdb.Map{
+			"id":   id,
+			"site": "http://johng.cn",
+		})
+		if err == nil {
+			fmt.Printf("id: %d\n", id)
+		} else {
+			fmt.Println(err)
+		}
+
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 基本sql查询
+func query() {
+	fmt.Println("query:")
+	list, err := db.GetAll("select * from aa_user")
+	if err == nil {
+		fmt.Println(list)
+	} else {
+		fmt.Println(err)
+	}
+
+	list, err = db.Table("aa_user").OrderBy("id").Limit(0, 2).Select()
+	if err == nil {
+		fmt.Println(list)
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// replace into
+func replace() {
+	fmt.Println("replace:")
+	r, err := db.Save("aa_user", gdb.Map{
+		"id":   1,
+		"name": "john",
+	})
+	if err == nil {
+		fmt.Println(r.LastInsertId())
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 数据保存
+func save() {
+	fmt.Println("save:")
+	r, err := db.Save("aa_user", gdb.Map{
+		"id":   1,
+		"name": "john",
+	})
+	if err == nil {
+		fmt.Println(r.LastInsertId())
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 批量写入
+func batchInsert() {
+	fmt.Println("batchInsert:")
+	_, err := db.BatchInsert("aa_user", gdb.List{
+		{"id": 11, "name": "batchInsert_john_1", "age": 11, "amt": 11.11},
+		{"id": 12, "name": "batchInsert_john_2", "age": 12, "amt": 12.12},
+		{"id": 13, "name": "batchInsert_john_3", "age": 13, "amt": 13.13},
+		{"id": 14, "name": "batchInsert_john_4", "age": 14, "amt": 14.14},
+	}, 10)
+	if err != nil {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 数据更新
+func update1() {
+	fmt.Println("update1:")
+	r, err := db.Update("aa_user", gdb.Map{"name": "john1", "age": 1}, "id=?", 1)
+	if err == nil {
+		fmt.Println(r.LastInsertId())
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 数据更新
+func update2() {
+	fmt.Println("update2:")
+	r, err := db.Update("aa_user", gdb.Map{"name": "john6", "age": 6}, "id=?", 2)
+	if err == nil {
+		fmt.Println(r.LastInsertId())
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 数据更新
+func update3() {
+	fmt.Println("update3:")
+	r, err := db.Update("aa_user", "name=?", "id=?", "john2", 3)
+	if err == nil {
+		fmt.Println(r.LastInsertId())
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式查询操作1
+func linkopSelect1() {
+	fmt.Println("linkopSelect1:")
+	r, err := db.Table("aa_user u").LeftJoin("user_detail ud", "u.id=ud.id").Fields("u.*, ud.site").Where("u.id > ?", 1).Limit(0, 2).Select()
+	if err == nil {
+		fmt.Println(r)
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式查询操作2
+func linkopSelect2() {
+	fmt.Println("linkopSelect2:")
+	r, err := db.Table("aa_user u").LeftJoin("user_detail ud", "u.id=ud.id").Fields("u.*,ud.site").Where("u.id=?", 1).One()
+	if err == nil {
+		fmt.Println(r)
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式查询操作3
+func linkopSelect3() {
+	fmt.Println("linkopSelect3:")
+	r, err := db.Table("aa_user u").LeftJoin("user_detail ud", "u.id=ud.id").Fields("ud.site").Where("u.id=?", 1).Value()
+	if err == nil {
+		fmt.Println(r.String())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式查询数量1
+func linkopCount1() {
+	fmt.Println("linkopCount1:")
+	r, err := db.Table("aa_user u").LeftJoin("user_detail ud", "u.id=ud.id").Where("name like ?", "john").Count()
+	if err == nil {
+		fmt.Println(r)
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 错误操作
+func linkopUpdate1() {
+	fmt.Println("linkopUpdate1:")
+	r, err := db.Table("henghe_setting").Update()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println("error", err)
+	}
+	fmt.Println()
+}
+
+// 通过Map指针方式传参方式
+func linkopUpdate2() {
+	fmt.Println("linkopUpdate2:")
+	r, err := db.Table("aa_user").Data(gdb.Map{"name": "john2"}).Where("name=?", "john").Update()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 通过字符串方式传参
+func linkopUpdate3() {
+	fmt.Println("linkopUpdate3:")
+	r, err := db.Table("aa_user").Data("name='john3'").Where("name=?", "john2").Update()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// Where条件使用Map
+func linkopUpdate4() {
+	fmt.Println("linkopUpdate4:")
+	r, err := db.Table("aa_user").Data(gdb.Map{"name": "john11111"}).Where(g.Map{"id": 1}).Update()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式批量写入
+func linkopBatchInsert1() {
+	fmt.Println("linkopBatchInsert1:")
+	r, err := db.Table("aa_user").Filter().Data(gdb.List{
+		{"id": 21, "name": "linkopBatchInsert1_john_1", "amt": 21.21, "tt": "haha"},
+		{"id": 22, "name": "linkopBatchInsert1_john_2", "amt": 22.22, "cc": "hahacc"},
+		{"id": 23, "name": "linkopBatchInsert1_john_3", "amt": 23.23, "bb": "hahabb"},
+		{"id": 24, "name": "linkopBatchInsert1_john_4", "amt": 24.24, "aa": "hahaaa"},
+	}).Insert()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式批量写入，指定每批次写入的条数
+func linkopBatchInsert2() {
+	fmt.Println("linkopBatchInsert2:")
+	r, err := db.Table("aa_user").Data(gdb.List{
+		{"id": 25, "name": "linkopBatchInsert2john_1"},
+		{"id": 26, "name": "linkopBatchInsert2john_2"},
+		{"id": 27, "name": "linkopBatchInsert2john_3"},
+		{"id": 28, "name": "linkopBatchInsert2john_4"},
+	}).Batch(2).Insert()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 链式批量保存
+func linkopBatchSave() {
+	fmt.Println("linkopBatchSave:")
+	r, err := db.Table("aa_user").Data(gdb.List{
+		{"id": 1, "name": "john_1"},
+		{"id": 2, "name": "john_2"},
+		{"id": 3, "name": "john_3"},
+		{"id": 4, "name": "john_4"},
+	}).Save()
+	if err == nil {
+		fmt.Println(r.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+	fmt.Println()
+}
+
+// 事务操作示例1
+func transaction1() {
+	fmt.Println("transaction1:")
+	if tx, err := db.Begin(); err == nil {
+		r, err := tx.Insert("aa_user", gdb.Map{
+			"id":   30,
+			"name": "transaction1",
+		})
+		tx.Rollback()
+		fmt.Println(r, err)
+	}
+	fmt.Println()
+}
+
+// 事务操作示例2
+func transaction2() {
+	fmt.Println("transaction2:")
+	if tx, err := db.Begin(); err == nil {
+		r, err := tx.Table("user_detail").Data(gdb.Map{"id": 5, "site": "www.baidu.com哈哈哈*?~!@#$%^&*()"}).Insert()
+		tx.Commit()
+		fmt.Println(r, err)
+	}
+	fmt.Println()
+}
+
+// 主从io复用测试，在mysql中使用 show full processlist 查看链接信息
+func keepPing() {
+	fmt.Println("keepPing:")
+	for i := 0; i < 30; i++ {
+		fmt.Println("ping...", i)
+		err := db.PingMaster()
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		err = db.PingSlave()
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		time.Sleep(1 * time.Second)
+	}
+}
+
+// like语句查询
+func likeQuery() {
+	fmt.Println("likeQuery:")
+	if r, err := db.Table("aa_user").Where("name like ?", "%john%").Select(); err == nil {
+		fmt.Println(r)
+	} else {
+		fmt.Println(err)
+	}
+}
+
+// mapToStruct
+func mapToStruct() {
+	type User struct {
+		Id   int
+		Name string
+		Age  int
+		Addr string
+	}
+	fmt.Println("mapToStruct:")
+	if r, err := db.Table("aa_user").Where("id=?", 1).One(); err == nil {
+		u := User{}
+		if err := r.ToStruct(&u); err == nil {
+			fmt.Println(r)
+			fmt.Println(u)
+		} else {
+			fmt.Println(err)
+		}
+	} else {
+		fmt.Println(err)
+	}
+}
+
+// getQueriedSqls
+func getQueriedSqls() {
+	for k, v := range db.GetQueriedSqls() {
+		fmt.Println(k, ":")
+		fmt.Println("Sql  :", v.Sql)
+		fmt.Println("Args :", v.Args)
+		fmt.Println("Error:", v.Error)
+	}
+}
+
+func main() {
+
+	db.PingMaster()
+	db.SetDebug(true)
+	/*err := create()
+	  if err != nil {
+	      return
+	  }*/
+
+	//test1
+	/*for i := 1; i < 5; i++ {
+	      insert(i)
+	  }
+	  query()
+	*/
+
+	//batchInsert()
+	//query()
+
+	//replace()
+	//save()
+
+	//update1()
+	//update2()
+	//update3()
+
+	/*linkopSelect1()
+	  linkopSelect2()
+	  linkopSelect3()
+	  linkopCount1()
+	*/
+
+	/*linkopUpdate1()
+	  linkopUpdate2()
+	  linkopUpdate3()
+	  linkopUpdate4()
+	*/
+
+	linkopBatchInsert1()
+	query()
+	//linkopBatchInsert2()
+
+	//transaction1()
+	//transaction2()
+	//
+	//keepPing()
+	//likeQuery()
+	//mapToStruct()
+	//getQueriedSqls()
+}

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

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	_ "github.com/mattn/go-sqlite3"
+)
+
+func main() {
+	gdb.SetConfig(gdb.Config{
+		"default": gdb.ConfigGroup{
+			gdb.ConfigNode{
+				Name: "/tmp/my.db",
+				Type: "sqlite",
+			},
+		},
+	})
+	db := g.DB()
+	if db == nil {
+		panic("db create failed")
+	}
+
+	// 创建表
+	sql := `CREATE TABLE user (
+       uid  INT PRIMARY KEY NOT NULL,
+       name VARCHAR(30) NOT NULL
+   );`
+	if _, err := db.Exec(sql); err != nil {
+		fmt.Println(err)
+	}
+
+	// 写入数据
+	result, err := db.Table("user").Data(g.Map{"uid": 1, "name": "john"}).Save()
+	if err == nil {
+		fmt.Println(result.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+
+	// 删除表
+	sql = `DROP TABLE user;`
+	if _, err := db.Exec(sql); err != nil {
+		fmt.Println(err)
+	}
+}

.example/database/gredis/gredis.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/database/gredis"
+	"github.com/gogf/gf/util/gconv"
+)
+
+// 使用原生gredis.New操作redis，但是注意需要自己调用Close方法关闭redis链接池
+func main() {
+	redis := gredis.New(gredis.Config{
+		Host: "127.0.0.1",
+		Port: 6379,
+	})
+	defer redis.Close()
+	redis.Do("SET", "k", "v")
+	v, _ := redis.Do("GET", "k")
+	fmt.Println(gconv.String(v))
+}

.example/database/gredis/gredis2.go

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

.example/database/gredis/gredis_conn_do.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+)
+
+func main() {
+	conn := g.Redis().Conn()
+	defer conn.Close()
+	conn.Do("SET", "k", "v")
+	v, _ := conn.Do("GET", "k")
+	fmt.Println(gconv.String(v))
+}

.example/database/gredis/gredis_conn_do_var.go

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

.example/database/gredis/gredis_conn_send.go

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

.example/database/gredis/gredis_conn_send_var.go

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

.example/database/gredis/gredis_conn_subscribe.go

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

.example/database/gredis/gredis_conn_subscribe_var.go

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

.example/debug/gdebug/gdebug.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/debug/gdebug"
+)
+
+func main() {
+	gdebug.PrintStack()
+	fmt.Println(gdebug.CallerPackage())
+	fmt.Println(gdebug.CallerFunction())
+}

.example/debug/gdebug/gdebug_info.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/debug/gdebug"
+)
+
+func main() {
+	fmt.Println(gdebug.BuildInfo())
+}

.example/encoding/gbase64/gbase64.go

@@ -0,0 +1,16 @@
+package gbase64
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gbase64"
+)
+
+func main() {
+	s := "john"
+	b := gbase64.Encode(s)
+	c, e := gbase64.Decode(b)
+	fmt.Println(b)
+	fmt.Println(c)
+	fmt.Println(e)
+}

.example/encoding/gbinary/binary.go

@@ -2,32 +2,26 @@ package main
 
 import (
 	"fmt"
-	"github.com/gogf/gf/g/encoding/gbinary"
-	"github.com/gogf/gf/g/os/glog"
+
+	"github.com/gogf/gf/encoding/gbinary"
+	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
 	// 使用gbinary.Encoded对基本数据类型进行二进制打包
-	if buffer, err := gbinary.Encode(18, 300, 1.01); err != nil {
-		glog.Error(err)
-	} else {
-		fmt.Println(buffer)
-	}
+	fmt.Println(gbinary.Encode(18, 300, 1.01))
 
 	// 使用gbinary.Decode对整形二进制解包，注意第二个及其后参数为字长确定的整形变量的指针地址，字长确定的类型，
 	// 例如：int8/16/32/64、uint8/16/32/64、float32/64
 	// 这里的1.01默认为float64类型(64位系统下)
-	if buffer, err := gbinary.Encode(18, 300, 1.01); err != nil {
+	buffer := gbinary.Encode(18, 300, 1.01)
+	var i1 int8
+	var i2 int16
+	var f3 float64
+	if err := gbinary.Decode(buffer, &i1, &i2, &f3); err != nil {
 		glog.Error(err)
 	} else {
-		var i1 int8
-		var i2 int16
-		var f3 float64
-		if err := gbinary.Decode(buffer, &i1, &i2, &f3); err != nil {
-			glog.Error(err)
-		} else {
-			fmt.Println(i1, i2, f3)
-		}
+		fmt.Println(i1, i2, f3)
 	}
 
 	// 编码/解析 int，自动识别变量长度

.example/encoding/gbinary/bits1.go

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

.example/encoding/gbinary/bits2.go

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

.example/encoding/gcfg/gcfg1.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	fmt.Println(g.Config().Get("redis"))
+
+	type RedisConfig struct {
+		Disk  string
+		Cache string
+	}
+
+	redisCfg := new(RedisConfig)
+	fmt.Println(g.Config().GetStruct("redis", redisCfg))
+	fmt.Println(redisCfg)
+}

.example/encoding/gcharset/gcharset.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gcharset"
+)
+
+func main() {
+	src := "~{;(<dR;:x>F#,6@WCN^O`GW!#"
+	srcCharset := "GB2312"
+	dstCharset := "UTF-8"
+	str, err := gcharset.Convert(dstCharset, srcCharset, src)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(str)
+	// output:
+	// 花间一壶酒，独酌无相亲。
+}

.example/encoding/gcompress/unzip.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gcompress"
+)
+
+func main() {
+	err := gcompress.UnZipFile(
+		`D:\Workspace\Go\GOPATH\src\github.com\gogf\gf\geg\encoding\gcompress\data.zip`,
+		`D:\Workspace\Go\GOPATH\src\github.com\gogf\gf\geg`,
+	)
+	fmt.Println(err)
+}

.example/encoding/gcompress/unzip_content.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gcompress"
+	"github.com/gogf/gf/os/gfile"
+)
+
+func main() {
+	err := gcompress.UnZipContent(
+		gfile.GetBytes(`D:\Workspace\Go\GOPATH\src\github.com\gogf\gf\geg\encoding\gcompress\data.zip`),
+		`D:\Workspace\Go\GOPATH\src\github.com\gogf\gf\geg`,
+	)
+	fmt.Println(err)
+}

.example/encoding/gcompress/zip.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"archive/zip"
+	"fmt"
+	"github.com/gogf/gf/encoding/gcompress"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+// srcFile could be a single file or a directory
+func Zip(srcFile string, destZip string) error {
+	zipfile, err := os.Create(destZip)
+	if err != nil {
+		return err
+	}
+	defer zipfile.Close()
+
+	archive := zip.NewWriter(zipfile)
+	defer archive.Close()
+
+	filepath.Walk(srcFile, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		header, err := zip.FileInfoHeader(info)
+		if err != nil {
+			return err
+		}
+
+		header.Name = strings.TrimPrefix(path, filepath.Dir(srcFile)+"/")
+		// header.Name = path
+		if info.IsDir() {
+			header.Name += "/"
+		} else {
+			header.Method = zip.Deflate
+		}
+
+		writer, err := archive.CreateHeader(header)
+		if err != nil {
+			return err
+		}
+
+		if !info.IsDir() {
+			file, err := os.Open(path)
+			if err != nil {
+				return err
+			}
+			defer file.Close()
+			_, err = io.Copy(writer, file)
+		}
+		return err
+	})
+
+	return err
+}
+
+func main() {
+	src := `/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/test`
+	dst := `/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/test.zip`
+	//src := `/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/README.MD`
+	//dst := `/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/README.MD.zip`
+	fmt.Println(gcompress.ZipPath(src, dst))
+	//fmt.Println(Zip(src, dst))
+}

.example/encoding/ghash/ghash_repeat_check.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/gogf/gf/encoding/ghash"
+)
+
+func main() {
+	m := make(map[uint64]bool)
+	for i := 0; i < 100000000; i++ {
+		hash := ghash.BKDRHash64([]byte("key_" + strconv.Itoa(i)))
+		if _, ok := m[hash]; ok {
+			fmt.Printf("duplicated hash %d\n", hash)
+		} else {
+			m[hash] = true
+		}
+	}
+}

.example/encoding/gini/gini.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/encoding/gini"
+)
+
+func main() {
+	s := `
+a = b
+
+`
+	m, err := gini.Decode([]byte(s))
+	fmt.Println(err)
+	fmt.Println(m)
+}

.example/encoding/gjson/gjson.go

@@ -0,0 +1,155 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/os/gtime"
+)
+
+func getByPattern() {
+	data :=
+		`{
+            "users" : {
+                    "count" : 100,
+                    "list"  : [
+                        {"name" : "小明",  "score" : 60},
+                        {"name" : "John", "score" : 99.5}
+                    ]
+            }
+        }`
+	j, err := gjson.DecodeToJson([]byte(data))
+	if err != nil {
+		glog.Error(err)
+	} else {
+		fmt.Println("John Score:", j.GetFloat32("users.list.1.score"))
+	}
+}
+
+// 当键名存在"."号时，检索优先级：键名->层级，因此不会引起歧义
+func testMultiDots() {
+	data :=
+		`{
+            "users" : {
+                "count" : 100
+            },
+            "users.count" : 101
+        }`
+	j, err := gjson.DecodeToJson([]byte(data))
+	if err != nil {
+		glog.Error(err)
+	} else {
+		fmt.Println("Users Count:", j.GetInt("users.count"))
+	}
+}
+
+// 设置数据
+func testSet() {
+	data :=
+		`{
+            "users" : {
+                "count" : 100
+            }
+        }`
+	j, err := gjson.DecodeToJson([]byte(data))
+	if err != nil {
+		glog.Error(err)
+	} else {
+		j.Set("users.count", 1)
+		j.Set("users.list", []string{"John", "小明"})
+		c, _ := j.ToJson()
+		fmt.Println(string(c))
+	}
+}
+
+// 将Json数据转换为其他数据格式
+func testConvert() {
+	data :=
+		`{
+            "users" : {
+                "count" : 100,
+                "list"  : ["John", "小明"]
+            }
+        }`
+	j, err := gjson.DecodeToJson([]byte(data))
+	if err != nil {
+		glog.Error(err)
+	} else {
+		c, _ := j.ToJson()
+		fmt.Println("JSON:")
+		fmt.Println(string(c))
+		fmt.Println("======================")
+
+		fmt.Println("XML:")
+		c, _ = j.ToXmlIndent()
+		fmt.Println(string(c))
+		fmt.Println("======================")
+
+		fmt.Println("YAML:")
+		c, _ = j.ToYaml()
+		fmt.Println(string(c))
+		fmt.Println("======================")
+
+		fmt.Println("TOML:")
+		c, _ = j.ToToml()
+		fmt.Println(string(c))
+	}
+}
+
+func testSplitChar() {
+	var v interface{}
+	j := gjson.New(nil)
+	t1 := gtime.TimestampNano()
+	j.Set("a.b.c.d.e.f.g.h.i.j.k", 1)
+	t2 := gtime.TimestampNano()
+	fmt.Println(t2 - t1)
+
+	t5 := gtime.TimestampNano()
+	v = j.Get("a.b.c.d.e.f.g.h.i.j.k")
+	t6 := gtime.TimestampNano()
+	fmt.Println(v)
+	fmt.Println(t6 - t5)
+
+	j.SetSplitChar('#')
+
+	t7 := gtime.TimestampNano()
+	v = j.Get("a#b#c#d#e#f#g#h#i#j#k")
+	t8 := gtime.TimestampNano()
+	fmt.Println(v)
+	fmt.Println(t8 - t7)
+}
+
+func testViolenceCheck() {
+	j := gjson.New(nil)
+	t1 := gtime.TimestampNano()
+	j.Set("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", 1)
+	t2 := gtime.TimestampNano()
+	fmt.Println(t2 - t1)
+
+	t3 := gtime.TimestampNano()
+	j.Set("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", 1)
+	t4 := gtime.TimestampNano()
+	fmt.Println(t4 - t3)
+
+	t5 := gtime.TimestampNano()
+	j.Get("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a")
+	t6 := gtime.TimestampNano()
+	fmt.Println(t6 - t5)
+
+	j.SetViolenceCheck(false)
+
+	t7 := gtime.TimestampNano()
+	j.Set("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", 1)
+	t8 := gtime.TimestampNano()
+	fmt.Println(t8 - t7)
+
+	t9 := gtime.TimestampNano()
+	j.Get("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a")
+	t10 := gtime.TimestampNano()
+	fmt.Println(t10 - t9)
+}
+
+func main() {
+	testViolenceCheck()
+}

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

@@ -0,0 +1,156 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gjson"
+)
+
+type XinYanModel struct {
+	Success   bool        `json:"success"`
+	Data      Data        `json:"data"`
+	ErrorCode interface{} `json:"errorCode"`
+	ErrorMsg  interface{} `json:"errorMsg"`
+}
+type ApplyReportDetail struct {
+	ApplyScore        string `json:"apply_score"`
+	ApplyCredibility  string `json:"apply_credibility"`
+	QueryOrgCount     string `json:"apply_query_org_count"`
+	QueryFinanceCount string `json:"apply_query_finance_count"`
+	QueryCashCount    string `json:"apply_query_cash_count"`
+	QuerySumCount     string `json:"apply_query_sum_count"`
+	LatestQueryTime   string `json:"apply_latest_query_time"`
+	LatestOneMonth    string `json:"apply_latest_one_month"`
+	LatestThreeMonth  string `json:"apply_latest_three_month"`
+	LatestSixMonth    string `json:"apply_latest_six_month"`
+}
+type BehaviorReportDetail struct {
+	LoansScore         string `json:"behavior_report_detailloans_score"`
+	LoansCredibility   string `json:"behavior_report_detailloans_credibility"`
+	LoansCount         string `json:"behavior_report_detailloans_count"`
+	LoansSettleCount   string `json:"behavior_report_detailloans_settle_count"`
+	LoansOverdueCount  string `json:"behavior_report_detailloans_overdue_count"`
+	LoansOrgCount      string `json:"behavior_report_detailloans_org_count"`
+	ConsfinOrgCount    string `json:"behavior_report_detailconsfin_org_count"`
+	LoansCashCount     string `json:"behavior_report_detailloans_cash_count"`
+	LatestOneMonth     string `json:"behavior_report_detaillatest_one_month"`
+	LatestThreeMonth   string `json:"behavior_report_detaillatest_three_month"`
+	LatestSixMonth     string `json:"behavior_report_detaillatest_six_month"`
+	HistorySucFee      string `json:"behavior_report_detailhistory_suc_fee"`
+	HistoryFailFee     string `json:"behavior_report_detailhistory_fail_fee"`
+	LatestOneMonthSuc  string `json:"behavior_report_detaillatest_one_month_suc"`
+	LatestOneMonthFail string `json:"behavior_report_detaillatest_one_month_fail"`
+	LoansLongTime      string `json:"behavior_report_detailloans_long_time"`
+	LoansLatestTime    string `json:"behavior_report_detailloans_latest_time"`
+}
+type CurrentReportDetail struct {
+	LoansCreditLimit    string `json:"current_report_detailloans_credit_limit"`
+	LoansCredibility    string `json:"current_report_detailloans_credibility"`
+	LoansOrgCount       string `json:"current_report_detailloans_org_count"`
+	LoansProductCount   string `json:"current_report_detailloans_product_count"`
+	LoansMaxLimit       string `json:"current_report_detailloans_max_limit"`
+	LoansAvgLimit       string `json:"current_report_detailloans_avg_limit"`
+	ConsfinCreditLimit  string `json:"current_report_detailconsfin_credit_limit"`
+	ConsfinCredibility  string `json:"current_report_detailconsfin_credibility"`
+	ConsfinOrgCount     string `json:"current_report_detailconsfin_org_count"`
+	ConsfinProductCount string `json:"current_report_detailconsfin_product_count"`
+	ConsfinMaxLimit     string `json:"current_report_detailconsfin_max_limit"`
+	ConsfinAvgLimit     string `json:"current_report_detailconsfin_avg_limit"`
+}
+type ResultDetail struct {
+	ApplyReportDetail    ApplyReportDetail    `json:"apply_report_detail"`
+	BehaviorReportDetail BehaviorReportDetail `json:"behavior_report_detail"`
+	CurrentReportDetail  CurrentReportDetail  `json:"current_report_detail"`
+}
+type Data struct {
+	Code         string       `json:"code"`
+	Desc         string       `json:"desc1"`
+	TransID      string       `json:"trans_id"`
+	TradeNo      string       `json:"trade_no"`
+	Fee          string       `json:"fee"`
+	IDNo         string       `json:"id_no"`
+	IDName       string       `json:"id_name"`
+	Versions     string       `json:"versions"`
+	ResultDetail ResultDetail `json:"result_detail"`
+}
+
+var data = `{
+    "success": true,
+    "data": {
+        "code": "0",
+        "desc": "查询成功",
+        "trans_id": "14910304379231213",
+        "trade_no": "201704011507240100057329",
+        "fee": "Y",
+        "id_no": "0783231bcc39f4957e99907e02ae401c",
+        "id_name": "dd67a5943781369ddd7c594e231e9e70 ",
+        "versions": "1.0.0",
+        "result_detail":{
+            "apply_report_detail": {
+                "apply_score": "189",
+                "apply_credibility": "84",
+                "query_org_count": "7",
+                "query_finance_count": "2",
+                "query_cash_count": "2",
+                "query_sum_count": "13",
+                "latest_query_time": "2017-09-03",
+                "latest_one_month": "1",
+                "latest_three_month": "5",
+                "latest_six_month": "12"
+            },
+            "behavior_report_detail": {
+                "loans_score": "199",
+                "loans_credibility": "90",
+                "loans_count": "300",
+                "loans_settle_count": "280",
+                "loans_overdue_count": "20",
+                "loans_org_count": "5",
+                "consfin_org_count": "3",
+                "loans_cash_count": "2",
+                "latest_one_month": "3",
+                "latest_three_month": "20",
+                "latest_six_month": "23",
+                "history_suc_fee": "30",
+                "history_fail_fee": "25",
+                "latest_one_month_suc": "5",
+                "latest_one_month_fail": "20",
+                "loans_long_time": "130",
+                "loans_latest_time": "2017-09-16"
+            },
+            "current_report_detail": {
+                "loans_credit_limit": "1400",
+                "loans_credibility": "80",
+                "loans_org_count": "7",
+                "loans_product_count": "8",
+                "loans_max_limit": "2000",
+                "loans_avg_limit": "1000",
+                "consfin_credit_limit": "1500",
+                "consfin_credibility": "90",
+                "consfin_org_count": "8",
+                "consfin_product_count": "5",
+                "consfin_max_limit": "5000",
+                "consfin_avg_limit": "3000"
+            }
+        }
+    },
+    "errorCode": null,
+    "errorMsg": null
+}`
+
+func main() {
+	struct1 := new(XinYanModel)
+	err := json.Unmarshal([]byte(data), struct1)
+	fmt.Println(err)
+	fmt.Println(struct1)
+
+	fmt.Println()
+
+	struct2 := new(XinYanModel)
+	j, err := gjson.DecodeToJson(data)
+	fmt.Println(err)
+	fmt.Println(j.Get("data.desc"))
+	err = j.ToStruct(struct2)
+	fmt.Println(err)
+	fmt.Println(struct2)
+}

.example/encoding/gjson/issue283.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"github.com/gogf/gf/encoding/gjson"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/glog"
+)
+
+type GameUser struct {
+	Uid        int         `json:"uid"`
+	Account    string      `json:"account"`
+	Tel        string      `json:"tel"`
+	Role       string      `json:"role"`
+	Vip        int         `json:"vip"`
+	GameLevel  int         `json:"gamelevel"`
+	Diamond    int         `json:"diamond"`
+	Coin       int         `json:"coin"`
+	Value      int         `json:"value"`
+	Area       string      `json:"area"`
+	ServerName string      `json:"servername"`
+	Time       int         `json:"time"`
+	ClientInfo *ClientInfo `json:"client_info"`
+}
+
+type ClientInfo struct {
+	ClientGuid       string `json:"client_guid"`
+	ClientType       int    `json:"client_type"`
+	ClientSDKVersion string `json:"client_sdk_version"`
+	ClientVersion    string `json:"client_version"`
+	PackageId        string `json:"packageid"`
+	PhoneType        string `json:"phone_type"`
+	DevicesId        string `json:"devices_id"`
+	ClientMac        string `json:"client_mac"`
+}
+
+func main() {
+	s := `{
+    "uid":9527,          			    
+    "account":"zhangsan",          	    
+    "tel":"15248787",          	     
+    "role":"test",          		   
+    "vip":7,          		   			
+    "gamelevel":59,          		  
+    "diamond ":59,          		   
+    "coin ":59,          		      
+    "value ":99,          		   
+    "area":"s",          		       
+    "servername":"灵动",          	
+    "time":15454878787,          	
+    "client_info": {
+		"client_guid": "aaaa", 
+		"client_type": 1,      
+		"client_sdk_version": "1.0.1",  
+		"client_version": "1.0.1",     
+		"packageid":"",                 
+		"phone_type": "vivi",
+		"devices_id":"",   
+		"client_mac":""      
+    }
+}`
+
+	gameUser := &GameUser{}
+	err := gjson.DecodeTo(s, gameUser)
+	if err != nil {
+		glog.Error(err)
+	}
+	g.Dump(gameUser)
+
+}

.example/encoding/gjson/issue360.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/encoding/gjson"
+)
+
+func main() {
+	s := `
+{"apiVersion":"v1","kind":"Service","metadata":{"labels":{"name":"http-daemon"},"name":"http-daemon","namespace":"default"},"spec":{"ports":[{"name":"http-daemon","port":8080,"protocol":"TCP","targetPort":9212}],"selector":{"app":"http-daemon","version":"v0930-082326"}}}
+`
+	js, err := gjson.DecodeToJson(s)
+	if err != nil {
+		panic(err)
+	}
+	//g.Dump(js.ToMap())
+	y, _ := js.ToYamlString()
+	fmt.Println(y)
+}

.example/encoding/gparser/config.yaml

@@ -0,0 +1,44 @@
+
+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: ""
+
+
+
+
+
+
+
+
+
+
+
+

.example/encoding/gparser/gparser.go

@@ -0,0 +1,217 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/encoding/gparser"
+	"github.com/gogf/gf/os/glog"
+)
+
+func getWithPattern1() {
+	data :=
+		`{
+            "users" : {
+                    "count" : 100,
+                    "list"  : [
+                        {"name" : "Ming", "score" : 60},
+                        {"name" : "John", "score" : 99.5}
+                    ]
+            }
+        }`
+
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
+		glog.Error(e)
+	} else {
+		fmt.Println("John Score:", p.GetFloat32("users.list.1.score"))
+	}
+}
+
+func getWithPattern2() {
+	data :=
+		`<?xml version="1.0" encoding="UTF-8"?>
+         <note>
+           <to>Tove</to>
+           <from>Jani</from>
+           <heading>Reminder</heading>
+           <body>Don't forget me this weekend!</body>
+         </note>`
+
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
+		glog.Error(e)
+	} else {
+		fmt.Println("Heading:", p.GetString("note.heading"))
+	}
+}
+
+// 当键名存在"."号时，检索优先级：键名->层级，因此不会引起歧义
+func multiDots1() {
+	data :=
+		`{
+            "users" : {
+                "count" : 100
+            },
+            "users.count" : 101
+        }`
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
+		glog.Error(e)
+	} else {
+		fmt.Println("Users Count:", p.Get("users.count"))
+	}
+}
+
+func multiDots2() {
+	data :=
+		`{
+            "users" : {
+                "count" : {
+                    "type1" : 1,
+                    "type2" : 2
+                },
+                "count.type1" : 100
+            }
+        }`
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
+		glog.Error(e)
+	} else {
+		fmt.Println("Users Count:", p.Get("users.count.type1"))
+		fmt.Println("Users Count:", p.Get("users.count.type2"))
+	}
+}
+
+// 设置数据
+func set1() {
+	data :=
+		`<?xml version="1.0" encoding="UTF-8"?>
+         <article>
+           <count>10</count>
+           <list><title>gf article1</title><content>gf content1</content></list>
+           <list><title>gf article2</title><content>gf content2</content></list>
+           <list><title>gf article3</title><content>gf content3</content></list>
+         </article>`
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
+		glog.Error(e)
+	} else {
+		p.Set("article.list.0", nil)
+		c, _ := p.ToJson()
+		fmt.Println(string(c))
+		// {"article":{"count":"10","list":[{"content":"gf content2","title":"gf article2"},{"content":"gf content3","title":"gf article3"}]}}
+	}
+}
+
+func set2() {
+	data :=
+		`{
+            "users" : {
+                "count" : 100
+            }
+        }`
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
+		glog.Error(e)
+	} else {
+		p.Set("users.count", 1)
+		p.Set("users.list", []string{"John", "小明"})
+		c, _ := p.ToJson()
+		fmt.Println(string(c))
+	}
+}
+
+func makeXml1() {
+	p := gparser.New(nil)
+	p.Set("name", "john")
+	p.Set("age", 18)
+	p.Set("scores", map[string]int{
+		"语文": 100,
+		"数学": 100,
+		"英语": 100,
+	})
+	c, _ := p.ToXmlIndent("simple-xml")
+	fmt.Println(string(c))
+}
+
+func makeJson1() {
+	type Order struct {
+		Id    int     `json:"id"`
+		Price float32 `json:"price"`
+	}
+	p := gparser.New(nil)
+	p.Set("orders.list.0", Order{1, 100})
+	p.Set("orders.list.1", Order{2, 666})
+	p.Set("orders.list.2", Order{3, 999.99})
+	fmt.Println("Order 1 Price:", p.Get("orders.list.1.price"))
+	c, _ := p.ToJson()
+	fmt.Println(string(c))
+}
+
+func makeJson2() {
+	p := gparser.New(map[string]string{
+		"k1": "v1",
+		"k2": "v2",
+	})
+	p.Set("k1.1", []int{1, 2, 3})
+	//p.Set("0.0.1", []int{1,2,3})
+	c, _ := p.ToJson()
+	fmt.Println(string(c))
+}
+
+func makeJson3() {
+	p := gparser.New([]string{"a"})
+	p.Set("0.0.0", []int{1, 2, 3})
+	c, _ := p.ToJson()
+	fmt.Println(string(c))
+}
+
+func toStruct1() {
+	type Info struct {
+		Name string
+		Url  string
+	}
+	o := Info{}
+	p := gparser.New(map[string]string{
+		"Name": "gf",
+		"Url":  "https://gitee.com/johng",
+	})
+	p.ToStruct(&o)
+	fmt.Println("Name:", o.Name)
+	fmt.Println("Url :", o.Url)
+}
+
+func convert() {
+	p := gparser.New(map[string]string{
+		"name": "gf",
+		"site": "https://gitee.com/johng",
+	})
+	c, _ := p.ToJson()
+	fmt.Println("JSON:")
+	fmt.Println(string(c))
+	fmt.Println("======================")
+
+	fmt.Println("XML:")
+	c, _ = p.ToXmlIndent()
+	fmt.Println(string(c))
+	fmt.Println("======================")
+
+	fmt.Println("YAML:")
+	c, _ = p.ToYaml()
+	fmt.Println(string(c))
+	fmt.Println("======================")
+
+	fmt.Println("TOML:")
+	c, _ = p.ToToml()
+	fmt.Println(string(c))
+
+}
+
+func remove1() {
+	p := gparser.New(map[string]string{
+		"k1": "v1",
+		"k2": "v2",
+	})
+	p.Set("0.0.0.0.0.0.0.0", []int{1, 2, 3})
+	p.Remove("0.0")
+	c, _ := p.ToJson()
+	fmt.Println(string(c))
+}
+
+func main() {
+	toStruct1()
+}

.example/encoding/gparser/gparser_xml.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/gogf/gf/g/encoding/gparser"
+import "github.com/gogf/gf/encoding/gparser"
 
 func main() {
 	xml := `<?xml version="1.0" encoding="GBK"?>