Merge pull request #189 from devfeel/develop

Remove all features in dotweb

Author: devfeel

config/configs.go

@@ -48,7 +48,6 @@ type (
 		EnabledGzip                 bool   `xml:"enabledgzip,attr"`      // enable gzip
 		EnabledAutoHEAD             bool   `xml:"enabledautohead,attr"`  // ehanble HEAD routing, default is false, will add HEAD routing for all routes except for websocket and HEAD
 		EnabledAutoOPTIONS          bool   // enable OPTIONS routing, default is false, will add OPTIONS routing for all routes except for websocket and OPTIONS
-		EnabledAutoCORS             bool   `xml:"enabledautocors,attr"`       // enable automatic CORS, if set, all [GET, POST, PUT, DELETE, OPTIONS] requests will allow CORS
 		EnabledIgnoreFavicon        bool   `xml:"enabledignorefavicon,attr"`  // ignore favicon.ico request, return empty reponse if set
 		EnabledBindUseJsonTag       bool   `xml:"enabledbindusejsontag,attr"` // allow Bind to use JSON tag, default is false, Bind will use json tag automatically and ignore form tag
 		EnabledStaticFileMiddleware bool   // The flag which enabled or disabled middleware for static-file route

context.go

@@ -112,7 +112,6 @@ type (
 		innerItems     core.ConcurrenceMap
 		items          core.ConcurrenceMap
 		viewData       core.ConcurrenceMap
-		features       *xFeatureTools
 		handler        HttpHandle
 	}
 )
@@ -129,7 +128,6 @@ func (ctx *HttpContext) reset(res *Response, r *Request, server *HttpServer, nod
 	ctx.innerItems = nil
 	ctx.items = nil
 	ctx.isEnd = false
-	ctx.features = FeatureTools
 	ctx.handler = handler
 	ctx.Items().Set(ItemKeyHandleStartTime, time.Now())
 }
@@ -147,7 +145,6 @@ func (ctx *HttpContext) release() {
 	ctx.isWebSocket = false
 	ctx.httpServer = nil
 	ctx.isEnd = false
-	ctx.features = nil
 	ctx.innerItems = nil
 	ctx.items = nil
 	ctx.viewData = nil
@@ -225,10 +222,6 @@ func (ctx *HttpContext) SessionID() string {
 	return ctx.sessionID
 }
 
-func (ctx *HttpContext) Features() *xFeatureTools {
-	return ctx.features
-}
-
 // AppContext get application's global appcontext
 // issue #3
 func (ctx *HttpContext) AppItems() core.ConcurrenceMap {

example/README.md

@@ -0,0 +1,8 @@
+# DotWeb
+Simple and easy go web micro framework
+
+More examples: https://github.com/devfeel/dotweb-example
+
+## Contact Us
+#### QQ-Group：193409346 - <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=836e11667837ad674462a4a97fb21fba487cd3dff5b2e1ca0d7ea4c2324b4574"><img border="0" src="http://pub.idqqimg.com/wpa/images/group.png" alt="Golang-Devfeel" title="Golang-Devfeel"></a>
+#### Gitter：[![Gitter](https://badges.gitter.im/devfeel/dotweb.svg)](https://gitter.im/devfeel-dotweb/wechat)

feature.go

@@ -14,7 +14,6 @@ import (
 	"strconv"
 
 	"github.com/devfeel/dotweb/config"
-	"github.com/devfeel/dotweb/feature"
 	"github.com/devfeel/dotweb/framework/file"
 	"github.com/devfeel/dotweb/framework/json"
 	"github.com/devfeel/dotweb/logger"
@@ -40,7 +39,6 @@ type (
 		binder         Binder
 		render         Renderer
 		offline        bool
-		Features       *feature.Feature
 		virtualPath    string // virtual path when deploy on no root path
 	}
 
@@ -73,7 +71,6 @@ func NewHttpServer() *HttpServer {
 		Modules:      make([]*HttpModule, 0),
 		lock_session: new(sync.RWMutex),
 		binder:       newBinder(),
-		Features:     &feature.Feature{},
 	}
 	// setup router
 	server.router = NewRouter(server)
@@ -83,10 +80,6 @@ func NewHttpServer() *HttpServer {
 
 // initConfig init config from app config
 func (server *HttpServer) initConfig() {
-	// CROS Config
-	if server.ServerConfig().EnabledAutoCORS {
-		server.Features.SetEnabledCROS()
-	}
 	server.SetEnabledGzip(server.ServerConfig().EnabledGzip)
 
 	// VirtualPath config
@@ -519,14 +512,6 @@ func prepareHttpContext(server *HttpServer, w http.ResponseWriter, req *http.Req
 		httpCtx.Response().SetHeader(HeaderContentEncoding, gzipScheme)
 	}
 
-	// CROS handling
-	if server.Features.CROSConfig != nil {
-		c := server.Features.CROSConfig
-		if c.EnabledCROS {
-			FeatureTools.SetCROSConfig(httpCtx, c)
-		}
-	}
-
 	return httpCtx
 }
 

feature/cors.go

@@ -17,7 +17,6 @@ func TestNewHttpServer(t *testing.T) {
 	test.NotNil(t, server.SessionConfig)
 	test.NotNil(t, server.lock_session)
 	test.NotNil(t, server.binder)
-	test.NotNil(t, server.Features)
 	test.NotNil(t, server.pool)
 	test.NotNil(t, server.pool.context)
 	test.NotNil(t, server.pool.request)

feature/features.go

@@ -1,5 +1,30 @@
 ## dotweb版本记录：
 
+#### Version 1.6
+* Remove: remove all features in dotweb!
+* Remove: remove ServerConfig().EnabledAutoCORS.
+* Add: add example/README.md
+* Demo for how to use ConfigSet tools?
+    - first define config file named 'user-conf.xml'
+    ```
+    <?xml version="1.0" encoding="UTF-8"?>
+    <config>
+        <set key="set1" value="1" />
+        <set key="set2" value="2" />
+        <set key="set3" value="3" />
+        <set key="set4" value="4" />
+    </config>
+    ```
+    - include config file
+    ```
+    err := app.Config.IncludeConfigSet("/home/your/user-conf.xml", config.ConfigType_XML)
+    ```
+    - use it in your HttpContext
+    ```
+    value := ctx.ConfigSet().GetString("set1")
+    ```
+* 2019-02-02 12:00
+
 #### Version 1.5.9.11
 * New Feature: HttpServer add SetIndexPage used to config default index-page name, default is "index.html"
 * Remove: remove example/basemiddleware demo, more examples you can see "https://github.com/devfeel/dotweb-example"