Version 1.3.5

devfeel · devfeel · commit 53542ceedcda · 2017-11-02T16:11:07.000+08:00
* 提升UUID性能，调整UUID算法，新增UUID包
* HttpServer新增设置是否启用唯一请求ID，默认不开启，开启后使用32位UUID，通过ctx.RequestID获取
* 提供HttpServer.SetEnabledRequestID()函数
* 提供uuid.V1\V2\V3\V4四类算法
* move example/exception to devfeel/dotweb-example
* move example/uploadfile to devfeel/dotweb-example
* add cookbook link
* 2017-11-02 16:00
diff --git a/router.go b/router.go
@@ -528,8 +528,8 @@ func (r *router) wrapWebSocketHandle(handler HttpHandle) websocket.Handler {
 		//get from pool
 		req := r.server.pool.request.Get().(*Request)
 		httpCtx := r.server.pool.context.Get().(*HttpContext)
-		req.reset(ws.Request(), httpCtx)
 		httpCtx.reset(nil, req, r.server, nil, nil, handler)
+		req.reset(ws.Request(), httpCtx)
 		httpCtx.webSocket = &WebSocket{
 			Conn: ws,
 		}
diff --git a/server.go b/server.go
@@ -140,9 +140,9 @@ func (server *HttpServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			response := server.pool.response.Get().(*Response)
 			request := server.pool.request.Get().(*Request)
 			httpCtx := server.pool.context.Get().(*HttpContext)
+			httpCtx.reset(response, request, server, nil, nil, nil)
 			response.reset(w)
 			request.reset(req, httpCtx)
-			httpCtx.reset(response, request, server, nil, nil, nil)
 
 			//处理前置Module集合
 			for _, module := range server.Modules {
