diff --git a/.example/other/test.go b/.example/other/test.go index 79444a4901b..786b8c761cd 100644 --- a/.example/other/test.go +++ b/.example/other/test.go @@ -6,6 +6,10 @@ import ( "github.com/gogf/gf/text/gstr" ) +const ( + TraceIdName = "trace-id" +) + func main() { type Sender struct { diff --git a/.example/util/gpage/gpage.go b/.example/util/gpage/gpage.go index 9b6071f0de2..00f80ee7af7 100644 --- a/.example/util/gpage/gpage.go +++ b/.example/util/gpage/gpage.go @@ -7,7 +7,7 @@ import ( ) func main() { - s := ghttp.GetServer() + s := g.Server() s.BindHandler("/page/demo", func(r *ghttp.Request) { page := r.GetPage(100, 10) buffer, _ := gview.ParseContent(` diff --git a/.example/util/gpage/gpage_ajax.go b/.example/util/gpage/gpage_ajax.go index 84c4facfa58..a33a83cdca5 100644 --- a/.example/util/gpage/gpage_ajax.go +++ b/.example/util/gpage/gpage_ajax.go @@ -7,7 +7,7 @@ import ( ) func main() { - s := ghttp.GetServer() + s := g.Server() s.BindHandler("/page/ajax", func(r *ghttp.Request) { page := r.GetPage(100, 10) page.AjaxActionName = "DoAjax" diff --git a/.example/util/gpage/gpage_custom1.go b/.example/util/gpage/gpage_custom1.go index 9571c36aa11..437a72da744 100644 --- a/.example/util/gpage/gpage_custom1.go +++ b/.example/util/gpage/gpage_custom1.go @@ -8,7 +8,7 @@ import ( "github.com/gogf/gf/util/gpage" ) -// 分页标签使用li标签包裹 +// wrapContent wraps each of the page tag with html li and ul. func wrapContent(page *gpage.Page) string { content := page.GetContent(4) content = gstr.ReplaceByMap(content, map[string]string{ @@ -21,7 +21,7 @@ func wrapContent(page *gpage.Page) string { } func main() { - s := ghttp.GetServer() + s := g.Server() s.BindHandler("/page/custom1/*page", func(r *ghttp.Request) { page := r.GetPage(100, 10) content := wrapContent(page) diff --git a/.example/util/gpage/gpage_custom2.go b/.example/util/gpage/gpage_custom2.go index 2e84042c242..e7512ef920d 100644 --- a/.example/util/gpage/gpage_custom2.go +++ b/.example/util/gpage/gpage_custom2.go @@ -7,7 +7,7 @@ import ( "github.com/gogf/gf/util/gpage" ) -// 自定义分页名称 +// pageContent customizes the page tag name. func pageContent(page *gpage.Page) string { page.NextPageTag = "NextPage" page.PrevPageTag = "PrevPage" @@ -22,7 +22,7 @@ func pageContent(page *gpage.Page) string { } func main() { - s := ghttp.GetServer() + s := g.Server() s.BindHandler("/page/custom2/*page", func(r *ghttp.Request) { page := r.GetPage(100, 10) buffer, _ := gview.ParseContent(` diff --git a/encoding/gbase64/gbase64_test.go b/encoding/gbase64/gbase64_test.go index 8286b648e74..c382a239b52 100644 --- a/encoding/gbase64/gbase64_test.go +++ b/encoding/gbase64/gbase64_test.go @@ -8,7 +8,6 @@ package gbase64_test import ( "github.com/gogf/gf/debug/gdebug" - "github.com/gogf/gf/os/gfile" "testing" "github.com/gogf/gf/encoding/gbase64" diff --git a/net/ghttp/ghttp_request_param_page.go b/net/ghttp/ghttp_request_param_page.go index f6cb94fa7ff..c9fbe7d03f4 100644 --- a/net/ghttp/ghttp_request_param_page.go +++ b/net/ghttp/ghttp_request_param_page.go @@ -53,7 +53,7 @@ func (r *Request) GetPage(totalSize, pageSize int) *gpage.Page { values := url.Query() values.Set(gpage.PAGE_NAME, gpage.PAGE_PLACE_HOLDER) url.RawQuery = values.Encode() - // Replace the encodes "{.page}" to "{.page}". + // Replace the encoded "{.page}" to original "{.page}". url.RawQuery = gstr.Replace(url.RawQuery, "%7B.page%7D", "{.page}") } if url.RawQuery != "" { diff --git a/net/ghttp/ghttp_unit_middleware_basic_test.go b/net/ghttp/ghttp_unit_middleware_basic_test.go index 7ce9420f264..3f0eac47e54 100644 --- a/net/ghttp/ghttp_unit_middleware_basic_test.go +++ b/net/ghttp/ghttp_unit_middleware_basic_test.go @@ -10,7 +10,6 @@ import ( "fmt" "github.com/gogf/gf/container/garray" "github.com/gogf/gf/debug/gdebug" - "github.com/gogf/gf/os/gfile" "net/http" "testing" "time" diff --git a/net/ghttp/ghttp_unit_template_test.go b/net/ghttp/ghttp_unit_template_test.go index 75c6395f0c8..661867c42e7 100644 --- a/net/ghttp/ghttp_unit_template_test.go +++ b/net/ghttp/ghttp_unit_template_test.go @@ -18,7 +18,6 @@ import ( "github.com/gogf/gf/frame/g" "github.com/gogf/gf/net/ghttp" - "github.com/gogf/gf/os/gfile" "github.com/gogf/gf/test/gtest" ) diff --git a/os/gview/gview_unit_config_test.go b/os/gview/gview_unit_config_test.go index e901f69bf6c..a19d607014c 100644 --- a/os/gview/gview_unit_config_test.go +++ b/os/gview/gview_unit_config_test.go @@ -9,7 +9,6 @@ package gview_test import ( "github.com/gogf/gf/debug/gdebug" "github.com/gogf/gf/frame/g" - "github.com/gogf/gf/os/gfile" "github.com/gogf/gf/os/gview" "github.com/gogf/gf/test/gtest" "testing"