Merge pull request #207 from devfeel/develop

Version 1.6.8 - Remove OfflineServer & Remove render\developmode\start examples

Author: devfeel

README.md

@@ -208,7 +208,8 @@ func TestBind(ctx dotweb.HttpContext) error{
 * [CORS](https://github.com/devfeel/middleware/tree/master/cors)   -  [example](https://github.com/devfeel/middleware/tree/master/example/cors)
 * [Gzip](https://github.com/devfeel/middleware/tree/master/gzip)   -  [example](https://github.com/devfeel/middleware/tree/master/example/gzip)
 * [authorization based on Casbin](https://github.com/devfeel/middleware/tree/master/authz) - [example](https://github.com/devfeel/middleware/tree/master/example/authz) - [what's Casbin?](https://github.com/casbin/casbin)
-* BasicAuth
+* [BasicAuth](https://github.com/devfeel/middleware/tree/master/basicauth) - [example](https://github.com/devfeel/middleware/tree/master/example/basicauth)
+* [Domain](https://github.com/devfeel/middleware/tree/master/domain) - [example](https://github.com/devfeel/middleware/tree/master/example/domain)
 * Recover
 * HeaderOverride
 
@@ -323,9 +324,6 @@ dependency now managed by go mod.
 #### <a href="https://github.com/devfeel/dotweb-start" target="_blank">dotweb-start</a>
 项目简介：基于dotweb、dotlog、mapper、dottask、cache、database的综合项目模板。
 
-## 贡献名单
-目前已经有几位朋友在为框架一起做努力，我们将在合适的时间向大家展现，谢谢他们的支持！
-
 ## 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)

config/configs.go

@@ -16,7 +16,6 @@ type (
 		XMLName        xml.Name          `xml:"config" json:"-" yaml:"-"`
 		App            *AppNode          `xml:"app"`
 		ConfigSetNodes []*ConfigSetNode  `xml:"configset>set"`
-		Offline        *OfflineNode      `xml:"offline"`
 		Server         *ServerNode       `xml:"server"`
 		Session        *SessionNode      `xml:"session"`
 		Routers        []*RouterNode     `xml:"routers>router"`
@@ -25,13 +24,6 @@ type (
 		ConfigSet      core.ReadonlyMap  `json:"-" yaml:"-"`
 	}
 
-	// OfflineNode dotweb app offline config
-	OfflineNode struct {
-		Offline     bool   `xml:"offline,attr"`     // maintenance mode, default false
-		OfflineText string `xml:"offlinetext,attr"` // text to display when Offline is true, OfflineUrl is used if set
-		OfflineUrl  string `xml:"offlineurl,attr"`  // maintenance page url
-	}
-
 	// AppNode dotweb app global config
 	AppNode struct {
 		LogPath      string `xml:"logpath,attr"`      // path of log files, use current directory if empty
@@ -108,7 +100,6 @@ const (
 func NewConfig() *Config {
 	return &Config{
 		App:       NewAppNode(),
-		Offline:   NewOfflineNode(),
 		Server:    NewServerNode(),
 		Session:   NewSessionNode(),
 		ConfigSet: core.NewReadonlyMap(),
@@ -148,11 +139,6 @@ func NewAppNode() *AppNode {
 	return config
 }
 
-func NewOfflineNode() *OfflineNode {
-	config := &OfflineNode{}
-	return config
-}
-
 func NewServerNode() *ServerNode {
 	config := &ServerNode{}
 	return config
@@ -224,10 +210,6 @@ func InitConfig(configFile string, confType ...interface{}) (config *Config, err
 		config.Session = NewSessionNode()
 	}
 
-	if config.Offline == nil {
-		config.Offline = NewOfflineNode()
-	}
-
 	tmpConfigSetMap := core.NewConcurrenceMap()
 	for _, v := range config.ConfigSetNodes {
 		tmpConfigSetMap.Set(v.Key, v.Value)

consts.go

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

dotweb.go

@@ -19,15 +19,13 @@ import (
 	"github.com/devfeel/dotweb/config"
 	"github.com/devfeel/dotweb/core"
 	"github.com/devfeel/dotweb/logger"
-	"github.com/devfeel/dotweb/servers"
 	"github.com/devfeel/dotweb/session"
 )
 
 type (
 	DotWeb struct {
 		HttpServer              *HttpServer
 		cache                   cache.Cache
-		OfflineServer           servers.Server
 		Config                  *config.Config
 		Mock                    Mock
 		Middlewares             []Middleware
@@ -81,7 +79,6 @@ const (
 func New() *DotWeb {
 	app := &DotWeb{
 		HttpServer:      NewHttpServer(),
-		OfflineServer:   servers.NewOfflineServer(),
 		Middlewares:     make([]Middleware, 0),
 		Items:           core.NewConcurrenceMap(),
 		Config:          config.NewConfig(),
@@ -385,12 +382,6 @@ func (app *DotWeb) initAppConfig() {
 
 	app.HttpServer.initConfig()
 
-	// maintenance mode
-	if config.Offline.Offline {
-		app.HttpServer.SetOffline(config.Offline.Offline, config.Offline.OfflineText, config.Offline.OfflineUrl)
-		app.OfflineServer.SetOffline(config.Offline.Offline, config.Offline.OfflineText, config.Offline.OfflineUrl)
-	}
-
 	// detailed request metrics
 	if config.Server.EnabledDetailRequestData {
 		app.StateInfo().EnabledDetailRequestData = config.Server.EnabledDetailRequestData

example/developmode/main.go

@@ -4,6 +4,6 @@ go 1.12
 
 require (
 	github.com/garyburd/redigo v1.6.0
-	golang.org/x/net v0.0.0-20190603091049-60506f45cf65 // indirect
+	golang.org/x/net v0.0.0-20190603091049-60506f45cf65
 	gopkg.in/yaml.v2 v2.2.2
 )

example/render/main.go

@@ -152,33 +152,27 @@ func (server *HttpServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	} else {
 		// setup header
 		w.Header().Set(HeaderServer, DefaultServerName)
-		// maintenance mode
-		if server.IsOffline() {
-			server.DotApp.OfflineServer.ServeHTTP(w, req)
-		} else {
-			httpCtx := prepareHttpContext(server, w, req)
-
-			// process OnBeginRequest of modules
-			for _, module := range server.Modules {
-				if module.OnBeginRequest != nil {
-					module.OnBeginRequest(httpCtx)
-				}
+		httpCtx := prepareHttpContext(server, w, req)
+		// process OnBeginRequest of modules
+		for _, module := range server.Modules {
+			if module.OnBeginRequest != nil {
+				module.OnBeginRequest(httpCtx)
 			}
+		}
 
-			if !httpCtx.IsEnd() {
-				server.Router().ServeHTTP(httpCtx)
-			}
+		if !httpCtx.IsEnd() {
+			server.Router().ServeHTTP(httpCtx)
+		}
 
-			// process OnEndRequest of modules
-			for _, module := range server.Modules {
-				if module.OnEndRequest != nil {
-					module.OnEndRequest(httpCtx)
-				}
+		// process OnEndRequest of modules
+		for _, module := range server.Modules {
+			if module.OnEndRequest != nil {
+				module.OnEndRequest(httpCtx)
 			}
-			server.StateInfo().AddRequestCount(httpCtx.Request().Path(), httpCtx.Response().HttpCode(), 1)
-
-			releaseHttpContext(server, httpCtx)
 		}
+		server.StateInfo().AddRequestCount(httpCtx.Request().Path(), httpCtx.Response().HttpCode(), 1)
+
+		releaseHttpContext(server, httpCtx)
 	}
 }