Merge branch 'master' of https://github.com/gogf/gf

Update Readme ,Github Action badge

.example/container/gpool/gpool.go

@@ -9,7 +9,7 @@ import (
 
 func main() {
 	// 创建一个对象池，过期时间为1000毫秒
-	p := gpool.New(1000, nil)
+	p := gpool.New(1000*time.Millisecond, nil)
 
 	// 从池中取一个对象，返回nil及错误信息
 	fmt.Println(p.Get())

.example/container/gpool/gpool_expirefunc.go

@@ -11,7 +11,7 @@ import (
 
 func main() {
 	// 创建对象复用池，对象过期时间为3000毫秒，并给定创建及销毁方法
-	p := gpool.New(3000, func() (interface{}, error) {
+	p := gpool.New(3000*time.Millisecond, func() (interface{}, error) {
 		return gtcp.NewConn("www.baidu.com:80")
 	}, func(i interface{}) {
 		glog.Println("expired")

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

@@ -0,0 +1,71 @@
+package driver
+
+import (
+	"context"
+	"database/sql"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/os/gtime"
+)
+
+// MyDriver is a custom database driver, which is used for testing only.
+// For simplifying the unit testing case purpose, MyDriver struct inherits the mysql driver
+// gdb.DriverMysql and overwrites its functions DoQuery and DoExec.
+// So if there's any sql execution, it goes through MyDriver.DoQuery/MyDriver.DoExec firstly
+// and then gdb.DriverMysql.DoQuery/gdb.DriverMysql.DoExec.
+// You can call it sql "HOOK" or "HiJack" as your will.
+type MyDriver struct {
+	*gdb.DriverMysql
+}
+
+var (
+	// customDriverName is my driver name, which is used for registering.
+	customDriverName = "MyDriver"
+)
+
+func init() {
+	// It here registers my custom driver in package initialization function "init".
+	// You can later use this type in the database configuration.
+	if err := gdb.Register(customDriverName, &MyDriver{}); err != nil {
+		panic(err)
+	}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *MyDriver) New(core *gdb.Core, node *gdb.ConfigNode) (gdb.DB, error) {
+	return &MyDriver{
+		&gdb.DriverMysql{
+			Core: core,
+		},
+	}, nil
+}
+
+// DoQuery commits the sql string and its arguments to underlying driver
+// through given link object and returns the execution result.
+func (d *MyDriver) DoQuery(ctx context.Context, link gdb.Link, sql string, args ...interface{}) (rows *sql.Rows, err error) {
+	tsMilli := gtime.TimestampMilli()
+	rows, err = d.DriverMysql.DoQuery(ctx, link, sql, args...)
+	link.Exec(
+		"INSERT INTO `monitor`(`sql`,`cost`,`time`,`error`) VALUES(?,?,?,?)",
+		gdb.FormatSqlWithArgs(sql, args),
+		gtime.TimestampMilli()-tsMilli,
+		gtime.Now(),
+		err,
+	)
+	return
+}
+
+// DoExec commits the query string and its arguments to underlying driver
+// through given link object and returns the execution result.
+func (d *MyDriver) DoExec(ctx context.Context, link gdb.Link, sql string, args ...interface{}) (result sql.Result, err error) {
+	tsMilli := gtime.TimestampMilli()
+	result, err = d.DriverMysql.DoExec(ctx, link, sql, args...)
+	link.Exec(
+		"INSERT INTO `monitor`(`sql`,`cost`,`time`,`error`) VALUES(?,?,?,?)",
+		gdb.FormatSqlWithArgs(sql, args),
+		gtime.TimestampMilli()-tsMilli,
+		gtime.Now(),
+		err,
+	)
+	return
+}

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

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

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

@@ -1,8 +1,3 @@
 
 [database]
-    type = "mssql"
-    host = "127.0.0.1"
-    port = "1451"
-    user = "sa"
-    pass = "eno@123"
-    name = "frpc"
+    linkinfo = "mssql:user id=test;password=test1;server=122.152.202.91;port=1433;database=test;encrypt=disable"

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

@@ -2,13 +2,22 @@ package main
 
 import (
 	"fmt"
+	"github.com/gogf/gf/os/gtime"
 
 	_ "github.com/denisenkom/go-mssqldb"
 	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	r, err := g.DB().GetAll(`SELECT TOP 10  * FROM KF_PatInfo_Emergency`)
-	fmt.Println(err)
-	g.Dump(r.ToList())
+	type Table2 struct {
+		Id         string     `orm:"id;pr" json:"id"`              //ID
+		Createtime gtime.Time `orm:"createtime" json:"createtime"` //创建时间
+		Updatetime gtime.Time `orm:"updatetime" json:"updatetime"` //更新时间
+	}
+	var table2 Table2
+	err := g.DB().Table("table2").Where("id=?", 1).Struct(&table2)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(table2.Createtime)
 }

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

@@ -512,16 +512,6 @@ func mapToStruct() {
 	}
 }
 
-// getQueriedSqls
-func getQueriedSqls() {
-	for k, v := range db.GetQueriedSqls() {
-		fmt.Println(k, ":")
-		fmt.Println("Sql  :", v.Sql)
-		fmt.Println("Args :", v.Args)
-		fmt.Println("Error:", v.Error)
-	}
-}
-
 func main() {
 
 	db.PingMaster()

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

@@ -1,8 +1,18 @@
 
-# MySQL数据库配置
+# MySQL.
 [database]
-#	debug = true
-    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"
+    [database.logger]
+        Level   = "all"
+        Stdout  = true
+        CtxKeys = ["Trace-Id"]
+    [database.default]
+        link   = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
+        debug  = true
+
+# Redis.
+[redis]
+    default = "127.0.0.1:6379,0"
+    cache   = "127.0.0.1:6379,1"
 
 #[database]
 #   [[database.default]]

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

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/frame/g"
 )
 
@@ -11,11 +10,19 @@ func main() {
 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)
 
-	r, e := db.Table("test").OrderBy("id asc").All()
+	r, e := db.GetAll("SELECT * from `user` where id in(?)", g.Slice{})
 	if e != nil {
-		panic(e)
+		fmt.Println(e)
 	}
 	if r != nil {
-		fmt.Println(r.ToList())
+		fmt.Println(r)
 	}
+	return
+	//r, e := db.Table("user").Where("id in(?)", g.Slice{}).All()
+	//if e != nil {
+	//	fmt.Println(e)
+	//}
+	//if r != nil {
+	//	fmt.Println(r.List())
+	//}
 }

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

@@ -0,0 +1,24 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	db := g.DB()
+	db.SetDebug(true)
+	list := make(g.List, 0)
+	for i := 0; i < 100; i++ {
+		list = append(list, g.Map{
+			"name": fmt.Sprintf(`name_%d`, i),
+		})
+	}
+	r, e := db.Table("user").Data(list).Batch(2).Insert()
+	if e != nil {
+		panic(e)
+	}
+	if r != nil {
+		fmt.Println(r.LastInsertId())
+	}
+}

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

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/gogf/gf/database/gdb"
 	"github.com/gogf/gf/util/gutil"
+	"time"
 )
 
 func main() {
@@ -10,7 +11,7 @@ func main() {
 		Host:    "127.0.0.1",
 		Port:    "3306",
 		User:    "root",
-		Pass:    "123456",
+		Pass:    "12345678",
 		Name:    "test",
 		Type:    "mysql",
 		Role:    "master",
@@ -20,19 +21,20 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
+	//db.GetCache().SetAdapter(adapter.NewRedis(g.Redis()))
 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)
 
 	// 执行2次查询并将查询结果缓存3秒，并可执行缓存名称(可选)
-	for i := 0; i < 2; i++ {
-		r, _ := db.Table("user").Cache(3, "vip-user").Where("uid=?", 1).One()
-		gutil.Dump(r.ToMap())
+	for i := 0; i < 3; i++ {
+		r, _ := db.Table("user").Cache(3000*time.Second).Where("id=?", 1).One()
+		gutil.Dump(r.Map())
 	}
 
 	// 执行更新操作，并清理指定名称的查询缓存
-	db.Table("user").Cache(-1, "vip-user").Data(gdb.Map{"name": "smith"}).Where("uid=?", 1).Update()
+	//db.Table("user").Cache(-1, "vip-user").Data(gdb.Map{"name": "smith"}).Where("id=?", 1).Update()
 
 	// 再次执行查询，启用查询缓存特性
-	r, _ := db.Table("user").Cache(3, "vip-user").Where("uid=?", 1).One()
-	gutil.Dump(r.ToMap())
+	//r, _ := db.Table("user").Cache(300000*time.Second, "vip-user").Where("id=?", 1).One()
+	//gutil.Dump(r.Map())
 }

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

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"context"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	ctx := context.WithValue(context.Background(), "Trace-Id", "123456789")
+	_, err := g.DB().Ctx(ctx).Query("SELECT 1")
+	if err != nil {
+		panic(err)
+	}
+}

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

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"context"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	ctx := context.WithValue(context.Background(), "Trace-Id", "123456789")
+	_, err := g.DB().Model("user").Ctx(ctx).All()
+	if err != nil {
+		panic(err)
+	}
+}

.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_insert.go

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

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

@@ -8,9 +8,6 @@ import (
 
 func main() {
 	db := g.DB()
-	db.SetMaxIdleConnCount(10)
-	db.SetMaxOpenConnCount(10)
-	db.SetMaxConnLifetime(time.Minute)
 
 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)
@@ -19,7 +16,7 @@ func main() {
 		for i := 0; i < 10; i++ {
 			go db.Table("user").All()
 		}
-		time.Sleep(time.Second)
+		time.Sleep(time.Millisecond * 100)
 	}
 
 }

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

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

.example/database/gdb/mysql/gdb_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_value.go

@@ -1,24 +1,15 @@
 package main
 
 import (
+	"fmt"
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/os/gtime"
 )
 
 func main() {
-	db := g.DB()
-	//db.SetDebug(true)
-
-	type User struct {
-		Id   int
-		Name *gtime.Time
-	}
-
-	user := new(User)
-	e := db.Table("test").Where("id", 10000).Struct(user)
-	if e != nil {
-		panic(e)
-	}
-	g.Dump(user)
-
+	one, err := g.DB().Table("carlist c").
+		LeftJoin("cardetail d", "c.postid=d.carid").
+		Where("c.postid", "142039140032006").
+		Fields("c.*,d.*").One()
+	fmt.Println(err)
+	g.Dump(one)
 }

.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/gdb/oracle/gdb.go

@@ -513,16 +513,6 @@ func mapToStruct() {
 	}
 }
 
-// getQueriedSqls
-func getQueriedSqls() {
-	for k, v := range db.GetQueriedSqls() {
-		fmt.Println(k, ":")
-		fmt.Println("Sql  :", v.Sql)
-		fmt.Println("Args :", v.Args)
-		fmt.Println("Error:", v.Error)
-	}
-}
-
 func main() {
 
 	db.PingMaster()

.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/encoding/gcompress/zip.go

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

.example/encoding/gjson/gjson.go

@@ -100,53 +100,53 @@ func testConvert() {
 func testSplitChar() {
 	var v interface{}
 	j := gjson.New(nil)
-	t1 := gtime.Nanosecond()
+	t1 := gtime.TimestampNano()
 	j.Set("a.b.c.d.e.f.g.h.i.j.k", 1)
-	t2 := gtime.Nanosecond()
+	t2 := gtime.TimestampNano()
 	fmt.Println(t2 - t1)
 
-	t5 := gtime.Nanosecond()
+	t5 := gtime.TimestampNano()
 	v = j.Get("a.b.c.d.e.f.g.h.i.j.k")
-	t6 := gtime.Nanosecond()
+	t6 := gtime.TimestampNano()
 	fmt.Println(v)
 	fmt.Println(t6 - t5)
 
 	j.SetSplitChar('#')
 
-	t7 := gtime.Nanosecond()
+	t7 := gtime.TimestampNano()
 	v = j.Get("a#b#c#d#e#f#g#h#i#j#k")
-	t8 := gtime.Nanosecond()
+	t8 := gtime.TimestampNano()
 	fmt.Println(v)
 	fmt.Println(t8 - t7)
 }
 
 func testViolenceCheck() {
 	j := gjson.New(nil)
-	t1 := gtime.Nanosecond()
+	t1 := gtime.TimestampNano()
 	j.Set("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", 1)
-	t2 := gtime.Nanosecond()
+	t2 := gtime.TimestampNano()
 	fmt.Println(t2 - t1)
 
-	t3 := gtime.Nanosecond()
+	t3 := gtime.TimestampNano()
 	j.Set("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", 1)
-	t4 := gtime.Nanosecond()
+	t4 := gtime.TimestampNano()
 	fmt.Println(t4 - t3)
 
-	t5 := gtime.Nanosecond()
+	t5 := gtime.TimestampNano()
 	j.Get("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a")
-	t6 := gtime.Nanosecond()
+	t6 := gtime.TimestampNano()
 	fmt.Println(t6 - t5)
 
 	j.SetViolenceCheck(false)
 
-	t7 := gtime.Nanosecond()
+	t7 := gtime.TimestampNano()
 	j.Set("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a", 1)
-	t8 := gtime.Nanosecond()
+	t8 := gtime.TimestampNano()
 	fmt.Println(t8 - t7)
 
-	t9 := gtime.Nanosecond()
+	t9 := gtime.TimestampNano()
 	j.Get("a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a")
-	t10 := gtime.Nanosecond()
+	t10 := gtime.TimestampNano()
 	fmt.Println(t10 - t9)
 }
 

.example/frame/mvc/app/model/article/article.go

@@ -1,3 +0,0 @@
-package article
-
-// Fill with you ideas below.

.example/frame/mvc/app/model/article/article_entity.go

@@ -1,68 +0,0 @@
-// ==========================================================================
-// This is auto-generated by gf cli tool. You may not really want to edit it.
-// ==========================================================================
-
-package article
-
-import (
-	"database/sql"
-	"github.com/gogf/gf/database/gdb"
-	"github.com/gogf/gf/os/gtime"
-)
-
-// Entity is the golang structure for table gf_article.
-type Entity struct {
-	Id         int         `orm:"id,primary"  json:"id"`          //
-	CatId      int         `orm:"cat_id"      json:"cat_id"`      // 分类ID
-	Uid        int         `orm:"uid"         json:"uid"`         // 用户ID
-	Title      string      `orm:"title"       json:"title"`       // 标题
-	Content    string      `orm:"content"     json:"content"`     // 内容
-	Order      int         `orm:"order"       json:"order"`       // 排序
-	Brief      string      `orm:"brief"       json:"brief"`       // 摘要
-	Thumb      string      `orm:"thumb"       json:"thumb"`       // 缩略图
-	Tags       string      `orm:"tags"        json:"tags"`        // 标签
-	Referer    string      `orm:"referer"     json:"referer"`     // 内容来源
-	Status     int         `orm:"status"      json:"status"`      // 状态\n0: 禁用\n1: 正常
-	CreateTime *gtime.Time `orm:"create_time" json:"create_time"` // 创建时间
-	UpdateTime *gtime.Time `orm:"update_time" json:"update_time"` // 修改时间
-}
-
-// Article is alias of Entity, which some developers say they just want.
-type Article = Entity
-
-// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
-// the data and where attributes for empty values.
-func (r *Entity) OmitEmpty() *arModel {
-	return Model.Data(r).OmitEmpty()
-}
-
-// Inserts does "INSERT...INTO..." statement for inserting current object into table.
-func (r *Entity) Insert() (result sql.Result, err error) {
-	return Model.Data(r).Insert()
-}
-
-// Replace does "REPLACE...INTO..." statement for inserting current object into table.
-// If there's already another same record in the table (it checks using primary key or unique index),
-// it deletes it and insert this one.
-func (r *Entity) Replace() (result sql.Result, err error) {
-	return Model.Data(r).Replace()
-}
-
-// Save does "INSERT...INTO..." statement for inserting/updating current object into table.
-// It updates the record if there's already another same record in the table
-// (it checks using primary key or unique index).
-func (r *Entity) Save() (result sql.Result, err error) {
-	return Model.Data(r).Save()
-}
-
-// Update does "UPDATE...WHERE..." statement for updating current object from table.
-// It updates the record if there's already another same record in the table
-// (it checks using primary key or unique index).
-func (r *Entity) Update() (result sql.Result, err error) {
-	return Model.Data(r).Where(gdb.GetWhereConditionOfStruct(r)).Update()
-}
-
-// Delete does "DELETE FROM...WHERE..." statement for deleting current object from table.
-func (r *Entity) Delete() (result sql.Result, err error) {
-	return Model.Where(gdb.GetWhereConditionOfStruct(r)).Delete()
-}

.example/frame/mvc/app/model/article/article_model.go

@@ -1,362 +0,0 @@
-// ==========================================================================
-// This is auto-generated by gf cli tool. You may not really want to edit it.
-// ==========================================================================
-
-package article
-
-import (
-	"database/sql"
-	"github.com/gogf/gf/database/gdb"
-	"github.com/gogf/gf/frame/g"
-	"time"
-)
-
-// arModel is a active record design model for table gf_article operations.
-type arModel struct {
-	M *gdb.Model
-}
-
-var (
-	// Table is the table name of gf_article.
-	Table = "gf_article"
-	// Model is the model object of gf_article.
-	Model = &arModel{g.DB("default").Table(Table).Safe()}
-)
-
-// FindOne is a convenience method for Model.FindOne.
-// See Model.FindOne.
-func FindOne(where ...interface{}) (*Entity, error) {
-	return Model.FindOne(where...)
-}
-
-// FindAll is a convenience method for Model.FindAll.
-// See Model.FindAll.
-func FindAll(where ...interface{}) ([]*Entity, error) {
-	return Model.FindAll(where...)
-}
-
-// FindValue is a convenience method for Model.FindValue.
-// See Model.FindValue.
-func FindValue(fieldsAndWhere ...interface{}) (gdb.Value, error) {
-	return Model.FindValue(fieldsAndWhere...)
-}
-
-// FindCount is a convenience method for Model.FindCount.
-// See Model.FindCount.
-func FindCount(where ...interface{}) (int, error) {
-	return Model.FindCount(where...)
-}
-
-// Insert is a convenience method for Model.Insert.
-func Insert(data ...interface{}) (result sql.Result, err error) {
-	return Model.Insert(data...)
-}
-
-// Replace is a convenience method for Model.Replace.
-func Replace(data ...interface{}) (result sql.Result, err error) {
-	return Model.Replace(data...)
-}
-
-// Save is a convenience method for Model.Save.
-func Save(data ...interface{}) (result sql.Result, err error) {
-	return Model.Save(data...)
-}
-
-// Update is a convenience method for Model.Update.
-func Update(dataAndWhere ...interface{}) (result sql.Result, err error) {
-	return Model.Update(dataAndWhere...)
-}
-
-// Delete is a convenience method for Model.Delete.
-func Delete(where ...interface{}) (result sql.Result, err error) {
-	return Model.Delete(where...)
-}
-
-// TX sets the transaction for current operation.
-func (m *arModel) TX(tx *gdb.TX) *arModel {
-	return &arModel{m.M.TX(tx)}
-}
-
-// Master marks the following operation on master node.
-func (m *arModel) Master() *arModel {
-	return &arModel{m.M.Master()}
-}
-
-// Slave marks the following operation on slave node.
-// Note that it makes sense only if there's any slave node configured.
-func (m *arModel) Slave() *arModel {
-	return &arModel{m.M.Slave()}
-}
-
-// LeftJoin does "LEFT JOIN ... ON ..." statement on the model.
-func (m *arModel) LeftJoin(joinTable string, on string) *arModel {
-	return &arModel{m.M.LeftJoin(joinTable, on)}
-}
-
-// RightJoin does "RIGHT JOIN ... ON ..." statement on the model.
-func (m *arModel) RightJoin(joinTable string, on string) *arModel {
-	return &arModel{m.M.RightJoin(joinTable, on)}
-}
-
-// InnerJoin does "INNER JOIN ... ON ..." statement on the model.
-func (m *arModel) InnerJoin(joinTable string, on string) *arModel {
-	return &arModel{m.M.InnerJoin(joinTable, on)}
-}
-
-// Fields sets the operation fields of the model, multiple fields joined using char ','.
-func (m *arModel) Fields(fields string) *arModel {
-	return &arModel{m.M.Fields(fields)}
-}
-
-// FieldsEx sets the excluded operation fields of the model, multiple fields joined using char ','.
-func (m *arModel) FieldsEx(fields string) *arModel {
-	return &arModel{m.M.FieldsEx(fields)}
-}
-
-// Option sets the extra operation option for the model.
-func (m *arModel) Option(option int) *arModel {
-	return &arModel{m.M.Option(option)}
-}
-
-// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
-// the data and where attributes for empty values.
-func (m *arModel) OmitEmpty() *arModel {
-	return &arModel{m.M.OmitEmpty()}
-}
-
-// Filter marks filtering the fields which does not exist in the fields of the operated table.
-func (m *arModel) Filter() *arModel {
-	return &arModel{m.M.Filter()}
-}
-
-// Where sets the condition statement for the model. The parameter <where> can be type of
-// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
-// multiple conditions will be joined into where statement using "AND".
-// Eg:
-// Where("uid=10000")
-// Where("uid", 10000)
-// Where("money>? AND name like ?", 99999, "vip_%")
-// Where("uid", 1).Where("name", "john")
-// Where("status IN (?)", g.Slice{1,2,3})
-// Where("age IN(?,?)", 18, 50)
-// Where(User{ Id : 1, UserName : "john"})
-func (m *arModel) Where(where interface{}, args ...interface{}) *arModel {
-	return &arModel{m.M.Where(where, args...)}
-}
-
-// And adds "AND" condition to the where statement.
-func (m *arModel) And(where interface{}, args ...interface{}) *arModel {
-	return &arModel{m.M.And(where, args...)}
-}
-
-// Or adds "OR" condition to the where statement.
-func (m *arModel) Or(where interface{}, args ...interface{}) *arModel {
-	return &arModel{m.M.Or(where, args...)}
-}
-
-// Group sets the "GROUP BY" statement for the model.
-func (m *arModel) Group(groupBy string) *arModel {
-	return &arModel{m.M.Group(groupBy)}
-}
-
-// Order sets the "ORDER BY" statement for the model.
-func (m *arModel) Order(orderBy string) *arModel {
-	return &arModel{m.M.Order(orderBy)}
-}
-
-// Limit sets the "LIMIT" statement for the model.
-// The parameter <limit> can be either one or two number, if passed two number is passed,
-// it then sets "LIMIT limit[0],limit[1]" statement for the model, or else it sets "LIMIT limit[0]"
-// statement.
-func (m *arModel) Limit(limit ...int) *arModel {
-	return &arModel{m.M.Limit(limit...)}
-}
-
-// Offset sets the "OFFSET" statement for the model.
-// It only makes sense for some databases like SQLServer, PostgreSQL, etc.
-func (m *arModel) Offset(offset int) *arModel {
-	return &arModel{m.M.Offset(offset)}
-}
-
-// Page sets the paging number for the model.
-// The parameter <page> is started from 1 for paging.
-// Note that, it differs that the Limit function start from 0 for "LIMIT" statement.
-func (m *arModel) Page(page, limit int) *arModel {
-	return &arModel{m.M.Page(page, limit)}
-}
-
-// Batch sets the batch operation number for the model.
-func (m *arModel) Batch(batch int) *arModel {
-	return &arModel{m.M.Batch(batch)}
-}
-
-// Cache sets the cache feature for the model. It caches the result of the sql, which means
-// if there's another same sql request, it just reads and returns the result from cache, it
-// but not committed and executed into the database.
-//
-// If the parameter <duration> < 0, which means it clear the cache with given <name>.
-// If the parameter <duration> = 0, which means it never expires.
-// If the parameter <duration> > 0, which means it expires after <duration>.
-//
-// The optional parameter <name> is used to bind a name to the cache, which means you can later
-// control the cache like changing the <duration> or clearing the cache with specified <name>.
-//
-// Note that, the cache feature is disabled if the model is operating on a transaction.
-func (m *arModel) Cache(expire time.Duration, name ...string) *arModel {
-	return &arModel{m.M.Cache(expire, name...)}
-}
-
-// Data sets the operation data for the model.
-// The parameter <data> can be type of string/map/gmap/slice/struct/*struct, etc.
-// Eg:
-// Data("uid=10000")
-// Data("uid", 10000)
-// Data(g.Map{"uid": 10000, "name":"john"})
-// Data(g.Slice{g.Map{"uid": 10000, "name":"john"}, g.Map{"uid": 20000, "name":"smith"})
-func (m *arModel) Data(data ...interface{}) *arModel {
-	return &arModel{m.M.Data(data...)}
-}
-
-// Insert does "INSERT INTO ..." statement for the model.
-// The optional parameter <data> is the same as the parameter of Model.Data function,
-// see Model.Data.
-func (m *arModel) Insert(data ...interface{}) (result sql.Result, err error) {
-	return m.M.Insert(data...)
-}
-
-// Replace does "REPLACE INTO ..." statement for the model.
-// The optional parameter <data> is the same as the parameter of Model.Data function,
-// see Model.Data.
-func (m *arModel) Replace(data ...interface{}) (result sql.Result, err error) {
-	return m.M.Replace(data...)
-}
-
-// Save does "INSERT INTO ... ON DUPLICATE KEY UPDATE..." statement for the model.
-// It updates the record if there's primary or unique index in the saving data,
-// or else it inserts a new record into the table.
-//
-// The optional parameter <data> is the same as the parameter of Model.Data function,
-// see Model.Data.
-func (m *arModel) Save(data ...interface{}) (result sql.Result, err error) {
-	return m.M.Save(data...)
-}
-
-// Update does "UPDATE ... " statement for the model.
-//
-// If the optional parameter <dataAndWhere> is given, the dataAndWhere[0] is the updated
-// data field, and dataAndWhere[1:] is treated as where condition fields.
-// Also see Model.Data and Model.Where functions.
-func (m *arModel) Update(dataAndWhere ...interface{}) (result sql.Result, err error) {
-	return m.M.Update(dataAndWhere...)
-}
-
-// Delete does "DELETE FROM ... " statement for the model.
-// The optional parameter <where> is the same as the parameter of Model.Where function,
-// see Model.Where.
-func (m *arModel) Delete(where ...interface{}) (result sql.Result, err error) {
-	return m.M.Delete(where...)
-}
-
-// Count does "SELECT COUNT(x) FROM ..." statement for the model.
-// The optional parameter <where> is the same as the parameter of Model.Where function,
-// see Model.Where.
-func (m *arModel) Count(where ...interface{}) (int, error) {
-	return m.M.Count(where...)
-}
-
-// All does "SELECT FROM ..." statement for the model.
-// It retrieves the records from table and returns the result as []*Entity.
-// It returns nil if there's no record retrieved with the given conditions from table.
-//
-// The optional parameter <where> is the same as the parameter of Model.Where function,
-// see Model.Where.
-func (m *arModel) All(where ...interface{}) ([]*Entity, error) {
-	all, err := m.M.All(where...)
-	if err != nil {
-		return nil, err
-	}
-	var entities []*Entity
-	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
-		return nil, err
-	}
-	return entities, nil
-}
-
-// One retrieves one record from table and returns the result as *Entity.
-// It returns nil if there's no record retrieved with the given conditions from table.
-//
-// The optional parameter <where> is the same as the parameter of Model.Where function,
-// see Model.Where.
-func (m *arModel) One(where ...interface{}) (*Entity, error) {
-	one, err := m.M.One(where...)
-	if err != nil {
-		return nil, err
-	}
-	var entity *Entity
-	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
-		return nil, err
-	}
-	return entity, nil
-}
-
-// Value retrieves a specified record value from table and returns the result as interface type.
-// It returns nil if there's no record found with the given conditions from table.
-//
-// If the optional parameter <fieldsAndWhere> is given, the fieldsAndWhere[0] is the selected fields
-// and fieldsAndWhere[1:] is treated as where condition fields.
-// Also see Model.Fields and Model.Where functions.
-func (m *arModel) Value(fieldsAndWhere ...interface{}) (gdb.Value, error) {
-	return m.M.Value(fieldsAndWhere...)
-}
-
-// FindOne retrieves and returns a single Record by Model.WherePri and Model.One.
-// Also see Model.WherePri and Model.One.
-func (m *arModel) FindOne(where ...interface{}) (*Entity, error) {
-	one, err := m.M.FindOne(where...)
-	if err != nil {
-		return nil, err
-	}
-	var entity *Entity
-	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
-		return nil, err
-	}
-	return entity, nil
-}
-
-// FindAll retrieves and returns Result by by Model.WherePri and Model.All.
-// Also see Model.WherePri and Model.All.
-func (m *arModel) FindAll(where ...interface{}) ([]*Entity, error) {
-	all, err := m.M.FindAll(where...)
-	if err != nil {
-		return nil, err
-	}
-	var entities []*Entity
-	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
-		return nil, err
-	}
-	return entities, nil
-}
-
-// FindValue retrieves and returns single field value by Model.WherePri and Model.Value.
-// Also see Model.WherePri and Model.Value.
-func (m *arModel) FindValue(fieldsAndWhere ...interface{}) (gdb.Value, error) {
-	return m.M.FindValue(fieldsAndWhere...)
-}
-
-// FindCount retrieves and returns the record number by Model.WherePri and Model.Count.
-// Also see Model.WherePri and Model.Count.
-func (m *arModel) FindCount(where ...interface{}) (int, error) {
-	return m.M.FindCount(where...)
-}
-
-// Chunk iterates the table with given size and callback function.
-func (m *arModel) Chunk(limit int, callback func(entities []*Entity, err error) bool) {
-	m.M.Chunk(limit, func(result gdb.Result, err error) bool {
-		var entities []*Entity
-		err = result.Structs(&entities)
-		if err == sql.ErrNoRows {
-			return false
-		}
-		return callback(entities, err)
-	})
-}

.example/frame/mvc/config.json

@@ -1,33 +0,0 @@
-{
-    "viewpath"   : "/home/www/templates/",
-    "database"   : {
-        "default" : [
-            {
-                "host"     : "127.0.0.1",
-                "port"     : "3306",
-                "user"     : "root",
-                "pass"     : "123456",
-                "name"     : "test",
-                "type"     : "mysql",
-                "role"     : "master",
-                "charset"  : "utf8",
-                "priority" : "1"
-            },
-            {
-                "host"     : "127.0.0.1",
-                "port"     : "3306",
-                "user"     : "root",
-                "pass"     : "123456",
-                "name"     : "test",
-                "type"     : "mysql",
-                "role"     : "master",
-                "charset"  : "utf8",
-                "priority" : "1"
-            }
-        ]
-    },
-    "redis"   : {
-        "disk"  : "127.0.0.1:6379,0",
-        "cache" : "127.0.0.1:6379,1"
-    }
-}

.example/frame/mvc/config.toml

@@ -1,11 +0,0 @@
-viewpath = "/home/www/templates"
-
-# MySQL数据库配置
-[database]
-	debug = true
-    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/gf"
-
-
-[redis]
-    disk  = "127.0.0.1:6379,0"
-    cache = "127.0.0.1:6379,1"

.example/frame/mvc/config.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <!-- 模板引擎目录 -->
-    <viewpath>/home/www/templates/</viewpath>
-    <!-- MySQL数据库配置 -->
-    <database>
-        <default>
-            <host>127.0.0.1</host>
-            <port>3306</port>
-            <user>root</user>
-            <pass>123456</pass>
-            <name>test</name>
-            <role>master</role>
-            <type>mysql</type>
-            <charset>utf8</charset>
-            <priority>1</priority>
-        </default>
-        <default>
-            <host>127.0.0.1</host>
-            <port>3306</port>
-            <user>root</user>
-            <pass>123456</pass>
-            <name>test</name>
-            <role>master</role>
-            <type>mysql</type>
-            <charset>utf8</charset>
-            <priority>1</priority>
-        </default>
-    </database>
-    <!-- Redis数据库配置 -->
-    <redis>
-        <disk>127.0.0.1:6379,0</disk>
-        <cache>127.0.0.1:6379,1</cache>
-    </redis>
-</config>

.example/frame/mvc/config.yml

@@ -1,27 +0,0 @@
-# 模板引擎目录
-viewpath: /home/www/templates/
-# MySQL数据库配置
-database:
-    default:
-        - host:     127.0.0.1
-          port:     3306
-          user:     root
-          pass:     "8692651"
-          name:     test
-          type:     mysql
-          role:     master
-          charset:  utf8
-          priority: 1
-        - host:     127.0.0.1
-          port:     3306
-          user:     root
-          pass:     "8692651"
-          name:     test
-          type:     mysql
-          role:     master
-          charset:  utf8
-          priority: 1
-# Redis数据库配置
-redis:
-    default: 127.0.0.1:6379,0
-    cache  : 127.0.0.1:6379,2

.example/frame/mvc/controller/demo/apple_pen.go

@@ -1,25 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func init() {
-	s := g.Server()
-	s.BindHandler("/apple", Apple)
-	s.BindHandler("/pen", Pen)
-	s.BindHandler("/apple-pen", ApplePen)
-}
-
-func Apple(r *ghttp.Request) {
-	r.Response.Write("Apple")
-}
-
-func Pen(r *ghttp.Request) {
-	r.Response.Write("Pen")
-}
-
-func ApplePen(r *ghttp.Request) {
-	r.Response.Write("Apple-Pen")
-}

.example/frame/mvc/controller/demo/buildin_vars.go

@@ -1,16 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type Order struct{}
-
-func init() {
-	g.Server().BindObject("/{.struct}-{.method}", new(Order))
-}
-
-func (o *Order) List(r *ghttp.Request) {
-	r.Response.Write("List")
-}

.example/frame/mvc/controller/demo/config.go

@@ -1,12 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/gins"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func init() {
-	ghttp.GetServer().BindHandler("/config", func(r *ghttp.Request) {
-		r.Response.Write(gins.Config().GetString("database.default.0.host"))
-	})
-}

.example/frame/mvc/controller/demo/cookie.go

@@ -1,16 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/gtime"
-)
-
-func init() {
-	ghttp.GetServer().BindHandler("/cookie", Cookie)
-}
-
-func Cookie(r *ghttp.Request) {
-	datetime := r.Cookie.Get("datetime")
-	r.Cookie.Set("datetime", gtime.Datetime())
-	r.Response.Write("datetime:" + datetime)
-}

.example/frame/mvc/controller/demo/domain.go

@@ -1,20 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type ControllerDomain struct{}
-
-// 初始化控制器对象，并绑定操作到Web Server
-func init() {
-	// 只有localhost域名下才能访问该对象，
-	// 对应URL为：http://localhost:8199/test/show
-	// 通过该地址将无法访问到内容：http://127.0.0.1:8199/test/show
-	ghttp.GetServer().Domain("localhost").BindObject("/domain", &ControllerDomain{})
-}
-
-// 用于对象映射
-func (d *ControllerDomain) Show(r *ghttp.Request) {
-	r.Response.Write("It's show time bibi!")
-}

.example/frame/mvc/controller/demo/exit.go

@@ -1,24 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/gmvc"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type ControllerExit struct {
-	gmvc.Controller
-}
-
-func (c *ControllerExit) Init(r *ghttp.Request) {
-	c.Controller.Init(r)
-	c.Response.Write("exit, it will not print \"show\"")
-	c.Request.Exit()
-}
-
-func (c *ControllerExit) Show() {
-	c.Response.Write("show")
-}
-
-func init() {
-	ghttp.GetServer().BindController("/exit", &ControllerExit{})
-}

.example/frame/mvc/controller/demo/form.go

@@ -1,36 +0,0 @@
-package demo
-
-import (
-	"fmt"
-
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func Form(r *ghttp.Request) {
-	fmt.Println(r.GetPostMap())
-	fmt.Println(r.GetPostString("name"))
-	fmt.Println(r.GetPostString("age"))
-
-}
-
-func FormShow(r *ghttp.Request) {
-	r.Response.Write(`
-<html>
-<head>
-    <title>表单提交</title>
-</head>
-    <body>
-        <form enctype="application/x-www-form-urlencoded" action="/form" method="post">
-            <input type="input" name="name" />
-            <input type="input" name="age" />
-            <input type="submit" value="submit" />
-        </form>
-    </body>
-</html>
-`)
-}
-
-func init() {
-	ghttp.GetServer().BindHandler("/form", Form)
-	ghttp.GetServer().BindHandler("/form/show", FormShow)
-}

.example/frame/mvc/controller/demo/hello.go

@@ -1,9 +0,0 @@
-package demo
-
-import "github.com/gogf/gf/net/ghttp"
-
-func init() {
-	ghttp.GetServer().BindHandler("/", func(r *ghttp.Request) {
-		r.Response.Write("Hello World!")
-	})
-}

.example/frame/mvc/controller/demo/method.go

@@ -1,30 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
-)
-
-type Method struct {
-	gmvc.Controller
-}
-
-func init() {
-	// 第三个参数指定主要注册的方法，其他方法不注册，方法名称会自动追加到给定路由后面，构成新路由
-	// 以下注册会中注册两个新路由: /method/name, /method/age
-	g.Server().BindController("/method", new(Method), "Name, Age")
-	// 绑定路由到指定的方法执行，以下注册只会注册一个路由: /method-name
-	g.Server().BindControllerMethod("/method-name", new(Method), "Name")
-}
-
-func (c *Method) Name() {
-	c.Response.Write("John")
-}
-
-func (c *Method) Age() {
-	c.Response.Write("18")
-}
-
-func (c *Method) Info() {
-	c.Response.Write("Info")
-}

.example/frame/mvc/controller/demo/object.go

@@ -1,20 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type Object struct{}
-
-func init() {
-	g.Server().BindObject("/object", new(Object))
-}
-
-func (o *Object) Index(r *ghttp.Request) {
-	r.Response.Write("object index")
-}
-
-func (o *Object) Show(r *ghttp.Request) {
-	r.Response.Write("object show")
-}

.example/frame/mvc/controller/demo/object_method.go

@@ -1,31 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type ObjectMethod struct{}
-
-func init() {
-	obj := &ObjectMethod{}
-	g.Server().BindObject("/object-method", obj, "Show1, Show2, Show3")
-	g.Server().BindObjectMethod("/object-method-show1", obj, "Show1")
-	g.Server().Domain("localhost").BindObject("/object-method", obj, "Show4")
-}
-
-func (o *ObjectMethod) Show1(r *ghttp.Request) {
-	r.Response.Write("show 1")
-}
-
-func (o *ObjectMethod) Show2(r *ghttp.Request) {
-	r.Response.Write("show 2")
-}
-
-func (o *ObjectMethod) Show3(r *ghttp.Request) {
-	r.Response.Write("show 3")
-}
-
-func (o *ObjectMethod) Show4(r *ghttp.Request) {
-	r.Response.Write("show 4")
-}

.example/frame/mvc/controller/demo/object_rest.go

@@ -1,30 +0,0 @@
-package demo
-
-import "github.com/gogf/gf/net/ghttp"
-
-// 测试绑定对象
-type ObjectRest struct{}
-
-func init() {
-	ghttp.GetServer().BindObjectRest("/object-rest", &ObjectRest{})
-}
-
-// RESTFul - GET
-func (o *ObjectRest) Get(r *ghttp.Request) {
-	r.Response.Write("RESTFul HTTP Method GET")
-}
-
-// RESTFul - POST
-func (c *ObjectRest) Post(r *ghttp.Request) {
-	r.Response.Write("RESTFul HTTP Method POST")
-}
-
-// RESTFul - DELETE
-func (c *ObjectRest) Delete(r *ghttp.Request) {
-	r.Response.Write("RESTFul HTTP Method DELETE")
-}
-
-// 该方法无法映射，将会无法访问到
-func (c *ObjectRest) Hello(r *ghttp.Request) {
-	r.Response.Write("Hello")
-}

.example/frame/mvc/controller/demo/product.go

@@ -1,25 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type Product struct {
-	total int
-}
-
-func init() {
-	p := &Product{}
-	g.Server().BindHandler("/product/total", p.Total)
-	g.Server().BindHandler("/product/list/{page}.html", p.List)
-}
-
-func (p *Product) Total(r *ghttp.Request) {
-	p.total++
-	r.Response.Write("total: ", p.total)
-}
-
-func (p *Product) List(r *ghttp.Request) {
-	r.Response.Write("page: ", r.Get("page"))
-}

.example/frame/mvc/controller/demo/rest.go

@@ -1,34 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
-)
-
-type Rest struct {
-	gmvc.Controller
-}
-
-func init() {
-	g.Server().BindControllerRest("/rest", &Rest{})
-}
-
-// RESTFul - GET
-func (c *Rest) Get() {
-	c.Response.Write("RESTFul HTTP Method GET")
-}
-
-// RESTFul - POST
-func (c *Rest) Post() {
-	c.Response.Write("RESTFul HTTP Method POST")
-}
-
-// RESTFul - DELETE
-func (c *Rest) Delete() {
-	c.Response.Write("RESTFul HTTP Method DELETE")
-}
-
-// 该方法无法映射，将会无法访问到
-func (c *Rest) Hello() {
-	c.Response.Write("Hello")
-}

.example/frame/mvc/controller/demo/rule.go

@@ -1,18 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
-)
-
-type ControllerRule struct {
-	gmvc.Controller
-}
-
-func init() {
-	g.Server().BindController("/rule/{method}/:name", &ControllerRule{})
-}
-
-func (c *ControllerRule) Show() {
-	c.Response.Write(c.Request.Get("name"))
-}

.example/frame/mvc/controller/demo/session.go

@@ -1,17 +0,0 @@
-package demo
-
-import (
-	"strconv"
-
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func init() {
-	ghttp.GetServer().BindHandler("/session", Session)
-}
-
-func Session(r *ghttp.Request) {
-	id := r.Session.GetInt("id")
-	r.Session.Set("id", id+1)
-	r.Response.Write("id:" + strconv.Itoa(id))
-}

.example/frame/mvc/controller/demo/template.go

@@ -1,23 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/gmvc"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-type ControllerTemplate struct {
-	gmvc.Controller
-}
-
-func (c *ControllerTemplate) Info() {
-	c.View.Assign("name", "john")
-	c.View.Assigns(map[string]interface{}{
-		"age":   18,
-		"score": 100,
-	})
-	c.View.Display("view/user/index.tpl")
-}
-
-func init() {
-	ghttp.GetServer().BindController("/template", &ControllerTemplate{})
-}

.example/frame/mvc/controller/demo/template2.go

@@ -1,16 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func init() {
-	ghttp.GetServer().BindHandler("/template2", func(r *ghttp.Request) {
-		content, _ := g.View().Parse("index.tpl", map[string]interface{}{
-			"id":   123,
-			"name": "john",
-		})
-		r.Response.Write(content)
-	})
-}

.example/frame/mvc/controller/demo/template3.go

@@ -1,17 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/gins"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func init() {
-	gins.View().SetPath("/home/www/template/")
-	ghttp.GetServer().BindHandler("/template3", func(r *ghttp.Request) {
-		content, _ := gins.View().Parse("index.tpl", map[string]interface{}{
-			"id":   123,
-			"name": "john",
-		})
-		r.Response.Write(content)
-	})
-}

.example/frame/mvc/controller/demo/upload.go

@@ -1,40 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/gfile"
-)
-
-func Upload(r *ghttp.Request) {
-	if f, h, e := r.FormFile("upload-file"); e == nil {
-		defer f.Close()
-		fname := gfile.Basename(h.Filename)
-		buffer := make([]byte, h.Size)
-		f.Read(buffer)
-		gfile.PutBytes("/tmp/"+fname, buffer)
-		r.Response.Write(fname + " uploaded successly")
-	} else {
-		r.Response.Write(e.Error())
-	}
-}
-
-func UploadShow(r *ghttp.Request) {
-	r.Response.Write(`
-<html>
-<head>
-    <title>上传文件</title>
-</head>
-    <body>
-        <form enctype="multipart/form-data" action="/upload" method="post">
-            <input type="file" name="upload-file" />
-            <input type="submit" value="upload" />
-        </form>
-    </body>
-</html>
-`)
-}
-
-func init() {
-	ghttp.GetServer().BindHandler("/upload", Upload)
-	ghttp.GetServer().BindHandler("/upload/show", UploadShow)
-}

.example/frame/mvc/controller/demo/user.go

@@ -1,29 +0,0 @@
-package demo
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
-)
-
-type User struct {
-	gmvc.Controller
-}
-
-func init() {
-	s := g.Server()
-	s.BindController("/user", new(User))
-	s.BindController("/user/{.method}/{uid}", new(User), "Info")
-	s.BindController("/user/{.method}/{page}.html", new(User), "List")
-}
-
-func (u *User) Index() {
-	u.Response.Write("User")
-}
-
-func (u *User) Info() {
-	u.Response.Write("Info - Uid: ", u.Request.Get("uid"))
-}
-
-func (u *User) List() {
-	u.Response.Write("List - Page: ", u.Request.Get("page"))
-}

.example/frame/mvc/controller/stats/stats.go

@@ -1,19 +0,0 @@
-package stats
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-var (
-	total int
-)
-
-func init() {
-	g.Server().BindHandler("/stats/total", showTotal)
-}
-
-func showTotal(r *ghttp.Request) {
-	total++
-	r.Response.Write("total:", total)
-}

.example/frame/mvc/main.go

@@ -1,10 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/.example/frame/mvc/app/model/article"
-)
-
-func main() {
-	m := article.Model
-	m.All()
-}

.example/frame/mvc/view/upload/upload.tpl

@@ -1,11 +0,0 @@
-<html>
-<head>
-    <title>上传文件</title>
-</head>
-    <body>
-        <form enctype="multipart/form-data" action="/upload" method="post">
-            <input type="file" name="upload-file" />
-            <input type="submit" value="upload" />
-        </form>
-    </body>
-</html>

.example/frame/mvc/view/user/footer.tpl

@@ -1,2 +0,0 @@
-<h3>This is footer</h3>
-<div style="color:red">tpl vals: {{.}}</div>

.example/frame/mvc/view/user/index.tpl

@@ -1,11 +0,0 @@
-<html>
-    <head>
-        <title></title>
-    </head>
-
-    <body>
-    <h3>This is index</h3>
-    <p>tpl vals: {{.}}</p>
-    {{include "user/footer.tpl" }}
-    </body>
-</html>

.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,26 +1,23 @@
 package main
 
 import (
+	"context"
 	"fmt"
-
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/i18n/gi18n"
 )
 
 func main() {
-	t := gi18n.New()
-	t.SetPath("/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/.example/i18n/gi18n/i18n")
-	t.SetLanguage("en")
-	fmt.Println(t.Translate(`hello`))
-	fmt.Println(t.Translate(`{#hello}{#world}!`))
-
-	t.SetLanguage("ja")
-	fmt.Println(t.Translate(`hello`))
-	fmt.Println(t.Translate(`{#hello}{#world}!`))
-
-	t.SetLanguage("ru")
-	fmt.Println(t.Translate(`hello`))
-	fmt.Println(t.Translate(`{#hello}{#world}!`))
-
-	fmt.Println(t.Translate(`hello`, "zh-CN"))
-	fmt.Println(t.Translate(`{#hello}{#world}!`, "zh-CN"))
+	var (
+		orderId     = 865271654
+		orderAmount = 99.8
+	)
+	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/en.toml

@@ -1,3 +1 @@
-
-hello = "Hello"
-world = "World"
+OrderPaid = "You have successfully complete order #%d payment, paid amount: ￥%0.2f."

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

@@ -1,2 +1,3 @@
-hello = "你好"
-world = "世界"
+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/client/upload-batch/server.go

@@ -3,34 +3,16 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/gfile"
-	"io"
 )
 
 // Upload uploads files to /tmp .
 func Upload(r *ghttp.Request) {
-	saveDir := "/tmp/"
-	for _, item := range r.GetMultipartFiles("upload-file") {
-		file, err := item.Open()
-		if err != nil {
-			r.Response.Write(err)
-			return
-		}
-		defer file.Close()
-
-		f, err := gfile.Create(saveDir + gfile.Basename(item.Filename))
-		if err != nil {
-			r.Response.Write(err)
-			return
-		}
-		defer f.Close()
-
-		if _, err := io.Copy(f, file); err != nil {
-			r.Response.Write(err)
-			return
-		}
+	saveDirPath := "/tmp/"
+	files := r.GetUploadFiles("upload-file")
+	if _, err := files.Save(saveDirPath); err != nil {
+		r.Response.WriteExit(err)
 	}
-	r.Response.Write("upload successfully")
+	r.Response.WriteExit("upload successfully")
 }
 
 // UploadShow shows uploading simgle file page.
@@ -71,7 +53,7 @@ func UploadShowBatch(r *ghttp.Request) {
 func main() {
 	s := g.Server()
 	s.Group("/upload", func(group *ghttp.RouterGroup) {
-		group.ALL("/", Upload)
+		group.POST("/", Upload)
 		group.ALL("/show", UploadShow)
 		group.ALL("/batch", UploadShowBatch)
 	})

.example/net/ghttp/client/upload/client.go

@@ -2,12 +2,34 @@ package main
 
 import (
 	"fmt"
+	"github.com/gogf/gf/frame/g"
+	"path/filepath"
 
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/glog"
 )
 
+func SendXmlFile(gameId int, areaName string, filePath string) error {
+	path := filepath.FromSlash(filePath)
+	fmt.Println(path)
+	data := g.Map{
+		"gameName":    gameId,
+		"area":        areaName,
+		"file":        "@file:" + path,
+		"contentType": "json",
+	}
+	if r, err := ghttp.Post("http://127.0.0.1:8199/upload", data); err != nil {
+		panic(err)
+	} else {
+		defer r.Close()
+		fmt.Println("ok")
+	}
+	return nil
+}
+
 func main() {
+	SendXmlFile(1, "xxx", "/Users/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/.example/net/ghttp/server/session.go")
+	return
 	path := "/home/john/Workspace/Go/github.com/gogf/gf/version.go"
 	r, e := ghttp.Post("http://127.0.0.1:8199/upload", "upload-file=@file:"+path)
 	if e != nil {

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

@@ -3,34 +3,16 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/gfile"
-	"io"
 )
 
 // Upload uploads files to /tmp .
 func Upload(r *ghttp.Request) {
-	saveDir := "/tmp/"
-	for _, item := range r.GetMultipartFiles("upload-file") {
-		file, err := item.Open()
-		if err != nil {
-			r.Response.Write(err)
-			return
-		}
-		defer file.Close()
-
-		f, err := gfile.Create(saveDir + gfile.Basename(item.Filename))
-		if err != nil {
-			r.Response.Write(err)
-			return
-		}
-		defer f.Close()
-
-		if _, err := io.Copy(f, file); err != nil {
-			r.Response.Write(err)
-			return
-		}
+	saveDirPath := "/tmp/"
+	files := r.GetUploadFiles("file")
+	if _, err := files.Save(saveDirPath); err != nil {
+		r.Response.WriteExit(err)
 	}
-	r.Response.Write("upload successfully")
+	r.Response.WriteExit("upload successfully")
 }
 
 // UploadShow shows uploading simgle file page.
@@ -71,7 +53,7 @@ func UploadShowBatch(r *ghttp.Request) {
 func main() {
 	s := g.Server()
 	s.Group("/upload", func(group *ghttp.RouterGroup) {
-		group.ALL("/", Upload)
+		group.POST("/", Upload)
 		group.ALL("/show", UploadShow)
 		group.ALL("/batch", UploadShowBatch)
 	})

.example/net/ghttp/server/body.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"io/ioutil"
+)
+
+func main() {
+	s := g.Server()
+	s.SetIndexFolder(true)
+	s.BindHandler("/", func(r *ghttp.Request) {
+		body1 := r.GetBody()
+		body2, _ := ioutil.ReadAll(r.Body)
+		fmt.Println(body1)
+		fmt.Println(body2)
+		r.Response.Write("hello world")
+	})
+	s.SetPort(8999)
+	s.Run()
+}

.example/net/ghttp/server/cors/cors1.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/glog"
 )
 
 func MiddlewareCORS(r *ghttp.Request) {
@@ -11,6 +12,7 @@ func MiddlewareCORS(r *ghttp.Request) {
 }
 
 func Order(r *ghttp.Request) {
+	glog.Println("order")
 	r.Response.Write("GET")
 }
 
@@ -18,7 +20,7 @@ func main() {
 	s := g.Server()
 	s.Group("/api.v1", func(group *ghttp.RouterGroup) {
 		group.Middleware(MiddlewareCORS)
-		g.GET("/order", Order)
+		group.GET("/order", Order)
 	})
 	s.SetPort(8199)
 	s.Run()

.example/net/ghttp/server/cors/cors2.go

@@ -20,7 +20,7 @@ func main() {
 	s := g.Server()
 	s.Group("/api.v1", func(group *ghttp.RouterGroup) {
 		group.Middleware(MiddlewareCORS)
-		g.GET("/order", Order)
+		group.GET("/order", Order)
 	})
 	s.SetPort(8199)
 	s.Run()

.example/net/ghttp/server/cors/cors3.go

@@ -26,7 +26,7 @@ func main() {
 	s := g.Server()
 	s.Group("/api.v1", func(group *ghttp.RouterGroup) {
 		group.Middleware(MiddlewareCORS)
-		g.GET("/order", Order)
+		group.GET("/order", Order)
 	})
 	s.SetPort(8199)
 	s.Run()

.example/net/ghttp/server/exit.go

@@ -15,10 +15,10 @@ func main() {
 		r.Response.Writeln("end")
 	})
 	s.BindHookHandlerByMap(p, map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+		ghttp.HookBeforeServe: func(r *ghttp.Request) {
 			glog.To(r.Response.Writer).Println("BeforeServe")
 		},
-		ghttp.HOOK_AFTER_SERVE: func(r *ghttp.Request) {
+		ghttp.HookAfterServe: func(r *ghttp.Request) {
 			glog.To(r.Response.Writer).Println("AfterServe")
 		},
 	})

.example/net/ghttp/server/hello.go

@@ -3,15 +3,12 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
 	s := g.Server()
-	s.SetIndexFolder(true)
 	s.BindHandler("/", func(r *ghttp.Request) {
-		glog.Println(r.Header)
-		r.Response.Write("hello world")
+		r.Response.Write("Hello World")
 	})
 	s.SetPort(8999)
 	s.Run()

.example/net/ghttp/server/hooks/cors2.go

@@ -12,7 +12,7 @@ func Order(r *ghttp.Request) {
 func main() {
 	s := g.Server()
 	s.Group("/api.v1", func(group *ghttp.RouterGroup) {
-		group.Hook("/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+		group.Hook("/*any", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 			r.Response.CORSDefault()
 		})
 		g.GET("/order", Order)

.example/net/ghttp/server/hooks/hooks1.go

@@ -11,10 +11,10 @@ func main() {
 	p := "/:name/info/{uid}"
 	s := g.Server()
 	s.BindHookHandlerByMap(p, map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE:  func(r *ghttp.Request) { glog.Println(ghttp.HOOK_BEFORE_SERVE) },
-		ghttp.HOOK_AFTER_SERVE:   func(r *ghttp.Request) { glog.Println(ghttp.HOOK_AFTER_SERVE) },
-		ghttp.HOOK_BEFORE_OUTPUT: func(r *ghttp.Request) { glog.Println(ghttp.HOOK_BEFORE_OUTPUT) },
-		ghttp.HOOK_AFTER_OUTPUT:  func(r *ghttp.Request) { glog.Println(ghttp.HOOK_AFTER_OUTPUT) },
+		ghttp.HookBeforeServe:  func(r *ghttp.Request) { glog.Println(ghttp.HookBeforeServe) },
+		ghttp.HookAfterServe:   func(r *ghttp.Request) { glog.Println(ghttp.HookAfterServe) },
+		ghttp.HookBeforeOutput: func(r *ghttp.Request) { glog.Println(ghttp.HookBeforeOutput) },
+		ghttp.HookAfterOutput:  func(r *ghttp.Request) { glog.Println(ghttp.HookAfterOutput) },
 	})
 	s.BindHandler(p, func(r *ghttp.Request) {
 		r.Response.Write("用户:", r.Get("name"), ", uid:", r.Get("uid"))

.example/net/ghttp/server/hooks/hooks4.go

@@ -11,7 +11,7 @@ func main() {
 	// 多事件回调示例，事件1
 	pattern1 := "/:name/info"
 	s.BindHookHandlerByMap(pattern1, map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+		ghttp.HookBeforeServe: func(r *ghttp.Request) {
 			r.SetParam("uid", 1000)
 		},
 	})
@@ -22,7 +22,7 @@ func main() {
 	// 多事件回调示例，事件2
 	pattern2 := "/{object}/list/{page}.java"
 	s.BindHookHandlerByMap(pattern2, map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_OUTPUT: func(r *ghttp.Request) {
+		ghttp.HookBeforeOutput: func(r *ghttp.Request) {
 			r.Response.SetBuffer([]byte(
 				fmt.Sprintf("通过事件修改输出内容, object:%s, page:%s", r.Get("object"), r.GetRouterString("page"))),
 			)

.example/net/ghttp/server/hooks/hooks5.go

@@ -7,10 +7,10 @@ import (
 
 func main() {
 	s := g.Server()
-	s.BindHookHandler("/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+	s.BindHookHandler("/*any", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 		r.Response.Writeln("/*any")
 	})
-	s.BindHookHandler("/v1/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+	s.BindHookHandler("/v1/*", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 		r.Response.Writeln("/v1/*")
 		r.ExitHook()
 	})

.example/net/ghttp/server/hooks/hooks_param.go

@@ -11,7 +11,7 @@ func main() {
 		r.Response.Writeln(r.Get("name"))
 	})
 	s.BindHookHandlerByMap("/", map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+		ghttp.HookBeforeServe: func(r *ghttp.Request) {
 			r.SetParam("name", "john")
 		},
 	})

.example/net/ghttp/server/hooks/same_route_multi_hook.go

@@ -12,17 +12,17 @@ func main() {
 	})
 
 	s.BindHookHandlerByMap("/priority/:name", map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+		ghttp.HookBeforeServe: func(r *ghttp.Request) {
 			r.Response.Writeln("/priority/:name")
 		},
 	})
 	s.BindHookHandlerByMap("/priority/*any", map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+		ghttp.HookBeforeServe: func(r *ghttp.Request) {
 			r.Response.Writeln("/priority/*any")
 		},
 	})
 	s.BindHookHandlerByMap("/priority/show", map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+		ghttp.HookBeforeServe: func(r *ghttp.Request) {
 			r.Response.Writeln("/priority/show")
 		},
 	})

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

@@ -19,7 +19,7 @@ func MiddlewareAuth(r *ghttp.Request) {
 func main() {
 	s := g.Server()
 	s.Group("/admin", func(group *ghttp.RouterGroup) {
-		g.MiddlewarePattern("/*action", func(r *ghttp.Request) {
+		group.Middleware(func(r *ghttp.Request) {
 			if action := r.GetRouterString("action"); action != "" {
 				switch action {
 				case "login":

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

@@ -25,14 +25,12 @@ func MiddlewareCORS(r *ghttp.Request) {
 
 func MiddlewareLog(r *ghttp.Request) {
 	r.Middleware.Next()
-	glog.Println(r.Response.Status, r.URL.Path)
+	g.Log().Println(r.Response.Status, r.URL.Path)
 }
 
 func main() {
 	s := g.Server()
-	s.Group("/", func(group *ghttp.RouterGroup) {
-		group.Middleware(MiddlewareLog)
-	})
+	s.Use(MiddlewareLog)
 	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
 		group.Middleware(MiddlewareAuth, MiddlewareCORS)
 		group.ALL("/user/list", func(r *ghttp.Request) {

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

@@ -13,24 +13,24 @@ func main() {
 			r.Middleware.Next()
 			r.Response.Write("end")
 		})
-		g.Group("/order", func(group *ghttp.RouterGroup) {
-			g.GET("/list", func(r *ghttp.Request) {
+		group.Group("/order", func(group *ghttp.RouterGroup) {
+			group.GET("/list", func(r *ghttp.Request) {
 				r.Response.Write("list")
 			})
 		})
-		g.Group("/user", func(group *ghttp.RouterGroup) {
-			g.GET("/info", func(r *ghttp.Request) {
+		group.Group("/user", func(group *ghttp.RouterGroup) {
+			group.GET("/info", func(r *ghttp.Request) {
 				r.Response.Write("info")
 			})
-			g.POST("/edit", func(r *ghttp.Request) {
+			group.POST("/edit", func(r *ghttp.Request) {
 				r.Response.Write("edit")
 			})
 		})
-		g.Group("/hook", func(group *ghttp.RouterGroup) {
-			group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+		group.Group("/hook", func(group *ghttp.RouterGroup) {
+			group.Hook("/*", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 				r.Response.Write("hook any")
 			})
-			group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+			group.Hook("/:name", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 				r.Response.Write("hook name")
 			})
 		})

.example/net/ghttp/server/object/user.go

@@ -5,21 +5,18 @@ import (
 	"github.com/gogf/gf/net/ghttp"
 )
 
-type User struct {
-}
+type User struct{}
 
-func (c *User) Index(r *ghttp.Request) {
-	r.Response.Write("Index")
-}
-
-// 不符合规范，不会被注册
-func (c *User) Test(r *ghttp.Request, value interface{}) {
+func (c *User) Test(r *ghttp.Request) {
 	r.Response.Write("Test")
 }
 
 func main() {
 	s := g.Server()
-	s.BindObject("/user", new(User))
+	u := new(User)
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.GET("/db-{table}/{id}", u, "Test")
+	})
 	s.SetPort(8199)
 	s.Run()
 }

.example/net/ghttp/server/pprof.go

@@ -1,12 +1,13 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	s := ghttp.GetServer()
-	s.EnablePProf()
+	s := g.Server()
+	s.Domain("localhost").EnablePProf()
 	s.BindHandler("/", func(r *ghttp.Request) {
 		r.Response.Writeln("哈喽世界！")
 	})

.example/net/ghttp/server/reload/admin.go

@@ -6,12 +6,8 @@ import (
 
 func main() {
 	s := g.Server()
+	s.SetConfigWithMap(g.Map{"Graceful": true})
 	s.EnableAdmin()
-	//s.BindHookHandler("/admin/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
-	//    if !r.BasicAuth("admin", "123", "") {
-	//        r.Exit()
-	//    }
-	//})
 	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/resource/resource.go

@@ -18,7 +18,7 @@ func main() {
 	s := g.Server()
 	s.SetIndexFolder(true)
 	s.SetServerRoot("root")
-	s.BindHookHandler("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+	s.BindHookHandler("/*", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 		fmt.Println(r.URL.Path, r.IsFileRequest())
 	})
 	s.BindHandler("/template", func(r *ghttp.Request) {

.example/net/ghttp/server/router/duplicated/duplicated.go

@@ -0,0 +1,20 @@
+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("/test", func(r *ghttp.Request) {
+			r.Response.Writeln(1)
+		})
+		group.ALL("/test", func(r *ghttp.Request) {
+			r.Response.Writeln(2)
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/router/group/batch.go

@@ -27,7 +27,7 @@ func main() {
 	s := g.Server()
 	obj := new(Object)
 	s.Group("/api").Bind([]ghttp.GroupItem{
-		{"ALL", "*", HookHandler, ghttp.HOOK_BEFORE_SERVE},
+		{"ALL", "*", HookHandler, ghttp.HookBeforeServe},
 		{"ALL", "/handler", Handler},
 		{"ALL", "/obj", obj},
 		{"GET", "/obj/show", obj, "Show"},

.example/net/ghttp/server/router/group/level.go

@@ -54,10 +54,10 @@ func main() {
 			})
 		})
 		group.Group("/hook", func(group *ghttp.RouterGroup) {
-			group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+			group.Hook("/*", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 				r.Response.Write("hook any")
 			})
-			group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+			group.Hook("/:name", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 				r.Response.Write("hook name")
 			})
 		})

.example/net/ghttp/server/router/router5.go

@@ -9,7 +9,7 @@ import (
 
 func main() {
 	s := g.Server()
-	s.BindHookHandler("/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+	s.BindHookHandler("/*any", ghttp.HookBeforeServe, func(r *ghttp.Request) {
 		fmt.Println(r.Router)
 		fmt.Println(r.Get("customer_id"))
 	})

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

@@ -9,14 +9,14 @@ import (
 func main() {
 	s := g.Server()
 	s.Group("/", func(group *ghttp.RouterGroup) {
-		g.GET("/set", func(r *ghttp.Request) {
-			r.Session.Set("time", gtime.Second())
+		group.GET("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Timestamp())
 			r.Response.Write("ok")
 		})
-		g.GET("/get", func(r *ghttp.Request) {
+		group.GET("/get", func(r *ghttp.Request) {
 			r.Response.WriteJson(r.Session.Map())
 		})
-		g.GET("/clear", func(r *ghttp.Request) {
+		group.GET("/clear", func(r *ghttp.Request) {
 			r.Session.Clear()
 		})
 	})