Merge pull request devfeel#107 from devfeel/develop

devfeel · web-flow · commit 6b488e730c2b · 2018-01-22T21:49:52.000+08:00
Version 1.4.7 - 修复Middleware特定场景下无效问题
diff --git a/const/const.go b/const/const.go
@@ -0,0 +1,6 @@
+package _const
+
+//dotweb const
+const (
+	Version = "1.4.7"
+)
diff --git a/consts.go b/consts.go
@@ -1,10 +1,5 @@
 package dotweb
 
-//dotweb const
-const (
-	Version = "1.4.5.1"
-)
-
 //Log define
 const (
 	LogTarget_Default     = "dotweb_default"
diff --git a/core/state.go b/core/state.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
+	"github.com/devfeel/dotweb/const"
 )
 
 var GlobalState *ServerStateInfo
@@ -116,6 +117,8 @@ type ServerStateInfo struct {
 //ShowHtmlData show server state data html-string format
 func (state *ServerStateInfo) ShowHtmlData() string {
 	data := "<html><body><div>"
+	data += "ServerVersion : " + _const.Version
+	data += "<br>"
 	data += "ServerStartTime : " + state.ServerStartTime.Format(dateTimeLayout)
 	data += "<br>"
 	data += "TotalRequestCount : " + strconv.FormatUint(state.TotalRequestCount, 10)
diff --git a/dotweb.go b/dotweb.go
@@ -275,7 +275,7 @@ func (app *DotWeb) ListenAndServe(addr string) error {
 	app.initBindMiddleware()
 
 	if app.StartMode == StartMode_Classic {
-		app.UseDotwebRouter()
+		app.IncludeDotwebGroup()
 	}
 
 	if app.HttpServer.ServerConfig().EnabledTLS {
@@ -402,21 +402,67 @@ func (app *DotWeb) initRegisterConfigGroup() {
 // init bind app's middleware to router node
 func (app *DotWeb) initBindMiddleware() {
 	router := app.HttpServer.Router().(*router)
-	for path, node := range router.allNodeMap {
+	//bind app middlewares
+	for fullExpress, _ := range router.allRouterExpress {
+		expresses := strings.Split(fullExpress, "_")
+		if len(expresses) < 2{
+			continue
+		}
+		node := router.getNode(expresses[0], expresses[1])
+		if node == nil{
+			continue
+		}
+
 		node.appMiddlewares = app.Middlewares
 		for _, m := range node.appMiddlewares {
 			if m.HasExclude() && m.ExistsExcludeRouter(node.fullPath) {
-				logger.Logger().Debug("DotWeb initBindMiddleware "+path+" "+reflect.TypeOf(m).String()+" exclude", LogTarget_HttpServer)
+				logger.Logger().Debug("DotWeb initBindMiddleware [app] "+fullExpress+" "+reflect.TypeOf(m).String()+" exclude", LogTarget_HttpServer)
 				node.hasExcludeMiddleware = true
 			} else {
-				logger.Logger().Debug("DotWeb initBindMiddleware "+path+" "+reflect.TypeOf(m).String()+" match", LogTarget_HttpServer)
+				logger.Logger().Debug("DotWeb initBindMiddleware [app] "+fullExpress+" "+reflect.TypeOf(m).String()+" match", LogTarget_HttpServer)
+			}
+		}
+		if len(node.middlewares) > 0{
+			firstMiddleware := &xMiddleware{}
+			firstMiddleware.SetNext(node.middlewares[0])
+			node.middlewares = append([]Middleware{firstMiddleware}, node.middlewares...)
+		}
+	}
+
+	//bind group middlewares
+	for _, g := range app.HttpServer.groups {
+		xg := g.(*xGroup)
+		if len(xg.middlewares) <= 0 {
+			continue
+		}else{
+			firstMiddleware := &xMiddleware{}
+			firstMiddleware.SetNext(xg.middlewares[0])
+			xg.middlewares = append([]Middleware{firstMiddleware}, xg.middlewares...)
+		}
+		for fullExpress, _ := range xg.allRouterExpress {
+			expresses := strings.Split(fullExpress, "_")
+			if len(expresses) < 2 {
+				continue
+			}
+			node := router.getNode(expresses[0], expresses[1])
+			if node == nil {
+				continue
+			}
+			node.groupMiddlewares = xg.middlewares
+			for _, m := range node.groupMiddlewares {
+				if m.HasExclude() && m.ExistsExcludeRouter(node.fullPath) {
+					logger.Logger().Debug("DotWeb initBindMiddleware [group] "+fullExpress+" "+reflect.TypeOf(m).String()+" exclude", LogTarget_HttpServer)
+					node.hasExcludeMiddleware = true
+				} else {
+					logger.Logger().Debug("DotWeb initBindMiddleware [group] "+fullExpress+" "+reflect.TypeOf(m).String()+" match", LogTarget_HttpServer)
+				}
 			}
 		}
 	}
 }
 
-// init inner routers
-func (app *DotWeb) UseDotwebRouter() {
+// IncludeDotwebGroup init inner routers
+func (app *DotWeb) IncludeDotwebGroup() {
 	//默认支持pprof信息查看
 	gInner := app.HttpServer.Group("/dotweb")
 	gInner.GET("/debug/pprof/:key", initPProf)
@@ -548,7 +594,7 @@ func showIntervalData(ctx Context) error {
 
 //显示服务器状态信息
 func showServerState(ctx Context) error {
-	ctx.WriteString(core.GlobalState.ShowHtmlData())
+	ctx.WriteHtml(core.GlobalState.ShowHtmlData())
 	return nil
 }
 
diff --git a/group.go b/group.go
@@ -1,6 +1,8 @@
 package dotweb
 
-import "github.com/devfeel/dotweb/logger"
+import (
+	"github.com/devfeel/dotweb/logger"
+)
 
 type (
 	Group interface {
@@ -18,12 +20,14 @@ type (
 	xGroup struct {
 		prefix      string
 		middlewares []Middleware
+		allRouterExpress   map[string]struct{}
 		server      *HttpServer
 	}
 )
 
 func NewGroup(prefix string, server *HttpServer) Group {
-	g := &xGroup{prefix: prefix, server: server}
+	g := &xGroup{prefix: prefix, server: server, allRouterExpress:make(map[string]struct{})}
+	server.groups = append(server.groups, g)
 	logger.Logger().Debug("DotWeb:Group NewGroup ["+prefix+"]", LogTarget_HttpServer)
 	return g
 }
@@ -92,6 +96,7 @@ func (g *xGroup) RegisterRoute(method, path string, handler HttpHandle) RouterNo
 
 func (g *xGroup) add(method, path string, handler HttpHandle) RouterNode {
 	node := g.server.Router().RegisterRoute(method, g.prefix+path, handler)
+	g.allRouterExpress[method+"_"+g.prefix+path] = struct{}{}
 	node.Node().groupMiddlewares = g.middlewares
 	return node
 }
diff --git a/router.go b/router.go
@@ -96,7 +96,7 @@ type (
 	// handler functions via configurable routes
 	router struct {
 		Nodes        map[string]*Node
-		allNodeMap   map[string]*Node
+		allRouterExpress   map[string]struct{}
 		server       *HttpServer
 		handlerMap   map[string]HttpHandle
 		handlerMutex *sync.RWMutex
@@ -159,7 +159,7 @@ func NewRouter(server *HttpServer) *router {
 		RedirectTrailingSlash: true,
 		RedirectFixedPath:     true,
 		HandleOPTIONS:         true,
-		allNodeMap:            make(map[string]*Node),
+		allRouterExpress:      make(map[string]struct{}),
 		server:                server,
 		handlerMap:            make(map[string]HttpHandle),
 		handlerMutex:          new(sync.RWMutex),
@@ -187,6 +187,14 @@ func (r *router) MatchPath(ctx Context, routePath string) bool {
 	return false
 }
 
+func (r *router) getNode(httpMethod string, routePath string) *Node{
+	if root := r.Nodes[httpMethod]; root != nil {
+		n := root.getNode(routePath)
+		return n
+	}
+	return nil
+}
+
 // ServeHTTP makes the router implement the http.Handler interface.
 func (r *router) ServeHTTP(ctx *HttpContext) {
 	req := ctx.Request().Request
@@ -492,7 +500,7 @@ func (r *router) add(method, path string, handle RouterHandle, m ...Middleware)
 	//fmt.Println("Handle => ", method, " - ", *root, " - ", path)
 	outnode = root.addRoute(path, handle, m...)
 	outnode.fullPath = path
-	r.allNodeMap[method+"_"+path] = outnode
+	r.allRouterExpress[method+"_"+path] = struct{}{}
 	return
 }
 
diff --git a/server.go b/server.go
@@ -26,6 +26,7 @@ type (
 	HttpServer struct {
 		stdServer      *http.Server
 		router         Router
+		groups	 	   []Group
 		Modules        []*HttpModule
 		DotApp         *DotWeb
 		sessionManager *session.SessionManager
diff --git a/version.MD b/version.MD
@@ -1,5 +1,11 @@
 ## dotweb版本记录：
 
+#### Version 1.4.7
+* BUG Fixed: 修复Middleware特定场景下无效问题
+* 新增dotweb.IncludeDotwebGroup，用于自动集成dotweb相关路由
+* /dotweb/state 增加 ServerVersion输出
+* 2018-01-22 22:00
+
 #### Version 1.4.6
 * BUG Fixed: UploadFile废弃Bytes接口，新增ReadBytes接口，用于返回上传文件本身
 * 需要特别注意，由于io.read具有一次性特性，UploadFile.SaveFile与UploadFile.ReadBytes只能使用其中一个，另外一个将无法正常获取数据
