release updates

.example/container/garray/json_marshal.go

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

.example/container/garray/json_unmarshal.go

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

.example/container/glist/basic.go

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

.example/container/glist/json_marshal.go

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

.example/container/glist/json_unmarshal.go

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

.example/container/gmap/basic.go

@@ -9,7 +9,7 @@ import (
 func main() {
 	// 创建一个默认的gmap对象，
 	// 默认情况下该gmap对象不支持并发安全特性，
-	// 初始化时可以给定true参数关闭并发安全特性，当做一个普通的map使用。
+	// 初始化时可以给定true参数开启并发安全特性，用以并发安全场景。
 	m := gmap.New()
 
 	// 设置键值对

.example/container/gmap/gmap_json.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/gogf/gf/container/gmap"
-)
-
-func main() {
-	m := gmap.NewIntIntMap()
-	m.Set(1, 2)
-	m.Set(3, 4)
-	b, err := json.Marshal(m)
-	fmt.Println(err)
-	fmt.Println(string(b))
-}

.example/container/gmap/gmap_json_marshal.go

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

.example/container/gmap/gmap_json_unmarshal.go

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

.example/container/gmap/gmap_map_clone_safe.go

@@ -6,7 +6,7 @@ import (
 )
 
 func main() {
-	m1 := gmap.New()
+	m1 := gmap.New(true)
 	m1.Set("1", "1")
 
 	m2 := m1.Map()

.example/container/gset/json_marshal.go

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

.example/container/gset/json_unmarshal.go

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

.example/container/gtype/json_marshal.go

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

.example/container/gtype/json_unmarshal.go

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

.example/container/gvar/json_marshal.go

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

.example/container/gvar/json_unmarshal.go

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

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

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

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

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

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

@@ -1,533 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/gogf/gf/database/gdb"
-	"github.com/gogf/gf/frame/g"
-)
-
-// 本文件用于gf框架的mysql数据库操作示例，不作为单元测试使用
-
-var db gdb.DB
-
-// 初始化配置及创建数据库
-func init() {
-	gdb.AddDefaultConfigNode(gdb.ConfigNode{
-		Host:    "127.0.0.1",
-		Port:    "3306",
-		User:    "root",
-		Pass:    "12345678",
-		Name:    "test",
-		Type:    "mysql",
-		Role:    "master",
-		Charset: "utf8",
-	})
-	db, _ = gdb.New()
-
-	//gins.Config().SetPath("/home/john/Workspace/Go/GOPATH/src/github.com/gogf/gf/.example/frame")
-	//db = g.Database()
-
-	//gdb.SetConfig(gdb.ConfigNode {
-	//    Host : "127.0.0.1",
-	//    Port : 3306,
-	//    User : "root",
-	//    Pass : "123456",
-	//    Name : "test",
-	//    Type : "mysql",
-	//})
-	//db, _ = gdb.Instance()
-
-	//gdb.SetConfig(gdb.Config {
-	//    "default" : gdb.ConfigGroup {
-	//        gdb.ConfigNode {
-	//            Host     : "127.0.0.1",
-	//            Port     : "3306",
-	//            User     : "root",
-	//            Pass     : "123456",
-	//            Name     : "test",
-	//            Type     : "mysql",
-	//            Role     : "master",
-	//            Weight : 100,
-	//        },
-	//        gdb.ConfigNode {
-	//            Host     : "127.0.0.2",
-	//            Port     : "3306",
-	//            User     : "root",
-	//            Pass     : "123456",
-	//            Name     : "test",
-	//            Type     : "mysql",
-	//            Role     : "master",
-	//            Weight : 100,
-	//        },
-	//        gdb.ConfigNode {
-	//            Host     : "127.0.0.3",
-	//            Port     : "3306",
-	//            User     : "root",
-	//            Pass     : "123456",
-	//            Name     : "test",
-	//            Type     : "mysql",
-	//            Role     : "master",
-	//            Weight : 100,
-	//        },
-	//        gdb.ConfigNode {
-	//            Host     : "127.0.0.4",
-	//            Port     : "3306",
-	//            User     : "root",
-	//            Pass     : "123456",
-	//            Name     : "test",
-	//            Type     : "mysql",
-	//            Role     : "master",
-	//            Weight : 100,
-	//        },
-	//    },
-	//})
-	//db, _ = gdb.Instance()
-}
-
-// 创建测试数据库
-func create() {
-	fmt.Println("create:")
-	_, err := db.Exec("CREATE DATABASE IF NOT EXISTS test")
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	s := `
-        CREATE TABLE IF NOT EXISTS user (
-            uid  INT(10) UNSIGNED AUTO_INCREMENT,
-            name VARCHAR(45),
-            PRIMARY KEY (uid)
-        )
-        ENGINE = InnoDB
-        DEFAULT CHARACTER SET = utf8
-    `
-	_, err = db.Exec(s)
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	s = `
-        CREATE TABLE IF NOT EXISTS user_detail (
-            uid   INT(10) UNSIGNED AUTO_INCREMENT,
-            site  VARCHAR(255),
-            PRIMARY KEY (uid)
-        )
-        ENGINE = InnoDB
-        DEFAULT CHARACTER SET = utf8
-    `
-
-	_, err = db.Exec(s)
-	if err != nil {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 数据写入
-func insert() {
-	fmt.Println("insert:")
-	r, err := db.Insert("user", gdb.Map{
-		"name": "john",
-	})
-	if err == nil {
-		uid, err2 := r.LastInsertId()
-		if err2 == nil {
-			r, err = db.Insert("user_detail", gdb.Map{
-				"uid":  uid,
-				"site": "http://johng.cn",
-			})
-			if err == nil {
-				fmt.Printf("uid: %d\n", uid)
-			} else {
-				fmt.Println(err)
-			}
-		} else {
-			fmt.Println(err2)
-		}
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 基本sql查询
-func query() {
-	fmt.Println("query:")
-	list, err := db.GetAll("select * from user limit 2")
-	if err == nil {
-		fmt.Println(list)
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// replace into
-func replace() {
-	fmt.Println("replace:")
-	r, err := db.Save("user", gdb.Map{
-		"uid":  1,
-		"name": "john",
-	})
-	if err == nil {
-		fmt.Println(r.LastInsertId())
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 数据保存
-func save() {
-	fmt.Println("save:")
-	r, err := db.Save("user", gdb.Map{
-		"uid":  1,
-		"name": "john",
-	})
-	if err == nil {
-		fmt.Println(r.LastInsertId())
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 批量写入
-func batchInsert() {
-	fmt.Println("batchInsert:")
-	_, err := db.BatchInsert("user", gdb.List{
-		{"name": "john_1"},
-		{"name": "john_2"},
-		{"name": "john_3"},
-		{"name": "john_4"},
-	}, 10)
-	if err != nil {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 数据更新
-func update1() {
-	fmt.Println("update1:")
-	r, err := db.Update("user", gdb.Map{"name": "john1"}, "uid=?", 1)
-	if err == nil {
-		fmt.Println(r.LastInsertId())
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 数据更新
-func update2() {
-	fmt.Println("update2:")
-	r, err := db.Update("user", gdb.Map{"name": "john6"}, "uid=?", 1)
-	if err == nil {
-		fmt.Println(r.LastInsertId())
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 数据更新
-func update3() {
-	fmt.Println("update3:")
-	r, err := db.Update("user", "name=?", "uid=?", "john2", 1)
-	if err == nil {
-		fmt.Println(r.LastInsertId())
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式查询操作1
-func linkopSelect1() {
-	fmt.Println("linkopSelect1:")
-	r, err := db.Table("user u").LeftJoin("user_detail ud", "u.uid=ud.uid").Fields("u.*, ud.site").Where("u.uid > ?", 1).Limit(0, 2).Select()
-	if err == nil {
-		fmt.Println(r)
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式查询操作2
-func linkopSelect2() {
-	fmt.Println("linkopSelect2:")
-	r, err := db.Table("user u").LeftJoin("user_detail ud", "u.uid=ud.uid").Fields("u.*,ud.site").Where("u.uid=?", 1).One()
-	if err == nil {
-		fmt.Println(r)
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式查询操作3
-func linkopSelect3() {
-	fmt.Println("linkopSelect3:")
-	r, err := db.Table("user u").LeftJoin("user_detail ud", "u.uid=ud.uid").Fields("ud.site").Where("u.uid=?", 1).Value()
-	if err == nil {
-		fmt.Println(r.String())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式查询数量1
-func linkopCount1() {
-	fmt.Println("linkopCount1:")
-	r, err := db.Table("user u").Fields("uid").LeftJoin("user_detail ud", "u.uid=ud.uid").Where("u.uid=?", 1).Count()
-	if err == nil {
-		fmt.Println(r)
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 错误操作
-func linkopUpdate1() {
-	fmt.Println("linkopUpdate1:")
-	r, err := db.Table("henghe_setting").Update()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 通过Map指针方式传参方式
-func linkopUpdate2() {
-	fmt.Println("linkopUpdate2:")
-	r, err := db.Table("user").Data(gdb.Map{"name": "john2"}).Where("name=?", "john_1").Update()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 通过字符串方式传参
-func linkopUpdate3() {
-	fmt.Println("linkopUpdate3:")
-	r, err := db.Table("user").Data("name='john3'").Where("name=?", "john2").Update()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// Where条件使用Map
-func linkopUpdate4() {
-	fmt.Println("linkopUpdate4:")
-	r, err := db.Table("user").Data(gdb.Map{"name": "john11111"}).Where(g.Map{"uid": 1}).Update()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式批量写入
-func linkopBatchInsert1() {
-	fmt.Println("linkopBatchInsert1:")
-	r, err := db.Table("user").Data(gdb.List{
-		{"name": "john_1"},
-		{"name": "john_2"},
-		{"name": "john_3"},
-		{"name": "john_4"},
-	}).Insert()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式批量写入，指定每批次写入的条数
-func linkopBatchInsert2() {
-	fmt.Println("linkopBatchInsert2:")
-	r, err := db.Table("user").Data(gdb.List{
-		{"name": "john_1"},
-		{"name": "john_2"},
-		{"name": "john_3"},
-		{"name": "john_4"},
-	}).Batch(2).Insert()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 链式批量保存
-func linkopBatchSave() {
-	fmt.Println("linkopBatchSave:")
-	r, err := db.Table("user").Data(gdb.List{
-		{"uid": 1, "name": "john_1"},
-		{"uid": 2, "name": "john_2"},
-		{"uid": 3, "name": "john_3"},
-		{"uid": 4, "name": "john_4"},
-	}).Save()
-	if err == nil {
-		fmt.Println(r.RowsAffected())
-	} else {
-		fmt.Println(err)
-	}
-	fmt.Println()
-}
-
-// 事务操作示例1
-func transaction1() {
-	fmt.Println("transaction1:")
-	if tx, err := db.Begin(); err == nil {
-		r, err := tx.Save("user", gdb.Map{
-			"uid":  1,
-			"name": "john",
-		})
-		tx.Rollback()
-		fmt.Println(r, err)
-	}
-	fmt.Println()
-}
-
-// 事务操作示例2
-func transaction2() {
-	fmt.Println("transaction2:")
-	if tx, err := db.Begin(); err == nil {
-		r, err := tx.Table("user").Data(gdb.Map{"uid": 1, "name": "john_1"}).Save()
-		tx.Commit()
-		fmt.Println(r, err)
-	}
-	fmt.Println()
-}
-
-// 主从io复用测试，在mysql中使用 show full processlist 查看链接信息
-func keepPing() {
-	fmt.Println("keepPing:")
-	for {
-		fmt.Println("ping...")
-		err := db.PingMaster()
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		err = db.PingSlave()
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-		time.Sleep(1 * time.Second)
-	}
-}
-
-// like语句查询
-func likeQuery() {
-	fmt.Println("likeQuery:")
-	if r, err := db.Table("user").Where("name like ?", "%john%").Select(); err == nil {
-		fmt.Println(r)
-	} else {
-		fmt.Println(err)
-	}
-}
-
-// mapToStruct
-func mapToStruct() {
-	type User struct {
-		Uid  int
-		Name string
-	}
-	fmt.Println("mapToStruct:")
-	if r, err := db.Table("user").Where("uid=?", 1).One(); err == nil {
-		u := User{}
-		if err := r.ToStruct(&u); err == nil {
-			fmt.Println(r)
-			fmt.Println(u)
-		} else {
-			fmt.Println(err)
-		}
-	} else {
-		fmt.Println(err)
-	}
-}
-
-// getQueriedSqls
-func getQueriedSqls() {
-	for k, v := range db.GetQueriedSqls() {
-		fmt.Println(k, ":")
-		fmt.Println("Sql  :", v.Sql)
-		fmt.Println("Args :", v.Args)
-		fmt.Println("Error:", v.Error)
-		fmt.Println("Func :", v.Func)
-	}
-}
-
-func main() {
-	//data := g.Map{
-	//    "nickname" : "john",
-	//}
-	//db.SetDebug(true)
-	//r, err := db.Table("user").Where("id=1").Data(data).Update()
-	//fmt.Println(err)
-	//fmt.Println(r.RowsAffected())
-
-	//data2 := g.Map{
-	//   "adsys1" : "ss",
-	//}
-	//db.SetDebug(true)
-	//r, err := db.Table("cd_adsys").Where("adsys0=1").Data(data2).Update()
-	//fmt.Println(err)
-	//fmt.Println(r.RowsAffected())
-	//return
-	//db.SetDebug(true)
-	//r, err := db.Table("test").Where("id=1").One()
-	//fmt.Println(r["datetime"])
-	//fmt.Println(r["datetime"].Time().Date())
-	//fmt.Println(err)
-	//create()
-	//create()
-	//insert()
-	//query()
-	//replace()
-	//save()
-	//batchInsert()
-	//update1()
-	//update2()
-	//update3()
-	linkopSelect1()
-	//linkopSelect2()
-	//linkopSelect3()
-	//linkopCount1()
-	//linkopUpdate1()
-	//linkopUpdate2()
-	//linkopUpdate3()
-	//linkopUpdate4()
-	//
-	//transaction1()
-	//transaction2()
-	//
-	//keepPing()
-	//likeQuery()
-	//mapToStruct()
-	//getQueriedSqls()
-}

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

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

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

@@ -2,22 +2,26 @@ package main
 
 import (
 	"fmt"
+	"github.com/gogf/gf/database/gdb"
 	"time"
-
-	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	db := g.DB()
-	// 开启调试模式，以便于记录所有执行的SQL
+	//db := g.DB()
+
+	gdb.AddDefaultConfigNode(gdb.ConfigNode{
+		LinkInfo: "root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local",
+		Type:     "mysql",
+		Charset:  "utf8",
+	})
+	db, _ := gdb.New()
+
 	db.SetDebug(true)
 
-	r, e := db.Table("user").Data(g.Map{
-		"passport":    "1",
-		"password":    "1",
-		"nickname":    "1",
-		"create_time": time.Now(),
-	}).Insert()
+	type User struct {
+		CreateTime time.Time `orm:"create_time"`
+	}
+	r, e := db.Table("user").Data(User{CreateTime: time.Now()}).Insert()
 	if e != nil {
 		panic(e)
 	}

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

@@ -1,20 +1,24 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gtime"
 )
 
 func main() {
 	db := g.DB()
-	db.SetDebug(true)
+	//db.SetDebug(true)
 
-	r, e := db.Table("test").Where("id IN (?)", []interface{}{1, 2}).All()
+	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)
 	}
-	if r != nil {
-		fmt.Println(r.ToList())
-	}
+	g.Dump(user)
+
 }

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

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

.example/debug/gdebug/gdebug.go

@@ -6,6 +6,7 @@ import (
 )
 
 func main() {
+	gdebug.PrintStack()
 	fmt.Println(gdebug.CallerPackage())
 	fmt.Println(gdebug.CallerFunction())
 }

.example/encoding/gjson/issue360.go

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

.example/frame/mvc/app/model/defaults/user.go

@@ -0,0 +1,60 @@
+// This is auto-generated by gf cli tool. You may not really want to edit it.
+
+package defaults
+
+import (
+	"database/sql"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+)
+
+import (
+	"github.com/gogf/gf/os/gtime"
+)
+
+// User is the golang structure for table user.
+type User struct {
+	Id         int         `orm:"id,primary"      json:"id"`
+	Passport   string      `orm:"passport"        json:"passport"`
+	Password   string      `orm:"password"        json:"password"`
+	Nickname   string      `orm:"nickname,unique" json:"nickname"`
+	CreateTime *gtime.Time `orm:"create_time"     json:"create_time"`
+}
+
+var (
+	// TableUser is the table name of user.
+	TableUser = "user"
+	// ModelUser is the model object of user.
+	ModelUser = g.DB("default").Table(TableUser).Safe()
+)
+
+// Inserts does "INSERT...INTO..." statement for inserting current object into table.
+func (r *User) Insert() (result sql.Result, err error) {
+	return ModelUser.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 *User) Replace() (result sql.Result, err error) {
+	return ModelUser.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 *User) Save() (result sql.Result, err error) {
+	return ModelUser.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 *User) Update() (result sql.Result, err error) {
+	return ModelUser.Data(r).Where(gdb.GetWhereConditionOfStruct(r)).Update()
+}
+
+// Delete does "DELETE FROM...WHERE..." statement for deleting current object from table.
+func (r *User) Delete() (result sql.Result, err error) {
+	return ModelUser.Where(gdb.GetWhereConditionOfStruct(r)).Delete()
+}

.example/frame/mvc/config.toml

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

.example/frame/mvc/main.go

@@ -1,15 +1,13 @@
 package main
 
 import (
-	_ "github.com/gogf/gf/.example/frame/mvc/controller/demo"
-	_ "github.com/gogf/gf/.example/frame/mvc/controller/stats"
-	"github.com/gogf/gf/frame/g"
+	"fmt"
+	"github.com/gogf/gf/.example/frame/mvc/app/model/defaults"
+	"github.com/gogf/gf/database/gdb"
 )
 
 func main() {
-
-	//g.Server().SetDumpRouteMap(false)
-	g.Server().SetPort(8199)
-	g.Server().Run()
-
+	u := defaults.User{Id: 1, Nickname: "test"}
+	fmt.Println(gdb.GetWhereConditionOfStruct(&u))
+	fmt.Println(u.Replace())
 }

.example/frame/mvc/model/test/Initialization.go

@@ -1,8 +0,0 @@
-package test
-
-import "github.com/gogf/gf/database/gdb"
-
-var (
-	// ConfigGroup is the configuration group name for this model.
-	ConfigGroup = gdb.DEFAULT_GROUP_NAME
-)

.example/frame/mvc/model/test/User.go

@@ -1,92 +0,0 @@
-package test
-
-import (
-	"database/sql"
-
-	"github.com/gogf/gf/frame/g"
-
-	"github.com/gogf/gf/database/gdb"
-	"github.com/gogf/gf/os/gtime"
-)
-
-// User is the golang structure for table user.
-type User struct {
-	Id         int         `orm:"id,primary"  json:"id"`
-	Passport   string      `orm:"passport"    json:"passport"`
-	Password   string      `orm:"password"    json:"password"`
-	NickName   string      `orm:"nickname"    json:"nick_name"`
-	CreateTime *gtime.Time `orm:"create_time" json:"create_time"`
-}
-
-// UserModel is the model of convenient operations for table user.
-type UserModel struct {
-	*gdb.Model
-	TableName string
-}
-
-var (
-	// UserTableName is the table name of user.
-	UserTableName = "user"
-)
-
-// ModelUser creates and returns a new model object for table user.
-func ModelUser() *UserModel {
-	return &UserModel{
-		g.DB(ConfigGroup).Table(UserTableName).Safe(),
-		UserTableName,
-	}
-}
-
-// Inserts does "INSERT...INTO..." statement for inserting current object into table.
-func (r *User) Insert() (result sql.Result, err error) {
-	return ModelUser().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 *User) Replace() (result sql.Result, err error) {
-	return ModelUser().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 *User) Save() (result sql.Result, err error) {
-	return ModelUser().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 *User) Update() (result sql.Result, err error) {
-	return ModelUser().Data(r).Where(gdb.GetWhereConditionOfStruct(r)).Update()
-}
-
-// Delete does "DELETE FROM...WHERE..." statement for deleting current object from table.
-func (r *User) Delete() (result sql.Result, err error) {
-	return ModelUser().Where(gdb.GetWhereConditionOfStruct(r)).Delete()
-}
-
-// Select overwrite the Select method from gdb.Model for model
-// as retuning all objects with specified structure.
-func (m *UserModel) Select() ([]*User, error) {
-	array := ([]*User)(nil)
-	if err := m.Scan(&array); err != nil {
-		return nil, err
-	}
-	return array, nil
-}
-
-// First does the same logistics as One method from gdb.Model for model
-// as retuning first/one object with specified structure.
-func (m *UserModel) First() (*User, error) {
-	list, err := m.Select()
-	if err != nil {
-		return nil, err
-	}
-	if len(list) > 0 {
-		return list[0], nil
-	}
-	return nil, nil
-}

.example/net/ghttp/client/get.go

@@ -1,19 +1,12 @@
 package main
 
 import (
-	"crypto/tls"
 	"fmt"
-	"net/http"
-
 	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	c := ghttp.NewClient()
-	c.Transport = &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	r, e := c.Clone().Get("https://127.0.0.1:8199")
-	fmt.Println(e)
-	fmt.Println(r.StatusCode)
+	r, err := ghttp.Get("http://127.0.0.1:8199/11111/11122")
+	fmt.Println(err)
+	fmt.Println(r.Header)
 }

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

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/glog"
+)
+
+func main() {
+	path1 := "/Users/john/Pictures/logo1.png"
+	path2 := "/Users/john/Pictures/logo2.png"
+	r, e := ghttp.Post(
+		"http://127.0.0.1:8199/upload",
+		fmt.Sprintf(`upload-file=@file:%s&upload-file=@file:%s`, path1, path2),
+	)
+	if e != nil {
+		glog.Error(e)
+	} else {
+		fmt.Println(string(r.ReadAll()))
+		r.Close()
+	}
+}

.example/net/ghttp/client/upload-batch/client2.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/glog"
+)
+
+func main() {
+	path1 := "/Users/john/Pictures/logo1.png"
+	path2 := "/Users/john/Pictures/logo2.png"
+	r, e := ghttp.Post(
+		"http://127.0.0.1:8199/upload",
+		fmt.Sprintf(`upload-file[]=@file:%s&upload-file[]=@file:%s`, path1, path2),
+	)
+	if e != nil {
+		glog.Error(e)
+	} else {
+		fmt.Println(string(r.ReadAll()))
+		r.Close()
+	}
+}

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

@@ -0,0 +1,80 @@
+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
+		}
+	}
+	r.Response.Write("upload successfully")
+}
+
+// UploadShow shows uploading simgle file page.
+func UploadShow(r *ghttp.Request) {
+	r.Response.Write(`
+    <html>
+    <head>
+        <title>GF Upload File Demo</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>
+    `)
+}
+
+// UploadShowBatch shows uploading multiple files page.
+func UploadShowBatch(r *ghttp.Request) {
+	r.Response.Write(`
+    <html>
+    <head>
+        <title>GF Upload Files Demo</title>
+    </head>
+        <body>
+            <form enctype="multipart/form-data" action="/upload" method="post">
+                <input type="file" name="upload-file" />
+                <input type="file" name="upload-file" />
+                <input type="submit" value="upload" />
+            </form>
+        </body>
+    </html>
+    `)
+}
+
+func main() {
+	s := g.Server()
+	s.Group("/upload", func(group *ghttp.RouterGroup) {
+		group.ALL("/", Upload)
+		group.ALL("/show", UploadShow)
+		group.ALL("/batch", UploadShowBatch)
+	})
+	s.SetPort(8199)
+	s.Run()
+}

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

@@ -9,7 +9,7 @@ import (
 
 func main() {
 	path := "/home/john/Workspace/Go/github.com/gogf/gf/version.go"
-	r, e := ghttp.Post("http://127.0.0.1:8199/upload", "name=john&age=18&upload-file=@file:"+path)
+	r, e := ghttp.Post("http://127.0.0.1:8199/upload", "upload-file=@file:"+path)
 	if e != nil {
 		glog.Error(e)
 	} else {

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

@@ -4,28 +4,41 @@ import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/gfile"
+	"io"
 )
 
-// 执行文件上传处理，上传到系统临时目录 /tmp
+// Upload uploads files to /tmp .
 func Upload(r *ghttp.Request) {
-	if f, h, e := r.FormFile("upload-file"); e == nil {
+	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()
-		name := gfile.Basename(h.Filename)
-		buffer := make([]byte, h.Size)
-		f.Read(buffer)
-		gfile.PutBytes("/tmp/"+name, buffer)
-		r.Response.Write(name + " uploaded successly")
-	} else {
-		r.Response.Write(e.Error())
+
+		if _, err := io.Copy(f, file); err != nil {
+			r.Response.Write(err)
+			return
+		}
 	}
+	r.Response.Write("upload successfully")
 }
 
-// 展示文件上传页面
+// UploadShow shows uploading simgle file page.
 func UploadShow(r *ghttp.Request) {
 	r.Response.Write(`
     <html>
     <head>
-        <title>上传文件</title>
+        <title>GF Upload File Demo</title>
     </head>
         <body>
             <form enctype="multipart/form-data" action="/upload" method="post">
@@ -37,10 +50,31 @@ func UploadShow(r *ghttp.Request) {
     `)
 }
 
+// UploadShowBatch shows uploading multiple files page.
+func UploadShowBatch(r *ghttp.Request) {
+	r.Response.Write(`
+    <html>
+    <head>
+        <title>GF Upload Files Demo</title>
+    </head>
+        <body>
+            <form enctype="multipart/form-data" action="/upload" method="post">
+                <input type="file" name="upload-file" />
+                <input type="file" name="upload-file" />
+                <input type="submit" value="upload" />
+            </form>
+        </body>
+    </html>
+    `)
+}
+
 func main() {
 	s := g.Server()
-	s.BindHandler("/upload", Upload)
-	s.BindHandler("/upload/show", UploadShow)
+	s.Group("/upload", func(group *ghttp.RouterGroup) {
+		group.ALL("/", Upload)
+		group.ALL("/show", UploadShow)
+		group.ALL("/batch", UploadShowBatch)
+	})
 	s.SetPort(8199)
 	s.Run()
 }

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

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

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

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

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

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

.example/net/ghttp/server/form/form-client.go

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	ghttp.PostContent("http://127.0.0.1:8199/", "array[]=1&array[]=2")
+}

.example/net/ghttp/server/form/form.go

@@ -8,7 +8,7 @@ import (
 func main() {
 	s := g.Server()
 	s.BindHandler("/", func(r *ghttp.Request) {
-		g.Dump(r.GetPostMap())
+		g.Dump(r.GetForm("array"))
 		r.Response.WriteTpl("form.html")
 	})
 	s.SetPort(8199)

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

@@ -3,14 +3,16 @@ 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")
 	})
-	s.SetPort(8199)
+	s.SetPort(8999)
 	s.Run()
 }

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

@@ -2,26 +2,18 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
 	"github.com/gogf/gf/net/ghttp"
 )
 
-type Order struct {
-	gmvc.Controller
-}
-
-func (o *Order) Get() {
-	o.Response.Write("GET")
+func Order(r *ghttp.Request) {
+	r.Response.Write("GET")
 }
 
 func main() {
 	s := g.Server()
-	s.BindHookHandlerByMap("/api.v1/*any", map[string]ghttp.HandlerFunc{
-		"BeforeServe": func(r *ghttp.Request) {
-			r.Response.SetAllowCrossDomainRequest("*", "PUT,GET,POST,DELETE,OPTIONS")
-		},
+	s.Group("/api.v1", func(group *ghttp.RouterGroup) {
+		g.GET("/order", Order)
 	})
-	s.BindControllerRest("/api.v1/{.struct}", new(Order))
 	s.SetPort(8199)
 	s.Run()
 }

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

@@ -2,26 +2,21 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
 	"github.com/gogf/gf/net/ghttp"
 )
 
-type Order2 struct {
-	gmvc.Controller
-}
-
-func (o *Order2) Get() {
-	o.Response.Write("GET")
+func Order(r *ghttp.Request) {
+	r.Response.Write("GET")
 }
 
 func main() {
 	s := g.Server()
-	s.BindHookHandlerByMap("/api.v2/*any", map[string]ghttp.HandlerFunc{
-		"BeforeServe": func(r *ghttp.Request) {
+	s.Group("/api.v1", func(group *ghttp.RouterGroup) {
+		group.Hook("/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
 			r.Response.CORSDefault()
-		},
+		})
+		g.GET("/order", Order)
 	})
-	s.BindControllerRest("/api.v2/{.struct}", new(Order2))
 	s.SetPort(8199)
 	s.Run()
 }

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

@@ -11,12 +11,10 @@ func main() {
 	p := "/:name/info/{uid}"
 	s := g.Server()
 	s.BindHookHandlerByMap(p, map[string]ghttp.HandlerFunc{
-		"BeforeServe":  func(r *ghttp.Request) { glog.Println("BeforeServe") },
-		"AfterServe":   func(r *ghttp.Request) { glog.Println("AfterServe") },
-		"BeforeOutput": func(r *ghttp.Request) { glog.Println("BeforeOutput") },
-		"AfterOutput":  func(r *ghttp.Request) { glog.Println("AfterOutput") },
-		"BeforeClose":  func(r *ghttp.Request) { glog.Println("BeforeClose") },
-		"AfterClose":   func(r *ghttp.Request) { glog.Println("AfterClose") },
+		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) },
 	})
 	s.BindHandler(p, func(r *ghttp.Request) {
 		r.Response.Write("用户:", r.Get("name"), ", uid:", r.Get("uid"))

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

@@ -1,38 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-)
-
-func main() {
-	s := g.Server()
-
-	// 多事件回调示例，事件1
-	pattern1 := "/:name/info"
-	s.BindHookHandlerByMap(pattern1, map[string]ghttp.HandlerFunc{
-		"BeforeServe": func(r *ghttp.Request) {
-			r.SetQuery("uid", "1000")
-		},
-	})
-	s.BindHandler(pattern1, func(r *ghttp.Request) {
-		r.Response.Write("用户:", r.Get("name"), ", uid:", r.GetQueryString("uid"))
-	})
-
-	// 多事件回调示例，事件2
-	pattern2 := "/{object}/list/{page}.java"
-	s.BindHookHandlerByMap(pattern2, map[string]ghttp.HandlerFunc{
-		"BeforeOutput": func(r *ghttp.Request) {
-			r.Response.SetBuffer([]byte(
-				fmt.Sprintf("通过事件修改输出内容, object:%s, page:%s", r.Get("object"), r.GetRouterString("page"))),
-			)
-		},
-	})
-	s.BindHandler(pattern2, func(r *ghttp.Request) {
-		r.Response.Write(r.Router.Uri)
-	})
-	s.SetPort(8199)
-	s.Run()
-}

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

@@ -1,31 +1,35 @@
 package main
 
 import (
+	"fmt"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/glog"
 )
 
 func main() {
 	s := g.Server()
-	s.BindHandler("/priority/show", func(r *ghttp.Request) {
-		r.Response.Write("priority test")
+	// 多事件回调示例，事件1
+	pattern1 := "/:name/info"
+	s.BindHookHandlerByMap(pattern1, map[string]ghttp.HandlerFunc{
+		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+			r.SetParam("uid", 1000)
+		},
+	})
+	s.BindHandler(pattern1, func(r *ghttp.Request) {
+		r.Response.Write("用户:", r.Get("name"), ", uid:", r.Get("uid"))
 	})
 
-	s.BindHookHandlerByMap("/priority/:name", map[string]ghttp.HandlerFunc{
-		"BeforeServe": func(r *ghttp.Request) {
-			glog.Println(r.Router.Uri)
+	// 多事件回调示例，事件2
+	pattern2 := "/{object}/list/{page}.java"
+	s.BindHookHandlerByMap(pattern2, map[string]ghttp.HandlerFunc{
+		ghttp.HOOK_BEFORE_OUTPUT: func(r *ghttp.Request) {
+			r.Response.SetBuffer([]byte(
+				fmt.Sprintf("通过事件修改输出内容, object:%s, page:%s", r.Get("object"), r.GetRouterString("page"))),
+			)
 		},
 	})
-	s.BindHookHandlerByMap("/priority/*any", map[string]ghttp.HandlerFunc{
-		"BeforeServe": func(r *ghttp.Request) {
-			glog.Println(r.Router.Uri)
-		},
-	})
-	s.BindHookHandlerByMap("/priority/show", map[string]ghttp.HandlerFunc{
-		"BeforeServe": func(r *ghttp.Request) {
-			glog.Println(r.Router.Uri)
-		},
+	s.BindHandler(pattern2, func(r *ghttp.Request) {
+		r.Response.Write(r.Router.Uri)
 	})
 	s.SetPort(8199)
 	s.Run()

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

@@ -8,7 +8,7 @@ import (
 func main() {
 	s := g.Server()
 	s.BindHandler("/", func(r *ghttp.Request) {
-		r.Response.Writeln(r.GetParam("name").String())
+		r.Response.Writeln(r.Get("name"))
 	})
 	s.BindHookHandlerByMap("/", map[string]ghttp.HandlerFunc{
 		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {

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

@@ -5,28 +5,27 @@ import (
 	"github.com/gogf/gf/net/ghttp"
 )
 
-// 优先调用的HOOK
-func beforeServeHook1(r *ghttp.Request) {
-	r.SetParam("name", "GoFrame")
-	r.Response.Writeln("set name")
-}
-
-// 随后调用的HOOK
-func beforeServeHook2(r *ghttp.Request) {
-	r.SetParam("site", "https://goframe.org")
-	r.Response.Writeln("set site")
-}
-
-// 允许对同一个路由同一个事件注册多个回调函数，按照注册顺序进行优先级调用。
-// 为便于在路由表中对比查看优先级，这里讲HOOK回调函数单独定义为了两个函数。
 func main() {
 	s := g.Server()
-	s.BindHandler("/", func(r *ghttp.Request) {
-		r.Response.Writeln(r.GetParam("name").String())
-		r.Response.Writeln(r.GetParam("site").String())
+	s.BindHandler("/priority/show", func(r *ghttp.Request) {
+		r.Response.Writeln("priority service")
+	})
+
+	s.BindHookHandlerByMap("/priority/:name", map[string]ghttp.HandlerFunc{
+		ghttp.HOOK_BEFORE_SERVE: 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) {
+			r.Response.Writeln("/priority/*any")
+		},
+	})
+	s.BindHookHandlerByMap("/priority/show", map[string]ghttp.HandlerFunc{
+		ghttp.HOOK_BEFORE_SERVE: func(r *ghttp.Request) {
+			r.Response.Writeln("/priority/show")
+		},
 	})
-	s.BindHookHandler("/", ghttp.HOOK_BEFORE_SERVE, beforeServeHook1)
-	s.BindHookHandler("/", ghttp.HOOK_BEFORE_SERVE, beforeServeHook2)
 	s.SetPort(8199)
 	s.Run()
 }

.example/net/ghttp/server/https/https.go

@@ -1,11 +1,12 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	s := ghttp.GetServer()
+	s := g.Server()
 	s.BindHandler("/", func(r *ghttp.Request) {
 		r.Response.Writeln("来自于HTTPS的：哈喽世界！")
 	})

.example/net/ghttp/server/https/https_http.go

@@ -1,11 +1,12 @@
 package main
 
 import (
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	s := ghttp.GetServer()
+	s := g.Server()
 	s.BindHandler("/", func(r *ghttp.Request) {
 		r.Response.Writeln("您可以同时通过HTTP和HTTPS方式看到该内容！")
 	})

.example/net/ghttp/server/log/config.toml

@@ -0,0 +1,7 @@
+[server]
+    LogPath          = "/tmp/gflog/server"
+    LogStdout        = true
+    ErrorLogEnabled  = true
+    ErrorLogPattern  = "error.log"
+    AccessLogEnabled = true
+    AccessLogPattern = "access.log"

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

@@ -1,26 +1,21 @@
 package main
 
 import (
-	"net/http"
-
+	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
+	"net/http"
 )
 
 func main() {
-	s := ghttp.GetServer()
-	s.BindHandler("/log/handler", func(r *ghttp.Request) {
-		r.Response.WriteStatus(http.StatusNotFound, "文件找不到了")
+	s := g.Server()
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.ALL("/", func(r *ghttp.Request) {
+			r.Response.Write("halo world!")
+		})
+		group.ALL("/log/handler", func(r *ghttp.Request) {
+			r.Response.WriteStatus(http.StatusNotFound, "File Not Found!")
+		})
 	})
-	s.SetAccessLogEnabled(true)
-	s.SetErrorLogEnabled(true)
-	//s.SetLogHandler(func(r *ghttp.Request, error ...interface{}) {
-	//    if len(error) > 0 {
-	//        // 如果是错误日志
-	//        fmt.Println("错误产生了：", error[0])
-	//    }
-	//    // 这里是请求日志
-	//    fmt.Println("请求处理完成，请求地址:", r.URL.String(), "请求结果:", r.Response.Status)
-	//})
 	s.SetPort(8199)
 	s.Run()
 }

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

@@ -23,9 +23,9 @@ func MiddlewareCORS(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareAuth, MiddlewareCORS)
-		g.ALL("/user/list", func(r *ghttp.Request) {
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareAuth, MiddlewareCORS)
+		group.ALL("/user/list", func(r *ghttp.Request) {
 			r.Response.Write("list")
 		})
 	})

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

@@ -18,7 +18,7 @@ func MiddlewareAuth(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/admin", func(g *ghttp.RouterGroup) {
+	s.Group("/admin", func(group *ghttp.RouterGroup) {
 		g.MiddlewarePattern("/*action", func(r *ghttp.Request) {
 			if action := r.GetRouterString("action"); action != "" {
 				switch action {
@@ -29,10 +29,10 @@ func main() {
 			}
 			MiddlewareAuth(r)
 		})
-		g.ALL("/login", func(r *ghttp.Request) {
+		group.ALL("/login", func(r *ghttp.Request) {
 			r.Response.Write("login")
 		})
-		g.ALL("/dashboard", func(r *ghttp.Request) {
+		group.ALL("/dashboard", func(r *ghttp.Request) {
 			r.Response.Write("dashboard")
 		})
 	})

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

@@ -12,9 +12,9 @@ func MiddlewareCORS(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareCORS)
-		g.ALL("/user/list", func(r *ghttp.Request) {
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareCORS)
+		group.ALL("/user/list", func(r *ghttp.Request) {
 			r.Response.Write("list")
 		})
 	})

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

@@ -31,9 +31,9 @@ func MiddlewareError(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareAuth, MiddlewareCORS, MiddlewareError)
-		g.ALL("/user/list", func(r *ghttp.Request) {
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareAuth, MiddlewareCORS, MiddlewareError)
+		group.ALL("/user/list", func(r *ghttp.Request) {
 			panic("db error: sql is xxxxxxx")
 		})
 	})

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

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	s := g.Server()
+	s.BindMiddlewareDefault(func(r *ghttp.Request) {
+		fmt.Println("cors")
+		r.Response.CORSDefault()
+		r.Middleware.Next()
+	})
+	s.BindHandler("/api/captcha", func(r *ghttp.Request) {
+		r.Response.Write("captcha")
+	})
+	s.SetPort(8010)
+	s.Run()
+}

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

@@ -30,12 +30,12 @@ func MiddlewareLog(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareLog)
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareLog)
 	})
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareAuth, MiddlewareCORS)
-		g.ALL("/user/list", func(r *ghttp.Request) {
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareAuth, MiddlewareCORS)
+		group.ALL("/user/list", func(r *ghttp.Request) {
 			panic("custom error")
 		})
 	})

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

@@ -7,18 +7,18 @@ import (
 
 func main() {
 	s := g.Server()
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(func(r *ghttp.Request) {
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.Middleware(func(r *ghttp.Request) {
 			r.Response.Write("start")
 			r.Middleware.Next()
 			r.Response.Write("end")
 		})
-		g.Group("/order", func(g *ghttp.RouterGroup) {
+		g.Group("/order", func(group *ghttp.RouterGroup) {
 			g.GET("/list", func(r *ghttp.Request) {
 				r.Response.Write("list")
 			})
 		})
-		g.Group("/user", func(g *ghttp.RouterGroup) {
+		g.Group("/user", func(group *ghttp.RouterGroup) {
 			g.GET("/info", func(r *ghttp.Request) {
 				r.Response.Write("info")
 			})
@@ -26,11 +26,11 @@ func main() {
 				r.Response.Write("edit")
 			})
 		})
-		g.Group("/hook", func(g *ghttp.RouterGroup) {
-			g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+		g.Group("/hook", func(group *ghttp.RouterGroup) {
+			group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
 				r.Response.Write("hook any")
 			})
-			g.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+			group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
 				r.Response.Write("hook name")
 			})
 		})

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

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+// 前置中间件1
+func MiddlewareBefore1(r *ghttp.Request) {
+	r.SetParam("name", "GoFrame")
+	r.Response.Writeln("set name")
+	r.Middleware.Next()
+}
+
+// 前置中间件2
+func MiddlewareBefore2(r *ghttp.Request) {
+	r.SetParam("site", "https://goframe.org")
+	r.Response.Writeln("set site")
+	r.Middleware.Next()
+}
+
+func main() {
+	s := g.Server()
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareBefore1, MiddlewareBefore2)
+		group.ALL("/", func(r *ghttp.Request) {
+			r.Response.Writefln(
+				"%s: %s",
+				r.GetParamVar("name").String(),
+				r.GetParamVar("site").String(),
+			)
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

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

@@ -6,7 +6,7 @@ import (
 
 func main() {
 	s := ghttp.GetServer()
-	s.EnablePprof()
+	s.EnablePProf()
 	s.BindHandler("/", func(r *ghttp.Request) {
 		r.Response.Writeln("哈喽世界！")
 	})

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

@@ -6,23 +6,35 @@ import (
 	"github.com/gogf/gf/util/gvalid"
 )
 
-func main() {
-	type User struct {
-		Uid   int    `gvalid:"uid@min:1"`
-		Name  string `params:"username"  gvalid:"username @required|length:6,30"`
-		Pass1 string `params:"password1" gvalid:"password1@required|password3"`
-		Pass2 string `params:"password2" gvalid:"password2@required|password3|same:password1#||两次密码不一致，请重新输入"`
-	}
+type User struct {
+	Uid   int    `gvalid:"uid@min:1"`
+	Name  string `params:"username"  gvalid:"username @required|length:6,30"`
+	Pass1 string `params:"password1" gvalid:"password1@required|password3"`
+	Pass2 string `params:"password2" gvalid:"password2@required|password3|same:password1#||两次密码不一致，请重新输入"`
+}
 
+func main() {
 	s := g.Server()
-	s.BindHandler("/user", func(r *ghttp.Request) {
-		user := new(User)
-		r.GetToStruct(user)
-		if err := gvalid.CheckStruct(user, nil); err != nil {
-			r.Response.WriteJson(err.Maps())
-		} else {
-			r.Response.Write("ok")
-		}
+	s.Group("/", func(rgroup *ghttp.RouterGroup) {
+		rgroup.ALL("/user", func(r *ghttp.Request) {
+			user := new(User)
+			if err := r.GetToStruct(user); err != nil {
+				r.Response.WriteJsonExit(g.Map{
+					"message": err,
+					"errcode": 1,
+				})
+			}
+			if err := gvalid.CheckStruct(user, nil); err != nil {
+				r.Response.WriteJsonExit(g.Map{
+					"message": err.Maps(),
+					"errcode": 1,
+				})
+			}
+			r.Response.WriteJsonExit(g.Map{
+				"message": "ok",
+				"errcode": 0,
+			})
+		})
 	})
 	s.SetPort(8199)
 	s.Run()

.example/net/ghttp/server/resource/resource.go

@@ -12,8 +12,8 @@ import (
 func main() {
 	gres.Dump()
 
-	v := g.View()
-	v.SetPath("template/layout1")
+	//v := g.View()
+	//v.SetPath("template/layout1")
 
 	s := g.Server()
 	s.SetIndexFolder(true)
@@ -22,8 +22,8 @@ func main() {
 		fmt.Println(r.URL.Path, r.IsFileRequest())
 	})
 	s.BindHandler("/template", func(r *ghttp.Request) {
-		r.Response.WriteTpl("layout.html")
+		r.Response.WriteTpl("layout1/layout.html")
 	})
-	s.SetPort(8199)
+	s.SetPort(8198)
 	s.Run()
 }

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

@@ -29,15 +29,15 @@ func MiddlewareLog(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareLog)
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareLog)
 	})
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareAuth, MiddlewareCORS)
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.Middleware(MiddlewareAuth, MiddlewareCORS)
 		g.GET("/test", func(r *ghttp.Request) {
 			r.Response.Write("test")
 		})
-		g.Group("/order", func(g *ghttp.RouterGroup) {
+		g.Group("/order", func(group *ghttp.RouterGroup) {
 			g.GET("/list", func(r *ghttp.Request) {
 				r.Response.Write("list")
 			})
@@ -45,7 +45,7 @@ func main() {
 				r.Response.Write("update")
 			})
 		})
-		g.Group("/user", func(g *ghttp.RouterGroup) {
+		g.Group("/user", func(group *ghttp.RouterGroup) {
 			g.GET("/info", func(r *ghttp.Request) {
 				r.Response.Write("info")
 			})
@@ -56,11 +56,11 @@ func main() {
 				r.Response.Write("drop")
 			})
 		})
-		g.Group("/hook", func(g *ghttp.RouterGroup) {
-			g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+		g.Group("/hook", func(group *ghttp.RouterGroup) {
+			group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
 				r.Response.Write("hook any")
 			})
-			g.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+			group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
 				r.Response.Write("hook name")
 			})
 		})

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

@@ -4,21 +4,21 @@ import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/gtime"
-	"time"
 )
 
 func main() {
 	s := g.Server()
-	s.SetSessionMaxAge(2 * time.Second)
-	s.BindHandler("/set", func(r *ghttp.Request) {
-		r.Session.Set("time", gtime.Second())
-		r.Response.Write("ok")
-	})
-	s.BindHandler("/get", func(r *ghttp.Request) {
-		r.Response.WriteJson(r.Session.Map())
-	})
-	s.BindHandler("/clear", func(r *ghttp.Request) {
-		r.Session.Clear()
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		g.GET("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Second())
+			r.Response.Write("ok")
+		})
+		g.GET("/get", func(r *ghttp.Request) {
+			r.Response.WriteJson(r.Session.Map())
+		})
+		g.GET("/clear", func(r *ghttp.Request) {
+			r.Session.Clear()
+		})
 	})
 	s.SetPort(8199)
 	s.Run()

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

@@ -1,82 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/gtime"
-)
-
-// 测试，SESSION写入
-func SessionSet(r *ghttp.Request) {
-	r.Session.Set("time", gtime.Second())
-	r.Response.WriteJson("ok")
-}
-
-// 测试，SESSION读取
-func SessionGet(r *ghttp.Request) {
-	r.Response.WriteJson(r.Session.Map())
-}
-
-// 请求处理之前将Redis中的数据读取出来并存储到SESSION对象中。
-func RedisHandlerGet(r *ghttp.Request) {
-	if !r.IsFileRequest() {
-		id := r.Cookie.GetSessionId()
-		if id == "" {
-			return
-		}
-		// 应用服务器一般是多个节点构成的集群，
-		// 当请求中带有SESSION ID时，自动从Redis读取并恢复数据。
-		value, err := g.Redis().DoVar("GET", id)
-		if err != nil {
-			panic(err)
-		}
-		if !value.IsNil() {
-			if err := r.Session.Restore(value.Bytes()); err != nil {
-				panic(err)
-			}
-		}
-	}
-}
-
-// 请求结束时将SESSION数据存储到Redis中，或者在SESSION删除时也删除Redis中的数据。
-func RedisHandlerSet(r *ghttp.Request) {
-	if !r.IsFileRequest() {
-		id := r.Cookie.GetSessionId()
-		if id == "" {
-			return
-		}
-		err := (error)(nil)
-		value := ([]byte)(nil)
-		if r.Session.Size() > 0 {
-			if value, err = r.Session.Export(); err == nil {
-				if len(value) == 0 {
-					return
-				} else if !r.Session.IsDirty() {
-					// 更新过期时间
-					_, err = g.Redis().Do("EXPIRE", id, r.Server.GetSessionMaxAge())
-				} else {
-					// 更新Redis数据
-					_, err = g.Redis().Do("SETEX", id, r.Server.GetSessionMaxAge(), value)
-				}
-			}
-		} else {
-			// 清空SESSION后自动删除Redis数据
-			_, err = g.Redis().Do("DEL", id)
-		}
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-func main() {
-	s := g.Server()
-	s.BindHandler("/set", SessionSet)
-	s.BindHandler("/get", SessionGet)
-	s.BindHookHandlerByMap("/*", map[string]ghttp.HandlerFunc{
-		ghttp.HOOK_BEFORE_SERVE: RedisHandlerGet,
-		ghttp.HOOK_AFTER_SERVE:  RedisHandlerSet,
-	})
-	s.SetPort(8199)
-	s.Run()
-}

.example/net/ghttp/server/static/static.go

@@ -7,7 +7,9 @@ func main() {
 	s := g.Server()
 	s.SetIndexFolder(true)
 	s.SetServerRoot("/Users/john/Downloads")
-	s.AddSearchPath("/Users/john/Documents")
+	//s.AddSearchPath("/Users/john/Documents")
+	s.SetErrorLogEnabled(true)
+	s.SetAccessLogEnabled(true)
 	s.SetPort(8199)
 	s.Run()
 }

.example/net/ghttp/server/template/tpl1/index.tpl

@@ -5,7 +5,6 @@
     <title>{{.title}}</title>
 </head>
 <body>
-<H1>姓名 ： {{.name}}</H1>
-12
+<H1>{{.name}}: {{.score}}</H1>
 </body>
 </html>

.example/net/ghttp/server/template/tpl1/tpl1.go

@@ -2,25 +2,19 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/frame/gmvc"
 	"github.com/gogf/gf/net/ghttp"
 )
 
-type ControllerIndex struct {
-	gmvc.Controller
-}
-
-func (c *ControllerIndex) Info() {
-	c.View.Assign("title", "Go Frame 第一个网站")
-	c.View.Assigns(g.Map{
-		"name":  "很开心1",
-		"score": 100,
-	})
-	c.View.Display("index.html")
-}
 func main() {
 	s := ghttp.GetServer()
-	s.BindController("/", new(ControllerIndex))
+	s.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.Write("Hello World")
+		r.Response.WriteTpl("index.tpl", g.Map{
+			"title": "Test",
+			"name":  "John",
+			"score": 100,
+		})
+	})
 	s.SetPort(8199)
 	s.Run()
 }

.example/net/ghttp/server/websocket/echo/main-group.go

@@ -11,7 +11,7 @@ func ws(r *ghttp.Request) {
 	ws, err := r.WebSocket()
 	if err != nil {
 		glog.Error(err)
-		r.Exit()
+		return
 	}
 	for {
 		msgType, msg, err := ws.ReadMessage()
@@ -26,10 +26,10 @@ func ws(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group().Bind([]ghttp.GroupItem{
+	s.Group("").Bind([]ghttp.GroupItem{
 		{"ALL", "/ws", ws},
 	})
-
+	s.SetAccessLogEnabled(true)
 	s.SetServerRoot(gfile.MainPkgPath())
 	s.SetPort(8199)
 	s.Run()

.example/net/ghttp/server/websocket/echo/main.go

@@ -13,7 +13,7 @@ func main() {
 		ws, err := r.WebSocket()
 		if err != nil {
 			glog.Error(err)
-			r.Exit()
+			return
 		}
 		for {
 			msgType, msg, err := ws.ReadMessage()

.example/net/gtcp/gtcp_func.go

@@ -8,11 +8,10 @@ import (
 )
 
 func main() {
-	data, err := gtcp.SendRecv("www.baidu.com:80", []byte("HEAD / HTTP/1.1\n\n"), -1)
-	if len(data) > 0 {
-		fmt.Println(string(data))
-	}
+	dstConn, err := gtcp.NewPoolConn("www.medlinker.com:80")
+	_, err = dstConn.Write([]byte("HEAD / HTTP/1.1\n\n"))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "ERROR: %s\n", err.Error())
 	}
+	fmt.Println(dstConn.RecvLine())
 }

.example/os/gcfg/basic/config.toml

@@ -1,3 +1,5 @@
+
+
 # redis配置
 [[redis-cache]]
     db   = 0

.example/os/gcfg/basic/gcfg4.go

@@ -8,5 +8,5 @@ import (
 
 // 使用g.Config方法获取配置管理对象，并指定默认的配置文件名称
 func main() {
-	fmt.Println(g.Config("config.json").Get("viewpath"))
+	fmt.Println(g.Config().Get("viewpath"))
 }

.example/os/gcfg/basic/gcfg_error.go

@@ -6,7 +6,6 @@ import (
 	"github.com/gogf/gf/frame/g"
 )
 
-// 演示在找不到配置文件时的错误提示
 func main() {
-	fmt.Println(g.Config("none-exist-config.toml").Get("none"))
+	fmt.Println(g.Config().Get("none"))
 }

.example/os/glog/glog_config1.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/glog"
+)
+
+func main() {
+	err := glog.SetConfigWithMap(g.Map{
+		"prefix": "[TEST]",
+	})
+	if err != nil {
+		panic(err)
+	}
+	glog.Info(1)
+}

.example/os/gsession/storage-file/file.go

@@ -1,24 +1,27 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gtime"
+	"time"
 )
 
 func main() {
 	s := g.Server()
-	s.SetSessionMaxAge(60)
+	s.SetConfigWithMap(g.Map{
+		"SessionMaxAge": time.Minute,
+	})
 	s.BindHandler("/set", func(r *ghttp.Request) {
-		r.Session.Set("captcha", map[string]string{
-			"key": "value",
-		})
+		r.Session.Set("time", gtime.Second())
 		r.Response.Write("ok")
 	})
 	s.BindHandler("/get", func(r *ghttp.Request) {
-		fmt.Println(r.Session.Get("captcha"))
-		r.Response.Write(r.Session.Get("captcha"))
+		r.Response.Write(r.Session.Map())
+	})
+	s.BindHandler("/del", func(r *ghttp.Request) {
+		r.Session.Clear()
+		r.Response.Write("ok")
 	})
 	s.SetPort(8199)
 	s.Run()

.example/os/gsession/storage-memory/memory.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gsession"
+	"github.com/gogf/gf/os/gtime"
+	"time"
+)
+
+func main() {
+	s := g.Server()
+	s.SetConfigWithMap(g.Map{
+		"SessionMaxAge":  time.Minute,
+		"SessionStorage": gsession.NewStorageMemory(),
+	})
+	s.BindHandler("/set", func(r *ghttp.Request) {
+		r.Session.Set("time", gtime.Second())
+		r.Response.Write("ok")
+	})
+	s.BindHandler("/get", func(r *ghttp.Request) {
+		r.Response.Write(r.Session.Map())
+	})
+	s.BindHandler("/del", func(r *ghttp.Request) {
+		r.Session.Clear()
+		r.Response.Write("ok")
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/os/gsession/storage-redis-hashtable/config.toml

@@ -0,0 +1,4 @@
+# Redis数据库配置
+[redis]
+    default = "127.0.0.1:6379,0"
+    cache   = "127.0.0.1:6379,1"

.example/os/gsession/storage-redis-hashtable/redis-hashtable.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gsession"
+	"github.com/gogf/gf/os/gtime"
+	"time"
+)
+
+func main() {
+	s := g.Server()
+	s.SetConfigWithMap(g.Map{
+		"SessionMaxAge":  time.Minute,
+		"SessionStorage": gsession.NewStorageRedisHashTable(g.Redis()),
+	})
+	s.BindHandler("/set", func(r *ghttp.Request) {
+		r.Session.Set("time", gtime.Second())
+		r.Response.Write("ok")
+	})
+	s.BindHandler("/get", func(r *ghttp.Request) {
+		r.Response.Write(r.Session.Map())
+	})
+	s.BindHandler("/del", func(r *ghttp.Request) {
+		r.Session.Clear()
+		r.Response.Write("ok")
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/os/gsession/storage-redis/config.toml

@@ -0,0 +1,4 @@
+# Redis数据库配置
+[redis]
+    default = "127.0.0.1:6379,0"
+    cache   = "127.0.0.1:6379,1"

.example/os/gsession/storage-redis/redis.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gsession"
+	"github.com/gogf/gf/os/gtime"
+	"time"
+)
+
+func main() {
+	s := g.Server()
+	s.SetConfigWithMap(g.Map{
+		"SessionMaxAge":  time.Minute,
+		"SessionStorage": gsession.NewStorageRedis(g.Redis()),
+	})
+	s.BindHandler("/set", func(r *ghttp.Request) {
+		r.Session.Set("time", gtime.Second())
+		r.Response.Write("ok")
+	})
+	s.BindHandler("/get", func(r *ghttp.Request) {
+		r.Response.Write(r.Session.Map())
+	})
+	s.BindHandler("/del", func(r *ghttp.Request) {
+		r.Session.Clear()
+		r.Response.Write("ok")
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/os/gview/build_in_funcs/issue359-1.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	tplContent := `
+{{"我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人"| strlimit 10  "..."}}
+`
+	content, err := g.View().ParseContent(tplContent, nil)
+	fmt.Println(err)
+	fmt.Println(content)
+}

.example/os/gview/build_in_funcs/issue359-2.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	s := "我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人我是中国人"
+	tplContent := `
+{{.str | strlimit 10  "..."}}
+`
+	content, err := g.View().ParseContent(tplContent, g.Map{
+		"str": s,
+	})
+	fmt.Println(err)
+	fmt.Println(content)
+}

.example/os/gview/i18n/i18n.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	content := `{{.name}} says "a{#hello}{#world}!"`
+	result1, _ := g.View().ParseContent(content, g.Map{
+		"name":         "john",
+		"I18nLanguage": "zh-CN",
+	})
+	fmt.Println(result1)
+
+	result2, _ := g.View().ParseContent(content, g.Map{
+		"name":         "john",
+		"I18nLanguage": "ja",
+	})
+	fmt.Println(result2)
+}

.example/other/config.toml

@@ -1,14 +1,3 @@
-# 监控服务主动拉取监控数据配置
-[active-pulling]
-    # 业务类别 腾讯问诊 订单总数
-    [[active-pulling.tencent-inquiry]]
-        groupId    = 3533761
-        metricName = "OrderCount"                                  # 监控项名称
-        url        = "http://ylt.medlinker.com/monitor/ordercount" # 监控数据地址
-        interval   = "1m"                                          # d:日 h:小时 m:分 s:秒
-    # 业务类别 腾讯问诊 超时订单总数
-    [[active-pulling.tencent-inquiry]]
-        groupId    = 3533711
-        metricName = "TimedOutOrderCount"
-        url        = "http://ylt.medlinker.com/monitor/timedout-ordercount"
-        interval   = "1m"
+[database]
+	debug = true
+    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"

.example/other/test.go

@@ -1,48 +1,17 @@
 package main
 
 import (
-	"fmt"
-
-	"github.com/gogf/gf/os/gfile"
-	"github.com/gogf/gf/text/gregex"
-
-	"github.com/gogf/gf/debug/gdebug"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	cdnUrl := "http://localhost"
-	content := `
-    <link rel="stylesheet" href="/plugin/amazeui-2.7.2/css/amazeui.min.css">
-    <link rel="stylesheet" href="/plugin/markdown-css/github-markdown.min.js">
-    <link rel="stylesheet" href="/plugin/prism/prism.css">
-    <link rel="stylesheet" href="/resource/css/document/style.css">
-    <link rel="icon" href="/resource/image/favicon.ico" type="image/x-icon">
-`
-	s, err := gregex.ReplaceStringFuncMatch(`(href|src)=['"](.+?)['"]`, content, func(match []string) string {
-		link := match[2]
-		if len(link) == 0 {
-			return match[0]
-		}
-		if link[0:1] != "/" && link[0:1] != "#" {
-			if len(link) > 10 && link[0:10] == "javascript" {
-				return match[0]
-			}
-			if len(link) > 7 && link[0:7] == "mailto:" {
-				return match[0]
-			}
-			if len(link) > 4 && link[0:4] == "http" {
-				return match[0]
-			}
-			link = "/" + link
-		}
-		if link[0:1] == "/" {
-			switch gfile.ExtName(link) {
-			case "png", "jpg", "jpeg", "gif", "js", "css", "otf", "eot", "ttf", "woff", "woff2":
-				return fmt.Sprintf(`%s="%s%s?%s"`, match[1], cdnUrl, link, gdebug.BinVersion())
-			}
-		}
-		return match[0]
+	s := g.Server()
+	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
+		group.ALL("/test", func(r *ghttp.Request) {
+			r.Response.Write(r.GetRequest("nickname"))
+		})
 	})
-	fmt.Println(err)
-	fmt.Println(s)
+	s.SetPort(8199)
+	s.Run()
 }

.example/util/gconv/gconv_struct3.go

@@ -1,32 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/util/gconv"
-)
-
-// 演示slice类型属性的赋值
-func main() {
-	type User struct {
-		Scores []int
-	}
-
-	user := new(User)
-	scores := []interface{}{99, 100, 60, 140}
-
-	// 通过map映射转换
-	if err := gconv.Struct(g.Map{"Scores": scores}, user); err != nil {
-		fmt.Println(err)
-	} else {
-		g.Dump(user)
-	}
-
-	// 通过变量映射转换，直接slice赋值
-	if err := gconv.Struct(scores, user); err != nil {
-		fmt.Println(err)
-	} else {
-		g.Dump(user)
-	}
-}

.example/util/gconv/gconv_struct4.go

@@ -21,8 +21,8 @@ func main() {
 
 	user1 := new(User1)
 	user2 := new(User2)
-	scores := map[string]interface{}{
-		"Scores": map[string]interface{}{
+	scores := g.Map{
+		"Scores": g.Map{
 			"Name":   "john",
 			"Result": 100,
 		},

.example/util/gconv/gconv_struct5.go

@@ -17,8 +17,8 @@ func main() {
 	}
 
 	user := new(User)
-	scores := map[string]interface{}{
-		"Scores": map[string]interface{}{
+	scores := g.Map{
+		"Scores": g.Map{
 			"Name":   "john",
 			"Result": 100,
 		},

.example/util/gconv/gconv_struct6.go

@@ -17,13 +17,13 @@ func main() {
 	}
 
 	user := new(User)
-	scores := map[string]interface{}{
-		"Scores": []interface{}{
-			map[string]interface{}{
+	scores := g.Map{
+		"Scores": g.Slice{
+			g.Map{
 				"Name":   "john",
 				"Result": 100,
 			},
-			map[string]interface{}{
+			g.Map{
 				"Name":   "smith",
 				"Result": 60,
 			},

.travis.yml

@@ -3,6 +3,7 @@ language: go
 go:
   - "1.11.x"
   - "1.12.x"
+  - "1.13.x"
 
 branches:
   only:
@@ -11,7 +12,7 @@ branches:
   - staging
 
 env:
-- GO111MODULE=on
+- GF_DEV=1 GO111MODULE=on
 
 services:
 - mysql
@@ -32,6 +33,7 @@ install:
 before_script:
 - find . -name "*.go" | xargs gofmt -w
 - git diff --name-only --exit-code || exit 1
+- echo "UPDATE mysql.user SET authentication_string=PASSWORD('12345678') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root
 - psql -c 'create database travis_ci_test;' -U postgres
 
 script:

DONATOR.MD

@@ -24,6 +24,11 @@
 |Hades|alipay|￥66.66
 |蔡蔡|wechat|￥666.00
 |上海金保证网络科技|bank|￥2000.00
+|[foxhack](https://github.com/foxhack)|wechat|￥20.00
+|*栈|wechat|￥5.00
+|*络|wechat|￥10.00
+|R*s|wechat|￥18.88
+|粟*e|wechat|￥50.00
 
 
 

README.MD

@@ -14,7 +14,7 @@ English | [简体中文](README_ZH.MD)
 
 # Installation
 ```
-go get -u github.com/gogf/gf
+go get -u -v github.com/gogf/gf
 ```
 suggested using `go.mod`:
 ```
@@ -23,7 +23,7 @@ require github.com/gogf/gf latest
 
 # Limitation
 ```
-golang version >= 1.10
+golang version >= 1.11
 ```
 
 # Documentation

README_ZH.MD

@@ -15,6 +15,7 @@
 # 特点
 * 模块化、松耦合设计；
 * 模块丰富，开箱即用；
+* 简便及可维护性为宗旨；
 * 详尽的开发文档及示例；
 * 完善的本地中文化支持；
 * 致力于项目的通用方案；
@@ -23,7 +24,7 @@
 
 # 安装
 ```html
-go get -u github.com/gogf/gf
+go get -u -v github.com/gogf/gf
 ```
 推荐使用 `go.mod`:
 ```
@@ -32,7 +33,7 @@ require github.com/gogf/gf latest
 
 # 限制
 ```shell
-golang版本 >= 1.10
+golang版本 >= 1.11
 ```
 
 # 架构

RELEASE.2.MD

@@ -1,4 +1,180 @@
-# `v1.9.3`
+# `v1.10.0` (2019-12-05)
+
+各位`gfer`久等了，较上一次发布时间过去已有两个多月了，这段时间`GF`也在不断地迭代改进，细节比较多，拟了个大概，以下是`release log`。
+
+另外，`GoFrame`也参加了2019最受欢迎中国开源软件评选投票，明天就结束了，欢迎为`GF`投票啊：https://www.oschina.net/project/top_cn_2019 网页可以投一票，微信也可以投一票。
+
+## 新特性
+
+1. `Web Server`新特性：
+    - 改进中间件及分组路由实现：https://goframe.org/net/ghttp/router/middleware
+    - 增加文件配置管理特性：https://goframe.org/net/ghttp/config
+    - 改进参数获取：https://goframe.org/net/ghttp/request
+    - 改进文件上传：https://goframe.org/net/ghttp/client/demo/upload
+1. `Session`增加内置的多种`Storage`实现：
+    - 基本介绍：https://goframe.org/os/gsession/index
+    - 文件存储：https://goframe.org/os/gsession/file
+    - 内存存储：https://goframe.org/os/gsession/memory
+    - `Redis`存储：https://goframe.org/os/gsession/redis
+1. 增加日志组件单例对象，并优化配置管理：
+    - https://goframe.org/frame/g/index
+    - https://goframe.org/os/glog/config
+1. 常用的`container`容器增加`JSON`数据格式的`Marshal`/`UnMarshal`接口实现：
+    - https://goframe.org/container/gmap/index
+    - https://goframe.org/container/garray/index
+    - https://goframe.org/container/gset/index
+    - https://goframe.org/container/gvar/index
+    - https://goframe.org/container/gtype/index
+    - https://goframe.org/container/glist/index
+    - https://goframe.org/container/gvar/index
+1. 新增`guuid`模块，用于通用的`UUID`生成：https://goframe.org/util/guuid/index
+
+## 功能改进
+
+### `net`
+1. `ghttp`
+    - 改进请求流程处理性能；
+    - `Server`增加对`Logger`日志对象的配置；
+    - `Server`开放了`GetRouterMap`方法，用于获得当前服务的路由列表信息，使得开发者可以更方便地实现自定义权限管理；
+    - `Server`配置管理优化；
+    - `Client`客户端对象进行了大量的改进工作；
+    - `Client`客户端对象增加多文件上传功能；
+    - `Request`对象增加`GetError`方法，用于获取当前处理错误；
+    - `Request`对象增加独立的视图对象及视图变量绑定功能，使得每个请求可以独立视图管理，也可以通过中间件切换请求对象的视图对象。默认情况下该功能关闭，视图解析时使用的是`Server`对象的视图对象；
+    - 改建`Response`对象的`CORS`功能；
+    - 增加`Response.WriteTplDefault`方法，用于解析并返回默认的模板内容；
+    - 增加更多的单元测试用例；
+    - 其他改进；
+1. `gipv4`/`gipv6`
+    - 一些改进工作；
+1. `gtcp`/`gudp`
+    - 一些改进工作；
+
+### `database`
+1. `gdb`
+    - 大量细节改进工作；
+    - 去掉查询数据为空时的`sql.ErrNoRows`错误返回，保留`Struct`/`Structs`/`Scan`方法在操作数据为空的该错误返回；
+    - 调试模式开启时，输出的SQL语句改进为完整的带参数的SQL，仅作参考；
+    - `Where`方法增加对`gmap`数据类型支持，包括顺序性的`ListMap`/`TreeMap`等等；
+    - 查询缓存方法`Cache`的缓存时间参数类型修改为`time.Duration`；
+    - 修改`Record`/`Result`的数据类型转换方法名称，原有的转换方法标记为`deprecated`；
+    - `Record`/`Result`查询结果类型增加`IsEmpty`方法，用于判断结果集是否为空；
+    - `Record`类型增加`GMap`方法，用于将查询记录转换为`gmap`类型；
+    - 增加`Option`/`OptionOmitEmpty`方法，用于输入参数过滤，包括`Data`参数及`Where`参数：https://goframe.org/database/gdb/empty
+    - 增加字段排除方法`FieldsEx`：https://goframe.org/database/gdb/senior
+    - 增加日志功能特性：https://goframe.org/database/gdb/senior
+    - 改进数据库配置管理：https://goframe.org/database/gdb/config
+    - 增加大量单元测试；
+1. `gredis`
+    - 返回数据类型转换改进：https://github.com/gogf/gf/issues/415
+    - 完善单元测试；
+    - 其他改进；
+
+### `os`
+1. `gcache`
+    - 需要注意了：缓存的有效时间参数从`interface{}`类型调整为了`time.Duration`类型，因此不再兼容之前的`int`参数类型，以保证更好的性能；
+1. `gfcache`
+    - 由于`gcache`组件的缓存时间参数类型的变更，因此该组件的时间参数也变更为了`time.Duration`类型；
+1. `gcfg`
+    - 增加`Available`方法，用以判断配置是否有效；
+1. `gfile`
+    - 增加`Chdir`方法，用于工作目录切换；
+1. `gtime`
+    - 增加`JSON`数据格式的`Marshal`/`UnMarshal`接口实现；
+
+### `container`
+1. `gmap`
+    - 增加`MapStrAny`方法，用于常见`map`类型的转换；
+    - 增加`MapCopy`方法，用于底层`map`数据复制；
+    - 增加`FilterEmpty`方法，用于`map`空值过滤；
+    - 增加`Pop`/`Pops`方法，用于随机返回`map`中的数据项（并删除）；
+    - 增加`Replace`方法，用于给定的`map`数据覆盖底层`map`数据项；
+    - 完善单元测试；
+    - 其他改进；
+1. `garray`
+    - 增加`Interfaces`转换方法，返回`[]interface{}`类型；
+    - 对排序数组增加`SetComparator`方法用户自定义修改比较器；
+    - 完善单元测试；
+    - 其他改进；
+1. `glist`
+    - 增加`NewFrom`方法，基于给定的`[]interface{}`变量创建链表；
+    - 增加`Join`方法，用于将链表项使用给定字符串连接为字符串返回；
+    - 完善单元测试；
+    - 其他改进；
+1. `gset`
+    - 增加`AddIfNotExistFunc`/`AddIfNotExistFuncLock`方法；
+    - 完善单元测试；
+    - 其他改进；
+1. `gtree`
+    - 增加`Replace`方法，用于更新现有树的数据项；
+    - 其他改进；
+1. `gtype`
+    - 一些细节改进工作，不一一列出；
+    - 完善基准测试、单元测试；
+1. `gvar`
+    - 增加`Ints`/`Uints`类型转换方法；
+    - 其他改进；
+
+### `crypto`
+1. `gmd5`
+    - 小细节改进；
+1. `gsha1`
+    - 小细节改进；
+
+### `text`
+1. `gstr`
+    - 改进`SplitAndTrim`方法，将`SplitAndTrimSpace`标记为`deprecated`；
+    - 增加`TrimStr`方法；
+    - 完善单元测试；
+    - 其他改进；
+
+### `debug`
+
+1. `gdebug`
+    - 增加`CallerFileLineShort`/`FuncPath`/`FuncName`方法；
+    - 其他改进；
+
+### `encoding`
+
+1. `gbase64`
+    - 增加`EncodeToString`/`EncodeFile`/`EncodeFileToString`/`DecodeToString`方法；
+    - 完善单元测试；
+1. `gjson`
+    - 完善单元测试；
+
+### `frame`
+
+1. `g`/`gins`
+    - https://goframe.org/frame/g/index
+    - 增加`CreateVar`方法；
+    - 完善单元测试；
+    - 其他改进；
+
+### `util`
+
+1. `gconv`
+    - 改进优化部分类型转换方法性能；
+    - 增加`Uints`/`SliceUint`类型转换方法；
+    - 增加`UnsafeStrToBytes`/`UnsafeBytesToStr`高性能的类型转换方法；
+    - 增加对`MapStrAny`接口方法的支持，用于常见`map`类型的转换；
+    - 其他改进；
+1. `gvalid`
+    - 改进对中国身份证号的识别校验功能；
+    - 增加`luhn`银行卡号的校验功能；
+1. `grand`
+    - 一些性能改进工作；
+
+
+## Bug Fix
+1. 解决`WebSocket`关闭时的`hijacked`报错问题：https://github.com/gogf/gf/issues/381
+1. 解决静态文件服务时大文件的内存占用问题；
+1. 修复前置`Nginx`后默认情况下的`Cookie`域名设置问题；
+1. 修复`gconv.Struct`在属性为`[]struct`并且输入属性参数为空时的转换失败问题：https://github.com/gogf/gf/issues/405
+1. 其他一些修复；
+
+
+
+# `v1.9.3` (2019-09-24)
 
 该版本实际为`v2.0`的大版本发布，为避免`go module`机制严格要求`v2`版本以上需要修改`import`并加上`v2`后缀，因此使用了`v1.9`版本进行发布。
 

container/garray/garray_normal_any.go

@@ -9,6 +9,7 @@ package garray
 import (
 	"bytes"
 	"encoding/json"
+	"github.com/gogf/gf/text/gstr"
 	"math"
 	"sort"
 
@@ -23,7 +24,7 @@ type Array struct {
 }
 
 // New creates and returns an empty array.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func New(safe ...bool) *Array {
 	return NewArraySize(0, 0, safe...)
@@ -35,7 +36,7 @@ func NewArray(safe ...bool) *Array {
 }
 
 // NewArraySize create and returns an array with given size and cap.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewArraySize(size int, cap int, safe ...bool) *Array {
 	return &Array{
@@ -55,7 +56,7 @@ func NewFromCopy(array []interface{}, safe ...bool) *Array {
 }
 
 // NewArrayFrom creates and returns an array with given slice <array>.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewArrayFrom(array []interface{}, safe ...bool) *Array {
 	return &Array{
@@ -65,7 +66,7 @@ func NewArrayFrom(array []interface{}, safe ...bool) *Array {
 }
 
 // NewArrayFromCopy creates and returns an array from a copy of given slice <array>.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewArrayFromCopy(array []interface{}, safe ...bool) *Array {
 	newArray := make([]interface{}, len(array))
@@ -355,19 +356,23 @@ func (a *Array) Len() int {
 }
 
 // Slice returns the underlying data of array.
-// Notice, if in concurrent-safe usage, it returns a copy of slice;
-// else a pointer to the underlying data.
+// Note that, if it's in concurrent-safe usage, it returns a copy of underlying data,
+// or else a pointer to the underlying data.
 func (a *Array) Slice() []interface{} {
-	array := ([]interface{})(nil)
 	if a.mu.IsSafe() {
 		a.mu.RLock()
 		defer a.mu.RUnlock()
-		array = make([]interface{}, len(a.array))
+		array := make([]interface{}, len(a.array))
 		copy(array, a.array)
+		return array
 	} else {
-		array = a.array
+		return a.array
 	}
-	return array
+}
+
+// Interfaces returns current array as []interface{}.
+func (a *Array) Interfaces() []interface{} {
+	return a.Slice()
 }
 
 // Clone returns a new array, which is a copy of current array.
@@ -604,12 +609,26 @@ func (a *Array) CountValues() map[interface{}]int {
 	return m
 }
 
-// String returns current array as a string.
+// String returns current array as a string, which implements like json.Marshal does.
 func (a *Array) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
-	jsonContent, _ := json.Marshal(a.array)
-	return string(jsonContent)
+	buffer := bytes.NewBuffer(nil)
+	buffer.WriteByte('[')
+	s := ""
+	for k, v := range a.array {
+		s = gconv.String(v)
+		if gstr.IsNumeric(s) {
+			buffer.WriteString(s)
+		} else {
+			buffer.WriteString(`"` + gstr.QuoteMeta(s, `"\`) + `"`)
+		}
+		if k != len(a.array)-1 {
+			buffer.WriteByte(',')
+		}
+	}
+	buffer.WriteByte(']')
+	return buffer.String()
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
@@ -618,3 +637,17 @@ func (a *Array) MarshalJSON() ([]byte, error) {
 	defer a.mu.RUnlock()
 	return json.Marshal(a.array)
 }
+
+// UnmarshalJSON implements the interface UnmarshalJSON for json.Unmarshal.
+func (a *Array) UnmarshalJSON(b []byte) error {
+	if a.mu == nil {
+		a.mu = rwmutex.New()
+		a.array = make([]interface{}, 0)
+	}
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	if err := json.Unmarshal(b, &a.array); err != nil {
+		return err
+	}
+	return nil
+}

container/garray/garray_normal_int.go

@@ -23,14 +23,14 @@ type IntArray struct {
 }
 
 // NewIntArray creates and returns an empty array.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewIntArray(safe ...bool) *IntArray {
 	return NewIntArraySize(0, 0, safe...)
 }
 
 // NewIntArraySize create and returns an array with given size and cap.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewIntArraySize(size int, cap int, safe ...bool) *IntArray {
 	return &IntArray{
@@ -40,7 +40,7 @@ func NewIntArraySize(size int, cap int, safe ...bool) *IntArray {
 }
 
 // NewIntArrayFrom creates and returns an array with given slice <array>.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewIntArrayFrom(array []int, safe ...bool) *IntArray {
 	return &IntArray{
@@ -50,7 +50,7 @@ func NewIntArrayFrom(array []int, safe ...bool) *IntArray {
 }
 
 // NewIntArrayFromCopy creates and returns an array from a copy of given slice <array>.
-// The parameter <safe> used to specify whether using array in concurrent-safety,
+// The parameter <safe> is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewIntArrayFromCopy(array []int, safe ...bool) *IntArray {
 	newArray := make([]int, len(array))
@@ -361,8 +361,8 @@ func (a *IntArray) Len() int {
 }
 
 // Slice returns the underlying data of array.
-// Notice, if in concurrent-safe usage, it returns a copy of slice;
-// else a pointer to the underlying data.
+// Note that, if it's in concurrent-safe usage, it returns a copy of underlying data,
+// or else a pointer to the underlying data.
 func (a *IntArray) Slice() []int {
 	array := ([]int)(nil)
 	if a.mu.IsSafe() {
@@ -376,6 +376,17 @@ func (a *IntArray) Slice() []int {
 	return array
 }
 
+// Interfaces returns current array as []interface{}.
+func (a *IntArray) Interfaces() []interface{} {
+	a.mu.RLock()
+	defer a.mu.RUnlock()
+	array := make([]interface{}, len(a.array))
+	for k, v := range a.array {
+		array[k] = v
+	}
+	return array
+}
+
 // Clone returns a new array, which is a copy of current array.
 func (a *IntArray) Clone() (newArray *IntArray) {
 	a.mu.RLock()
@@ -610,12 +621,9 @@ func (a *IntArray) CountValues() map[int]int {
 	return m
 }
 
-// String returns current array as a string.
+// String returns current array as a string, which implements like json.Marshal does.
 func (a *IntArray) String() string {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	jsonContent, _ := json.Marshal(a.array)
-	return string(jsonContent)
+	return "[" + a.Join(",") + "]"
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
@@ -624,3 +632,17 @@ func (a *IntArray) MarshalJSON() ([]byte, error) {
 	defer a.mu.RUnlock()
 	return json.Marshal(a.array)
 }
+
+// UnmarshalJSON implements the interface UnmarshalJSON for json.Unmarshal.
+func (a *IntArray) UnmarshalJSON(b []byte) error {
+	if a.mu == nil {
+		a.mu = rwmutex.New()
+		a.array = make([]int, 0)
+	}
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	if err := json.Unmarshal(b, &a.array); err != nil {
+		return err
+	}
+	return nil
+}