Merge pull request #230 from devfeel/develop

add Tools include some useful functions

Author: devfeel

consts.go

@@ -3,7 +3,7 @@ package dotweb
 // Global define
 const (
 	// Version current version
-	Version = "1.7.7"
+	Version = "1.7.11"
 )
 
 // Log define

context.go

@@ -46,6 +46,7 @@ type (
 		RouterNode() RouterNode
 		RouterParams() Params
 		Handler() HttpHandle
+		Tools() *Tools
 		AppItems() core.ConcurrenceMap
 		Cache() cache.Cache
 		Items() core.ConcurrenceMap
@@ -116,6 +117,7 @@ type (
 		items          core.ConcurrenceMap
 		viewData       core.ConcurrenceMap
 		handler        HttpHandle
+		tools          *Tools
 	}
 
 	WebSocket struct {
@@ -269,6 +271,15 @@ func (ctx *HttpContext) Items() core.ConcurrenceMap {
 	return ctx.items
 }
 
+// Tools get tools
+// lazy init when first use
+func (ctx *HttpContext) Tools() *Tools {
+	if ctx.tools == nil {
+		ctx.tools = new(Tools)
+	}
+	return ctx.tools
+}
+
 // AppSetConfig get appset from config file
 // update for issue #16 Config file
 func (ctx *HttpContext) ConfigSet() core.ReadonlyMap {

example/main.go

@@ -97,7 +97,7 @@ func main() {
 
 func Index(ctx dotweb.Context) error {
 	ctx.Response().Header().Set("Content-Type", "text/html; charset=utf-8")
-	ctx.WriteString(ctx.Request().RemoteIP())
+	ctx.Write(200, []byte(ctx.Request().RemoteIP()))
 	//_, err := ctx.WriteStringC(201, "index => ", ctx.RemoteIP(), "我是首页")
 	return nil
 }
@@ -122,6 +122,18 @@ func IndexReg(ctx dotweb.Context) error {
 	return ctx.WriteString("welcome to dotweb")
 }
 
+func IndexPretty(ctx dotweb.Context) error {
+	type Result struct {
+		Code    int
+		Message string
+	}
+	result := Result{
+		Code:    200,
+		Message: "Test",
+	}
+	return ctx.WriteString(ctx.Tools().PrettyJson(result))
+}
+
 func ReadPost(ctx dotweb.Context) error {
 	return ctx.WriteString(ctx.Request().PostBody())
 }
@@ -172,5 +184,6 @@ func InitRoute(server *dotweb.HttpServer) {
 	server.GET("/returnerr", ReturnError)
 	server.GET("/redirect", Redirect)
 	server.POST("/readpost", ReadPost)
+	server.GET("/pretty", IndexPretty)
 	//server.Router().RegisterRoute(dotweb.RouteMethod_GET, "/index", IndexReg)
 }

tools.go

@@ -0,0 +1,17 @@
+package dotweb
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+type Tools struct {
+}
+
+func (t *Tools) PrettyJson(data interface{}) string {
+	by, err := json.MarshalIndent(data, "", "\t")
+	if err != nil {
+		return fmt.Sprint(data)
+	}
+	return string(by)
+}

tools_test.go

@@ -0,0 +1 @@
+package dotweb

version.MD

@@ -1,5 +1,12 @@
 ## dotweb版本记录：
 
+
+#### Version 1.7.11
+* Feature: add Tools include some useful functions
+* Feature: add Tools.PrettyJson used to pretty json format view in text
+* Detail: use ctx.Tools() to use Tools
+* 2020-05-10 15:00 at ShangHai
+
 #### Version 1.7.10
 * Feature: add Request.ExistsQueryKey used to check is exists from query params with the given key.
 * Opt: optimize file layout, remove module.go