version updates

fix tcp http demo error content-length

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

@@ -1,15 +1,9 @@
-// Copyright 2017 gf Author(https://github.com/gogf/gf). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
 package driver
 
 import (
+	"context"
 	"database/sql"
 	"github.com/gogf/gf/database/gdb"
-	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"
 )
 
@@ -48,32 +42,30 @@ func (d *MyDriver) New(core *gdb.Core, node *gdb.ConfigNode) (gdb.DB, error) {
 
 // DoQuery commits the sql string and its arguments to underlying driver
 // through given link object and returns the execution result.
-func (d *MyDriver) DoQuery(link gdb.Link, sql string, args ...interface{}) (rows *sql.Rows, err error) {
+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(link, sql, args...)
-	if _, err := d.DriverMysql.InsertIgnore("monitor", g.Map{
-		"sql":   gdb.FormatSqlWithArgs(sql, args),
-		"cost":  gtime.TimestampMilli() - tsMilli,
-		"time":  gtime.Now(),
-		"error": err.Error(),
-	}); err != nil {
-		panic(err)
-	}
+	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(link gdb.Link, sql string, args ...interface{}) (result sql.Result, err error) {
+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(link, sql, args...)
-	if _, err := d.DriverMysql.InsertIgnore("monitor", g.Map{
-		"sql":   gdb.FormatSqlWithArgs(sql, args),
-		"cost":  gtime.TimestampMilli() - tsMilli,
-		"time":  gtime.Now(),
-		"error": err.Error(),
-	}); err != nil {
-		panic(err)
-	}
+	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/mysql/config.toml

@@ -1,9 +1,18 @@
 
-# MySQL数据库配置
+# MySQL.
 [database]
-	debug   = true
-    link    = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"
-    MaxOpen = 100
+    [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_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_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,12 +1,15 @@
 package main
 
 import (
+	"fmt"
 	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	db := g.DB()
-	db.SetDebug(true)
-
-	db.Table("user").Data("num=num+1").Where("id", 8).Update()
+	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/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,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/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/middleware.go

@@ -27,10 +27,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/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/redirect/redirect_to.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	s := g.Server()
+	s.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.RedirectTo("/login")
+	})
+	s.BindHandler("/login", func(r *ghttp.Request) {
+		r.Response.Writeln("Login First")
+	})
+	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/servefile/servefile.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	s := g.Server()
+	s.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.ServeFile("test.txt")
+	})
+	s.SetPort(8999)
+	s.Run()
+}

.example/net/ghttp/server/servefile/servefiledownload.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	s := g.Server()
+	s.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.ServeFileDownload("test.txt")
+	})
+	s.SetPort(8999)
+	s.Run()
+}

.example/net/ghttp/server/servefile/test.txt

@@ -0,0 +1 @@
+test

.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/net/gsmtp/gsmtp_sendMail.go

@@ -1,4 +1,4 @@
-// Copyright 2017 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
 //
 // This Source Code Form is subject to the terms of the MIT License.
 // If a copy of the MIT was not distributed with this file,

.example/net/gtcp/gtcp_conn.go

@@ -16,7 +16,7 @@ func main() {
 	}
 	defer conn.Close()
 
-	if err := conn.Send([]byte("GET / HTTP/1.1\n\n")); err != nil {
+	if err := conn.Send([]byte("GET / HTTP/1.1\r\n\r\n")); err != nil {
 		panic(err)
 	}
 
@@ -30,13 +30,14 @@ func main() {
 			array := bytes.Split(data, []byte(": "))
 			// 获得页面内容长度
 			if contentLength == 0 && len(array) == 2 && bytes.EqualFold([]byte("Content-Length"), array[0]) {
-				contentLength = gconv.Int(array[1])
+				// http 以\r\n换行，需要把\r也去掉
+				contentLength = gconv.Int(string(array[1][:len(array[1])-1]))
 			}
 			header = append(header, data...)
 			header = append(header, '\n')
 		}
-		// header读取完毕，读取文本内容
-		if contentLength > 0 && len(data) == 0 {
+		// header读取完毕，读取文本内容, 1为\r
+		if contentLength > 0 && len(data) == 1 {
 			content, _ = conn.Recv(contentLength)
 			break
 		}

.example/os/gcache/getorset_func_lock.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/os/gcache"
+	"github.com/gogf/gf/os/gctx"
+	"time"
+)
+
+func main() {
+	var (
+		ch    = make(chan struct{}, 0)
+		ctx   = gctx.New()
+		key   = `key`
+		value = `value`
+	)
+	for i := 0; i < 10; i++ {
+		go func(index int) {
+			<-ch
+			_, _ = gcache.Ctx(ctx).GetOrSetFuncLock(key, func() (interface{}, error) {
+				fmt.Println(index, "entered")
+				return value, nil
+			}, 0)
+		}(i)
+	}
+	close(ch)
+	time.Sleep(time.Second)
+}

.example/os/gcache/note_interface_key.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/os/gcache"
+	"github.com/gogf/gf/os/gctx"
+)
+
+func main() {
+	var (
+		ctx           = gctx.New()
+		key1  int32   = 1
+		key2  float64 = 1
+		value         = `value`
+	)
+	_ = gcache.Ctx(ctx).Set(key1, value, 0)
+	fmt.Println(gcache.Ctx(ctx).Get(key1))
+	fmt.Println(gcache.Ctx(ctx).Get(key2))
+}

.example/os/gcache/note_interface_value.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/os/gcache"
+	"github.com/gogf/gf/os/gctx"
+)
+
+func main() {
+	type User struct {
+		Id   int
+		Name string
+		Site string
+	}
+	var (
+		ctx   = gctx.New()
+		user  *User
+		key   = `UserKey`
+		value = &User{
+			Id:   1,
+			Name: "GoFrame",
+			Site: "https://goframe.org",
+		}
+	)
+	_ = gcache.Ctx(ctx).Set(key, value, 0)
+	v, _ := gcache.Ctx(ctx).GetVar(key)
+	_ = v.Scan(&user)
+	fmt.Printf(`%#v`, user)
+}

.example/os/glog/glog_CtxKeys.go

@@ -0,0 +1,14 @@
+package main
+
+import (
+	"context"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	g.Log().SetCtxKeys("TraceId", "SpanId", "Test")
+	ctx := context.WithValue(context.Background(), "TraceId", "1234567890")
+	ctx = context.WithValue(ctx, "SpanId", "abcdefg")
+
+	g.Log().Ctx(ctx).Print(1, 2, 3)
+}

.example/os/glog/glog_SetConfigWithMap.go

@@ -6,7 +6,7 @@ import (
 )
 
 func main() {
-	err := glog.SetConfigWithMap(g.Map{
+	err := g.Log().SetConfigWithMap(g.Map{
 		"prefix": "[TEST]",
 	})
 	if err != nil {

.example/os/glog/glog_async_chaining.go

@@ -1,14 +1,13 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"time"
-
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
 	for i := 0; i < 10; i++ {
-		glog.Async().Print("async log", i)
+		g.Log().Async().Print("async log", i)
 	}
 	time.Sleep(time.Second)
 }

.example/os/glog/glog_async_configure.go

@@ -1,15 +1,14 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"time"
-
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
-	glog.SetAsync(true)
+	g.Log().SetAsync(true)
 	for i := 0; i < 10; i++ {
-		glog.Async().Print("async log", i)
+		g.Log().Print("async log", i)
 	}
 	time.Sleep(time.Second)
 }

.example/os/glog/glog_category.go

@@ -3,13 +3,12 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gfile"
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
 	path := "/tmp/glog-cat"
-	glog.SetPath(path)
-	glog.Stdout(false).Cat("cat1").Cat("cat2").Println("test")
+	g.Log().SetPath(path)
+	g.Log().Stdout(false).Cat("cat1").Cat("cat2").Println("test")
 	list, err := gfile.ScanDir(path, "*", true)
 	g.Dump(err)
 	g.Dump(list)

.example/os/glog/glog_color.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	g.Log().Print("Print")
+	g.Log().Debug("Debug")
+	g.Log().Info("Info")
+	g.Log().Notice("Notice")
+	g.Log().Warning("Warning")
+	g.Log().Error("Error")
+	g.Log().Critical("Critical")
+}

.example/os/glog/glog_ctx.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	"context"
-	"github.com/gogf/gf/os/glog"
-)
-
-func main() {
-	glog.SetCtxKeys("Trace-Id", "Span-Id", "Test")
-	ctx := context.WithValue(context.Background(), "Trace-Id", "1234567890")
-	ctx = context.WithValue(ctx, "Span-Id", "abcdefg")
-
-	glog.Ctx(ctx).Print(1, 2, 3)
-}

.example/os/glog/glog_debug.go

@@ -1,19 +1,19 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"time"
 
-	"github.com/gogf/gf/os/glog"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/os/gtimer"
 )
 
 func main() {
 	gtimer.SetTimeout(3*time.Second, func() {
-		glog.SetDebug(false)
+		g.Log().SetDebug(false)
 	})
 	for {
-		glog.Debug(gtime.Datetime())
+		g.Log().Debug(gtime.Datetime())
 		time.Sleep(time.Second)
 	}
 }

.example/os/glog/glog_file.go

@@ -3,24 +3,25 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gfile"
-	"github.com/gogf/gf/os/glog"
 )
 
 // 设置日志等级
 func main() {
-	l := glog.New()
 	path := "/tmp/glog"
-	l.SetPath(path)
-	l.SetStdoutPrint(false)
+	g.Log().SetPath(path)
+	g.Log().SetStdoutPrint(false)
+
 	// 使用默认文件名称格式
-	l.Println("标准文件名称格式，使用当前时间时期")
+	g.Log().Println("标准文件名称格式，使用当前时间时期")
+
 	// 通过SetFile设置文件名称格式
-	l.SetFile("stdout.log")
-	l.Println("设置日志输出文件名称格式为同一个文件")
+	g.Log().SetFile("stdout.log")
+	g.Log().Println("设置日志输出文件名称格式为同一个文件")
+
 	// 链式操作设置文件名称格式
-	l.File("stderr.log").Println("支持链式操作")
-	l.File("error-{Ymd}.log").Println("文件名称支持带gtime日期格式")
-	l.File("access-{Ymd}.log").Println("文件名称支持带gtime日期格式")
+	g.Log().File("stderr.log").Println("支持链式操作")
+	g.Log().File("error-{Ymd}.log").Println("文件名称支持带gtime日期格式")
+	g.Log().File("access-{Ymd}.log").Println("文件名称支持带gtime日期格式")
 
 	list, err := gfile.ScanDir(path, "*")
 	g.Dump(err)

.example/os/glog/glog_flags.go

@@ -1,15 +1,15 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
-	l := glog.New()
-	l.SetFlags(glog.F_TIME_TIME | glog.F_FILE_SHORT)
-	l.Println("time and short line number")
-	l.SetFlags(glog.F_TIME_MILLI | glog.F_FILE_LONG)
-	l.Println("time with millisecond and long line number")
-	l.SetFlags(glog.F_TIME_STD | glog.F_FILE_LONG)
-	l.Println("standard time format and long line number")
+	g.Log().SetFlags(glog.F_TIME_TIME | glog.F_FILE_SHORT)
+	g.Log().Println("time and short line number")
+	g.Log().SetFlags(glog.F_TIME_MILLI | glog.F_FILE_LONG)
+	g.Log().Println("time with millisecond and long line number")
+	g.Log().SetFlags(glog.F_TIME_STD | glog.F_FILE_LONG)
+	g.Log().Println("standard time format and long line number")
 }

.example/os/glog/glog_gerror.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"errors"
+	"github.com/gogf/gf/frame/g"
 
 	"github.com/gogf/gf/errors/gerror"
-	"github.com/gogf/gf/os/glog"
 )
 
 func MakeError() error {
@@ -18,8 +18,8 @@ func MakeGError() error {
 func TestGError() {
 	err1 := MakeError()
 	err2 := MakeGError()
-	glog.Error(err1)
-	glog.Error(err2)
+	g.Log().Error(err1)
+	g.Log().Error(err2)
 }
 
 func main() {

.example/os/glog/glog_json.go

@@ -2,15 +2,14 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
-	glog.Debug(g.Map{"uid": 100, "name": "john"})
+	g.Log().Debug(g.Map{"uid": 100, "name": "john"})
 
 	type User struct {
 		Uid  int    `json:"uid"`
 		Name string `json:"name"`
 	}
-	glog.Debug(User{100, "john"})
+	g.Log().Debug(User{100, "john"})
 }

.example/os/glog/glog_level.go

@@ -1,13 +1,13 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
 )
 
 // 设置日志等级，过滤掉Info日志信息
 func main() {
-	l := glog.New()
-	l.Info("info1")
-	l.SetLevel(glog.LEVEL_ALL ^ glog.LEVEL_INFO)
-	l.Info("info2")
+	g.Log().Info("info1")
+	g.Log().SetLevel(glog.LEVEL_ALL ^ glog.LEVEL_INFO)
+	g.Log().Info("info2")
 }

.example/os/glog/glog_level_prefix.go

@@ -1,11 +1,11 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
-	l := glog.New()
-	l.SetLevelPrefix(glog.LEVEL_DEBU, "debug")
-	l.Debug("test")
+	g.Log().SetLevelPrefix(glog.LEVEL_DEBU, "debug")
+	g.Log().Debug("test")
 }

.example/os/glog/glog_line.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	glog.Line().Debug("this is the short file name with its line number")
-	glog.Line(true).Debug("lone file name with line number")
+	g.Log().Line().Debug("this is the short file name with its line number")
+	g.Log().Line(true).Debug("lone file name with line number")
 }

.example/os/glog/glog_line2.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/frame/g"
 )
 
 func PrintLog(content string) {
-	glog.Skip(0).Line().Println("line number with skip:", content)
-	glog.Line(true).Println("line number without skip:", content)
+	g.Log().Skip(0).Line().Println("line number with skip:", content)
+	g.Log().Line(true).Println("line number without skip:", content)
 }
 
 func main() {

.example/os/glog/glog_path.go

@@ -3,14 +3,13 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gfile"
-	"github.com/gogf/gf/os/glog"
 )
 
 // 设置日志输出路径
 func main() {
 	path := "/tmp/glog"
-	glog.SetPath(path)
-	glog.Println("日志内容")
+	g.Log().SetPath(path)
+	g.Log().Println("日志内容")
 	list, err := gfile.ScanDir(path, "*")
 	g.Dump(err)
 	g.Dump(list)

.example/os/glog/glog_pool.go

@@ -1,18 +1,18 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"time"
 
-	"github.com/gogf/gf/os/glog"
 	"github.com/gogf/gf/os/gtime"
 )
 
 // 测试删除日志文件是否会重建日志文件
 func main() {
 	path := "/Users/john/Temp/test"
-	glog.SetPath(path)
+	g.Log().SetPath(path)
 	for {
-		glog.Println(gtime.Now().String())
+		g.Log().Println(gtime.Now().String())
 		time.Sleep(time.Second)
 	}
 }

.example/os/glog/glog_prefix.go

@@ -1,12 +1,11 @@
 package main
 
 import (
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	l := glog.New()
-	l.SetPrefix("[API]")
-	l.Println("hello world")
-	l.Error("error occurred")
+	g.Log().SetPrefix("[API]")
+	g.Log().Println("hello world")
+	g.Log().Error("error occurred")
 }

.example/os/glog/glog_stack.go

@@ -2,15 +2,11 @@ package main
 
 import (
 	"fmt"
-
-	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
+	g.Log().PrintStack()
 
-	glog.PrintStack()
-	glog.New().PrintStack()
-
-	fmt.Println(glog.GetStack())
-	fmt.Println(glog.New().GetStack())
+	fmt.Println(g.Log().GetStack())
 }

.example/os/glog/glog_stdout.go

@@ -1,22 +1,23 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"sync"
-
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
-	wg := sync.WaitGroup{}
-	c := make(chan struct{})
+	var (
+		wg = sync.WaitGroup{}
+		ch = make(chan struct{})
+	)
 	wg.Add(3000)
 	for i := 0; i < 3000; i++ {
 		go func() {
-			<-c
-			glog.Println("abcdefghijklmnopqrstuvwxyz1234567890")
+			<-ch
+			g.Log().Println("abcdefghijklmnopqrstuvwxyz1234567890")
 			wg.Done()
 		}()
 	}
-	close(c)
+	close(ch)
 	wg.Wait()
 }

.example/os/glog/glog_writer_hook.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
+	"github.com/gogf/gf/frame/g"
 
-	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/glog"
 	"github.com/gogf/gf/text/gregex"
 )
@@ -16,7 +16,7 @@ func (w *MyWriter) Write(p []byte) (n int, err error) {
 	s := string(p)
 	if gregex.IsMatchString(`\[(PANI|FATA)\]`, s) {
 		fmt.Println("SERIOUS ISSUE OCCURRED!! I'd better tell monitor in first time!")
-		ghttp.PostContent("http://monitor.mydomain.com", s)
+		g.Client().PostContent("http://monitor.mydomain.com", s)
 	}
 	return w.logger.Write(p)
 }

.example/os/glog/handler/glog_handler_greylog.go

@@ -0,0 +1,31 @@
+package main
+
+//import (
+//	"context"
+//	"github.com/gogf/gf/frame/g"
+//	"github.com/gogf/gf/os/glog"
+//	"github.com/robertkowalski/graylog-golang"
+//)
+//
+//var greyLogClient = gelf.New(gelf.Config{
+//	GraylogPort:     80,
+//	GraylogHostname: "graylog-host.com",
+//	Connection:      "wan",
+//	MaxChunkSizeWan: 42,
+//	MaxChunkSizeLan: 1337,
+//})
+//
+//// LoggingGreyLogHandler is an example handler for logging content to remote GreyLog service.
+//var LoggingGreyLogHandler glog.Handler = func(ctx context.Context, in *glog.HandlerInput) {
+//	in.Next()
+//	greyLogClient.Log(in.Buffer.String())
+//}
+//
+//func main() {
+//	g.Log().SetHandlers(LoggingGreyLogHandler)
+//
+//	g.Log().Debug("Debugging...")
+//	g.Log().Warning("It is warning info")
+//	g.Log().Error("Error occurs, please have a check")
+//	glog.Println("test log")
+//}

.example/os/glog/handler/glog_handler_json.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/internal/json"
+	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/text/gstr"
+	"os"
+)
+
+// JsonOutputsForLogger is for JSON marshaling in sequence.
+type JsonOutputsForLogger struct {
+	Time    string `json:"time"`
+	Level   string `json:"level"`
+	Content string `json:"content"`
+}
+
+// LoggingJsonHandler is an example handler for logging JSON format content.
+var LoggingJsonHandler glog.Handler = func(ctx context.Context, in *glog.HandlerInput) {
+	jsonForLogger := JsonOutputsForLogger{
+		Time:    in.TimeFormat,
+		Level:   in.LevelFormat,
+		Content: gstr.Trim(in.String()),
+	}
+	jsonBytes, err := json.Marshal(jsonForLogger)
+	if err != nil {
+		_, _ = os.Stderr.WriteString(err.Error())
+		return
+	}
+	in.Buffer.Write(jsonBytes)
+	in.Buffer.WriteString("\n")
+	in.Next()
+}
+
+func main() {
+	g.Log().SetHandlers(LoggingJsonHandler)
+
+	g.Log().Debug("Debugging...")
+	g.Log().Warning("It is warning info")
+	g.Log().Error("Error occurs, please have a check")
+}

.example/os/gmlock/1.lock&unlock.go

@@ -10,8 +10,10 @@ import (
 
 // 内存锁基本使用
 func main() {
-	key := "lock"
-	wg := sync.WaitGroup{}
+	var (
+		key = "lock"
+		wg  = sync.WaitGroup{}
+	)
 	for i := 0; i < 10; i++ {
 		wg.Add(1)
 		go func(i int) {

.example/os/gmlock/3.lock_conflicts.go

@@ -13,7 +13,7 @@ func main() {
 	key := "key"
 
 	// 第一次锁带时间
-	gmlock.Lock(key, 1000)
+	gmlock.Lock(key)
 	glog.Println("lock1")
 	// 这个时候上一次的计时解锁已失效
 	gmlock.Unlock(key)

.example/os/gmlock/4.test_deadlock.go

@@ -11,12 +11,13 @@ import (
 
 // 测试Locker是否会产生死锁
 func main() {
-	l := gmlock.New()
-	wg := sync.WaitGroup{}
-	key := "test"
-	event := make(chan int)
-	number := 100000
-
+	var (
+		l      = gmlock.New()
+		wg     = sync.WaitGroup{}
+		key    = "test"
+		event  = make(chan int)
+		number = 100000
+	)
 	for i := 0; i < number; i++ {
 		wg.Add(1)
 		go func() {

.example/os/gmlock/locker2.go

@@ -1,23 +0,0 @@
-package main
-
-import (
-	"sync"
-
-	"github.com/gogf/gf/os/glog"
-	"github.com/gogf/gf/os/gmlock"
-)
-
-// 内存锁 - 给定过期时间
-func main() {
-	key := "lock"
-	wg := sync.WaitGroup{}
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func(i int) {
-			gmlock.Lock(key, 1000)
-			glog.Println(i)
-			wg.Done()
-		}(i)
-	}
-	wg.Wait()
-}

.example/os/gmlock/test_mutex.go

@@ -1,95 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"math/rand"
-	"sync"
-	"time"
-
-	"github.com/gogf/gf/os/gmlock"
-)
-
-// 测试是否会产生死锁
-func main() {
-	mu := gmlock.NewMutex()
-	wg := sync.WaitGroup{}
-	event := make(chan int)
-	number := 100000
-
-	for i := 0; i < number; i++ {
-		wg.Add(1)
-		go func() {
-			<-event
-			mu.Lock()
-			//fmt.Println("get lock")
-			mu.Unlock()
-			wg.Done()
-		}()
-	}
-
-	for i := 0; i < number; i++ {
-		wg.Add(1)
-		go func() {
-			<-event
-			mu.RLock()
-			//fmt.Println("get rlock")
-			mu.RUnlock()
-			wg.Done()
-		}()
-	}
-
-	for i := 0; i < number; i++ {
-		wg.Add(1)
-		go func() {
-			<-event
-			if mu.TryLock() {
-				//fmt.Println("get lock")
-				mu.Unlock()
-			}
-			wg.Done()
-		}()
-	}
-
-	for i := 0; i < number; i++ {
-		wg.Add(1)
-		go func() {
-			<-event
-			if mu.TryRLock() {
-				//fmt.Println("get rlock")
-				mu.RUnlock()
-			}
-			wg.Done()
-		}()
-	}
-
-	for i := 0; i < number; i++ {
-		wg.Add(1)
-		go func() {
-			<-event
-			if mu.TryLock() {
-				// 模拟业务逻辑的随机处理间隔
-				time.Sleep(time.Duration(rand.Intn(100)) * time.Millisecond)
-				mu.Unlock()
-			}
-			wg.Done()
-		}()
-	}
-
-	for i := 0; i < number; i++ {
-		wg.Add(1)
-		go func() {
-			<-event
-			if mu.TryRLock() {
-				// 模拟业务逻辑的随机处理间隔
-				time.Sleep(time.Duration(rand.Intn(100)) * time.Millisecond)
-				mu.RUnlock()
-			}
-			wg.Done()
-		}()
-	}
-	// 使用chan作为事件发送测试指令，让所有的goroutine同时执行
-	close(event)
-	wg.Wait()
-
-	fmt.Println("done!")
-}

.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/os/gview/layout/layout1/main.go

@@ -2,19 +2,18 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
+	"github.com/gogf/gf/net/ghttp"
 )
 
-type Controller struct {
-	gmvc.Controller
-}
-
-func (c *Controller) Test() {
-	c.View.Display("layout.html")
-}
 func main() {
 	s := g.Server()
-	s.BindControllerMethod("/", new(Controller), "Test")
+	s.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.WriteTpl("layout.html", g.Map{
+			"header":    "This is header",
+			"container": "This is container",
+			"footer":    "This is footer",
+		})
+	})
 	s.SetPort(8199)
 	s.Run()
 }

.example/os/gview/layout/layout1/template/container.html

@@ -1,3 +1,3 @@
 {{define "container"}}
-<h1>CONTAINER</h1>
+<h1>{{.container}}</h1>
 {{end}}

.example/os/gview/layout/layout1/template/footer.html

@@ -1,3 +1,3 @@
 {{define "footer"}}
-<h1>FOOTER</h1>
+<h1>{{.footer}}</h1>
 {{end}}

.example/os/gview/layout/layout1/template/header.html

@@ -1,3 +1,3 @@
 {{define "header"}}
-    <h1>HEADER</h1>
+    <h1>{{.header}}</h1>
 {{end}}

.example/os/gview/layout/layout1/template/layout.html

@@ -2,14 +2,14 @@
 <html>
 <head>
     <title>GoFrame Layout</title>
-    {{template "header"}}
+    {{template "header" .}}
 </head>
 <body>
     <div class="container">
-    {{template "container"}}
+    {{template "container" .}}
     </div>
     <div class="footer">
-    {{template "footer"}}
+    {{template "footer" .}}
     </div>
 </body>
 </html>

.example/os/gview/layout/layout2/main.go

@@ -9,11 +9,13 @@ func main() {
 	s := g.Server()
 	s.BindHandler("/main1", func(r *ghttp.Request) {
 		r.Response.WriteTpl("layout.html", g.Map{
+			"name":    "smith",
 			"mainTpl": "main/main1.html",
 		})
 	})
 	s.BindHandler("/main2", func(r *ghttp.Request) {
 		r.Response.WriteTpl("layout.html", g.Map{
+			"name":    "john",
 			"mainTpl": "main/main2.html",
 		})
 	})

.example/util/gutil/try_catch.go

@@ -11,7 +11,7 @@ func main() {
 		fmt.Println(1)
 		gutil.Throw("error")
 		fmt.Println(2)
-	}, func(err interface{}) {
+	}, func(err error) {
 		fmt.Println(err)
 	})
 }

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

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"github.com/gogf/gf/net/ghttp"
+
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/i18n/gi18n"
+)
+
+func main() {
+	type User struct {
+		Name    string `v:"required#ReuiredUserName"`
+		Type    int    `v:"required#ReuiredUserType"`
+		Project string `v:"size:10#MustSize"`
+	}
+	s := g.Server()
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.Middleware(func(r *ghttp.Request) {
+			lang := r.GetString("lang", "zh-CN")
+			r.SetCtx(gi18n.WithLanguage(r.Context(), lang))
+			r.Middleware.Next()
+		})
+		group.GET("/validate", func(r *ghttp.Request) {
+			var (
+				err  error
+				user = User{}
+			)
+			if err = r.Parse(&user); err != nil {
+				r.Response.WriteExit(err)
+			}
+			r.Response.WriteExit(user)
+		})
+	})
+	s.SetPort(8199)
+}

.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())
 }