example codes update; donator updates

.example/container/garray/array_unique.go

@@ -1,16 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	array := []uint{1, 1, 2, 3, 3, 4, 4, 5, 5, 6, 6}
-	for i := 0; i < len(array)-1; i++ {
-		for j := i + 1; j < len(array); j++ {
-			if array[i] == array[j] {
-				array = append(array[:j], array[j+1:]...)
-			}
-		}
-	}
-	fmt.Println(array)
-
-}

.example/container/garray/basic_array.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/container/garray"
+)
+
+func main() {
+	// Create a int array, which is concurrent-unsafe in default.
+	a := garray.NewIntArray()
+
+	// Appending items.
+	for i := 0; i < 10; i++ {
+		a.Append(i)
+	}
+
+	// Get the length of the array.
+	fmt.Println(a.Len())
+
+	// Get the slice of the array.
+	fmt.Println(a.Slice())
+
+	// Get the item of specified index.
+	fmt.Println(a.Get(6))
+
+	// Insert after/before specified index.
+	a.InsertAfter(9, 11)
+	a.InsertBefore(10, 10)
+	fmt.Println(a.Slice())
+
+	a.Set(0, 100)
+	fmt.Println(a.Slice())
+
+	// Searching the item and returning the index.
+	fmt.Println(a.Search(5))
+
+	// Remove item of specified index.
+	a.Remove(0)
+	fmt.Println(a.Slice())
+
+	// Clearing the array.
+	fmt.Println(a.Slice())
+	a.Clear()
+	fmt.Println(a.Slice())
+}

.example/container/garray/garray1.go

@@ -1,59 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/gogf/gf/container/garray"
-)
-
-func main() {
-	// 创建普通的int类型数组，并关闭默认的并发安全特性
-	a := garray.NewIntArray(true)
-
-	// 添加数据项
-	for i := 0; i < 10; i++ {
-		a.Append(i)
-	}
-
-	// 获取当前数组长度
-	fmt.Println(a.Len())
-
-	// 获取当前数据项列表
-	fmt.Println(a.Slice())
-
-	// 获取指定索引项
-	fmt.Println(a.Get(6))
-
-	// 在指定索引前插入数据项
-	a.InsertAfter(9, 11)
-	// 在指定索引后插入数据项
-	a.InsertBefore(10, 10)
-	fmt.Println(a.Slice())
-
-	// 修改指定索引的数据项
-	a.Set(0, 100)
-	fmt.Println(a.Slice())
-
-	// 搜索数据项，返回搜索到的索引位置
-	fmt.Println(a.Search(5))
-
-	// 删除指定索引的数据项
-	a.Remove(0)
-	fmt.Println(a.Slice())
-
-	// 并发安全，写锁操作
-	a.LockFunc(func(array []int) {
-		// 将末尾项改为100
-		array[len(array)-1] = 100
-	})
-
-	// 并发安全，读锁操作
-	a.RLockFunc(func(array []int) {
-		fmt.Println(array[len(array)-1])
-	})
-
-	// 清空数组
-	fmt.Println(a.Slice())
-	a.Clear()
-	fmt.Println(a.Slice())
-}

.example/container/garray/garray_slice_safe.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/container/garray"
-	"github.com/gogf/gf/frame/g"
-)
-
-func main() {
-	a := garray.NewIntArray()
-	a.Append(1, 2, 3)
-
-	v := a.Slice()
-	v[0] = 4
-
-	g.Dump(a.Slice())
-	g.Dump(v)
-}

.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/garray/sorted_string_array.go

@@ -1,20 +1,23 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/gogf/gf/container/garray"
-	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	array := garray.NewSortedStringArray()
-	array.Add("1")
-	array.Add("2")
-	array.Add("3")
-	array.Add("4")
-	array.Add("5")
-	array.Add("6")
-	array.Add("7")
-	array.Add("8")
+	array := garray.NewSortedStrArray()
 	array.Add("9")
-	g.Dump(array.Slice())
+	array.Add("8")
+	array.Add("7")
+	array.Add("6")
+	array.Add("5")
+	array.Add("4")
+	array.Add("3")
+	array.Add("2")
+	array.Add("1")
+	fmt.Println(array.Slice())
+	// output:
+	// [1 2 3 4 5 6 7 8 9]
 }

.example/container/garray/sorted_string_array2.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/gogf/gf/container/garray"
-	"github.com/gogf/gf/frame/g"
-)
-
-func main() {
-	array := garray.NewSortedStringArray()
-	array.Add("/api/ctl/show")
-	array.Add("/api/ctl/post")
-	array.Add("/api/obj/rest")
-	array.Add("/api/handler")
-	array.Add("/api/obj/delete")
-	array.Add("/api/obj/show")
-	array.Add("/api/obj/my-show")
-	array.Add("/api/*")
-	array.Add("/api/ctl/rest")
-	array.Add("/api/ctl/my-show")
-	g.Dump(array.Slice())
-
-	fmt.Println(strings.Compare("/api/ctl/post", "/api/*"))
-	fmt.Println(strings.Compare("/api/*", "/api/ctl/my-show"))
-}

.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)
+	e := l.PushFront(0)
+	// Insert
+	l.InsertBefore(e, -1)
+	l.InsertAfter(e, "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,24 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/gogf/gf/container/gmap"
-)
-
-func main() {
-	//m := gmap.New()
-	//m.Set("k", "v")
-	//m.Set("1", "2")
-	//b, err := json.Marshal(m)
-	//fmt.Println(err)
-	//fmt.Println(string(b))
-
-	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

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"github.com/gogf/gf/container/gmap"
+	"github.com/gogf/gf/frame/g"
+)
+
+func main() {
+	m1 := gmap.New(true)
+	m1.Set("1", "1")
+
+	m2 := m1.Map()
+	m2["2"] = "2"
+
+	g.Dump(m1.Clone())
+	g.Dump(m2)
+	//output:
+	//{
+	//	"1": "1"
+	//}
+	//
+	//{
+	//	"1": "1",
+	//	"2": "2"
+	//}
+}

.example/container/gmap/gmap_map_safe.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/container/gmap"
-	"github.com/gogf/gf/frame/g"
-)
-
-func main() {
-	m := gmap.New()
-	m.Set("1", "1")
-
-	m1 := m.Map()
-	m1["2"] = "2"
-
-	g.Dump(m.Clone())
-	g.Dump(m1)
-}

.example/container/gmap/gmap_maps.go

@@ -10,9 +10,9 @@ import (
 
 func main() {
 	array := g.Slice{2, 3, 1, 5, 4, 6, 8, 7, 9}
-	hashMap := gmap.New(true)
-	linkMap := gmap.NewLinkMap(true)
-	treeMap := gmap.NewTreeMap(gutil.ComparatorInt, true)
+	hashMap := gmap.New()
+	linkMap := gmap.NewListMap()
+	treeMap := gmap.NewTreeMap(gutil.ComparatorInt)
 	for _, v := range array {
 		hashMap.Set(v, v)
 	}

.example/container/gmap/safe_map_delete.go

@@ -1,39 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"sync"
-	"time"
-)
-
-// 验证 map 的delete方法是否并发安全
-func main() {
-	// 创建一个初始化的map
-	m := make(map[int]int)
-	for i := 0; i < 10000; i++ {
-		m[i] = i
-	}
-
-	fmt.Println("map size:", len(m))
-
-	wg := sync.WaitGroup{}
-	ev := make(chan struct{}, 0)
-
-	// 创建10个并发的goroutine，使用ev控制并发开始事件，更容易模拟data race
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			<-ev
-			fmt.Println("start")
-			for i := 0; i < 10000; i++ {
-				delete(m, i)
-			}
-			wg.Done()
-		}()
-	}
-
-	time.Sleep(time.Second)
-
-	close(ev)
-	wg.Wait()
-}

.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/container/gvar/var.go

@@ -30,8 +30,4 @@ func main() {
 	s := new(Score)
 	v.Struct(s)
 	fmt.Println(s)
-
-	// 只读接口
-	r := v.ReadOnly()
-	fmt.Println(r.String())
 }

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

@@ -519,7 +519,6 @@ func getQueriedSqls() {
 		fmt.Println("Sql  :", v.Sql)
 		fmt.Println("Args :", v.Args)
 		fmt.Println("Error:", v.Error)
-		fmt.Println("Func :", v.Func)
 	}
 }
 

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

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/gogf/gf/database/gdb"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/glog"
@@ -23,7 +21,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	db.SetDebug(true)
+	//db.SetDebug(false)
 
 	glog.SetPath("/tmp")
 
@@ -36,7 +34,4 @@ func main() {
 
 	db.Table("user").Data(g.Map{"name": "smith"}).Where("uid=?", 1).Save()
 
-	db.PrintQueriedSqls()
-
-	fmt.Println(db.GetLastSql())
 }

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

@@ -6,6 +6,7 @@ import (
 
 func main() {
 	db := g.DB()
+
 	// 执行3条SQL查询
 	for i := 1; i <= 3; i++ {
 		db.Table("user").Where("id=?", i).One()

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

@@ -8,9 +8,9 @@ import (
 
 func main() {
 	db := g.DB()
-	db.SetMaxIdleConns(10)
-	db.SetMaxOpenConns(10)
-	db.SetConnMaxLifetime(10)
+	db.SetMaxIdleConnCount(10)
+	db.SetMaxOpenConnCount(10)
+	db.SetMaxConnLifetime(time.Minute)
 
 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)

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

@@ -520,7 +520,6 @@ func getQueriedSqls() {
 		fmt.Println("Sql  :", v.Sql)
 		fmt.Println("Args :", v.Args)
 		fmt.Println("Error:", v.Error)
-		fmt.Println("Func :", v.Func)
 	}
 }
 

.example/database/gdb/sqlite/sqlite.go

@@ -1,47 +1,47 @@
 package main
 
-//import (
-//    _ "github.com/mattn/go-sqlite3"
-//    "github.com/gogf/gf/database/gdb"
-//    "github.com/gogf/gf/frame/g"
-//    "fmt"
-//)
-//
-//func main() {
-//    gdb.SetConfig(gdb.Config{
-//        "default": gdb.ConfigGroup{
-//            gdb.ConfigNode{
-//                Name: "/tmp/my.db",
-//                Type: "sqlite",
-//            },
-//        },
-//    })
-//    db := g.Database()
-//    if db == nil {
-//        panic("db create failed")
-//    }
-//    defer db.Close()
-//
-//    // 创建表
-//    sql := `CREATE TABLE user (
-//        uid  INT PRIMARY KEY NOT NULL,
-//        name VARCHAR(30) NOT NULL
-//    );`
-//    if _, err := db.Exec(sql); err != nil {
-//        fmt.Println(err)
-//    }
-//
-//    // 写入数据
-//    result, err := db.Table("user").Data(g.Map{"uid" : 1, "name" : "john"}).Save()
-//    if err == nil {
-//        fmt.Println(result.RowsAffected())
-//    } else {
-//        fmt.Println(err)
-//    }
-//
-//    // 删除表
-//    sql  = `DROP TABLE user;`
-//    if _, err := db.Exec(sql); err != nil {
-//        fmt.Println(err)
-//    }
-//}
+import (
+	"fmt"
+
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	_ "github.com/mattn/go-sqlite3"
+)
+
+func main() {
+	gdb.SetConfig(gdb.Config{
+		"default": gdb.ConfigGroup{
+			gdb.ConfigNode{
+				Name: "/tmp/my.db",
+				Type: "sqlite",
+			},
+		},
+	})
+	db := g.DB()
+	if db == nil {
+		panic("db create failed")
+	}
+
+	// 创建表
+	sql := `CREATE TABLE user (
+       uid  INT PRIMARY KEY NOT NULL,
+       name VARCHAR(30) NOT NULL
+   );`
+	if _, err := db.Exec(sql); err != nil {
+		fmt.Println(err)
+	}
+
+	// 写入数据
+	result, err := db.Table("user").Data(g.Map{"uid": 1, "name": "john"}).Save()
+	if err == nil {
+		fmt.Println(result.RowsAffected())
+	} else {
+		fmt.Println(err)
+	}
+
+	// 删除表
+	sql = `DROP TABLE user;`
+	if _, err := db.Exec(sql); err != nil {
+		fmt.Println(err)
+	}
+}

.example/database/gredis/migration/migration.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/gogf/gf/util/gconv"
-
-	"github.com/gogf/gf/os/gcmd"
-
-	"github.com/gogf/gf/container/garray"
-	"github.com/gogf/gf/database/gredis"
-	"github.com/gogf/gf/frame/g"
-)
-
-func main() {
-	batchNumber := 1000
-	redis1Config, err := gredis.ConfigFromStr("im-redis-slave:6379,9")
-	if err != nil {
-		panic(err)
-	}
-	redis2Config, err := gredis.ConfigFromStr("r-bp1f0a5d4efd8744.redis.rds.aliyuncs.com:6379,9")
-	if err != nil {
-		panic(err)
-	}
-	gredis.SetConfig(redis1Config)
-
-	v, err := g.Redis().DoVar("keys", "*")
-	if err != nil {
-		panic(err)
-	}
-	array := garray.NewStrArrayFrom(v.Strings())
-	for {
-		slice := array.PopLefts(batchNumber)
-		if len(slice) > 0 {
-			// `migrate %s %d "" 0 2000 copy replace auth %s keys %s`,
-			params := g.Slice{
-				redis2Config.Host,
-				redis2Config.Port,
-				"",
-				redis2Config.Db,
-				2000,
-				"copy",
-				"replace",
-				"keys",
-			}
-			params = append(params, gconv.Interfaces(slice)...)
-			fmt.Println(params)
-			if gcmd.GetOpt("dryrun") == "0" {
-				if v, err := g.Redis().DoVar("migrate", params...); err != nil {
-					panic(err)
-				} else {
-					fmt.Println(v.String())
-				}
-			}
-		} else {
-			break
-		}
-	}
-	fmt.Println("done")
-}

.example/debug/gdebug/gdebug.go

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

.example/debug/gdebug/gdebug_info.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/debug/gdebug"
+)
+
+func main() {
+	fmt.Println(gdebug.BuildInfo())
+}

.example/encoding/gbase64/gbase64.go

@@ -1,4 +1,4 @@
-package main
+package gbase64
 
 import (
 	"fmt"

.example/encoding/gbinary/binary.go

@@ -9,26 +9,19 @@ import (
 
 func main() {
 	// 使用gbinary.Encoded对基本数据类型进行二进制打包
-	if buffer, err := gbinary.Encode(18, 300, 1.01); err != nil {
-		glog.Error(err)
-	} else {
-		fmt.Println(buffer)
-	}
+	fmt.Println(gbinary.Encode(18, 300, 1.01))
 
 	// 使用gbinary.Decode对整形二进制解包，注意第二个及其后参数为字长确定的整形变量的指针地址，字长确定的类型，
 	// 例如：int8/16/32/64、uint8/16/32/64、float32/64
 	// 这里的1.01默认为float64类型(64位系统下)
-	if buffer, err := gbinary.Encode(18, 300, 1.01); err != nil {
+	buffer := gbinary.Encode(18, 300, 1.01)
+	var i1 int8
+	var i2 int16
+	var f3 float64
+	if err := gbinary.Decode(buffer, &i1, &i2, &f3); err != nil {
 		glog.Error(err)
 	} else {
-		var i1 int8
-		var i2 int16
-		var f3 float64
-		if err := gbinary.Decode(buffer, &i1, &i2, &f3); err != nil {
-			glog.Error(err)
-		} else {
-			fmt.Println(i1, i2, f3)
-		}
+		fmt.Println(i1, i2, f3)
 	}
 
 	// 编码/解析 int，自动识别变量长度

.example/encoding/gcfg/gcfg1.go

@@ -15,6 +15,6 @@ func main() {
 	}
 
 	redisCfg := new(RedisConfig)
-	fmt.Println(g.Config().GetToStruct("redis", redisCfg))
+	fmt.Println(g.Config().GetStruct("redis", redisCfg))
 	fmt.Println(redisCfg)
 }

.example/encoding/gcharset/gcharset.go

@@ -15,4 +15,6 @@ func main() {
 		panic(err)
 	}
 	fmt.Println(str)
+	// output:
+	// 花间一壶酒，独酌无相亲。
 }

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

@@ -19,7 +19,7 @@ func getWithPattern1() {
             }
         }`
 
-	if p, e := gparser.LoadContent([]byte(data), "json"); e != nil {
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
 		glog.Error(e)
 	} else {
 		fmt.Println("John Score:", p.GetFloat32("users.list.1.score"))
@@ -36,7 +36,7 @@ func getWithPattern2() {
            <body>Don't forget me this weekend!</body>
          </note>`
 
-	if p, e := gparser.LoadContent([]byte(data), "xml"); e != nil {
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
 		glog.Error(e)
 	} else {
 		fmt.Println("Heading:", p.GetString("note.heading"))
@@ -52,7 +52,7 @@ func multiDots1() {
             },
             "users.count" : 101
         }`
-	if p, e := gparser.LoadContent([]byte(data), "json"); e != nil {
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
 		glog.Error(e)
 	} else {
 		fmt.Println("Users Count:", p.Get("users.count"))
@@ -70,7 +70,7 @@ func multiDots2() {
                 "count.type1" : 100
             }
         }`
-	if p, e := gparser.LoadContent([]byte(data), "json"); e != nil {
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
 		glog.Error(e)
 	} else {
 		fmt.Println("Users Count:", p.Get("users.count.type1"))
@@ -88,7 +88,7 @@ func set1() {
            <list><title>gf article2</title><content>gf content2</content></list>
            <list><title>gf article3</title><content>gf content3</content></list>
          </article>`
-	if p, e := gparser.LoadContent([]byte(data), "xml"); e != nil {
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
 		glog.Error(e)
 	} else {
 		p.Set("article.list.0", nil)
@@ -105,7 +105,7 @@ func set2() {
                 "count" : 100
             }
         }`
-	if p, e := gparser.LoadContent([]byte(data), "json"); e != nil {
+	if p, e := gparser.LoadContent([]byte(data)); e != nil {
 		glog.Error(e)
 	} else {
 		p.Set("users.count", 1)
@@ -116,7 +116,7 @@ func set2() {
 }
 
 func makeXml1() {
-	p := gparser.New()
+	p := gparser.New(nil)
 	p.Set("name", "john")
 	p.Set("age", 18)
 	p.Set("scores", map[string]int{
@@ -133,7 +133,7 @@ func makeJson1() {
 		Id    int     `json:"id"`
 		Price float32 `json:"price"`
 	}
-	p := gparser.New()
+	p := gparser.New(nil)
 	p.Set("orders.list.0", Order{1, 100})
 	p.Set("orders.list.1", Order{2, 666})
 	p.Set("orders.list.2", Order{3, 999.99})

.example/frame/main/model/config.toml

@@ -1,4 +0,0 @@
-
-# MySQL数据库配置
-[database]
-    link = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"

.example/frame/main/model/model1.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/.example/frame/mvc/model/test"
-	"github.com/gogf/gf/frame/g"
-)
-
-func main() {
-	g.DB().SetDebug(true)
-	user, err := test.ModelUser().One()
-	g.Dump(err)
-	g.Dump(user)
-}

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

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

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

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

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

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

.example/frame/mvc/config.toml

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

.example/frame/mvc/main.go

@@ -1,15 +1,10 @@
 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"
+	"github.com/gogf/gf/.example/frame/mvc/app/model/article"
 )
 
 func main() {
-
-	//g.Server().SetDumpRouteMap(false)
-	g.Server().SetPort(8199)
-	g.Server().Run()
-
+	m := article.Model
+	m.All()
 }

.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/log/log_error.go

@@ -7,9 +7,7 @@ import (
 func main() {
 	s := ghttp.GetServer()
 	s.BindHandler("/log/error", func(r *ghttp.Request) {
-		if j := r.GetJson(); j != nil {
-			r.Response.Write(j.Get("test"))
-		}
+		panic("OMG")
 	})
 	s.SetErrorLogEnabled(true)
 	s.SetPort(8199)

.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/basic.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.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.Writeln(r.Get("amount"))
+		r.Response.Writeln(r.GetInt("amount"))
+		r.Response.Writeln(r.GetFloat32("amount"))
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/exit/exit.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) {
+		if r.GetInt("type") == 1 {
+			r.Response.Writeln("john")
+		}
+		r.Response.Writeln("smith")
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/json-xml/test1.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.Writef("name: %v, pass: %v", r.Get("name"), r.Get("pass"))
+	})
+	s.SetPort(8199)
+	s.Run()
+}

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

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/util/gvalid"
+)
+
+type RegisterReq struct {
+	Name  string `p:"username"  v:"required|length:6,30#请输入账号|账号长度为:min到:max位"`
+	Pass  string `p:"password1" v:"required|length:6,30#请输入密码|密码长度不够"`
+	Pass2 string `p:"password2" v:"required|length:6,30|same:password1#请确认密码|两次密码不一致"`
+}
+
+type RegisterRes struct {
+	Code  int         `json:"code"`
+	Error string      `json:"error"`
+	Data  interface{} `json:"data"`
+}
+
+func main() {
+	s := g.Server()
+	s.BindHandler("/register", func(r *ghttp.Request) {
+		var req *RegisterReq
+		//fmt.Println(r.GetBody())
+		if err := r.Parse(&req); err != nil {
+			// Validation error.
+			if v, ok := err.(*gvalid.Error); ok {
+				r.Response.WriteJsonExit(RegisterRes{
+					Code:  1,
+					Error: v.FirstString(),
+				})
+			}
+			// Other error.
+			r.Response.WriteJsonExit(RegisterRes{
+				Code:  1,
+				Error: err.Error(),
+			})
+		}
+		// ...
+		r.Response.WriteJsonExit(RegisterRes{
+			Data: req,
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/params/array.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.Write(r.Get("array"))
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/params/map.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.Write(r.Get("map"))
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/params/repeat.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.Write(r.Get("name"))
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/priority.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("/input", func(r *ghttp.Request) {
+		r.Response.Writeln(r.Get("amount"))
+	})
+	s.BindHandler("/query", func(r *ghttp.Request) {
+		r.Response.Writeln(r.GetQuery("amount"))
+	})
+	s.SetPort(8199)
+	s.Run()
+}