version updates

add Raw* method in ClientResponse to get request and response string

.example/container/glist/basic.go

@@ -10,10 +10,10 @@ func main() {
 	// Push
 	l.PushBack(1)
 	l.PushBack(2)
-	e0 := l.PushFront(0)
+	e := l.PushFront(0)
 	// Insert
-	l.InsertBefore(e0, -1)
-	l.InsertAfter(e0, "a")
+	l.InsertBefore(e, -1)
+	l.InsertAfter(e, "a")
 	fmt.Println(l)
 	// Pop
 	fmt.Println(l.PopFront())

.example/container/gmap/basic.go

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

.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/gpool/gpool.go

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

.example/container/gpool/gpool_expirefunc.go

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

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

@@ -0,0 +1,79 @@
+// Copyright 2017 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package driver
+
+import (
+	"database/sql"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gtime"
+)
+
+// MyDriver is a custom database driver, which is used for testing only.
+// For simplifying the unit testing case purpose, MyDriver struct inherits the mysql driver
+// gdb.DriverMysql and overwrites its functions DoQuery and DoExec.
+// So if there's any sql execution, it goes through MyDriver.DoQuery/MyDriver.DoExec firstly
+// and then gdb.DriverMysql.DoQuery/gdb.DriverMysql.DoExec.
+// You can call it sql "HOOK" or "HiJack" as your will.
+type MyDriver struct {
+	*gdb.DriverMysql
+}
+
+var (
+	// customDriverName is my driver name, which is used for registering.
+	customDriverName = "MyDriver"
+)
+
+func init() {
+	// It here registers my custom driver in package initialization function "init".
+	// You can later use this type in the database configuration.
+	if err := gdb.Register(customDriverName, &MyDriver{}); err != nil {
+		panic(err)
+	}
+}
+
+// New creates and returns a database object for mysql.
+// It implements the interface of gdb.Driver for extra database driver installation.
+func (d *MyDriver) New(core *gdb.Core, node *gdb.ConfigNode) (gdb.DB, error) {
+	return &MyDriver{
+		&gdb.DriverMysql{
+			Core: core,
+		},
+	}, nil
+}
+
+// DoQuery commits the sql string and its arguments to underlying driver
+// through given link object and returns the execution result.
+func (d *MyDriver) DoQuery(link gdb.Link, sql string, args ...interface{}) (rows *sql.Rows, err error) {
+	tsMilli := gtime.TimestampMilli()
+	rows, err = d.DriverMysql.DoQuery(link, sql, args...)
+	if _, err := d.DriverMysql.InsertIgnore("monitor", g.Map{
+		"sql":   gdb.FormatSqlWithArgs(sql, args),
+		"cost":  gtime.TimestampMilli() - tsMilli,
+		"time":  gtime.Now(),
+		"error": err.Error(),
+	}); err != nil {
+		panic(err)
+	}
+	return
+}
+
+// DoExec commits the query string and its arguments to underlying driver
+// through given link object and returns the execution result.
+func (d *MyDriver) DoExec(link gdb.Link, sql string, args ...interface{}) (result sql.Result, err error) {
+	tsMilli := gtime.TimestampMilli()
+	result, err = d.DriverMysql.DoExec(link, sql, args...)
+	if _, err := d.DriverMysql.InsertIgnore("monitor", g.Map{
+		"sql":   gdb.FormatSqlWithArgs(sql, args),
+		"cost":  gtime.TimestampMilli() - tsMilli,
+		"time":  gtime.Now(),
+		"error": err.Error(),
+	}); err != nil {
+		panic(err)
+	}
+	return
+}

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

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

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

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

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

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

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

@@ -11,11 +11,11 @@ func main() {
 	// 开启调试模式，以便于记录所有执行的SQL
 	db.SetDebug(true)
 
-	r, e := db.Table("test").OrderBy("id asc").All()
+	r, e := db.Table("test").Order("id asc").All()
 	if e != nil {
-		panic(e)
+		fmt.Println(e)
 	}
 	if r != nil {
-		fmt.Println(r.ToList())
+		fmt.Println(r.List())
 	}
 }

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

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

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

@@ -2,23 +2,11 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/os/gtime"
 )
 
 func main() {
 	db := g.DB()
 	db.SetDebug(true)
 
-	type User struct {
-		Id   int
-		Name *gtime.Time
-	}
-
-	user := new(User)
-	e := db.Table("test").Where("id", 10000).Struct(user)
-	if e != nil {
-		panic(e)
-	}
-	g.Dump(user)
-
+	db.Table("user").Fields("DISTINCT id,nickname").Filter().All()
 }

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

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

.example/encoding/gjson/gjson.go

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

.example/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/config.json

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

.example/frame/mvc/config.toml

@@ -1,4 +0,0 @@
-viewpath = "/home/www/templates"
-[redis]
-    disk  = "127.0.0.1:6379,0"
-    cache = "127.0.0.1:6379,1"

.example/frame/mvc/config.xml

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

.example/frame/mvc/config.yml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

.example/frame/mvc/main.go

@@ -1,15 +0,0 @@
-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"
-)
-
-func main() {
-
-	//g.Server().SetDumpRouteMap(false)
-	g.Server().SetPort(8199)
-	g.Server().Run()
-
-}

.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/frame/mvc/view/upload/upload.tpl

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

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

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

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

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

.example/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,62 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+// Upload uploads files to /tmp .
+func Upload(r *ghttp.Request) {
+	saveDirPath := "/tmp/"
+	files := r.GetUploadFiles("upload-file")
+	if _, err := files.Save(saveDirPath); err != nil {
+		r.Response.WriteExit(err)
+	}
+	r.Response.WriteExit("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.POST("/", 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

@@ -3,29 +3,24 @@ package main
 import (
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/gfile"
 )
 
-// 执行文件上传处理，上传到系统临时目录 /tmp
+// Upload uploads files to /tmp .
 func Upload(r *ghttp.Request) {
-	if f, h, e := r.FormFile("upload-file"); e == nil {
-		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())
+	saveDirPath := "/tmp/"
+	files := r.GetUploadFiles("upload-file")
+	if _, err := files.Save(saveDirPath); err != nil {
+		r.Response.WriteExit(err)
 	}
+	r.Response.WriteExit("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 +32,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.POST("/", Upload)
+		group.ALL("/show", UploadShow)
+		group.ALL("/batch", UploadShowBatch)
+	})
 	s.SetPort(8199)
 	s.Run()
 }

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

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

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

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

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

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

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

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

.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

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

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

@@ -11,8 +11,8 @@ func Order(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/api.v1", func(g *ghttp.RouterGroup) {
-		g.Hook("/*any", ghttp.HOOK_BEFORE_SERVE, 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)

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

@@ -1,32 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"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.Get("name"))
-		r.Response.Writeln(r.Get("site"))
-	})
-	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,8 +18,8 @@ func MiddlewareAuth(r *ghttp.Request) {
 
 func main() {
 	s := g.Server()
-	s.Group("/admin", func(g *ghttp.RouterGroup) {
-		g.MiddlewarePattern("/*action", func(r *ghttp.Request) {
+	s.Group("/admin", func(group *ghttp.RouterGroup) {
+		group.Middleware(func(r *ghttp.Request) {
 			if action := r.GetRouterString("action"); action != "" {
 				switch action {
 				case "login":
@@ -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

@@ -25,17 +25,15 @@ func MiddlewareCORS(r *ghttp.Request) {
 
 func MiddlewareLog(r *ghttp.Request) {
 	r.Middleware.Next()
-	glog.Println(r.Response.Status, r.URL.Path)
+	g.Log().Println(r.Response.Status, r.URL.Path)
 }
 
 func main() {
 	s := g.Server()
-	s.Group("/", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareLog)
-	})
-	s.Group("/api.v2", func(g *ghttp.RouterGroup) {
-		g.Middleware(MiddlewareAuth, MiddlewareCORS)
-		g.ALL("/user/list", func(r *ghttp.Request) {
+	s.Use(MiddlewareLog)
+	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,30 +7,30 @@ 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.GET("/list", func(r *ghttp.Request) {
+		group.Group("/order", func(group *ghttp.RouterGroup) {
+			group.GET("/list", func(r *ghttp.Request) {
 				r.Response.Write("list")
 			})
 		})
-		g.Group("/user", func(g *ghttp.RouterGroup) {
-			g.GET("/info", func(r *ghttp.Request) {
+		group.Group("/user", func(group *ghttp.RouterGroup) {
+			group.GET("/info", func(r *ghttp.Request) {
 				r.Response.Write("info")
 			})
-			g.POST("/edit", func(r *ghttp.Request) {
+			group.POST("/edit", func(r *ghttp.Request) {
 				r.Response.Write("edit")
 			})
 		})
-		g.Group("/hook", func(g *ghttp.RouterGroup) {
-			g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
+		group.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()
+}

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

@@ -5,20 +5,20 @@ import (
 	"github.com/gogf/gf/net/ghttp"
 )
 
-type User struct {
-	Uid   int    `json:"uid"`
-	Name  string `json:"name"  params:"username"`
-	Pass1 string `json:"pass1" params:"password1,userpass1"`
-	Pass2 string `json:"pass2" params:"password3,userpass2"`
-}
-
 func main() {
+	type User struct {
+		Uid   int    `json:"uid"`
+		Name  string `json:"name"  p:"username"`
+		Pass1 string `json:"pass1" p:"password1"`
+		Pass2 string `json:"pass2" p:"password2"`
+	}
+
 	s := g.Server()
 	s.BindHandler("/user", func(r *ghttp.Request) {
-		user := new(User)
-		r.GetToStruct(user)
-		//r.GetPostToStruct(user)
-		//r.GetQueryToStruct(user)
+		var user *User
+		if err := r.Parse(&user); err != nil {
+			panic(err)
+		}
 		r.Response.WriteJson(user)
 	})
 	s.SetPort(8199)

.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/request/struct/parse1.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	type User struct {
+		Id    int    `json:"id"`
+		Name  string `json:"name"`
+		Pass1 string `json:"password1" p:"password1"`
+		Pass2 string `json:"password2" p:"password2"`
+	}
+	s := g.Server()
+	s.BindHandler("/", func(r *ghttp.Request) {
+		var user *User
+		if err := r.Parse(&user); err != nil {
+			r.Response.WriteExit(err)
+		}
+		r.Response.WriteExit(user)
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/request/struct/parse2.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+type RegisterReq struct {
+	Name  string
+	Pass  string `p:"password1"`
+	Pass2 string `p:"password2"`
+}
+
+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
+		if err := r.Parse(&req); err != nil {
+			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/validation/validation1.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+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
+		if err := r.Parse(&req); err != nil {
+			r.Response.WriteJsonExit(RegisterRes{
+				Code:  1,
+				Error: err.Error(),
+			})
+		}
+		// ...
+		r.Response.WriteJsonExit(RegisterRes{
+			Data: req,
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}