add function Transaction for gdb.Model

add valid size method

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

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	g.DB().Model("user").Distinct().CountColumn("uid,name")
+}

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

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	var (
+		db    = g.DB()
+		table = "user"
+	)
+	tx, err := db.Begin()
+	if err != nil {
+		panic(err)
+	}
+	if err = tx.Begin(); err != nil {
+		panic(err)
+	}
+	_, err = tx.Model(table).Data(g.Map{"id": 1, "name": "john"}).Insert()
+	if err = tx.Rollback(); err != nil {
+		panic(err)
+	}
+	_, err = tx.Model(table).Data(g.Map{"id": 2, "name": "smith"}).Insert()
+	if err = tx.Commit(); err != nil {
+		panic(err)
+	}
+}

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

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	var (
+		err   error
+		db    = g.DB()
+		table = "user"
+	)
+	if err = db.Transaction(func(tx *gdb.TX) error {
+		// Nested transaction 1.
+		if err = tx.Transaction(func(tx *gdb.TX) error {
+			_, err = tx.Model(table).Data(g.Map{"id": 1, "name": "john"}).Insert()
+			return err
+		}); err != nil {
+			return err
+		}
+		// Nested transaction 2, panic.
+		if err = tx.Transaction(func(tx *gdb.TX) error {
+			_, err = tx.Model(table).Data(g.Map{"id": 2, "name": "smith"}).Insert()
+			// Create a panic that can make this transaction rollback automatically.
+			panic("error")
+		}); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		panic(err)
+	}
+}

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

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	var (
+		err   error
+		db    = g.DB()
+		table = "user"
+	)
+	tx, err := db.Begin()
+	if err != nil {
+		panic(err)
+	}
+	defer func() {
+		if err := recover(); err != nil {
+			_ = tx.Rollback()
+		}
+	}()
+	if _, err = tx.Model(table).Data(g.Map{"id": 1, "name": "john"}).Insert(); err != nil {
+		panic(err)
+	}
+	if err = tx.SavePoint("MyPoint"); err != nil {
+		panic(err)
+	}
+	if _, err = tx.Model(table).Data(g.Map{"id": 2, "name": "smith"}).Insert(); err != nil {
+		panic(err)
+	}
+	if _, err = tx.Model(table).Data(g.Map{"id": 3, "name": "green"}).Insert(); err != nil {
+		panic(err)
+	}
+	if err = tx.RollbackTo("MyPoint"); err != nil {
+		panic(err)
+	}
+	if err = tx.Commit(); err != nil {
+		panic(err)
+	}
+}

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

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gmeta"
+)
+
+func main() {
+	type UserDetail struct {
+		gmeta.Meta `orm:"table:user_detail"`
+		Uid        int    `json:"uid"`
+		Address    string `json:"address"`
+	}
+
+	type UserScore struct {
+		gmeta.Meta `orm:"table:user_score"`
+		Id         int `json:"id"`
+		Uid        int `json:"uid"`
+		Score      int `json:"score"`
+	}
+
+	type User struct {
+		gmeta.Meta `orm:"table:user"`
+		Id         int          `json:"id"`
+		Name       string       `json:"name"`
+		UserDetail *UserDetail  `orm:"with:uid=id"`
+		UserScores []*UserScore `orm:"with:uid=id"`
+	}
+
+	db := g.DB()
+	db.Transaction(func(tx *gdb.TX) error {
+		for i := 1; i <= 5; i++ {
+			// User.
+			user := User{
+				Name: fmt.Sprintf(`name_%d`, i),
+			}
+			lastInsertId, err := db.Model(user).Data(user).OmitEmpty().InsertAndGetId()
+			if err != nil {
+				return err
+			}
+			// Detail.
+			userDetail := UserDetail{
+				Uid:     int(lastInsertId),
+				Address: fmt.Sprintf(`address_%d`, lastInsertId),
+			}
+			_, err = db.Model(userDetail).Data(userDetail).OmitEmpty().Insert()
+			if err != nil {
+				return err
+			}
+			// Scores.
+			for j := 1; j <= 5; j++ {
+				userScore := UserScore{
+					Uid:   int(lastInsertId),
+					Score: j,
+				}
+				_, err = db.Model(userScore).Data(userScore).OmitEmpty().Insert()
+				if err != nil {
+					return err
+				}
+			}
+		}
+		return nil
+	})
+}

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

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gmeta"
+)
+
+func main() {
+	type UserDetail struct {
+		gmeta.Meta `orm:"table:user_detail"`
+		Uid        int    `json:"uid"`
+		Address    string `json:"address"`
+	}
+
+	type UserScore struct {
+		gmeta.Meta `orm:"table:user_score"`
+		Id         int `json:"id"`
+		Uid        int `json:"uid"`
+		Score      int `json:"score"`
+	}
+
+	type User struct {
+		gmeta.Meta `orm:"table:user"`
+		Id         int          `json:"id"`
+		Name       string       `json:"name"`
+		UserDetail *UserDetail  `orm:"with:uid=id"`
+		UserScores []*UserScore `orm:"with:uid=id"`
+	}
+
+	db := g.DB()
+	var user *User
+	err := db.Model(user).WithAll().Where("id", 3).Scan(&user)
+	if err != nil {
+		panic(err)
+	}
+	g.Dump(user)
+}

.example/database/gredis/gredis.go

@@ -9,10 +9,11 @@ import (
 
 // 使用原生gredis.New操作redis，但是注意需要自己调用Close方法关闭redis链接池
 func main() {
-	redis := gredis.New(gredis.Config{
+	config := &gredis.Config{
 		Host: "127.0.0.1",
 		Port: 6379,
-	})
+	}
+	redis := gredis.New(config)
 	defer redis.Close()
 	redis.Do("SET", "k", "v")
 	v, _ := redis.Do("GET", "k")

.example/i18n/gi18n/gi18n-dir.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/gogf/gf/i18n/gi18n"
@@ -13,6 +14,6 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(t.Translate(`hello`))
-	fmt.Println(t.Translate(`{#hello}{#world}!`))
+	fmt.Println(t.Translate(context.TODO(), `hello`))
+	fmt.Println(t.Translate(context.TODO(), `{#hello}{#world}!`))
 }

.example/i18n/gi18n/gi18n-file.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/gogf/gf/i18n/gi18n"
@@ -13,6 +14,6 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(t.Translate(`hello`))
-	fmt.Println(t.Translate(`{#hello}{#world}!`))
+	fmt.Println(t.Translate(context.TODO(), `hello`))
+	fmt.Println(t.Translate(context.TODO(), `{#hello}{#world}!`))
 }

.example/i18n/gi18n/gi18n.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/i18n/gi18n"
 )
 
 func main() {
@@ -10,6 +12,12 @@ func main() {
 		orderId     = 865271654
 		orderAmount = 99.8
 	)
-	fmt.Println(g.I18n().Tfl(`en`, `{#OrderPaid}`, orderId, orderAmount))
-	fmt.Println(g.I18n().Tfl(`zh-CN`, `{#OrderPaid}`, orderId, orderAmount))
+	fmt.Println(g.I18n().Tf(
+		gi18n.WithLanguage(context.TODO(), `en`),
+		`{#OrderPaid}`, orderId, orderAmount,
+	))
+	fmt.Println(g.I18n().Tf(
+		gi18n.WithLanguage(context.TODO(), `zh-CN`),
+		`{#OrderPaid}`, orderId, orderAmount,
+	))
 }

.example/i18n/gi18n/http_view_i18n.go

@@ -2,15 +2,19 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/i18n/gi18n"
 	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	g.I18n().SetPath("/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/.example/i18n/gi18n/i18n")
 	s := g.Server()
-	s.BindHandler("/", func(r *ghttp.Request) {
-		r.Response.WriteTplContent(`{#hello}{#world}!`, g.Map{
-			"I18nLanguage": r.Get("lang", "zh-CN"),
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.Middleware(func(r *ghttp.Request) {
+			r.SetCtx(gi18n.WithLanguage(r.Context(), r.GetString("lang", "zh-CN")))
+			r.Middleware.Next()
+		})
+		group.ALL("/", func(r *ghttp.Request) {
+			r.Response.WriteTplContent(`{#hello}{#world}!`)
 		})
 	})
 	s.SetPort(8199)

.example/i18n/gi18n/i18n/zh-CN.toml

@@ -1 +1,3 @@
-OrderPaid = "您已成功完成订单号 #%d 支付，支付金额￥%.2f。"
+OrderPaid = "您已成功完成订单号 #%d 支付，支付金额￥%.2f。"
+hello     = "你好"
+world     = "世界"

.example/net/ghttp/client/middleware/client.go

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/gogf/gf/container/garray"
+	"github.com/gogf/gf/crypto/gmd5"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/internal/json"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/util/guid"
+	"github.com/gogf/gf/util/gutil"
+	"io/ioutil"
+	"net/http"
+)
+
+const (
+	appId     = "123"
+	appSecret = "456"
+)
+
+// 注入统一的接口签名参数
+func injectSignature(jsonContent []byte) []byte {
+	var m map[string]interface{}
+	_ = json.Unmarshal(jsonContent, &m)
+	if len(m) > 0 {
+		m["appid"] = appId
+		m["nonce"] = guid.S()
+		m["timestamp"] = gtime.Timestamp()
+		var (
+			keyArray   = garray.NewSortedStrArrayFrom(gutil.Keys(m))
+			sigContent string
+		)
+		keyArray.Iterator(func(k int, v string) bool {
+			sigContent += v
+			sigContent += gconv.String(m[v])
+			return true
+		})
+		m["signature"] = gmd5.MustEncryptString(gmd5.MustEncryptString(sigContent) + appSecret)
+		jsonContent, _ = json.Marshal(m)
+	}
+	return jsonContent
+}
+
+func main() {
+	c := g.Client()
+	c.Use(func(c *ghttp.Client, r *http.Request) (resp *ghttp.ClientResponse, err error) {
+		bodyBytes, _ := ioutil.ReadAll(r.Body)
+		if len(bodyBytes) > 0 {
+			// 注入签名相关参数，修改Request原有的提交参数
+			bodyBytes = injectSignature(bodyBytes)
+			r.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
+			r.ContentLength = int64(len(bodyBytes))
+		}
+		return c.Next(r)
+	})
+	content := c.ContentJson().PostContent("http://127.0.0.1:8199/", g.Map{
+		"name": "goframe",
+		"site": "https://goframe.org",
+	})
+	fmt.Println(content)
+}

.example/net/ghttp/client/middleware/server.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	s := g.Server()
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.ALL("/", func(r *ghttp.Request) {
+			r.Response.Write(r.GetMap())
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/json-xml/test2.go

@@ -25,7 +25,7 @@ func main() {
 		//fmt.Println(r.GetBody())
 		if err := r.Parse(&req); err != nil {
 			// Validation error.
-			if v, ok := err.(*gvalid.Error); ok {
+			if v, ok := err.(gvalid.Error); ok {
 				r.Response.WriteJsonExit(RegisterRes{
 					Code:  1,
 					Error: v.FirstString(),

.example/net/ghttp/server/request/request_validation.go

@@ -18,13 +18,13 @@ func main() {
 	s.Group("/", func(rgroup *ghttp.RouterGroup) {
 		rgroup.ALL("/user", func(r *ghttp.Request) {
 			user := new(User)
-			if err := r.GetToStruct(user); err != nil {
+			if err := r.GetStruct(user); err != nil {
 				r.Response.WriteJsonExit(g.Map{
 					"message": err,
 					"errcode": 1,
 				})
 			}
-			if err := gvalid.CheckStruct(user, nil); err != nil {
+			if err := gvalid.CheckStruct(r.Context(), user, nil); err != nil {
 				r.Response.WriteJsonExit(g.Map{
 					"message": err.Maps(),
 					"errcode": 1,

.example/net/ghttp/server/request/validation/validation2/validation2.go

@@ -24,7 +24,7 @@ func main() {
 		var req *RegisterReq
 		if err := r.Parse(&req); err != nil {
 			// Validation error.
-			if v, ok := err.(*gvalid.Error); ok {
+			if v, ok := err.(gvalid.Error); ok {
 				r.Response.WriteJsonExit(RegisterRes{
 					Code:  1,
 					Error: v.FirstString(),

.example/net/ghttp/server/session/basic/session.go

@@ -8,7 +8,6 @@ import (
 
 func main() {
 	s := g.Server()
-	s.SetSessionCookieMaxAge(0)
 	s.Group("/", func(group *ghttp.RouterGroup) {
 		group.GET("/set", func(r *ghttp.Request) {
 			r.Session.Set("time", gtime.Timestamp())

.example/net/ghttp/server/session/redis/redis_bigint.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gsession"
+)
+
+func main() {
+	type User struct {
+		Id   int64
+		Name string
+	}
+	s := g.Server()
+	s.SetSessionStorage(gsession.NewStorageRedis(g.Redis()))
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.GET("/set", func(r *ghttp.Request) {
+			user := &User{
+				Id:   1265476890672672808,
+				Name: "john",
+			}
+			if err := r.Session.Set("user", user); err != nil {
+				panic(err)
+			}
+			r.Response.Write("ok")
+		})
+		group.GET("/get", func(r *ghttp.Request) {
+			r.Response.WriteJson(r.Session.Get("user"))
+		})
+		group.GET("/clear", func(r *ghttp.Request) {
+			r.Session.Clear()
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/os/gproc/signal/signal_handler.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+)
+
+func signalHandlerForMQ() {
+	var (
+		sig          os.Signal
+		receivedChan = make(chan os.Signal)
+	)
+	signal.Notify(
+		receivedChan,
+		syscall.SIGINT,
+		syscall.SIGQUIT,
+		syscall.SIGKILL,
+		syscall.SIGTERM,
+		syscall.SIGABRT,
+	)
+	for {
+		sig = <-receivedChan
+		fmt.Println("MQ is shutting down due to signal:", sig.String())
+		time.Sleep(time.Second)
+		fmt.Println("MQ is shut down smoothly")
+		return
+	}
+}
+
+func main() {
+	fmt.Println("Process start, pid:", os.Getpid())
+	go signalHandlerForMQ()
+
+	var (
+		sig          os.Signal
+		receivedChan = make(chan os.Signal)
+	)
+	signal.Notify(
+		receivedChan,
+		syscall.SIGINT,
+		syscall.SIGQUIT,
+		syscall.SIGKILL,
+		syscall.SIGTERM,
+		syscall.SIGABRT,
+	)
+	for {
+		sig = <-receivedChan
+		fmt.Println("MainProcess is shutting down due to signal:", sig.String())
+		return
+	}
+}

.example/os/gproc/signal/signal_handler_gproc.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/os/gproc"
+	"os"
+	"time"
+)
+
+func signalHandlerForMQ(sig os.Signal) {
+	fmt.Println("MQ is shutting down due to signal:", sig.String())
+	time.Sleep(time.Second)
+	fmt.Println("MQ is shut down smoothly")
+}
+
+func signalHandlerForMain(sig os.Signal) {
+	fmt.Println("MainProcess is shutting down due to signal:", sig.String())
+}
+
+func main() {
+	fmt.Println("Process start, pid:", os.Getpid())
+	gproc.AddSigHandlerShutdown(
+		signalHandlerForMQ,
+		signalHandlerForMain,
+	)
+	gproc.Listen()
+}

.example/util/gvalid/config.toml

@@ -0,0 +1,14 @@
+
+
+
+# MySQL.
+[database]
+    [database.default]
+        link   = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
+        debug  = true
+
+
+
+
+
+

.example/util/gvalid/gvalid.go

@@ -1,31 +1,32 @@
 package main
 
 import (
+	"context"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
 
 func main() {
 	//rule := "length:6,16"
-	//if m := gvalid.Check("123456", rule, nil);  m != nil {
+	//if m := gvalid.Check(context.TODO(), "123456", rule, nil);  m != nil {
 	//    fmt.Println(m)
 	//}
-	//if m := gvalid.Check("12345", rule, nil);  m != nil {
+	//if m := gvalid.Check(context.TODO(), "12345", rule, nil);  m != nil {
 	//    fmt.Println(m)
 	//    // map[length:字段长度为6到16个字符]
 	//}
 
 	//rule := "integer|between:6,16"
 	//msgs := "请输入一个整数|参数大小不对啊老铁"
-	//fmt.Println(gvalid.Check("5.66", rule, msgs))
+	//fmt.Println(gvalid.Check(context.TODO(), "5.66", rule, msgs))
 	//// map[integer:请输入一个整数 between:参数大小不对啊老铁]
 
 	//// 参数长度至少为6个数字或者6个字母，但是总长度不能超过16个字符
 	//rule := `regex:\d{6,}|\D{6,}|max-length:16`
-	//if m := gvalid.Check("123456", rule, nil);  m != nil {
+	//if m := gvalid.Check(context.TODO(), "123456", rule, nil);  m != nil {
 	//    fmt.Println(m)
 	//}
-	//if m := gvalid.Check("abcde6", rule, nil);  m != nil {
+	//if m := gvalid.Check(context.TODO(), "abcde6", rule, nil);  m != nil {
 	//    fmt.Println(m)
 	//    // map[regex:字段值不合法]
 	//}
@@ -40,18 +41,20 @@ func main() {
 	//    "password"  : "required|length:6,16|same:password2",
 	//    "password2" : "required|length:6,16",
 	//}
-	//fmt.Println(gvalid.CheckMap(params, rules))
+	//fmt.Println(gvalid.CheckMap(context.TODO(), params, rules))
 	//// map[passport:map[length:字段长度为6到16个字符] password:map[same:字段值不合法]]
 
 	params := map[string]interface{}{
 		"passport":  "john",
 		"password":  "123456",
 		"password2": "1234567",
+		"name":      "gf",
 	}
 	rules := map[string]string{
 		"passport":  "required|length:6,16",
 		"password":  "required|length:6,16|same:password2",
 		"password2": "required|length:6,16",
+		"name":      "size:5",
 	}
 	msgs := map[string]interface{}{
 		"passport": "账号不能为空|账号长度应当在:min到:max之间",
@@ -59,8 +62,9 @@ func main() {
 			"required": "密码不能为空",
 			"same":     "两次密码输入不相等",
 		},
+		"name": "名字长度必须为:size",
 	}
-	if e := gvalid.CheckMap(params, rules, msgs); e != nil {
+	if e := gvalid.CheckMap(context.TODO(), params, rules, msgs); e != nil {
 		g.Dump(e.Maps())
 	}
 	// map[passport:map[length:账号长度应当在6到16之间] password:map[same:两次密码输入不相等]]

.example/util/gvalid/gvalid_checkstructwithdata.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"context"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
+	"github.com/gogf/gf/util/gvalid"
+)
+
+func main() {
+	type User struct {
+		Name string `v:"required#请输入用户姓名"`
+		Type int    `v:"required#请选择用户类型"`
+	}
+	data := g.Map{
+		"name": "john",
+	}
+	user := User{}
+	if err := gconv.Scan(data, &user); err != nil {
+		panic(err)
+	}
+	err := gvalid.CheckStructWithData(context.TODO(), user, data, nil)
+	// 也可以使用
+	// err := g.Validator().Data(data).CheckStruct(user)
+	if err != nil {
+		g.Dump(err.Items())
+	}
+}

.example/util/gvalid/gvalid_custom_message.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
@@ -8,6 +9,6 @@ import (
 
 func main() {
 	g.I18n().SetLanguage("cn")
-	err := gvalid.Check("", "required", nil)
+	err := gvalid.Check(context.TODO(), "", "required", nil)
 	fmt.Println(err.String())
 }

.example/util/gvalid/gvalid_error.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
@@ -17,7 +18,7 @@ func main() {
 		ConfiemPassword: "",
 	}
 
-	e := gvalid.CheckStruct(user, nil)
+	e := gvalid.CheckStruct(context.TODO(), user, nil)
 	g.Dump(e.Map())
 	g.Dump(e.Maps())
 	g.Dump(e.String())

.example/util/gvalid/gvalid_i18n.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"context"
+
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/i18n/gi18n"
+	"github.com/gogf/gf/util/gconv"
+)
+
+func main() {
+	type User struct {
+		Name    string `v:"required#ReuiredUserName"`
+		Type    int    `v:"required#ReuiredUserType"`
+		Project string `v:"size:10#MustSize"`
+	}
+	var (
+		data = g.Map{
+			"name":    "john",
+			"project": "gf",
+		}
+		user  = User{}
+		ctxEn = gi18n.WithLanguage(context.TODO(), "en")
+		ctxCh = gi18n.WithLanguage(context.TODO(), "zh-CN")
+	)
+
+	if err := gconv.Scan(data, &user); err != nil {
+		panic(err)
+	}
+	// 英文
+	if err := g.Validator().Ctx(ctxEn).Data(data).CheckStruct(user); err != nil {
+		g.Dump(err.String())
+	}
+	// 中文
+	if err := g.Validator().Ctx(ctxCh).Data(data).CheckStruct(user); err != nil {
+		g.Dump(err.String())
+	}
+}

.example/util/gvalid/gvalid_result.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
@@ -18,7 +19,7 @@ func main() {
 		Pass2: "123",
 	}
 
-	e := gvalid.CheckStruct(user, nil)
+	e := gvalid.CheckStruct(context.TODO(), user, nil)
 	g.Dump(e.String())
 	g.Dump(e.FirstString())
 }

.example/util/gvalid/gvalid_sequence.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/gogf/gf/util/gvalid"
@@ -17,7 +18,7 @@ func main() {
 		"password@required|length:6,16|same:password2#密码不能为空}|两次密码输入不相等",
 		"password2@required|length:6,16#",
 	}
-	if e := gvalid.CheckMap(params, rules); e != nil {
+	if e := gvalid.CheckMap(context.TODO(), params, rules); e != nil {
 		fmt.Println(e.Map())
 		fmt.Println(e.FirstItem())
 		fmt.Println(e.FirstString())

.example/util/gvalid/gvalid_struct1.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
@@ -20,7 +21,7 @@ func main() {
 	}
 
 	// 使用结构体定义的校验规则和错误提示进行校验
-	g.Dump(gvalid.CheckStruct(user, nil).Map())
+	g.Dump(gvalid.CheckStruct(context.TODO(), user, nil).Map())
 
 	// 自定义校验规则和错误提示，对定义的特定校验规则和错误提示进行覆盖
 	rules := map[string]string{
@@ -31,5 +32,5 @@ func main() {
 			"password3": "名称不能为空",
 		},
 	}
-	g.Dump(gvalid.CheckStruct(user, rules, msgs).Map())
+	g.Dump(gvalid.CheckStruct(context.TODO(), user, rules, msgs).Map())
 }

.example/util/gvalid/gvalid_struct2.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
@@ -13,5 +14,5 @@ func main() {
 
 	user := &User{}
 
-	g.Dump(gvalid.CheckStruct(user, nil))
+	g.Dump(gvalid.CheckStruct(context.TODO(), user, nil))
 }

.example/util/gvalid/gvalid_struct3.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
@@ -15,5 +16,5 @@ func main() {
 		Pass: "1",
 	}
 
-	g.Dump(gvalid.CheckStruct(user, nil).Maps())
+	g.Dump(gvalid.CheckStruct(context.TODO(), user, nil).Maps())
 }

.example/util/gvalid/gvalid_struct_meta.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"github.com/gogf/gf/errors/gerror"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gmeta"
+)
+
+type UserCreateReq struct {
+	gmeta.Meta `v:"UserCreateReq"`
+	Name       string
+	Pass       string
+}
+
+func UserCreateReqChecker(ctx context.Context, rule string, value interface{}, message string, data interface{}) error {
+	user := &UserCreateReq{}
+	if v, ok := data.(*UserCreateReq); ok {
+		user = v
+	}
+	// SELECT COUNT(*) FROM `user` WHERE `name` = xxx
+	count, err := g.Model("user").Ctx(ctx).Where("name", user.Name).Count()
+	if err != nil {
+		return err
+	}
+	if count > 0 {
+		return gerror.Newf(`The name "%s" is already token`, user.Name)
+	}
+	return nil
+}
+
+func main() {
+	user := &UserCreateReq{
+		Name: "john",
+		Pass: "123456",
+	}
+	err := g.Validator().RuleFunc("UserCreateReq", UserCreateReqChecker).CheckStruct(user)
+	fmt.Println(err)
+}

.example/util/gvalid/i18n/cn.toml

@@ -1,14 +0,0 @@
-
-
-"gf.gvalid.required" = "字段不能为空"
-
-
-
-
-
-
-
-
-
-
-

.example/util/gvalid/i18n/en.toml

@@ -0,0 +1,7 @@
+"gf.gvalid.required" = "字段不能为空"
+
+
+"ReuiredUserName" = "Please input user name"
+"ReuiredUserType" = "Please select user type"
+"MustSize"        = "Size of :attribute must be :size"
+

.example/util/gvalid/i18n/zh-CN.toml

@@ -0,0 +1,16 @@
+
+
+"gf.gvalid.required" = "字段不能为空"
+
+"ReuiredUserName" = "请输入用户名称"
+"ReuiredUserType" = "请选择用户类型"
+"MustSize"        = ":attribute长度必须为:size"
+
+
+
+
+
+
+
+
+

.gitignore

@@ -14,5 +14,4 @@ bin/
 cbuild
 **/.DS_Store
 .vscode/
-go.sum
 .example/other/

.travis.yml

@@ -4,11 +4,9 @@ arch: arm64-graviton2
 language: go
 
 go:
-  - "1.11.x"
-  - "1.12.x"
-  - "1.13.x"
   - "1.14.x"
   - "1.15.x"
+  - "1.16.x"
 
 branches:
   only:

README.MD

@@ -1,7 +1,7 @@
 # GoFrame
 
 [![Go Doc](https://godoc.org/github.com/gogf/gf?status.svg)](https://godoc.org/github.com/gogf/gf)
-[![Build Status](https://travis-ci.org/gogf/gf.svg?branch=master)](https://travis-ci.org/gogf/gf)
+[![Build Status](https://travis-ci.com/gogf/gf.svg?branch=master)](https://travis-ci.org/gogf/gf)
 [![Go Report](https://goreportcard.com/badge/github.com/gogf/gf?v=1)](https://goreportcard.com/report/github.com/gogf/gf)
 [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf/branch/master)
 [![Production Ready](https://img.shields.io/badge/production-ready-blue.svg)](https://github.com/gogf/gf)
@@ -9,11 +9,8 @@
 
 English | [简体中文](README_ZH.MD)
 
-`GF(GoFrame)` is a modular, powerful, high-performance and enterprise-class application development framework 
-of Golang. Providing a series of core components and dozens of practical modules, such as: 
-cache, logging, containers, timer, resource, validator, database orm, etc. 
-Supporting web server integrated with router, cookie, session, middleware, logger, configure, 
-template, https, hooks, rewrites and many more features. 
+`GoFrame` is a modular, powerful, high-performance and enterprise-class application development framework 
+of Golang. 
 
 > If you're a newbie to `Go`, you may consider `GoFrame` easy and great as `Laravel` in `PHP`, `SpringBoot` in `Java` or `Django` in `Python`.
 
@@ -33,7 +30,7 @@ golang version >= 1.11
 
 # Architecture
 <div align=center>
-<img src="https://itician.org/download/attachments/1114119/arch.png"/>
+<img src="https://goframe.org/download/attachments/1114119/arch.png"/>
 </div>
 
 # Packages
@@ -53,17 +50,10 @@ The `Web` component performance of `GoFrame`, please refer to third-party projec
 
 # Documentation
 
-* 中文官网: https://goframe.org
-* GoDoc API: https://godoc.org/github.com/gogf/gf
+* 中文官网: [https://goframe.org](https://goframe.org/display/gf)
+* GoDoc API: [https://pkg.go.dev/github.com/gogf/gf](https://pkg.go.dev/github.com/gogf/gf)
 
 
-# Discussion
-- QQ Group：[116707870](//shang.qq.com/wpa/qunwpa?idkey=195f91eceeb5d7fa76009b7cd5a4641f70bf4897b7f5a520635eb26ff17adfe7)
-- WX Group：Add friend`389961817` in WeChat, commenting `GF`
-- Issues：https://github.com/gogf/gf/issues
-
-> It's recommended learning `GoFrame` through its awesome source codes and API reference.
-
 # License
 
 `GF` is licensed under the [MIT License](LICENSE), 100% free and open-source, forever.
@@ -80,7 +70,7 @@ The `Web` component performance of `GoFrame`, please refer to third-party projec
 - [XiMaLaYa](https://www.ximalaya.com)
 - [ZYBang](https://www.zybang.com/)
 
-> We list part of the users here, if your company or products are using `GoFrame`, please let us know [here](https://itician.org/pages/viewpage.action?pageId=1114415).
+> We list part of the users here, if your company or products are using `GoFrame`, please let us know [here](https://goframe.org/pages/viewpage.action?pageId=1114415).
 
 
 # Contributors
@@ -90,7 +80,7 @@ This project exists thanks to all the people who contribute. [[Contributors](htt
 
 # Donators
 
-If you love `GF`, why not [buy developer a cup of coffee](https://itician.org/pages/viewpage.action?pageId=1115633)?
+If you love `GF`, why not [buy developer a cup of coffee](https://goframe.org/pages/viewpage.action?pageId=1115633)?
 
 # Sponsors
 We appreciate any kind of sponsorship for `GF` development. If you've got some interesting, please contact WeChat `389961817` / Email `john@goframe.org`.
@@ -98,8 +88,8 @@ We appreciate any kind of sponsorship for `GF` development. If you've got some i
 
 
 # Thanks
-<a href="https://www.jetbrains.com/?from=GoFrame"><img src="https://itician.org/download/thumbnails/1114119/jetbrains.png?version=1&modificationDate=1608649325806&api=v2" height="120" alt="JetBrains"/></a>
-<a href="https://www.atlassian.com/?from=GoFrame"><img src="https://itician.org/download/thumbnails/1114119/u%3D605052180%2C3099422872%26fm%3D11%26gp%3D0.jpg?version=1&modificationDate=1608649343601&api=v2" height="120" alt="Atlassian"/></a>
+<a href="https://www.jetbrains.com/?from=GoFrame"><img src="https://goframe.org/download/thumbnails/1114119/jetbrains.png" height="120" alt="JetBrains"/></a>
+<a href="https://www.atlassian.com/?from=GoFrame"><img src="https://goframe.org/download/attachments/1114119/atlassian.jpg" height="120" alt="Atlassian"/></a>
 
 
 

README_ZH.MD

@@ -1,6 +1,6 @@
 # GoFrame
 [![Go Doc](https://godoc.org/github.com/gogf/gf?status.svg)](https://godoc.org/github.com/gogf/gf) 
-[![Build Status](https://travis-ci.org/gogf/gf.svg?branch=master)](https://travis-ci.org/gogf/gf) 
+[![Build Status](https://travis-ci.com/gogf/gf.svg?branch=master)](https://travis-ci.org/gogf/gf) 
 [![Go Report](https://goreportcard.com/badge/github.com/gogf/gf?v=1)](https://goreportcard.com/report/github.com/gogf/gf)
 [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf/branch/master)
 [![Production Ready](https://img.shields.io/badge/production-ready-blue.svg)](https://github.com/gogf/gf)
@@ -8,24 +8,21 @@
 
 [English](README.MD) | 简体中文
 
-`GF(Go Frame)`是一款模块化、高性能、企业级的Go基础开发框架。
-实现了比较完善的基础设施建设以及开发工具链，提供了常用的基础开发模块，
-如：缓存、日志、队列、数组、集合、容器、定时器、命令行、内存锁、对象池、
-配置管理、资源管理、数据校验、数据编码、定时任务、数据库ORM、TCP/UDP组件、进程管理/通信等等。
-并提供了Web服务开发的系列核心组件，如：Router、Cookie、Session、Middleware、服务注册、模板引擎等等，
-支持热重启、热更新、域名绑定、TLS/HTTPS、Rewrite等特性。
+`GoFrame`是一款模块化、高性能、企业级的Go基础开发框架。
 
 > 如果您初识`Go`语言，您可以将`GoFrame`类似于`PHP`中的`Laravel`, `Java`中的`SpringBoot`或者`Python`中的`Django`。
 
 # 特点
-* 模块化、松耦合设计；
-* 模块丰富、开箱即用；
-* 简便易用、易于维护；
-* 高代码质量、高单元测试覆盖率；
-* 社区活跃，大牛谦逊低调脾气好；
-* 详尽的开发文档及示例；
-* 完善的本地中文化支持；
-* 设计为团队及企业使用；
+*   模块化、松耦合
+*   模块丰富、开箱即用
+*   简洁易用、快速接入
+*   文档详尽、易于维护
+*   自顶向下、体系化设计
+*   统一框架、统一组件、降低选择成本
+*   开发规范、设计模式、代码分层模型
+*   强大便捷的开发工具链
+*   完善的本地中文化支持
+*   设计为团队及企业使用
 
 # 地址
 - **主库**：https://github.com/gogf/gf 
@@ -49,7 +46,7 @@ golang版本 >= 1.11
 
 # 架构
 <div align=center>
-<img src="https://itician.org/download/attachments/1114119/arch.png"/>
+<img src="https://goframe.org/download/attachments/1114119/arch.png"/>
 </div>
 
 # 模块
@@ -68,16 +65,10 @@ golang版本 >= 1.11
 
 # 文档
 
-开发文档：https://goframe.org
+官方站点：[https://goframe.org](https://goframe.org/display/gf)
 
-接口文档：https://godoc.org/github.com/gogf/gf
+接口文档：[https://pkg.go.dev/github.com/gogf/gf](https://pkg.go.dev/github.com/gogf/gf)
 
-# 帮助
-- QQ交流群：[116707870](//shang.qq.com/wpa/qunwpa?idkey=195f91eceeb5d7fa76009b7cd5a4641f70bf4897b7f5a520635eb26ff17adfe7)
-- WX交流群：微信添加`389961817`备注`GF`
-- 主库ISSUE：https://github.com/gogf/gf/issues
-
-> 建议通过阅读`GoFrame`的源码以及API文档深度学习`GoFrame`，了解更多的精妙设计。
 
 # 协议
 
@@ -86,7 +77,7 @@ golang版本 >= 1.11
 # 用户
 
 - [腾讯科技](https://www.tencent.com/)
-- [中兴科技](https://www.zte.com.cn/china/)
+- [中兴通讯](https://www.zte.com.cn/china/)
 - [蚂蚁金服](https://www.antfin.com/)
 - [医联科技](https://www.medlinker.com/)
 - [库币科技](https://www.kucoin.io/)
@@ -95,7 +86,7 @@ golang版本 >= 1.11
 - [喜马拉雅](https://www.ximalaya.com)
 - [作业帮](https://www.zybang.com/)
 
-> 在这里只列举了部分知名的用户，如果您的企业或者产品正在使用`GoFrame`，欢迎到 [这里](https://itician.org/pages/viewpage.action?pageId=1114415) 留言。
+> 在这里只列举了部分知名的用户，如果您的企业或者产品正在使用`GoFrame`，欢迎到 [这里](https://goframe.org/pages/viewpage.action?pageId=1114415) 留言。
 
 # 贡献
 
@@ -105,7 +96,7 @@ golang版本 >= 1.11
 
 # 捐赠
 
-如果您喜欢`GF`，要不给开发者 [来杯咖啡](https://itician.org/pages/viewpage.action?pageId=1115633) 吧！
+如果您喜欢`GF`，要不给开发者 [来杯咖啡](https://goframe.org/pages/viewpage.action?pageId=1115633) 吧！
 请在捐赠时备注您的`github`/`gitee`账号名称。
 
 # 赞助
@@ -113,5 +104,6 @@ golang版本 >= 1.11
 赞助支持`GF`框架的快速研发，如果您感兴趣，请联系 微信 `389961817` / 邮件 `john@goframe.org`。
 
 # 感谢
-<a href="https://www.jetbrains.com/?from=GoFrame"><img src="https://itician.org/download/thumbnails/1114119/jetbrains.png?version=1&modificationDate=1608649325806&api=v2" height="120" alt="JetBrains"/></a>
-<a href="https://www.atlassian.com/?from=GoFrame"><img src="https://itician.org/download/thumbnails/1114119/u%3D605052180%2C3099422872%26fm%3D11%26gp%3D0.jpg?version=1&modificationDate=1608649343601&api=v2" height="120" alt="Atlassian"/></a>
+<a href="https://www.jetbrains.com/?from=GoFrame"><img src="https://goframe.org/download/thumbnails/1114119/jetbrains.png" height="120" alt="JetBrains"/></a>
+<a href="https://www.atlassian.com/?from=GoFrame"><img src="https://goframe.org/download/attachments/1114119/atlassian.jpg" height="120" alt="Atlassian"/></a>
+

container/garray/garray_normal_any.go

@@ -736,7 +736,7 @@ func (a *Array) UnmarshalJSON(b []byte) error {
 	}
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	if err := json.Unmarshal(b, &a.array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &a.array); err != nil {
 		return err
 	}
 	return nil
@@ -748,7 +748,7 @@ func (a *Array) UnmarshalValue(value interface{}) error {
 	defer a.mu.Unlock()
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &a.array)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &a.array)
 	default:
 		a.array = gconv.SliceAny(value)
 	}

container/garray/garray_normal_int.go

@@ -735,7 +735,7 @@ func (a *IntArray) UnmarshalJSON(b []byte) error {
 	}
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	if err := json.Unmarshal(b, &a.array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &a.array); err != nil {
 		return err
 	}
 	return nil
@@ -747,7 +747,7 @@ func (a *IntArray) UnmarshalValue(value interface{}) error {
 	defer a.mu.Unlock()
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &a.array)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &a.array)
 	default:
 		a.array = gconv.SliceInt(value)
 	}

container/garray/garray_normal_str.go

@@ -750,7 +750,7 @@ func (a *StrArray) UnmarshalJSON(b []byte) error {
 	}
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	if err := json.Unmarshal(b, &a.array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &a.array); err != nil {
 		return err
 	}
 	return nil
@@ -762,7 +762,7 @@ func (a *StrArray) UnmarshalValue(value interface{}) error {
 	defer a.mu.Unlock()
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &a.array)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &a.array)
 	default:
 		a.array = gconv.SliceStr(value)
 	}

container/garray/garray_sorted_any.go

@@ -685,7 +685,7 @@ func (a *SortedArray) UnmarshalJSON(b []byte) error {
 	}
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	if err := json.Unmarshal(b, &a.array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &a.array); err != nil {
 		return err
 	}
 	if a.comparator != nil && a.array != nil {
@@ -706,7 +706,7 @@ func (a *SortedArray) UnmarshalValue(value interface{}) (err error) {
 	defer a.mu.Unlock()
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &a.array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &a.array)
 	default:
 		a.array = gconv.SliceAny(value)
 	}

container/garray/garray_sorted_int.go

@@ -658,7 +658,7 @@ func (a *SortedIntArray) UnmarshalJSON(b []byte) error {
 	}
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	if err := json.Unmarshal(b, &a.array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &a.array); err != nil {
 		return err
 	}
 	if a.array != nil {
@@ -676,7 +676,7 @@ func (a *SortedIntArray) UnmarshalValue(value interface{}) (err error) {
 	defer a.mu.Unlock()
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &a.array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &a.array)
 	default:
 		a.array = gconv.SliceInt(value)
 	}

container/garray/garray_sorted_str.go

@@ -671,7 +671,7 @@ func (a *SortedStrArray) UnmarshalJSON(b []byte) error {
 	}
 	a.mu.Lock()
 	defer a.mu.Unlock()
-	if err := json.Unmarshal(b, &a.array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &a.array); err != nil {
 		return err
 	}
 	if a.array != nil {
@@ -689,7 +689,7 @@ func (a *SortedStrArray) UnmarshalValue(value interface{}) (err error) {
 	defer a.mu.Unlock()
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &a.array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &a.array)
 	default:
 		a.array = gconv.SliceStr(value)
 	}

container/garray/garray_z_unit_normal_any_array_test.go

@@ -570,12 +570,12 @@ func TestArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.New()
-		err2 = json.Unmarshal(b2, &a2)
+		err2 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(err2, nil)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.Array
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -589,12 +589,12 @@ func TestArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.New()
-		err2 = json.Unmarshal(b2, &a2)
+		err2 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(err2, nil)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.Array
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -612,7 +612,7 @@ func TestArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, data["Scores"])
@@ -631,7 +631,7 @@ func TestArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, data["Scores"])

container/garray/garray_z_unit_normal_int_array_test.go

@@ -615,11 +615,11 @@ func TestIntArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewIntArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.IntArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -633,11 +633,11 @@ func TestIntArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewIntArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.IntArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -655,7 +655,7 @@ func TestIntArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, data["Scores"])
@@ -674,7 +674,7 @@ func TestIntArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, data["Scores"])

container/garray/garray_z_unit_normal_str_array_test.go

@@ -614,11 +614,11 @@ func TestStrArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewStrArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.StrArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -632,11 +632,11 @@ func TestStrArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewStrArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.StrArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -654,7 +654,7 @@ func TestStrArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, data["Scores"])
@@ -673,7 +673,7 @@ func TestStrArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, data["Scores"])

container/garray/garray_z_unit_sorted_any_array_test.go

@@ -656,11 +656,11 @@ func TestSortedArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewSortedArray(gutil.ComparatorString)
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 		t.Assert(a3.Interfaces(), s1)
@@ -676,11 +676,11 @@ func TestSortedArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewSortedArray(gutil.ComparatorString)
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 		t.Assert(a3.Interfaces(), s1)
@@ -699,7 +699,7 @@ func TestSortedArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.AssertNE(user.Scores, nil)
@@ -735,7 +735,7 @@ func TestSortedArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.AssertNE(user.Scores, nil)

container/garray/garray_z_unit_sorted_int_array_test.go

@@ -557,11 +557,11 @@ func TestSortedIntArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewSortedIntArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedIntArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -576,11 +576,11 @@ func TestSortedIntArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewSortedIntArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedIntArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 	})
@@ -598,7 +598,7 @@ func TestSortedIntArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, []int{98, 99, 100})
@@ -617,7 +617,7 @@ func TestSortedIntArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, []int{98, 99, 100})

container/garray/garray_z_unit_sorted_str_array_test.go

@@ -577,12 +577,12 @@ func TestSortedStrArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewSortedStrArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s2)
 		t.Assert(a2.Interfaces(), s2)
 
 		var a3 garray.SortedStrArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 		t.Assert(a3.Interfaces(), s1)
@@ -598,12 +598,12 @@ func TestSortedStrArray_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := garray.NewSortedStrArray()
-		err1 = json.Unmarshal(b2, &a2)
+		err1 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(a2.Slice(), s2)
 		t.Assert(a2.Interfaces(), s2)
 
 		var a3 garray.SortedStrArray
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Slice(), s1)
 		t.Assert(a3.Interfaces(), s1)
@@ -622,7 +622,7 @@ func TestSortedStrArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, []string{"A", "A", "A+"})
@@ -641,7 +641,7 @@ func TestSortedStrArray_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		user := new(User)
-		err = json.Unmarshal(b, user)
+		err = json.UnmarshalUseNumber(b, user)
 		t.Assert(err, nil)
 		t.Assert(user.Name, data["Name"])
 		t.Assert(user.Scores, []string{"A", "A", "A+"})

container/glist/glist.go

@@ -519,7 +519,7 @@ func (l *List) UnmarshalJSON(b []byte) error {
 		l.list = list.New()
 	}
 	var array []interface{}
-	if err := json.Unmarshal(b, &array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &array); err != nil {
 		return err
 	}
 	l.PushBacks(array)
@@ -536,7 +536,7 @@ func (l *List) UnmarshalValue(value interface{}) (err error) {
 	var array []interface{}
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &array)
 	default:
 		array = gconv.SliceAny(value)
 	}

container/glist/glist_z_unit_test.go

@@ -711,7 +711,7 @@ func TestList_Json(t *testing.T) {
 		b, err := json.Marshal(a)
 		t.Assert(err, nil)
 
-		err = json.Unmarshal(b, l)
+		err = json.UnmarshalUseNumber(b, l)
 		t.Assert(err, nil)
 		t.Assert(l.FrontAll(), a)
 	})
@@ -721,7 +721,7 @@ func TestList_Json(t *testing.T) {
 		b, err := json.Marshal(a)
 		t.Assert(err, nil)
 
-		err = json.Unmarshal(b, &l)
+		err = json.UnmarshalUseNumber(b, &l)
 		t.Assert(err, nil)
 		t.Assert(l.FrontAll(), a)
 	})

container/gmap/gmap_hash_any_any_map.go

@@ -476,7 +476,7 @@ func (m *AnyAnyMap) UnmarshalJSON(b []byte) error {
 		m.data = make(map[interface{}]interface{})
 	}
 	var data map[string]interface{}
-	if err := json.Unmarshal(b, &data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &data); err != nil {
 		return err
 	}
 	for k, v := range data {

container/gmap/gmap_hash_int_any_map.go

@@ -475,7 +475,7 @@ func (m *IntAnyMap) UnmarshalJSON(b []byte) error {
 	if m.data == nil {
 		m.data = make(map[int]interface{})
 	}
-	if err := json.Unmarshal(b, &m.data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &m.data); err != nil {
 		return err
 	}
 	return nil
@@ -490,7 +490,7 @@ func (m *IntAnyMap) UnmarshalValue(value interface{}) (err error) {
 	}
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &m.data)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &m.data)
 	default:
 		for k, v := range gconv.Map(value) {
 			m.data[gconv.Int(k)] = v

container/gmap/gmap_hash_int_int_map.go

@@ -446,7 +446,7 @@ func (m *IntIntMap) UnmarshalJSON(b []byte) error {
 	if m.data == nil {
 		m.data = make(map[int]int)
 	}
-	if err := json.Unmarshal(b, &m.data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &m.data); err != nil {
 		return err
 	}
 	return nil
@@ -461,7 +461,7 @@ func (m *IntIntMap) UnmarshalValue(value interface{}) (err error) {
 	}
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &m.data)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &m.data)
 	default:
 		for k, v := range gconv.Map(value) {
 			m.data[gconv.Int(k)] = gconv.Int(v)

container/gmap/gmap_hash_int_str_map.go

@@ -446,7 +446,7 @@ func (m *IntStrMap) UnmarshalJSON(b []byte) error {
 	if m.data == nil {
 		m.data = make(map[int]string)
 	}
-	if err := json.Unmarshal(b, &m.data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &m.data); err != nil {
 		return err
 	}
 	return nil
@@ -461,7 +461,7 @@ func (m *IntStrMap) UnmarshalValue(value interface{}) (err error) {
 	}
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &m.data)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &m.data)
 	default:
 		for k, v := range gconv.Map(value) {
 			m.data[gconv.Int(k)] = gconv.String(v)

container/gmap/gmap_hash_str_any_map.go

@@ -471,7 +471,7 @@ func (m *StrAnyMap) UnmarshalJSON(b []byte) error {
 	if m.data == nil {
 		m.data = make(map[string]interface{})
 	}
-	if err := json.Unmarshal(b, &m.data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &m.data); err != nil {
 		return err
 	}
 	return nil

container/gmap/gmap_hash_str_int_map.go

@@ -449,7 +449,7 @@ func (m *StrIntMap) UnmarshalJSON(b []byte) error {
 	if m.data == nil {
 		m.data = make(map[string]int)
 	}
-	if err := json.Unmarshal(b, &m.data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &m.data); err != nil {
 		return err
 	}
 	return nil
@@ -464,7 +464,7 @@ func (m *StrIntMap) UnmarshalValue(value interface{}) (err error) {
 	}
 	switch value.(type) {
 	case string, []byte:
-		return json.Unmarshal(gconv.Bytes(value), &m.data)
+		return json.UnmarshalUseNumber(gconv.Bytes(value), &m.data)
 	default:
 		for k, v := range gconv.Map(value) {
 			m.data[k] = gconv.Int(v)

container/gmap/gmap_hash_str_str_map.go

@@ -449,7 +449,7 @@ func (m *StrStrMap) UnmarshalJSON(b []byte) error {
 	if m.data == nil {
 		m.data = make(map[string]string)
 	}
-	if err := json.Unmarshal(b, &m.data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &m.data); err != nil {
 		return err
 	}
 	return nil

container/gmap/gmap_list_map.go

@@ -530,7 +530,7 @@ func (m *ListMap) UnmarshalJSON(b []byte) error {
 		m.list = glist.New()
 	}
 	var data map[string]interface{}
-	if err := json.Unmarshal(b, &data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &data); err != nil {
 		return err
 	}
 	for key, value := range data {

container/gmap/gmap_z_unit_any_any_test.go

@@ -255,7 +255,7 @@ func Test_AnyAnyMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.New()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])
@@ -269,7 +269,7 @@ func Test_AnyAnyMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		var m gmap.Map
-		err = json.Unmarshal(b, &m)
+		err = json.UnmarshalUseNumber(b, &m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])

container/gmap/gmap_z_unit_int_any_test.go

@@ -245,7 +245,7 @@ func Test_IntAnyMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewIntAnyMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get(1), data[1])
 		t.Assert(m.Get(2), data[2])

container/gmap/gmap_z_unit_int_int_test.go

@@ -251,7 +251,7 @@ func Test_IntIntMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewIntIntMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get(1), data[1])
 		t.Assert(m.Get(2), data[2])

container/gmap/gmap_z_unit_int_str_test.go

@@ -249,7 +249,7 @@ func Test_IntStrMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewIntStrMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get(1), data[1])
 		t.Assert(m.Get(2), data[2])

container/gmap/gmap_z_unit_list_map_test.go

@@ -204,7 +204,7 @@ func Test_ListMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewListMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])
@@ -219,7 +219,7 @@ func Test_ListMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		var m gmap.ListMap
-		err = json.Unmarshal(b, &m)
+		err = json.UnmarshalUseNumber(b, &m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])

container/gmap/gmap_z_unit_str_any_test.go

@@ -243,7 +243,7 @@ func Test_StrAnyMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewStrAnyMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])
@@ -257,7 +257,7 @@ func Test_StrAnyMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		var m gmap.StrAnyMap
-		err = json.Unmarshal(b, &m)
+		err = json.UnmarshalUseNumber(b, &m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])

container/gmap/gmap_z_unit_str_int_test.go

@@ -247,7 +247,7 @@ func Test_StrIntMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewStrIntMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])
@@ -261,7 +261,7 @@ func Test_StrIntMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		var m gmap.StrIntMap
-		err = json.Unmarshal(b, &m)
+		err = json.UnmarshalUseNumber(b, &m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])

container/gmap/gmap_z_unit_str_str_test.go

@@ -244,7 +244,7 @@ func Test_StrStrMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewStrStrMap()
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])
@@ -258,7 +258,7 @@ func Test_StrStrMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		var m gmap.StrStrMap
-		err = json.Unmarshal(b, &m)
+		err = json.UnmarshalUseNumber(b, &m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])

container/gmap/gmap_z_unit_tree_map_test.go

@@ -188,7 +188,7 @@ func Test_TreeMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		m := gmap.NewTreeMap(gutil.ComparatorString)
-		err = json.Unmarshal(b, m)
+		err = json.UnmarshalUseNumber(b, m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])
@@ -202,7 +202,7 @@ func Test_TreeMap_Json(t *testing.T) {
 		t.Assert(err, nil)
 
 		var m gmap.TreeMap
-		err = json.Unmarshal(b, &m)
+		err = json.UnmarshalUseNumber(b, &m)
 		t.Assert(err, nil)
 		t.Assert(m.Get("k1"), data["k1"])
 		t.Assert(m.Get("k2"), data["k2"])

container/gqueue/gqueue.go

@@ -35,10 +35,8 @@ type Queue struct {
 }
 
 const (
-	// Size for queue buffer.
-	gDEFAULT_QUEUE_SIZE = 10000
-	// Max batch size per-fetching from list.
-	gDEFAULT_MAX_BATCH_SIZE = 10
+	defaultQueueSize = 10000 // Size for queue buffer.
+	defaultBatchSize = 10    // Max batch size per-fetching from list.
 )
 
 // New returns an empty queue object.
@@ -54,7 +52,7 @@ func New(limit ...int) *Queue {
 	} else {
 		q.list = glist.New(true)
 		q.events = make(chan struct{}, math.MaxInt32)
-		q.C = make(chan interface{}, gDEFAULT_QUEUE_SIZE)
+		q.C = make(chan interface{}, defaultQueueSize)
 		go q.asyncLoopFromListToChannel()
 	}
 	return q
@@ -72,8 +70,8 @@ func (q *Queue) asyncLoopFromListToChannel() {
 		<-q.events
 		for !q.closed.Val() {
 			if length := q.list.Len(); length > 0 {
-				if length > gDEFAULT_MAX_BATCH_SIZE {
-					length = gDEFAULT_MAX_BATCH_SIZE
+				if length > defaultBatchSize {
+					length = defaultBatchSize
 				}
 				for _, v := range q.list.PopFronts(length) {
 					// When q.C is closed, it will panic here, especially q.C is being blocked for writing.
@@ -101,7 +99,7 @@ func (q *Queue) Push(v interface{}) {
 		q.C <- v
 	} else {
 		q.list.PushBack(v)
-		if len(q.events) < gDEFAULT_QUEUE_SIZE {
+		if len(q.events) < defaultQueueSize {
 			q.events <- struct{}{}
 		}
 	}
@@ -124,14 +122,14 @@ func (q *Queue) Close() {
 	if q.limit > 0 {
 		close(q.C)
 	}
-	for i := 0; i < gDEFAULT_MAX_BATCH_SIZE; i++ {
+	for i := 0; i < defaultBatchSize; i++ {
 		q.Pop()
 	}
 }
 
 // Len returns the length of the queue.
 // Note that the result might not be accurate as there's a
-// asynchronize channel reading the list constantly.
+// asynchronous channel reading the list constantly.
 func (q *Queue) Len() (length int) {
 	if q.list != nil {
 		length += q.list.Len()

container/gset/gset_any_set.go

@@ -477,7 +477,7 @@ func (set *Set) UnmarshalJSON(b []byte) error {
 		set.data = make(map[interface{}]struct{})
 	}
 	var array []interface{}
-	if err := json.Unmarshal(b, &array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &array); err != nil {
 		return err
 	}
 	for _, v := range array {
@@ -496,7 +496,7 @@ func (set *Set) UnmarshalValue(value interface{}) (err error) {
 	var array []interface{}
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &array)
 	default:
 		array = gconv.SliceAny(value)
 	}

container/gset/gset_int_set.go

@@ -437,7 +437,7 @@ func (set *IntSet) UnmarshalJSON(b []byte) error {
 		set.data = make(map[int]struct{})
 	}
 	var array []int
-	if err := json.Unmarshal(b, &array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &array); err != nil {
 		return err
 	}
 	for _, v := range array {
@@ -456,7 +456,7 @@ func (set *IntSet) UnmarshalValue(value interface{}) (err error) {
 	var array []int
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &array)
 	default:
 		array = gconv.SliceInt(value)
 	}

container/gset/gset_str_set.go

@@ -465,7 +465,7 @@ func (set *StrSet) UnmarshalJSON(b []byte) error {
 		set.data = make(map[string]struct{})
 	}
 	var array []string
-	if err := json.Unmarshal(b, &array); err != nil {
+	if err := json.UnmarshalUseNumber(b, &array); err != nil {
 		return err
 	}
 	for _, v := range array {
@@ -484,7 +484,7 @@ func (set *StrSet) UnmarshalValue(value interface{}) (err error) {
 	var array []string
 	switch value.(type) {
 	case string, []byte:
-		err = json.Unmarshal(gconv.Bytes(value), &array)
+		err = json.UnmarshalUseNumber(gconv.Bytes(value), &array)
 	default:
 		array = gconv.SliceStr(value)
 	}

container/gset/gset_z_unit_any_test.go

@@ -327,7 +327,7 @@ func TestSet_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := gset.New()
-		err2 = json.Unmarshal(b2, &a2)
+		err2 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(err2, nil)
 		t.Assert(a2.Contains("a"), true)
 		t.Assert(a2.Contains("b"), true)
@@ -336,7 +336,7 @@ func TestSet_Json(t *testing.T) {
 		t.Assert(a2.Contains("e"), false)
 
 		var a3 gset.Set
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Contains("a"), true)
 		t.Assert(a3.Contains("b"), true)

container/gset/gset_z_unit_int_test.go

@@ -358,7 +358,7 @@ func TestIntSet_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := gset.NewIntSet()
-		err2 = json.Unmarshal(b2, &a2)
+		err2 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(err2, nil)
 		t.Assert(a2.Contains(1), true)
 		t.Assert(a2.Contains(2), true)
@@ -367,7 +367,7 @@ func TestIntSet_Json(t *testing.T) {
 		t.Assert(a2.Contains(5), false)
 
 		var a3 gset.IntSet
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a2.Contains(1), true)
 		t.Assert(a2.Contains(2), true)

container/gset/gset_z_unit_str_test.go

@@ -404,7 +404,7 @@ func TestStrSet_Json(t *testing.T) {
 		t.Assert(err1, err2)
 
 		a2 := gset.NewStrSet()
-		err2 = json.Unmarshal(b2, &a2)
+		err2 = json.UnmarshalUseNumber(b2, &a2)
 		t.Assert(err2, nil)
 		t.Assert(a2.Contains("a"), true)
 		t.Assert(a2.Contains("b"), true)
@@ -413,7 +413,7 @@ func TestStrSet_Json(t *testing.T) {
 		t.Assert(a2.Contains("e"), false)
 
 		var a3 gset.StrSet
-		err := json.Unmarshal(b2, &a3)
+		err := json.UnmarshalUseNumber(b2, &a3)
 		t.Assert(err, nil)
 		t.Assert(a3.Contains("a"), true)
 		t.Assert(a3.Contains("b"), true)

container/gtree/gtree.go

@@ -7,5 +7,4 @@
 // Package gtree provides concurrent-safe/unsafe tree containers.
 //
 // Some implements are from: https://github.com/emirpasic/gods
-// Thanks!
 package gtree

container/gtree/gtree_redblacktree.go

@@ -937,7 +937,7 @@ func (tree *RedBlackTree) UnmarshalJSON(b []byte) error {
 		tree.comparator = gutil.ComparatorString
 	}
 	var data map[string]interface{}
-	if err := json.Unmarshal(b, &data); err != nil {
+	if err := json.UnmarshalUseNumber(b, &data); err != nil {
 		return err
 	}
 	for k, v := range data {

container/gtype/interface.go

@@ -58,7 +58,7 @@ func (v *Interface) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON implements the interface UnmarshalJSON for json.Unmarshal.
 func (v *Interface) UnmarshalJSON(b []byte) error {
 	var i interface{}
-	err := json.Unmarshal(b, &i)
+	err := json.UnmarshalUseNumber(b, &i)
 	if err != nil {
 		return err
 	}

container/gtype/z_unit_bool_test.go

@@ -55,16 +55,16 @@ func Test_Bool_JSON(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var err error
 		i := gtype.NewBool()
-		err = json.Unmarshal([]byte("true"), &i)
+		err = json.UnmarshalUseNumber([]byte("true"), &i)
 		t.Assert(err, nil)
 		t.Assert(i.Val(), true)
-		err = json.Unmarshal([]byte("false"), &i)
+		err = json.UnmarshalUseNumber([]byte("false"), &i)
 		t.Assert(err, nil)
 		t.Assert(i.Val(), false)
-		err = json.Unmarshal([]byte("1"), &i)
+		err = json.UnmarshalUseNumber([]byte("1"), &i)
 		t.Assert(err, nil)
 		t.Assert(i.Val(), true)
-		err = json.Unmarshal([]byte("0"), &i)
+		err = json.UnmarshalUseNumber([]byte("0"), &i)
 		t.Assert(err, nil)
 		t.Assert(i.Val(), false)
 	})
@@ -78,7 +78,7 @@ func Test_Bool_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewBool()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), i.Val())
 	})
@@ -91,7 +91,7 @@ func Test_Bool_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewBool()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), i.Val())
 	})

container/gtype/z_unit_byte_test.go

@@ -53,7 +53,7 @@ func Test_Byte_JSON(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var err error
 		i := gtype.NewByte()
-		err = json.Unmarshal([]byte("49"), &i)
+		err = json.UnmarshalUseNumber([]byte("49"), &i)
 		t.Assert(err, nil)
 		t.Assert(i.Val(), "49")
 	})

container/gtype/z_unit_bytes_test.go

@@ -39,7 +39,7 @@ func Test_Bytes_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewBytes()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), b)
 	})

container/gtype/z_unit_float32_test.go

@@ -40,7 +40,7 @@ func Test_Float32_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewFloat32()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), v)
 	})

container/gtype/z_unit_float64_test.go

@@ -38,7 +38,7 @@ func Test_Float64_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewFloat64()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), v)
 	})

container/gtype/z_unit_int32_test.go

@@ -51,7 +51,7 @@ func Test_Int32_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewInt32()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), v)
 	})

container/gtype/z_unit_int64_test.go

@@ -50,7 +50,7 @@ func Test_Int64_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewInt64()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), i)
 	})

container/gtype/z_unit_int_test.go

@@ -50,7 +50,7 @@ func Test_Int_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewInt()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), v)
 	})

container/gtype/z_unit_interface_test.go

@@ -40,7 +40,7 @@ func Test_Interface_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.New()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), s)
 	})

container/gtype/z_unit_string_test.go

@@ -38,7 +38,7 @@ func Test_String_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewString()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), s)
 	})

container/gtype/z_unit_uint32_test.go

@@ -50,7 +50,7 @@ func Test_Uint32_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewUint32()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), i)
 	})

container/gtype/z_unit_uint64_test.go

@@ -55,7 +55,7 @@ func Test_Uint64_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewUint64()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), i)
 	})

container/gtype/z_unit_uint_test.go

@@ -49,7 +49,7 @@ func Test_Uint_JSON(t *testing.T) {
 		t.Assert(b1, b2)
 
 		i2 := gtype.NewUint()
-		err := json.Unmarshal(b2, &i2)
+		err := json.UnmarshalUseNumber(b2, &i2)
 		t.Assert(err, nil)
 		t.Assert(i2.Val(), i)
 	})

container/gvar/gvar.go

@@ -189,7 +189,7 @@ func (v *Var) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON implements the interface UnmarshalJSON for json.Unmarshal.
 func (v *Var) UnmarshalJSON(b []byte) error {
 	var i interface{}
-	err := json.Unmarshal(b, &i)
+	err := json.UnmarshalUseNumber(b, &i)
 	if err != nil {
 		return err
 	}

container/gvar/gvar_map.go

@@ -71,13 +71,6 @@ func (v *Var) MapToMap(pointer interface{}, mapping ...map[string]string) (err e
 	return gconv.MapToMap(v.Val(), pointer, mapping...)
 }
 
-// MapToMapDeep converts any map type variable <params> to another map type variable
-// <pointer> recursively.
-// See gconv.MapToMapDeep.
-func (v *Var) MapToMapDeep(pointer interface{}, mapping ...map[string]string) (err error) {
-	return gconv.MapToMapDeep(v.Val(), pointer, mapping...)
-}
-
 // MapToMaps converts any map type variable <params> to another map type variable <pointer>.
 // See gconv.MapToMaps.
 func (v *Var) MapToMaps(pointer interface{}, mapping ...map[string]string) (err error) {

container/gvar/gvar_z_unit_basic_test.go

@@ -245,12 +245,57 @@ func Test_Duration(t *testing.T) {
 	})
 }
 
-func Test_UnmarshalValue(t *testing.T) {
-	type V struct {
-		Name string
-		Var  *gvar.Var
-	}
+func Test_UnmarshalJson(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
+		type V struct {
+			Name string
+			Var  *gvar.Var
+		}
+		var v *V
+		err := gconv.Struct(map[string]interface{}{
+			"name": "john",
+			"var":  "v",
+		}, &v)
+		t.Assert(err, nil)
+		t.Assert(v.Name, "john")
+		t.Assert(v.Var.String(), "v")
+	})
+	gtest.C(t, func(t *gtest.T) {
+		type V struct {
+			Name string
+			Var  gvar.Var
+		}
+		var v *V
+		err := gconv.Struct(map[string]interface{}{
+			"name": "john",
+			"var":  "v",
+		}, &v)
+		t.Assert(err, nil)
+		t.Assert(v.Name, "john")
+		t.Assert(v.Var.String(), "v")
+	})
+}
+
+func Test_UnmarshalValue(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		type V struct {
+			Name string
+			Var  *gvar.Var
+		}
+		var v *V
+		err := gconv.Struct(map[string]interface{}{
+			"name": "john",
+			"var":  "v",
+		}, &v)
+		t.Assert(err, nil)
+		t.Assert(v.Name, "john")
+		t.Assert(v.Var.String(), "v")
+	})
+	gtest.C(t, func(t *gtest.T) {
+		type V struct {
+			Name string
+			Var  gvar.Var
+		}
 		var v *V
 		err := gconv.Struct(map[string]interface{}{
 			"name": "john",