version updates

add Tables and TableFields method for sqlite

.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/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,119 @@
+// 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"
+	"fmt"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/internal/intlog"
+	"github.com/gogf/gf/text/gstr"
+)
+
+type MyDriver struct {
+	*gdb.Core
+}
+
+// Open creates and returns a underlying sql.DB object for mysql.
+func (d *MyDriver) Open(config *gdb.ConfigNode) (*sql.DB, error) {
+	var source string
+	if config.LinkInfo != "" {
+		source = config.LinkInfo
+	} else {
+		source = fmt.Sprintf(
+			"%s:%s@tcp(%s:%s)/%s?charset=%s&multiStatements=true&parseTime=true&loc=Local",
+			config.User, config.Pass, config.Host, config.Port, config.Name, config.Charset,
+		)
+	}
+	intlog.Printf("Open: %s", source)
+	if db, err := sql.Open("mysql", source); err == nil {
+		return db, nil
+	} else {
+		return nil, err
+	}
+}
+
+// getChars returns the security char for this type of database.
+func (d *MyDriver) GetChars() (charLeft string, charRight string) {
+	return "`", "`"
+}
+
+// handleSqlBeforeExec handles the sql before posts it to database.
+func (d *MyDriver) HandleSqlBeforeExec(sql string) string {
+	return sql
+}
+
+// Tables retrieves and returns the tables of current schema.
+func (d *MyDriver) Tables(schema ...string) (tables []string, err error) {
+	var result gdb.Result
+	link, err := d.DB.GetSlave(schema...)
+	if err != nil {
+		return nil, err
+	}
+	result, err = d.DB.DoGetAll(link, `SHOW TABLES`)
+	if err != nil {
+		return
+	}
+	for _, m := range result {
+		for _, v := range m {
+			tables = append(tables, v.String())
+		}
+	}
+	return
+}
+
+// gdb.TableFields retrieves and returns the fields information of specified table of current schema.
+//
+// Note that it returns a map containing the field name and its corresponding fields.
+// As a map is unsorted, the gdb.TableField struct has a "Index" field marks its sequence in the fields.
+//
+// It's using cache feature to enhance the performance, which is never expired util the process restarts.
+func (d *MyDriver) TableFields(table string, schema ...string) (fields map[string]*gdb.TableField, err error) {
+	table = gstr.Trim(table)
+	if gstr.Contains(table, " ") {
+		panic("function gdb.TableFields supports only single table operations")
+	}
+	checkSchema := d.DB.GetSchema()
+	if len(schema) > 0 && schema[0] != "" {
+		checkSchema = schema[0]
+	}
+	v := d.DB.GetCache().GetOrSetFunc(
+		fmt.Sprintf(`mysql_table_fields_%s_%s`, table, checkSchema),
+		func() interface{} {
+			var result gdb.Result
+			var link *sql.DB
+			link, err = d.DB.GetSlave(checkSchema)
+			if err != nil {
+				return nil
+			}
+			result, err = d.DB.DoGetAll(
+				link,
+				fmt.Sprintf(`SHOW FULL COLUMNS FROM %s`, d.DB.QuoteWord(table)),
+			)
+			if err != nil {
+				return nil
+			}
+			fields = make(map[string]*gdb.TableField)
+			for i, m := range result {
+				fields[m["Field"].String()] = &gdb.TableField{
+					Index:   i,
+					Name:    m["Field"].String(),
+					Type:    m["Type"].String(),
+					Null:    m["Null"].Bool(),
+					Key:     m["Key"].String(),
+					Default: m["Default"].Val(),
+					Extra:   m["Extra"].String(),
+					Comment: m["Comment"].String(),
+				}
+			}
+			return fields
+		}, 0)
+	if err == nil {
+		fields = v.(map[string]*gdb.TableField)
+	}
+	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,7 +1,7 @@
 
 # MySQL数据库配置
 [database]
-	debug = true
+#	debug = true
     link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"
 
 #[database]

.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_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_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.SetDebug(true)
 
+	db.Table("user").Fields("DISTINCT id,nickname").Filter().All()
 }

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

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

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

@@ -1,60 +0,0 @@
-// This is auto-generated by gf cli tool. You may not really want to edit it.
-
-package defaults
-
-import (
-	"database/sql"
-	"github.com/gogf/gf/database/gdb"
-	"github.com/gogf/gf/frame/g"
-)
-
-import (
-	"github.com/gogf/gf/os/gtime"
-)
-
-// User is the golang structure for table user.
-type User struct {
-	Id         int         `orm:"id,primary"      json:"id"`
-	Passport   string      `orm:"passport"        json:"passport"`
-	Password   string      `orm:"password"        json:"password"`
-	Nickname   string      `orm:"nickname,unique" json:"nickname"`
-	CreateTime *gtime.Time `orm:"create_time"     json:"create_time"`
-}
-
-var (
-	// TableUser is the table name of user.
-	TableUser = "user"
-	// ModelUser is the model object of user.
-	ModelUser = g.DB("default").Table(TableUser).Safe()
-)
-
-// Inserts does "INSERT...INTO..." statement for inserting current object into table.
-func (r *User) Insert() (result sql.Result, err error) {
-	return ModelUser.Data(r).Insert()
-}
-
-// Replace does "REPLACE...INTO..." statement for inserting current object into table.
-// If there's already another same record in the table (it checks using primary key or unique index),
-// it deletes it and insert this one.
-func (r *User) Replace() (result sql.Result, err error) {
-	return ModelUser.Data(r).Replace()
-}
-
-// Save does "INSERT...INTO..." statement for inserting/updating current object into table.
-// It updates the record if there's already another same record in the table
-// (it checks using primary key or unique index).
-func (r *User) Save() (result sql.Result, err error) {
-	return ModelUser.Data(r).Save()
-}
-
-// Update does "UPDATE...WHERE..." statement for updating current object from table.
-// It updates the record if there's already another same record in the table
-// (it checks using primary key or unique index).
-func (r *User) Update() (result sql.Result, err error) {
-	return ModelUser.Data(r).Where(gdb.GetWhereConditionOfStruct(r)).Update()
-}
-
-// Delete does "DELETE FROM...WHERE..." statement for deleting current object from table.
-func (r *User) Delete() (result sql.Result, err error) {
-	return ModelUser.Where(gdb.GetWhereConditionOfStruct(r)).Delete()
-}

.example/frame/mvc/config.json

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

.example/frame/mvc/config.toml

@@ -1,11 +0,0 @@
-viewpath = "/home/www/templates"
-
-# MySQL数据库配置
-[database]
-	debug = true
-    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
-
-
-[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,13 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/gogf/gf/.example/frame/mvc/app/model/defaults"
-	"github.com/gogf/gf/database/gdb"
-)
-
-func main() {
-	u := defaults.User{Id: 1, Nickname: "test"}
-	fmt.Println(gdb.GetWhereConditionOfStruct(&u))
-	fmt.Println(u.Replace())
-}

.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/upload-batch/server.go

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

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

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

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

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

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

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

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

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

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

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

.example/net/ghttp/server/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_exception.go

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

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

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

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

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

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

.example/net/ghttp/server/request/validation/validation2.go

@@ -0,0 +1,46 @@
+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
+		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/router/group/basic.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+func main() {
+	s := g.Server()
+	group := s.Group("/api")
+	group.ALL("/all", func(r *ghttp.Request) {
+		r.Response.Write("all")
+	})
+	group.GET("/get", func(r *ghttp.Request) {
+		r.Response.Write("get")
+	})
+	group.POST("/post", func(r *ghttp.Request) {
+		r.Response.Write("post")
+	})
+	s.SetPort(8199)
+	s.Run()
+}

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

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+type Object struct{}
+
+func (o *Object) Show(r *ghttp.Request) {
+	r.Response.Writeln("Show")
+}
+
+func (o *Object) Delete(r *ghttp.Request) {
+	r.Response.Writeln("REST Delete")
+}
+
+func Handler(r *ghttp.Request) {
+	r.Response.Writeln("Handler")
+}
+
+func HookHandler(r *ghttp.Request) {
+	r.Response.Writeln("HOOK Handler")
+}
+
+func main() {
+	s := g.Server()
+	obj := new(Object)
+	s.Group("/api").Bind([]ghttp.GroupItem{
+		{"ALL", "*", HookHandler, ghttp.HOOK_BEFORE_SERVE},
+		{"ALL", "/handler", Handler},
+		{"ALL", "/obj", obj},
+		{"GET", "/obj/show", obj, "Show"},
+		{"REST", "/obj/rest", obj},
+	})
+	s.SetPort(8199)
+	s.Run()
+}

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

@@ -5,7 +5,6 @@ import (
 
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
-	"github.com/gogf/gf/os/glog"
 )
 
 func MiddlewareAuth(r *ghttp.Request) {
@@ -24,39 +23,37 @@ func MiddlewareCORS(r *ghttp.Request) {
 
 func MiddlewareLog(r *ghttp.Request) {
 	r.Middleware.Next()
-	glog.Println(r.Response.Status, r.URL.Path)
+	g.Log().Println(r.Response.Status, r.URL.Path)
 }
 
 func main() {
 	s := g.Server()
-	s.Group("/", func(group *ghttp.RouterGroup) {
-		group.Middleware(MiddlewareLog)
-	})
+	s.Use(MiddlewareLog)
 	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
 		group.Middleware(MiddlewareAuth, MiddlewareCORS)
-		g.GET("/test", func(r *ghttp.Request) {
+		group.GET("/test", func(r *ghttp.Request) {
 			r.Response.Write("test")
 		})
-		g.Group("/order", func(group *ghttp.RouterGroup) {
-			g.GET("/list", func(r *ghttp.Request) {
+		group.Group("/order", func(group *ghttp.RouterGroup) {
+			group.GET("/list", func(r *ghttp.Request) {
 				r.Response.Write("list")
 			})
-			g.PUT("/update", func(r *ghttp.Request) {
+			group.PUT("/update", func(r *ghttp.Request) {
 				r.Response.Write("update")
 			})
 		})
-		g.Group("/user", func(group *ghttp.RouterGroup) {
-			g.GET("/info", func(r *ghttp.Request) {
+		group.Group("/user", func(group *ghttp.RouterGroup) {
+			group.GET("/info", func(r *ghttp.Request) {
 				r.Response.Write("info")
 			})
-			g.POST("/edit", func(r *ghttp.Request) {
+			group.POST("/edit", func(r *ghttp.Request) {
 				r.Response.Write("edit")
 			})
-			g.DELETE("/drop", func(r *ghttp.Request) {
+			group.DELETE("/drop", func(r *ghttp.Request) {
 				r.Response.Write("drop")
 			})
 		})
-		g.Group("/hook", func(group *ghttp.RouterGroup) {
+		group.Group("/hook", func(group *ghttp.RouterGroup) {
 			group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) {
 				r.Response.Write("hook any")
 			})

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

@@ -1,9 +1,12 @@
 package main
 
-import "github.com/gogf/gf/net/ghttp"
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
 
 func main() {
-	s := ghttp.GetServer()
+	s := g.Server()
 	s.BindHandler("/user/:name", func(r *ghttp.Request) {
 		r.Response.Writeln(r.Router.Uri)
 	})

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

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

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

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/gsession"
+	"github.com/gogf/gf/os/gtime"
+	"time"
+)
+
+func main() {
+	s := g.Server()
+	s.SetSessionMaxAge(2 * time.Minute)
+	s.SetSessionStorage(gsession.NewStorageRedis(g.Redis()))
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.GET("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Timestamp())
+			r.Response.Write("ok")
+		})
+		group.GET("/get", func(r *ghttp.Request) {
+			r.Response.WriteJson(r.Session.Map())
+		})
+		group.GET("/clear", func(r *ghttp.Request) {
+			r.Session.Clear()
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/template/config/config.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.WriteTplContent(`${.name}`, g.Map{
+			"name": "john",
+		})
+	})
+	s.SetPort(8199)
+	s.Run()
+}

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

@@ -0,0 +1,2 @@
+[viewer]
+    delimiters  =  ["${", "}"]

.example/net/ghttp/server/template/conflicts-name/client.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+// https://github.com/gogf/gf/issues/437
+func main() {
+	s := g.Server()
+	s.BindHandler("/", func(r *ghttp.Request) {
+		r.Response.WriteTpl("client/layout.html")
+	})
+	s.SetPort(8199)
+	s.Run()
+}

.example/net/ghttp/server/template/conflicts-name/template/client/layout.html

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

.example/net/gtcp/pkg_operations/monitor/gtcp_monitor_client.go

@@ -27,7 +27,7 @@ func main() {
 		},
 		MemUsed:  15560320,
 		MemTotal: 16333788,
-		Time:     int(gtime.Second()),
+		Time:     int(gtime.Timestamp()),
 	})
 	if err != nil {
 		panic(err)

.example/os/gbuild/config.toml

@@ -0,0 +1,9 @@
+
+
+# custom gf build setting.
+[compiler]
+    name = "app"
+    [compiler.varmap]
+        name      = "GoFrame"
+        version   = "1.10.1"
+        home-site = "https://goframe.org"

.example/os/gbuild/gbuild.go

@@ -0,0 +1,11 @@
+package main
+
+import (
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/os/gbuild"
+)
+
+func main() {
+	g.Dump(gbuild.Info())
+	g.Dump(gbuild.Map())
+}

.example/os/gfpool/gfpool.go

@@ -11,7 +11,7 @@ import (
 func main() {
 	for {
 		time.Sleep(time.Second)
-		if f, err := gfpool.Open("/home/john/temp/log.log", os.O_RDONLY, 0666, 60000000*1000); err == nil {
+		if f, err := gfpool.Open("/home/john/temp/log.log", os.O_RDONLY, 0666, time.Hour); err == nil {
 			fmt.Println(f.Name())
 			f.Close()
 		} else {

.example/os/gproc/gproc_comm.go

@@ -1,6 +1,3 @@
-// 多进程通信示例，
-// 子进程每个1秒向父进程发送当前时间，
-// 父进程监听进程消息，收到后打印到终端。
 package main
 
 import (

.example/os/gproc/gproc_kill.go

@@ -2,16 +2,15 @@ package main
 
 import (
 	"fmt"
-
 	"github.com/gogf/gf/os/gproc"
 )
 
-// 使用gproc kill指定其他进程(清确保运行该程序的用户有足够权限)
 func main() {
-	pid := 28536
+	pid := 32556
 	m := gproc.NewManager()
 	m.AddProcess(pid)
-	m.KillAll()
+	err := m.KillAll()
+	fmt.Println(err)
 	m.WaitAll()
 	fmt.Printf("%d was killed\n", pid)
 }

.example/os/gproc/gproc_sleep.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gogf/gf/os/gproc"
+)
+
+func main() {
+	fmt.Println(gproc.Pid())
+	err := gproc.ShellRun("sleep 99999s")
+	fmt.Println(err)
+}

.example/os/grpool/goroutine.go

@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	start := gtime.Millisecond()
+	start := gtime.TimestampMilli()
 	wg := sync.WaitGroup{}
 	for i := 0; i < 100000; i++ {
 		wg.Add(1)
@@ -19,5 +19,5 @@ func main() {
 		}()
 	}
 	wg.Wait()
-	fmt.Println("time spent:", gtime.Millisecond()-start)
+	fmt.Println("time spent:", gtime.TimestampMilli()-start)
 }

.example/os/grpool/grpool.go

@@ -10,7 +10,7 @@ import (
 )
 
 func main() {
-	start := gtime.Millisecond()
+	start := gtime.TimestampMilli()
 	wg := sync.WaitGroup{}
 	for i := 0; i < 100000; i++ {
 		wg.Add(1)
@@ -21,5 +21,5 @@ func main() {
 	}
 	wg.Wait()
 	fmt.Println(grpool.Size())
-	fmt.Println("time spent:", gtime.Millisecond()-start)
+	fmt.Println("time spent:", gtime.TimestampMilli()-start)
 }

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

@@ -12,16 +12,18 @@ func main() {
 	s.SetConfigWithMap(g.Map{
 		"SessionMaxAge": time.Minute,
 	})
-	s.BindHandler("/set", func(r *ghttp.Request) {
-		r.Session.Set("time", gtime.Second())
-		r.Response.Write("ok")
-	})
-	s.BindHandler("/get", func(r *ghttp.Request) {
-		r.Response.Write(r.Session.Map())
-	})
-	s.BindHandler("/del", func(r *ghttp.Request) {
-		r.Session.Clear()
-		r.Response.Write("ok")
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.ALL("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Timestamp())
+			r.Response.Write("ok")
+		})
+		group.ALL("/get", func(r *ghttp.Request) {
+			r.Response.Write(r.Session.Map())
+		})
+		group.ALL("/del", func(r *ghttp.Request) {
+			r.Session.Clear()
+			r.Response.Write("ok")
+		})
 	})
 	s.SetPort(8199)
 	s.Run()

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

@@ -14,16 +14,18 @@ func main() {
 		"SessionMaxAge":  time.Minute,
 		"SessionStorage": gsession.NewStorageMemory(),
 	})
-	s.BindHandler("/set", func(r *ghttp.Request) {
-		r.Session.Set("time", gtime.Second())
-		r.Response.Write("ok")
-	})
-	s.BindHandler("/get", func(r *ghttp.Request) {
-		r.Response.Write(r.Session.Map())
-	})
-	s.BindHandler("/del", func(r *ghttp.Request) {
-		r.Session.Clear()
-		r.Response.Write("ok")
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.ALL("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Timestamp())
+			r.Response.Write("ok")
+		})
+		group.ALL("/get", func(r *ghttp.Request) {
+			r.Response.Write(r.Session.Map())
+		})
+		group.ALL("/del", func(r *ghttp.Request) {
+			r.Session.Clear()
+			r.Response.Write("ok")
+		})
 	})
 	s.SetPort(8199)
 	s.Run()

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

@@ -14,16 +14,18 @@ func main() {
 		"SessionMaxAge":  time.Minute,
 		"SessionStorage": gsession.NewStorageRedisHashTable(g.Redis()),
 	})
-	s.BindHandler("/set", func(r *ghttp.Request) {
-		r.Session.Set("time", gtime.Second())
-		r.Response.Write("ok")
-	})
-	s.BindHandler("/get", func(r *ghttp.Request) {
-		r.Response.Write(r.Session.Map())
-	})
-	s.BindHandler("/del", func(r *ghttp.Request) {
-		r.Session.Clear()
-		r.Response.Write("ok")
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.ALL("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Timestamp())
+			r.Response.Write("ok")
+		})
+		group.ALL("/get", func(r *ghttp.Request) {
+			r.Response.Write(r.Session.Map())
+		})
+		group.ALL("/del", func(r *ghttp.Request) {
+			r.Session.Clear()
+			r.Response.Write("ok")
+		})
 	})
 	s.SetPort(8199)
 	s.Run()

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

@@ -14,16 +14,18 @@ func main() {
 		"SessionMaxAge":  time.Minute,
 		"SessionStorage": gsession.NewStorageRedis(g.Redis()),
 	})
-	s.BindHandler("/set", func(r *ghttp.Request) {
-		r.Session.Set("time", gtime.Second())
-		r.Response.Write("ok")
-	})
-	s.BindHandler("/get", func(r *ghttp.Request) {
-		r.Response.Write(r.Session.Map())
-	})
-	s.BindHandler("/del", func(r *ghttp.Request) {
-		r.Session.Clear()
-		r.Response.Write("ok")
+	s.Group("/", func(group *ghttp.RouterGroup) {
+		group.ALL("/set", func(r *ghttp.Request) {
+			r.Session.Set("time", gtime.Timestamp())
+			r.Response.Write("ok")
+		})
+		group.ALL("/get", func(r *ghttp.Request) {
+			r.Response.Write(r.Session.Map())
+		})
+		group.ALL("/del", func(r *ghttp.Request) {
+			r.Session.Clear()
+			r.Response.Write("ok")
+		})
 	})
 	s.SetPort(8199)
 	s.Run()

.example/os/gtime/gtime_func.go

@@ -9,8 +9,8 @@ import (
 func main() {
 	fmt.Println("Date       :", gtime.Date())
 	fmt.Println("Datetime   :", gtime.Datetime())
-	fmt.Println("Second     :", gtime.Second())
-	fmt.Println("Millisecond:", gtime.Millisecond())
-	fmt.Println("Microsecond:", gtime.Microsecond())
-	fmt.Println("Nanosecond :", gtime.Nanosecond())
+	fmt.Println("Second     :", gtime.Timestamp())
+	fmt.Println("Millisecond:", gtime.TimestampMilli())
+	fmt.Println("Microsecond:", gtime.TimestampMicro())
+	fmt.Println("Nanosecond :", gtime.TimestampNano())
 }

.example/other/config.toml

@@ -1,3 +1,12 @@
+
 [database]
 	debug = true
-    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?parseTime=true&loc=Local"
+    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
+
+[redis]
+    default  = "127.0.0.1:6379,0"
+    cache = "127.0.0.1:6379,1"
+
+[viewer]
+    delimiters  =  ["${", "}"]
+    autoencode  =  true

.example/other/terminal-color.go

@@ -1,42 +0,0 @@
-package main
-
-import (
-	"fmt"
-)
-
-func main() {
-	fmt.Println("")
-
-	// 前景 背景 颜色
-	// ---------------------------------------
-	// 30  40  黑色
-	// 31  41  红色
-	// 32  42  绿色
-	// 33  43  黄色
-	// 34  44  蓝色
-	// 35  45  紫红色
-	// 36  46  青蓝色
-	// 37  47  白色
-	//
-	// 代码 意义
-	// -------------------------
-	//  0  终端默认设置
-	//  1  高亮显示
-	//  4  使用下划线
-	//  5  闪烁
-	//  7  反白显示
-	//  8  不可见
-
-	// 背景色彩 = 40-47
-	for b := 40; b <= 47; b++ {
-		// 前景色彩 = 30-37
-		for f := 30; f <= 37; f++ {
-			// 显示方式 = 0,1,4,5,7,8
-			for _, d := range []int{0, 1, 4, 5, 7, 8} {
-				fmt.Printf(" %c[%d;%d;%dm%s(f=%d,b=%d,d=%d)%c[0m ", 0x1B, d, b, f, "", f, b, d, 0x1B)
-			}
-			fmt.Println("")
-		}
-		fmt.Println("")
-	}
-}

.example/other/test.go

@@ -2,16 +2,34 @@ package main
 
 import (
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/os/gtimer"
+	"time"
 )
 
-func main() {
-	s := g.Server()
-	s.Group("/api.v2", func(group *ghttp.RouterGroup) {
-		group.ALL("/test", func(r *ghttp.Request) {
-			r.Response.Write(r.GetRequest("nickname"))
+func GetList() {
+START:
+	for {
+		res, err := g.Redis().DoVar("RPOP", "mill")
+		if err != nil {
+			glog.Debug("Rpop:", err)
+			break
+		}
+		glog.Debug(res)
+		if res.IsEmpty() {
+			glog.Debug("nil")
+			continue START
+		}
+		interval := 50 * time.Second
+		gtimer.AddOnce(interval, func() {
+			glog.Debug("end------:", res, gtime.Now().Format("Y-m-d H:i:s"))
 		})
-	})
-	s.SetPort(8199)
-	s.Run()
+	}
+}
+
+func main() {
+	g.Redis().SetMaxActive(2)
+	//g.Redis().SetMaxIdle(100)
+	GetList()
 }

.example/other/test2.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/text/gregex"
+	"fmt"
+	"github.com/gogf/gf/net/ghttp"
 )
 
 func main() {
-	s := `-abc`
-	m, err := gregex.MatchString(`^\-{1,2}a={0,1}(.*)`, s)
-	g.Dump(err)
-	g.Dump(m)
+	r := ghttp.PostContent("http://127.0.0.1:8199/test", `<doc><id>1</id><name>john</name><password1>123Abc!@#</password1><password2>123Abc!@#</password2></doc>`)
+	fmt.Println(r)
 }

.example/other/try-catch.go

@@ -1,22 +0,0 @@
-package main
-
-import (
-	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/os/glog"
-)
-
-func main() {
-	g.TryCatch(func() {
-		glog.Println("hello")
-		g.Throw("exception")
-		glog.Println("world")
-	})
-
-	g.TryCatch(func() {
-		glog.Println("hello")
-		g.Throw("exception")
-		glog.Println("world")
-	}, func(exception interface{}) {
-		glog.Error(exception)
-	})
-}

.example/util/gconv/gconv_map_deep.go

@@ -7,18 +7,18 @@ import (
 
 func main() {
 	type Ids struct {
-		Id  int `json:"id"`
-		Uid int `json:"uid"`
+		Id  int `c:"id"`
+		Uid int `c:"uid"`
 	}
 	type Base struct {
 		Ids
-		CreateTime string `json:"create_time"`
+		CreateTime string `c:"create_time"`
 	}
 	type User struct {
 		Base
-		Passport string `json:"passport"`
-		Password string `json:"password"`
-		Nickname string `json:"nickname"`
+		Passport string `c:"passport"`
+		Password string `c:"password"`
+		Nickname string `c:"nickname"`
 	}
 	user := new(User)
 	user.Id = 1
@@ -27,5 +27,6 @@ func main() {
 	user.Passport = "johng"
 	user.Password = "123456"
 	user.CreateTime = "2019"
+	g.Dump(gconv.Map(user))
 	g.Dump(gconv.MapDeep(user))
 }