improve ghttp for session storage with redis server

sync master

.gitignore

@@ -15,4 +15,3 @@ cbuild
 **/.DS_Store
 .vscode/
 go.sum
-

.travis.yml

@@ -21,7 +21,7 @@ addons:
   - local
 
 before_install:
-- pwd
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
 
 install:
 - cat /etc/hosts

DONATOR.MD

@@ -4,7 +4,7 @@
 | Name | Channel | Amount
 |---|---|---
 |[hailaz](https://gitee.com/hailaz)|gitee|￥20.00
-|[ireadx](https://github.com/ireadx)|alipay|￥201.00
+|[ireadx](https://github.com/ireadx)|alipay|￥301.00
 |[mg91](https://gitee.com/mg91)|gitee|￥10.00
 |[pibigstar](https://github.com/pibigstar)|alipay|￥10.00
 |[tiangenglan](https://gitee.com/tiangenglan)|gitee|￥30.00
@@ -15,6 +15,7 @@
 |x*z|wechat|￥20.00
 |潘兄|wechat|￥100.00
 |Fly的狐狸|wechat|￥100.00
+|全|alipay|￥100.00
 |土豆相公|alipay|￥66.60
 |Hades|alipay|￥66.66
 |蔡蔡|wechat|￥666.00

RELEASE.MD

@@ -1,4 +1,76 @@
-# `v1.7.0`
+# `v1.8.0` (2019-07-15)
+
+## 新功能改进
+1. 框架目前 `69` 个开发模块（不包括内部模块），原生代码 `65302` 行（不包含第三包依赖包），单元测试覆盖率达到`77%`；
+1. 新增`gerror`错误处理模块：https://goframe.org/errors/gerror/index
+1. 改进`gcharset`字符编码转换模块，支持更多的字符集：https://goframe.org/encoding/gcharset/index
+1. 新增`gmutex`模块，基于`channel`实现的高级互斥锁模块，支持更丰富的互斥锁特性：https://goframe.org/os/gmutex/index
+1. 改进`glog`日志模块：
+    - 新增日志异步输出特性：https://goframe.org/os/glog/async
+    - 新增`Flags`额外功能特性：https://goframe.org/os/glog/flags
+    - 新增`Json`数据格式输出：https://goframe.org/os/glog/json
+    - 新增自定义`Writer`接口特性：https://goframe.org/os/glog/writer
+    - **修改`Backtrace`名称为`Stack`，并改进调用堆栈输出格式；**
+    - 新增`Expose`方法暴露内部默认`Logger`对象；
+1. 改进`gdb`数据库ORM模块：
+    - **改进错误处理，当数据库操作没有查询到数据时，`error`返回`sql.ErrNoRows`**：https://goframe.org/database/gdb/error
+    - 改进`Update`/`Delete`方法支持`Order BY`及`LIMIT`特性；
+    - 数据库链式操作及方法操作中，预处理变量参数支持`slice`参数：https://goframe.org/database/gdb/chaining/model
+    - **修改`Priority`权重配置名称为`Weight`；**
+    - 新增`Debug`配置，可配置开启/关闭调试特性：https://goframe.org/database/gdb/config
+    - 新增`Offset`方法，该方法为可选链式操作方法，`pgsql`数据库可直接通过`Limit`方法第二个参数自动识别为`Offset`语法；
+    - 改进数据库动态切换特性，支持不同数据库类型的当前操作数据库切换；
+    - 改进简化配置文件结构：https://goframe.org/database/gdb/config
+1. 改进`gconv`数据转换模块：
+    - 对结构体对象转换时支持更多的标签：`gconv/c/json`；
+    - 支持`*struct/[]struct/[]*struct`自动初始化创建对象/数组：https://goframe.org/util/gconv/struct
+    - 新增`Strusts/StrctsDeep`方法，用于结构体数组的递归转换；
+    - 新增`StructDeep`方法，用于对结构体对象的递归转换；
+    - 新增`MapDeep`方法，用于对结构体属性的递归转换；
+1. 改进`ghttp`模块：
+    - 改进`ghttp`模块的分组路由功能，完善逻辑处理细节，程序更加稳健；
+    - 改进`ghttp.Request.Get*ToStruct`方法，支持`params/param/p`标签，支持结构体递归转换，并且支持`**struct`参数的对象自动初始化；
+    - 改进`ghttp.CORSDefault`的跨域设置参数，`AllowOrigin`参数调整为`*`；
+1. 改进`gvalid`数据校验模块：
+    - 增加对校验标签`gvalid/valid/v`的支持；
+    - 改进`CheckStruct`支持对结构体对象的递归校验：https://goframe.org/util/gvalid/checkstruct
+1. 改进`gtcp`TCP通信模块：
+    - 改进通信包协议设计，更加轻量级高效：https://goframe.org/net/gtcp/conn/pkg
+    - 改进`TCP Server`增加对`TLS`的支持：https://goframe.org/net/gtcp/tls
+    - 增加`Server.Cloce`服务端关闭方法；
+1. 改进`gproc`模块的通信数据结构，并使用`gtcp`的轻量级包协议重构消息发送逻辑；
+1. 改进`gqueue`模块增加数据同步缓冲机制，解决大数据量下的内存占用及延迟问题；
+1. 改进`gmlock`模块，使用`gmutex`模块替换内部的互斥锁，增加更多的操作方法；
+1. 改进`gaes`加密模块，增加`CBC`模式的加密/解密方法：
+1. 改进`garray.Range/SubSlice`方法，改进设计，提高性能；
+1. 改进`gjson`/`gparser`模块实现`MarshalJSON`接口以实现自定义的`JSON`数据格式转换；
+1. **改进`crypto`分类下模块的方法返回值，增加`error`错误变量返回，以保证更严谨的接口设计风格；**
+1. **改进`gbase64`模块，输入输出类型发生改变，并增加多个相关方法；**
+1. 改进`gflock`修改方法名`UnLock`为`Unlock`，新增`IsRLocked`方法；
+1. 新增`gfile.CopyFile/CopyDir`方法，用于文件及目录的复制；
+1. 改进`gjson/gparser/gvar/gcfg`模块增加更多的类型转换方法；
+1. 改进`gcache`模块，过期时间参数支持`time.Duration`类型；
+1. 新增`internal/structs`包，强大且便捷的结构体解析，并改进框架中所有涉及到结构体反射处理的模块；
+1. 改进`gbinary`增加封装方法对`BigEndian`的支持；
+
+## Bug Fix
+1. 修复`garray.Search`返回值问题；
+1. 修复`garray.Contains`, `garray.New*ArrayFromCopy`方法逻辑问题；
+1. 修复`gjson.Remove`删除`slice`参数问题；
+1. 修复`gtree.AVLTree.Remove`方法返回值问题；
+1. 修复`gqueue.Size`不准确的大小问题；
+1. 修复`queue.Close`问题；
+1. 修复`gcache.GetOrSetLockFunc`当回调函数返回`nil`结果时的死锁问题；
+1. 修复`gfsnotify.Add`方法默认递归监控添加失效问题；
+1. 修复`gdb.Model.Scan`在某些参数类型下的失效问题；
+
+## 注意事项
+
+请注意以上粗体文字部分，如有使用，在您升级时可能会出现不兼容性。
+
+
+
+# `v1.7.0` (2019-06-10)
 ## 新功能/改进
 1. 重构改进`glog`模块：
     - 去掉日志模块所有的锁机制，改为无锁设计，执行性能更加高效

g/container/garray/garray_normal_int.go

@@ -8,7 +8,7 @@ package garray
 
 import (
 	"bytes"
-	"fmt"
+	"encoding/json"
 	"math"
 	"sort"
 
@@ -614,5 +614,13 @@ func (a *IntArray) CountValues() map[int]int {
 func (a *IntArray) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	return fmt.Sprint(a.array)
+	jsonContent, _ := json.Marshal(a.array)
+	return string(jsonContent)
+}
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (a *IntArray) MarshalJSON() ([]byte, error) {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return json.Marshal(a.array)
 }

g/container/garray/garray_normal_interface.go

@@ -8,7 +8,7 @@ package garray
 
 import (
 	"bytes"
-	"fmt"
+	"encoding/json"
 	"math"
 	"sort"
 
@@ -608,5 +608,13 @@ func (a *Array) CountValues() map[interface{}]int {
 func (a *Array) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	return fmt.Sprint(a.array)
+	jsonContent, _ := json.Marshal(a.array)
+	return string(jsonContent)
+}
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (a *Array) MarshalJSON() ([]byte, error) {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return json.Marshal(a.array)
 }

g/container/garray/garray_normal_string.go

@@ -8,7 +8,7 @@ package garray
 
 import (
 	"bytes"
-	"fmt"
+	"encoding/json"
 	"math"
 	"sort"
 	"strings"
@@ -614,5 +614,13 @@ func (a *StringArray) CountValues() map[string]int {
 func (a *StringArray) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	return fmt.Sprint(a.array)
+	jsonContent, _ := json.Marshal(a.array)
+	return string(jsonContent)
+}
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (a *StringArray) MarshalJSON() ([]byte, error) {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return json.Marshal(a.array)
 }

g/container/garray/garray_sorted_int.go

@@ -8,7 +8,7 @@ package garray
 
 import (
 	"bytes"
-	"fmt"
+	"encoding/json"
 	"math"
 	"sort"
 
@@ -539,5 +539,13 @@ func (a *SortedIntArray) CountValues() map[int]int {
 func (a *SortedIntArray) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	return fmt.Sprint(a.array)
+	jsonContent, _ := json.Marshal(a.array)
+	return string(jsonContent)
+}
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (a *SortedIntArray) MarshalJSON() ([]byte, error) {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return json.Marshal(a.array)
 }

g/container/garray/garray_sorted_interface.go

@@ -8,7 +8,7 @@ package garray
 
 import (
 	"bytes"
-	"fmt"
+	"encoding/json"
 	"math"
 	"sort"
 
@@ -540,5 +540,13 @@ func (a *SortedArray) CountValues() map[interface{}]int {
 func (a *SortedArray) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	return fmt.Sprint(a.array)
+	jsonContent, _ := json.Marshal(a.array)
+	return string(jsonContent)
+}
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (a *SortedArray) MarshalJSON() ([]byte, error) {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return json.Marshal(a.array)
 }

g/container/garray/garray_sorted_string.go

@@ -8,7 +8,7 @@ package garray
 
 import (
 	"bytes"
-	"fmt"
+	"encoding/json"
 	"math"
 	"sort"
 	"strings"
@@ -534,5 +534,13 @@ func (a *SortedStringArray) CountValues() map[string]int {
 func (a *SortedStringArray) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	return fmt.Sprint(a.array)
+	jsonContent, _ := json.Marshal(a.array)
+	return string(jsonContent)
+}
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (a *SortedStringArray) MarshalJSON() ([]byte, error) {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	return json.Marshal(a.array)
 }

g/container/garray/garray_z_bench_test.go

@@ -9,8 +9,9 @@
 package garray_test
 
 import (
-	"github.com/gogf/gf/g/container/garray"
 	"testing"
+
+	"github.com/gogf/gf/g/container/garray"
 )
 
 var (

g/container/glist/glist_z_bench_test.go

@@ -13,41 +13,49 @@ import (
 )
 
 var (
-	l  = New()
-	bn = 20000000
+	l = New()
 )
 
 func Benchmark_PushBack(b *testing.B) {
-	b.N = bn
-	for i := 0; i < b.N; i++ {
-		l.PushBack(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			l.PushBack(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_PushFront(b *testing.B) {
-	b.N = bn
-	for i := 0; i < b.N; i++ {
-		l.PushFront(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			l.PushFront(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_Len(b *testing.B) {
-	b.N = bn
-	for i := 0; i < b.N; i++ {
-		l.Len()
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			l.Len()
+		}
+	})
 }
 
 func Benchmark_PopFront(b *testing.B) {
-	b.N = bn
-	for i := 0; i < b.N; i++ {
-		l.PopFront()
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			l.PopFront()
+		}
+	})
 }
 
 func Benchmark_PopBack(b *testing.B) {
-	b.N = bn
-	for i := 0; i < b.N; i++ {
-		l.PopBack()
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			l.PopBack()
+		}
+	})
 }

g/container/glist/glist_z_unit_test.go

@@ -8,6 +8,7 @@ package glist
 
 import (
 	"container/list"
+
 	"github.com/gogf/gf/g/test/gtest"
 	"github.com/gogf/gf/g/util/gconv"
 
@@ -407,17 +408,18 @@ func TestList_PushBacks(t *testing.T) {
 }
 
 func TestList_PopBacks(t *testing.T) {
-	l := New()
-	a1 := []interface{}{1, 2, 3, 4}
-	a2 := []interface{}{"a", "c", "b", "e"}
-	l.PushFronts(a1)
-	i1 := l.PopBacks(2)
-	gtest.Assert(i1, []interface{}{"1", "2"})
-
-	l.PushBacks(a2) //4.3,a,c,b,e
-	i1 = l.PopBacks(3)
-	gtest.Assert(i1, []interface{}{"e", "b", "c"})
+	gtest.Case(t, func() {
+		l := New()
+		a1 := []interface{}{1, 2, 3, 4}
+		a2 := []interface{}{"a", "c", "b", "e"}
+		l.PushFronts(a1)
+		i1 := l.PopBacks(2)
+		gtest.Assert(i1, []interface{}{1, 2})
 
+		l.PushBacks(a2) //4.3,a,c,b,e
+		i1 = l.PopBacks(3)
+		gtest.Assert(i1, []interface{}{"e", "b", "c"})
+	})
 }
 
 func TestList_PopFronts(t *testing.T) {
@@ -425,7 +427,7 @@ func TestList_PopFronts(t *testing.T) {
 	a1 := []interface{}{1, 2, 3, 4}
 	l.PushFronts(a1)
 	i1 := l.PopFronts(2)
-	gtest.Assert(i1, []interface{}{"4", "3"})
+	gtest.Assert(i1, []interface{}{4, 3})
 	gtest.Assert(l.Len(), 2)
 }
 

g/container/gmap/gmap_hash_any_any_map.go

@@ -7,6 +7,10 @@
 package gmap
 
 import (
+	"encoding/json"
+
+	"github.com/gogf/gf/g/util/gconv"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
 )
@@ -328,3 +332,8 @@ func (m *AnyAnyMap) Merge(other *AnyAnyMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *AnyAnyMap) MarshalJSON() ([]byte, error) {
+	return json.Marshal(gconv.Map(m.Map()))
+}

g/container/gmap/gmap_hash_int_any_map.go

@@ -8,6 +8,8 @@
 package gmap
 
 import (
+	"encoding/json"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
 	"github.com/gogf/gf/g/util/gconv"
@@ -330,3 +332,10 @@ func (m *IntAnyMap) Merge(other *IntAnyMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *IntAnyMap) MarshalJSON() ([]byte, error) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return json.Marshal(m.data)
+}

g/container/gmap/gmap_hash_int_int_map.go

@@ -7,6 +7,8 @@
 package gmap
 
 import (
+	"encoding/json"
+
 	"github.com/gogf/gf/g/internal/rwmutex"
 )
 
@@ -306,3 +308,10 @@ func (m *IntIntMap) Merge(other *IntIntMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *IntIntMap) MarshalJSON() ([]byte, error) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return json.Marshal(m.data)
+}

g/container/gmap/gmap_hash_int_str_map.go

@@ -7,6 +7,8 @@
 package gmap
 
 import (
+	"encoding/json"
+
 	"github.com/gogf/gf/g/internal/rwmutex"
 	"github.com/gogf/gf/g/util/gconv"
 )
@@ -307,3 +309,10 @@ func (m *IntStrMap) Merge(other *IntStrMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *IntStrMap) MarshalJSON() ([]byte, error) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return json.Marshal(m.data)
+}

g/container/gmap/gmap_hash_str_any_map.go

@@ -8,6 +8,8 @@
 package gmap
 
 import (
+	"encoding/json"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
 	"github.com/gogf/gf/g/util/gconv"
@@ -332,3 +334,10 @@ func (m *StrAnyMap) Merge(other *StrAnyMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *StrAnyMap) MarshalJSON() ([]byte, error) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return json.Marshal(m.data)
+}

g/container/gmap/gmap_hash_str_int_map.go

@@ -8,6 +8,8 @@
 package gmap
 
 import (
+	"encoding/json"
+
 	"github.com/gogf/gf/g/internal/rwmutex"
 	"github.com/gogf/gf/g/util/gconv"
 )
@@ -310,3 +312,10 @@ func (m *StrIntMap) Merge(other *StrIntMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *StrIntMap) MarshalJSON() ([]byte, error) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return json.Marshal(m.data)
+}

g/container/gmap/gmap_hash_str_str_map.go

@@ -8,6 +8,8 @@
 package gmap
 
 import (
+	"encoding/json"
+
 	"github.com/gogf/gf/g/internal/rwmutex"
 )
 
@@ -309,3 +311,10 @@ func (m *StrStrMap) Merge(other *StrStrMap) {
 		m.data[k] = v
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *StrStrMap) MarshalJSON() ([]byte, error) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return json.Marshal(m.data)
+}

g/container/gmap/gmap_link_map.go

@@ -7,6 +7,10 @@
 package gmap
 
 import (
+	"encoding/json"
+
+	"github.com/gogf/gf/g/util/gconv"
+
 	"github.com/gogf/gf/g/container/glist"
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
@@ -364,3 +368,8 @@ func (m *ListMap) Merge(other *ListMap) {
 		return true
 	})
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (m *ListMap) MarshalJSON() ([]byte, error) {
+	return json.Marshal(gconv.Map(m.Map()))
+}

g/container/gmap/gmap_z_bench_maps_test.go

@@ -9,9 +9,10 @@
 package gmap_test
 
 import (
+	"testing"
+
 	"github.com/gogf/gf/g/container/gmap"
 	"github.com/gogf/gf/g/util/gutil"
-	"testing"
 )
 
 var hashMap = gmap.New()
@@ -19,37 +20,61 @@ var listMap = gmap.NewListMap()
 var treeMap = gmap.NewTreeMap(gutil.ComparatorInt)
 
 func Benchmark_HashMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		hashMap.Set(i, i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			hashMap.Set(i, i)
+			i++
+		}
+	})
 }
 
 func Benchmark_ListMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		listMap.Set(i, i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			listMap.Set(i, i)
+			i++
+		}
+	})
 }
 
 func Benchmark_TreeMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		treeMap.Set(i, i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			treeMap.Set(i, i)
+			i++
+		}
+	})
 }
 
 func Benchmark_HashMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		hashMap.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			hashMap.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_ListMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		listMap.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			listMap.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_TreeMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		treeMap.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			treeMap.Get(i)
+			i++
+		}
+	})
 }

g/container/gmap/gmap_z_bench_safe_test.go

@@ -9,99 +9,162 @@
 package gmap_test
 
 import (
-	"github.com/gogf/gf/g/container/gmap"
 	"strconv"
 	"testing"
+
+	"github.com/gogf/gf/g/container/gmap"
 )
 
-var ififm = gmap.New()
-var iim = gmap.NewIntIntMap()
-var iifm = gmap.NewIntAnyMap()
-var ism = gmap.NewIntStrMap()
-var sim = gmap.NewStrIntMap()
-var sifm = gmap.NewStrAnyMap()
-var ssm = gmap.NewStrStrMap()
+var anyAnyMap = gmap.NewAnyAnyMap()
+var intIntMap = gmap.NewIntIntMap()
+var intAnyMap = gmap.NewIntAnyMap()
+var intStrMap = gmap.NewIntStrMap()
+var strIntMap = gmap.NewStrIntMap()
+var strAnyMap = gmap.NewStrAnyMap()
+var strStrMap = gmap.NewStrStrMap()
 
 func Benchmark_IntIntMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		iim.Set(i, i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intIntMap.Set(i, i)
+			i++
+		}
+	})
 }
 
 func Benchmark_IntAnyMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		iifm.Set(i, i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intAnyMap.Set(i, i)
+			i++
+		}
+	})
 }
 
 func Benchmark_IntStrMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ism.Set(i, strconv.Itoa(i))
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intStrMap.Set(i, "123456789")
+			i++
+		}
+	})
 }
 
 func Benchmark_AnyAnyMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ififm.Set(i, i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			anyAnyMap.Set(i, i)
+			i++
+		}
+	})
 }
 
+// Note that there's additional performance cost for string conversion.
 func Benchmark_StrIntMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		sim.Set(strconv.Itoa(i), i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strIntMap.Set(strconv.Itoa(i), i)
+			i++
+		}
+	})
 }
 
+// Note that there's additional performance cost for string conversion.
 func Benchmark_StrAnyMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		sifm.Set(strconv.Itoa(i), i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strAnyMap.Set(strconv.Itoa(i), i)
+			i++
+		}
+	})
 }
 
+// Note that there's additional performance cost for string conversion.
 func Benchmark_StrStrMap_Set(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ssm.Set(strconv.Itoa(i), strconv.Itoa(i))
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strStrMap.Set(strconv.Itoa(i), "123456789")
+			i++
+		}
+	})
 }
 
 func Benchmark_IntIntMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		iim.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intIntMap.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_IntAnyMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		iifm.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intAnyMap.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_IntStrMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ism.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intStrMap.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_AnyAnyMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ififm.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			anyAnyMap.Get(i)
+			i++
+		}
+	})
 }
 
+// Note that there's additional performance cost for string conversion.
 func Benchmark_StrIntMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		sim.Get(strconv.Itoa(i))
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strIntMap.Get(strconv.Itoa(i))
+			i++
+		}
+	})
 }
 
+// Note that there's additional performance cost for string conversion.
 func Benchmark_StrAnyMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		sifm.Get(strconv.Itoa(i))
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strAnyMap.Get(strconv.Itoa(i))
+			i++
+		}
+	})
 }
 
+// Note that there's additional performance cost for string conversion.
 func Benchmark_StrStrMap_Get(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ssm.Get(strconv.Itoa(i))
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strStrMap.Get(strconv.Itoa(i))
+			i++
+		}
+	})
 }

g/container/gmap/gmap_z_bench_syncmap_test.go

@@ -9,46 +9,71 @@
 package gmap_test
 
 import (
-	"github.com/gogf/gf/g/container/gmap"
 	"sync"
 	"testing"
+
+	"github.com/gogf/gf/g/container/gmap"
 )
 
-var m1 = gmap.NewIntIntMap()
-var m2 = sync.Map{}
+var gm = gmap.NewIntIntMap()
+var sm = sync.Map{}
 
-func BenchmarkGmapSet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		m1.Set(i, i)
-	}
+func Benchmark_GMapSet(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			gm.Set(i, i)
+			i++
+		}
+	})
 }
 
-func BenchmarkSyncmapSet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		m2.Store(i, i)
-	}
+func Benchmark_SyncMapSet(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			sm.Store(i, i)
+			i++
+		}
+	})
 }
 
-func BenchmarkGmapGet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		m1.Get(i)
-	}
+func Benchmark_GMapGet(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			gm.Get(i)
+			i++
+		}
+	})
 }
 
-func BenchmarkSyncmapGet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		m2.Load(i)
-	}
+func Benchmark_SyncMapGet(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			sm.Load(i)
+			i++
+		}
+	})
 }
 
-func BenchmarkGmapRemove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		m1.Remove(i)
-	}
+func Benchmark_GMapRemove(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			gm.Remove(i)
+			i++
+		}
+	})
 }
 
-func BenchmarkSyncmapRmove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		m2.Delete(i)
-	}
+func Benchmark_SyncMapRmove(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			sm.Delete(i)
+			i++
+		}
+	})
 }

g/container/gmap/gmap_z_bench_unsafe_test.go

@@ -9,9 +9,10 @@
 package gmap_test
 
 import (
-	"github.com/gogf/gf/g/container/gmap"
 	"strconv"
 	"testing"
+
+	"github.com/gogf/gf/g/container/gmap"
 )
 
 var ififmUnsafe = gmap.New(true)
@@ -22,7 +23,7 @@ var simUnsafe = gmap.NewStrIntMap(true)
 var sifmUnsafe = gmap.NewStrAnyMap(true)
 var ssmUnsafe = gmap.NewStrStrMap(true)
 
-// 写入性能测试
+// Writing benchmarks.
 
 func Benchmark_Unsafe_IntIntMap_Set(b *testing.B) {
 	for i := 0; i < b.N; i++ {
@@ -66,7 +67,7 @@ func Benchmark_Unsafe_StrStrMap_Set(b *testing.B) {
 	}
 }
 
-// 读取性能测试
+// Reading benchmarks.
 
 func Benchmark_Unsafe_IntIntMap_Get(b *testing.B) {
 	for i := 0; i < b.N; i++ {

g/container/gqueue/gqueue.go

@@ -46,7 +46,7 @@ func New(limit ...int) *Queue {
 	q := &Queue{
 		closed: gtype.NewBool(),
 	}
-	if len(limit) > 0 {
+	if len(limit) > 0 && limit[0] > 0 {
 		q.limit = limit[0]
 		q.C = make(chan interface{}, limit[0])
 	} else {
@@ -87,7 +87,7 @@ func (q *Queue) startAsyncLoop() {
 			<-q.events
 		}
 	}
-	// It should be here to close q.C.
+	// It should be here to close q.C if <q> is unlimited size.
 	// It's the sender's responsibility to close channel when it should be closed.
 	close(q.C)
 }
@@ -119,6 +119,9 @@ func (q *Queue) Close() {
 	if q.events != nil {
 		close(q.events)
 	}
+	if q.limit > 0 {
+		close(q.C)
+	}
 	for i := 0; i < gDEFAULT_MAX_BATCH_SIZE; i++ {
 		q.Pop()
 	}

g/container/gset/gset_z_bench_test.go

@@ -4,127 +4,170 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// go test *.go -bench=".*"
+// go test *.go -bench=".*" -benchmem
 
 package gset_test
 
 import (
-	"github.com/gogf/gf/g/container/gset"
 	"strconv"
 	"testing"
+
+	"github.com/gogf/gf/g/container/gset"
 )
 
-var ints = gset.NewIntSet()
-var itfs = gset.NewSet()
-var strs = gset.NewStringSet()
-var intsUnsafe = gset.NewIntSet(true)
-var itfsUnsafe = gset.NewSet(true)
-var strsUnsafe = gset.NewStringSet(true)
+var intSet = gset.NewIntSet()
+var anySet = gset.NewSet()
+var strSet = gset.NewStringSet()
+var intSetUnsafe = gset.NewIntSet(true)
+var anySetUnsafe = gset.NewSet(true)
+var strSetUnsafe = gset.NewStringSet(true)
 
 func Benchmark_IntSet_Add(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ints.Add(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intSet.Add(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_IntSet_Contains(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ints.Contains(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intSet.Contains(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_IntSet_Remove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ints.Remove(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			intSet.Remove(i)
+			i++
+		}
+	})
 }
 
-func Benchmark_Set_Add(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		itfs.Add(i)
-	}
+func Benchmark_AnySet_Add(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			anySet.Add(i)
+			i++
+		}
+	})
 }
 
-func Benchmark_Set_Contains(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		itfs.Contains(i)
-	}
+func Benchmark_AnySet_Contains(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			anySet.Contains(i)
+			i++
+		}
+	})
 }
 
-func Benchmark_Set_Remove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		itfs.Remove(i)
-	}
+func Benchmark_AnySet_Remove(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			anySet.Remove(i)
+			i++
+		}
+	})
 }
 
-func Benchmark_StringSet_Add(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		strs.Add(strconv.Itoa(i))
-	}
+// Note that there's additional performance cost for string conversion.
+func Benchmark_StrSet_Add(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strSet.Add(strconv.Itoa(i))
+			i++
+		}
+	})
 }
 
-func Benchmark_StringSet_Contains(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		strs.Contains(strconv.Itoa(i))
-	}
+// Note that there's additional performance cost for string conversion.
+func Benchmark_StrSet_Contains(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strSet.Contains(strconv.Itoa(i))
+			i++
+		}
+	})
 }
 
-func Benchmark_StringSet_Remove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		strs.Remove(strconv.Itoa(i))
-	}
+// Note that there's additional performance cost for string conversion.
+func Benchmark_StrSet_Remove(b *testing.B) {
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			strSet.Remove(strconv.Itoa(i))
+			i++
+		}
+	})
 }
 
 func Benchmark_Unsafe_IntSet_Add(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		intsUnsafe.Add(i)
+		intSetUnsafe.Add(i)
 	}
 }
 
 func Benchmark_Unsafe_IntSet_Contains(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		intsUnsafe.Contains(i)
+		intSetUnsafe.Contains(i)
 	}
 }
 
 func Benchmark_Unsafe_IntSet_Remove(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		intsUnsafe.Remove(i)
+		intSetUnsafe.Remove(i)
 	}
 }
 
-func Benchmark_Unsafe_Set_Add(b *testing.B) {
+func Benchmark_Unsafe_AnySet_Add(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		itfsUnsafe.Add(i)
+		anySetUnsafe.Add(i)
 	}
 }
 
-func Benchmark_Unsafe_Set_Contains(b *testing.B) {
+func Benchmark_Unsafe_AnySet_Contains(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		itfsUnsafe.Contains(i)
+		anySetUnsafe.Contains(i)
 	}
 }
 
-func Benchmark_Unsafe_Set_Remove(b *testing.B) {
+func Benchmark_Unsafe_AnySet_Remove(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		itfsUnsafe.Remove(i)
+		anySetUnsafe.Remove(i)
 	}
 }
 
-func Benchmark_Unsafe_StringSet_Add(b *testing.B) {
+// Note that there's additional performance cost for string conversion.
+func Benchmark_Unsafe_StrSet_Add(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		strsUnsafe.Add(strconv.Itoa(i))
+		strSetUnsafe.Add(strconv.Itoa(i))
 	}
 }
 
-func Benchmark_Unsafe_StringSet_Contains(b *testing.B) {
+// Note that there's additional performance cost for string conversion.
+func Benchmark_Unsafe_StrSet_Contains(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		strsUnsafe.Contains(strconv.Itoa(i))
+		strSetUnsafe.Contains(strconv.Itoa(i))
 	}
 }
 
-func Benchmark_Unsafe_StringSet_Remove(b *testing.B) {
+// Note that there's additional performance cost for string conversion.
+func Benchmark_Unsafe_StrSet_Remove(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		strsUnsafe.Remove(strconv.Itoa(i))
+		strSetUnsafe.Remove(strconv.Itoa(i))
 	}
 }

g/container/gtree/gtree_avltree.go

@@ -7,7 +7,9 @@
 package gtree
 
 import (
+	"encoding/json"
 	"fmt"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
 )
@@ -704,3 +706,8 @@ func output(node *AVLTreeNode, prefix string, isTail bool, str *string) {
 		output(node.children[0], newPrefix, true, str)
 	}
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (tree *AVLTree) MarshalJSON() ([]byte, error) {
+	return json.Marshal(tree.Map())
+}

g/container/gtree/gtree_btree.go

@@ -8,10 +8,12 @@ package gtree
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
-	"strings"
 )
 
 // BTree holds elements of the B-tree.
@@ -845,3 +847,8 @@ func (tree *BTree) deleteChild(node *BTreeNode, index int) {
 	node.Children[len(node.Children)-1] = nil
 	node.Children = node.Children[:len(node.Children)-1]
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (tree *BTree) MarshalJSON() ([]byte, error) {
+	return json.Marshal(tree.Map())
+}

g/container/gtree/gtree_redblacktree.go

@@ -7,7 +7,9 @@
 package gtree
 
 import (
+	"encoding/json"
 	"fmt"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/rwmutex"
 )
@@ -833,3 +835,8 @@ func (tree *RedBlackTree) nodeColor(node *RedBlackTreeNode) color {
 	}
 	return node.color
 }
+
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (tree *RedBlackTree) MarshalJSON() ([]byte, error) {
+	return json.Marshal(tree.Map())
+}

g/container/gvar/gvar.go

@@ -8,10 +8,12 @@
 package gvar
 
 import (
+	"encoding/json"
+	"time"
+
 	"github.com/gogf/gf/g/container/gtype"
 	"github.com/gogf/gf/g/os/gtime"
 	"github.com/gogf/gf/g/util/gconv"
-	"time"
 )
 
 // Var is an universal variable type.
@@ -34,6 +36,11 @@ func New(value interface{}, unsafe ...bool) *Var {
 	return v
 }
 
+// MarshalJSON implements the interface MarshalJSON for json.Marshal.
+func (v *Var) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.Val())
+}
+
 // Set sets <value> to <v>, and returns the old value.
 func (v *Var) Set(value interface{}) (old interface{}) {
 	if v.safe {

g/crypto/gmd5/gmd5.go

@@ -13,7 +13,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/gogf/gf/g/internal/errors"
+	"github.com/gogf/gf/g/errors/gerror"
 	"github.com/gogf/gf/g/util/gconv"
 )
 
@@ -40,7 +40,7 @@ func EncryptFile(path string) (encrypt string, err error) {
 		return "", err
 	}
 	defer func() {
-		err = errors.Wrap(f.Close(), "file closing error")
+		err = gerror.Wrap(f.Close(), "file closing error")
 	}()
 	h := md5.New()
 	_, err = io.Copy(h, f)

g/crypto/gsha1/gsha1.go

@@ -13,7 +13,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/gogf/gf/g/internal/errors"
+	"github.com/gogf/gf/g/errors/gerror"
 	"github.com/gogf/gf/g/util/gconv"
 )
 
@@ -37,7 +37,7 @@ func EncryptFile(path string) (encrypt string, err error) {
 		return "", err
 	}
 	defer func() {
-		err = errors.Wrap(f.Close(), "file closing error")
+		err = gerror.Wrap(f.Close(), "file closing error")
 	}()
 	h := sha1.New()
 	_, err = io.Copy(h, f)

g/database/gdb/gdb.go

@@ -87,16 +87,19 @@ type DB interface {
 	GetQueriedSqls() []*Sql
 	GetLastSql() *Sql
 	PrintQueriedSqls()
-	SetMaxIdleConns(n int)
-	SetMaxOpenConns(n int)
-	SetConnMaxLifetime(n int)
+	SetMaxIdleConnCount(n int)
+	SetMaxOpenConnCount(n int)
+	SetMaxConnLifetime(n int)
 
 	// 内部方法接口
 	getCache() *gcache.Cache
 	getChars() (charLeft string, charRight string)
 	getDebug() bool
+	quoteWord(s string) string
+	setSchema(sqlDb *sql.DB, schema string) error
 	filterFields(table string, data map[string]interface{}) map[string]interface{}
-	convertValue(fieldValue interface{}, fieldType string) interface{}
+	formatWhere(where interface{}, args []interface{}) (newWhere string, newArgs []interface{})
+	convertValue(fieldValue []byte, fieldType string) interface{}
 	getTableFields(table string) (map[string]string, error)
 	rowsToResult(rows *sql.Rows) (Result, error)
 	handleSqlBeforeExec(sql string) string
@@ -248,9 +251,9 @@ func getConfigNodeByGroup(group string, master bool) (*ConfigNode, error) {
 			slaveList = masterList
 		}
 		if master {
-			return getConfigNodeByPriority(masterList), nil
+			return getConfigNodeByWeight(masterList), nil
 		} else {
-			return getConfigNodeByPriority(slaveList), nil
+			return getConfigNodeByWeight(slaveList), nil
 		}
 	} else {
 		return nil, errors.New(fmt.Sprintf("empty database configuration for item name '%s'", group))
@@ -263,19 +266,19 @@ func getConfigNodeByGroup(group string, master bool) (*ConfigNode, error) {
 // 2、那么节点1的权重范围为[0, 99]，节点2的权重范围为[100, 199]，比例为1:1；
 // 3、假如计算出的随机数为99;
 // 4、那么选择的配置为节点1;
-func getConfigNodeByPriority(cg ConfigGroup) *ConfigNode {
+func getConfigNodeByWeight(cg ConfigGroup) *ConfigNode {
 	if len(cg) < 2 {
 		return &cg[0]
 	}
 	var total int
 	for i := 0; i < len(cg); i++ {
-		total += cg[i].Priority * 100
+		total += cg[i].Weight * 100
 	}
 	// 如果total为0表示所有连接都没有配置priority属性，那么默认都是1
 	if total == 0 {
 		for i := 0; i < len(cg); i++ {
-			cg[i].Priority = 1
-			total += cg[i].Priority * 100
+			cg[i].Weight = 1
+			total += cg[i].Weight * 100
 		}
 	}
 	// 不能取到末尾的边界点
@@ -286,7 +289,7 @@ func getConfigNodeByPriority(cg ConfigGroup) *ConfigNode {
 	min := 0
 	max := 0
 	for i := 0; i < len(cg); i++ {
-		max = min + cg[i].Priority*100
+		max = min + cg[i].Weight*100
 		//fmt.Printf("r: %d, min: %d, max: %d\n", r, min, max)
 		if r >= min && r < max {
 			return &cg[i]
@@ -308,12 +311,14 @@ func (bs *dbBase) getSqlDb(master bool) (sqlDb *sql.DB, err error) {
 	if node.Charset == "" {
 		node.Charset = "utf8"
 	}
+	// 缓存连接对象(该对象其实是一个连接池对象)
 	v := bs.cache.GetOrSetFuncLock(node.String(), func() interface{} {
 		sqlDb, err = bs.db.Open(node)
 		if err != nil {
 			return nil
 		}
-
+		// 接口对象可能会覆盖这些连接参数，所以这里优先判断有误设置连接池属性。
+		// 若无设置则使用配置节点的连接池参数
 		if n := bs.maxIdleConnCount.Val(); n > 0 {
 			sqlDb.SetMaxIdleConns(n)
 		} else if node.MaxIdleConnCount > 0 {
@@ -336,9 +341,15 @@ func (bs *dbBase) getSqlDb(master bool) (sqlDb *sql.DB, err error) {
 	if v != nil && sqlDb == nil {
 		sqlDb = v.(*sql.DB)
 	}
+	// 是否开启调试模式
+	if node.Debug {
+		bs.db.SetDebug(node.Debug)
+	}
 	// 是否手动选择数据库
 	if v := bs.schema.Val(); v != "" {
-		sqlDb.Exec("USE " + v)
+		if e := bs.db.setSchema(sqlDb, v); e != nil {
+			err = e
+		}
 	}
 	return
 }

g/database/gdb/gdb_base.go

@@ -8,12 +8,16 @@
 package gdb
 
 import (
+	"bytes"
 	"database/sql"
 	"errors"
 	"fmt"
 	"reflect"
+	"regexp"
 	"strings"
 
+	"github.com/gogf/gf/g/text/gstr"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/os/gcache"
 	"github.com/gogf/gf/g/os/gtime"
@@ -22,7 +26,13 @@ import (
 )
 
 const (
-	gDEFAULT_DEBUG_SQL_LENGTH = 1000 // 默认调试模式下记录的SQL条数
+	// 默认调试模式下记录的SQL条数
+	gDEFAULT_DEBUG_SQL_LENGTH = 1000
+)
+
+var (
+	wordReg         = regexp.MustCompile(`^[a-zA-Z0-9\-_]+$`)
+	lastOperatorReg = regexp.MustCompile(`[<>=]+\s*$`)
 )
 
 // 获取最近一条执行的sql
@@ -78,6 +88,7 @@ func (bs *dbBase) Query(query string, args ...interface{}) (rows *sql.Rows, err
 
 // 数据库sql查询操作，主要执行查询
 func (bs *dbBase) doQuery(link dbLink, query string, args ...interface{}) (rows *sql.Rows, err error) {
+	query, args = formatQuery(query, args)
 	query = bs.db.handleSqlBeforeExec(query)
 	if bs.db.getDebug() {
 		mTime1 := gtime.Millisecond()
@@ -114,6 +125,7 @@ func (bs *dbBase) Exec(query string, args ...interface{}) (result sql.Result, er
 
 // 执行一条sql，并返回执行情况，主要用于非查询操作
 func (bs *dbBase) doExec(link dbLink, query string, args ...interface{}) (result sql.Result, err error) {
+	query, args = formatQuery(query, args)
 	query = bs.db.handleSqlBeforeExec(query)
 	if bs.db.getDebug() {
 		mTime1 := gtime.Millisecond()
@@ -178,28 +190,28 @@ func (bs *dbBase) GetOne(query string, args ...interface{}) (Record, error) {
 }
 
 // 数据库查询，查询单条记录，自动映射数据到给定的struct对象中
-func (bs *dbBase) GetStruct(objPointer interface{}, query string, args ...interface{}) error {
+func (bs *dbBase) GetStruct(pointer interface{}, query string, args ...interface{}) error {
 	one, err := bs.GetOne(query, args...)
 	if err != nil {
 		return err
 	}
-	return one.ToStruct(objPointer)
+	return one.ToStruct(pointer)
 }
 
 // 数据库查询，查询多条记录，并自动转换为指定的slice对象, 如: []struct/[]*struct。
-func (bs *dbBase) GetStructs(objPointerSlice interface{}, query string, args ...interface{}) error {
+func (bs *dbBase) GetStructs(pointer interface{}, query string, args ...interface{}) error {
 	all, err := bs.GetAll(query, args...)
 	if err != nil {
 		return err
 	}
-	return all.ToStructs(objPointerSlice)
+	return all.ToStructs(pointer)
 }
 
 // 将结果转换为指定的struct/*struct/[]struct/[]*struct,
 // 参数应该为指针类型，否则返回失败。
 // 该方法自动识别参数类型，调用Struct/Structs方法。
-func (bs *dbBase) GetScan(objPointer interface{}, query string, args ...interface{}) error {
-	t := reflect.TypeOf(objPointer)
+func (bs *dbBase) GetScan(pointer interface{}, query string, args ...interface{}) error {
+	t := reflect.TypeOf(pointer)
 	k := t.Kind()
 	if k != reflect.Ptr {
 		return fmt.Errorf("params should be type of pointer, but got: %v", k)
@@ -207,9 +219,9 @@ func (bs *dbBase) GetScan(objPointer interface{}, query string, args ...interfac
 	k = t.Elem().Kind()
 	switch k {
 	case reflect.Array, reflect.Slice:
-		return bs.db.GetStructs(objPointer, query, args...)
+		return bs.db.GetStructs(pointer, query, args...)
 	case reflect.Struct:
-		return bs.db.GetStruct(objPointer, query, args...)
+		return bs.db.GetStruct(pointer, query, args...)
 	}
 	return fmt.Errorf("element type should be type of struct/slice, unsupported: %v", k)
 }
@@ -308,6 +320,7 @@ func (bs *dbBase) doInsert(link dbLink, table string, data interface{}, option i
 	var values []string
 	var params []interface{}
 	var dataMap Map
+	table = bs.db.quoteWord(table)
 	// 使用反射判断data数据类型，如果为slice类型，那么自动转为批量操作
 	rv := reflect.ValueOf(data)
 	kind := rv.Kind()
@@ -336,16 +349,16 @@ func (bs *dbBase) doInsert(link dbLink, table string, data interface{}, option i
 	operation := getInsertOperationByOption(option)
 	updateStr := ""
 	if option == OPTION_SAVE {
-		var updates []string
 		for k, _ := range dataMap {
-			updates = append(updates,
-				fmt.Sprintf("%s%s%s=VALUES(%s%s%s)",
-					charL, k, charR,
-					charL, k, charR,
-				),
+			if len(updateStr) > 0 {
+				updateStr += ","
+			}
+			updateStr += fmt.Sprintf("%s%s%s=VALUES(%s%s%s)",
+				charL, k, charR,
+				charL, k, charR,
 			)
 		}
-		updateStr = fmt.Sprintf("ON DUPLICATE KEY UPDATE %s", strings.Join(updates, ","))
+		updateStr = fmt.Sprintf(" ON DUPLICATE KEY UPDATE %s", updateStr)
 	}
 	if link == nil {
 		if link, err = bs.db.Master(); err != nil {
@@ -378,6 +391,7 @@ func (bs *dbBase) doBatchInsert(link dbLink, table string, list interface{}, opt
 	var keys []string
 	var values []string
 	var params []interface{}
+	table = bs.db.quoteWord(table)
 	listMap := (List)(nil)
 	switch v := list.(type) {
 	case Result:
@@ -429,22 +443,22 @@ func (bs *dbBase) doBatchInsert(link dbLink, table string, list interface{}, opt
 	}
 	batchResult := new(batchSqlResult)
 	charL, charR := bs.db.getChars()
-	keyStr := charL + strings.Join(keys, charL+","+charR) + charR
+	keyStr := charL + strings.Join(keys, charR+","+charL) + charR
 	valueHolderStr := "(" + strings.Join(holders, ",") + ")"
 	// 操作判断
 	operation := getInsertOperationByOption(option)
 	updateStr := ""
 	if option == OPTION_SAVE {
-		var updates []string
 		for _, k := range keys {
-			updates = append(updates,
-				fmt.Sprintf("%s%s%s=VALUES(%s%s%s)",
-					charL, k, charR,
-					charL, k, charR,
-				),
+			if len(updateStr) > 0 {
+				updateStr += ","
+			}
+			updateStr += fmt.Sprintf("%s%s%s=VALUES(%s%s%s)",
+				charL, k, charR,
+				charL, k, charR,
 			)
 		}
-		updateStr = fmt.Sprintf(" ON DUPLICATE KEY UPDATE %s", strings.Join(updates, ","))
+		updateStr = fmt.Sprintf(" ON DUPLICATE KEY UPDATE %s", updateStr)
 	}
 	// 构造批量写入数据格式(注意map的遍历是无序的)
 	batchNum := gDEFAULT_BATCH_NUM
@@ -496,7 +510,7 @@ func (bs *dbBase) doBatchInsert(link dbLink, table string, list interface{}, opt
 // CURD操作:数据更新，统一采用sql预处理。
 // data参数支持string/map/struct/*struct类型。
 func (bs *dbBase) Update(table string, data interface{}, condition interface{}, args ...interface{}) (sql.Result, error) {
-	newWhere, newArgs := formatWhere(condition, args)
+	newWhere, newArgs := bs.db.formatWhere(condition, args)
 	if newWhere != "" {
 		newWhere = " WHERE " + newWhere
 	}
@@ -506,8 +520,8 @@ func (bs *dbBase) Update(table string, data interface{}, condition interface{},
 // CURD操作:数据更新，统一采用sql预处理。
 // data参数支持string/map/struct/*struct类型类型。
 func (bs *dbBase) doUpdate(link dbLink, table string, data interface{}, condition string, args ...interface{}) (result sql.Result, err error) {
+	table = bs.db.quoteWord(table)
 	updates := ""
-	charL, charR := bs.db.getChars()
 	// 使用反射进行类型判断
 	rv := reflect.ValueOf(data)
 	kind := rv.Kind()
@@ -522,7 +536,7 @@ func (bs *dbBase) doUpdate(link dbLink, table string, data interface{}, conditio
 	case reflect.Struct:
 		var fields []string
 		for k, v := range structToMap(data) {
-			fields = append(fields, fmt.Sprintf("%s%s%s=?", charL, k, charR))
+			fields = append(fields, bs.db.quoteWord(k)+"=?")
 			params = append(params, convertParam(v))
 		}
 		updates = strings.Join(fields, ",")
@@ -543,7 +557,7 @@ func (bs *dbBase) doUpdate(link dbLink, table string, data interface{}, conditio
 
 // CURD操作:删除数据
 func (bs *dbBase) Delete(table string, condition interface{}, args ...interface{}) (result sql.Result, err error) {
-	newWhere, newArgs := formatWhere(condition, args)
+	newWhere, newArgs := bs.db.formatWhere(condition, args)
 	if newWhere != "" {
 		newWhere = " WHERE " + newWhere
 	}
@@ -557,6 +571,7 @@ func (bs *dbBase) doDelete(link dbLink, table string, condition string, args ...
 			return nil, err
 		}
 	}
+	table = bs.db.quoteWord(table)
 	return bs.db.doExec(link, fmt.Sprintf("DELETE FROM %s%s", table, condition), args...)
 }
 
@@ -567,6 +582,9 @@ func (bs *dbBase) getCache() *gcache.Cache {
 
 // 将数据查询的列表数据*sql.Rows转换为Result类型
 func (bs *dbBase) rowsToResult(rows *sql.Rows) (Result, error) {
+	if !rows.Next() {
+		return nil, sql.ErrNoRows
+	}
 	// 列信息列表, 名称与类型
 	columnTypes, err := rows.ColumnTypes()
 	if err != nil {
@@ -585,7 +603,7 @@ func (bs *dbBase) rowsToResult(rows *sql.Rows) (Result, error) {
 	for i := range values {
 		scanArgs[i] = &values[i]
 	}
-	for rows.Next() {
+	for {
 		if err := rows.Scan(scanArgs...); err != nil {
 			return records, err
 		}
@@ -599,10 +617,112 @@ func (bs *dbBase) rowsToResult(rows *sql.Rows) (Result, error) {
 				// 由于 sql.RawBytes 是slice类型, 这里必须使用值复制
 				v := make([]byte, len(column))
 				copy(v, column)
+				//fmt.Println(columns[i], types[i], string(v), v, bs.db.convertValue(v, types[i]))
 				row[columns[i]] = gvar.New(bs.db.convertValue(v, types[i]), true)
 			}
 		}
 		records = append(records, row)
+		if !rows.Next() {
+			break
+		}
 	}
 	return records, nil
 }
+
+// 格式化Where查询条件。
+func (bs *dbBase) formatWhere(where interface{}, args []interface{}) (newWhere string, newArgs []interface{}) {
+	// 条件字符串处理
+	buffer := bytes.NewBuffer(nil)
+	// 使用反射进行类型判断
+	rv := reflect.ValueOf(where)
+	kind := rv.Kind()
+	if kind == reflect.Ptr {
+		rv = rv.Elem()
+		kind = rv.Kind()
+	}
+	switch kind {
+	// map/struct类型
+	case reflect.Map:
+		fallthrough
+	case reflect.Struct:
+		for key, value := range structToMap(where) {
+			// 字段安全符号判断
+			key = bs.db.quoteWord(key)
+			if buffer.Len() > 0 {
+				buffer.WriteString(" AND ")
+			}
+			// 支持slice键值/属性，如果只有一个?占位符号，那么作为IN查询，否则打散作为多个查询参数
+			rv := reflect.ValueOf(value)
+			switch rv.Kind() {
+			case reflect.Slice:
+				fallthrough
+			case reflect.Array:
+				count := gstr.Count(key, "?")
+				if count == 0 {
+					buffer.WriteString(key + " IN(?)")
+					newArgs = append(newArgs, value)
+				} else if count != rv.Len() {
+					buffer.WriteString(key)
+					newArgs = append(newArgs, value)
+				} else {
+					buffer.WriteString(key)
+					// 如果键名/属性名称中带有多个?占位符号，那么将参数打散
+					newArgs = append(newArgs, gconv.Interfaces(value)...)
+				}
+			default:
+				if value == nil {
+					buffer.WriteString(key)
+				} else {
+					// 支持key带操作符号
+					if gstr.Pos(key, "?") == -1 {
+						if gstr.Pos(key, "<") == -1 && gstr.Pos(key, ">") == -1 && gstr.Pos(key, "=") == -1 {
+							buffer.WriteString(key + "=?")
+						} else {
+							buffer.WriteString(key + "?")
+						}
+					} else {
+						buffer.WriteString(key)
+					}
+					newArgs = append(newArgs, value)
+				}
+			}
+		}
+
+	default:
+		buffer.WriteString(gconv.String(where))
+	}
+	// 没有任何条件查询参数，直接返回
+	if buffer.Len() == 0 {
+		return "", args
+	}
+	newArgs = append(newArgs, args...)
+	newWhere = buffer.String()
+	// 查询条件参数处理，主要处理slice参数类型
+	if len(newArgs) > 0 {
+		// 支持例如 Where/And/Or("uid", 1) , Where/And/Or("uid>=", 1) 这种格式
+		if gstr.Pos(newWhere, "?") == -1 {
+			if lastOperatorReg.MatchString(newWhere) {
+				newWhere += "?"
+			} else if wordReg.MatchString(newWhere) {
+				newWhere += "=?"
+			}
+		}
+	}
+	return
+}
+
+// 使用关键字操作符转义给定字符串。
+// 如果给定的字符串不为单词，那么不转义，直接返回该字符串。
+func (bs *dbBase) quoteWord(s string) string {
+	charLeft, charRight := bs.db.getChars()
+	if wordReg.MatchString(s) && !gstr.ContainsAny(s, charLeft+charRight) {
+		return charLeft + s + charRight
+	}
+	return s
+}
+
+// 动态切换数据库
+func (bs *dbBase) setSchema(sqlDb *sql.DB, schema string) error {
+	_, err := sqlDb.Exec("USE " + schema)
+	return err
+}

g/database/gdb/gdb_config.go

@@ -3,14 +3,14 @@
 // 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 gdb
 
 import (
 	"fmt"
-	"github.com/gogf/gf/g/container/gring"
 	"sync"
+
+	"github.com/gogf/gf/g/container/gring"
 )
 
 const (
@@ -30,10 +30,11 @@ type ConfigNode struct {
 	User             string // 账号
 	Pass             string // 密码
 	Name             string // 数据库名称
-	Type             string // 数据库类型：mysql, sqlite, mssql, pgsql, oracle(目前仅支持mysql)
+	Type             string // 数据库类型：mysql, sqlite, mssql, pgsql, oracle
 	Role             string // (可选，默认为master)数据库的角色，用于主从操作分离，至少需要有一个master，参数值：master, slave
+	Debug            bool   // (可选)开启调试模式
+	Weight           int    // (可选)用于负载均衡的权重计算，当集群中只有一个节点时，权重没有任何意义
 	Charset          string // (可选，默认为 utf8)编码，默认为 utf8
-	Priority         int    // (可选)用于负载均衡的权重计算，当集群中只有一个节点时，权重没有任何意义
 	LinkInfo         string // (可选)自定义链接信息，当该字段被设置值时，以上链接字段(Host,Port,User,Pass,Name)将失效(该字段是一个扩展功能)
 	MaxIdleConnCount int    // (可选)连接池最大限制的连接数
 	MaxOpenConnCount int    // (可选)连接池最大打开的连接数
@@ -47,37 +48,6 @@ var configs struct {
 	defaultGroup string // 默认数据库分组名称
 }
 
-// 数据库集群配置示例，支持主从处理，多数据库集群支持
-/*
-var DatabaseConfiguration = Config {
-    // 数据库集群配置名称
-    "default" : ConfigGroup {
-        {
-            Host     : "192.168.1.100",
-            Port     : "3306",
-            User     : "root",
-            Pass     : "123456",
-            Name     : "test",
-            Type     : "mysql",
-            Role     : "master",
-            Charset  : "utf8",
-            Priority : 100,
-        },
-        {
-            Host     : "192.168.1.101",
-            Port     : "3306",
-            User     : "root",
-            Pass     : "123456",
-            Name     : "test",
-            Type     : "mysql",
-            Role     : "slave",
-            Charset  : "utf8",
-            Priority : 100,
-        },
-    },
-}
-*/
-
 // 包初始化
 func init() {
 	configs.config = make(Config)
@@ -136,24 +106,24 @@ func SetDefaultGroup(name string) {
 // 获取默认链接的数据库链接配置项(默认是 default)
 func GetDefaultGroup() string {
 	defer instances.Clear()
-	configs.Lock()
-	defer configs.Unlock()
+	configs.RLock()
+	defer configs.RUnlock()
 	return configs.defaultGroup
 }
 
 // 设置数据库连接池中空闲链接的大小
-func (bs *dbBase) SetMaxIdleConns(n int) {
+func (bs *dbBase) SetMaxIdleConnCount(n int) {
 	bs.maxIdleConnCount.Set(n)
 }
 
 // 设置数据库连接池最大打开的链接数量
-func (bs *dbBase) SetMaxOpenConns(n int) {
+func (bs *dbBase) SetMaxOpenConnCount(n int) {
 	bs.maxOpenConnCount.Set(n)
 }
 
 // 设置数据库连接可重复利用的时间，超过该时间则被关闭废弃
 // 如果 d <= 0 表示该链接会一直重复利用
-func (bs *dbBase) SetConnMaxLifetime(n int) {
+func (bs *dbBase) SetMaxConnLifetime(n int) {
 	bs.maxConnLifetime.Set(n)
 }
 
@@ -162,14 +132,17 @@ func (node *ConfigNode) String() string {
 	if node.LinkInfo != "" {
 		return node.LinkInfo
 	}
-	return fmt.Sprintf(`%s@%s:%s,%s,%s,%s,%s,%d-%d-%d`, node.User, node.Host, node.Port,
-		node.Name, node.Type, node.Role, node.Charset,
+	return fmt.Sprintf(`%s@%s:%s,%s,%s,%s,%s,%v,%d-%d-%d`, node.User, node.Host, node.Port,
+		node.Name, node.Type, node.Role, node.Charset, node.Debug,
 		node.MaxIdleConnCount, node.MaxOpenConnCount, node.MaxConnLifetime,
 	)
 }
 
 // 是否开启调试服务
 func (bs *dbBase) SetDebug(debug bool) {
+	if bs.debug.Val() == debug {
+		return
+	}
 	bs.debug.Set(debug)
 	if debug && bs.sqls == nil {
 		bs.sqls = gring.New(gDEFAULT_DEBUG_SQL_LENGTH)

g/database/gdb/gdb_func.go

@@ -7,7 +7,6 @@
 package gdb
 
 import (
-	"bytes"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -27,75 +26,14 @@ type apiString interface {
 	String() string
 }
 
-// 格式化Where查询条件
-func formatWhere(where interface{}, args []interface{}) (newWhere string, newArgs []interface{}) {
-	// 条件字符串处理
-	buffer := bytes.NewBuffer(nil)
-	// 使用反射进行类型判断
-	rv := reflect.ValueOf(where)
-	kind := rv.Kind()
-	if kind == reflect.Ptr {
-		rv = rv.Elem()
-		kind = rv.Kind()
-	}
-	tmpArgs := []interface{}(nil)
-	switch kind {
-	// map/struct类型
-	case reflect.Map:
-		fallthrough
-	case reflect.Struct:
-		for key, value := range structToMap(where) {
-			if buffer.Len() > 0 {
-				buffer.WriteString(" AND ")
-			}
-			// 支持slice键值/属性，如果只有一个?占位符号，那么作为IN查询，否则打散作为多个查询参数
-			rv := reflect.ValueOf(value)
-			switch rv.Kind() {
-			case reflect.Slice:
-				fallthrough
-			case reflect.Array:
-				count := gstr.Count(key, "?")
-				if count == 0 {
-					buffer.WriteString(key + " IN(?)")
-					tmpArgs = append(tmpArgs, value)
-				} else if count != rv.Len() {
-					buffer.WriteString(key)
-					tmpArgs = append(tmpArgs, value)
-				} else {
-					buffer.WriteString(key)
-					// 如果键名/属性名称中带有多个?占位符号，那么将参数打散
-					tmpArgs = append(tmpArgs, gconv.Interfaces(value)...)
-				}
-			default:
-				if value == nil {
-					buffer.WriteString(key)
-				} else {
-					if gstr.Pos(key, "?") == -1 {
-						if gstr.Pos(key, "<") == -1 && gstr.Pos(key, ">") == -1 && gstr.Pos(key, "=") == -1 {
-							buffer.WriteString(key + "=?")
-						} else {
-							buffer.WriteString(key + "?")
-						}
-					} else {
-						buffer.WriteString(key)
-					}
-					tmpArgs = append(tmpArgs, value)
-				}
-			}
-		}
-
-	default:
-		buffer.WriteString(gconv.String(where))
-	}
-	// 没有任何条件查询参数，直接返回
-	if buffer.Len() == 0 {
-		return "", args
-	}
-	newWhere = buffer.String()
-	tmpArgs = append(tmpArgs, args...)
+// 格式化SQL语句。
+// 1. 支持参数只传一个slice；
+// 2. 支持占位符号数量自动扩展；
+func formatQuery(query string, args []interface{}) (newQuery string, newArgs []interface{}) {
+	newQuery = query
 	// 查询条件参数处理，主要处理slice参数类型
-	if len(tmpArgs) > 0 {
-		for index, arg := range tmpArgs {
+	if len(args) > 0 {
+		for index, arg := range args {
 			rv := reflect.ValueOf(arg)
 			kind := rv.Kind()
 			if kind == reflect.Ptr {
@@ -103,17 +41,27 @@ func formatWhere(where interface{}, args []interface{}) (newWhere string, newArg
 				kind = rv.Kind()
 			}
 			switch kind {
-			// '?'占位符支持slice类型,
-			// 这里会将slice参数拆散，并更新原有占位符'?'为多个'?'，使用','符号连接。
-			case reflect.Slice:
-				fallthrough
-			case reflect.Array:
+			// '?'占位符支持slice类型, 这里会将slice参数拆散，并更新原有占位符'?'为多个'?'，使用','符号连接。
+			case reflect.Slice, reflect.Array:
+				if rv.Len() == 0 {
+					continue
+				}
+				// 不拆分[]byte类型
+				if _, ok := arg.([]byte); ok {
+					newArgs = append(newArgs, arg)
+					continue
+				}
 				for i := 0; i < rv.Len(); i++ {
 					newArgs = append(newArgs, rv.Index(i).Interface())
 				}
+				// 如果参数直接传递slice，并且占位符数量与slice长度相等，
+				// 那么不用替换扩展占位符数量，直接使用该slice作为查询参数
+				if len(args) == 1 && gstr.Count(newQuery, "?") == rv.Len() {
+					break
+				}
 				// counter用于匹配该参数的位置(与index对应)
 				counter := 0
-				newWhere, _ = gregex.ReplaceStringFunc(`\?`, newWhere, func(s string) string {
+				newQuery, _ = gregex.ReplaceStringFunc(`\?`, newQuery, func(s string) string {
 					counter++
 					if counter == index+1 {
 						return "?" + strings.Repeat(",?", rv.Len()-1)
@@ -121,14 +69,6 @@ func formatWhere(where interface{}, args []interface{}) (newWhere string, newArg
 					return s
 				})
 			default:
-				// 支持例如 Where/And/Or("uid", 1) 这种格式
-				if gstr.Pos(newWhere, "?") == -1 {
-					if gstr.Pos(newWhere, "<") == -1 && gstr.Pos(newWhere, ">") == -1 && gstr.Pos(newWhere, "=") == -1 {
-						newWhere += "=?"
-					} else {
-						newWhere += "?"
-					}
-				}
 				newArgs = append(newArgs, arg)
 			}
 		}
@@ -175,7 +115,7 @@ func printSql(v *Sql) {
 	)
 	if v.Error != nil {
 		s += "\nError: " + v.Error.Error()
-		glog.Backtrace(true, 2).Error(s)
+		glog.Stack(true, 2).Error(s)
 	} else {
 		glog.Debug(s)
 	}

g/database/gdb/gdb_model.go

@@ -3,8 +3,6 @@
 // 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.
-//
-// @author john, ymrjqyy
 
 package gdb
 
@@ -30,6 +28,7 @@ type Model struct {
 	orderBy      string        // 排序语句
 	start        int           // 分页开始
 	limit        int           // 分页条数
+	offset       int           // 查询偏移量(OFFSET语法)
 	data         interface{}   // 操作数据(注意仅支持Map/List/string类型)
 	batch        int           // 批量操作条数
 	filter       bool          // 是否按照表字段过滤data参数
@@ -44,9 +43,10 @@ func (bs *dbBase) Table(tables string) *Model {
 	return &Model{
 		db:         bs.db,
 		tablesInit: tables,
-		tables:     tables,
+		tables:     bs.db.quoteWord(tables),
 		fields:     "*",
 		start:      -1,
+		offset:     -1,
 		safe:       false,
 	}
 }
@@ -62,7 +62,10 @@ func (tx *TX) Table(tables string) *Model {
 		db:         tx.db,
 		tx:         tx,
 		tablesInit: tables,
-		tables:     tables,
+		tables:     tx.db.quoteWord(tables),
+		fields:     "*",
+		start:      -1,
+		offset:     -1,
 		safe:       false,
 	}
 }
@@ -151,7 +154,7 @@ func (md *Model) Where(where interface{}, args ...interface{}) *Model {
 	if model.where != "" {
 		return md.And(where, args...)
 	}
-	newWhere, newArgs := formatWhere(where, args)
+	newWhere, newArgs := md.db.formatWhere(where, args)
 	model.where = newWhere
 	model.whereArgs = newArgs
 	return model
@@ -160,7 +163,7 @@ func (md *Model) Where(where interface{}, args ...interface{}) *Model {
 // 链式操作，添加AND条件到Where中
 func (md *Model) And(where interface{}, args ...interface{}) *Model {
 	model := md.getModel()
-	newWhere, newArgs := formatWhere(where, args)
+	newWhere, newArgs := md.db.formatWhere(where, args)
 	if len(model.where) > 0 && model.where[0] == '(' {
 		model.where = fmt.Sprintf(`%s AND (%s)`, model.where, newWhere)
 	} else {
@@ -173,7 +176,7 @@ func (md *Model) And(where interface{}, args ...interface{}) *Model {
 // 链式操作，添加OR条件到Where中
 func (md *Model) Or(where interface{}, args ...interface{}) *Model {
 	model := md.getModel()
-	newWhere, newArgs := formatWhere(where, args)
+	newWhere, newArgs := md.db.formatWhere(where, args)
 	if len(model.where) > 0 && model.where[0] == '(' {
 		model.where = fmt.Sprintf(`%s OR (%s)`, model.where, newWhere)
 	} else {
@@ -214,6 +217,14 @@ func (md *Model) Limit(limit ...int) *Model {
 	return model
 }
 
+// 链式操作，OFFSET语法（部分数据库支持）。
+// 注意：可以使用Limit方法调用替换该方法特性，底层不同数据库将会自动替换LIMIT语法为OFFSET语法。
+func (md *Model) Offset(offset int) *Model {
+	model := md.getModel()
+	model.offset = offset
+	return model
+}
+
 // 链式操作，翻页，注意分页页码从1开始，而Limit方法从0开始。
 func (md *Model) ForPage(page, limit int) *Model {
 	model := md.getModel()
@@ -463,7 +474,7 @@ func (md *Model) Select() (Result, error) {
 
 // 链式操作，查询所有记录
 func (md *Model) All() (Result, error) {
-	return md.getAll(fmt.Sprintf("SELECT %s FROM %s %s", md.fields, md.tables, md.getConditionSql()), md.whereArgs...)
+	return md.getAll(fmt.Sprintf("SELECT %s FROM %s%s", md.fields, md.tables, md.getConditionSql()), md.whereArgs...)
 }
 
 // 链式操作，查询单条记录
@@ -605,11 +616,13 @@ func (md *Model) getConditionSql() string {
 	}
 	if md.limit != 0 {
 		if md.start >= 0 {
-			s += fmt.Sprintf(" LIMIT %d, %d", md.start, md.limit)
+			s += fmt.Sprintf(" LIMIT %d,%d", md.start, md.limit)
 		} else {
 			s += fmt.Sprintf(" LIMIT %d", md.limit)
 		}
-
+	}
+	if md.offset >= 0 {
+		s += fmt.Sprintf(" OFFSET %d", md.offset)
 	}
 	return s
 }

g/database/gdb/gdb_mssql.go

@@ -3,23 +3,21 @@
 // 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.
-/*
-@author wenzi1<liyz23@qq.com>
-@date 20181109
-说明：
-    1.需要导入sqlserver驱动： github.com/denisenkom/go-mssqldb
-    2.不支持save/replace方法
-    3.不支持LastInsertId方法
-*/
+// 说明：
+//    1.需要导入sqlserver驱动： github.com/denisenkom/go-mssqldb
+//    2.不支持save/replace方法
+//    3.不支持LastInsertId方法
+//
 
 package gdb
 
 import (
 	"database/sql"
 	"fmt"
-	"github.com/gogf/gf/g/text/gregex"
 	"strconv"
 	"strings"
+
+	"github.com/gogf/gf/g/text/gregex"
 )
 
 // 数据库链接对象

g/database/gdb/gdb_oracle.go

@@ -3,23 +3,20 @@
 // 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.
-/*
-@author wenzi1<liyz23@qq.com>
-@date 20181026
-说明：
-    1.需要导入oracle驱动： github.com/mattn/go-oci8
-    2.不支持save/replace方法，可以调用这2个方法估计会报错，还没测试过,(应该是可以通过oracle的merge来实现这2个功能的，还没仔细研究)
-    3.不支持LastInsertId方法
-*/
+// 说明：
+//    1.需要导入oracle驱动： github.com/mattn/go-oci8
+//    2.不支持save/replace方法，可以调用这2个方法估计会报错，还没测试过,(应该是可以通过oracle的merge来实现这2个功能的，还没仔细研究)
+//    3.不支持LastInsertId方法
 
 package gdb
 
 import (
 	"database/sql"
 	"fmt"
-	"github.com/gogf/gf/g/text/gregex"
 	"strconv"
 	"strings"
+
+	"github.com/gogf/gf/g/text/gregex"
 )
 
 // 数据库链接对象

g/database/gdb/gdb_pgsql.go

@@ -9,12 +9,16 @@ package gdb
 import (
 	"database/sql"
 	"fmt"
-	"regexp"
+
+	"github.com/gogf/gf/g/text/gregex"
 )
 
 // PostgreSQL的适配.
+//
 // 使用时需要import:
+//
 // _ "github.com/gogf/gf/third/github.com/lib/pq"
+//
 // @todo 需要完善replace和save的操作覆盖
 
 // 数据库链接对象
@@ -37,6 +41,12 @@ func (db *dbPgsql) Open(config *ConfigNode) (*sql.DB, error) {
 	}
 }
 
+// 动态切换数据库
+func (db *dbPgsql) setSchema(sqlDb *sql.DB, schema string) error {
+	_, err := sqlDb.Exec("SET search_path TO " + schema)
+	return err
+}
+
 // 获得关键字操作符
 func (db *dbPgsql) getChars() (charLeft string, charRight string) {
 	return "\"", "\""
@@ -44,11 +54,12 @@ func (db *dbPgsql) getChars() (charLeft string, charRight string) {
 
 // 在执行sql之前对sql进行进一步处理
 func (db *dbPgsql) handleSqlBeforeExec(query string) string {
-	reg := regexp.MustCompile("\\?")
 	index := 0
-	str := reg.ReplaceAllStringFunc(query, func(s string) string {
+	query, _ = gregex.ReplaceStringFunc("\\?", query, func(s string) string {
 		index++
 		return fmt.Sprintf("$%d", index)
 	})
-	return str
+	// 分页语法替换
+	query, _ = gregex.ReplaceString(` LIMIT (\d+),\s*(\d+)`, ` LIMIT $1 OFFSET $2`, query)
+	return query
 }

g/database/gdb/gdb_sqlite.go

@@ -3,7 +3,6 @@
 // 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.
-// @author wxkj<wxscz@qq.com>
 
 package gdb
 
@@ -41,7 +40,7 @@ func (db *dbSqlite) getChars() (charLeft string, charRight string) {
 	return "`", "`"
 }
 
-// 在执行sql之前对sql进行进一步处理
+// 在执行sql之前对sql进行进一步处理。
 // @todo 需要增加对Save方法的支持，可使用正则来实现替换，
 // @todo 将ON DUPLICATE KEY UPDATE触发器修改为两条SQL语句(INSERT OR IGNORE & UPDATE)
 func (db *dbSqlite) handleSqlBeforeExec(query string) string {

g/database/gdb/gdb_structure.go

@@ -25,24 +25,24 @@ import (
 //}
 
 // 字段类型转换，将数据库字段类型转换为golang变量类型
-func (bs *dbBase) convertValue(fieldValue interface{}, fieldType string) interface{} {
+func (bs *dbBase) convertValue(fieldValue []byte, fieldType string) interface{} {
 	t, _ := gregex.ReplaceString(`\(.+\)`, "", fieldType)
 	t = strings.ToLower(t)
 	switch t {
 	case "binary", "varbinary", "blob", "tinyblob", "mediumblob", "longblob":
-		return gconv.Bytes(fieldValue)
+		return fieldValue
 
 	case "int", "tinyint", "small_int", "medium_int":
-		return gconv.Int(fieldValue)
+		return gconv.Int(string(fieldValue))
 
 	case "big_int":
-		return gconv.Int64(fieldValue)
+		return gconv.Int64(string(fieldValue))
 
 	case "float", "double", "decimal":
-		return gconv.Float64(fieldValue)
+		return gconv.Float64(string(fieldValue))
 
 	case "bit":
-		s := gconv.String(fieldValue)
+		s := string(fieldValue)
 		// 这里的字符串判断是为兼容不同的数据库类型，如: mssql
 		if strings.EqualFold(s, "true") {
 			return 1
@@ -50,10 +50,7 @@ func (bs *dbBase) convertValue(fieldValue interface{}, fieldType string) interfa
 		if strings.EqualFold(s, "false") {
 			return 0
 		}
-		if b, ok := fieldValue.([]byte); ok {
-			return gbinary.BeDecodeToInt64(b)
-		}
-		return gconv.Int(fieldValue)
+		return gbinary.BeDecodeToInt64(fieldValue)
 
 	case "bool":
 		return gconv.Bool(fieldValue)
@@ -62,22 +59,22 @@ func (bs *dbBase) convertValue(fieldValue interface{}, fieldType string) interfa
 		// 自动识别类型, 以便默认支持更多数据库类型
 		switch {
 		case strings.Contains(t, "int"):
-			return gconv.Int(fieldValue)
+			return gconv.Int(string(fieldValue))
 
 		case strings.Contains(t, "text") || strings.Contains(t, "char"):
-			return gconv.String(fieldValue)
+			return string(fieldValue)
 
 		case strings.Contains(t, "float") || strings.Contains(t, "double"):
-			return gconv.Float64(fieldValue)
+			return gconv.Float64(string(fieldValue))
 
 		case strings.Contains(t, "bool"):
-			return gconv.Bool(fieldValue)
+			return gconv.Bool(string(fieldValue))
 
 		case strings.Contains(t, "binary") || strings.Contains(t, "blob"):
-			return gconv.Bytes(fieldValue)
+			return fieldValue
 
 		default:
-			return gconv.String(fieldValue)
+			return string(fieldValue)
 		}
 	}
 }
@@ -99,8 +96,7 @@ func (bs *dbBase) getTableFields(table string) (fields map[string]string, err er
 	// 缓存不存在时会查询数据表结构，缓存后不过期，直至程序重启(重新部署)
 	v := bs.cache.GetOrSetFunc("table_fields_"+table, func() interface{} {
 		result := (Result)(nil)
-		charL, charR := bs.db.getChars()
-		result, err = bs.GetAll(fmt.Sprintf(`SHOW COLUMNS FROM %s%s%s`, charL, table, charR))
+		result, err = bs.GetAll(fmt.Sprintf(`SHOW COLUMNS FROM %s`, bs.db.quoteWord(table)))
 		if err != nil {
 			return nil
 		}

g/database/gdb/gdb_transaction.go

@@ -165,7 +165,7 @@ func (tx *TX) BatchSave(table string, list interface{}, batch ...int) (sql.Resul
 // CURD操作:数据更新，统一采用sql预处理,
 // data参数支持字符串或者关联数组类型，内部会自行做判断处理.
 func (tx *TX) Update(table string, data interface{}, condition interface{}, args ...interface{}) (sql.Result, error) {
-	newWhere, newArgs := formatWhere(condition, args)
+	newWhere, newArgs := tx.db.formatWhere(condition, args)
 	if newWhere != "" {
 		newWhere = " WHERE " + newWhere
 	}
@@ -179,7 +179,7 @@ func (tx *TX) doUpdate(table string, data interface{}, condition string, args ..
 
 // CURD操作:删除数据
 func (tx *TX) Delete(table string, condition interface{}, args ...interface{}) (sql.Result, error) {
-	newWhere, newArgs := formatWhere(condition, args)
+	newWhere, newArgs := tx.db.formatWhere(condition, args)
 	if newWhere != "" {
 		newWhere = " WHERE " + newWhere
 	}

g/database/gdb/gdb_unit_init_test.go

@@ -19,12 +19,14 @@ import (
 )
 
 const (
-	// 初始化表数据量
-	INIT_DATA_SIZE = 10
+	INIT_DATA_SIZE = 10      // 初始化表数据量
+	TABLE          = "user"  // 测试数据表
+	SCHEMA1        = "test1" // 测试数据库1
+	SCHEMA2        = "test2" // 测试数据库2
 )
 
 var (
-	// 数据库对象/接口
+	// 测试包变量，ORM对象
 	db gdb.DB
 )
 
@@ -32,60 +34,63 @@ var (
 // 测试前需要修改连接参数。
 func init() {
 	node := gdb.ConfigNode{
-		Host:     "127.0.0.1",
-		Port:     "3306",
-		User:     "root",
-		Pass:     "",
-		Name:     "",
-		Type:     "mysql",
-		Role:     "master",
-		Charset:  "utf8",
-		Priority: 1,
+		Host:    "127.0.0.1",
+		Port:    "3306",
+		User:    "root",
+		Pass:    "",
+		Name:    "",
+		Type:    "mysql",
+		Role:    "master",
+		Charset: "utf8",
+		Weight:  1,
 	}
-	hostname, _ := os.Hostname()
-	// 本地测试hack
-	if hostname == "ijohn" {
+	// 作者本地测试hack
+	if hostname, _ := os.Hostname(); hostname == "ijohn" {
 		node.Pass = "12345678"
 	}
 	gdb.AddConfigNode("test", node)
 	gdb.AddConfigNode(gdb.DEFAULT_GROUP_NAME, node)
 	if r, err := gdb.New(); err != nil {
-		gtest.Fatal(err)
+		gtest.Error(err)
 	} else {
 		db = r
 	}
-	// 准备测试数据结构
-	if _, err := db.Exec("CREATE DATABASE IF NOT EXISTS `test` CHARACTER SET UTF8"); err != nil {
-		gtest.Fatal(err)
+	// 准备测试数据结构：数据库
+	schemaTemplate := "CREATE DATABASE IF NOT EXISTS `%s` CHARACTER SET UTF8"
+	if _, err := db.Exec(fmt.Sprintf(schemaTemplate, SCHEMA1)); err != nil {
+		gtest.Error(err)
 	}
-	// 选择操作数据库
-	db.SetSchema("test")
+	// 多个数据库，用于测试数据库切换
+	if _, err := db.Exec(fmt.Sprintf(schemaTemplate, SCHEMA2)); err != nil {
+		gtest.Error(err)
+	}
+	// 设置默认操作数据库
+	db.SetSchema(SCHEMA1)
 	// 创建默认用户表
-	createTable("user")
+	createTable(TABLE)
 }
 
 // 创建指定名称的user测试表，当table为空时，创建随机的表名。
 // 创建的测试表默认没有任何数据。
 // 执行完成后返回该表名。
-// TODO 支持更多数据库
 func createTable(table ...string) (name string) {
 	if len(table) > 0 {
 		name = table[0]
 	} else {
-		name = fmt.Sprintf(`user_%d`, gtime.Nanosecond())
+		name = fmt.Sprintf(`%s_%d`, TABLE, gtime.Nanosecond())
 	}
 	dropTable(name)
 	if _, err := db.Exec(fmt.Sprintf(`
     CREATE TABLE %s (
-        id int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-        passport varchar(45) NOT NULL COMMENT '账号',
-        password char(32) NOT NULL COMMENT '密码',
-        nickname varchar(45) NOT NULL COMMENT '昵称',
+        id          int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+        passport    varchar(45) NOT NULL COMMENT '账号',
+        password    char(32) NOT NULL COMMENT '密码',
+        nickname    varchar(45) NOT NULL COMMENT '昵称',
         create_time timestamp NOT NULL COMMENT '创建时间/注册时间',
         PRIMARY KEY (id)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     `, name)); err != nil {
-		gtest.Fatal(err)
+		gtest.Error(err)
 	}
 	return
 }
@@ -97,10 +102,10 @@ func createInitTable(table ...string) (name string) {
 	for i := 1; i <= INIT_DATA_SIZE; i++ {
 		array.Append(g.Map{
 			"id":          i,
-			"passport":    fmt.Sprintf(`t%d`, i),
-			"password":    fmt.Sprintf(`p%d`, i),
-			"nickname":    fmt.Sprintf(`T%d`, i),
-			"create_time": gtime.Now().String(),
+			"passport":    fmt.Sprintf(`user_%d`, i),
+			"password":    fmt.Sprintf(`pass_%d`, i),
+			"nickname":    fmt.Sprintf(`name_%d`, i),
+			"create_time": gtime.NewFromStr("2018-10-24 10:00:00").String(),
 		})
 	}
 	result, err := db.Table(name).Data(array.Slice()).Insert()
@@ -115,6 +120,6 @@ func createInitTable(table ...string) (name string) {
 // 删除指定表.
 func dropTable(table string) {
 	if _, err := db.Exec(fmt.Sprintf("DROP TABLE IF EXISTS `%s`", table)); err != nil {
-		gtest.Fatal(err)
+		gtest.Error(err)
 	}
 }

g/database/gdb/gdb_unit_method_test.go

@@ -1,536 +0,0 @@
-// Copyright 2019 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 gdb_test
-
-import (
-	"github.com/gogf/gf/g"
-	"github.com/gogf/gf/g/os/gtime"
-	"github.com/gogf/gf/g/test/gtest"
-	"testing"
-	"time"
-)
-
-func TestDbBase_Ping(t *testing.T) {
-	gtest.Case(t, func() {
-		err1 := db.PingMaster()
-		err2 := db.PingSlave()
-		gtest.Assert(err1, nil)
-		gtest.Assert(err2, nil)
-	})
-}
-
-func TestDbBase_Query(t *testing.T) {
-	if _, err := db.Query("SELECT ?", 1); err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := db.Query("ERROR"); err == nil {
-		gtest.Fatal("FAIL")
-	}
-}
-
-func TestDbBase_Exec(t *testing.T) {
-	if _, err := db.Exec("SELECT ?", 1); err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := db.Exec("ERROR"); err == nil {
-		gtest.Fatal("FAIL")
-	}
-}
-
-func TestDbBase_Prepare(t *testing.T) {
-	st, err := db.Prepare("SELECT 100")
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	rows, err := st.Query()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	array, err := rows.Columns()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(array[0], "100")
-	if err := rows.Close(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestDbBase_Insert(t *testing.T) {
-	if _, err := db.Insert("user", g.Map{
-		"id":          1,
-		"passport":    "t1",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T1",
-		"create_time": gtime.Now().String(),
-	}); err != nil {
-		gtest.Fatal(err)
-	}
-	// normal map
-	result, err := db.Insert("user", map[interface{}]interface{}{
-		"id":          "2",
-		"passport":    "t2",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T2",
-		"create_time": gtime.Now().String(),
-	})
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ := result.RowsAffected()
-	gtest.Assert(n, 1)
-
-	// struct
-	type User struct {
-		Id         int    `gconv:"id"`
-		Passport   string `json:"passport"`
-		Password   string `gconv:"password"`
-		Nickname   string `gconv:"nickname"`
-		CreateTime string `json:"create_time"`
-	}
-	result, err = db.Insert("user", User{
-		Id:         3,
-		Passport:   "t3",
-		Password:   "25d55ad283aa400af464c76d713c07ad",
-		Nickname:   "T3",
-		CreateTime: gtime.Now().String(),
-	})
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 1)
-	value, err := db.GetValue("select `passport` from `user` where id=?", 3)
-	gtest.Assert(err, nil)
-	gtest.Assert(value.String(), "t3")
-
-	// *struct
-	result, err = db.Insert("user", &User{
-		Id:         4,
-		Passport:   "t4",
-		Password:   "25d55ad283aa400af464c76d713c07ad",
-		Nickname:   "T4",
-		CreateTime: gtime.Now().String(),
-	})
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 1)
-	value, err = db.GetValue("select `passport` from `user` where id=?", 4)
-	gtest.Assert(err, nil)
-	gtest.Assert(value.String(), "t4")
-
-	// batch with Insert
-	if r, err := db.Insert("user", []interface{}{
-		map[interface{}]interface{}{
-			"id":          200,
-			"passport":    "t200",
-			"password":    "25d55ad283aa400af464c76d713c07ad",
-			"nickname":    "T200",
-			"create_time": gtime.Now().String(),
-		},
-		map[interface{}]interface{}{
-			"id":          300,
-			"passport":    "t300",
-			"password":    "25d55ad283aa400af464c76d713c07ad",
-			"nickname":    "T300",
-			"create_time": gtime.Now().String(),
-		},
-	}); err != nil {
-		gtest.Fatal(err)
-	} else {
-		n, _ := r.RowsAffected()
-		gtest.Assert(n, 2)
-	}
-
-	// clear unnecessary data
-	result, err = db.Delete("user", "id>?", 1)
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 5)
-}
-
-func TestDbBase_BatchInsert(t *testing.T) {
-	gtest.Case(t, func() {
-		if r, err := db.BatchInsert("user", g.List{
-			{
-				"id":          2,
-				"passport":    "t2",
-				"password":    "25d55ad283aa400af464c76d713c07ad",
-				"nickname":    "T2",
-				"create_time": gtime.Now().String(),
-			},
-			{
-				"id":          3,
-				"passport":    "t3",
-				"password":    "25d55ad283aa400af464c76d713c07ad",
-				"nickname":    "T3",
-				"create_time": gtime.Now().String(),
-			},
-		}, 1); err != nil {
-			gtest.Fatal(err)
-		} else {
-			n, _ := r.RowsAffected()
-			gtest.Assert(n, 2)
-		}
-
-		result, err := db.Delete("user", "id>?", 1)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 2)
-
-		// []interface{}
-		if r, err := db.BatchInsert("user", []interface{}{
-			map[interface{}]interface{}{
-				"id":          2,
-				"passport":    "t2",
-				"password":    "25d55ad283aa400af464c76d713c07ad",
-				"nickname":    "T2",
-				"create_time": gtime.Now().String(),
-			},
-			map[interface{}]interface{}{
-				"id":          3,
-				"passport":    "t3",
-				"password":    "25d55ad283aa400af464c76d713c07ad",
-				"nickname":    "T3",
-				"create_time": gtime.Now().String(),
-			},
-		}, 1); err != nil {
-			gtest.Fatal(err)
-		} else {
-			n, _ := r.RowsAffected()
-			gtest.Assert(n, 2)
-		}
-	})
-	// batch insert map
-	gtest.Case(t, func() {
-		table := createTable()
-		defer dropTable(table)
-		result, err := db.BatchInsert(table, g.Map{
-			"id":          1,
-			"passport":    "t1",
-			"password":    "p1",
-			"nickname":    "T1",
-			"create_time": gtime.Now().String(),
-		})
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-	})
-	// batch insert struct
-	gtest.Case(t, func() {
-		table := createTable()
-		defer dropTable(table)
-
-		type User struct {
-			Id         int         `gconv:"id"`
-			Passport   string      `gconv:"passport"`
-			Password   string      `gconv:"password"`
-			NickName   string      `gconv:"nickname"`
-			CreateTime *gtime.Time `gconv:"create_time"`
-		}
-		user := &User{
-			Id:         1,
-			Passport:   "t1",
-			Password:   "p1",
-			NickName:   "T1",
-			CreateTime: gtime.Now(),
-		}
-		result, err := db.BatchInsert(table, user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-	})
-}
-
-func TestDbBase_Save(t *testing.T) {
-	if _, err := db.Save("user", g.Map{
-		"id":          1,
-		"passport":    "t1",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T11",
-		"create_time": gtime.Now().String(),
-	}); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestDbBase_Replace(t *testing.T) {
-	if _, err := db.Save("user", g.Map{
-		"id":          1,
-		"passport":    "t1",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T111",
-		"create_time": gtime.Now().String(),
-	}); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestDbBase_Update(t *testing.T) {
-	if result, err := db.Update("user", "create_time='2010-10-10 00:00:01'", "id=3"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-	}
-}
-
-func TestDbBase_GetAll(t *testing.T) {
-	if result, err := db.GetAll("SELECT * FROM user WHERE id=?", 1); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(len(result), 1)
-	}
-}
-
-func TestDbBase_GetOne(t *testing.T) {
-	if record, err := db.GetOne("SELECT * FROM user WHERE passport=?", "t1"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		if record == nil {
-			gtest.Fatal("FAIL")
-		}
-		gtest.Assert(record["nickname"].String(), "T111")
-	}
-}
-
-func TestDbBase_GetValue(t *testing.T) {
-	if value, err := db.GetValue("SELECT id FROM user WHERE passport=?", "t3"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(value.Int(), 3)
-	}
-}
-
-func TestDbBase_GetCount(t *testing.T) {
-	if count, err := db.GetCount("SELECT * FROM user"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(count, 3)
-	}
-}
-
-func TestDbBase_GetStruct(t *testing.T) {
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		user := new(User)
-		if err := db.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		} else {
-			gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		}
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		if err := db.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		} else {
-			gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		}
-	})
-}
-
-func TestDbBase_GetStructs(t *testing.T) {
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		var users []User
-		if err := db.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-	})
-
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []User
-		if err := db.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-	})
-}
-
-func TestDbBase_GetScan(t *testing.T) {
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		user := new(User)
-		if err := db.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		} else {
-			gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		}
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		if err := db.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		} else {
-			gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		}
-	})
-
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		var users []User
-		if err := db.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-	})
-
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []User
-		if err := db.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-	})
-}
-
-func TestDbBase_Delete(t *testing.T) {
-	if result, err := db.Delete("user", nil); err != nil {
-		gtest.Fatal(err)
-	} else {
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 3)
-	}
-}
-
-func TestDbBase_Time(t *testing.T) {
-	gtest.Case(t, func() {
-		result, err := db.Insert("user", g.Map{
-			"id":          200,
-			"passport":    "t200",
-			"password":    "123456",
-			"nickname":    "T200",
-			"create_time": time.Now(),
-		})
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-		value, err := db.GetValue("select `passport` from `user` where id=?", 200)
-		gtest.Assert(err, nil)
-		gtest.Assert(value.String(), "t200")
-	})
-
-	gtest.Case(t, func() {
-		t := time.Now()
-		result, err := db.Insert("user", g.Map{
-			"id":          300,
-			"passport":    "t300",
-			"password":    "123456",
-			"nickname":    "T300",
-			"create_time": &t,
-		})
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-		value, err := db.GetValue("select `passport` from `user` where id=?", 300)
-		gtest.Assert(err, nil)
-		gtest.Assert(value.String(), "t300")
-	})
-
-	if result, err := db.Delete("user", nil); err != nil {
-		gtest.Fatal(err)
-	} else {
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 2)
-	}
-}

g/database/gdb/gdb_unit_model_test.go

@@ -1,800 +0,0 @@
-// Copyright 2019 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 gdb_test
-
-import (
-	"database/sql"
-	"testing"
-
-	"github.com/gogf/gf/g"
-	"github.com/gogf/gf/g/os/gtime"
-	"github.com/gogf/gf/g/test/gtest"
-)
-
-// 基本测试
-func TestModel_Insert(t *testing.T) {
-	result, err := db.Table("user").Filter().Data(g.Map{
-		"id":          1,
-		"uid":         1,
-		"passport":    "t1",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T1",
-		"create_time": gtime.Now().String(),
-	}).Insert()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ := result.LastInsertId()
-	gtest.Assert(n, 1)
-
-	result, err = db.Table("user").Filter().Data(map[interface{}]interface{}{
-		"id":          "2",
-		"uid":         "2",
-		"passport":    "t2",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T2",
-		"create_time": gtime.Now().String(),
-	}).Insert()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 1)
-
-	type User struct {
-		Id         int    `gconv:"id"`
-		Uid        int    `gconv:"uid"`
-		Passport   string `json:"passport"`
-		Password   string `gconv:"password"`
-		Nickname   string `gconv:"nickname"`
-		CreateTime string `json:"create_time"`
-	}
-	result, err = db.Table("user").Filter().Data(User{
-		Id:         3,
-		Uid:        3,
-		Passport:   "t3",
-		Password:   "25d55ad283aa400af464c76d713c07ad",
-		Nickname:   "T3",
-		CreateTime: gtime.Now().String(),
-	}).Insert()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 1)
-	value, err := db.Table("user").Fields("passport").Where("id=3").Value()
-	gtest.Assert(err, nil)
-	gtest.Assert(value.String(), "t3")
-
-	result, err = db.Table("user").Filter().Data(&User{
-		Id:         4,
-		Uid:        4,
-		Passport:   "t4",
-		Password:   "25d55ad283aa400af464c76d713c07ad",
-		Nickname:   "T4",
-		CreateTime: gtime.Now().String(),
-	}).Insert()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 1)
-	value, err = db.Table("user").Fields("passport").Where("id=4").Value()
-	gtest.Assert(err, nil)
-	gtest.Assert(value.String(), "t4")
-
-	result, err = db.Table("user").Where("id>?", 1).Delete()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ = result.RowsAffected()
-	gtest.Assert(n, 3)
-}
-
-func TestModel_Batch(t *testing.T) {
-	// batch insert
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Filter().Data(g.List{
-			{
-				"id":          2,
-				"uid":         2,
-				"passport":    "t2",
-				"password":    "25d55ad283aa400af464c76d713c07ad",
-				"nickname":    "T2",
-				"create_time": gtime.Now().String(),
-			},
-			{
-				"id":          3,
-				"uid":         3,
-				"passport":    "t3",
-				"password":    "25d55ad283aa400af464c76d713c07ad",
-				"nickname":    "T3",
-				"create_time": gtime.Now().String(),
-			},
-		}).Batch(1).Insert()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 2)
-	})
-
-	// batch save
-	gtest.Case(t, func() {
-		table := createInitTable()
-		defer dropTable(table)
-		result, err := db.Table(table).All()
-		gtest.Assert(err, nil)
-		gtest.Assert(len(result), INIT_DATA_SIZE)
-		for _, v := range result {
-			v["nickname"].Set(v["nickname"].String() + v["id"].String())
-		}
-		r, e := db.Table(table).Data(result).Save()
-		gtest.Assert(e, nil)
-		n, e := r.RowsAffected()
-		gtest.Assert(e, nil)
-		gtest.Assert(n, INIT_DATA_SIZE*2)
-	})
-
-	// batch replace
-	gtest.Case(t, func() {
-		table := createInitTable()
-		defer dropTable(table)
-		result, err := db.Table(table).All()
-		gtest.Assert(err, nil)
-		gtest.Assert(len(result), INIT_DATA_SIZE)
-		for _, v := range result {
-			v["nickname"].Set(v["nickname"].String() + v["id"].String())
-		}
-		r, e := db.Table(table).Data(result).Replace()
-		gtest.Assert(e, nil)
-		n, e := r.RowsAffected()
-		gtest.Assert(e, nil)
-		gtest.Assert(n, INIT_DATA_SIZE*2)
-	})
-}
-
-func TestModel_Replace(t *testing.T) {
-	result, err := db.Table("user").Data(g.Map{
-		"id":          1,
-		"passport":    "t11",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T11",
-		"create_time": "2018-10-10 00:01:10",
-	}).Replace()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ := result.RowsAffected()
-	gtest.Assert(n, 2)
-}
-
-func TestModel_Save(t *testing.T) {
-	result, err := db.Table("user").Data(g.Map{
-		"id":          1,
-		"passport":    "t111",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T111",
-		"create_time": "2018-10-10 00:01:10",
-	}).Save()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	n, _ := result.RowsAffected()
-	gtest.Assert(n, 2)
-}
-
-func TestModel_Update(t *testing.T) {
-	table := createInitTable()
-	// UPDATE...LIMIT
-	gtest.Case(t, func() {
-		result, err := db.Table(table).Data("nickname", "T100").OrderBy("id desc").Limit(2).Update()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 2)
-
-		v1, err := db.Table(table).Fields("nickname").Where("id", 10).Value()
-		gtest.Assert(err, nil)
-		gtest.Assert(v1.String(), "T100")
-
-		v2, err := db.Table(table).Fields("nickname").Where("id", 8).Value()
-		gtest.Assert(err, nil)
-		gtest.Assert(v2.String(), "T8")
-	})
-
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Data("passport", "t22").Where("passport=?", "t2").Update()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-	})
-
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Data("passport", "t2").Where("passport='t22'").Update()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-	})
-}
-
-func TestModel_Clone(t *testing.T) {
-	md := db.Table("user").Where("id IN(?)", g.Slice{1, 3})
-	count, err := md.Count()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	record, err := md.OrderBy("id DESC").One()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	result, err := md.OrderBy("id ASC").All()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(count, 2)
-	gtest.Assert(record["id"].Int(), 3)
-	gtest.Assert(len(result), 2)
-	gtest.Assert(result[0]["id"].Int(), 1)
-	gtest.Assert(result[1]["id"].Int(), 3)
-}
-
-func TestModel_Safe(t *testing.T) {
-	gtest.Case(t, func() {
-		md := db.Table("user").Safe(false).Where("id IN(?)", g.Slice{1, 3})
-		count, err := md.Count()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(count, 2)
-		md.And("id = ?", 1)
-		count, err = md.Count()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(count, 1)
-	})
-	gtest.Case(t, func() {
-		md := db.Table("user").Safe(true).Where("id IN(?)", g.Slice{1, 3})
-		count, err := md.Count()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(count, 2)
-		md.And("id = ?", 1)
-		count, err = md.Count()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(count, 2)
-	})
-}
-
-func TestModel_All(t *testing.T) {
-	result, err := db.Table("user").All()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(len(result), 3)
-}
-
-func TestModel_One(t *testing.T) {
-	record, err := db.Table("user").Where("id", 1).One()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if record == nil {
-		gtest.Fatal("FAIL")
-	}
-	gtest.Assert(record["nickname"].String(), "T111")
-}
-
-func TestModel_Value(t *testing.T) {
-	value, err := db.Table("user").Fields("nickname").Where("id", 1).Value()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if value == nil {
-		gtest.Fatal("FAIL")
-	}
-	gtest.Assert(value.String(), "T111")
-}
-
-func TestModel_Count(t *testing.T) {
-	count, err := db.Table("user").Count()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(count, 3)
-}
-
-func TestModel_Select(t *testing.T) {
-	result, err := db.Table("user").Select()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(len(result), 3)
-}
-
-func TestModel_Struct(t *testing.T) {
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		user := new(User)
-		err := db.Table("user").Where("id=1").Struct(user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T111")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		err := db.Table("user").Where("id=1").Struct(user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T111")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	// Auto creating struct object.
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := (*User)(nil)
-		err := db.Table("user").Where("id=1").Struct(&user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T111")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	// Just using Scan.
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := (*User)(nil)
-		err := db.Table("user").Where("id=1").Scan(&user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T111")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
-	})
-
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		err := db.Table("user").Where("id=-1").Struct(user)
-		gtest.Assert(err, sql.ErrNoRows)
-	})
-}
-
-func TestModel_Structs(t *testing.T) {
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		var users []User
-		err := db.Table("user").OrderBy("id asc").Structs(&users)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	// Auto create struct slice.
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []*User
-		err := db.Table("user").OrderBy("id asc").Structs(&users)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	// Just using Scan.
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []*User
-		err := db.Table("user").OrderBy("id asc").Scan(&users)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []*User
-		err := db.Table("user").Where("id<0").Structs(&users)
-		gtest.Assert(err, sql.ErrNoRows)
-	})
-}
-
-func TestModel_Scan(t *testing.T) {
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		user := new(User)
-		err := db.Table("user").Where("id=1").Scan(user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T111")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		err := db.Table("user").Where("id=1").Scan(user)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T111")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		var users []User
-		err := db.Table("user").OrderBy("id asc").Scan(&users)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
-	})
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []*User
-		err := db.Table("user").OrderBy("id asc").Scan(&users)
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 3)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T111")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[0].CreateTime.String(), "2018-10-10 00:01:10")
-	})
-
-	gtest.Case(t, func() {
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		users := new([]*User)
-		err1 := db.Table("user").Where("id < 0").Scan(user)
-		err2 := db.Table("user").Where("id < 0").Scan(users)
-		gtest.Assert(err1, sql.ErrNoRows)
-		gtest.Assert(err2, sql.ErrNoRows)
-	})
-}
-
-func TestModel_OrderBy(t *testing.T) {
-	result, err := db.Table("user").OrderBy("id DESC").Select()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(len(result), 3)
-	gtest.Assert(result[0]["nickname"].String(), "T3")
-}
-
-func TestModel_GroupBy(t *testing.T) {
-	result, err := db.Table("user").GroupBy("id").Select()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(len(result), 3)
-	gtest.Assert(result[0]["nickname"].String(), "T111")
-}
-
-func TestModel_Where(t *testing.T) {
-	// string
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id=? and nickname=?", 3, "T3").One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.AssertGT(len(result), 0)
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id", 3).One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.AssertGT(len(result), 0)
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id", 3).Where("nickname", "T3").One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id", 3).And("nickname", "T3").One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id", 30).Or("nickname", "T3").One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id", 30).Or("nickname", "T3").And("id>?", 1).One()
-		gtest.Assert(err, nil)
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id", 30).Or("nickname", "T3").And("id>", 1).One()
-		gtest.Assert(err, nil)
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	// slice
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id=? AND nickname=?", g.Slice{3, "T3"}...).One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("passport like ? and nickname like ?", g.Slice{"t3", "T3"}...).One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	// map
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where(g.Map{"id": 3, "nickname": "T3"}).One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	// map key operator
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where(g.Map{"id>": 1, "id<": 3}).One()
-		gtest.Assert(err, nil)
-		gtest.Assert(result["id"].Int(), 2)
-	})
-	// complicated where 1
-	gtest.Case(t, func() {
-		//db.SetDebug(true)
-		conditions := g.Map{
-			"nickname like ?":    "%T%",
-			"id between ? and ?": g.Slice{1, 3},
-			"id > 0":             nil,
-			"create_time > 0":    nil,
-			"id":                 g.Slice{1, 2, 3},
-		}
-		result, err := db.Table("user").Where(conditions).OrderBy("id asc").All()
-		gtest.Assert(err, nil)
-		gtest.Assert(len(result), 3)
-		gtest.Assert(result[0]["id"].Int(), 1)
-	})
-	// complicated where 2
-	gtest.Case(t, func() {
-		//db.SetDebug(true)
-		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},
-		}
-		result, err := db.Table("user").Where(conditions).OrderBy("id asc").All()
-		gtest.Assert(err, nil)
-		gtest.Assert(len(result), 3)
-		gtest.Assert(result[0]["id"].Int(), 1)
-	})
-	// struct
-	gtest.Case(t, func() {
-		type User struct {
-			Id       int    `json:"id"`
-			Nickname string `gconv:"nickname"`
-		}
-		result, err := db.Table("user").Where(User{3, "T3"}).One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-
-		result, err = db.Table("user").Where(&User{3, "T3"}).One()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(result["id"].Int(), 3)
-	})
-	// slice single
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("id IN(?)", g.Slice{1, 3}).OrderBy("id ASC").All()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(result), 2)
-		gtest.Assert(result[0]["id"].Int(), 1)
-		gtest.Assert(result[1]["id"].Int(), 3)
-	})
-	// slice + string
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where("nickname=? AND id IN(?)", "T3", g.Slice{1, 3}).OrderBy("id ASC").All()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(result), 1)
-		gtest.Assert(result[0]["id"].Int(), 3)
-	})
-	// slice + map
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Where(g.Map{
-			"id":       g.Slice{1, 3},
-			"nickname": "T3",
-		}).OrderBy("id ASC").All()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(result), 1)
-		gtest.Assert(result[0]["id"].Int(), 3)
-	})
-	// slice + struct
-	gtest.Case(t, func() {
-		type User struct {
-			Ids      []int  `json:"id"`
-			Nickname string `gconv:"nickname"`
-		}
-		result, err := db.Table("user").Where(User{
-			Ids:      []int{1, 3},
-			Nickname: "T3",
-		}).OrderBy("id ASC").All()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(result), 1)
-		gtest.Assert(result[0]["id"].Int(), 3)
-	})
-}
-
-func TestModel_Delete(t *testing.T) {
-	// DELETE...LIMIT
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Limit(2).Delete()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 2)
-	})
-
-	gtest.Case(t, func() {
-		result, err := db.Table("user").Delete()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		n, _ := result.RowsAffected()
-		gtest.Assert(n, 1)
-	})
-}

g/database/gdb/gdb_unit_transaction_test.go

@@ -1,588 +0,0 @@
-// Copyright 2019 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 gdb_test
-
-import (
-	"github.com/gogf/gf/g"
-	"github.com/gogf/gf/g/os/gtime"
-	"github.com/gogf/gf/g/test/gtest"
-	"testing"
-)
-
-func TestTX_Query(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if rows, err := tx.Query("SELECT ?", 1); err != nil {
-		gtest.Fatal(err)
-	} else {
-		rows.Close()
-	}
-	if _, err := tx.Query("ERROR"); err == nil {
-		gtest.Fatal("FAIL")
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_Exec(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.Exec("SELECT ?", 1); err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.Exec("ERROR"); err == nil {
-		gtest.Fatal("FAIL")
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_Commit(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_Rollback(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Rollback(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_Prepare(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	st, err := tx.Prepare("SELECT 100")
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	rows, err := st.Query()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	array, err := rows.Columns()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	gtest.Assert(array[0], "100")
-	if err := rows.Close(); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_Insert(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.Insert("user", g.Map{
-		"id":          1,
-		"passport":    "t1",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T1",
-		"create_time": gtime.Now().String(),
-	}); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-	if n, err := db.Table("user").Count(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(n, 1)
-	}
-}
-
-func TestTX_BatchInsert(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.BatchInsert("user", g.List{
-		{
-			"id":          2,
-			"passport":    "t",
-			"password":    "25d55ad283aa400af464c76d713c07ad",
-			"nickname":    "T2",
-			"create_time": gtime.Now().String(),
-		},
-		{
-			"id":          3,
-			"passport":    "t3",
-			"password":    "25d55ad283aa400af464c76d713c07ad",
-			"nickname":    "T3",
-			"create_time": gtime.Now().String(),
-		},
-	}, 10); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-	if n, err := db.Table("user").Count(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(n, 3)
-	}
-}
-
-func TestTX_BatchReplace(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.BatchReplace("user", g.List{
-		{
-			"id":          2,
-			"passport":    "t2",
-			"password":    "p2",
-			"nickname":    "T2",
-			"create_time": gtime.Now().String(),
-		},
-		{
-			"id":          4,
-			"passport":    "t4",
-			"password":    "25d55ad283aa400af464c76d713c07ad",
-			"nickname":    "T4",
-			"create_time": gtime.Now().String(),
-		},
-	}, 10); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-	// 数据数量
-	if n, err := db.Table("user").Count(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(n, 4)
-	}
-	// 检查replace后的数值
-	if value, err := db.Table("user").Fields("password").Where("id", 2).Value(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(value.String(), "p2")
-	}
-}
-
-func TestTX_BatchSave(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.BatchSave("user", g.List{
-		{
-			"id":          4,
-			"passport":    "t4",
-			"password":    "p4",
-			"nickname":    "T4",
-			"create_time": gtime.Now().String(),
-		},
-	}, 10); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-	// 数据数量
-	if n, err := db.Table("user").Count(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(n, 4)
-	}
-	// 检查replace后的数值
-	if value, err := db.Table("user").Fields("password").Where("id", 4).Value(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(value.String(), "p4")
-	}
-}
-
-func TestTX_Replace(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.Replace("user", g.Map{
-		"id":          1,
-		"passport":    "t11",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T11",
-		"create_time": gtime.Now().String(),
-	}); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Rollback(); err != nil {
-		gtest.Fatal(err)
-	}
-	if value, err := db.Table("user").Fields("nickname").Where("id", 1).Value(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(value.String(), "T1")
-	}
-}
-
-func TestTX_Save(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.Save("user", g.Map{
-		"id":          1,
-		"passport":    "t11",
-		"password":    "25d55ad283aa400af464c76d713c07ad",
-		"nickname":    "T11",
-		"create_time": gtime.Now().String(),
-	}); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-	if value, err := db.Table("user").Fields("nickname").Where("id", 1).Value(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(value.String(), "T11")
-	}
-}
-
-func TestTX_Update(t *testing.T) {
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		if result, err := db.Update("user", "create_time='2010-10-10 00:00:01'", "id=3"); err != nil {
-			gtest.Fatal(err)
-		} else {
-			n, _ := result.RowsAffected()
-			gtest.Assert(n, 1)
-		}
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-		if value, err := db.Table("user").Fields("create_time").Where("id", 3).Value(); err != nil {
-			gtest.Fatal(err)
-		} else {
-			gtest.Assert(value.String(), "2010-10-10 00:00:01")
-		}
-	})
-}
-
-func TestTX_GetAll(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if result, err := tx.GetAll("SELECT * FROM user WHERE id=?", 1); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(len(result), 1)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_GetOne(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if record, err := tx.GetOne("SELECT * FROM user WHERE passport=?", "t2"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		if record == nil {
-			gtest.Fatal("FAIL")
-		}
-		gtest.Assert(record["nickname"].String(), "T2")
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_GetValue(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if value, err := tx.GetValue("SELECT id FROM user WHERE passport=?", "t3"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(value.Int(), 3)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_GetCount(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if count, err := tx.GetCount("SELECT * FROM user"); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(count, 4)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-}
-
-func TestTX_GetStruct(t *testing.T) {
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		user := new(User)
-		if err := tx.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T3")
-		gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		if err := tx.GetStruct(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T3")
-		gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-}
-
-func TestTX_GetStructs(t *testing.T) {
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		var users []User
-		if err := tx.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 4)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T11")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []User
-		if err := tx.GetStructs(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 4)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T11")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-}
-
-func TestTX_GetScan(t *testing.T) {
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		user := new(User)
-		if err := tx.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T3")
-		gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		user := new(User)
-		if err := tx.GetScan(user, "SELECT * FROM user WHERE id=?", 3); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(user.NickName, "T3")
-		gtest.Assert(user.CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime gtime.Time
-		}
-		var users []User
-		if err := tx.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 4)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T11")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-
-	gtest.Case(t, func() {
-		tx, err := db.Begin()
-		if err != nil {
-			gtest.Fatal(err)
-		}
-		type User struct {
-			Id         int
-			Passport   string
-			Password   string
-			NickName   string
-			CreateTime *gtime.Time
-		}
-		var users []User
-		if err := tx.GetScan(&users, "SELECT * FROM user WHERE id>=?", 1); err != nil {
-			gtest.Fatal(err)
-		}
-		gtest.Assert(len(users), 4)
-		gtest.Assert(users[0].Id, 1)
-		gtest.Assert(users[1].Id, 2)
-		gtest.Assert(users[2].Id, 3)
-		gtest.Assert(users[0].NickName, "T11")
-		gtest.Assert(users[1].NickName, "T2")
-		gtest.Assert(users[2].NickName, "T3")
-		gtest.Assert(users[2].CreateTime.String(), "2010-10-10 00:00:01")
-		if err := tx.Commit(); err != nil {
-			gtest.Fatal(err)
-		}
-	})
-}
-
-func TestTX_Delete(t *testing.T) {
-	tx, err := db.Begin()
-	if err != nil {
-		gtest.Fatal(err)
-	}
-	if _, err := tx.Delete("user", nil); err != nil {
-		gtest.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		gtest.Fatal(err)
-	}
-	if n, err := db.Table("user").Count(); err != nil {
-		gtest.Fatal(err)
-	} else {
-		gtest.Assert(n, 0)
-	}
-}

g/database/gdb/gdb_unit_types_test.go

@@ -0,0 +1,60 @@
+// Copyright 2019 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 gdb_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/gogf/gf/g"
+
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func Test_Types(t *testing.T) {
+
+	gtest.Case(t, func() {
+		if _, err := db.Exec(fmt.Sprintf(`
+    CREATE TABLE IF NOT EXISTS types (
+        id int(10) unsigned NOT NULL AUTO_INCREMENT,
+        %s blob NOT NULL,
+        %s binary(8) NOT NULL,
+        %s date NOT NULL,
+        %s decimal(5,2) NOT NULL,
+        %s double NOT NULL,
+        %s bit(2) NOT NULL,
+        PRIMARY KEY (id)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+    `, "`blob`", "`binary`", "`date`", "`decimal`", "`double`", "`bit`")); err != nil {
+			gtest.Error(err)
+		}
+		defer dropTable("types")
+		data := g.Map{
+			"id":      1,
+			"blob":    "i love gf",
+			"binary":  []byte("abcdefgh"),
+			"date":    "2018-10-24",
+			"decimal": 123.456,
+			"double":  123.456,
+			"bit":     2,
+		}
+		r, err := db.Table("types").Data(data).Insert()
+		gtest.Assert(err, nil)
+		n, _ := r.RowsAffected()
+		gtest.Assert(n, 1)
+
+		one, err := db.Table("types").One()
+		gtest.Assert(err, nil)
+		gtest.Assert(one["id"].Int(), 1)
+		gtest.Assert(one["blob"].String(), data["blob"])
+		gtest.Assert(one["binary"].String(), data["binary"])
+		gtest.Assert(one["date"].String(), data["date"])
+		gtest.Assert(one["decimal"].String(), 123.46)
+		gtest.Assert(one["double"].String(), data["double"])
+		gtest.Assert(one["bit"].Int(), data["bit"])
+	})
+}

g/database/gdb/gdb_unit_z_method_test.go

@@ -0,0 +1,627 @@
+// Copyright 2019 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 gdb_test
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/gogf/gf/g"
+	"github.com/gogf/gf/g/os/gtime"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func Test_DB_Ping(t *testing.T) {
+	gtest.Case(t, func() {
+		err1 := db.PingMaster()
+		err2 := db.PingSlave()
+		gtest.Assert(err1, nil)
+		gtest.Assert(err2, nil)
+	})
+}
+
+func Test_DB_Query(t *testing.T) {
+	gtest.Case(t, func() {
+		_, err := db.Query("SELECT ?", 1)
+		gtest.Assert(err, nil)
+
+		_, err = db.Query("SELECT ?+?", 1, 2)
+		gtest.Assert(err, nil)
+
+		_, err = db.Query("SELECT ?+?", g.Slice{1, 2})
+		gtest.Assert(err, nil)
+
+		_, err = db.Query("ERROR")
+		gtest.AssertNE(err, nil)
+	})
+
+}
+
+func Test_DB_Exec(t *testing.T) {
+	gtest.Case(t, func() {
+		_, err := db.Exec("SELECT ?", 1)
+		gtest.Assert(err, nil)
+
+		_, err = db.Exec("ERROR")
+		gtest.AssertNE(err, nil)
+	})
+
+}
+
+func Test_DB_Prepare(t *testing.T) {
+	gtest.Case(t, func() {
+		st, err := db.Prepare("SELECT 100")
+		gtest.Assert(err, nil)
+
+		rows, err := st.Query()
+		gtest.Assert(err, nil)
+
+		array, err := rows.Columns()
+		gtest.Assert(err, nil)
+		gtest.Assert(array[0], "100")
+
+		err = rows.Close()
+		gtest.Assert(err, nil)
+	})
+}
+
+func Test_DB_Insert(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		_, err := db.Insert(table, g.Map{
+			"id":          1,
+			"passport":    "t1",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "T1",
+			"create_time": gtime.Now().String(),
+		})
+		gtest.Assert(err, nil)
+
+		// normal map
+		result, err := db.Insert(table, g.Map{
+			"id":          "2",
+			"passport":    "t2",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "name_2",
+			"create_time": gtime.Now().String(),
+		})
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+
+		// struct
+		type User struct {
+			Id         int    `gconv:"id"`
+			Passport   string `json:"passport"`
+			Password   string `gconv:"password"`
+			Nickname   string `gconv:"nickname"`
+			CreateTime string `json:"create_time"`
+		}
+		timeStr := gtime.Now().String()
+		result, err = db.Insert(table, User{
+			Id:         3,
+			Passport:   "user_3",
+			Password:   "25d55ad283aa400af464c76d713c07ad",
+			Nickname:   "name_3",
+			CreateTime: timeStr,
+		})
+		gtest.Assert(err, nil)
+		n, _ = result.RowsAffected()
+		gtest.Assert(n, 1)
+
+		one, err := db.Table(table).Where("id", 3).One()
+		gtest.Assert(err, nil)
+
+		gtest.Assert(one["id"].Int(), 3)
+		gtest.Assert(one["passport"].String(), "user_3")
+		gtest.Assert(one["password"].String(), "25d55ad283aa400af464c76d713c07ad")
+		gtest.Assert(one["nickname"].String(), "name_3")
+		gtest.Assert(one["create_time"].String(), timeStr)
+
+		// *struct
+		timeStr = gtime.Now().String()
+		result, err = db.Insert(table, &User{
+			Id:         4,
+			Passport:   "t4",
+			Password:   "25d55ad283aa400af464c76d713c07ad",
+			Nickname:   "name_4",
+			CreateTime: timeStr,
+		})
+		gtest.Assert(err, nil)
+		n, _ = result.RowsAffected()
+		gtest.Assert(n, 1)
+
+		one, err = db.Table(table).Where("id", 4).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(one["id"].Int(), 4)
+		gtest.Assert(one["passport"].String(), "t4")
+		gtest.Assert(one["password"].String(), "25d55ad283aa400af464c76d713c07ad")
+		gtest.Assert(one["nickname"].String(), "name_4")
+		gtest.Assert(one["create_time"].String(), timeStr)
+
+		// batch with Insert
+		timeStr = gtime.Now().String()
+		r, err := db.Insert(table, g.Slice{
+			g.Map{
+				"id":          200,
+				"passport":    "t200",
+				"password":    "25d55ad283aa400af464c76d71qw07ad",
+				"nickname":    "T200",
+				"create_time": timeStr,
+			},
+			g.Map{
+				"id":          300,
+				"passport":    "t300",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "T300",
+				"create_time": timeStr,
+			},
+		})
+		gtest.Assert(err, nil)
+		n, _ = r.RowsAffected()
+		gtest.Assert(n, 2)
+
+		one, err = db.Table(table).Where("id", 200).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(one["id"].Int(), 200)
+		gtest.Assert(one["passport"].String(), "t200")
+		gtest.Assert(one["password"].String(), "25d55ad283aa400af464c76d71qw07ad")
+		gtest.Assert(one["nickname"].String(), "T200")
+		gtest.Assert(one["create_time"].String(), timeStr)
+	})
+}
+
+func Test_DB_BatchInsert(t *testing.T) {
+	gtest.Case(t, func() {
+		table := createTable()
+		defer dropTable(table)
+		r, err := db.BatchInsert(table, g.List{
+			{
+				"id":          2,
+				"passport":    "t2",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "name_2",
+				"create_time": gtime.Now().String(),
+			},
+			{
+				"id":          3,
+				"passport":    "user_3",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "name_3",
+				"create_time": gtime.Now().String(),
+			},
+		}, 1)
+		gtest.Assert(err, nil)
+		n, _ := r.RowsAffected()
+		gtest.Assert(n, 2)
+	})
+
+	gtest.Case(t, func() {
+		table := createTable()
+		defer dropTable(table)
+		// []interface{}
+		r, err := db.BatchInsert(table, g.Slice{
+			g.Map{
+				"id":          2,
+				"passport":    "t2",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "name_2",
+				"create_time": gtime.Now().String(),
+			},
+			g.Map{
+				"id":          3,
+				"passport":    "user_3",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "name_3",
+				"create_time": gtime.Now().String(),
+			},
+		}, 1)
+		gtest.Assert(err, nil)
+		n, _ := r.RowsAffected()
+		gtest.Assert(n, 2)
+	})
+
+	// batch insert map
+	gtest.Case(t, func() {
+		table := createTable()
+		defer dropTable(table)
+		result, err := db.BatchInsert(table, g.Map{
+			"id":          1,
+			"passport":    "t1",
+			"password":    "p1",
+			"nickname":    "T1",
+			"create_time": gtime.Now().String(),
+		})
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+	})
+
+	// batch insert struct
+	gtest.Case(t, func() {
+		table := createTable()
+		defer dropTable(table)
+
+		type User struct {
+			Id         int         `gconv:"id"`
+			Passport   string      `gconv:"passport"`
+			Password   string      `gconv:"password"`
+			NickName   string      `gconv:"nickname"`
+			CreateTime *gtime.Time `gconv:"create_time"`
+		}
+		user := &User{
+			Id:         1,
+			Passport:   "t1",
+			Password:   "p1",
+			NickName:   "T1",
+			CreateTime: gtime.Now(),
+		}
+		result, err := db.BatchInsert(table, user)
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+	})
+
+}
+
+func Test_DB_Save(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		timeStr := gtime.Now().String()
+		_, err := db.Save(table, g.Map{
+			"id":          1,
+			"passport":    "t1",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "T11",
+			"create_time": timeStr,
+		})
+		gtest.Assert(err, nil)
+
+		one, err := db.Table(table).Where("id", 1).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(one["id"].Int(), 1)
+		gtest.Assert(one["passport"].String(), "t1")
+		gtest.Assert(one["password"].String(), "25d55ad283aa400af464c76d713c07ad")
+		gtest.Assert(one["nickname"].String(), "T11")
+		gtest.Assert(one["create_time"].String(), timeStr)
+	})
+}
+
+func Test_DB_Replace(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		timeStr := gtime.Now().String()
+		_, err := db.Replace(table, g.Map{
+			"id":          1,
+			"passport":    "t1",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "T11",
+			"create_time": timeStr,
+		})
+		gtest.Assert(err, nil)
+
+		one, err := db.Table(table).Where("id", 1).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(one["id"].Int(), 1)
+		gtest.Assert(one["passport"].String(), "t1")
+		gtest.Assert(one["password"].String(), "25d55ad283aa400af464c76d713c07ad")
+		gtest.Assert(one["nickname"].String(), "T11")
+		gtest.Assert(one["create_time"].String(), timeStr)
+	})
+}
+
+func Test_DB_Update(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.Update(table, "password='987654321'", "id=3")
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+
+		one, err := db.Table(table).Where("id", 3).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(one["id"].Int(), 3)
+		gtest.Assert(one["passport"].String(), "user_3")
+		gtest.Assert(one["password"].String(), "987654321")
+		gtest.Assert(one["nickname"].String(), "name_3")
+	})
+}
+
+func Test_DB_GetAll(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 1)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 1)
+		gtest.Assert(result[0]["id"].Int(), 1)
+	})
+	gtest.Case(t, func() {
+		result, err := db.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), g.Slice{1})
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 1)
+		gtest.Assert(result[0]["id"].Int(), 1)
+	})
+	gtest.Case(t, func() {
+		result, err := db.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id in(?)", table), g.Slice{1, 2, 3})
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 3)
+		gtest.Assert(result[0]["id"].Int(), 1)
+		gtest.Assert(result[1]["id"].Int(), 2)
+		gtest.Assert(result[2]["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id in(?,?,?)", table), g.Slice{1, 2, 3})
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 3)
+		gtest.Assert(result[0]["id"].Int(), 1)
+		gtest.Assert(result[1]["id"].Int(), 2)
+		gtest.Assert(result[2]["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id in(?,?,?)", table), g.Slice{1, 2, 3}...)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 3)
+		gtest.Assert(result[0]["id"].Int(), 1)
+		gtest.Assert(result[1]["id"].Int(), 2)
+		gtest.Assert(result[2]["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id>=? AND id <=?", table), g.Slice{1, 3})
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 3)
+		gtest.Assert(result[0]["id"].Int(), 1)
+		gtest.Assert(result[1]["id"].Int(), 2)
+		gtest.Assert(result[2]["id"].Int(), 3)
+	})
+}
+
+func Test_DB_GetOne(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		record, err := db.GetOne(fmt.Sprintf("SELECT * FROM %s WHERE passport=?", table), "user_1")
+		gtest.Assert(err, nil)
+		gtest.Assert(record["nickname"].String(), "name_1")
+	})
+}
+
+func Test_DB_GetValue(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		value, err := db.GetValue(fmt.Sprintf("SELECT id FROM %s WHERE passport=?", table), "user_3")
+		gtest.Assert(err, nil)
+		gtest.Assert(value.Int(), 3)
+	})
+}
+
+func Test_DB_GetCount(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		count, err := db.GetCount(fmt.Sprintf("SELECT * FROM %s", table))
+		gtest.Assert(err, nil)
+		gtest.Assert(count, INIT_DATA_SIZE)
+	})
+}
+
+func Test_DB_GetStruct(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		user := new(User)
+		err := db.GetStruct(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_3")
+	})
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		err := db.GetStruct(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_3")
+	})
+}
+
+func Test_DB_GetStructs(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		err := db.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(users), INIT_DATA_SIZE-1)
+		gtest.Assert(users[0].Id, 2)
+		gtest.Assert(users[1].Id, 3)
+		gtest.Assert(users[2].Id, 4)
+		gtest.Assert(users[0].NickName, "name_2")
+		gtest.Assert(users[1].NickName, "name_3")
+		gtest.Assert(users[2].NickName, "name_4")
+	})
+
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []User
+		err := db.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(users), INIT_DATA_SIZE-1)
+		gtest.Assert(users[0].Id, 2)
+		gtest.Assert(users[1].Id, 3)
+		gtest.Assert(users[2].Id, 4)
+		gtest.Assert(users[0].NickName, "name_2")
+		gtest.Assert(users[1].NickName, "name_3")
+		gtest.Assert(users[2].NickName, "name_4")
+	})
+}
+
+func Test_DB_GetScan(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		user := new(User)
+		err := db.GetScan(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_3")
+	})
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		err := db.GetScan(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_3")
+	})
+
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		err := db.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(users), INIT_DATA_SIZE-1)
+		gtest.Assert(users[0].Id, 2)
+		gtest.Assert(users[1].Id, 3)
+		gtest.Assert(users[2].Id, 4)
+		gtest.Assert(users[0].NickName, "name_2")
+		gtest.Assert(users[1].NickName, "name_3")
+		gtest.Assert(users[2].NickName, "name_4")
+	})
+
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []User
+		err := db.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(users), INIT_DATA_SIZE-1)
+		gtest.Assert(users[0].Id, 2)
+		gtest.Assert(users[1].Id, 3)
+		gtest.Assert(users[2].Id, 4)
+		gtest.Assert(users[0].NickName, "name_2")
+		gtest.Assert(users[1].NickName, "name_3")
+		gtest.Assert(users[2].NickName, "name_4")
+	})
+}
+
+func Test_DB_Delete(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		result, err := db.Delete(table, nil)
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, INIT_DATA_SIZE)
+	})
+}
+
+func Test_DB_Time(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.Insert(table, g.Map{
+			"id":          200,
+			"passport":    "t200",
+			"password":    "123456",
+			"nickname":    "T200",
+			"create_time": time.Now(),
+		})
+		if err != nil {
+			gtest.Error(err)
+		}
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+		value, err := db.GetValue(fmt.Sprintf("select `passport` from `%s` where id=?", table), 200)
+		gtest.Assert(err, nil)
+		gtest.Assert(value.String(), "t200")
+	})
+
+	gtest.Case(t, func() {
+		t := time.Now()
+		result, err := db.Insert(table, g.Map{
+			"id":          300,
+			"passport":    "t300",
+			"password":    "123456",
+			"nickname":    "T300",
+			"create_time": &t,
+		})
+		if err != nil {
+			gtest.Error(err)
+		}
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+		value, err := db.GetValue(fmt.Sprintf("select `passport` from `%s` where id=?", table), 300)
+		gtest.Assert(err, nil)
+		gtest.Assert(value.String(), "t300")
+	})
+
+	gtest.Case(t, func() {
+		result, err := db.Delete(table, nil)
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 2)
+	})
+}

g/database/gdb/gdb_unit_z_model_test.go

@@ -0,0 +1,818 @@
+// Copyright 2019 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 gdb_test
+
+import (
+	"database/sql"
+	"fmt"
+	"testing"
+
+	"github.com/gogf/gf/g"
+	"github.com/gogf/gf/g/os/gtime"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func Test_Model_Insert(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Filter().Data(g.Map{
+			"id":          1,
+			"uid":         1,
+			"passport":    "t1",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "name_1",
+			"create_time": gtime.Now().String(),
+		}).Insert()
+		gtest.Assert(err, nil)
+		n, _ := result.LastInsertId()
+		gtest.Assert(n, 1)
+
+		result, err = db.Table(table).Filter().Data(g.Map{
+			"id":          "2",
+			"uid":         "2",
+			"passport":    "t2",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "name_2",
+			"create_time": gtime.Now().String(),
+		}).Insert()
+		gtest.Assert(err, nil)
+		n, _ = result.RowsAffected()
+		gtest.Assert(n, 1)
+
+		type User struct {
+			Id         int    `gconv:"id"`
+			Uid        int    `gconv:"uid"`
+			Passport   string `json:"passport"`
+			Password   string `gconv:"password"`
+			Nickname   string `gconv:"nickname"`
+			CreateTime string `json:"create_time"`
+		}
+		result, err = db.Table(table).Filter().Data(User{
+			Id:         3,
+			Uid:        3,
+			Passport:   "t3",
+			Password:   "25d55ad283aa400af464c76d713c07ad",
+			Nickname:   "name_3",
+			CreateTime: gtime.Now().String(),
+		}).Insert()
+		gtest.Assert(err, nil)
+		n, _ = result.RowsAffected()
+		gtest.Assert(n, 1)
+		value, err := db.Table(table).Fields("passport").Where("id=3").Value()
+		gtest.Assert(err, nil)
+		gtest.Assert(value.String(), "t3")
+
+		result, err = db.Table(table).Filter().Data(&User{
+			Id:         4,
+			Uid:        4,
+			Passport:   "t4",
+			Password:   "25d55ad283aa400af464c76d713c07ad",
+			Nickname:   "T4",
+			CreateTime: gtime.Now().String(),
+		}).Insert()
+		gtest.Assert(err, nil)
+		n, _ = result.RowsAffected()
+		gtest.Assert(n, 1)
+		value, err = db.Table(table).Fields("passport").Where("id=4").Value()
+		gtest.Assert(err, nil)
+		gtest.Assert(value.String(), "t4")
+
+		result, err = db.Table(table).Where("id>?", 1).Delete()
+		gtest.Assert(err, nil)
+		n, _ = result.RowsAffected()
+		gtest.Assert(n, 3)
+	})
+
+}
+
+func Test_Model_Batch(t *testing.T) {
+	// bacth insert
+	gtest.Case(t, func() {
+		table := createTable()
+		defer dropTable(table)
+		result, err := db.Table(table).Filter().Data(g.List{
+			{
+				"id":          2,
+				"uid":         2,
+				"passport":    "t2",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "name_2",
+				"create_time": gtime.Now().String(),
+			},
+			{
+				"id":          3,
+				"uid":         3,
+				"passport":    "t3",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "name_3",
+				"create_time": gtime.Now().String(),
+			},
+		}).Batch(1).Insert()
+		if err != nil {
+			gtest.Error(err)
+		}
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 2)
+	})
+
+	// batch save
+	gtest.Case(t, func() {
+		table := createInitTable()
+		defer dropTable(table)
+		result, err := db.Table(table).All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), INIT_DATA_SIZE)
+		for _, v := range result {
+			v["nickname"].Set(v["nickname"].String() + v["id"].String())
+		}
+		r, e := db.Table(table).Data(result).Save()
+		gtest.Assert(e, nil)
+		n, e := r.RowsAffected()
+		gtest.Assert(e, nil)
+		gtest.Assert(n, INIT_DATA_SIZE*2)
+	})
+
+	// batch replace
+	gtest.Case(t, func() {
+		table := createInitTable()
+		defer dropTable(table)
+		result, err := db.Table(table).All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), INIT_DATA_SIZE)
+		for _, v := range result {
+			v["nickname"].Set(v["nickname"].String() + v["id"].String())
+		}
+		r, e := db.Table(table).Data(result).Replace()
+		gtest.Assert(e, nil)
+		n, e := r.RowsAffected()
+		gtest.Assert(e, nil)
+		gtest.Assert(n, INIT_DATA_SIZE*2)
+	})
+}
+
+func Test_Model_Replace(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Data(g.Map{
+			"id":          1,
+			"passport":    "t11",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "T11",
+			"create_time": "2018-10-24 10:00:00",
+		}).Replace()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+	})
+}
+
+func Test_Model_Save(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Data(g.Map{
+			"id":          1,
+			"passport":    "t111",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "T111",
+			"create_time": "2018-10-24 10:00:00",
+		}).Save()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+	})
+}
+
+func Test_Model_Update(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	// UPDATE...LIMIT
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Data("nickname", "T100").OrderBy("id desc").Limit(2).Update()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 2)
+
+		v1, err := db.Table(table).Fields("nickname").Where("id", 10).Value()
+		gtest.Assert(err, nil)
+		gtest.Assert(v1.String(), "T100")
+
+		v2, err := db.Table(table).Fields("nickname").Where("id", 8).Value()
+		gtest.Assert(err, nil)
+		gtest.Assert(v2.String(), "name_8")
+	})
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Data("passport", "user_22").Where("passport=?", "user_2").Update()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+	})
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Data("passport", "user_2").Where("passport='user_22'").Update()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 1)
+	})
+}
+
+func Test_Model_Clone(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		md := db.Table(table).Where("id IN(?)", g.Slice{1, 3})
+		count, err := md.Count()
+		gtest.Assert(err, nil)
+
+		record, err := md.OrderBy("id DESC").One()
+		gtest.Assert(err, nil)
+
+		result, err := md.OrderBy("id ASC").All()
+		gtest.Assert(err, nil)
+
+		gtest.Assert(count, 2)
+		gtest.Assert(record["id"].Int(), 3)
+		gtest.Assert(len(result), 2)
+		gtest.Assert(result[0]["id"].Int(), 1)
+		gtest.Assert(result[1]["id"].Int(), 3)
+	})
+}
+
+func Test_Model_Safe(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		md := db.Table(table).Safe(false).Where("id IN(?)", g.Slice{1, 3})
+		count, err := md.Count()
+		gtest.Assert(err, nil)
+		gtest.Assert(count, 2)
+
+		md.And("id = ?", 1)
+		count, err = md.Count()
+		gtest.Assert(err, nil)
+		gtest.Assert(count, 1)
+	})
+	gtest.Case(t, func() {
+		md := db.Table(table).Safe(true).Where("id IN(?)", g.Slice{1, 3})
+		count, err := md.Count()
+		gtest.Assert(err, nil)
+		gtest.Assert(count, 2)
+
+		md.And("id = ?", 1)
+		count, err = md.Count()
+		gtest.Assert(err, nil)
+		gtest.Assert(count, 2)
+	})
+}
+
+func Test_Model_All(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), INIT_DATA_SIZE)
+	})
+	// sql.ErrNoRows
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id<0").All()
+		gtest.Assert(result, nil)
+		gtest.Assert(err, sql.ErrNoRows)
+	})
+}
+
+func Test_Model_One(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		record, err := db.Table(table).Where("id", 1).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(record["nickname"].String(), "name_1")
+	})
+	// sql.ErrNoRows
+	gtest.Case(t, func() {
+		record, err := db.Table(table).Where("id", 0).One()
+		gtest.Assert(err, sql.ErrNoRows)
+		gtest.Assert(record, nil)
+	})
+}
+
+func Test_Model_Value(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		value, err := db.Table(table).Fields("nickname").Where("id", 1).Value()
+		gtest.Assert(err, nil)
+		gtest.Assert(value.String(), "name_1")
+	})
+	// sql.ErrNoRows
+	gtest.Case(t, func() {
+		value, err := db.Table(table).Fields("nickname").Where("id", 0).Value()
+		gtest.Assert(err, sql.ErrNoRows)
+		gtest.Assert(value, nil)
+	})
+}
+
+func Test_Model_Count(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		count, err := db.Table(table).Count()
+		gtest.Assert(err, nil)
+		gtest.Assert(count, INIT_DATA_SIZE)
+	})
+}
+
+func Test_Model_Select(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Select()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), INIT_DATA_SIZE)
+	})
+}
+
+func Test_Model_Struct(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		user := new(User)
+		err := db.Table(table).Where("id=1").Struct(user)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_1")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		err := db.Table(table).Where("id=1").Struct(user)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_1")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// Auto creating struct object.
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := (*User)(nil)
+		err := db.Table(table).Where("id=1").Struct(&user)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_1")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// Just using Scan.
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := (*User)(nil)
+		err := db.Table(table).Where("id=1").Scan(&user)
+		if err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(user.NickName, "name_1")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// sql.ErrNoRows
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		err := db.Table(table).Where("id=-1").Struct(user)
+		gtest.Assert(err, sql.ErrNoRows)
+	})
+}
+
+func Test_Model_Structs(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		err := db.Table(table).OrderBy("id asc").Structs(&users)
+		if err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[0].CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// Auto create struct slice.
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []*User
+		err := db.Table(table).OrderBy("id asc").Structs(&users)
+		if err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[0].CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// Just using Scan.
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []*User
+		err := db.Table(table).OrderBy("id asc").Scan(&users)
+		if err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[0].CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// sql.ErrNoRows
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []*User
+		err := db.Table(table).Where("id<0").Structs(&users)
+		gtest.Assert(err, sql.ErrNoRows)
+	})
+}
+
+func Test_Model_Scan(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		user := new(User)
+		err := db.Table(table).Where("id=1").Scan(user)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_1")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		err := db.Table(table).Where("id=1").Scan(user)
+		gtest.Assert(err, nil)
+		gtest.Assert(user.NickName, "name_1")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		err := db.Table(table).OrderBy("id asc").Scan(&users)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[0].CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []*User
+		err := db.Table(table).OrderBy("id asc").Scan(&users)
+		gtest.Assert(err, nil)
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[0].CreateTime.String(), "2018-10-24 10:00:00")
+	})
+	// sql.ErrNoRows
+	gtest.Case(t, func() {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		users := new([]*User)
+		err1 := db.Table(table).Where("id < 0").Scan(user)
+		err2 := db.Table(table).Where("id < 0").Scan(users)
+		gtest.Assert(err1, sql.ErrNoRows)
+		gtest.Assert(err2, sql.ErrNoRows)
+	})
+}
+
+func Test_Model_OrderBy(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).OrderBy("id DESC").Select()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), INIT_DATA_SIZE)
+		gtest.Assert(result[0]["nickname"].String(), fmt.Sprintf("name_%d", INIT_DATA_SIZE))
+	})
+}
+
+func Test_Model_GroupBy(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).GroupBy("id").Select()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), INIT_DATA_SIZE)
+		gtest.Assert(result[0]["nickname"].String(), "name_1")
+	})
+}
+
+func Test_Model_Where(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	// string
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id=? and nickname=?", 3, "name_3").One()
+		gtest.Assert(err, nil)
+		gtest.AssertGT(len(result), 0)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	// slice parameter
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id=? and nickname=?", g.Slice{3, "name_3"}).One()
+		gtest.Assert(err, nil)
+		gtest.AssertGT(len(result), 0)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id=3", g.Slice{}).One()
+		gtest.Assert(err, nil)
+		gtest.AssertGT(len(result), 0)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id=?", g.Slice{3}).One()
+		gtest.Assert(err, nil)
+		gtest.AssertGT(len(result), 0)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id", 3).One()
+		gtest.Assert(err, nil)
+		gtest.AssertGT(len(result), 0)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id", 3).Where("nickname", "name_3").One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id", 3).And("nickname", "name_3").One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id", 30).Or("nickname", "name_3").One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id", 30).Or("nickname", "name_3").And("id>?", 1).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id", 30).Or("nickname", "name_3").And("id>", 1).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	// slice
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id=? AND nickname=?", g.Slice{3, "name_3"}...).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id=? AND nickname=?", g.Slice{3, "name_3"}).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("passport like ? and nickname like ?", g.Slice{"user_3", "name_3"}).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	// map
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where(g.Map{"id": 3, "nickname": "name_3"}).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	// map key operator
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where(g.Map{"id>": 1, "id<": 3}).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 2)
+	})
+	// complicated where 1
+	gtest.Case(t, func() {
+		//db.SetDebug(true)
+		conditions := g.Map{
+			"nickname like ?":    "%name%",
+			"id between ? and ?": g.Slice{1, 3},
+			"id > 0":             nil,
+			"create_time > 0":    nil,
+			"id":                 g.Slice{1, 2, 3},
+		}
+		result, err := db.Table(table).Where(conditions).OrderBy("id asc").All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 3)
+		gtest.Assert(result[0]["id"].Int(), 1)
+	})
+	// complicated where 2
+	gtest.Case(t, func() {
+		//db.SetDebug(true)
+		conditions := g.Map{
+			"nickname like ?":    "%name%",
+			"id between ? and ?": g.Slice{1, 3},
+			"id >= ?":            1,
+			"create_time > ?":    0,
+			"id in(?)":           g.Slice{1, 2, 3},
+		}
+		result, err := db.Table(table).Where(conditions).OrderBy("id asc").All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 3)
+		gtest.Assert(result[0]["id"].Int(), 1)
+	})
+	// struct
+	gtest.Case(t, func() {
+		type User struct {
+			Id       int    `json:"id"`
+			Nickname string `gconv:"nickname"`
+		}
+		result, err := db.Table(table).Where(User{3, "name_3"}).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+
+		result, err = db.Table(table).Where(&User{3, "name_3"}).One()
+		gtest.Assert(err, nil)
+		gtest.Assert(result["id"].Int(), 3)
+	})
+	// slice single
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("id IN(?)", g.Slice{1, 3}).OrderBy("id ASC").All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 2)
+		gtest.Assert(result[0]["id"].Int(), 1)
+		gtest.Assert(result[1]["id"].Int(), 3)
+	})
+	// slice + string
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where("nickname=? AND id IN(?)", "name_3", g.Slice{1, 3}).OrderBy("id ASC").All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 1)
+		gtest.Assert(result[0]["id"].Int(), 3)
+	})
+	// slice + map
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Where(g.Map{
+			"id":       g.Slice{1, 3},
+			"nickname": "name_3",
+		}).OrderBy("id ASC").All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 1)
+		gtest.Assert(result[0]["id"].Int(), 3)
+	})
+	// slice + struct
+	gtest.Case(t, func() {
+		type User struct {
+			Ids      []int  `json:"id"`
+			Nickname string `gconv:"nickname"`
+		}
+		result, err := db.Table(table).Where(User{
+			Ids:      []int{1, 3},
+			Nickname: "name_3",
+		}).OrderBy("id ASC").All()
+		gtest.Assert(err, nil)
+		gtest.Assert(len(result), 1)
+		gtest.Assert(result[0]["id"].Int(), 3)
+	})
+}
+
+func Test_Model_Delete(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	// DELETE...LIMIT
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Limit(2).Delete()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, 2)
+	})
+
+	gtest.Case(t, func() {
+		result, err := db.Table(table).Delete()
+		gtest.Assert(err, nil)
+		n, _ := result.RowsAffected()
+		gtest.Assert(n, INIT_DATA_SIZE-2)
+	})
+}

g/database/gdb/gdb_unit_z_struct_test.go

@@ -7,13 +7,17 @@
 package gdb_test
 
 import (
+	"testing"
+
 	"github.com/gogf/gf/g"
 	"github.com/gogf/gf/g/os/gtime"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
 )
 
-func TestModel_Inherit_Insert(t *testing.T) {
+func Test_Model_Inherit_Insert(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
 	gtest.Case(t, func() {
 		type Base struct {
 			Id         int    `json:"id"`
@@ -26,7 +30,7 @@ func TestModel_Inherit_Insert(t *testing.T) {
 			Password string `json:"password"`
 			Nickname string `json:"nickname"`
 		}
-		result, err := db.Table("user").Filter().Data(User{
+		result, err := db.Table(table).Filter().Data(User{
 			Passport: "john-test",
 			Password: "123456",
 			Nickname: "John",
@@ -39,16 +43,16 @@ func TestModel_Inherit_Insert(t *testing.T) {
 		gtest.Assert(err, nil)
 		n, _ := result.RowsAffected()
 		gtest.Assert(n, 1)
-		value, err := db.Table("user").Fields("passport").Where("id=100").Value()
+		value, err := db.Table(table).Fields("passport").Where("id=100").Value()
 		gtest.Assert(err, nil)
 		gtest.Assert(value.String(), "john-test")
-		// Delete this test data.
-		_, err = db.Table("user").Where("id", 100).Delete()
-		gtest.Assert(err, nil)
 	})
 }
 
-func TestModel_Inherit_MapToStruct(t *testing.T) {
+func Test_Model_Inherit_MapToStruct(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
 	gtest.Case(t, func() {
 		type Ids struct {
 			Id  int `json:"id"`
@@ -72,12 +76,12 @@ func TestModel_Inherit_MapToStruct(t *testing.T) {
 			"nickname":    "T1",
 			"create_time": gtime.Now().String(),
 		}
-		result, err := db.Table("user").Filter().Data(data).Insert()
+		result, err := db.Table(table).Filter().Data(data).Insert()
 		gtest.Assert(err, nil)
 		n, _ := result.RowsAffected()
 		gtest.Assert(n, 1)
 
-		one, err := db.Table("user").Where("id=100").One()
+		one, err := db.Table(table).Where("id=100").One()
 		gtest.Assert(err, nil)
 
 		user := new(User)
@@ -89,9 +93,6 @@ func TestModel_Inherit_MapToStruct(t *testing.T) {
 		gtest.Assert(user.Nickname, data["nickname"])
 		gtest.Assert(user.CreateTime, data["create_time"])
 
-		// Delete this test data.
-		_, err = db.Table("user").Where("id", 100).Delete()
-		gtest.Assert(err, nil)
 	})
 
 }

g/database/gdb/gdb_unit_z_transaction_test.go

@@ -0,0 +1,677 @@
+// Copyright 2019 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 gdb_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/gogf/gf/g"
+	"github.com/gogf/gf/g/os/gtime"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func Test_TX_Query(t *testing.T) {
+	tx, err := db.Begin()
+	if err != nil {
+		gtest.Error(err)
+	}
+	if rows, err := tx.Query("SELECT ?", 1); err != nil {
+		gtest.Error(err)
+	} else {
+		rows.Close()
+	}
+	if rows, err := tx.Query("SELECT ?+?", 1, 2); err != nil {
+		gtest.Error(err)
+	} else {
+		rows.Close()
+	}
+	if rows, err := tx.Query("SELECT ?+?", g.Slice{1, 2}); err != nil {
+		gtest.Error(err)
+	} else {
+		rows.Close()
+	}
+	if _, err := tx.Query("ERROR"); err == nil {
+		gtest.Error("FAIL")
+	}
+	if err := tx.Commit(); err != nil {
+		gtest.Error(err)
+	}
+}
+
+func Test_TX_Exec(t *testing.T) {
+	tx, err := db.Begin()
+	if err != nil {
+		gtest.Error(err)
+	}
+	if _, err := tx.Exec("SELECT ?", 1); err != nil {
+		gtest.Error(err)
+	}
+	if _, err := tx.Exec("SELECT ?+?", 1, 2); err != nil {
+		gtest.Error(err)
+	}
+	if _, err := tx.Exec("SELECT ?+?", g.Slice{1, 2}); err != nil {
+		gtest.Error(err)
+	}
+	if _, err := tx.Exec("ERROR"); err == nil {
+		gtest.Error("FAIL")
+	}
+	if err := tx.Commit(); err != nil {
+		gtest.Error(err)
+	}
+}
+
+func Test_TX_Commit(t *testing.T) {
+	tx, err := db.Begin()
+	if err != nil {
+		gtest.Error(err)
+	}
+	if err := tx.Commit(); err != nil {
+		gtest.Error(err)
+	}
+}
+
+func Test_TX_Rollback(t *testing.T) {
+	tx, err := db.Begin()
+	if err != nil {
+		gtest.Error(err)
+	}
+	if err := tx.Rollback(); err != nil {
+		gtest.Error(err)
+	}
+}
+
+func Test_TX_Prepare(t *testing.T) {
+	tx, err := db.Begin()
+	if err != nil {
+		gtest.Error(err)
+	}
+	st, err := tx.Prepare("SELECT 100")
+	if err != nil {
+		gtest.Error(err)
+	}
+	rows, err := st.Query()
+	if err != nil {
+		gtest.Error(err)
+	}
+	array, err := rows.Columns()
+	if err != nil {
+		gtest.Error(err)
+	}
+	gtest.Assert(array[0], "100")
+	if err := rows.Close(); err != nil {
+		gtest.Error(err)
+	}
+	if err := tx.Commit(); err != nil {
+		gtest.Error(err)
+	}
+}
+
+func Test_TX_Insert(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.Insert(table, g.Map{
+			"id":          1,
+			"passport":    "t1",
+			"password":    "25d55ad283aa400af464c76d713c07ad",
+			"nickname":    "T1",
+			"create_time": gtime.Now().String(),
+		}); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+		if n, err := db.Table(table).Count(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(n, 1)
+		}
+	})
+}
+
+func Test_TX_BatchInsert(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.BatchInsert(table, g.List{
+			{
+				"id":          2,
+				"passport":    "t",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "T2",
+				"create_time": gtime.Now().String(),
+			},
+			{
+				"id":          3,
+				"passport":    "t3",
+				"password":    "25d55ad283aa400af464c76d713c07ad",
+				"nickname":    "T3",
+				"create_time": gtime.Now().String(),
+			},
+		}, 10); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+		if n, err := db.Table(table).Count(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(n, 2)
+		}
+	})
+}
+
+func Test_TX_BatchReplace(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.BatchReplace(table, g.List{
+			{
+				"id":          2,
+				"passport":    "USER_2",
+				"password":    "PASS_2",
+				"nickname":    "NAME_2",
+				"create_time": gtime.Now().String(),
+			},
+			{
+				"id":          4,
+				"passport":    "USER_4",
+				"password":    "PASS_4",
+				"nickname":    "NAME_4",
+				"create_time": gtime.Now().String(),
+			},
+		}, 10); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+		if n, err := db.Table(table).Count(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(n, INIT_DATA_SIZE)
+		}
+		if value, err := db.Table(table).Fields("password").Where("id", 2).Value(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(value.String(), "PASS_2")
+		}
+	})
+}
+
+func Test_TX_BatchSave(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.BatchSave(table, g.List{
+			{
+				"id":          4,
+				"passport":    "USER_4",
+				"password":    "PASS_4",
+				"nickname":    "NAME_4",
+				"create_time": gtime.Now().String(),
+			},
+		}, 10); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+
+		if n, err := db.Table(table).Count(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(n, INIT_DATA_SIZE)
+		}
+
+		if value, err := db.Table(table).Fields("password").Where("id", 4).Value(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(value.String(), "PASS_4")
+		}
+	})
+}
+
+func Test_TX_Replace(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.Replace(table, g.Map{
+			"id":          1,
+			"passport":    "USER_1",
+			"password":    "PASS_1",
+			"nickname":    "NAME_1",
+			"create_time": gtime.Now().String(),
+		}); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Rollback(); err != nil {
+			gtest.Error(err)
+		}
+		if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(value.String(), "name_1")
+		}
+	})
+
+}
+
+func Test_TX_Save(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.Save(table, g.Map{
+			"id":          1,
+			"passport":    "USER_1",
+			"password":    "PASS_1",
+			"nickname":    "NAME_1",
+			"create_time": gtime.Now().String(),
+		}); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+		if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(value.String(), "NAME_1")
+		}
+	})
+}
+
+func Test_TX_Update(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if result, err := tx.Update(table, "create_time='2019-10-24 10:00:00'", "id=3"); err != nil {
+			gtest.Error(err)
+		} else {
+			n, _ := result.RowsAffected()
+			gtest.Assert(n, 1)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+		_, err = tx.Table(table).Fields("create_time").Where("id", 3).Value()
+		gtest.AssertNE(err, nil)
+
+		if value, err := db.Table(table).Fields("create_time").Where("id", 3).Value(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(value.String(), "2019-10-24 10:00:00")
+		}
+	})
+}
+
+func Test_TX_GetAll(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if result, err := tx.GetAll(fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 1); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(len(result), 1)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+}
+
+func Test_TX_GetOne(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if record, err := tx.GetOne(fmt.Sprintf("SELECT * FROM %s WHERE passport=?", table), "user_2"); err != nil {
+			gtest.Error(err)
+		} else {
+			if record == nil {
+				gtest.Error("FAIL")
+			}
+			gtest.Assert(record["nickname"].String(), "name_2")
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+}
+
+func Test_TX_GetValue(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if value, err := tx.GetValue(fmt.Sprintf("SELECT id FROM %s WHERE passport=?", table), "user_3"); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(value.Int(), 3)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+
+}
+
+func Test_TX_GetCount(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if count, err := tx.GetCount("SELECT * FROM " + table); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(count, INIT_DATA_SIZE)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+}
+
+func Test_TX_GetStruct(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		user := new(User)
+		if err := tx.GetStruct(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(user.NickName, "name_3")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		if err := tx.GetStruct(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(user.NickName, "name_3")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+}
+
+func Test_TX_GetStructs(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		if err := tx.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[2].CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []User
+		if err := tx.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[2].CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+}
+
+func Test_TX_GetScan(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		user := new(User)
+		if err := tx.GetScan(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(user.NickName, "name_3")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		if err := tx.GetScan(user, fmt.Sprintf("SELECT * FROM %s WHERE id=?", table), 3); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(user.NickName, "name_3")
+		gtest.Assert(user.CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		if err := tx.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[2].CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var users []User
+		if err := tx.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
+			gtest.Error(err)
+		}
+		gtest.Assert(len(users), INIT_DATA_SIZE)
+		gtest.Assert(users[0].Id, 1)
+		gtest.Assert(users[1].Id, 2)
+		gtest.Assert(users[2].Id, 3)
+		gtest.Assert(users[0].NickName, "name_1")
+		gtest.Assert(users[1].NickName, "name_2")
+		gtest.Assert(users[2].NickName, "name_3")
+		gtest.Assert(users[2].CreateTime.String(), "2018-10-24 10:00:00")
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+	})
+}
+
+func Test_TX_Delete(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	gtest.Case(t, func() {
+		tx, err := db.Begin()
+		if err != nil {
+			gtest.Error(err)
+		}
+		if _, err := tx.Delete(table, nil); err != nil {
+			gtest.Error(err)
+		}
+		if err := tx.Commit(); err != nil {
+			gtest.Error(err)
+		}
+		if n, err := db.Table(table).Count(); err != nil {
+			gtest.Error(err)
+		} else {
+			gtest.Assert(n, 0)
+		}
+	})
+
+}

g/database/gredis/gredis_unit_test.go

@@ -7,11 +7,12 @@
 package gredis_test
 
 import (
+	"testing"
+	"time"
+
 	"github.com/gogf/gf/g/database/gredis"
 	"github.com/gogf/gf/g/test/gtest"
 	redis2 "github.com/gogf/gf/third/github.com/gomodule/redigo/redis"
-	"testing"
-	"time"
 )
 
 var (

g/encoding/gjson/gjson.go

@@ -27,9 +27,7 @@ type Json struct {
 	mu *rwmutex.RWMutex
 	p  *interface{} // Pointer for hierarchical data access, it's the root of data in default.
 	c  byte         // Char separator('.' in default).
-	// Violence Check(false in default), which is used to access data
-	// when the hierarchical data key contains separator char.
-	vc bool
+	vc bool         // Violence Check(false in default), which is used to access data when the hierarchical data key contains separator char.
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
@@ -37,8 +35,8 @@ func (j *Json) MarshalJSON() ([]byte, error) {
 	return j.ToJson()
 }
 
-// Set <value> by <pattern>.
-// Notice:
+// setValue sets <value> to <j> by <pattern>.
+// Note:
 // 1. If value is nil and removed is true, means deleting this value;
 // 2. It's quite complicated in hierarchical data search, node creating and data assignment;
 func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
@@ -53,8 +51,8 @@ func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
 			*j.p = make(map[string]interface{})
 		}
 	}
-	var pparent *interface{} = nil // 父级元素项(设置时需要根据子级的内容确定数据类型，所以必须记录父级)
-	var pointer *interface{} = j.p // 当前操作层级项
+	var pparent *interface{} = nil // Parent pointer.
+	var pointer *interface{} = j.p // Current pointer.
 	j.mu.Lock()
 	defer j.mu.Unlock()
 	for i := 0; i < length; i++ {
@@ -62,26 +60,26 @@ func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
 		case map[string]interface{}:
 			if i == length-1 {
 				if removed && value == nil {
-					// 删除map元素
+					// Delete item from map.
 					delete((*pointer).(map[string]interface{}), array[i])
 				} else {
 					(*pointer).(map[string]interface{})[array[i]] = value
 				}
 			} else {
-				// 当键名不存在的情况这里会进行处理
+				// If the key does not exit in the map.
 				if v, ok := (*pointer).(map[string]interface{})[array[i]]; !ok {
 					if removed && value == nil {
 						goto done
 					}
-					// 创建新节点
+					// Creating new node.
 					if gstr.IsNumeric(array[i+1]) {
-						// 创建array节点
+						// Creating array node.
 						n, _ := strconv.Atoi(array[i+1])
 						var v interface{} = make([]interface{}, n+1)
 						pparent = j.setPointerWithValue(pointer, array[i], v)
 						pointer = &v
 					} else {
-						// 创建map节点
+						// Creating map node.
 						var v interface{} = make(map[string]interface{})
 						pparent = j.setPointerWithValue(pointer, array[i], v)
 						pointer = &v
@@ -93,7 +91,6 @@ func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
 			}
 
 		case []interface{}:
-			// 键名与当前指针类型不符合，需要执行**覆盖操作**
 			if !gstr.IsNumeric(array[i]) {
 				if i == length-1 {
 					*pointer = map[string]interface{}{array[i]: value}
@@ -110,11 +107,11 @@ func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
 			if err != nil {
 				return err
 			}
-			// 叶子节点
+			// Leaf node.
 			if i == length-1 {
 				if len((*pointer).([]interface{})) > valn {
 					if removed && value == nil {
-						// 删除数据元素
+						// Deleting element.
 						if pparent == nil {
 							*pointer = append((*pointer).([]interface{})[:valn], (*pointer).([]interface{})[valn+1:]...)
 						} else {
@@ -128,10 +125,10 @@ func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
 						goto done
 					}
 					if pparent == nil {
-						// 表示根节点
+						// It is the root node.
 						j.setPointerWithValue(pointer, array[i], value)
 					} else {
-						// 非根节点
+						// It is not the root node.
 						s := make([]interface{}, valn+1)
 						copy(s, (*pointer).([]interface{}))
 						s[valn] = value
@@ -160,8 +157,8 @@ func (j *Json) setValue(pattern string, value interface{}, removed bool) error {
 				}
 			}
 
-		// 如果当前指针指向的变量不是引用类型的，
-		// 那么修改变量必须通过父级进行修改，即 pparent
+		// If the variable pointed to by the <pointer> is not of a reference type,
+		// then it modifies the variable via its the parent, ie: pparent.
 		default:
 			if removed && value == nil {
 				goto done
@@ -199,7 +196,7 @@ done:
 	return nil
 }
 
-// Convert <value> to map[string]interface{} or []interface{},
+// convertValue converts <value> to map[string]interface{} or []interface{},
 // which can be supported for hierarchical data access.
 func (j *Json) convertValue(value interface{}) interface{} {
 	switch value.(type) {
@@ -232,7 +229,7 @@ func (j *Json) convertValue(value interface{}) interface{} {
 	}
 }
 
-// Set <key>:<value> to <pointer>, the <key> may be a map key or slice index.
+// setPointerWithValue sets <key>:<value> to <pointer>, the <key> may be a map key or slice index.
 // It returns the pointer to the new value set.
 func (j *Json) setPointerWithValue(pointer *interface{}, key string, value interface{}) *interface{} {
 	switch (*pointer).(type) {
@@ -257,7 +254,7 @@ func (j *Json) setPointerWithValue(pointer *interface{}, key string, value inter
 	return pointer
 }
 
-// Get a pointer to the value by specified <pattern>.
+// getPointerByPattern returns a pointer to the value by specified <pattern>.
 func (j *Json) getPointerByPattern(pattern string) *interface{} {
 	if j.vc {
 		return j.getPointerByPatternWithViolenceCheck(pattern)
@@ -266,7 +263,7 @@ func (j *Json) getPointerByPattern(pattern string) *interface{} {
 	}
 }
 
-// Get a pointer to the value of specified <pattern> with violence check.
+// getPointerByPatternWithViolenceCheck returns a pointer to the value of specified <pattern> with violence check.
 func (j *Json) getPointerByPatternWithViolenceCheck(pattern string) *interface{} {
 	if !j.vc {
 		return j.getPointerByPatternWithoutViolenceCheck(pattern)
@@ -305,7 +302,7 @@ func (j *Json) getPointerByPatternWithViolenceCheck(pattern string) *interface{}
 	return nil
 }
 
-// Get a pointer to the value of specified <pattern>, with no violence check.
+// getPointerByPatternWithoutViolenceCheck returns a pointer to the value of specified <pattern>, with no violence check.
 func (j *Json) getPointerByPatternWithoutViolenceCheck(pattern string) *interface{} {
 	if j.vc {
 		return j.getPointerByPatternWithViolenceCheck(pattern)
@@ -329,7 +326,7 @@ func (j *Json) getPointerByPatternWithoutViolenceCheck(pattern string) *interfac
 	return nil
 }
 
-// Check whether there's value by <key> in specified <pointer>.
+// checkPatternByPointer checks whether there's value by <key> in specified <pointer>.
 // It returns a pointer to the value.
 func (j *Json) checkPatternByPointer(key string, pointer *interface{}) *interface{} {
 	switch (*pointer).(type) {

g/encoding/gjson/gjson_api.go

@@ -8,10 +8,13 @@ package gjson
 
 import (
 	"fmt"
+	"time"
+
+	"github.com/gogf/gf/g/util/gutil"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/os/gtime"
 	"github.com/gogf/gf/g/util/gconv"
-	"time"
 )
 
 // Val returns the json value.
@@ -21,6 +24,13 @@ func (j *Json) Value() interface{} {
 	return *(j.p)
 }
 
+// IsNil checks whether the value pointed by <j> is nil.
+func (j *Json) IsNil() bool {
+	j.mu.RLock()
+	defer j.mu.RUnlock()
+	return j.p == nil || *(j.p) == nil
+}
+
 // Get returns value by specified <pattern>.
 // It returns all values of current Json object, if <pattern> is empty or not specified.
 // It returns nil if no value found by <pattern>.
@@ -66,11 +76,7 @@ func (j *Json) GetMap(pattern string, def ...interface{}) map[string]interface{}
 // GetJson gets the value by specified <pattern>,
 // and converts it to a un-concurrent-safe Json object.
 func (j *Json) GetJson(pattern string, def ...interface{}) *Json {
-	result := j.Get(pattern, def...)
-	if result != nil {
-		return New(result, true)
-	}
-	return nil
+	return New(j.Get(pattern, def...), true)
 }
 
 // GetJsons gets the value by specified <pattern>,
@@ -113,6 +119,10 @@ func (j *Json) GetString(pattern string, def ...interface{}) string {
 	return gconv.String(j.Get(pattern, def...))
 }
 
+func (j *Json) GetBytes(pattern string, def ...interface{}) []byte {
+	return gconv.Bytes(j.Get(pattern, def...))
+}
+
 // GetBool gets the value by specified <pattern>,
 // and converts it to bool.
 // It returns false when value is: "", 0, false, off, nil;
@@ -252,6 +262,7 @@ func (j *Json) Append(pattern string, value interface{}) error {
 // GetToVar gets the value by specified <pattern>,
 // and converts it to specified golang variable <v>.
 // The <pointer> should be a pointer type.
+// Deprecated.
 func (j *Json) GetToVar(pattern string, pointer interface{}) error {
 	r := j.Get(pattern)
 	if r != nil {
@@ -318,14 +329,34 @@ func (j *Json) ToStruct(pointer interface{}) error {
 	return gconv.Struct(*(j.p), pointer)
 }
 
-// Dump prints current Json object with more manually readable.
-func (j *Json) Dump() error {
+func (j *Json) ToStructDeep(pointer interface{}) error {
 	j.mu.RLock()
 	defer j.mu.RUnlock()
-	if b, err := j.ToJsonIndent(); err != nil {
-		return err
-	} else {
-		fmt.Println(string(b))
-	}
-	return nil
+	return gconv.StructDeep(*(j.p), pointer)
+}
+
+func (j *Json) ToStructs(pointer interface{}) error {
+	j.mu.RLock()
+	defer j.mu.RUnlock()
+	return gconv.Structs(*(j.p), pointer)
+}
+
+func (j *Json) ToStructsDeep(pointer interface{}) error {
+	j.mu.RLock()
+	defer j.mu.RUnlock()
+	return gconv.StructsDeep(*(j.p), pointer)
+}
+
+// Dump prints current Json object with more manually readable.
+func (j *Json) Dump() {
+	j.mu.RLock()
+	defer j.mu.RUnlock()
+	gutil.Dump(*j.p)
+}
+
+// Export returns <j> as a string with more manually readable.
+func (j *Json) Export() string {
+	j.mu.RLock()
+	defer j.mu.RUnlock()
+	return gutil.Export(*j.p)
 }

g/encoding/gjson/gjson_api_new_load.go

@@ -12,6 +12,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"reflect"
+
+	"github.com/gogf/gf/g/os/gfile"
+
 	"github.com/gogf/gf/g/encoding/gtoml"
 	"github.com/gogf/gf/g/encoding/gxml"
 	"github.com/gogf/gf/g/encoding/gyaml"
@@ -19,7 +23,6 @@ import (
 	"github.com/gogf/gf/g/os/gfcache"
 	"github.com/gogf/gf/g/text/gregex"
 	"github.com/gogf/gf/g/util/gconv"
-	"reflect"
 )
 
 // New creates a Json object with any variable type of <data>,
@@ -128,64 +131,92 @@ func DecodeToJson(data interface{}, unsafe ...bool) (*Json, error) {
 // Load loads content from specified file <path>,
 // and creates a Json object from its content.
 func Load(path string, unsafe ...bool) (*Json, error) {
-	return LoadContent(gfcache.GetBinContents(path), unsafe...)
+	return doLoadContent(gfile.Ext(path), gfcache.GetBinContents(path), unsafe...)
 }
 
-// LoadContent creates a Json object from given content,
-// it checks the data type of <content> automatically,
-// supporting JSON, XML, YAML and TOML types of data.
-func LoadContent(data interface{}, unsafe ...bool) (*Json, error) {
+func LoadJson(data interface{}, unsafe ...bool) (*Json, error) {
+	return doLoadContent("json", gconv.Bytes(data), unsafe...)
+}
+
+func LoadXml(data interface{}, unsafe ...bool) (*Json, error) {
+	return doLoadContent("xml", gconv.Bytes(data), unsafe...)
+}
+
+func LoadYaml(data interface{}, unsafe ...bool) (*Json, error) {
+	return doLoadContent("yaml", gconv.Bytes(data), unsafe...)
+}
+
+func LoadToml(data interface{}, unsafe ...bool) (*Json, error) {
+	return doLoadContent("toml", gconv.Bytes(data), unsafe...)
+}
+
+func doLoadContent(dataType string, data []byte, unsafe ...bool) (*Json, error) {
 	var err error
 	var result interface{}
-	b := gconv.Bytes(data)
-	t := ""
-	if len(b) == 0 {
+	if len(data) == 0 {
 		return New(nil, unsafe...), nil
 	}
-	// auto check data type
-	if json.Valid(b) {
-		t = "json"
-	} else if gregex.IsMatch(`^<.+>[\S\s]+<.+>$`, b) {
-		t = "xml"
-	} else if gregex.IsMatch(`^[\s\t]*\w+\s*:\s*.+`, b) || gregex.IsMatch(`\n[\s\t]*\w+\s*:\s*.+`, b) {
-		t = "yml"
-	} else if gregex.IsMatch(`^[\s\t]*\w+\s*=\s*.+`, b) || gregex.IsMatch(`\n[\s\t]*\w+\s*=\s*.+`, b) {
-		t = "toml"
-	} else {
-		return nil, errors.New("unsupported data type")
+	if dataType == "" {
+		dataType = checkDataType(data)
 	}
-	// convert to json type data
-	switch t {
+	switch dataType {
 	case "json", ".json":
-		// ok
+
 	case "xml", ".xml":
-		// TODO UseNumber
-		b, err = gxml.ToJson(b)
+		if data, err = gxml.ToJson(data); err != nil {
+			return nil, err
+		}
 
 	case "yml", "yaml", ".yml", ".yaml":
-		// TODO UseNumber
-		b, err = gyaml.ToJson(b)
+		if data, err = gyaml.ToJson(data); err != nil {
+			return nil, err
+		}
 
 	case "toml", ".toml":
-		// TODO UseNumber
-		b, err = gtoml.ToJson(b)
+		if data, err = gtoml.ToJson(data); err != nil {
+			return nil, err
+		}
 
 	default:
-		err = errors.New("nonsupport type " + t)
+		err = errors.New("unsupported type for loading")
 	}
 	if err != nil {
 		return nil, err
 	}
 	if result == nil {
-		decoder := json.NewDecoder(bytes.NewReader(b))
+		decoder := json.NewDecoder(bytes.NewReader(data))
 		decoder.UseNumber()
 		if err := decoder.Decode(&result); err != nil {
 			return nil, err
 		}
 		switch result.(type) {
 		case string, []byte:
-			return nil, fmt.Errorf(`json decoding failed for content: %s`, string(b))
+			return nil, fmt.Errorf(`json decoding failed for content: %s`, string(data))
 		}
 	}
 	return New(result, unsafe...), nil
 }
+
+func LoadContent(data interface{}, unsafe ...bool) (*Json, error) {
+	content := gconv.Bytes(data)
+	if len(content) == 0 {
+		return New(nil, unsafe...), nil
+	}
+	return doLoadContent(checkDataType(content), content, unsafe...)
+
+}
+
+// checkDataType automatically checks and returns the data type for <content>.
+func checkDataType(content []byte) string {
+	if json.Valid(content) {
+		return "json"
+	} else if gregex.IsMatch(`^<.+>[\S\s]+<.+>$`, content) {
+		return "xml"
+	} else if gregex.IsMatch(`^[\s\t]*[\w\-]+\s*:\s*.+`, content) || gregex.IsMatch(`\n[\s\t]*[\w\-]+\s*:\s*.+`, content) {
+		return "yml"
+	} else if gregex.IsMatch(`^[\s\t]*[\w\-]+\s*=\s*.+`, content) || gregex.IsMatch(`\n[\s\t]*[\w\-]+\s*=\s*.+`, content) {
+		return "toml"
+	} else {
+		return ""
+	}
+}

g/encoding/gjson/gjson_z_unit_basic_test.go

@@ -7,10 +7,11 @@
 package gjson_test
 
 import (
+	"testing"
+
 	"github.com/gogf/gf/g"
 	"github.com/gogf/gf/g/encoding/gjson"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
@@ -347,7 +348,7 @@ func Test_Convert2(t *testing.T) {
 		j := gjson.New(`{"name":"gf","time":"2019-06-12"}`)
 		gtest.Assert(j.Value().(g.Map)["name"], "gf")
 		gtest.Assert(j.GetMap("name1"), nil)
-		gtest.Assert(j.GetJson("name1"), nil)
+		gtest.AssertNE(j.GetJson("name1"), nil)
 		gtest.Assert(j.GetJsons("name1"), nil)
 		gtest.Assert(j.GetJsonMap("name1"), nil)
 		gtest.Assert(j.Contains("name1"), false)
@@ -361,7 +362,7 @@ func Test_Convert2(t *testing.T) {
 		err := j.ToStruct(&name)
 		gtest.Assert(err, nil)
 		gtest.Assert(name.Name, "gf")
-		err = j.Dump()
+		j.Dump()
 		gtest.Assert(err, nil)
 
 		j = gjson.New(`{"person":{"name":"gf"}}`)
@@ -370,7 +371,7 @@ func Test_Convert2(t *testing.T) {
 		gtest.Assert(name.Name, "gf")
 
 		j = gjson.New(`{"name":"gf""}`)
-		err = j.Dump()
+		j.Dump()
 		gtest.Assert(err, nil)
 
 		j = gjson.New(`[1,2,3]`)
@@ -459,3 +460,10 @@ func Test_Basic(t *testing.T) {
 
 	})
 }
+
+func Test_IsNil(t *testing.T) {
+	gtest.Case(t, func() {
+		j := gjson.New(nil)
+		gtest.Assert(j.IsNil(), true)
+	})
+}

g/encoding/gjson/gjson_z_unit_load_test.go

@@ -7,11 +7,12 @@
 package gjson_test
 
 import (
+	"testing"
+
 	"github.com/gogf/gf/g"
 	"github.com/gogf/gf/g/encoding/gjson"
 	"github.com/gogf/gf/g/os/gfile"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
 )
 
 func Test_Load_JSON(t *testing.T) {
@@ -50,7 +51,7 @@ func Test_Load_XML(t *testing.T) {
 		gtest.Assert(j.Get("doc.n"), "123456789")
 		gtest.Assert(j.Get("doc.m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("doc.m.k"), "v")
-		gtest.Assert(j.Get("doc.a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("doc.a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("doc.a.1"), 2)
 	})
 	// XML
@@ -63,7 +64,7 @@ func Test_Load_XML(t *testing.T) {
 		gtest.Assert(j.Get("doc.n"), "123456789")
 		gtest.Assert(j.Get("doc.m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("doc.m.k"), "v")
-		gtest.Assert(j.Get("doc.a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("doc.a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("doc.a.1"), 2)
 	})
 
@@ -133,7 +134,7 @@ func Test_Load_YAML2(t *testing.T) {
 func Test_Load_TOML1(t *testing.T) {
 	data := []byte(`
 a = ["1", "2", "3"]
-n = "123456789"
+n = 123456789
 
 [m]
   k = "v"
@@ -145,7 +146,7 @@ n = "123456789"
 		gtest.Assert(j.Get("n"), "123456789")
 		gtest.Assert(j.Get("m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("m.k"), "v")
-		gtest.Assert(j.Get("a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("a.1"), 2)
 	})
 	// TOML
@@ -158,7 +159,7 @@ n = "123456789"
 		gtest.Assert(j.Get("n"), "123456789")
 		gtest.Assert(j.Get("m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("m.k"), "v")
-		gtest.Assert(j.Get("a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("a.1"), 2)
 	})
 }

g/encoding/gparser/gparser_api.go

@@ -7,9 +7,10 @@
 package gparser
 
 import (
+	"time"
+
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/os/gtime"
-	"time"
 )
 
 // Val returns the value.
@@ -141,6 +142,7 @@ func (p *Parser) GetGTime(pattern string, format ...string) *gtime.Time {
 // GetToVar gets the value by specified <pattern>,
 // and converts it to specified golang variable <v>.
 // The <v> should be a pointer type.
+// Deprecated.
 func (p *Parser) GetToVar(pattern string, pointer interface{}) error {
 	return p.json.GetToVar(pattern, pointer)
 }
@@ -216,7 +218,23 @@ func (p *Parser) ToStruct(pointer interface{}) error {
 	return p.json.ToStruct(pointer)
 }
 
-// Dump prints current Json object with more manually readable.
-func (p *Parser) Dump() error {
-	return p.json.Dump()
+func (p *Parser) ToStructDeep(pointer interface{}) error {
+	return p.json.ToStructDeep(pointer)
+}
+
+func (p *Parser) ToStructs(pointer interface{}) error {
+	return p.json.ToStructs(pointer)
+}
+
+func (p *Parser) ToStructsDeep(pointer interface{}) error {
+	return p.json.ToStructsDeep(pointer)
+}
+
+// Dump prints current Json object with more manually readable.
+func (p *Parser) Dump() {
+	p.json.Dump()
+}
+
+func (p *Parser) Export() string {
+	return p.json.Export()
 }

g/encoding/gparser/gparser_unit_load_test.go

@@ -7,12 +7,13 @@
 package gparser_test
 
 import (
+	"io/ioutil"
+	"testing"
+
 	"github.com/gogf/gf/g"
 	"github.com/gogf/gf/g/encoding/gparser"
 	"github.com/gogf/gf/g/os/gfile"
 	"github.com/gogf/gf/g/test/gtest"
-	"io/ioutil"
-	"testing"
 )
 
 func Test_Load_JSON(t *testing.T) {
@@ -51,7 +52,7 @@ func Test_Load_XML(t *testing.T) {
 		gtest.Assert(j.Get("doc.n"), "123456789")
 		gtest.Assert(j.Get("doc.m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("doc.m.k"), "v")
-		gtest.Assert(j.Get("doc.a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("doc.a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("doc.a.1"), 2)
 	})
 	// XML
@@ -64,7 +65,7 @@ func Test_Load_XML(t *testing.T) {
 		gtest.Assert(j.Get("doc.n"), "123456789")
 		gtest.Assert(j.Get("doc.m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("doc.m.k"), "v")
-		gtest.Assert(j.Get("doc.a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("doc.a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("doc.a.1"), 2)
 	})
 
@@ -146,7 +147,7 @@ n = "123456789"
 		gtest.Assert(j.Get("n"), "123456789")
 		gtest.Assert(j.Get("m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("m.k"), "v")
-		gtest.Assert(j.Get("a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("a.1"), 2)
 	})
 	// TOML
@@ -159,7 +160,7 @@ n = "123456789"
 		gtest.Assert(j.Get("n"), "123456789")
 		gtest.Assert(j.Get("m"), g.Map{"k": "v"})
 		gtest.Assert(j.Get("m.k"), "v")
-		gtest.Assert(j.Get("a"), g.Slice{1, 2, 3})
+		gtest.Assert(j.Get("a"), g.Slice{"1", "2", "3"})
 		gtest.Assert(j.Get("a.1"), 2)
 	})
 }

g/errors/gerror/gerror.go

@@ -0,0 +1,90 @@
+// Copyright 2019 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 errors provides simple functions to manipulate errors.
+package gerror
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/g/util/gconv"
+)
+
+type ApiStack interface {
+	Stack() string
+}
+
+type ApiCause interface {
+	Cause() error
+}
+
+// New returns an error that formats as the given value.
+func New(value interface{}) error {
+	if value == nil {
+		return nil
+	}
+	return NewText(gconv.String(value))
+}
+
+// NewText returns an error that formats as the given text.
+func NewText(text string) error {
+	if text == "" {
+		return nil
+	}
+	return &Error{
+		stack: callers(),
+		text:  text,
+	}
+}
+
+// Wrap wraps error with text.
+// It returns nil if given err is nil.
+func Wrap(err error, text string) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(),
+		text:  text,
+	}
+}
+
+// Wrapf returns an error annotating err with a stack trace
+// at the point Wrapf is called, and the format specifier.
+// It returns nil if given err is nil.
+func Wrapf(err error, format string, args ...interface{}) error {
+	if err == nil {
+		return nil
+	}
+	return &Error{
+		error: err,
+		stack: callers(),
+		text:  fmt.Sprintf(format, args...),
+	}
+}
+
+// Cause returns the root cause error.
+func Cause(err error) error {
+	if err != nil {
+		if e, ok := err.(ApiCause); ok {
+			return e.Cause()
+		}
+	}
+	return err
+}
+
+// Stack returns the stack callers as string.
+// It returns an empty string id the <err> does not support stacks.
+func Stack(err error) string {
+	if err == nil {
+		return ""
+	}
+	if e, ok := err.(ApiStack); ok {
+		return e.Stack()
+	}
+	return ""
+}

g/errors/gerror/gerror_error.go

@@ -0,0 +1,143 @@
+// Copyright 2019 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 gerror
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"runtime"
+	"strings"
+)
+
+// Error is custom error for additional features.
+type Error struct {
+	error error  // Wrapped error.
+	stack stack  // Stack array, which records the stack information when this error is created or wrapped.
+	text  string // Error text, which is created by New* functions.
+}
+
+const (
+	gFILTER_KEY = "/g/errors/gerror/gerror"
+)
+
+var (
+	// goRootForFilter is used for stack filtering purpose.
+	goRootForFilter = runtime.GOROOT()
+)
+
+func init() {
+	if goRootForFilter != "" {
+		goRootForFilter = strings.Replace(goRootForFilter, "\\", "/", -1)
+	}
+}
+
+// Error implements the interface of Error, it returns the error as string.
+func (err *Error) Error() string {
+	if err.text != "" {
+		if err.error != nil {
+			return err.text + ": " + err.error.Error()
+		}
+		return err.text
+	}
+	return err.error.Error()
+}
+
+// Cause returns the root cause error.
+func (err *Error) Cause() error {
+	loop := err
+	for loop != nil {
+		if loop.error != nil {
+			if e, ok := loop.error.(*Error); ok {
+				loop = e
+			} else {
+				return loop.error
+			}
+		} else {
+			return loop
+		}
+	}
+	return nil
+}
+
+// Format formats the frame according to the fmt.Formatter interface.
+//
+// %v, %s   : Print the error string;
+// %-v, %-s : Print current error string;
+// %+s      : Print full stack error list;
+// %+v      : Print the error string and full stack error list;
+func (err *Error) Format(s fmt.State, verb rune) {
+	switch verb {
+	case 's', 'v':
+		switch {
+		case s.Flag('-'):
+			if err.text != "" {
+				io.WriteString(s, err.text)
+			} else {
+				io.WriteString(s, err.Error())
+			}
+		case s.Flag('+'):
+			if verb == 's' {
+				io.WriteString(s, err.Stack())
+			} else {
+				io.WriteString(s, err.Error()+"\n"+err.Stack())
+			}
+		default:
+			io.WriteString(s, err.Error())
+		}
+	}
+}
+
+// Stack returns the stack callers as string.
+// It returns an empty string id the <err> does not support stacks.
+func (err *Error) Stack() string {
+	if err == nil {
+		return ""
+	}
+	loop := err
+	index := 1
+	buffer := bytes.NewBuffer(nil)
+	for loop != nil {
+		buffer.WriteString(fmt.Sprintf("%d. %-v\n", index, loop))
+		index++
+		formatSubStack(loop.stack, buffer)
+		if loop.error != nil {
+			if e, ok := loop.error.(*Error); ok {
+				loop = e
+			} else {
+				buffer.WriteString(fmt.Sprintf("%d. %s\n", index, loop.error.Error()))
+				index++
+				break
+			}
+		} else {
+			break
+		}
+	}
+	return buffer.String()
+}
+
+// formatSubStack formats the stack for error.
+func formatSubStack(st stack, buffer *bytes.Buffer) {
+	index := 1
+	space := "  "
+	for _, p := range st {
+		if fn := runtime.FuncForPC(p - 1); fn != nil {
+			file, line := fn.FileLine(p - 1)
+			if strings.Contains(file, gFILTER_KEY) {
+				continue
+			}
+			if goRootForFilter != "" && len(file) >= len(goRootForFilter) && file[0:len(goRootForFilter)] == goRootForFilter {
+				continue
+			}
+			if index > 9 {
+				space = " "
+			}
+			buffer.WriteString(fmt.Sprintf("   %d).%s%s\n    \t%s:%d\n", index, space, fn.Name(), file, line))
+			index++
+		}
+	}
+}

g/errors/gerror/gerror_stack.go

@@ -0,0 +1,22 @@
+// Copyright 2019 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 gerror
+
+import "runtime"
+
+// stack represents a stack of program counters.
+type stack []uintptr
+
+const (
+	gMAX_STACK_DEPTH = 32
+)
+
+func callers() stack {
+	var pcs [gMAX_STACK_DEPTH]uintptr
+	n := runtime.Callers(3, pcs[:])
+	return pcs[0:n]
+}

g/errors/gerror/gerror_test.go

@@ -0,0 +1,133 @@
+// Copyright 2019 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 gerror_test
+
+import (
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/gogf/gf/g/errors/gerror"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func interfaceNil() interface{} {
+	return nil
+}
+
+func nilError() error {
+	return nil
+}
+
+func Test_Nil(t *testing.T) {
+	gtest.Case(t, func() {
+		gtest.Assert(gerror.New(interfaceNil()), nil)
+		gtest.Assert(gerror.Wrap(nilError(), "test"), nil)
+	})
+}
+
+func Test_Wrap(t *testing.T) {
+	gtest.Case(t, func() {
+		err := errors.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		gtest.Assert(err.Error(), "3: 2: 1")
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		gtest.Assert(err.Error(), "3: 2: 1")
+	})
+}
+
+func Test_Cause(t *testing.T) {
+	gtest.Case(t, func() {
+		err := errors.New("1")
+		gtest.Assert(gerror.Cause(err), err)
+	})
+
+	gtest.Case(t, func() {
+		err := errors.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.Assert(gerror.Cause(err), "1")
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		gtest.Assert(gerror.Cause(err), "1")
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.Assert(gerror.Cause(err), "1")
+	})
+}
+
+func Test_Format(t *testing.T) {
+	gtest.Case(t, func() {
+		err := errors.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		gtest.Assert(fmt.Sprintf("%s", err), "3: 2: 1")
+		gtest.Assert(fmt.Sprintf("%v", err), "3: 2: 1")
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		gtest.Assert(fmt.Sprintf("%s", err), "3: 2: 1")
+		gtest.Assert(fmt.Sprintf("%v", err), "3: 2: 1")
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		gtest.Assert(fmt.Sprintf("%-s", err), "3")
+		gtest.Assert(fmt.Sprintf("%-v", err), "3")
+	})
+}
+
+func Test_Stack(t *testing.T) {
+	gtest.Case(t, func() {
+		err := errors.New("1")
+		gtest.Assert(fmt.Sprintf("%+v", err), "1")
+	})
+
+	gtest.Case(t, func() {
+		err := errors.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		//fmt.Printf("%+v", err)
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		gtest.AssertNE(fmt.Sprintf("%+v", err), "1")
+		//fmt.Printf("%+v", err)
+	})
+
+	gtest.Case(t, func() {
+		err := gerror.New("1")
+		err = gerror.Wrap(err, "2")
+		err = gerror.Wrap(err, "3")
+		gtest.AssertNE(err, nil)
+		//fmt.Printf("%+v", err)
+	})
+}

g/frame/gins/gins.go

@@ -9,6 +9,8 @@ package gins
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/gogf/gf/g/container/gmap"
 	"github.com/gogf/gf/g/database/gdb"
 	"github.com/gogf/gf/g/database/gredis"
@@ -19,7 +21,6 @@ import (
 	"github.com/gogf/gf/g/text/gregex"
 	"github.com/gogf/gf/g/text/gstr"
 	"github.com/gogf/gf/g/util/gconv"
-	"time"
 )
 
 const (
@@ -159,11 +160,14 @@ func parseDBConfigNode(value interface{}) *gdb.ConfigNode {
 	if value, ok := nodeMap["role"]; ok {
 		node.Role = gconv.String(value)
 	}
+	if value, ok := nodeMap["debug"]; ok {
+		node.Debug = gconv.Bool(value)
+	}
 	if value, ok := nodeMap["charset"]; ok {
 		node.Charset = gconv.String(value)
 	}
-	if value, ok := nodeMap["priority"]; ok {
-		node.Priority = gconv.Int(value)
+	if value, ok := nodeMap["weight"]; ok {
+		node.Weight = gconv.Int(value)
 	}
 	if value, ok := nodeMap["linkinfo"]; ok {
 		node.LinkInfo = gconv.String(value)

g/frame/gins/gins_config_test.go

@@ -8,12 +8,14 @@ package gins_test
 
 import (
 	"fmt"
+	"github.com/gogf/gf/g/os/gcfg"
+	"testing"
+	"time"
+
 	"github.com/gogf/gf/g/frame/gins"
 	"github.com/gogf/gf/g/os/gfile"
 	"github.com/gogf/gf/g/os/gtime"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
-	"time"
 )
 
 func Test_Config(t *testing.T) {
@@ -166,3 +168,17 @@ test = "v=1"
 		gtest.Assert(gins.Config("test").Get("redis.disk"), "127.0.0.1:6379,0")
 	})
 }
+
+func Test_Basic2(t *testing.T) {
+	config := `log-path = "logs"`
+	gtest.Case(t, func() {
+		path := gcfg.DEFAULT_CONFIG_FILE
+		err := gfile.PutContents(path, config)
+		gtest.Assert(err, nil)
+		defer func() {
+			_ = gfile.Remove(path)
+		}()
+
+		gtest.Assert(gins.Config().Get("log-path"), "logs")
+	})
+}

g/frame/gins/gins_database_test.go

@@ -7,12 +7,12 @@
 package gins_test
 
 import (
-	"fmt"
+	"testing"
+	"time"
+
 	"github.com/gogf/gf/g/frame/gins"
 	"github.com/gogf/gf/g/os/gfile"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
-	"time"
 )
 
 func Test_Database(t *testing.T) {
@@ -31,8 +31,8 @@ test = "v=2"
         name     = "test"
         type     = "mysql"
         role     = "master"
+		weight   = "1"
         charset  = "utf8"
-        priority = "1"
     [[database.test]]
         host     = "127.0.0.1"
         port     = "3306"
@@ -42,8 +42,8 @@ test = "v=2"
         name     = "test"
         type     = "mysql"
         role     = "master"
+		weight   = "1"
         charset  = "utf8"
-        priority = "1"
 # Redis数据库配置
 [redis]
     default = "127.0.0.1:6379,0"
@@ -59,7 +59,7 @@ test = "v=2"
 	time.Sleep(500 * time.Millisecond)
 
 	gtest.Case(t, func() {
-		fmt.Println("gins Test_Database", gins.Config().Get("test"))
+		//fmt.Println("gins Test_Database", gins.Config().Get("test"))
 
 		dbDefault := gins.Database()
 		dbTest := gins.Database("test")

g/internal/debug/stack.go

@@ -0,0 +1,130 @@
+// Copyright 2019 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 debug contains facilities for programs to debug themselves while
+// they are running.
+package debug
+
+import (
+	"bytes"
+	"fmt"
+	"runtime"
+	"strings"
+)
+
+const (
+	gMAX_DEPTH  = 1000
+	gFILTER_KEY = "/g/internal/debug/stack.go"
+)
+
+var (
+	// goRootForFilter is used for stack filtering purpose.
+	goRootForFilter = runtime.GOROOT()
+)
+
+func init() {
+	if goRootForFilter != "" {
+		goRootForFilter = strings.Replace(goRootForFilter, "\\", "/", -1)
+	}
+}
+
+// PrintStack prints to standard error the stack trace returned by runtime.Stack.
+func PrintStack(skip ...int) {
+	fmt.Print(Stack(skip...))
+}
+
+// Stack returns a formatted stack trace of the goroutine that calls it.
+// It calls runtime.Stack with a large enough buffer to capture the entire trace.
+func Stack(skip ...int) string {
+	return StackWithFilter("", skip...)
+}
+
+// StackWithFilter returns a formatted stack trace of the goroutine that calls it.
+// It calls runtime.Stack with a large enough buffer to capture the entire trace.
+//
+// The parameter <filter> is used to filter the path of the caller.
+func StackWithFilter(filter string, skip ...int) string {
+	number := 0
+	if len(skip) > 0 {
+		number = skip[0]
+	}
+	name := ""
+	space := "  "
+	index := 1
+	buffer := bytes.NewBuffer(nil)
+	for i := callerFromIndex(filter) + number; i < gMAX_DEPTH; i++ {
+		if pc, file, line, ok := runtime.Caller(i); ok {
+			if goRootForFilter != "" && len(file) >= len(goRootForFilter) && file[0:len(goRootForFilter)] == goRootForFilter {
+				continue
+			}
+			if filter != "" && strings.Contains(file, filter) {
+				continue
+			}
+			if strings.Contains(file, gFILTER_KEY) {
+				continue
+			}
+			if fn := runtime.FuncForPC(pc); fn == nil {
+				name = "unknown"
+			} else {
+				name = fn.Name()
+			}
+			if index > 9 {
+				space = " "
+			}
+			buffer.WriteString(fmt.Sprintf("%d.%s%s\n    %s:%d\n", index, space, name, file, line))
+			index++
+		} else {
+			break
+		}
+	}
+	return buffer.String()
+}
+
+// CallerPath returns the absolute file path along with its line number of the caller.
+func Caller(skip ...int) string {
+	return CallerWithFilter("", skip...)
+}
+
+// CallerPathWithFilter returns the absolute file path along with its line number of the caller.
+//
+// The parameter <filter> is used to filter the path of the caller.
+func CallerWithFilter(filter string, skip ...int) string {
+	number := 0
+	if len(skip) > 0 {
+		number = skip[0]
+	}
+	for i := callerFromIndex(filter) + number; i < gMAX_DEPTH; i++ {
+		if _, file, line, ok := runtime.Caller(i); ok {
+			if filter != "" && strings.Contains(file, filter) {
+				continue
+			}
+			if strings.Contains(file, gFILTER_KEY) {
+				continue
+			}
+			return fmt.Sprintf(`%s:%d`, file, line)
+		} else {
+			break
+		}
+	}
+	return ""
+}
+
+// callerFromIndex returns the caller position exclusive of the debug package.
+func callerFromIndex(filter string) int {
+	for i := 0; i < gMAX_DEPTH; i++ {
+		if _, file, _, ok := runtime.Caller(i); ok {
+			if filter != "" && strings.Contains(file, filter) {
+				continue
+			}
+			if strings.Contains(file, gFILTER_KEY) {
+				continue
+			}
+			// exclude the depth from the function of current package.
+			return i - 1
+		}
+	}
+	return 0
+}

g/internal/empty/empty.go

@@ -18,7 +18,6 @@ func IsEmpty(value interface{}) bool {
 	if value == nil {
 		return true
 	}
-	// 优先通过断言来进行常用类型判断
 	switch value := value.(type) {
 	case int:
 		return value == 0

g/internal/errors/errors.go

@@ -1,48 +0,0 @@
-// Copyright 2019 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 errors provides simple functions to manipulate errors.
-//
-// This package can be scalable due to https://go.googlesource.com/proposal/+/master/design/go2draft.md.
-package errors
-
-import "github.com/gogf/gf/g/util/gconv"
-
-// errorWrapper is a simple wrapper for errors.
-type errorWrapper struct {
-	s string
-}
-
-// New returns an error that formats as the given value.
-func New(value interface{}) error {
-	if value == nil {
-		return nil
-	}
-	return NewText(gconv.String(value))
-}
-
-// NewText returns an error that formats as the given text.
-func NewText(text string) error {
-	if text == "" {
-		return nil
-	}
-	return &errorWrapper{
-		s: text,
-	}
-}
-
-// Wrap wraps error with text.
-func Wrap(err error, text string) error {
-	if err == nil {
-		return nil
-	}
-	return NewText(text + ": " + err.Error())
-}
-
-// Error implements interface Error.
-func (e *errorWrapper) Error() string {
-	return e.s
-}

g/internal/errors/errors_test.go

@@ -1,39 +0,0 @@
-// Copyright 2019 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 errors_test
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/g/internal/errors"
-	"github.com/gogf/gf/g/test/gtest"
-)
-
-func interfaceNil() interface{} {
-	return nil
-}
-
-func nilError() error {
-	return nil
-}
-
-func Test_Nil(t *testing.T) {
-	gtest.Case(t, func() {
-		gtest.Assert(errors.New(interfaceNil()), nil)
-		gtest.Assert(errors.Wrap(nilError(), "test"), nil)
-	})
-}
-
-func Test_Wrap(t *testing.T) {
-	gtest.Case(t, func() {
-		err := errors.New("1")
-		err = errors.Wrap(err, "func2 error")
-		err = errors.Wrap(err, "func3 error")
-		gtest.AssertNE(err, nil)
-		gtest.Assert(err.Error(), "func3 error: func2 error: 1")
-	})
-}

g/internal/structs/structs_tag.go

@@ -40,7 +40,19 @@ func TagMapField(pointer interface{}, priority []string, recursive bool) map[str
 	if v, ok := pointer.(reflect.Value); ok {
 		fields = structs.Fields(v.Interface())
 	} else {
-		fields = structs.Fields(pointer)
+		rv := reflect.ValueOf(pointer)
+		kind := rv.Kind()
+		if kind == reflect.Ptr {
+			rv = rv.Elem()
+			kind = rv.Kind()
+		}
+		// If pointer is type of **struct and nil, then automatically create a temporary struct,
+		// which is used for structs.Fields.
+		if kind == reflect.Ptr && (!rv.IsValid() || rv.IsNil()) {
+			fields = structs.Fields(reflect.New(rv.Type().Elem()).Elem().Interface())
+		} else {
+			fields = structs.Fields(pointer)
+		}
 	}
 	tag := ""
 	name := ""

g/internal/strutils/strutils.go

@@ -0,0 +1,60 @@
+// Copyright 2019 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 strutils provides some string functions for internal usage.
+package strutils
+
+import "strings"
+
+// IsLetterUpper tests whether the given byte b is in upper case.
+func IsLetterUpper(b byte) bool {
+	if b >= byte('A') && b <= byte('Z') {
+		return true
+	}
+	return false
+}
+
+// IsLetterLower tests whether the given byte b is in lower case.
+func IsLetterLower(b byte) bool {
+	if b >= byte('a') && b <= byte('z') {
+		return true
+	}
+	return false
+}
+
+// IsNumeric tests whether the given string s is numeric.
+func IsNumeric(s string) bool {
+	length := len(s)
+	if length == 0 {
+		return false
+	}
+	for i := 0; i < len(s); i++ {
+		if s[i] < byte('0') || s[i] > byte('9') {
+			return false
+		}
+	}
+	return true
+}
+
+// UcFirst returns a copy of the string s with the first letter mapped to its upper case.
+func UcFirst(s string) string {
+	if len(s) == 0 {
+		return s
+	}
+	if IsLetterLower(s[0]) {
+		return string(s[0]-32) + s[1:]
+	}
+	return s
+}
+
+// ReplaceByMap returns a copy of <origin>,
+// which is replaced by a map in unordered way, case-sensitively.
+func ReplaceByMap(origin string, replaces map[string]string) string {
+	for k, v := range replaces {
+		origin = strings.Replace(origin, k, v, -1)
+	}
+	return origin
+}

g/net/ghttp/ghttp_func.go

@@ -7,29 +7,32 @@
 package ghttp
 
 import (
+	"strings"
+
 	"github.com/gogf/gf/g/encoding/gurl"
 	"github.com/gogf/gf/g/util/gconv"
-	"strings"
 )
 
 // 构建请求参数，参数支持任意数据类型，常见参数类型为string/map。
-// 如果参数为map类型，参数值将会进行urlencode编码。
-func BuildParams(params interface{}) (encodedParamStr string) {
-	m := gconv.Map(params)
+// 如果参数为map类型，参数值将会进行urlencode编码；可以通过 noUrlEncode:true 参数取消编码。
+func BuildParams(params interface{}, noUrlEncode ...bool) (encodedParamStr string) {
+	m, urlEncode := gconv.Map(params), true
 	if len(m) == 0 {
 		return gconv.String(params)
 	}
+	if len(noUrlEncode) == 1 {
+		urlEncode = !noUrlEncode[0]
+	}
 	s := ""
 	for k, v := range m {
 		if len(encodedParamStr) > 0 {
 			encodedParamStr += "&"
 		}
 		s = gconv.String(v)
-		if len(s) > 6 && strings.Compare(s[0:6], "@file:") == 0 {
-			encodedParamStr += k + "=" + s
-		} else {
-			encodedParamStr += k + "=" + gurl.Encode(s)
+		if urlEncode && len(s) > 6 && strings.Compare(s[0:6], "@file:") != 0 {
+			s = gurl.Encode(s)
 		}
+		encodedParamStr += k + "=" + s
 	}
 	return
 }

g/net/ghttp/ghttp_request_post.go

@@ -7,6 +7,7 @@
 package ghttp
 
 import (
+	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/internal/structs"
 	"github.com/gogf/gf/g/util/gconv"
 )
@@ -32,7 +33,6 @@ func (r *Request) AddPost(key string, value string) {
 	r.PostForm[key] = append(r.PostForm[key], value)
 }
 
-// 获得post参数
 func (r *Request) GetPost(key string, def ...interface{}) []string {
 	r.initPost()
 	if v, ok := r.PostForm[key]; ok {
@@ -44,6 +44,10 @@ func (r *Request) GetPost(key string, def ...interface{}) []string {
 	return nil
 }
 
+func (r *Request) GetPostVar(key string, def ...interface{}) *gvar.Var {
+	return gvar.New(r.GetPostString(key, def...), true)
+}
+
 func (r *Request) GetPostString(key string, def ...interface{}) string {
 	value := r.GetPost(key, def...)
 	if value != nil && value[0] != "" {

g/net/ghttp/ghttp_request_query.go

@@ -9,6 +9,8 @@ package ghttp
 import (
 	"strings"
 
+	"github.com/gogf/gf/g/container/gvar"
+
 	"github.com/gogf/gf/g/internal/structs"
 	"github.com/gogf/gf/g/util/gconv"
 )
@@ -54,6 +56,10 @@ func (r *Request) GetQuery(key string, def ...interface{}) []string {
 	return nil
 }
 
+func (r *Request) GetQueryVar(key string, def ...interface{}) *gvar.Var {
+	return gvar.New(r.GetQueryString(key, def...), true)
+}
+
 func (r *Request) GetQueryString(key string, def ...interface{}) string {
 	value := r.GetQuery(key, def...)
 	if value != nil && value[0] != "" {

g/net/ghttp/ghttp_response.go

@@ -10,11 +10,12 @@ package ghttp
 import (
 	"bytes"
 	"fmt"
+	"net/http"
+	"strconv"
+
 	"github.com/gogf/gf/g/encoding/gparser"
 	"github.com/gogf/gf/g/os/gfile"
 	"github.com/gogf/gf/g/util/gconv"
-	"net/http"
-	"strconv"
 )
 
 // 服务端请求返回对象。
@@ -131,7 +132,7 @@ func (r *Response) SetAllowCrossDomainRequest(allowOrigin string, allowMethods s
 }
 
 // 返回HTTP Code状态码
-func (r *Response) WriteStatus(status int, content ...string) {
+func (r *Response) WriteStatus(status int, content ...interface{}) {
 	if r.buffer.Len() == 0 {
 		// 状态码注册回调函数处理
 		if status != http.StatusOK {
@@ -146,10 +147,12 @@ func (r *Response) WriteStatus(status int, content ...string) {
 				return
 			}
 		}
-		r.Header().Set("Content-Type", "text/plain; charset=utf-8")
-		r.Header().Set("X-Content-Type-Options", "nosniff")
+		if r.Header().Get("Content-Type") == "" {
+			r.Header().Set("Content-Type", "text/plain; charset=utf-8")
+			//r.Header().Set("X-Content-Type-Options", "nosniff")
+		}
 		if len(content) > 0 {
-			r.Write(content[0])
+			r.Write(content...)
 		} else {
 			r.Write(http.StatusText(status))
 		}

g/net/ghttp/ghttp_server.go

@@ -36,26 +36,21 @@ import (
 type (
 	// Server结构体
 	Server struct {
-		// 基本属性变量
-		name        string            // 服务名称，方便识别
-		config      ServerConfig      // 配置对象
-		servers     []*gracefulServer // 底层http.Server列表
-		serverCount *gtype.Int        // 底层http.Server数量
-		closeChan   chan struct{}     // 用以关闭事件通知的通道
-		servedCount *gtype.Int        // 已经服务的请求数(4-8字节，不考虑溢出情况)，同时作为请求ID
-		// 服务注册相关
-		serveTree  map[string]interface{}           // 所有注册的服务回调函数(路由表，树型结构，哈希表+链表优先级匹配)
-		hooksTree  map[string]interface{}           // 所有注册的事件回调函数(路由表，树型结构，哈希表+链表优先级匹配)
-		serveCache *gcache.Cache                    // 服务注册路由内存缓存
-		hooksCache *gcache.Cache                    // 事件回调路由内存缓存
-		routesMap  map[string][]registeredRouteItem // 已经注册的路由及对应的注册方法文件地址(用以路由重复注册判断)
-		// 自定义状态码回调
-		hsmu             sync.RWMutex           // status handler互斥锁
-		statusHandlerMap map[string]HandlerFunc // 不同状态码下的注册处理方法(例如404状态时的处理方法)
-		// SESSION
-		sessions *gcache.Cache // Session内存缓存
-		// Logger
-		logger *glog.Logger // 日志管理对象
+		name             string                           // 服务名称
+		config           ServerConfig                     // 配置对象
+		servers          []*gracefulServer                // 底层http.Server列表
+		serverCount      *gtype.Int                       // 底层http.Server数量
+		closeChan        chan struct{}                    // 用以关闭事件通知的通道
+		servedCount      *gtype.Int                       // 已经服务的请求数(4-8字节，不考虑溢出情况)，同时作为请求ID
+		serveTree        map[string]interface{}           // 所有注册的服务回调函数(路由表，树型结构，哈希表+链表优先级匹配)
+		hooksTree        map[string]interface{}           // 所有注册的事件回调函数(路由表，树型结构，哈希表+链表优先级匹配)
+		serveCache       *gcache.Cache                    // 服务注册路由内存缓存
+		hooksCache       *gcache.Cache                    // 事件回调路由内存缓存
+		routesMap        map[string][]registeredRouteItem // 已经注册的路由及对应的注册方法文件地址(用以路由重复注册判断)
+		statusHandlerMu  sync.RWMutex                     // status handler互斥锁
+		statusHandlerMap map[string]HandlerFunc           // 不同状态码下的注册处理方法(例如404状态时的处理方法)
+		sessions         *gcache.Cache                    // Session内存缓存
+		logger           *glog.Logger                     // 日志管理对象
 	}
 
 	// 路由对象
@@ -103,17 +98,14 @@ type (
 )
 
 const (
-	SERVER_STATUS_STOPPED = 0 // Server状态：停止
-	SERVER_STATUS_RUNNING = 1 // Server状态：运行
-	HOOK_BEFORE_SERVE     = "BeforeServe"
-	HOOK_AFTER_SERVE      = "AfterServe"
-	HOOK_BEFORE_OUTPUT    = "BeforeOutput"
-	HOOK_AFTER_OUTPUT     = "AfterOutput"
-
-	// Deprecated.
-	HOOK_BEFORE_CLOSE = "BeforeClose"
-	// Deprecated.
-	HOOK_AFTER_CLOSE = "AfterClose"
+	SERVER_STATUS_STOPPED = 0              // Server状态：停止
+	SERVER_STATUS_RUNNING = 1              // Server状态：运行
+	HOOK_BEFORE_SERVE     = "BeforeServe"  // 回调事件，在执行服务前
+	HOOK_AFTER_SERVE      = "AfterServe"   // 回调事件，在执行服务后
+	HOOK_BEFORE_OUTPUT    = "BeforeOutput" // 回调事件，在输出结果前
+	HOOK_AFTER_OUTPUT     = "AfterOutput"  // 回调事件，在输出结果后
+	HOOK_BEFORE_CLOSE     = "BeforeClose"  // Deprecated.
+	HOOK_AFTER_CLOSE      = "AfterClose"   // Deprecated.
 
 	HTTP_METHODS               = "GET,PUT,POST,DELETE,PATCH,HEAD,CONNECT,OPTIONS,TRACE"
 	gDEFAULT_SERVER            = "default"

g/net/ghttp/ghttp_server_config.go

@@ -9,11 +9,12 @@ package ghttp
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/gogf/gf/g/os/gfile"
-	"github.com/gogf/gf/g/os/glog"
 	"net/http"
 	"strconv"
 	"time"
+
+	"github.com/gogf/gf/g/os/gfile"
+	"github.com/gogf/gf/g/os/glog"
 )
 
 const (
@@ -25,7 +26,7 @@ const (
 	NAME_TO_URI_TYPE_CAMEL             = 3             // 采用驼峰命名方式
 	gDEFAULT_COOKIE_PATH               = "/"           // 默认path
 	gDEFAULT_COOKIE_MAX_AGE            = 86400 * 365   // 默认cookie有效期(一年)
-	gDEFAULT_SESSION_MAX_AGE           = 600000        // 默认session有效期(600秒)
+	gDEFAULT_SESSION_MAX_AGE           = 86400         // 默认session有效期(一天)
 	gDEFAULT_SESSION_ID_NAME           = "gfsessionid" // 默认存放Cookie中的SessionId名称
 	gCHANGE_CONFIG_WHILE_RUNNING_ERROR = "cannot be changed while running"
 )

g/net/ghttp/ghttp_server_log.go

@@ -9,6 +9,7 @@ package ghttp
 
 import (
 	"fmt"
+
 	"github.com/gogf/gf/g/os/gtime"
 )
 
@@ -32,7 +33,7 @@ func (s *Server) handleAccessLog(r *Request) {
 	)
 	content += fmt.Sprintf(` %.3f`, float64(r.LeaveTime-r.EnterTime)/1000)
 	content += fmt.Sprintf(`, %s, "%s", "%s"`, r.GetClientIp(), r.Referer(), r.UserAgent())
-	s.logger.Cat("access").Backtrace(false, 2).Stdout(s.config.LogStdout).Println(content)
+	s.logger.Cat("access").Stack(false, 2).Stdout(s.config.LogStdout).Println(content)
 }
 
 // 处理服务错误信息，主要是panic，http请求的status由access log进行管理
@@ -60,5 +61,5 @@ func (s *Server) handleErrorLog(error interface{}, r *Request) {
 		content += fmt.Sprintf(` %.3f`, float64(gtime.Microsecond()-r.EnterTime)/1000)
 	}
 	content += fmt.Sprintf(`, %s, "%s", "%s"`, r.GetClientIp(), r.Referer(), r.UserAgent())
-	s.logger.Cat("error").Backtrace(true, 2).Stdout(s.config.LogStdout).Error(content)
+	s.logger.Cat("error").Stack(true, 2).Stdout(s.config.LogStdout).Error(content)
 }

g/net/ghttp/ghttp_server_session.go

@@ -1,34 +1,36 @@
-// Copyright 2017 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+// Copyright 2017-2019 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.
-// 并发安全的Session管理器
 
 package ghttp
 
 import (
+	"encoding/json"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/gogf/gf/g/container/gmap"
 	"github.com/gogf/gf/g/container/gvar"
 	"github.com/gogf/gf/g/os/gtime"
 	"github.com/gogf/gf/g/util/gconv"
 	"github.com/gogf/gf/g/util/grand"
-	"strconv"
-	"strings"
-	"time"
 )
 
-// SESSION对象
+// SESSION对象，并发安全
 type Session struct {
 	id      string          // SessionId
 	data    *gmap.StrAnyMap // Session数据
+	dirty   bool            // 数据是否被修改
 	server  *Server         // 所属Server
 	request *Request        // 关联的请求
 }
 
 // 生成一个唯一的SessionId字符串，长度18位。
 func makeSessionId() string {
-	return strings.ToUpper(strconv.FormatInt(gtime.Nanosecond(), 36) + grand.RandStr(6))
+	return strings.ToUpper(strconv.FormatInt(gtime.Nanosecond(), 36) + grand.Str(6))
 }
 
 // 获取或者生成一个session对象(延迟初始化)
@@ -41,15 +43,12 @@ func GetSession(r *Request) *Session {
 	}
 }
 
-// 执行初始化(用于延迟初始化).
+// 延迟初始化
 func (s *Session) init() {
 	if len(s.id) == 0 {
 		s.server = s.request.Server
-		// 根据提交的SESSION ID获取已存在SESSION
-		id := s.request.Cookie.GetSessionId()
-		if id != "" {
-			data := s.server.sessions.Get(id)
-			if data != nil {
+		if id := s.request.Cookie.GetSessionId(); id != "" {
+			if data := s.server.sessions.Get(id); data != nil {
 				s.id = id
 				s.data = data.(*gmap.StrAnyMap)
 				return
@@ -59,6 +58,7 @@ func (s *Session) init() {
 		s.id = s.request.Cookie.MakeSessionId()
 		s.data = gmap.NewStrAnyMap()
 		s.server.sessions.Set(s.id, s.data, s.server.GetSessionMaxAge()*1000)
+		s.dirty = true
 	}
 }
 
@@ -68,7 +68,7 @@ func (s *Session) Id() string {
 	return s.id
 }
 
-// 获取当前session所有数据
+// 获取当前session所有数据，注意是值拷贝
 func (s *Session) Map() map[string]interface{} {
 	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
 		s.init()
@@ -77,16 +77,27 @@ func (s *Session) Map() map[string]interface{} {
 	return nil
 }
 
+// 获得session map大小
+func (s *Session) Size() int {
+	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
+		s.init()
+		return s.data.Size()
+	}
+	return 0
+}
+
 // 设置session
 func (s *Session) Set(key string, value interface{}) {
 	s.init()
 	s.data.Set(key, value)
+	s.dirty = true
 }
 
 // 批量设置
 func (s *Session) Sets(m map[string]interface{}) {
 	s.init()
 	s.data.Sets(m)
+	s.dirty = true
 }
 
 // 判断键名是否存在
@@ -98,6 +109,58 @@ func (s *Session) Contains(key string) bool {
 	return false
 }
 
+// 判断session是否有修改(包括新创建)
+func (s *Session) IsDirty() bool {
+	return s.dirty
+}
+
+// 删除指定session键值对
+func (s *Session) Remove(key string) {
+	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
+		s.init()
+		s.data.Remove(key)
+		s.dirty = true
+	}
+}
+
+// 将session数据导出为[]byte数据(目前使用json进行序列化)
+func (s *Session) Export() (data []byte, err error) {
+	if s.Size() > 0 {
+		data, err = json.Marshal(s.data)
+	}
+	return
+}
+
+// 从[]byte中恢复session数据(目前使用json进行序列化)
+func (s *Session) Restore(data []byte) (err error) {
+	if len(data) == 0 {
+		return nil
+	}
+	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
+		s.init()
+		s.data.LockFunc(func(m map[string]interface{}) {
+			err = json.Unmarshal(data, &m)
+		})
+	}
+	return
+}
+
+// 清空session
+func (s *Session) Clear() {
+	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
+		s.init()
+		s.data.Clear()
+		s.dirty = true
+	}
+}
+
+// 更新过期时间(如果用在守护进程中长期使用，需要手动调用进行更新，防止超时被清除)
+func (s *Session) UpdateExpire() {
+	if len(s.id) > 0 && s.data.Size() > 0 {
+		s.server.sessions.Set(s.id, s.data, s.server.GetSessionMaxAge()*1000)
+	}
+}
+
 // 获取SESSION变量
 func (s *Session) Get(key string, def ...interface{}) interface{} {
 	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
@@ -117,29 +180,6 @@ func (s *Session) GetVar(key string, def ...interface{}) *gvar.Var {
 	return gvar.New(s.Get(key, def...), true)
 }
 
-// 删除session
-func (s *Session) Remove(key string) {
-	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
-		s.init()
-		s.data.Remove(key)
-	}
-}
-
-// 清空session
-func (s *Session) Clear() {
-	if len(s.id) > 0 || s.request.Cookie.GetSessionId() != "" {
-		s.init()
-		s.data.Clear()
-	}
-}
-
-// 更新过期时间(如果用在守护进程中长期使用，需要手动调用进行更新，防止超时被清除)
-func (s *Session) UpdateExpire() {
-	if len(s.id) > 0 && s.data.Size() > 0 {
-		s.server.sessions.Set(s.id, s.data, s.server.GetSessionMaxAge()*1000)
-	}
-}
-
 func (s *Session) GetString(key string, def ...interface{}) string {
 	return gconv.String(s.Get(key, def...))
 }
@@ -228,7 +268,34 @@ func (s *Session) GetDuration(key string, def ...interface{}) time.Duration {
 	return gconv.Duration(s.Get(key, def...))
 }
 
-// 将变量转换为对象，注意 pointer 参数必须为struct指针
+func (s *Session) GetMap(value interface{}, tags ...string) map[string]interface{} {
+	return gconv.Map(value, tags...)
+}
+
+func (s *Session) GetMapDeep(value interface{}, tags ...string) map[string]interface{} {
+	return gconv.MapDeep(value, tags...)
+}
+
+func (s *Session) GetMaps(value interface{}, tags ...string) []map[string]interface{} {
+	return gconv.Maps(value, tags...)
+}
+
+func (s *Session) GetMapsDeep(value interface{}, tags ...string) []map[string]interface{} {
+	return gconv.MapsDeep(value, tags...)
+}
+
 func (s *Session) GetStruct(key string, pointer interface{}, mapping ...map[string]string) error {
 	return gconv.Struct(s.Get(key), pointer, mapping...)
 }
+
+func (s *Session) GetStructDeep(key string, pointer interface{}, mapping ...map[string]string) error {
+	return gconv.StructDeep(s.Get(key), pointer, mapping...)
+}
+
+func (s *Session) GetStructs(key string, pointer interface{}, mapping ...map[string]string) error {
+	return gconv.Structs(s.Get(key), pointer, mapping...)
+}
+
+func (s *Session) GetStructsDeep(key string, pointer interface{}, mapping ...map[string]string) error {
+	return gconv.StructsDeep(s.Get(key), pointer, mapping...)
+}

g/net/ghttp/ghttp_server_status.go

@@ -14,8 +14,8 @@ import (
 // 查询状态码回调函数
 func (s *Server) getStatusHandler(status int, r *Request) HandlerFunc {
 	domains := []string{r.GetHost(), gDEFAULT_DOMAIN}
-	s.hsmu.RLock()
-	defer s.hsmu.RUnlock()
+	s.statusHandlerMu.RLock()
+	defer s.statusHandlerMu.RUnlock()
 	for _, domain := range domains {
 		if f, ok := s.statusHandlerMap[s.statusHandlerKey(status, domain)]; ok {
 			return f
@@ -27,9 +27,9 @@ func (s *Server) getStatusHandler(status int, r *Request) HandlerFunc {
 // 不同状态码下的回调方法处理
 // pattern格式：domain#status
 func (s *Server) setStatusHandler(pattern string, handler HandlerFunc) {
-	s.hsmu.Lock()
+	s.statusHandlerMu.Lock()
 	s.statusHandlerMap[pattern] = handler
-	s.hsmu.Unlock()
+	s.statusHandlerMu.Unlock()
 }
 
 // 生成状态码回调函数map存储键名

g/net/ghttp/ghttp_unit_param_struct_test.go

@@ -0,0 +1,67 @@
+// Copyright 2018 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 ghttp_test
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/gogf/gf/g/util/gvalid"
+
+	"github.com/gogf/gf/g"
+	"github.com/gogf/gf/g/net/ghttp"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func Test_Params_Struct(t *testing.T) {
+	type User struct {
+		Id    int
+		Name  string
+		Pass1 string `params:"password1"`
+		Pass2 string `params:"password2" gvalid:"passwd1 @required|length:2,20|password3#||密码强度不足"`
+	}
+	p := ports.PopRand()
+	s := g.Server(p)
+	s.BindHandler("/struct1", func(r *ghttp.Request) {
+		if m := r.GetMap(); len(m) > 0 {
+			user := new(User)
+			r.GetToStruct(user)
+			r.Response.Write(user.Id, user.Name, user.Pass1, user.Pass2)
+		}
+	})
+	s.BindHandler("/struct2", func(r *ghttp.Request) {
+		if m := r.GetMap(); len(m) > 0 {
+			user := (*User)(nil)
+			r.GetToStruct(&user)
+			r.Response.Write(user.Id, user.Name, user.Pass1, user.Pass2)
+		}
+	})
+	s.BindHandler("/struct-valid", func(r *ghttp.Request) {
+		if m := r.GetMap(); len(m) > 0 {
+			user := new(User)
+			r.GetToStruct(user)
+			err := gvalid.CheckStruct(user, nil)
+			r.Response.Write(err.Maps())
+		}
+	})
+	s.SetPort(p)
+	s.SetDumpRouteMap(false)
+	s.Start()
+	defer s.Shutdown()
+
+	// 等待启动完成
+	time.Sleep(time.Second)
+	gtest.Case(t, func() {
+		client := ghttp.NewClient()
+		client.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", p))
+		gtest.Assert(client.GetContent("/struct1", `id=1&name=john&password1=123&password2=456`), `1john123456`)
+		gtest.Assert(client.PostContent("/struct1", `id=1&name=john&password1=123&password2=456`), `1john123456`)
+		gtest.Assert(client.PostContent("/struct2", `id=1&name=john&password1=123&password2=456`), `1john123456`)
+		gtest.Assert(client.PostContent("/struct-valid", `id=1&name=john&password1=123&password2=0`), `{"passwd1":{"length":"字段长度为2到20个字符","password3":"密码强度不足"}}`)
+	})
+}

g/net/gtcp/gtcp_conn.go

@@ -14,7 +14,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/gogf/gf/g/internal/errors"
+	"github.com/gogf/gf/g/errors/gerror"
 )
 
 // 封装的链接对象
@@ -209,7 +209,7 @@ func (c *Conn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry
 		return nil, err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
+		err = gerror.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
 	}()
 	data, err = c.Recv(length, retry...)
 	return
@@ -221,7 +221,7 @@ func (c *Conn) SendWithTimeout(data []byte, timeout time.Duration, retry ...Retr
 		return err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
+		err = gerror.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
 	}()
 	err = c.Send(data, retry...)
 	return

g/net/gtcp/gtcp_conn_pkg.go

@@ -11,20 +11,23 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gogf/gf/g/internal/errors"
+	"github.com/gogf/gf/g/errors/gerror"
 )
 
 const (
 	// 默认允许最大的简单协议包大小(byte), 65535 byte
-	gPKG_MAX_DATA_SIZE = 65535
-	// 简单协议包头大小
-	gPKG_HEADER_SIZE = 3
+	gPKG_DEFAULT_MAX_DATA_SIZE = 65535
+	// 默认简单协议包头大小
+	gPKG_DEFAULT_HEADER_SIZE = 2
+	// 协议头最大大小
+	gPKG_MAX_HEADER_SIZE = 4
 )
 
 // 数据读取选项
 type PkgOption struct {
-	MaxSize int   // (byte)数据读取的最大包大小，最大不能超过3字节(0xFFFFFF,15MB)，默认为65535byte
-	Retry   Retry // 失败重试
+	HeaderSize  int   // 自定义头大小(默认为2字节，最大不能超过4字节)
+	MaxDataSize int   // (byte)数据读取的最大包大小，默认最大不能超过2字节(65535 byte)
+	Retry       Retry // 失败重试
 }
 
 // getPkgOption wraps and returns the PkgOption.
@@ -34,10 +37,13 @@ func getPkgOption(option ...PkgOption) (*PkgOption, error) {
 	if len(option) > 0 {
 		pkgOption = option[0]
 	}
-	if pkgOption.MaxSize == 0 {
-		pkgOption.MaxSize = gPKG_MAX_DATA_SIZE
-	} else if pkgOption.MaxSize > 0xFFFFFF {
-		return nil, fmt.Errorf(`package size %d exceeds allowed max size %d`, pkgOption.MaxSize, 0xFFFFFF)
+	if pkgOption.HeaderSize == 0 {
+		pkgOption.HeaderSize = gPKG_DEFAULT_HEADER_SIZE
+	}
+	if pkgOption.MaxDataSize == 0 {
+		pkgOption.MaxDataSize = gPKG_DEFAULT_MAX_DATA_SIZE
+	} else if pkgOption.MaxDataSize > 0xFFFFFF {
+		return nil, fmt.Errorf(`package size %d exceeds allowed max size %d`, pkgOption.MaxDataSize, 0xFFFFFF)
 	}
 	return &pkgOption, nil
 }
@@ -55,17 +61,18 @@ func (c *Conn) SendPkg(data []byte, option ...PkgOption) error {
 		return err
 	}
 	length := len(data)
-	if length > pkgOption.MaxSize {
-		return fmt.Errorf(`data size %d exceeds max pkg size %d`, length, gPKG_MAX_DATA_SIZE)
+	if length > pkgOption.MaxDataSize {
+		return fmt.Errorf(`data size %d exceeds max pkg size %d`, length, pkgOption.MaxDataSize)
 	}
-	buffer := make([]byte, gPKG_HEADER_SIZE+1+len(data))
+	offset := gPKG_MAX_HEADER_SIZE - pkgOption.HeaderSize
+	buffer := make([]byte, gPKG_MAX_HEADER_SIZE+len(data))
 	binary.BigEndian.PutUint32(buffer[0:], uint32(length))
-	copy(buffer[gPKG_HEADER_SIZE+1:], data)
+	copy(buffer[gPKG_MAX_HEADER_SIZE:], data)
 	if pkgOption.Retry.Count > 0 {
-		return c.Send(buffer[1:], pkgOption.Retry)
+		return c.Send(buffer[offset:], pkgOption.Retry)
 	}
-	//fmt.Println("SendPkg:", buffer[1:])
-	return c.Send(buffer[1:])
+	//fmt.Println("SendPkg:", buffer[offset:])
+	return c.Send(buffer[offset:])
 }
 
 // 简单协议: 带超时时间的数据发送
@@ -74,7 +81,7 @@ func (c *Conn) SendPkgWithTimeout(data []byte, timeout time.Duration, option ...
 		return err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
+		err = gerror.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
 	}()
 	err = c.SendPkg(data, option...)
 	return
@@ -109,26 +116,38 @@ func (c *Conn) RecvPkg(option ...PkgOption) (result []byte, err error) {
 	for {
 		// 先根据对象的缓冲区数据进行计算
 		for {
-			if len(c.buffer) >= gPKG_HEADER_SIZE {
-				// 注意"数据长度"为3个字节，不满足4个字节的uint32类型，因此这里"低位"补0
-				length = int(binary.BigEndian.Uint32([]byte{0, c.buffer[0], c.buffer[1], c.buffer[2]}))
+			if len(c.buffer) >= pkgOption.HeaderSize {
+				// 不满足4个字节的uint32类型，因此这里"低位"补0
+				if length <= 0 {
+					switch pkgOption.HeaderSize {
+					case 1:
+						length = int(binary.BigEndian.Uint32([]byte{0, 0, 0, c.buffer[0]}))
+					case 2:
+						length = int(binary.BigEndian.Uint32([]byte{0, 0, c.buffer[0], c.buffer[1]}))
+					case 3:
+						length = int(binary.BigEndian.Uint32([]byte{0, c.buffer[0], c.buffer[1], c.buffer[2]}))
+					default:
+						length = int(binary.BigEndian.Uint32([]byte{c.buffer[0], c.buffer[1], c.buffer[2], c.buffer[3]}))
+					}
+				}
 				// 解析的大小是否符合规范，清空从该连接接收到的所有数据包
-				if length < 0 || length > pkgOption.MaxSize {
+				if length < 0 || length > pkgOption.MaxDataSize {
 					c.buffer = c.buffer[:0]
 					return nil, fmt.Errorf(`invalid package size %d`, length)
 				}
 				// 不满足包大小，需要继续读取
-				if len(c.buffer) < length+gPKG_HEADER_SIZE {
+				if len(c.buffer) < length+pkgOption.HeaderSize {
 					break
 				}
-				result = c.buffer[gPKG_HEADER_SIZE : gPKG_HEADER_SIZE+length]
-				c.buffer = c.buffer[gPKG_HEADER_SIZE+length:]
+				result = c.buffer[pkgOption.HeaderSize : pkgOption.HeaderSize+length]
+				c.buffer = c.buffer[pkgOption.HeaderSize+length:]
+				length = 0
 				return
 			} else {
 				break
 			}
 		}
-		// 读取系统socket缓冲区的完整数据
+		// 读取系统socket当前缓冲区的数据
 		temp, err = c.Recv(0, pkgOption.Retry)
 		if err != nil {
 			break
@@ -147,7 +166,7 @@ func (c *Conn) RecvPkgWithTimeout(timeout time.Duration, option ...PkgOption) (d
 		return nil, err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
+		err = gerror.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
 	}()
 	data, err = c.RecvPkg(option...)
 	return

g/net/gtcp/gtcp_pool.go

@@ -9,10 +9,9 @@ package gtcp
 import (
 	"time"
 
-	"github.com/gogf/gf/g/internal/errors"
-
 	"github.com/gogf/gf/g/container/gmap"
 	"github.com/gogf/gf/g/container/gpool"
+	"github.com/gogf/gf/g/errors/gerror"
 )
 
 // 链接池链接对象
@@ -122,7 +121,7 @@ func (c *PoolConn) RecvWithTimeout(length int, timeout time.Duration, retry ...R
 		return nil, err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
+		err = gerror.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
 	}()
 	data, err = c.Recv(length, retry...)
 	return
@@ -134,7 +133,7 @@ func (c *PoolConn) SendWithTimeout(data []byte, timeout time.Duration, retry ...
 		return err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
+		err = gerror.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
 	}()
 	err = c.Send(data, retry...)
 	return

g/net/gtcp/gtcp_pool_pkg.go

@@ -9,7 +9,7 @@ package gtcp
 import (
 	"time"
 
-	"github.com/gogf/gf/g/internal/errors"
+	"github.com/gogf/gf/g/errors/gerror"
 )
 
 // 简单协议: (方法覆盖)发送数据
@@ -47,7 +47,7 @@ func (c *PoolConn) RecvPkgWithTimeout(timeout time.Duration, option ...PkgOption
 		return nil, err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
+		err = gerror.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
 	}()
 	data, err = c.RecvPkg(option...)
 	return
@@ -59,7 +59,7 @@ func (c *PoolConn) SendPkgWithTimeout(data []byte, timeout time.Duration, option
 		return err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
+		err = gerror.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
 	}()
 	err = c.SendPkg(data, option...)
 	return

g/net/gudp/gudp_conn.go

@@ -11,7 +11,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/gogf/gf/g/internal/errors"
+	"github.com/gogf/gf/g/errors/gerror"
 )
 
 // 封装的UDP链接对象
@@ -182,7 +182,7 @@ func (c *Conn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry
 		return nil, err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
+		err = gerror.Wrap(c.SetRecvDeadline(time.Time{}), "SetRecvDeadline error")
 	}()
 	data, err = c.Recv(length, retry...)
 	return
@@ -194,7 +194,7 @@ func (c *Conn) SendWithTimeout(data []byte, timeout time.Duration, retry ...Retr
 		return err
 	}
 	defer func() {
-		err = errors.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
+		err = gerror.Wrap(c.SetSendDeadline(time.Time{}), "SetSendDeadline error")
 	}()
 	err = c.Send(data, retry...)
 	return

g/os/gcache/gcache.go

@@ -10,23 +10,32 @@ package gcache
 // Default cache object.
 var cache = New()
 
-// Set sets cache with <key>-<value> pair, which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func Set(key interface{}, value interface{}, expire int) {
-	cache.Set(key, value, expire)
+// Set sets cache with <key>-<value> pair, which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func Set(key interface{}, value interface{}, duration interface{}) {
+	cache.Set(key, value, duration)
 }
 
 // SetIfNotExist sets cache with <key>-<value> pair if <key> does not exist in the cache,
-// which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func SetIfNotExist(key interface{}, value interface{}, expire int) bool {
-	return cache.SetIfNotExist(key, value, expire)
+// which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func SetIfNotExist(key interface{}, value interface{}, duration interface{}) bool {
+	return cache.SetIfNotExist(key, value, duration)
 }
 
-// Sets batch sets cache with key-value pairs by <data>, which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func Sets(data map[interface{}]interface{}, expire int) {
-	cache.Sets(data, expire)
+// Sets batch sets cache with key-value pairs by <data>, which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func Sets(data map[interface{}]interface{}, duration interface{}) {
+	cache.Sets(data, duration)
 }
 
 // Get returns the value of <key>.
@@ -37,30 +46,39 @@ func Get(key interface{}) interface{} {
 
 // GetOrSet returns the value of <key>,
 // or sets <key>-<value> pair and returns <value> if <key> does not exist in the cache.
-// The key-value pair expires after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func GetOrSet(key interface{}, value interface{}, expire int) interface{} {
-	return cache.GetOrSet(key, value, expire)
+// The key-value pair expires after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func GetOrSet(key interface{}, value interface{}, duration interface{}) interface{} {
+	return cache.GetOrSet(key, value, duration)
 }
 
 // GetOrSetFunc returns the value of <key>,
 // or sets <key> with result of function <f> and returns its result
 // if <key> does not exist in the cache.
-// The key-value pair expires after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func GetOrSetFunc(key interface{}, f func() interface{}, expire int) interface{} {
-	return cache.GetOrSetFunc(key, f, expire)
+// The key-value pair expires after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func GetOrSetFunc(key interface{}, f func() interface{}, duration interface{}) interface{} {
+	return cache.GetOrSetFunc(key, f, duration)
 }
 
 // GetOrSetFuncLock returns the value of <key>,
 // or sets <key> with result of function <f> and returns its result
 // if <key> does not exist in the cache.
-// The key-value pair expires after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
+// The key-value pair expires after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
 //
 // Note that the function <f> is executed within writing mutex lock.
-func GetOrSetFuncLock(key interface{}, f func() interface{}, expire int) interface{} {
-	return cache.GetOrSetFuncLock(key, f, expire)
+func GetOrSetFuncLock(key interface{}, f func() interface{}, duration interface{}) interface{} {
+	return cache.GetOrSetFuncLock(key, f, duration)
 }
 
 // Contains returns true if <key> exists in the cache, or else returns false.

g/os/gcache/gcache_mem_cache.go

@@ -9,6 +9,7 @@ package gcache
 import (
 	"math"
 	"sync"
+	"time"
 
 	"github.com/gogf/gf/g/container/glist"
 	"github.com/gogf/gf/g/container/gset"
@@ -103,9 +104,24 @@ func (c *memCache) getOrNewExpireSet(expire int64) (expireSet *gset.Set) {
 	return
 }
 
-// Set sets cache with <key>-<value> pair, which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func (c *memCache) Set(key interface{}, value interface{}, expire int) {
+// getMilliExpire converts parameter <duration> to int type in milliseconds.
+//
+// Note that there's some performance cost in type assertion here, but it's valuable.
+func (c *memCache) getMilliExpire(duration interface{}) int {
+	if d, ok := duration.(time.Duration); ok {
+		return int(d.Nanoseconds() / 1000000)
+	} else {
+		return duration.(int)
+	}
+}
+
+// Set sets cache with <key>-<value> pair, which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func (c *memCache) Set(key interface{}, value interface{}, duration interface{}) {
+	expire := c.getMilliExpire(duration)
 	expireTime := c.getInternalExpire(expire)
 	c.dataMu.Lock()
 	c.data[key] = memCacheItem{v: value, e: expireTime}
@@ -114,12 +130,16 @@ func (c *memCache) Set(key interface{}, value interface{}, expire int) {
 }
 
 // doSetWithLockCheck sets cache with <key>-<value> pair if <key> does not exist in the cache,
-// which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
+// which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
 //
 // It doubly checks the <key> whether exists in the cache using mutex writing lock
 // before setting it to the cache.
-func (c *memCache) doSetWithLockCheck(key interface{}, value interface{}, expire int) interface{} {
+func (c *memCache) doSetWithLockCheck(key interface{}, value interface{}, duration interface{}) interface{} {
+	expire := c.getMilliExpire(duration)
 	expireTimestamp := c.getInternalExpire(expire)
 	c.dataMu.Lock()
 	defer c.dataMu.Unlock()
@@ -147,9 +167,13 @@ func (c *memCache) getInternalExpire(expire int) int64 {
 }
 
 // SetIfNotExist sets cache with <key>-<value> pair if <key> does not exist in the cache,
-// which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func (c *memCache) SetIfNotExist(key interface{}, value interface{}, expire int) bool {
+// which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func (c *memCache) SetIfNotExist(key interface{}, value interface{}, duration interface{}) bool {
+	expire := c.getMilliExpire(duration)
 	if !c.Contains(key) {
 		c.doSetWithLockCheck(key, value, expire)
 		return true
@@ -157,9 +181,13 @@ func (c *memCache) SetIfNotExist(key interface{}, value interface{}, expire int)
 	return false
 }
 
-// Sets batch sets cache with key-value pairs by <data>, which is expired after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func (c *memCache) Sets(data map[interface{}]interface{}, expire int) {
+// Sets batch sets cache with key-value pairs by <data>, which is expired after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func (c *memCache) Sets(data map[interface{}]interface{}, duration interface{}) {
+	expire := c.getMilliExpire(duration)
 	expireTime := c.getInternalExpire(expire)
 	for k, v := range data {
 		c.dataMu.Lock()
@@ -187,11 +215,14 @@ func (c *memCache) Get(key interface{}) interface{} {
 
 // GetOrSet returns the value of <key>,
 // or sets <key>-<value> pair and returns <value> if <key> does not exist in the cache.
-// The key-value pair expires after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func (c *memCache) GetOrSet(key interface{}, value interface{}, expire int) interface{} {
+// The key-value pair expires after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func (c *memCache) GetOrSet(key interface{}, value interface{}, duration interface{}) interface{} {
 	if v := c.Get(key); v == nil {
-		return c.doSetWithLockCheck(key, value, expire)
+		return c.doSetWithLockCheck(key, value, duration)
 	} else {
 		return v
 	}
@@ -200,11 +231,14 @@ func (c *memCache) GetOrSet(key interface{}, value interface{}, expire int) inte
 // GetOrSetFunc returns the value of <key>,
 // or sets <key> with result of function <f> and returns its result
 // if <key> does not exist in the cache.
-// The key-value pair expires after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
-func (c *memCache) GetOrSetFunc(key interface{}, f func() interface{}, expire int) interface{} {
+// The key-value pair expires after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
+func (c *memCache) GetOrSetFunc(key interface{}, f func() interface{}, duration interface{}) interface{} {
 	if v := c.Get(key); v == nil {
-		return c.doSetWithLockCheck(key, f(), expire)
+		return c.doSetWithLockCheck(key, f(), duration)
 	} else {
 		return v
 	}
@@ -213,13 +247,16 @@ func (c *memCache) GetOrSetFunc(key interface{}, f func() interface{}, expire in
 // GetOrSetFuncLock returns the value of <key>,
 // or sets <key> with result of function <f> and returns its result
 // if <key> does not exist in the cache.
-// The key-value pair expires after <expire> milliseconds.
-// If <expire> <=0 means it does not expire.
+// The key-value pair expires after <duration>.
+//
+// The parameter <duration> can be either type of int or time.Duration.
+// If <duration> is type of int, it means <duration> milliseconds.
+// If <duration> <=0 means it does not expire.
 //
 // Note that the function <f> is executed within writing mutex lock.
-func (c *memCache) GetOrSetFuncLock(key interface{}, f func() interface{}, expire int) interface{} {
+func (c *memCache) GetOrSetFuncLock(key interface{}, f func() interface{}, duration interface{}) interface{} {
 	if v := c.Get(key); v == nil {
-		return c.doSetWithLockCheck(key, f, expire)
+		return c.doSetWithLockCheck(key, f, duration)
 	} else {
 		return v
 	}

g/os/gcache/gcache_z_bench_test.go

@@ -10,104 +10,70 @@ package gcache_test
 
 import (
 	"github.com/gogf/gf/g/os/gcache"
-	"sync"
 	"testing"
 )
 
 var (
-	c    = gcache.New()
-	clru = gcache.New(10000)
-	mInt = make(map[int]int)
-	mMap = make(map[interface{}]interface{})
-
-	muInt = sync.RWMutex{}
-	muMap = sync.RWMutex{}
+	cache    = gcache.New()
+	cacheLru = gcache.New(10000)
 )
 
 func Benchmark_CacheSet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		c.Set(i, i, 0)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			cache.Set(i, i, 0)
+			i++
+		}
+	})
 }
 
 func Benchmark_CacheGet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		c.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			cache.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_CacheRemove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		c.Remove(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			cache.Remove(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_CacheLruSet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		clru.Set(i, i, 0)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			cacheLru.Set(i, i, 0)
+			i++
+		}
+	})
 }
 
 func Benchmark_CacheLruGet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		clru.Get(i)
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			cacheLru.Get(i)
+			i++
+		}
+	})
 }
 
 func Benchmark_CacheLruRemove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		clru.Remove(i)
-	}
-}
-
-func Benchmark_InterfaceMapWithLockSet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		muMap.Lock()
-		mMap[i] = i
-		muMap.Unlock()
-	}
-}
-
-func Benchmark_InterfaceMapWithLockGet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		muMap.RLock()
-		if _, ok := mMap[i]; ok {
-
+	b.RunParallel(func(pb *testing.PB) {
+		i := 0
+		for pb.Next() {
+			cacheLru.Remove(i)
+			i++
 		}
-		muMap.RUnlock()
-	}
-}
-
-func Benchmark_InterfaceMapWithLockRemove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		muMap.Lock()
-		delete(mMap, i)
-		muMap.Unlock()
-	}
-}
-
-func Benchmark_IntMapWithLockWithLockSet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		muInt.Lock()
-		mInt[i] = i
-		muInt.Unlock()
-	}
-}
-
-func Benchmark_IntMapWithLockGet(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		muInt.RLock()
-		if _, ok := mInt[i]; ok {
-
-		}
-		muInt.RUnlock()
-	}
-}
-
-func Benchmark_IntMapWithLockRemove(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		muInt.Lock()
-		delete(mInt, i)
-		muInt.Unlock()
-	}
+	})
 }

g/os/gcache/gcache_z_unit_1_test.go

@@ -9,13 +9,14 @@
 package gcache_test
 
 import (
+	"testing"
+	"time"
+
 	"github.com/gogf/gf/g"
 	"github.com/gogf/gf/g/container/gset"
 	"github.com/gogf/gf/g/os/gcache"
 	"github.com/gogf/gf/g/os/grpool"
 	"github.com/gogf/gf/g/test/gtest"
-	"testing"
-	"time"
 )
 
 //clear 用于清除全局缓存，因gcache api 暂未暴露 Clear 方法
@@ -49,6 +50,14 @@ func TestCache_Set_Expire(t *testing.T) {
 		gtest.Assert(cache.Size(), 0)
 		cache.Close()
 	})
+
+	gtest.Case(t, func() {
+		cache := gcache.New()
+		cache.Set(1, 11, 100*time.Millisecond)
+		gtest.Assert(cache.Get(1), 11)
+		time.Sleep(200 * time.Millisecond)
+		gtest.Assert(cache.Get(1), nil)
+	})
 }
 
 func TestCache_Keys_Values(t *testing.T) {
@@ -205,7 +214,7 @@ func TestCache_SetConcurrency(t *testing.T) {
 		}()
 		select {
 		case <-time.After(2 * time.Second):
-			t.Log("first part end")
+			//t.Log("first part end")
 		}
 
 		go func() {
@@ -217,7 +226,7 @@ func TestCache_SetConcurrency(t *testing.T) {
 		}()
 		select {
 		case <-time.After(2 * time.Second):
-			t.Log("second part end")
+			//t.Log("second part end")
 		}
 	})
 }

g/os/gcfg/gcfg.go

@@ -36,8 +36,7 @@ type Config struct {
 	name  *gtype.String       // Default configuration file name.
 	paths *garray.StringArray // Searching path array.
 	jsons *gmap.StrAnyMap     // The pared JSON objects for configuration files.
-	vc    *gtype.Bool         // Whether do violence check in value index searching.
-	// It affects the performance when set true(false in default).
+	vc    *gtype.Bool         // Whether do violence check in value index searching. It affects the performance when set true(false in default).
 }
 
 // New returns a new configuration management object.
@@ -259,7 +258,7 @@ func (c *Config) GetFileName() string {
 	return c.name.Val()
 }
 
-// getJson returns a gjson.Json object for the specified <file> content.
+// getJson returns a *gjson.Json object for the specified <file> content.
 // It would print error if file reading fails.
 // If any error occurs, it return nil.
 func (c *Config) getJson(file ...string) *gjson.Json {

g/os/gcfg/gcfg_z_unit_test.go

@@ -24,7 +24,7 @@ func init() {
 	os.Setenv("GF_GCFG_ERRORPRINT", "false")
 }
 
-func Test_Basic(t *testing.T) {
+func Test_Basic1(t *testing.T) {
 	config := `
 v1    = 1
 v2    = "true"
@@ -76,8 +76,8 @@ array = [1,2,3]
 
 		gtest.AssertEQ(c.GetInts("array"), []int{1, 2, 3})
 		gtest.AssertEQ(c.GetStrings("array"), []string{"1", "2", "3"})
-		gtest.AssertEQ(c.GetArray("array"), []interface{}{"1", "2", "3"})
-		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{"1", "2", "3"})
+		gtest.AssertEQ(c.GetArray("array"), []interface{}{1, 2, 3})
+		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{1, 2, 3})
 		gtest.AssertEQ(c.GetMap("redis"), map[string]interface{}{
 			"disk":  "127.0.0.1:6379,0",
 			"cache": "127.0.0.1:6379,1",
@@ -87,6 +87,21 @@ array = [1,2,3]
 	})
 }
 
+func Test_Basic2(t *testing.T) {
+	config := `log-path = "logs"`
+	gtest.Case(t, func() {
+		path := gcfg.DEFAULT_CONFIG_FILE
+		err := gfile.PutContents(path, config)
+		gtest.Assert(err, nil)
+		defer func() {
+			_ = gfile.Remove(path)
+		}()
+
+		c := gcfg.New()
+		gtest.Assert(c.Get("log-path"), "logs")
+	})
+}
+
 func Test_Content(t *testing.T) {
 	content := `
 v1    = 1
@@ -135,8 +150,8 @@ array = [1,2,3]
 
 		gtest.AssertEQ(c.GetInts("array"), []int{1, 2, 3})
 		gtest.AssertEQ(c.GetStrings("array"), []string{"1", "2", "3"})
-		gtest.AssertEQ(c.GetArray("array"), []interface{}{"1", "2", "3"})
-		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{"1", "2", "3"})
+		gtest.AssertEQ(c.GetArray("array"), []interface{}{1, 2, 3})
+		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{1, 2, 3})
 		gtest.AssertEQ(c.GetMap("redis"), map[string]interface{}{
 			"disk":  "127.0.0.1:6379,0",
 			"cache": "127.0.0.1:6379,1",
@@ -204,8 +219,8 @@ func Test_SetFileName(t *testing.T) {
 
 		gtest.AssertEQ(c.GetInts("array"), []int{1, 2, 3})
 		gtest.AssertEQ(c.GetStrings("array"), []string{"1", "2", "3"})
-		gtest.AssertEQ(c.GetArray("array"), []interface{}{"1", "2", "3"})
-		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{"1", "2", "3"})
+		gtest.AssertEQ(c.GetArray("array"), []interface{}{1, 2, 3})
+		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{1, 2, 3})
 		gtest.AssertEQ(c.GetMap("redis"), map[string]interface{}{
 			"disk":  "127.0.0.1:6379,0",
 			"cache": "127.0.0.1:6379,1",
@@ -274,8 +289,8 @@ func Test_Instance(t *testing.T) {
 
 		gtest.AssertEQ(c.GetInts("array"), []int{1, 2, 3})
 		gtest.AssertEQ(c.GetStrings("array"), []string{"1", "2", "3"})
-		gtest.AssertEQ(c.GetArray("array"), []interface{}{"1", "2", "3"})
-		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{"1", "2", "3"})
+		gtest.AssertEQ(c.GetArray("array"), []interface{}{1, 2, 3})
+		gtest.AssertEQ(c.GetInterfaces("array"), []interface{}{1, 2, 3})
 		gtest.AssertEQ(c.GetMap("redis"), map[string]interface{}{
 			"disk":  "127.0.0.1:6379,0",
 			"cache": "127.0.0.1:6379,1",

g/os/gcmd/gcmd.go

@@ -9,9 +9,10 @@
 package gcmd
 
 import (
-	"github.com/gogf/gf/g/os/glog"
 	"os"
 	"regexp"
+
+	"github.com/gogf/gf/g/os/glog"
 )
 
 // Console values.
@@ -36,7 +37,7 @@ func init() {
 func doInit() {
 	Value.values = Value.values[:0]
 	Option.options = make(map[string]string)
-	reg := regexp.MustCompile(`\-\-{0,1}(.+?)=(.+)`)
+	reg := regexp.MustCompile(`^\-{1,2}(\w+)={0,1}(.*)`)
 	for i := 0; i < len(os.Args); i++ {
 		result := reg.FindStringSubmatch(os.Args[i])
 		if len(result) > 1 {

g/os/gcmd/gcmd_z_unit_test.go

@@ -9,9 +9,10 @@
 package gcmd
 
 import (
-	"github.com/gogf/gf/g/test/gtest"
 	"os"
 	"testing"
+
+	"github.com/gogf/gf/g/test/gtest"
 )
 
 func Test_ValueAndOption(t *testing.T) {

g/os/gfcache/gfcache.go

@@ -8,6 +8,8 @@
 package gfcache
 
 import (
+	"time"
+
 	"github.com/gogf/gf/g/internal/cmdenv"
 	"github.com/gogf/gf/g/os/gcache"
 	"github.com/gogf/gf/g/os/gfile"
@@ -27,18 +29,18 @@ var (
 // GetContents returns string content of given file by <path> from cache.
 // If there's no content in the cache, it will read it from disk file specified by <path>.
 // The parameter <expire> specifies the caching time for this file content in seconds.
-func GetContents(path string, expire ...int) string {
-	return string(GetBinContents(path, expire...))
+func GetContents(path string, duration ...interface{}) string {
+	return string(GetBinContents(path, duration...))
 }
 
 // GetBinContents returns []byte content of given file by <path> from cache.
 // If there's no content in the cache, it will read it from disk file specified by <path>.
 // The parameter <expire> specifies the caching time for this file content in seconds.
-func GetBinContents(path string, expire ...int) []byte {
+func GetBinContents(path string, duration ...interface{}) []byte {
 	k := cacheKey(path)
 	e := cacheExpire
-	if len(expire) > 0 {
-		e = expire[0]
+	if len(duration) > 0 {
+		e = getSecondExpire(duration[0])
 	}
 	r := gcache.GetOrSetFuncLock(k, func() interface{} {
 		b := gfile.GetBinContents(path)
@@ -58,7 +60,18 @@ func GetBinContents(path string, expire ...int) []byte {
 	return nil
 }
 
-// 生成缓存键名
+// getSecondExpire converts parameter <duration> to int type in seconds.
+//
+// Note that there's some performance cost in type assertion here, but it's valuable.
+func getSecondExpire(duration interface{}) int {
+	if d, ok := duration.(time.Duration); ok {
+		return int(d.Nanoseconds() / 1000000000)
+	} else {
+		return duration.(int)
+	}
+}
+
+// cacheKey produces the cache key for gcache.
 func cacheKey(path string) string {
 	return "gf.gfcache:" + path
 }

g/os/gfcache/gfcache_z_unit_test.go

@@ -0,0 +1,92 @@
+// 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.
+
+// go test *.go -bench=".*" -benchmem
+
+package gfcache_test
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/gogf/gf/g/os/gfcache"
+	"github.com/gogf/gf/g/os/gfile"
+	"github.com/gogf/gf/g/test/gtest"
+)
+
+func TestGetContents(t *testing.T) {
+	gtest.Case(t, func() {
+
+		var f *os.File
+		var err error
+		fileName := "test"
+		strTest := "123"
+
+		if !gfile.Exists(fileName) {
+			f, err = ioutil.TempFile("", fileName)
+			if err != nil {
+				t.Error("create file fail")
+			}
+		}
+
+		defer f.Close()
+		defer os.Remove(f.Name())
+
+		if gfile.Exists(f.Name()) {
+
+			f, err = gfile.OpenFile(f.Name(), os.O_APPEND|os.O_WRONLY, os.ModeAppend)
+			if err != nil {
+				t.Error("file open fail", err)
+			}
+
+			err = gfile.PutContents(f.Name(), strTest)
+			if err != nil {
+				t.Error("write error", err)
+			}
+
+			cache := gfcache.GetContents(f.Name(), 1)
+			gtest.Assert(cache, strTest)
+		}
+	})
+
+	gtest.Case(t, func() {
+
+		var f *os.File
+		var err error
+		fileName := "test2"
+		strTest := "123"
+
+		if !gfile.Exists(fileName) {
+			f, err = ioutil.TempFile("", fileName)
+			if err != nil {
+				t.Error("create file fail")
+			}
+		}
+
+		defer f.Close()
+		defer os.Remove(f.Name())
+
+		if gfile.Exists(f.Name()) {
+			cache := gfcache.GetContents(f.Name())
+
+			f, err = gfile.OpenFile(f.Name(), os.O_APPEND|os.O_WRONLY, os.ModeAppend)
+			if err != nil {
+				t.Error("file open fail", err)
+			}
+
+			err = gfile.PutContents(f.Name(), strTest)
+			if err != nil {
+				t.Error("write error", err)
+			}
+
+			gtest.Assert(cache, "")
+
+			time.Sleep(100 * time.Millisecond)
+		}
+	})
+}