From 49fffe3ebe6f54ce848c9ebf502f33f104b34cd8 Mon Sep 17 00:00:00 2001
From: Guohua Ouyang <guohuaouyang@gmail.com>
Date: Mon, 27 Feb 2017 14:43:16 +0800
Subject: [PATCH 01/35] Parse form time by its length

Fix #2451

Signed-off-by: Guohua Ouyang <guohuaouyang@gmail.com>
---
 templatefunc.go | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/templatefunc.go b/templatefunc.go
index 01751717..8ecacbfe 100644
--- a/templatefunc.go
+++ b/templatefunc.go
@@ -26,6 +26,12 @@ import (
 	"time"
 )
 
+const (
+	formatTime     = "15:04:05"
+	formatDate     = "2006-01-02"
+	formatDateTime = "2006-01-02 15:04:05"
+)
+
 // Substr returns the substr from start to length.
 func Substr(s string, start, length int) string {
 	bt := []rune(s)
@@ -352,11 +358,25 @@ func parseFormToStruct(form url.Values, objT reflect.Type, objV reflect.Value) e
 		case reflect.Struct:
 			switch fieldT.Type.String() {
 			case "time.Time":
-				format := time.RFC3339
-				if len(tags) > 1 {
-					format = tags[1]
+				var (
+					t   time.Time
+					err error
+				)
+				if len(value) >= 19 {
+					value = value[:19]
+					t, err = time.ParseInLocation(formatDateTime, value, time.Local)
+				} else if len(value) >= 10 {
+					if len(value) > 10 {
+						value = value[:10]
+					}
+					t, err = time.ParseInLocation(formatDate, value, time.Local)
+				} else if len(value) >= 8 {
+					if len(value) > 8 {
+						value = value[:8]
+					}
+					t, err = time.ParseInLocation(formatTime, value, time.Local)
 				}
-				t, err := time.ParseInLocation(format, value, time.Local)
+
 				if err != nil {
 					return err
 				}

From 8e46decc8ea690797be773b9713a1f024707d305 Mon Sep 17 00:00:00 2001
From: chendingxing <chendingxing@wanda.cn>
Date: Fri, 10 Mar 2017 09:28:25 +0800
Subject: [PATCH 02/35] fix routing bug for splat

---
 tree.go      | 25 +++++++++++++++----------
 tree_test.go |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/tree.go b/tree.go
index 25b78e50..2d6c3fc3 100644
--- a/tree.go
+++ b/tree.go
@@ -288,10 +288,10 @@ func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{
 		return nil
 	}
 	w := make([]string, 0, 20)
-	return t.match(pattern, w, ctx)
+	return t.match(pattern[1:], pattern, w, ctx)
 }
 
-func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Context) (runObject interface{}) {
+func (t *Tree) match(treePattern string, pattern string, wildcardValues []string, ctx *context.Context) (runObject interface{}) {
 	if len(pattern) > 0 {
 		i := 0
 		for ; i < len(pattern) && pattern[i] == '/'; i++ {
@@ -301,13 +301,13 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 	// Handle leaf nodes:
 	if len(pattern) == 0 {
 		for _, l := range t.leaves {
-			if ok := l.match(wildcardValues, ctx); ok {
+			if ok := l.match(treePattern, wildcardValues, ctx); ok {
 				return l.runObject
 			}
 		}
 		if t.wildcard != nil {
 			for _, l := range t.wildcard.leaves {
-				if ok := l.match(wildcardValues, ctx); ok {
+				if ok := l.match(treePattern, wildcardValues, ctx); ok {
 					return l.runObject
 				}
 			}
@@ -327,7 +327,12 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 	}
 	for _, subTree := range t.fixrouters {
 		if subTree.prefix == seg {
-			runObject = subTree.match(pattern, wildcardValues, ctx)
+			if len(pattern) != 0 && pattern[0] == '/' {
+				treePattern = pattern[1:]
+			} else {
+				treePattern = pattern
+			}
+			runObject = subTree.match(treePattern, pattern, wildcardValues, ctx)
 			if runObject != nil {
 				break
 			}
@@ -339,7 +344,7 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 			if strings.HasSuffix(seg, str) {
 				for _, subTree := range t.fixrouters {
 					if subTree.prefix == seg[:len(seg)-len(str)] {
-						runObject = subTree.match(pattern, wildcardValues, ctx)
+						runObject = subTree.match(treePattern, pattern, wildcardValues, ctx)
 						if runObject != nil {
 							ctx.Input.SetParam(":ext", str[1:])
 						}
@@ -349,7 +354,7 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 		}
 	}
 	if runObject == nil && t.wildcard != nil {
-		runObject = t.wildcard.match(pattern, append(wildcardValues, seg), ctx)
+		runObject = t.wildcard.match(treePattern, pattern, append(wildcardValues, seg), ctx)
 	}
 
 	if runObject == nil && len(t.leaves) > 0 {
@@ -368,7 +373,7 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 			wildcardValues = append(wildcardValues, pattern[start:i])
 		}
 		for _, l := range t.leaves {
-			if ok := l.match(wildcardValues, ctx); ok {
+			if ok := l.match(treePattern, wildcardValues, ctx); ok {
 				return l.runObject
 			}
 		}
@@ -386,7 +391,7 @@ type leafInfo struct {
 	runObject interface{}
 }
 
-func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok bool) {
+func (leaf *leafInfo) match(treePattern string, wildcardValues []string, ctx *context.Context) (ok bool) {
 	//fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
 	if leaf.regexps == nil {
 		if len(wildcardValues) == 0 && len(leaf.wildcards) == 0 { // static path
@@ -394,7 +399,7 @@ func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok b
 		}
 		// match *
 		if len(leaf.wildcards) == 1 && leaf.wildcards[0] == ":splat" {
-			ctx.Input.SetParam(":splat", path.Join(wildcardValues...))
+			ctx.Input.SetParam(":splat", treePattern)
 			return true
 		}
 		// match *.* or :id
diff --git a/tree_test.go b/tree_test.go
index 81ff7edd..d412a348 100644
--- a/tree_test.go
+++ b/tree_test.go
@@ -42,7 +42,7 @@ func init() {
 	routers = append(routers, testinfo{"/", "/", nil})
 	routers = append(routers, testinfo{"/customer/login", "/customer/login", nil})
 	routers = append(routers, testinfo{"/customer/login", "/customer/login.json", map[string]string{":ext": "json"}})
-	routers = append(routers, testinfo{"/*", "/customer/123", map[string]string{":splat": "customer/123"}})
+	routers = append(routers, testinfo{"/*", "/http://customer/123/", map[string]string{":splat": "http://customer/123/"}})
 	routers = append(routers, testinfo{"/*", "/customer/2009/12/11", map[string]string{":splat": "customer/2009/12/11"}})
 	routers = append(routers, testinfo{"/aa/*/bb", "/aa/2009/bb", map[string]string{":splat": "2009"}})
 	routers = append(routers, testinfo{"/cc/*/dd", "/cc/2009/11/dd", map[string]string{":splat": "2009/11"}})

From d41f4c0a3aa9aa6b5c621f2c72532389293ba454 Mon Sep 17 00:00:00 2001
From: miraclesu <suchuangji@gmail.com>
Date: Sun, 12 Mar 2017 19:23:46 +0800
Subject: [PATCH 03/35] validation: fix email valid

---
 validation/validators.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/validation/validators.go b/validation/validators.go
index 9b04c5ce..01aed443 100644
--- a/validation/validators.go
+++ b/validation/validators.go
@@ -518,7 +518,7 @@ func (a AlphaDash) GetLimitValue() interface{} {
 	return nil
 }
 
-var emailPattern = regexp.MustCompile("[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[a-zA-Z0-9](?:[\\w-]*[\\w])?")
+var emailPattern = regexp.MustCompile("^[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[a-zA-Z0-9](?:[\\w-]*[\\w])?$")
 
 // Email check struct
 type Email struct {

From b34853f8cc29c6734f543669e4914ef12f098c70 Mon Sep 17 00:00:00 2001
From: miraclesu <suchuangji@gmail.com>
Date: Sun, 12 Mar 2017 19:30:23 +0800
Subject: [PATCH 04/35] validattion: add test case for email valid

---
 validation/validation_test.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/validation/validation_test.go b/validation/validation_test.go
index ec65b6d0..2b287a1e 100644
--- a/validation/validation_test.go
+++ b/validation/validation_test.go
@@ -214,6 +214,12 @@ func TestEmail(t *testing.T) {
 	if !valid.Email("suchuangji@gmail.com", "email").Ok {
 		t.Error("\"suchuangji@gmail.com\" is a valid email address should be true")
 	}
+	if valid.Email("@suchuangji@gmail.com", "email").Ok {
+		t.Error("\"@suchuangji@gmail.com\" is a valid email address should be false")
+	}
+	if valid.Email("@suchuangji@gmail.com", "email").Ok {
+		t.Error("\"suchuangji@gmail.com ok\" is a valid email address should be false")
+	}
 }
 
 func TestIP(t *testing.T) {

From c9cc642d37d07f19e1a0f30b175551b3743b08b8 Mon Sep 17 00:00:00 2001
From: miraclesu <suchuangji@gmail.com>
Date: Sun, 12 Mar 2017 20:27:09 +0800
Subject: [PATCH 05/35] validation: amend email test case

---
 validation/validation_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/validation/validation_test.go b/validation/validation_test.go
index 2b287a1e..83e881bf 100644
--- a/validation/validation_test.go
+++ b/validation/validation_test.go
@@ -217,7 +217,7 @@ func TestEmail(t *testing.T) {
 	if valid.Email("@suchuangji@gmail.com", "email").Ok {
 		t.Error("\"@suchuangji@gmail.com\" is a valid email address should be false")
 	}
-	if valid.Email("@suchuangji@gmail.com", "email").Ok {
+	if valid.Email("suchuangji@gmail.com ok", "email").Ok {
 		t.Error("\"suchuangji@gmail.com ok\" is a valid email address should be false")
 	}
 }

From 24d4a278427159811fa83ff9fa6de504f01c86a6 Mon Sep 17 00:00:00 2001
From: Eyal Post <eyalp@gett.com>
Date: Mon, 13 Mar 2017 08:46:57 +0200
Subject: [PATCH 06/35] Don't panic during AddViewPath if adding the same path
 twice

---
 template.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template.go b/template.go
index 2dba9d1f..0524f3cb 100644
--- a/template.go
+++ b/template.go
@@ -72,7 +72,7 @@ func ExecuteViewPathTemplate(wr io.Writer, name string, viewPath string, data in
 		}
 		panic("can't find templatefile in the path:" + viewPath + "/" + name)
 	}
-	panic("Uknown view path:" + viewPath)
+	panic("Unknown view path:" + viewPath)
 }
 
 func init() {
@@ -165,6 +165,9 @@ func AddTemplateExt(ext string) {
 //will panic if called after beego.Run() 
 func AddViewPath(viewPath string) error {
 	if beeViewPathTemplateLocked {
+		if _, exist := beeViewPathTemplates[viewPath]; exist {
+			return nil //Ignore if viewpath already exists
+		}
 		panic("Can not add new view paths after beego.Run()")
 	}
 	beeViewPathTemplates[viewPath] = make(map[string]*template.Template)

From 3e37b97549f2293ede78d12850f38a62b6a6537e Mon Sep 17 00:00:00 2001
From: Sergey Lanzman <Sergeylanz@gettaxi.com>
Date: Tue, 14 Mar 2017 12:55:40 +0200
Subject: [PATCH 07/35] temple parse error write in log as trace. change to
 error

---
 template.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template.go b/template.go
index 89d38b80..4e0d6384 100644
--- a/template.go
+++ b/template.go
@@ -217,7 +217,7 @@ func BuildTemplate(dir string, files ...string) error {
 					t, err = getTemplate(self.root, file, v...)
 				}
 				if err != nil {
-					logs.Trace("parse template err:", file, err)
+					logs.Error("parse template err:", file, err)
 				} else {
 					beeTemplates[file] = t
 				}

From f5fc2edfd36e8f1aa9a88d1b728a170032343fd3 Mon Sep 17 00:00:00 2001
From: Sergey Lanzman <Sergeylanz@gettaxi.com>
Date: Fri, 17 Mar 2017 19:32:31 +0200
Subject: [PATCH 08/35] add support go1.7/8 to travis yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index df3e923f..4c068baf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ go:
   - 1.6
   - 1.5.3
   - 1.4.3
+  - 1.7
+  - 1.8
 services:
   - redis-server
   - mysql

From 3204d7631bfce56ad3e3a28c927ab3481f71b699 Mon Sep 17 00:00:00 2001
From: Sergey Lanzman <Sergeylanz@gettaxi.com>
Date: Fri, 17 Mar 2017 19:33:54 +0200
Subject: [PATCH 09/35] drop support go1.4/5 in travis yml

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df3e923f..37cbe0c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,6 @@ language: go
 
 go:
   - 1.6
-  - 1.5.3
-  - 1.4.3
 services:
   - redis-server
   - mysql

From 856fde28dc37705a4a97593abbb1f12eb37621de Mon Sep 17 00:00:00 2001
From: Sergey Lanzman <Sergeylanz@gettaxi.com>
Date: Fri, 17 Mar 2017 19:45:30 +0200
Subject: [PATCH 10/35] add unconverted support

---
 .travis.yml                    |  2 ++
 cache/ssdb/ssdb.go             |  4 ++--
 config.go                      |  2 +-
 logs/alils/log.pb.go           |  2 +-
 logs/smtp.go                   |  2 +-
 orm/utils.go                   |  8 ++++----
 session/ledis/ledis_session.go |  2 +-
 templatefunc.go                | 30 ++++++++++++------------------
 utils/captcha/image.go         |  2 +-
 9 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df3e923f..fe47739a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ install:
   - go get github.com/ssdb/gossdb/ssdb
   - go get github.com/cloudflare/golz4
   - go get github.com/gogo/protobuf/proto
+  - go get -u github.com/mdempsky/unconvert
 before_script:
   - psql --version
   - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi"
@@ -47,5 +48,6 @@ after_script:
   - rm -rf ./res/var/*
 script:
   - go test -v ./...
+  - unconvert $(go list ./... | grep -v /vendor/)
 addons:
   postgresql: "9.4"
diff --git a/cache/ssdb/ssdb.go b/cache/ssdb/ssdb.go
index bbc43606..479d4d9a 100644
--- a/cache/ssdb/ssdb.go
+++ b/cache/ssdb/ssdb.go
@@ -53,7 +53,7 @@ func (rc *Cache) GetMulti(keys []string) []interface{} {
 	resSize := len(res)
 	if err == nil {
 		for i := 1; i < resSize; i += 2 {
-			values = append(values, string(res[i+1]))
+			values = append(values, res[i+1])
 		}
 		return values
 	}
@@ -175,7 +175,7 @@ func (rc *Cache) ClearAll() error {
 		}
 		keys := []string{}
 		for i := 1; i < size; i += 2 {
-			keys = append(keys, string(resp[i]))
+			keys = append(keys, resp[i])
 		}
 		_, e := rc.conn.Do("multi_del", keys)
 		if e != nil {
diff --git a/config.go b/config.go
index 3c202e53..e6e99570 100644
--- a/config.go
+++ b/config.go
@@ -345,7 +345,7 @@ func assignSingleConfig(p interface{}, ac config.Configer) {
 		case reflect.String:
 			pf.SetString(ac.DefaultString(name, pf.String()))
 		case reflect.Int, reflect.Int64:
-			pf.SetInt(int64(ac.DefaultInt64(name, pf.Int())))
+			pf.SetInt(ac.DefaultInt64(name, pf.Int()))
 		case reflect.Bool:
 			pf.SetBool(ac.DefaultBool(name, pf.Bool()))
 		case reflect.Struct:
diff --git a/logs/alils/log.pb.go b/logs/alils/log.pb.go
index 42f7e892..b60ca200 100755
--- a/logs/alils/log.pb.go
+++ b/logs/alils/log.pb.go
@@ -395,7 +395,7 @@ func sovLog(x uint64) (n int) {
 	return n
 }
 func sozLog(x uint64) (n int) {
-	return sovLog(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+	return sovLog((x << 1) ^ (x >> 63))
 }
 func (m *Log) Unmarshal(data []byte) error {
 	var hasFields [1]uint64
diff --git a/logs/smtp.go b/logs/smtp.go
index 834130ef..a07947e6 100644
--- a/logs/smtp.go
+++ b/logs/smtp.go
@@ -106,7 +106,7 @@ func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd
 	if err != nil {
 		return err
 	}
-	_, err = w.Write([]byte(msgContent))
+	_, err = w.Write(msgContent)
 	if err != nil {
 		return err
 	}
diff --git a/orm/utils.go b/orm/utils.go
index 6aac8e5d..3cfc1e7d 100644
--- a/orm/utils.go
+++ b/orm/utils.go
@@ -92,11 +92,11 @@ func (f StrTo) Int64() (int64, error) {
 		i := new(big.Int)
 		ni, ok := i.SetString(f.String(), 10) // octal
 		if !ok {
-			return int64(v), err
+			return v, err
 		}
 		return ni.Int64(), nil
 	}
-	return int64(v), err
+	return v, err
 }
 
 // Uint string to uint
@@ -130,11 +130,11 @@ func (f StrTo) Uint64() (uint64, error) {
 		i := new(big.Int)
 		ni, ok := i.SetString(f.String(), 10)
 		if !ok {
-			return uint64(v), err
+			return v, err
 		}
 		return ni.Uint64(), nil
 	}
-	return uint64(v), err
+	return v, err
 }
 
 // String string to string
diff --git a/session/ledis/ledis_session.go b/session/ledis/ledis_session.go
index 68f37b08..1366104e 100644
--- a/session/ledis/ledis_session.go
+++ b/session/ledis/ledis_session.go
@@ -150,7 +150,7 @@ func (lp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error)
 	if len(kvs) == 0 {
 		kv = make(map[interface{}]interface{})
 	} else {
-		kv, err = session.DecodeGob([]byte(kvs))
+		kv, err = session.DecodeGob(kvs)
 		if err != nil {
 			return nil, err
 		}
diff --git a/templatefunc.go b/templatefunc.go
index 01751717..b54c0b42 100644
--- a/templatefunc.go
+++ b/templatefunc.go
@@ -46,26 +46,25 @@ func Substr(s string, start, length int) string {
 
 // HTML2str returns escaping text convert from html.
 func HTML2str(html string) string {
-	src := string(html)
 
 	re, _ := regexp.Compile("\\<[\\S\\s]+?\\>")
-	src = re.ReplaceAllStringFunc(src, strings.ToLower)
+	html = re.ReplaceAllStringFunc(html, strings.ToLower)
 
 	//remove STYLE
 	re, _ = regexp.Compile("\\<style[\\S\\s]+?\\</style\\>")
-	src = re.ReplaceAllString(src, "")
+	html = re.ReplaceAllString(html, "")
 
 	//remove SCRIPT
 	re, _ = regexp.Compile("\\<script[\\S\\s]+?\\</script\\>")
-	src = re.ReplaceAllString(src, "")
+	html = re.ReplaceAllString(html, "")
 
 	re, _ = regexp.Compile("\\<[\\S\\s]+?\\>")
-	src = re.ReplaceAllString(src, "\n")
+	html = re.ReplaceAllString(html, "\n")
 
 	re, _ = regexp.Compile("\\s{2,}")
-	src = re.ReplaceAllString(src, "\n")
+	html = re.ReplaceAllString(html, "\n")
 
-	return strings.TrimSpace(src)
+	return strings.TrimSpace(html)
 }
 
 // DateFormat takes a time and a layout string and returns a string with the formatted date. Used by the template parser as "dateformat"
@@ -193,7 +192,7 @@ func Str2html(raw string) template.HTML {
 }
 
 // Htmlquote returns quoted html string.
-func Htmlquote(src string) string {
+func Htmlquote(text string) string {
 	//HTML编码为实体符号
 	/*
 	   Encodes `text` for raw use in HTML.
@@ -201,8 +200,6 @@ func Htmlquote(src string) string {
 	       '&lt;&#39;&amp;&quot;&gt;'
 	*/
 
-	text := string(src)
-
 	text = strings.Replace(text, "&", "&amp;", -1) // Must be done first!
 	text = strings.Replace(text, "<", "&lt;", -1)
 	text = strings.Replace(text, ">", "&gt;", -1)
@@ -216,7 +213,7 @@ func Htmlquote(src string) string {
 }
 
 // Htmlunquote returns unquoted html string.
-func Htmlunquote(src string) string {
+func Htmlunquote(text string) string {
 	//实体符号解释为HTML
 	/*
 	   Decodes `text` that's HTML quoted.
@@ -227,7 +224,6 @@ func Htmlunquote(src string) string {
 	// strings.Replace(s, old, new, n)
 	// 在s字符串中，把old字符串替换为new字符串，n表示替换的次数，小于0表示全部替换
 
-	text := string(src)
 	text = strings.Replace(text, "&nbsp;", " ", -1)
 	text = strings.Replace(text, "&rdquo;", "”", -1)
 	text = strings.Replace(text, "&ldquo;", "“", -1)
@@ -262,19 +258,17 @@ func URLFor(endpoint string, values ...interface{}) string {
 }
 
 // AssetsJs returns script tag with src string.
-func AssetsJs(src string) template.HTML {
-	text := string(src)
+func AssetsJs(text string) template.HTML {
 
-	text = "<script src=\"" + src + "\"></script>"
+	text = "<script src=\"" + text + "\"></script>"
 
 	return template.HTML(text)
 }
 
 // AssetsCSS returns stylesheet link tag with src string.
-func AssetsCSS(src string) template.HTML {
-	text := string(src)
+func AssetsCSS(text string) template.HTML {
 
-	text = "<link href=\"" + src + "\" rel=\"stylesheet\" />"
+	text = "<link href=\"" + text + "\" rel=\"stylesheet\" />"
 
 	return template.HTML(text)
 }
diff --git a/utils/captcha/image.go b/utils/captcha/image.go
index 0ceb8e42..c3c9a83a 100644
--- a/utils/captcha/image.go
+++ b/utils/captcha/image.go
@@ -474,7 +474,7 @@ func randomBrightness(c color.RGBA, max uint8) color.RGBA {
 		uint8(int(c.R) + n),
 		uint8(int(c.G) + n),
 		uint8(int(c.B) + n),
-		uint8(c.A),
+		c.A,
 	}
 }
 

From 37c1ffc57a0d46ba32718712bdd27b89c6391e92 Mon Sep 17 00:00:00 2001
From: Sergey Lanzman <Sergeylanz@gettaxi.com>
Date: Fri, 17 Mar 2017 19:24:45 +0200
Subject: [PATCH 11/35] add go simple support

---
 .gosimpleignore                     |  4 +++
 .travis.yml                         |  2 ++
 admin.go                            | 22 ++++++++--------
 cache/conv_test.go                  |  6 ++---
 cache/memcache/memcache.go          |  5 +---
 cache/redis/redis.go                |  2 +-
 cache/ssdb/ssdb.go                  | 15 +++--------
 config/ini.go                       |  7 ++---
 config/ini_test.go                  |  2 +-
 controller.go                       |  6 ++---
 flash_test.go                       |  2 +-
 grace/listener.go                   |  2 +-
 httplib/httplib.go                  |  2 +-
 logs/file.go                        | 14 +++++-----
 logs/jianliao.go                    |  6 +----
 logs/log.go                         |  8 ++----
 logs/slack.go                       |  6 +----
 logs/smtp.go                        | 13 ++--------
 namespace_test.go                   |  5 +---
 orm/cmd.go                          |  4 +--
 orm/cmd_utils.go                    |  8 +++---
 orm/db.go                           | 28 ++++++++++----------
 orm/db_alias.go                     |  4 +--
 orm/db_tables.go                    | 12 ++++-----
 orm/models_boot.go                  | 14 +++++-----
 orm/models_info_f.go                |  6 ++---
 orm/models_info_m.go                |  2 +-
 orm/orm.go                          | 26 +++++--------------
 orm/orm_querym2m.go                 | 10 +++-----
 orm/orm_test.go                     |  4 +--
 orm/utils.go                        |  2 +-
 router_test.go                      | 40 ++++++++++++++---------------
 session/ledis/ledis_session.go      |  5 +---
 session/memcache/sess_memcache.go   |  6 +----
 session/mysql/sess_mysql.go         |  5 +---
 session/postgres/sess_postgresql.go |  6 +----
 session/sess_file.go                |  5 +---
 session/sess_test.go                |  2 +-
 session/ssdb/sess_ssdb.go           | 16 +++---------
 staticfile.go                       |  4 +--
 template.go                         | 20 +++++++--------
 templatefunc_test.go                | 18 ++++++-------
 validation/validation.go            |  2 +-
 43 files changed, 150 insertions(+), 228 deletions(-)
 create mode 100644 .gosimpleignore

diff --git a/.gosimpleignore b/.gosimpleignore
new file mode 100644
index 00000000..84df9b95
--- /dev/null
+++ b/.gosimpleignore
@@ -0,0 +1,4 @@
+github.com/astaxie/beego/*/*:S1012
+github.com/astaxie/beego/*:S1012
+github.com/astaxie/beego/*/*:S1007
+github.com/astaxie/beego/*:S1007
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index df3e923f..abee35f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ install:
   - go get github.com/ssdb/gossdb/ssdb
   - go get github.com/cloudflare/golz4
   - go get github.com/gogo/protobuf/proto
+  - go get -u honnef.co/go/tools/cmd/gosimple
 before_script:
   - psql --version
   - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi"
@@ -47,5 +48,6 @@ after_script:
   - rm -rf ./res/var/*
 script:
   - go test -v ./...
+  - gosimple -ignore "$(cat .gosimpleignore)" $(go list ./... | grep -v /vendor/)
 addons:
   postgresql: "9.4"
diff --git a/admin.go b/admin.go
index a2b2f53a..b4e3068f 100644
--- a/admin.go
+++ b/admin.go
@@ -157,8 +157,8 @@ func listConf(rw http.ResponseWriter, r *http.Request) {
 					resultList := new([][]string)
 					for _, f := range bf {
 						var result = []string{
-							fmt.Sprintf("%s", f.pattern),
-							fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)),
+							f.pattern,
+							utils.GetFuncName(f.filterFunc),
 						}
 						*resultList = append(*resultList, result)
 					}
@@ -213,7 +213,7 @@ func printTree(resultList *[][]string, t *Tree) {
 				var result = []string{
 					v.pattern,
 					fmt.Sprintf("%s", v.methods),
-					fmt.Sprintf("%s", v.controllerType),
+					v.controllerType.String(),
 				}
 				*resultList = append(*resultList, result)
 			} else if v.routerType == routerTypeRESTFul {
@@ -287,16 +287,16 @@ func healthcheck(rw http.ResponseWriter, req *http.Request) {
 	for name, h := range toolbox.AdminCheckList {
 		if err := h.Check(); err != nil {
 			result = []string{
-				fmt.Sprintf("error"),
-				fmt.Sprintf("%s", name),
-				fmt.Sprintf("%s", err.Error()),
+				"error",
+				name,
+				err.Error(),
 			}
 
 		} else {
 			result = []string{
-				fmt.Sprintf("success"),
-				fmt.Sprintf("%s", name),
-				fmt.Sprintf("OK"),
+				"success",
+				name,
+				"OK",
 			}
 
 		}
@@ -341,8 +341,8 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) {
 	for tname, tk := range toolbox.AdminTaskList {
 		result = []string{
 			tname,
-			fmt.Sprintf("%s", tk.GetSpec()),
-			fmt.Sprintf("%s", tk.GetStatus()),
+			tk.GetSpec(),
+			tk.GetStatus(),
 			tk.GetPrev().String(),
 		}
 		*resultList = append(*resultList, result)
diff --git a/cache/conv_test.go b/cache/conv_test.go
index cf792fa6..b90e224a 100644
--- a/cache/conv_test.go
+++ b/cache/conv_test.go
@@ -118,14 +118,14 @@ func TestGetFloat64(t *testing.T) {
 
 func TestGetBool(t *testing.T) {
 	var t1 = true
-	if true != GetBool(t1) {
+	if !GetBool(t1) {
 		t.Error("get bool from bool error")
 	}
 	var t2 = "true"
-	if true != GetBool(t2) {
+	if !GetBool(t2) {
 		t.Error("get bool from string error")
 	}
-	if false != GetBool(nil) {
+	if GetBool(nil) {
 		t.Error("get bool from nil error")
 	}
 }
diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go
index 972361f7..0624f5fa 100644
--- a/cache/memcache/memcache.go
+++ b/cache/memcache/memcache.go
@@ -146,10 +146,7 @@ func (rc *Cache) IsExist(key string) bool {
 		}
 	}
 	_, err := rc.conn.Get(key)
-	if err != nil {
-		return false
-	}
-	return true
+	return !(err != nil)
 }
 
 // ClearAll clear all cached in memcache.
diff --git a/cache/redis/redis.go b/cache/redis/redis.go
index 781e3836..3e71fb53 100644
--- a/cache/redis/redis.go
+++ b/cache/redis/redis.go
@@ -137,7 +137,7 @@ func (rc *Cache) IsExist(key string) bool {
 	if err != nil {
 		return false
 	}
-	if v == false {
+	if !v {
 		if _, err = rc.do("HDEL", rc.key, key); err != nil {
 			return false
 		}
diff --git a/cache/ssdb/ssdb.go b/cache/ssdb/ssdb.go
index bbc43606..0b59503c 100644
--- a/cache/ssdb/ssdb.go
+++ b/cache/ssdb/ssdb.go
@@ -71,10 +71,7 @@ func (rc *Cache) DelMulti(keys []string) error {
 		}
 	}
 	_, err := rc.conn.Do("multi_del", keys)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Put put value to memcache. only support string.
@@ -113,10 +110,7 @@ func (rc *Cache) Delete(key string) error {
 		}
 	}
 	_, err := rc.conn.Del(key)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Incr increase counter.
@@ -229,10 +223,7 @@ func (rc *Cache) connectInit() error {
 	}
 	var err error
 	rc.conn, err = ssdb.Connect(host, port)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func init() {
diff --git a/config/ini.go b/config/ini.go
index 27220f90..42d218d6 100644
--- a/config/ini.go
+++ b/config/ini.go
@@ -397,11 +397,8 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) {
 			}
 		}
 	}
-
-	if _, err = buf.WriteTo(f); err != nil {
-		return err
-	}
-	return nil
+	_, err = buf.WriteTo(f)
+	return err
 }
 
 // Set writes a new value for key.
diff --git a/config/ini_test.go b/config/ini_test.go
index 83ff3668..ffcdb294 100644
--- a/config/ini_test.go
+++ b/config/ini_test.go
@@ -181,7 +181,7 @@ name=mysql
 		cfgData := string(data)
 		datas := strings.Split(saveResult, "\n")
 		for _, line := range datas {
-			if strings.Contains(cfgData, line+"\n") == false {
+			if !strings.Contains(cfgData, line+"\n") {
 				t.Fatalf("different after save ini config file. need contains %q", line)
 			}
 		}
diff --git a/controller.go b/controller.go
index 488ffcda..c2a327b3 100644
--- a/controller.go
+++ b/controller.go
@@ -223,7 +223,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
 		}
 
 		buf.Reset()
-		ExecuteViewPathTemplate(&buf, c.Layout, c.viewPath() ,c.Data)
+		ExecuteViewPathTemplate(&buf, c.Layout, c.viewPath(), c.Data)
 	}
 	return buf.Bytes(), err
 }
@@ -249,7 +249,7 @@ func (c *Controller) renderTemplate() (bytes.Buffer, error) {
 				}
 			}
 		}
-		BuildTemplate(c.viewPath() , buildFiles...)
+		BuildTemplate(c.viewPath(), buildFiles...)
 	}
 	return buf, ExecuteViewPathTemplate(&buf, c.TplName, c.viewPath(), c.Data)
 }
@@ -314,7 +314,7 @@ func (c *Controller) ServeJSON(encoding ...bool) {
 	if BConfig.RunMode == PROD {
 		hasIndent = false
 	}
-	if len(encoding) > 0 && encoding[0] == true {
+	if len(encoding) > 0 && encoding[0] {
 		hasEncoding = true
 	}
 	c.Ctx.Output.JSON(c.Data["json"], hasIndent, hasEncoding)
diff --git a/flash_test.go b/flash_test.go
index 640d54de..d5e9608d 100644
--- a/flash_test.go
+++ b/flash_test.go
@@ -48,7 +48,7 @@ func TestFlashHeader(t *testing.T) {
 	// match for the expected header
 	res := strings.Contains(sc, "BEEGO_FLASH=%00notice%23BEEGOFLASH%23TestFlashString%00")
 	// validate the assertion
-	if res != true {
+	if !res {
 		t.Errorf("TestFlashHeader() unable to validate flash message")
 	}
 }
diff --git a/grace/listener.go b/grace/listener.go
index 5439d0b2..823d3cce 100644
--- a/grace/listener.go
+++ b/grace/listener.go
@@ -21,7 +21,7 @@ func newGraceListener(l net.Listener, srv *Server) (el *graceListener) {
 		server:   srv,
 	}
 	go func() {
-		_ = <-el.stop
+		<-el.stop
 		el.stopped = true
 		el.stop <- el.Listener.Close()
 	}()
diff --git a/httplib/httplib.go b/httplib/httplib.go
index 39480469..32edc5c4 100644
--- a/httplib/httplib.go
+++ b/httplib/httplib.go
@@ -335,7 +335,7 @@ func (b *BeegoHTTPRequest) JSONBody(obj interface{}) (*BeegoHTTPRequest, error)
 func (b *BeegoHTTPRequest) buildURL(paramBody string) {
 	// build GET url with query string
 	if b.req.Method == "GET" && len(paramBody) > 0 {
-		if strings.Index(b.url, "?") != -1 {
+		if strings.Contains(b.url, "?") {
 			b.url += "&" + paramBody
 		} else {
 			b.url = b.url + "?" + paramBody
diff --git a/logs/file.go b/logs/file.go
index bd3c22a9..d00cbfc6 100644
--- a/logs/file.go
+++ b/logs/file.go
@@ -193,16 +193,14 @@ func (w *fileLogWriter) dailyRotate(openTime time.Time) {
 	y, m, d := openTime.Add(24 * time.Hour).Date()
 	nextDay := time.Date(y, m, d, 0, 0, 0, 0, openTime.Location())
 	tm := time.NewTimer(time.Duration(nextDay.UnixNano() - openTime.UnixNano() + 100))
-	select {
-	case <-tm.C:
-		w.Lock()
-		if w.needRotate(0, time.Now().Day()) {
-			if err := w.doRotate(time.Now()); err != nil {
-				fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err)
-			}
+	<-tm.C
+	w.Lock()
+	if w.needRotate(0, time.Now().Day()) {
+		if err := w.doRotate(time.Now()); err != nil {
+			fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err)
 		}
-		w.Unlock()
 	}
+	w.Unlock()
 }
 
 func (w *fileLogWriter) lines() (int, error) {
diff --git a/logs/jianliao.go b/logs/jianliao.go
index 16773c93..16bbdc2e 100644
--- a/logs/jianliao.go
+++ b/logs/jianliao.go
@@ -25,11 +25,7 @@ func newJLWriter() Logger {
 
 // Init JLWriter with json config string
 func (s *JLWriter) Init(jsonconfig string) error {
-	err := json.Unmarshal([]byte(jsonconfig), s)
-	if err != nil {
-		return err
-	}
-	return nil
+	return json.Unmarshal([]byte(jsonconfig), s)
 }
 
 // WriteMsg write message in smtp writer.
diff --git a/logs/log.go b/logs/log.go
index c351c473..a5e0a9ea 100644
--- a/logs/log.go
+++ b/logs/log.go
@@ -275,7 +275,7 @@ func (bl *BeeLogger) writeMsg(logLevel int, msg string, v ...interface{}) error
 			line = 0
 		}
 		_, filename := path.Split(file)
-		msg = "[" + filename + ":" + strconv.FormatInt(int64(line), 10) + "] " + msg
+		msg = "[" + filename + ":" + strconv.Itoa(line) + "] " + msg
 	}
 
 	//set level info in front of filename info
@@ -561,11 +561,7 @@ func SetLogFuncCallDepth(d int) {
 
 // SetLogger sets a new logger.
 func SetLogger(adapter string, config ...string) error {
-	err := beeLogger.SetLogger(adapter, config...)
-	if err != nil {
-		return err
-	}
-	return nil
+	return beeLogger.SetLogger(adapter, config...)
 }
 
 // Emergency logs a message at emergency level.
diff --git a/logs/slack.go b/logs/slack.go
index 90f009cb..d8482b3e 100644
--- a/logs/slack.go
+++ b/logs/slack.go
@@ -21,11 +21,7 @@ func newSLACKWriter() Logger {
 
 // Init SLACKWriter with json config string
 func (s *SLACKWriter) Init(jsonconfig string) error {
-	err := json.Unmarshal([]byte(jsonconfig), s)
-	if err != nil {
-		return err
-	}
-	return nil
+	return json.Unmarshal([]byte(jsonconfig), s)
 }
 
 // WriteMsg write message in smtp writer.
diff --git a/logs/smtp.go b/logs/smtp.go
index 834130ef..bf603f2b 100644
--- a/logs/smtp.go
+++ b/logs/smtp.go
@@ -52,11 +52,7 @@ func newSMTPWriter() Logger {
 //		"level":LevelError
 //	}
 func (s *SMTPWriter) Init(jsonconfig string) error {
-	err := json.Unmarshal([]byte(jsonconfig), s)
-	if err != nil {
-		return err
-	}
-	return nil
+	return json.Unmarshal([]byte(jsonconfig), s)
 }
 
 func (s *SMTPWriter) getSMTPAuth(host string) smtp.Auth {
@@ -116,12 +112,7 @@ func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd
 		return err
 	}
 
-	err = client.Quit()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return client.Quit()
 }
 
 // WriteMsg write message in smtp writer.
diff --git a/namespace_test.go b/namespace_test.go
index fc02b5fb..b3f20dff 100644
--- a/namespace_test.go
+++ b/namespace_test.go
@@ -139,10 +139,7 @@ func TestNamespaceCond(t *testing.T) {
 
 	ns := NewNamespace("/v2")
 	ns.Cond(func(ctx *context.Context) bool {
-		if ctx.Input.Domain() == "beego.me" {
-			return true
-		}
-		return false
+		return ctx.Input.Domain() == "beego.me"
 	}).
 		AutoRouter(&TestController{})
 	AddNamespace(ns)
diff --git a/orm/cmd.go b/orm/cmd.go
index 3638a75c..0ff4dc40 100644
--- a/orm/cmd.go
+++ b/orm/cmd.go
@@ -150,7 +150,7 @@ func (d *commandSyncDb) Run() error {
 			}
 
 			for _, fi := range mi.fields.fieldsDB {
-				if _, ok := columns[fi.column]; ok == false {
+				if _, ok := columns[fi.column]; !ok {
 					fields = append(fields, fi)
 				}
 			}
@@ -175,7 +175,7 @@ func (d *commandSyncDb) Run() error {
 			}
 
 			for _, idx := range indexes[mi.table] {
-				if d.al.DbBaser.IndexExists(db, idx.Table, idx.Name) == false {
+				if !d.al.DbBaser.IndexExists(db, idx.Table, idx.Name) {
 					if !d.noInfo {
 						fmt.Printf("create index `%s` for table `%s`\n", idx.Name, idx.Table)
 					}
diff --git a/orm/cmd_utils.go b/orm/cmd_utils.go
index 8119b70b..de47cb02 100644
--- a/orm/cmd_utils.go
+++ b/orm/cmd_utils.go
@@ -89,7 +89,7 @@ checkColumn:
 		col = T["float64"]
 	case TypeDecimalField:
 		s := T["float64-decimal"]
-		if strings.Index(s, "%d") == -1 {
+		if !strings.Contains(s, "%d") {
 			col = s
 		} else {
 			col = fmt.Sprintf(s, fi.digits, fi.decimals)
@@ -120,7 +120,7 @@ func getColumnAddQuery(al *alias, fi *fieldInfo) string {
 	Q := al.DbBaser.TableQuote()
 	typ := getColumnTyp(al, fi)
 
-	if fi.null == false {
+	if !fi.null {
 		typ += " " + "NOT NULL"
 	}
 
@@ -172,7 +172,7 @@ func getDbCreateSQL(al *alias) (sqls []string, tableIndexes map[string][]dbIndex
 			} else {
 				column += col
 
-				if fi.null == false {
+				if !fi.null {
 					column += " " + "NOT NULL"
 				}
 
@@ -192,7 +192,7 @@ func getDbCreateSQL(al *alias) (sqls []string, tableIndexes map[string][]dbIndex
 				}
 			}
 
-			if strings.Index(column, "%COL%") != -1 {
+			if strings.Contains(column, "%COL%") {
 				column = strings.Replace(column, "%COL%", fi.column, -1)
 			}
 
diff --git a/orm/db.go b/orm/db.go
index bca6071d..1544c479 100644
--- a/orm/db.go
+++ b/orm/db.go
@@ -48,7 +48,7 @@ var (
 		"lte":         true,
 		"eq":          true,
 		"nq":          true,
-		"ne":	       true,
+		"ne":          true,
 		"startswith":  true,
 		"endswith":    true,
 		"istartswith": true,
@@ -87,7 +87,7 @@ func (d *dbBase) collectValues(mi *modelInfo, ind reflect.Value, cols []string,
 		} else {
 			panic(fmt.Errorf("wrong db field/column name `%s` for model `%s`", column, mi.fullName))
 		}
-		if fi.dbcol == false || fi.auto && skipAuto {
+		if !fi.dbcol || fi.auto && skipAuto {
 			continue
 		}
 		value, err := d.collectFieldValue(mi, fi, ind, insert, tz)
@@ -224,7 +224,7 @@ func (d *dbBase) collectFieldValue(mi *modelInfo, fi *fieldInfo, ind reflect.Val
 							value = nil
 						}
 					}
-					if fi.null == false && value == nil {
+					if !fi.null && value == nil {
 						return nil, fmt.Errorf("field `%s` cannot be NULL", fi.fullName)
 					}
 				}
@@ -271,7 +271,7 @@ func (d *dbBase) PrepareInsert(q dbQuerier, mi *modelInfo) (stmtQuerier, string,
 	dbcols := make([]string, 0, len(mi.fields.dbcols))
 	marks := make([]string, 0, len(mi.fields.dbcols))
 	for _, fi := range mi.fields.fieldsDB {
-		if fi.auto == false {
+		if !fi.auto {
 			dbcols = append(dbcols, fi.column)
 			marks = append(marks, "?")
 		}
@@ -326,7 +326,7 @@ func (d *dbBase) Read(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.Lo
 	} else {
 		// default use pk value as where condtion.
 		pkColumn, pkValue, ok := getExistPk(mi, ind)
-		if ok == false {
+		if !ok {
 			return ErrMissPK
 		}
 		whereCols = []string{pkColumn}
@@ -601,7 +601,7 @@ func (d *dbBase) InsertOrUpdate(q dbQuerier, mi *modelInfo, ind reflect.Value, a
 // execute update sql dbQuerier with given struct reflect.Value.
 func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.Location, cols []string) (int64, error) {
 	pkName, pkValue, ok := getExistPk(mi, ind)
-	if ok == false {
+	if !ok {
 		return 0, ErrMissPK
 	}
 
@@ -654,7 +654,7 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.
 	} else {
 		// default use pk value as where condtion.
 		pkColumn, pkValue, ok := getExistPk(mi, ind)
-		if ok == false {
+		if !ok {
 			return 0, ErrMissPK
 		}
 		whereCols = []string{pkColumn}
@@ -699,7 +699,7 @@ func (d *dbBase) UpdateBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con
 	columns := make([]string, 0, len(params))
 	values := make([]interface{}, 0, len(params))
 	for col, val := range params {
-		if fi, ok := mi.fields.GetByAny(col); ok == false || fi.dbcol == false {
+		if fi, ok := mi.fields.GetByAny(col); !ok || !fi.dbcol {
 			panic(fmt.Errorf("wrong field/column name `%s`", col))
 		} else {
 			columns = append(columns, fi.column)
@@ -929,7 +929,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
 		if hasRel {
 			for _, fi := range mi.fields.fieldsDB {
 				if fi.fieldType&IsRelField > 0 {
-					if maps[fi.column] == false {
+					if !maps[fi.column] {
 						tCols = append(tCols, fi.column)
 					}
 				}
@@ -987,7 +987,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
 
 	var cnt int64
 	for rs.Next() {
-		if one && cnt == 0 || one == false {
+		if one && cnt == 0 || !one {
 			if err := rs.Scan(refs...); err != nil {
 				return 0, err
 			}
@@ -1067,7 +1067,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
 		cnt++
 	}
 
-	if one == false {
+	if !one {
 		if cnt > 0 {
 			ind.Set(slice)
 		} else {
@@ -1357,7 +1357,7 @@ end:
 func (d *dbBase) setFieldValue(fi *fieldInfo, value interface{}, field reflect.Value) (interface{}, error) {
 
 	fieldType := fi.fieldType
-	isNative := fi.isFielder == false
+	isNative := !fi.isFielder
 
 setValue:
 	switch {
@@ -1533,7 +1533,7 @@ setValue:
 		}
 	}
 
-	if isNative == false {
+	if !isNative {
 		fd := field.Addr().Interface().(Fielder)
 		err := fd.SetRaw(value)
 		if err != nil {
@@ -1594,7 +1594,7 @@ func (d *dbBase) ReadValues(q dbQuerier, qs *querySet, mi *modelInfo, cond *Cond
 		infos = make([]*fieldInfo, 0, len(exprs))
 		for _, ex := range exprs {
 			index, name, fi, suc := tables.parseExprs(mi, strings.Split(ex, ExprSep))
-			if suc == false {
+			if !suc {
 				panic(fmt.Errorf("unknown field/column name `%s`", ex))
 			}
 			cols = append(cols, fmt.Sprintf("%s.%s%s%s %s%s%s", index, Q, fi.column, Q, Q, name, Q))
diff --git a/orm/db_alias.go b/orm/db_alias.go
index c95d49c9..8daa4b23 100644
--- a/orm/db_alias.go
+++ b/orm/db_alias.go
@@ -186,7 +186,7 @@ func addAliasWthDB(aliasName, driverName string, db *sql.DB) (*alias, error) {
 		return nil, fmt.Errorf("register db Ping `%s`, %s", aliasName, err.Error())
 	}
 
-	if dataBaseCache.add(aliasName, al) == false {
+	if !dataBaseCache.add(aliasName, al) {
 		return nil, fmt.Errorf("DataBase alias name `%s` already registered, cannot reuse", aliasName)
 	}
 
@@ -244,7 +244,7 @@ end:
 
 // RegisterDriver Register a database driver use specify driver name, this can be definition the driver is which database type.
 func RegisterDriver(driverName string, typ DriverType) error {
-	if t, ok := drivers[driverName]; ok == false {
+	if t, ok := drivers[driverName]; !ok {
 		drivers[driverName] = typ
 	} else {
 		if t != typ {
diff --git a/orm/db_tables.go b/orm/db_tables.go
index e4c74ace..42be5550 100644
--- a/orm/db_tables.go
+++ b/orm/db_tables.go
@@ -63,7 +63,7 @@ func (t *dbTables) set(names []string, mi *modelInfo, fi *fieldInfo, inner bool)
 // add table info to collection.
 func (t *dbTables) add(names []string, mi *modelInfo, fi *fieldInfo, inner bool) (*dbTable, bool) {
 	name := strings.Join(names, ExprSep)
-	if _, ok := t.tablesM[name]; ok == false {
+	if _, ok := t.tablesM[name]; !ok {
 		i := len(t.tables) + 1
 		jt := &dbTable{i, fmt.Sprintf("T%d", i), name, names, false, inner, mi, fi, nil}
 		t.tablesM[name] = jt
@@ -261,7 +261,7 @@ loopFor:
 				fiN, okN = mmi.fields.GetByAny(exprs[i+1])
 			}
 
-			if isRel && (fi.mi.isThrough == false || num != i) {
+			if isRel && (!fi.mi.isThrough || num != i) {
 				if fi.null || t.skipEnd {
 					inner = false
 				}
@@ -364,7 +364,7 @@ func (t *dbTables) getCondSQL(cond *Condition, sub bool, tz *time.Location) (whe
 			}
 
 			index, _, fi, suc := t.parseExprs(mi, exprs)
-			if suc == false {
+			if !suc {
 				panic(fmt.Errorf("unknown field/column name `%s`", strings.Join(p.exprs, ExprSep)))
 			}
 
@@ -383,7 +383,7 @@ func (t *dbTables) getCondSQL(cond *Condition, sub bool, tz *time.Location) (whe
 		}
 	}
 
-	if sub == false && where != "" {
+	if !sub && where != "" {
 		where = "WHERE " + where
 	}
 
@@ -403,7 +403,7 @@ func (t *dbTables) getGroupSQL(groups []string) (groupSQL string) {
 		exprs := strings.Split(group, ExprSep)
 
 		index, _, fi, suc := t.parseExprs(t.mi, exprs)
-		if suc == false {
+		if !suc {
 			panic(fmt.Errorf("unknown field/column name `%s`", strings.Join(exprs, ExprSep)))
 		}
 
@@ -432,7 +432,7 @@ func (t *dbTables) getOrderSQL(orders []string) (orderSQL string) {
 		exprs := strings.Split(order, ExprSep)
 
 		index, _, fi, suc := t.parseExprs(t.mi, exprs)
-		if suc == false {
+		if !suc {
 			panic(fmt.Errorf("unknown field/column name `%s`", strings.Join(exprs, ExprSep)))
 		}
 
diff --git a/orm/models_boot.go b/orm/models_boot.go
index 4ba5affd..85d0917f 100644
--- a/orm/models_boot.go
+++ b/orm/models_boot.go
@@ -128,7 +128,7 @@ func bootStrap() {
 						if i := strings.LastIndex(fi.relThrough, "."); i != -1 && len(fi.relThrough) > (i+1) {
 							pn := fi.relThrough[:i]
 							rmi, ok := modelCache.getByFullName(fi.relThrough)
-							if ok == false || pn != rmi.pkg {
+							if !ok || pn != rmi.pkg {
 								err = fmt.Errorf("field `%s` wrong rel_through value `%s` cannot find table", fi.fullName, fi.relThrough)
 								goto end
 							}
@@ -171,7 +171,7 @@ func bootStrap() {
 						break
 					}
 				}
-				if inModel == false {
+				if !inModel {
 					rmi := fi.relModelInfo
 					ffi := new(fieldInfo)
 					ffi.name = mi.name
@@ -185,7 +185,7 @@ func bootStrap() {
 					} else {
 						ffi.fieldType = RelReverseMany
 					}
-					if rmi.fields.Add(ffi) == false {
+					if !rmi.fields.Add(ffi) {
 						added := false
 						for cnt := 0; cnt < 5; cnt++ {
 							ffi.name = fmt.Sprintf("%s%d", mi.name, cnt)
@@ -195,7 +195,7 @@ func bootStrap() {
 								break
 							}
 						}
-						if added == false {
+						if !added {
 							panic(fmt.Errorf("cannot generate auto reverse field info `%s` to `%s`", fi.fullName, ffi.fullName))
 						}
 					}
@@ -248,7 +248,7 @@ func bootStrap() {
 						break mForA
 					}
 				}
-				if found == false {
+				if !found {
 					err = fmt.Errorf("reverse field `%s` not found in model `%s`", fi.fullName, fi.relModelInfo.fullName)
 					goto end
 				}
@@ -267,7 +267,7 @@ func bootStrap() {
 						break mForB
 					}
 				}
-				if found == false {
+				if !found {
 				mForC:
 					for _, ffi := range fi.relModelInfo.fields.fieldsByType[RelManyToMany] {
 						conditions := fi.relThrough != "" && fi.relThrough == ffi.relThrough ||
@@ -287,7 +287,7 @@ func bootStrap() {
 						}
 					}
 				}
-				if found == false {
+				if !found {
 					err = fmt.Errorf("reverse field for `%s` not found in model `%s`", fi.fullName, fi.relModelInfo.fullName)
 					goto end
 				}
diff --git a/orm/models_info_f.go b/orm/models_info_f.go
index 4b3d3e27..bbb7d71f 100644
--- a/orm/models_info_f.go
+++ b/orm/models_info_f.go
@@ -47,7 +47,7 @@ func (f *fields) Add(fi *fieldInfo) (added bool) {
 	} else {
 		return
 	}
-	if _, ok := f.fieldsByType[fi.fieldType]; ok == false {
+	if _, ok := f.fieldsByType[fi.fieldType]; !ok {
 		f.fieldsByType[fi.fieldType] = make([]*fieldInfo, 0)
 	}
 	f.fieldsByType[fi.fieldType] = append(f.fieldsByType[fi.fieldType], fi)
@@ -334,12 +334,12 @@ checkType:
 		switch onDelete {
 		case odCascade, odDoNothing:
 		case odSetDefault:
-			if initial.Exist() == false {
+			if !initial.Exist() {
 				err = errors.New("on_delete: set_default need set field a default value")
 				goto end
 			}
 		case odSetNULL:
-			if fi.null == false {
+			if !fi.null {
 				err = errors.New("on_delete: set_null need set field null")
 				goto end
 			}
diff --git a/orm/models_info_m.go b/orm/models_info_m.go
index d6ba1dca..4a3a37f9 100644
--- a/orm/models_info_m.go
+++ b/orm/models_info_m.go
@@ -78,7 +78,7 @@ func addModelFields(mi *modelInfo, ind reflect.Value, mName string, index []int)
 		fi.fieldIndex = append(index, i)
 		fi.mi = mi
 		fi.inModel = true
-		if mi.fields.Add(fi) == false {
+		if !mi.fields.Add(fi) {
 			err = fmt.Errorf("duplicate column name: %s", fi.column)
 			break
 		}
diff --git a/orm/orm.go b/orm/orm.go
index d9d1cd77..d364e621 100644
--- a/orm/orm.go
+++ b/orm/orm.go
@@ -122,21 +122,13 @@ func (o *orm) getFieldInfo(mi *modelInfo, name string) *fieldInfo {
 // read data to model
 func (o *orm) Read(md interface{}, cols ...string) error {
 	mi, ind := o.getMiInd(md, true)
-	err := o.alias.DbBaser.Read(o.db, mi, ind, o.alias.TZ, cols, false)
-	if err != nil {
-		return err
-	}
-	return nil
+	return o.alias.DbBaser.Read(o.db, mi, ind, o.alias.TZ, cols, false)
 }
 
 // read data to model, like Read(), but use "SELECT FOR UPDATE" form
 func (o *orm) ReadForUpdate(md interface{}, cols ...string) error {
 	mi, ind := o.getMiInd(md, true)
-	err := o.alias.DbBaser.Read(o.db, mi, ind, o.alias.TZ, cols, true)
-	if err != nil {
-		return err
-	}
-	return nil
+	return o.alias.DbBaser.Read(o.db, mi, ind, o.alias.TZ, cols, true)
 }
 
 // Try to read a row from the database, or insert one if it doesn't exist
@@ -238,15 +230,11 @@ func (o *orm) InsertOrUpdate(md interface{}, colConflitAndArgs ...string) (int64
 // cols set the columns those want to update.
 func (o *orm) Update(md interface{}, cols ...string) (int64, error) {
 	mi, ind := o.getMiInd(md, true)
-	num, err := o.alias.DbBaser.Update(o.db, mi, ind, o.alias.TZ, cols)
-	if err != nil {
-		return num, err
-	}
-	return num, nil
+	return o.alias.DbBaser.Update(o.db, mi, ind, o.alias.TZ, cols)
 }
 
 // delete model in database
-// cols shows the delete conditions values read from. deafult is pk
+// cols shows the delete conditions values read from. default is pk
 func (o *orm) Delete(md interface{}, cols ...string) (int64, error) {
 	mi, ind := o.getMiInd(md, true)
 	num, err := o.alias.DbBaser.Delete(o.db, mi, ind, o.alias.TZ, cols)
@@ -361,7 +349,7 @@ func (o *orm) queryRelated(md interface{}, name string) (*modelInfo, *fieldInfo,
 	fi := o.getFieldInfo(mi, name)
 
 	_, _, exist := getExistPk(mi, ind)
-	if exist == false {
+	if !exist {
 		panic(ErrMissPK)
 	}
 
@@ -489,7 +477,7 @@ func (o *orm) Begin() error {
 
 // commit transaction
 func (o *orm) Commit() error {
-	if o.isTx == false {
+	if !o.isTx {
 		return ErrTxDone
 	}
 	err := o.db.(txEnder).Commit()
@@ -504,7 +492,7 @@ func (o *orm) Commit() error {
 
 // rollback transaction
 func (o *orm) Rollback() error {
-	if o.isTx == false {
+	if !o.isTx {
 		return ErrTxDone
 	}
 	err := o.db.(txEnder).Rollback()
diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go
index b220bda6..6a270a0d 100644
--- a/orm/orm_querym2m.go
+++ b/orm/orm_querym2m.go
@@ -72,7 +72,7 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) {
 	}
 
 	_, v1, exist := getExistPk(o.mi, o.ind)
-	if exist == false {
+	if !exist {
 		panic(ErrMissPK)
 	}
 
@@ -87,7 +87,7 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) {
 			v2 = ind.Interface()
 		} else {
 			_, v2, exist = getExistPk(fi.relModelInfo, ind)
-			if exist == false {
+			if !exist {
 				panic(ErrMissPK)
 			}
 		}
@@ -104,11 +104,7 @@ func (o *queryM2M) Remove(mds ...interface{}) (int64, error) {
 	fi := o.fi
 	qs := o.qs.Filter(fi.reverseFieldInfo.name, o.md)
 
-	nums, err := qs.Filter(fi.reverseFieldInfoTwo.name+ExprSep+"in", mds).Delete()
-	if err != nil {
-		return nums, err
-	}
-	return nums, nil
+	return qs.Filter(fi.reverseFieldInfoTwo.name+ExprSep+"in", mds).Delete()
 }
 
 // check model is existed in relationship of origin model
diff --git a/orm/orm_test.go b/orm/orm_test.go
index 8738952b..a8b4fe69 100644
--- a/orm/orm_test.go
+++ b/orm/orm_test.go
@@ -93,14 +93,14 @@ wrongArg:
 }
 
 func AssertIs(a interface{}, args ...interface{}) error {
-	if ok, err := ValuesCompare(true, a, args...); ok == false {
+	if ok, err := ValuesCompare(true, a, args...); !ok {
 		return err
 	}
 	return nil
 }
 
 func AssertNot(a interface{}, args ...interface{}) error {
-	if ok, err := ValuesCompare(false, a, args...); ok == false {
+	if ok, err := ValuesCompare(false, a, args...); !ok {
 		return err
 	}
 	return nil
diff --git a/orm/utils.go b/orm/utils.go
index 6aac8e5d..7340715d 100644
--- a/orm/utils.go
+++ b/orm/utils.go
@@ -225,7 +225,7 @@ func camelString(s string) string {
 		if d == '_' {
 			flag = true
 			continue
-		} else if flag == true {
+		} else if flag {
 			if d >= 'a' && d <= 'z' {
 				d = d - 32
 			}
diff --git a/router_test.go b/router_test.go
index 936fd5e8..25804d67 100644
--- a/router_test.go
+++ b/router_test.go
@@ -502,10 +502,10 @@ func TestFilterBeforeRouter(t *testing.T) {
 	rw, r := testRequest("GET", url)
 	mux.ServeHTTP(rw, r)
 
-	if strings.Contains(rw.Body.String(), "BeforeRouter1") == false {
+	if !strings.Contains(rw.Body.String(), "BeforeRouter1") {
 		t.Errorf(testName + " BeforeRouter did not run")
 	}
-	if strings.Contains(rw.Body.String(), "hello") == true {
+	if strings.Contains(rw.Body.String(), "hello") {
 		t.Errorf(testName + " BeforeRouter did not return properly")
 	}
 }
@@ -525,13 +525,13 @@ func TestFilterBeforeExec(t *testing.T) {
 	rw, r := testRequest("GET", url)
 	mux.ServeHTTP(rw, r)
 
-	if strings.Contains(rw.Body.String(), "BeforeExec1") == false {
+	if !strings.Contains(rw.Body.String(), "BeforeExec1") {
 		t.Errorf(testName + " BeforeExec did not run")
 	}
-	if strings.Contains(rw.Body.String(), "hello") == true {
+	if strings.Contains(rw.Body.String(), "hello") {
 		t.Errorf(testName + " BeforeExec did not return properly")
 	}
-	if strings.Contains(rw.Body.String(), "BeforeRouter") == true {
+	if strings.Contains(rw.Body.String(), "BeforeRouter") {
 		t.Errorf(testName + " BeforeRouter ran in error")
 	}
 }
@@ -552,16 +552,16 @@ func TestFilterAfterExec(t *testing.T) {
 	rw, r := testRequest("GET", url)
 	mux.ServeHTTP(rw, r)
 
-	if strings.Contains(rw.Body.String(), "AfterExec1") == false {
+	if !strings.Contains(rw.Body.String(), "AfterExec1") {
 		t.Errorf(testName + " AfterExec did not run")
 	}
-	if strings.Contains(rw.Body.String(), "hello") == false {
+	if !strings.Contains(rw.Body.String(), "hello") {
 		t.Errorf(testName + " handler did not run properly")
 	}
-	if strings.Contains(rw.Body.String(), "BeforeRouter") == true {
+	if strings.Contains(rw.Body.String(), "BeforeRouter") {
 		t.Errorf(testName + " BeforeRouter ran in error")
 	}
-	if strings.Contains(rw.Body.String(), "BeforeExec") == true {
+	if strings.Contains(rw.Body.String(), "BeforeExec") {
 		t.Errorf(testName + " BeforeExec ran in error")
 	}
 }
@@ -583,19 +583,19 @@ func TestFilterFinishRouter(t *testing.T) {
 	rw, r := testRequest("GET", url)
 	mux.ServeHTTP(rw, r)
 
-	if strings.Contains(rw.Body.String(), "FinishRouter1") == true {
+	if strings.Contains(rw.Body.String(), "FinishRouter1") {
 		t.Errorf(testName + " FinishRouter did not run")
 	}
-	if strings.Contains(rw.Body.String(), "hello") == false {
+	if !strings.Contains(rw.Body.String(), "hello") {
 		t.Errorf(testName + " handler did not run properly")
 	}
-	if strings.Contains(rw.Body.String(), "AfterExec1") == true {
+	if strings.Contains(rw.Body.String(), "AfterExec1") {
 		t.Errorf(testName + " AfterExec ran in error")
 	}
-	if strings.Contains(rw.Body.String(), "BeforeRouter") == true {
+	if strings.Contains(rw.Body.String(), "BeforeRouter") {
 		t.Errorf(testName + " BeforeRouter ran in error")
 	}
-	if strings.Contains(rw.Body.String(), "BeforeExec") == true {
+	if strings.Contains(rw.Body.String(), "BeforeExec") {
 		t.Errorf(testName + " BeforeExec ran in error")
 	}
 }
@@ -615,14 +615,14 @@ func TestFilterFinishRouterMultiFirstOnly(t *testing.T) {
 	rw, r := testRequest("GET", url)
 	mux.ServeHTTP(rw, r)
 
-	if strings.Contains(rw.Body.String(), "FinishRouter1") == false {
+	if !strings.Contains(rw.Body.String(), "FinishRouter1") {
 		t.Errorf(testName + " FinishRouter1 did not run")
 	}
-	if strings.Contains(rw.Body.String(), "hello") == false {
+	if !strings.Contains(rw.Body.String(), "hello") {
 		t.Errorf(testName + " handler did not run properly")
 	}
 	// not expected in body
-	if strings.Contains(rw.Body.String(), "FinishRouter2") == true {
+	if strings.Contains(rw.Body.String(), "FinishRouter2") {
 		t.Errorf(testName + " FinishRouter2 did run")
 	}
 }
@@ -642,13 +642,13 @@ func TestFilterFinishRouterMulti(t *testing.T) {
 	rw, r := testRequest("GET", url)
 	mux.ServeHTTP(rw, r)
 
-	if strings.Contains(rw.Body.String(), "FinishRouter1") == false {
+	if !strings.Contains(rw.Body.String(), "FinishRouter1") {
 		t.Errorf(testName + " FinishRouter1 did not run")
 	}
-	if strings.Contains(rw.Body.String(), "hello") == false {
+	if !strings.Contains(rw.Body.String(), "hello") {
 		t.Errorf(testName + " handler did not run properly")
 	}
-	if strings.Contains(rw.Body.String(), "FinishRouter2") == false {
+	if !strings.Contains(rw.Body.String(), "FinishRouter2") {
 		t.Errorf(testName + " FinishRouter2 did not run properly")
 	}
 }
diff --git a/session/ledis/ledis_session.go b/session/ledis/ledis_session.go
index 68f37b08..7dcc080d 100644
--- a/session/ledis/ledis_session.go
+++ b/session/ledis/ledis_session.go
@@ -125,10 +125,7 @@ func (lp *Provider) SessionRead(sid string) (session.Store, error) {
 // SessionExist check ledis session exist by sid
 func (lp *Provider) SessionExist(sid string) bool {
 	count, _ := c.Exists([]byte(sid))
-	if count == 0 {
-		return false
-	}
-	return true
+	return !(count == 0)
 }
 
 // SessionRegenerate generate new sid for ledis session
diff --git a/session/memcache/sess_memcache.go b/session/memcache/sess_memcache.go
index f1069bc9..cad02258 100644
--- a/session/memcache/sess_memcache.go
+++ b/session/memcache/sess_memcache.go
@@ -205,11 +205,7 @@ func (rp *MemProvider) SessionDestroy(sid string) error {
 		}
 	}
 
-	err := client.Delete(sid)
-	if err != nil {
-		return err
-	}
-	return nil
+	return client.Delete(sid)
 }
 
 func (rp *MemProvider) connectInit() error {
diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go
index 7683ee1f..37c45283 100644
--- a/session/mysql/sess_mysql.go
+++ b/session/mysql/sess_mysql.go
@@ -171,10 +171,7 @@ func (mp *Provider) SessionExist(sid string) bool {
 	row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid)
 	var sessiondata []byte
 	err := row.Scan(&sessiondata)
-	if err == sql.ErrNoRows {
-		return false
-	}
-	return true
+	return !(err == sql.ErrNoRows)
 }
 
 // SessionRegenerate generate new sid for mysql session
diff --git a/session/postgres/sess_postgresql.go b/session/postgres/sess_postgresql.go
index 73f9c13a..f00e0711 100644
--- a/session/postgres/sess_postgresql.go
+++ b/session/postgres/sess_postgresql.go
@@ -184,11 +184,7 @@ func (mp *Provider) SessionExist(sid string) bool {
 	row := c.QueryRow("select session_data from session where session_key=$1", sid)
 	var sessiondata []byte
 	err := row.Scan(&sessiondata)
-
-	if err == sql.ErrNoRows {
-		return false
-	}
-	return true
+	return !(err == sql.ErrNoRows)
 }
 
 // SessionRegenerate generate new sid for postgresql session
diff --git a/session/sess_file.go b/session/sess_file.go
index 50687c9e..12cf1f3f 100644
--- a/session/sess_file.go
+++ b/session/sess_file.go
@@ -163,10 +163,7 @@ func (fp *FileProvider) SessionExist(sid string) bool {
 	defer filepder.lock.Unlock()
 
 	_, err := os.Stat(path.Join(fp.savePath, string(sid[0]), string(sid[1]), sid))
-	if err == nil {
-		return true
-	}
-	return false
+	return err == nil
 }
 
 // SessionDestroy Remove all files in this save path
diff --git a/session/sess_test.go b/session/sess_test.go
index b40865f3..60b47dd4 100644
--- a/session/sess_test.go
+++ b/session/sess_test.go
@@ -115,7 +115,7 @@ func TestParseConfig(t *testing.T) {
 	if cf2.Gclifetime != 3600 {
 		t.Fatal("parseconfig get gclifetime error")
 	}
-	if cf2.EnableSetCookie != false {
+	if cf2.EnableSetCookie {
 		t.Fatal("parseconfig get enableSetCookie error")
 	}
 	cconfig := new(cookieConfig)
diff --git a/session/ssdb/sess_ssdb.go b/session/ssdb/sess_ssdb.go
index 4dcf160a..c846e73a 100644
--- a/session/ssdb/sess_ssdb.go
+++ b/session/ssdb/sess_ssdb.go
@@ -26,10 +26,7 @@ func (p *SsdbProvider) connectInit() error {
 		return errors.New("SessionInit First")
 	}
 	p.client, err = ssdb.Connect(p.host, p.port)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (p *SsdbProvider) SessionInit(maxLifetime int64, savePath string) error {
@@ -41,11 +38,7 @@ func (p *SsdbProvider) SessionInit(maxLifetime int64, savePath string) error {
 	if e != nil {
 		return e
 	}
-	err := p.connectInit()
-	if err != nil {
-		return err
-	}
-	return nil
+	return p.connectInit()
 }
 
 func (p *SsdbProvider) SessionRead(sid string) (session.Store, error) {
@@ -126,10 +119,7 @@ func (p *SsdbProvider) SessionDestroy(sid string) error {
 		}
 	}
 	_, err := p.client.Del(sid)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (p *SsdbProvider) SessionGC() {
diff --git a/staticfile.go b/staticfile.go
index b7be24f3..7c270947 100644
--- a/staticfile.go
+++ b/staticfile.go
@@ -109,14 +109,14 @@ var (
 func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, string, *serveContentHolder, error) {
 	mapKey := acceptEncoding + ":" + filePath
 	mapLock.RLock()
-	mapFile, _ := staticFileMap[mapKey]
+	mapFile := staticFileMap[mapKey]
 	mapLock.RUnlock()
 	if isOk(mapFile, fi) {
 		return mapFile.encoding != "", mapFile.encoding, mapFile, nil
 	}
 	mapLock.Lock()
 	defer mapLock.Unlock()
-	if mapFile, _ = staticFileMap[mapKey]; !isOk(mapFile, fi) {
+	if mapFile = staticFileMap[mapKey]; !isOk(mapFile, fi) {
 		file, err := os.Open(filePath)
 		if err != nil {
 			return false, "", nil, err
diff --git a/template.go b/template.go
index 4e0d6384..0d69a29e 100644
--- a/template.go
+++ b/template.go
@@ -31,11 +31,11 @@ import (
 )
 
 var (
-	beegoTplFuncMap = make(template.FuncMap)
+	beegoTplFuncMap           = make(template.FuncMap)
 	beeViewPathTemplateLocked = false
 	// beeViewPathTemplates caching map and supported template file extensions per view
-	beeViewPathTemplates  = make(map[string]map[string]*template.Template)
-	templatesLock sync.RWMutex
+	beeViewPathTemplates = make(map[string]map[string]*template.Template)
+	templatesLock        sync.RWMutex
 	// beeTemplateExt stores the template extension which will build
 	beeTemplateExt = []string{"tpl", "html"}
 	// beeTemplatePreprocessors stores associations of extension -> preprocessor handler
@@ -46,7 +46,7 @@ var (
 // writing the output to wr.
 // A template will be executed safely in parallel.
 func ExecuteTemplate(wr io.Writer, name string, data interface{}) error {
-	return ExecuteViewPathTemplate(wr,name, BConfig.WebConfig.ViewsPath, data)
+	return ExecuteViewPathTemplate(wr, name, BConfig.WebConfig.ViewsPath, data)
 }
 
 // ExecuteViewPathTemplate applies the template with name and from specific viewPath to the specified data object,
@@ -57,7 +57,7 @@ func ExecuteViewPathTemplate(wr io.Writer, name string, viewPath string, data in
 		templatesLock.RLock()
 		defer templatesLock.RUnlock()
 	}
-	if beeTemplates,ok := beeViewPathTemplates[viewPath]; ok {
+	if beeTemplates, ok := beeViewPathTemplates[viewPath]; ok {
 		if t, ok := beeTemplates[name]; ok {
 			var err error
 			if t.Lookup(name) != nil {
@@ -160,9 +160,9 @@ func AddTemplateExt(ext string) {
 	beeTemplateExt = append(beeTemplateExt, ext)
 }
 
-// AddViewPath adds a new path to the supported view paths. 
+// AddViewPath adds a new path to the supported view paths.
 //Can later be used by setting a controller ViewPath to this folder
-//will panic if called after beego.Run() 
+//will panic if called after beego.Run()
 func AddViewPath(viewPath string) error {
 	if beeViewPathTemplateLocked {
 		if _, exist := beeViewPathTemplates[viewPath]; exist {
@@ -187,7 +187,7 @@ func BuildTemplate(dir string, files ...string) error {
 		}
 		return errors.New("dir open err")
 	}
-	beeTemplates,ok := beeViewPathTemplates[dir];
+	beeTemplates, ok := beeViewPathTemplates[dir]
 	if !ok {
 		panic("Unknown view path: " + dir)
 	}
@@ -296,7 +296,7 @@ func _getTemplate(t0 *template.Template, root string, subMods [][]string, others
 					t, subMods1, err = getTplDeep(root, otherFile, "", t)
 					if err != nil {
 						logs.Trace("template parse file err:", err)
-					} else if subMods1 != nil && len(subMods1) > 0 {
+					} else if len(subMods1) > 0 {
 						t, err = _getTemplate(t, root, subMods1, others...)
 					}
 					break
@@ -317,7 +317,7 @@ func _getTemplate(t0 *template.Template, root string, subMods [][]string, others
 						t, subMods1, err = getTplDeep(root, otherFile, "", t)
 						if err != nil {
 							logs.Trace("template parse file err:", err)
-						} else if subMods1 != nil && len(subMods1) > 0 {
+						} else if len(subMods1) > 0 {
 							t, err = _getTemplate(t, root, subMods1, others...)
 						}
 						break
diff --git a/templatefunc_test.go b/templatefunc_test.go
index a1ec1136..20d9b850 100644
--- a/templatefunc_test.go
+++ b/templatefunc_test.go
@@ -173,7 +173,7 @@ func TestParseForm(t *testing.T) {
 	if u.Intro != "I am an engineer!" {
 		t.Errorf("Intro should equal `I am an engineer!` but got `%v`", u.Intro)
 	}
-	if u.StrBool != true {
+	if !u.StrBool {
 		t.Errorf("strboll should equal `true`, but got `%v`", u.StrBool)
 	}
 	y, m, d := u.Date.Date()
@@ -255,43 +255,43 @@ func TestParseFormTag(t *testing.T) {
 	objT := reflect.TypeOf(&user{}).Elem()
 
 	label, name, fType, id, class, ignored, required := parseFormTag(objT.Field(0))
-	if !(name == "name" && label == "年龄：" && fType == "text" && ignored == false) {
+	if !(name == "name" && label == "年龄：" && fType == "text" && !ignored) {
 		t.Errorf("Form Tag with name, label and type was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(1))
-	if !(name == "NoName" && label == "年龄：" && fType == "hidden" && ignored == false) {
+	if !(name == "NoName" && label == "年龄：" && fType == "hidden" && !ignored) {
 		t.Errorf("Form Tag with label and type but without name was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(2))
-	if !(name == "OnlyLabel" && label == "年龄：" && fType == "text" && ignored == false) {
+	if !(name == "OnlyLabel" && label == "年龄：" && fType == "text" && !ignored) {
 		t.Errorf("Form Tag containing only label was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(3))
-	if !(name == "name" && label == "OnlyName: " && fType == "text" && ignored == false &&
+	if !(name == "name" && label == "OnlyName: " && fType == "text" && !ignored &&
 		id == "name" && class == "form-name") {
 		t.Errorf("Form Tag containing only name was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(4))
-	if ignored == false {
+	if !ignored {
 		t.Errorf("Form Tag that should be ignored was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(5))
-	if !(name == "name" && required == true) {
+	if !(name == "name" && required) {
 		t.Errorf("Form Tag containing only name and required was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(6))
-	if !(name == "name" && required == false) {
+	if !(name == "name" && !required) {
 		t.Errorf("Form Tag containing only name and ignore required was not correctly parsed.")
 	}
 
 	label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(7))
-	if !(name == "name" && required == false) {
+	if !(name == "name" && !required) {
 		t.Errorf("Form Tag containing only name and not required was not correctly parsed.")
 	}
 
diff --git a/validation/validation.go b/validation/validation.go
index 489dfa5e..9dc51106 100644
--- a/validation/validation.go
+++ b/validation/validation.go
@@ -349,7 +349,7 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) {
 	//Step 1: validate obj itself firstly
 	// fails if objc is not struct
 	pass, err := v.Valid(objc)
-	if err != nil || false == pass {
+	if err != nil || !pass {
 		return pass, err // Stop recursive validation
 	}
 	// Step 2: Validate struct's struct fields

From b0e2012a170832c899ba6264fab7373a8712995f Mon Sep 17 00:00:00 2001
From: liaoziqian <liaoziqian@lzq-mac.local>
Date: Tue, 21 Mar 2017 09:15:30 +0800
Subject: [PATCH 12/35] Fix set cookie bug, zero max age is not valid.

---
 context/output.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/context/output.go b/context/output.go
index 564ef96d..c15f9fe7 100644
--- a/context/output.go
+++ b/context/output.go
@@ -105,7 +105,7 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface
 		switch {
 		case maxAge > 0:
 			fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(maxAge)*time.Second).UTC().Format(time.RFC1123), maxAge)
-		case maxAge < 0:
+		case maxAge <= 0:
 			fmt.Fprintf(&b, "; Max-Age=0")
 		}
 	}

From ae0a75c464e3373c89f296e698a1679f80e566f9 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 21 Mar 2017 23:55:40 +0800
Subject: [PATCH 13/35] console debug use diffrent color

---
 logs/console.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logs/console.go b/logs/console.go
index e6bf6c29..e75f2a1b 100644
--- a/logs/console.go
+++ b/logs/console.go
@@ -41,7 +41,7 @@ var colors = []brush{
 	newBrush("1;33"), // Warning            yellow
 	newBrush("1;32"), // Notice             green
 	newBrush("1;34"), // Informational      blue
-	newBrush("1;34"), // Debug              blue
+	newBrush("1;44"), // Debug              Background blue
 }
 
 // consoleWriter implements LoggerInterface and writes messages to terminal.

From 83d4385f1f94acde7972801abec35b6508db8cb6 Mon Sep 17 00:00:00 2001
From: Guohua Ouyang <guohuaouyang@gmail.com>
Date: Sat, 25 Mar 2017 07:52:43 +0800
Subject: [PATCH 14/35] Support time.RFC3339

Signed-off-by: Guohua Ouyang <guohuaouyang@gmail.com>
---
 templatefunc.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templatefunc.go b/templatefunc.go
index 8ecacbfe..5bd7b73f 100644
--- a/templatefunc.go
+++ b/templatefunc.go
@@ -362,7 +362,10 @@ func parseFormToStruct(form url.Values, objT reflect.Type, objV reflect.Value) e
 					t   time.Time
 					err error
 				)
-				if len(value) >= 19 {
+				if len(value) >= 25 {
+					value = value[:25]
+					t, err = time.ParseInLocation(time.RFC3339, value, time.Local)
+				} else if len(value) >= 19 {
 					value = value[:19]
 					t, err = time.ParseInLocation(formatDateTime, value, time.Local)
 				} else if len(value) >= 10 {

From c387aeeb363ea65ec18b5f3fecbcde06f6506c49 Mon Sep 17 00:00:00 2001
From: Jisu Kim <vbalien@live.jp>
Date: Mon, 27 Mar 2017 14:30:42 +0900
Subject: [PATCH 15/35] fix markdown formatting

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d3c92d84..c8a964f8 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific feature
 
 More info [beego.me](http://beego.me)
 
-##Quick Start
-######Download and install
+## Quick Start
+###### Download and install
 
     go get github.com/astaxie/beego
 
-######Create file `hello.go`
+###### Create file `hello.go`
 ```go
 package main
 
@@ -24,12 +24,12 @@ func main(){
     beego.Run()
 }
 ```
-######Build and run
+###### Build and run
 ```bash
     go build hello.go
     ./hello
 ```
-######Congratulations! 
+###### Congratulations! 
 You just built your first beego app.
 Open your browser and visit `http://localhost:8080`.
 Please see [Documentation](http://beego.me/docs) for more.

From 7c3a99773590c37aac84ebea32364a6eeba02b3c Mon Sep 17 00:00:00 2001
From: xia hao <do.not.reply@foxmail.com>
Date: Mon, 27 Mar 2017 23:34:58 +0800
Subject: [PATCH 16/35] poolsize could set to zero

sometimes we may want disable the redis pool
---
 session/redis/sess_redis.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go
index c46fa7cd..14bbd4c1 100644
--- a/session/redis/sess_redis.go
+++ b/session/redis/sess_redis.go
@@ -128,7 +128,7 @@ func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error {
 	}
 	if len(configs) > 1 {
 		poolsize, err := strconv.Atoi(configs[1])
-		if err != nil || poolsize <= 0 {
+		if err != nil || poolsize < 0 {
 			rp.poolsize = MaxPoolSize
 		} else {
 			rp.poolsize = poolsize

From fdb2660a2a67f923637d78b0570d62ee44ee066b Mon Sep 17 00:00:00 2001
From: Ketan Gupta <ketan19972010@gmail.com>
Date: Tue, 28 Mar 2017 11:29:20 +0530
Subject: [PATCH 17/35] Update README.md

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d3c92d84..c8a964f8 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific feature
 
 More info [beego.me](http://beego.me)
 
-##Quick Start
-######Download and install
+## Quick Start
+###### Download and install
 
     go get github.com/astaxie/beego
 
-######Create file `hello.go`
+###### Create file `hello.go`
 ```go
 package main
 
@@ -24,12 +24,12 @@ func main(){
     beego.Run()
 }
 ```
-######Build and run
+###### Build and run
 ```bash
     go build hello.go
     ./hello
 ```
-######Congratulations! 
+###### Congratulations! 
 You just built your first beego app.
 Open your browser and visit `http://localhost:8080`.
 Please see [Documentation](http://beego.me/docs) for more.

From 2808a13f0774880901f31714838793ef0dc0d7b8 Mon Sep 17 00:00:00 2001
From: Christoph Pech <christoph.pech@gmail.com>
Date: Tue, 28 Mar 2017 12:38:27 +0200
Subject: [PATCH 18/35] Fix for IndexExists in SQLite driver, they added the
 "origin" and "partial" columns to the index_list pragma. see:
 https://www.sqlite.org/src/info/2743846cdba572f6

---
 orm/db_sqlite.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orm/db_sqlite.go b/orm/db_sqlite.go
index a3cb69a7..a43a5594 100644
--- a/orm/db_sqlite.go
+++ b/orm/db_sqlite.go
@@ -134,7 +134,7 @@ func (d *dbBaseSqlite) IndexExists(db dbQuerier, table string, name string) bool
 	defer rows.Close()
 	for rows.Next() {
 		var tmp, index sql.NullString
-		rows.Scan(&tmp, &index, &tmp)
+		rows.Scan(&tmp, &index, &tmp, &tmp, &tmp)
 		if name == index.String {
 			return true
 		}

From bf469f0b550cda35f2c0ef543d7a7c14ed77a05b Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Wed, 29 Mar 2017 09:57:18 +0800
Subject: [PATCH 19/35] Revert "close mysql connection"

---
 session/mysql/sess_mysql.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go
index 37c45283..7bcf959c 100644
--- a/session/mysql/sess_mysql.go
+++ b/session/mysql/sess_mysql.go
@@ -143,7 +143,6 @@ func (mp *Provider) SessionInit(maxlifetime int64, savePath string) error {
 // SessionRead get mysql session by sid
 func (mp *Provider) SessionRead(sid string) (session.Store, error) {
 	c := mp.connectInit()
-	defer c.Close()
 	row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid)
 	var sessiondata []byte
 	err := row.Scan(&sessiondata)
@@ -177,7 +176,6 @@ func (mp *Provider) SessionExist(sid string) bool {
 // SessionRegenerate generate new sid for mysql session
 func (mp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
 	c := mp.connectInit()
-	defer c.Close()
 	row := c.QueryRow("select session_data from "+TableName+" where session_key=?", oldsid)
 	var sessiondata []byte
 	err := row.Scan(&sessiondata)

From 5c7673e73da9addeede1a97c7ebd1097aee99a4f Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Wed, 29 Mar 2017 10:22:27 +0800
Subject: [PATCH 20/35] update to 1.8.1

---
 beego.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beego.go b/beego.go
index c06b499c..7acf4a13 100644
--- a/beego.go
+++ b/beego.go
@@ -23,7 +23,7 @@ import (
 
 const (
 	// VERSION represent beego web framework version.
-	VERSION = "1.8.0"
+	VERSION = "1.8.1"
 
 	// DEV is for develop
 	DEV = "dev"

From fb04d3cff18fe575d7fbdc465a9f88e65bcefa5b Mon Sep 17 00:00:00 2001
From: Vladimir Shteinman <vladimir.shteinman@gmail.com>
Date: Thu, 30 Mar 2017 11:44:31 +0300
Subject: [PATCH 21/35] Fix example for Hander func

---
 app.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.go b/app.go
index 32776298..25ea2a04 100644
--- a/app.go
+++ b/app.go
@@ -348,9 +348,9 @@ func Any(rootpath string, f FilterFunc) *App {
 
 // Handler used to register a Handler router
 // usage:
-//    beego.Handler("/api", func(ctx *context.Context){
-//          ctx.Output.Body("hello world")
-//    })
+//    beego.Handler("/api", http.HandlerFunc(func (w http.ResponseWriter, r *http.Request) {
+//          fmt.Fprintf(w, "Hello, %q", html.EscapeString(r.URL.Path))
+//    }))
 func Handler(rootpath string, h http.Handler, options ...interface{}) *App {
 	BeeApp.Handlers.Handler(rootpath, h, options...)
 	return BeeApp

From 6a32b048bd996790db417b40428aaa0f5b747167 Mon Sep 17 00:00:00 2001
From: Ondrej Fabry <TrueFurby@users.noreply.github.com>
Date: Sun, 2 Apr 2017 11:04:08 +0200
Subject: [PATCH 22/35] Update README.md

---
 README.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index d3c92d84..32c8e25e 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,18 @@
-## Beego
-
-[![Build Status](https://travis-ci.org/astaxie/beego.svg?branch=master)](https://travis-ci.org/astaxie/beego)
-[![GoDoc](http://godoc.org/github.com/astaxie/beego?status.svg)](http://godoc.org/github.com/astaxie/beego)
-[![Foundation](https://img.shields.io/badge/Golang-Foundation-green.svg)](http://golangfoundation.org)
+# Beego [![Build Status](https://travis-ci.org/astaxie/beego.svg?branch=master)](https://travis-ci.org/astaxie/beego) [![GoDoc](http://godoc.org/github.com/astaxie/beego?status.svg)](http://godoc.org/github.com/astaxie/beego) [![Foundation](https://img.shields.io/badge/Golang-Foundation-green.svg)](http://golangfoundation.org)
 
 beego is used for rapid development of RESTful APIs, web apps and backend services in Go.
 It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific features such as interfaces and struct embedding.
 
-More info [beego.me](http://beego.me)
+###### More info at [beego.me](http://beego.me).
 
-##Quick Start
-######Download and install
+## Quick Start
+
+#### Download and install
 
     go get github.com/astaxie/beego
 
-######Create file `hello.go`
+#### Create file `hello.go`
+
 ```go
 package main
 
@@ -24,15 +22,17 @@ func main(){
     beego.Run()
 }
 ```
-######Build and run
-```bash
-    go build hello.go
+
+#### Build and run
+
+    go build main.go
     ./hello
-```
-######Congratulations! 
-You just built your first beego app.
-Open your browser and visit `http://localhost:8080`.
-Please see [Documentation](http://beego.me/docs) for more.
+
+#### Go to [http://localhost:8080](http://localhost:8080)
+
+Congratulations! You've just built your first **beego** app.
+
+###### Please see [Documentation](http://beego.me/docs) for more.
 
 ## Features
 
@@ -56,7 +56,7 @@ Please see [Documentation](http://beego.me/docs) for more.
 * [http://beego.me/community](http://beego.me/community)
 * Welcome to join us in Slack: [https://beego.slack.com](https://beego.slack.com), you can get invited from [here](https://github.com/beego/beedoc/issues/232)
 
-## LICENSE
+## License
 
 beego source code is licensed under the Apache Licence, Version 2.0
 (http://www.apache.org/licenses/LICENSE-2.0.html).

From d5c03f5b8f577a702a76f735ec490488bcf62785 Mon Sep 17 00:00:00 2001
From: Liaodd <sglicx23@gmail.com>
Date: Mon, 10 Apr 2017 11:30:23 +0800
Subject: [PATCH 23/35] Update ini.go

change the key to lowercase when set a new key for ini configer
---
 config/ini.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ini.go b/config/ini.go
index 27220f90..8fdbc2ea 100644
--- a/config/ini.go
+++ b/config/ini.go
@@ -416,7 +416,7 @@ func (c *IniConfigContainer) Set(key, value string) error {
 
 	var (
 		section, k string
-		sectionKey = strings.Split(key, "::")
+		sectionKey = strings.Split(strings.ToLower(key), "::")
 	)
 
 	if len(sectionKey) >= 2 {

From 932019770deeb0651233e4bebfa87fa9e6b345d7 Mon Sep 17 00:00:00 2001
From: zjjott <zjjott@gmail.com>
Date: Mon, 10 Apr 2017 17:36:17 +0800
Subject: [PATCH 24/35] fix: log mode 0440 should not be 440

---
 logs/file.go      |  2 +-
 logs/file_test.go | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/logs/file.go b/logs/file.go
index bd3c22a9..a7276523 100644
--- a/logs/file.go
+++ b/logs/file.go
@@ -270,7 +270,7 @@ func (w *fileLogWriter) doRotate(logTime time.Time) error {
 	// Rename the file to its new found name
 	// even if occurs error,we MUST guarantee to  restart new logger
 	err = os.Rename(w.Filename, fName)
-	err = os.Chmod(fName, os.FileMode(440))
+	err = os.Chmod(fName, os.FileMode(0440))
 	// re-start logger
 RESTART_LOGGER:
 
diff --git a/logs/file_test.go b/logs/file_test.go
index 69a66d84..a1b226bf 100644
--- a/logs/file_test.go
+++ b/logs/file_test.go
@@ -162,7 +162,27 @@ func TestFileRotate_05(t *testing.T) {
 	testFileDailyRotate(t, fn1, fn2)
 	os.Remove(fn)
 }
-
+func TestFileRotate_06(t *testing.T) {//test file mode
+	log := NewLogger(10000)
+	log.SetLogger("file", `{"filename":"test3.log","maxlines":4}`)
+	log.Debug("debug")
+	log.Info("info")
+	log.Notice("notice")
+	log.Warning("warning")
+	log.Error("error")
+	log.Alert("alert")
+	log.Critical("critical")
+	log.Emergency("emergency")
+	rotateName := "test3" + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1) + ".log"
+	s,_:=os.Lstat(rotateName)
+	if s.Mode() != 0440 {
+		os.Remove(rotateName)
+		os.Remove("test3.log")
+		t.Fatal("rotate file mode error")
+	}
+	os.Remove(rotateName)
+	os.Remove("test3.log")
+}
 func testFileRotate(t *testing.T, fn1, fn2 string) {
 	fw := &fileLogWriter{
 		Daily:   true,

From 0cd31a247f898e782f1730beb2f542963988a73c Mon Sep 17 00:00:00 2001
From: Orefa <Orefa@foxmail.com>
Date: Wed, 19 Apr 2017 07:47:05 +0800
Subject: [PATCH 25/35] fix Template nesting problem

---
 template.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template.go b/template.go
index 17c18591..163ed620 100644
--- a/template.go
+++ b/template.go
@@ -227,9 +227,12 @@ func BuildTemplate(dir string, files ...string) error {
 
 func getTplDeep(root, file, parent string, t *template.Template) (*template.Template, [][]string, error) {
 	var fileAbsPath string
+	var rParent string
 	if filepath.HasPrefix(file, "../") {
+		rParent = filepath.Join(filepath.Dir(parent), file)
 		fileAbsPath = filepath.Join(root, filepath.Dir(parent), file)
 	} else {
+		rParent = file
 		fileAbsPath = filepath.Join(root, file)
 	}
 	if e := utils.FileExists(fileAbsPath); !e {
@@ -254,7 +257,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp
 			if !HasTemplateExt(m[1]) {
 				continue
 			}
-			_, _, err = getTplDeep(root, m[1], file, t)
+			_, _, err = getTplDeep(root, m[1], rParent, t)
 			if err != nil {
 				return nil, [][]string{}, err
 			}

From 0cb8de421857b4b084d50a7df2cb24073938e3c6 Mon Sep 17 00:00:00 2001
From: PaulChen2016 <747766706@qq.com>
Date: Wed, 19 Apr 2017 16:22:58 +0800
Subject: [PATCH 26/35] =?UTF-8?q?Beego=20=E8=BF=90=E8=A1=8C=E8=BF=87?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E5=8A=A8=E6=80=81=E5=A2=9E=E5=87=8F=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8Cnow=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=90=A6=E5=88=99=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4=E4=BC=9A?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

beego 启动时，执行toolbox.StartTask()
运行过程中，动态添加定时任务（这个是now时间已经不是starttask的时间了，需要刷新）
     case <-changed:
			now = time.Now().Local()
			continue
---
 toolbox/task.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolbox/task.go b/toolbox/task.go
index abd411c8..672717cd 100644
--- a/toolbox/task.go
+++ b/toolbox/task.go
@@ -427,6 +427,7 @@ func run() {
 			}
 			continue
 		case <-changed:
+			now = time.Now().Local()
 			continue
 		case <-stop:
 			return

From d1a2583972ffdc743a9bb87e0ccb8ae40f4d7124 Mon Sep 17 00:00:00 2001
From: Ggicci <ggicci@163.com>
Date: Wed, 19 Apr 2017 19:50:11 +0800
Subject: [PATCH 27/35] Fix ini parsing error for multiple users on one
 machine.

If there were multiple users working on one machine, it's common that
"/tmp/beego" will be owned by one of them, and the others won't be able
to access to it. So, it's better to add an "id-like" postfix to the
temporary directory.
---
 config/ini.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/config/ini.go b/config/ini.go
index 27220f90..7711b010 100644
--- a/config/ini.go
+++ b/config/ini.go
@@ -21,6 +21,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -184,10 +185,17 @@ func (ini *IniConfig) parseData(dir string, data []byte) (*IniConfigContainer, e
 
 // ParseData parse ini the data
 // When include other.conf,other.conf is either absolute directory
-// or under beego in default temporary directory(/tmp/beego).
+// or under beego in default temporary directory(/tmp/beego[-username]).
 func (ini *IniConfig) ParseData(data []byte) (Configer, error) {
-	dir := filepath.Join(os.TempDir(), "beego")
-	os.MkdirAll(dir, os.ModePerm)
+	dir := "beego"
+	currentUser, err := user.Current()
+	if err == nil {
+		dir = "beego-" + currentUser.Username
+	}
+	dir = filepath.Join(os.TempDir(), dir)
+	if err = os.MkdirAll(dir, os.ModePerm); err != nil {
+		return nil, err
+	}
 
 	return ini.parseData(dir, data)
 }

From 453691728ab73e569c32df3055e941ff35405e5c Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Thu, 20 Apr 2017 10:56:09 +0800
Subject: [PATCH 28/35] gofmt simplify

---
 context/input_test.go   | 4 ++--
 controller_test.go      | 4 ++--
 logs/alils/signature.go | 3 +--
 logs/file_test.go       | 4 ++--
 toolbox/statistics.go   | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/context/input_test.go b/context/input_test.go
index 9853e398..db812a0f 100644
--- a/context/input_test.go
+++ b/context/input_test.go
@@ -73,8 +73,8 @@ func TestBind(t *testing.T) {
 		{"/?human.ID=888&human.Nick=astaxie&human.Ms=true&human[Pwd]=pass", []testItem{{"human", Human{}, Human{ID: 888, Nick: "astaxie", Ms: true, Pwd: "pass"}}}},
 		{"/?human[0].ID=888&human[0].Nick=astaxie&human[0].Ms=true&human[0][Pwd]=pass01&human[1].ID=999&human[1].Nick=ysqi&human[1].Ms=On&human[1].Pwd=pass02",
 			[]testItem{{"human", []Human{}, []Human{
-				Human{ID: 888, Nick: "astaxie", Ms: true, Pwd: "pass01"},
-				Human{ID: 999, Nick: "ysqi", Ms: true, Pwd: "pass02"},
+				{ID: 888, Nick: "astaxie", Ms: true, Pwd: "pass01"},
+				{ID: 999, Nick: "ysqi", Ms: true, Pwd: "pass02"},
 			}}}},
 
 		{
diff --git a/controller_test.go b/controller_test.go
index c2025860..1e53416d 100644
--- a/controller_test.go
+++ b/controller_test.go
@@ -172,10 +172,10 @@ func TestAdditionalViewPaths(t *testing.T) {
 				t.Fatal("TestAdditionalViewPaths expected error")
 			}
 		}()
-		ctrl.RenderString();
+		ctrl.RenderString()
 	}()
 
 	ctrl.TplName = "file2.tpl"
 	ctrl.ViewPath = dir2
-	ctrl.RenderString();
+	ctrl.RenderString()
 }
diff --git a/logs/alils/signature.go b/logs/alils/signature.go
index e0e4b3f7..2d611307 100755
--- a/logs/alils/signature.go
+++ b/logs/alils/signature.go
@@ -76,7 +76,7 @@ func signature(project *LogProject, method, uri string,
 		var keys sort.StringSlice
 
 		vals := u.Query()
-		for k, _ := range vals {
+		for k := range vals {
 			keys = append(keys, k)
 		}
 
@@ -109,4 +109,3 @@ func signature(project *LogProject, method, uri string,
 	digest = base64.StdEncoding.EncodeToString(mac.Sum(nil))
 	return
 }
-
diff --git a/logs/file_test.go b/logs/file_test.go
index a1b226bf..f345ff20 100644
--- a/logs/file_test.go
+++ b/logs/file_test.go
@@ -162,7 +162,7 @@ func TestFileRotate_05(t *testing.T) {
 	testFileDailyRotate(t, fn1, fn2)
 	os.Remove(fn)
 }
-func TestFileRotate_06(t *testing.T) {//test file mode
+func TestFileRotate_06(t *testing.T) { //test file mode
 	log := NewLogger(10000)
 	log.SetLogger("file", `{"filename":"test3.log","maxlines":4}`)
 	log.Debug("debug")
@@ -174,7 +174,7 @@ func TestFileRotate_06(t *testing.T) {//test file mode
 	log.Critical("critical")
 	log.Emergency("emergency")
 	rotateName := "test3" + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1) + ".log"
-	s,_:=os.Lstat(rotateName)
+	s, _ := os.Lstat(rotateName)
 	if s.Mode() != 0440 {
 		os.Remove(rotateName)
 		os.Remove("test3.log")
diff --git a/toolbox/statistics.go b/toolbox/statistics.go
index c6a9489f..d014544c 100644
--- a/toolbox/statistics.go
+++ b/toolbox/statistics.go
@@ -119,7 +119,7 @@ func (m *URLMap) GetMap() map[string]interface{} {
 func (m *URLMap) GetMapData() []map[string]interface{} {
 	m.lock.Lock()
 	defer m.lock.Unlock()
-	
+
 	var resultLists []map[string]interface{}
 
 	for k, v := range m.urlmap {

From 712df81c99796febb88d6c1a374bc1f1d99f9330 Mon Sep 17 00:00:00 2001
From: OlegFX <oleg@oleg.name>
Date: Fri, 21 Apr 2017 19:57:04 +0300
Subject: [PATCH 29/35] Fixed InsertOrUpdate bug

---
 orm/db.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orm/db.go b/orm/db.go
index 1544c479..e9508ee0 100644
--- a/orm/db.go
+++ b/orm/db.go
@@ -592,7 +592,7 @@ func (d *dbBase) InsertOrUpdate(q dbQuerier, mi *modelInfo, ind reflect.Value, a
 	row := q.QueryRow(query, values...)
 	var id int64
 	err = row.Scan(&id)
-	if err.Error() == `pq: syntax error at or near "ON"` {
+	if err != nil && err.Error() == `pq: syntax error at or near "ON"` {
 		err = fmt.Errorf("postgres version must 9.5 or higher")
 	}
 	return id, err

From bf6bd6b292a9c8c1d3835ef607daa1446f7b8a7d Mon Sep 17 00:00:00 2001
From: Faissal Elamraoui <amr.faissal@gmail.com>
Date: Sun, 23 Apr 2017 19:07:12 +0200
Subject: [PATCH 30/35] Fixes #2587

Fixes warnings and errors raised by gometalinter and gosimple.
---
 admin.go                            | 10 +++---
 grace/server.go                     |  1 -
 logs/jianliao.go                    |  2 --
 logs/slack.go                       |  2 --
 logs/smtp.go                        |  2 --
 namespace.go                        | 11 +++----
 router.go                           | 49 +++++++++++++++--------------
 router_test.go                      | 10 +++++-
 session/couchbase/sess_couchbase.go | 10 +++---
 session/ledis/ledis_session.go      | 47 ++++++++++++++-------------
 session/memcache/sess_memcache.go   |  1 -
 session/mysql/sess_mysql.go         |  1 -
 session/postgres/sess_postgresql.go |  1 -
 session/redis/sess_redis.go         | 33 ++++++++-----------
 session/sess_cookie.go              | 24 ++++++--------
 session/ssdb/sess_ssdb.go           | 11 +++----
 staticfile.go                       |  2 --
 17 files changed, 99 insertions(+), 118 deletions(-)

diff --git a/admin.go b/admin.go
index b4e3068f..80615957 100644
--- a/admin.go
+++ b/admin.go
@@ -208,7 +208,7 @@ func printTree(resultList *[][]string, t *Tree) {
 		printTree(resultList, t.wildcard)
 	}
 	for _, l := range t.leaves {
-		if v, ok := l.runObject.(*controllerInfo); ok {
+		if v, ok := l.runObject.(*ControllerInfo); ok {
 			if v.routerType == routerTypeBeego {
 				var result = []string{
 					v.pattern,
@@ -276,8 +276,8 @@ func profIndex(rw http.ResponseWriter, r *http.Request) {
 // it's in "/healthcheck" pattern in admin module.
 func healthcheck(rw http.ResponseWriter, req *http.Request) {
 	var (
+		result     []string
 		data       = make(map[interface{}]interface{})
-		result     = []string{}
 		resultList = new([][]string)
 		content    = map[string]interface{}{
 			"Fields": []string{"Name", "Message", "Status"},
@@ -291,17 +291,16 @@ func healthcheck(rw http.ResponseWriter, req *http.Request) {
 				name,
 				err.Error(),
 			}
-
 		} else {
 			result = []string{
 				"success",
 				name,
 				"OK",
 			}
-
 		}
 		*resultList = append(*resultList, result)
 	}
+
 	content["Data"] = resultList
 	data["Content"] = content
 	data["Title"] = "Health Check"
@@ -330,7 +329,6 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) {
 	// List Tasks
 	content := make(map[string]interface{})
 	resultList := new([][]string)
-	var result = []string{}
 	var fields = []string{
 		"Task Name",
 		"Task Spec",
@@ -339,7 +337,7 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) {
 		"",
 	}
 	for tname, tk := range toolbox.AdminTaskList {
-		result = []string{
+		result := []string{
 			tname,
 			tk.GetSpec(),
 			tk.GetStatus(),
diff --git a/grace/server.go b/grace/server.go
index cc985552..c71193ad 100644
--- a/grace/server.go
+++ b/grace/server.go
@@ -196,7 +196,6 @@ func (srv *Server) signalHooks(ppFlag int, sig os.Signal) {
 	for _, f := range srv.SignalHooks[ppFlag][sig] {
 		f()
 	}
-	return
 }
 
 // shutdown closes the listener so that no new connections are accepted. it also
diff --git a/logs/jianliao.go b/logs/jianliao.go
index 16bbdc2e..88ba0f9a 100644
--- a/logs/jianliao.go
+++ b/logs/jianliao.go
@@ -61,12 +61,10 @@ func (s *JLWriter) WriteMsg(when time.Time, msg string, level int) error {
 
 // Flush implementing method. empty.
 func (s *JLWriter) Flush() {
-	return
 }
 
 // Destroy implementing method. empty.
 func (s *JLWriter) Destroy() {
-	return
 }
 
 func init() {
diff --git a/logs/slack.go b/logs/slack.go
index d8482b3e..1cd2e5ae 100644
--- a/logs/slack.go
+++ b/logs/slack.go
@@ -49,12 +49,10 @@ func (s *SLACKWriter) WriteMsg(when time.Time, msg string, level int) error {
 
 // Flush implementing method. empty.
 func (s *SLACKWriter) Flush() {
-	return
 }
 
 // Destroy implementing method. empty.
 func (s *SLACKWriter) Destroy() {
-	return
 }
 
 func init() {
diff --git a/logs/smtp.go b/logs/smtp.go
index 2ec0514d..6208d7b8 100644
--- a/logs/smtp.go
+++ b/logs/smtp.go
@@ -138,12 +138,10 @@ func (s *SMTPWriter) WriteMsg(when time.Time, msg string, level int) error {
 
 // Flush implementing method. empty.
 func (s *SMTPWriter) Flush() {
-	return
 }
 
 // Destroy implementing method. empty.
 func (s *SMTPWriter) Destroy() {
-	return
 }
 
 func init() {
diff --git a/namespace.go b/namespace.go
index cfde0111..72f22a72 100644
--- a/namespace.go
+++ b/namespace.go
@@ -267,13 +267,12 @@ func addPrefix(t *Tree, prefix string) {
 		addPrefix(t.wildcard, prefix)
 	}
 	for _, l := range t.leaves {
-		if c, ok := l.runObject.(*controllerInfo); ok {
+		if c, ok := l.runObject.(*ControllerInfo); ok {
 			if !strings.HasPrefix(c.pattern, prefix) {
 				c.pattern = prefix + c.pattern
 			}
 		}
 	}
-
 }
 
 // NSCond is Namespace Condition
@@ -284,16 +283,16 @@ func NSCond(cond namespaceCond) LinkNamespace {
 }
 
 // NSBefore Namespace BeforeRouter filter
-func NSBefore(filiterList ...FilterFunc) LinkNamespace {
+func NSBefore(filterList ...FilterFunc) LinkNamespace {
 	return func(ns *Namespace) {
-		ns.Filter("before", filiterList...)
+		ns.Filter("before", filterList...)
 	}
 }
 
 // NSAfter add Namespace FinishRouter filter
-func NSAfter(filiterList ...FilterFunc) LinkNamespace {
+func NSAfter(filterList ...FilterFunc) LinkNamespace {
 	return func(ns *Namespace) {
-		ns.Filter("after", filiterList...)
+		ns.Filter("after", filterList...)
 	}
 }
 
diff --git a/router.go b/router.go
index 9f573f26..c6ec8af6 100644
--- a/router.go
+++ b/router.go
@@ -109,7 +109,8 @@ func ExceptMethodAppend(action string) {
 	exceptMethod = append(exceptMethod, action)
 }
 
-type controllerInfo struct {
+// ControllerInfo holds information about the controller.
+type ControllerInfo struct {
 	pattern        string
 	controllerType reflect.Type
 	methods        map[string]string
@@ -176,7 +177,7 @@ func (p *ControllerRegister) Add(pattern string, c ControllerInterface, mappingM
 		}
 	}
 
-	route := &controllerInfo{}
+	route := &ControllerInfo{}
 	route.pattern = pattern
 	route.methods = methods
 	route.routerType = routerTypeBeego
@@ -198,7 +199,7 @@ func (p *ControllerRegister) Add(pattern string, c ControllerInterface, mappingM
 	}
 }
 
-func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerInfo) {
+func (p *ControllerRegister) addToRouter(method, pattern string, r *ControllerInfo) {
 	if !BConfig.RouterCaseSensitive {
 		pattern = strings.ToLower(pattern)
 	}
@@ -335,7 +336,7 @@ func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) {
 	if _, ok := HTTPMETHOD[method]; method != "*" && !ok {
 		panic("not support http method: " + method)
 	}
-	route := &controllerInfo{}
+	route := &ControllerInfo{}
 	route.pattern = pattern
 	route.routerType = routerTypeRESTFul
 	route.runFunction = f
@@ -361,7 +362,7 @@ func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) {
 
 // Handler add user defined Handler
 func (p *ControllerRegister) Handler(pattern string, h http.Handler, options ...interface{}) {
-	route := &controllerInfo{}
+	route := &ControllerInfo{}
 	route.pattern = pattern
 	route.routerType = routerTypeHandler
 	route.handler = h
@@ -396,7 +397,7 @@ func (p *ControllerRegister) AddAutoPrefix(prefix string, c ControllerInterface)
 	controllerName := strings.TrimSuffix(ct.Name(), "Controller")
 	for i := 0; i < rt.NumMethod(); i++ {
 		if !utils.InSlice(rt.Method(i).Name, exceptMethod) {
-			route := &controllerInfo{}
+			route := &ControllerInfo{}
 			route.routerType = routerTypeBeego
 			route.methods = map[string]string{"*": rt.Method(i).Name}
 			route.controllerType = ct
@@ -502,7 +503,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin
 		}
 	}
 	for _, l := range t.leaves {
-		if c, ok := l.runObject.(*controllerInfo); ok {
+		if c, ok := l.runObject.(*ControllerInfo); ok {
 			if c.routerType == routerTypeBeego &&
 				strings.HasSuffix(path.Join(c.controllerType.PkgPath(), c.controllerType.Name()), controllName) {
 				find := false
@@ -629,7 +630,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 		runRouter  reflect.Type
 		findRouter bool
 		runMethod  string
-		routerInfo *controllerInfo
+		routerInfo *ControllerInfo
 		isRunnable bool
 	)
 	context := p.pool.Get().(*beecontext.Context)
@@ -670,7 +671,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 		goto Admin
 	}
 
-	if r.Method != "GET" && r.Method != "HEAD" {
+	if r.Method != http.MethodGet && r.Method != http.MethodHead {
 		if BConfig.CopyRequestBody && !context.Input.IsUpload() {
 			context.Input.CopyBody(BConfig.MaxMemory)
 		}
@@ -743,11 +744,11 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 		} else {
 			runRouter = routerInfo.controllerType
 			method := r.Method
-			if r.Method == "POST" && context.Input.Query("_method") == "PUT" {
-				method = "PUT"
+			if r.Method == http.MethodPost && context.Input.Query("_method") == http.MethodPost {
+				method = http.MethodPut
 			}
-			if r.Method == "POST" && context.Input.Query("_method") == "DELETE" {
-				method = "DELETE"
+			if r.Method == http.MethodPost && context.Input.Query("_method") == http.MethodDelete {
+				method = http.MethodDelete
 			}
 			if m, ok := routerInfo.methods[method]; ok {
 				runMethod = m
@@ -777,8 +778,8 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 		//if XSRF is Enable then check cookie where there has any cookie in the  request's cookie _csrf
 		if BConfig.WebConfig.EnableXSRF {
 			execController.XSRFToken()
-			if r.Method == "POST" || r.Method == "DELETE" || r.Method == "PUT" ||
-				(r.Method == "POST" && (context.Input.Query("_method") == "DELETE" || context.Input.Query("_method") == "PUT")) {
+			if r.Method == http.MethodPost || r.Method == http.MethodDelete || r.Method == http.MethodPut ||
+				(r.Method == http.MethodPost && (context.Input.Query("_method") == http.MethodDelete || context.Input.Query("_method") == http.MethodPut)) {
 				execController.CheckXSRFCookie()
 			}
 		}
@@ -788,19 +789,19 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 		if !context.ResponseWriter.Started {
 			//exec main logic
 			switch runMethod {
-			case "GET":
+			case http.MethodGet:
 				execController.Get()
-			case "POST":
+			case http.MethodPost:
 				execController.Post()
-			case "DELETE":
+			case http.MethodDelete:
 				execController.Delete()
-			case "PUT":
+			case http.MethodPut:
 				execController.Put()
-			case "HEAD":
+			case http.MethodHead:
 				execController.Head()
-			case "PATCH":
+			case http.MethodPatch:
 				execController.Patch()
-			case "OPTIONS":
+			case http.MethodOptions:
 				execController.Options()
 			default:
 				if !execController.HandlerFunc(runMethod) {
@@ -887,7 +888,7 @@ Admin:
 }
 
 // FindRouter Find Router info for URL
-func (p *ControllerRegister) FindRouter(context *beecontext.Context) (routerInfo *controllerInfo, isFind bool) {
+func (p *ControllerRegister) FindRouter(context *beecontext.Context) (routerInfo *ControllerInfo, isFind bool) {
 	var urlPath = context.Input.URL()
 	if !BConfig.RouterCaseSensitive {
 		urlPath = strings.ToLower(urlPath)
@@ -895,7 +896,7 @@ func (p *ControllerRegister) FindRouter(context *beecontext.Context) (routerInfo
 	httpMethod := context.Input.Method()
 	if t, ok := p.routers[httpMethod]; ok {
 		runObject := t.Match(urlPath, context)
-		if r, ok := runObject.(*controllerInfo); ok {
+		if r, ok := runObject.(*ControllerInfo); ok {
 			return r, true
 		}
 	}
diff --git a/router_test.go b/router_test.go
index 25804d67..720b4ca8 100644
--- a/router_test.go
+++ b/router_test.go
@@ -654,32 +654,40 @@ func TestFilterFinishRouterMulti(t *testing.T) {
 }
 
 func beegoFilterNoOutput(ctx *context.Context) {
-	return
 }
+
 func beegoBeforeRouter1(ctx *context.Context) {
 	ctx.WriteString("|BeforeRouter1")
 }
+
 func beegoBeforeRouter2(ctx *context.Context) {
 	ctx.WriteString("|BeforeRouter2")
 }
+
 func beegoBeforeExec1(ctx *context.Context) {
 	ctx.WriteString("|BeforeExec1")
 }
+
 func beegoBeforeExec2(ctx *context.Context) {
 	ctx.WriteString("|BeforeExec2")
 }
+
 func beegoAfterExec1(ctx *context.Context) {
 	ctx.WriteString("|AfterExec1")
 }
+
 func beegoAfterExec2(ctx *context.Context) {
 	ctx.WriteString("|AfterExec2")
 }
+
 func beegoFinishRouter1(ctx *context.Context) {
 	ctx.WriteString("|FinishRouter1")
 }
+
 func beegoFinishRouter2(ctx *context.Context) {
 	ctx.WriteString("|FinishRouter2")
 }
+
 func beegoResetParams(ctx *context.Context) {
 	ctx.ResponseWriter.Header().Set("splat", ctx.Input.Param(":splat"))
 }
diff --git a/session/couchbase/sess_couchbase.go b/session/couchbase/sess_couchbase.go
index d5be11d0..791a6cc7 100644
--- a/session/couchbase/sess_couchbase.go
+++ b/session/couchbase/sess_couchbase.go
@@ -155,10 +155,13 @@ func (cp *Provider) SessionInit(maxlifetime int64, savePath string) error {
 func (cp *Provider) SessionRead(sid string) (session.Store, error) {
 	cp.b = cp.getBucket()
 
-	var doc []byte
+	var (
+		kv  map[interface{}]interface{}
+		err error
+		doc []byte
+	)
 
-	err := cp.b.Get(sid, &doc)
-	var kv map[interface{}]interface{}
+	err = cp.b.Get(sid, &doc)
 	if doc == nil {
 		kv = make(map[interface{}]interface{})
 	} else {
@@ -230,7 +233,6 @@ func (cp *Provider) SessionDestroy(sid string) error {
 
 // SessionGC Recycle
 func (cp *Provider) SessionGC() {
-	return
 }
 
 // SessionAll return all active session
diff --git a/session/ledis/ledis_session.go b/session/ledis/ledis_session.go
index 4892a8ab..18b27708 100644
--- a/session/ledis/ledis_session.go
+++ b/session/ledis/ledis_session.go
@@ -12,8 +12,10 @@ import (
 	"github.com/siddontang/ledisdb/ledis"
 )
 
-var ledispder = &Provider{}
-var c *ledis.DB
+var (
+	ledispder = &Provider{}
+	c         *ledis.DB
+)
 
 // SessionStore ledis session store
 type SessionStore struct {
@@ -97,27 +99,36 @@ func (lp *Provider) SessionInit(maxlifetime int64, savePath string) error {
 	}
 	cfg := new(config.Config)
 	cfg.DataDir = lp.savePath
-	nowLedis, err := ledis.Open(cfg)
-	c, err = nowLedis.Select(lp.db)
+
+	var ledisInstance *ledis.Ledis
+	ledisInstance, err = ledis.Open(cfg)
 	if err != nil {
-		println(err)
-		return nil
+		return err
 	}
-	return nil
+	c, err = ledisInstance.Select(lp.db)
+	return err
 }
 
 // SessionRead read ledis session by sid
 func (lp *Provider) SessionRead(sid string) (session.Store, error) {
-	kvs, err := c.Get([]byte(sid))
-	var kv map[interface{}]interface{}
+	var (
+		kv  map[interface{}]interface{}
+		kvs []byte
+		err error
+	)
+
+	if kvs, err = c.Get([]byte(sid)); err != nil {
+		return nil, err
+	}
+
 	if len(kvs) == 0 {
 		kv = make(map[interface{}]interface{})
 	} else {
-		kv, err = session.DecodeGob(kvs)
-		if err != nil {
+		if kv, err = session.DecodeGob(kvs); err != nil {
 			return nil, err
 		}
 	}
+
 	ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
 	return ls, nil
 }
@@ -142,18 +153,7 @@ func (lp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error)
 		c.Set([]byte(sid), data)
 		c.Expire([]byte(sid), lp.maxlifetime)
 	}
-	kvs, err := c.Get([]byte(sid))
-	var kv map[interface{}]interface{}
-	if len(kvs) == 0 {
-		kv = make(map[interface{}]interface{})
-	} else {
-		kv, err = session.DecodeGob(kvs)
-		if err != nil {
-			return nil, err
-		}
-	}
-	ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
-	return ls, nil
+	return lp.SessionRead(sid)
 }
 
 // SessionDestroy delete ledis session by id
@@ -164,7 +164,6 @@ func (lp *Provider) SessionDestroy(sid string) error {
 
 // SessionGC Impelment method, no used.
 func (lp *Provider) SessionGC() {
-	return
 }
 
 // SessionAll return all active session
diff --git a/session/memcache/sess_memcache.go b/session/memcache/sess_memcache.go
index cad02258..755979c4 100644
--- a/session/memcache/sess_memcache.go
+++ b/session/memcache/sess_memcache.go
@@ -215,7 +215,6 @@ func (rp *MemProvider) connectInit() error {
 
 // SessionGC Impelment method, no used.
 func (rp *MemProvider) SessionGC() {
-	return
 }
 
 // SessionAll return all activeSession
diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go
index 7bcf959c..4c9251e7 100644
--- a/session/mysql/sess_mysql.go
+++ b/session/mysql/sess_mysql.go
@@ -209,7 +209,6 @@ func (mp *Provider) SessionGC() {
 	c := mp.connectInit()
 	c.Exec("DELETE from "+TableName+" where session_expiry < ?", time.Now().Unix()-mp.maxlifetime)
 	c.Close()
-	return
 }
 
 // SessionAll count values in mysql session
diff --git a/session/postgres/sess_postgresql.go b/session/postgres/sess_postgresql.go
index f00e0711..ffc27def 100644
--- a/session/postgres/sess_postgresql.go
+++ b/session/postgres/sess_postgresql.go
@@ -224,7 +224,6 @@ func (mp *Provider) SessionGC() {
 	c := mp.connectInit()
 	c.Exec("DELETE from session where EXTRACT(EPOCH FROM (current_timestamp - session_expiry)) > $1", mp.maxlifetime)
 	c.Close()
-	return
 }
 
 // SessionAll count values in postgresql session
diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go
index 14bbd4c1..08efa6e1 100644
--- a/session/redis/sess_redis.go
+++ b/session/redis/sess_redis.go
@@ -155,7 +155,7 @@ func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error {
 			return nil, err
 		}
 		if rp.password != "" {
-			if _, err := c.Do("AUTH", rp.password); err != nil {
+			if _, err = c.Do("AUTH", rp.password); err != nil {
 				c.Close()
 				return nil, err
 			}
@@ -176,13 +176,20 @@ func (rp *Provider) SessionRead(sid string) (session.Store, error) {
 	c := rp.poollist.Get()
 	defer c.Close()
 
-	kvs, err := redis.String(c.Do("GET", sid))
-	var kv map[interface{}]interface{}
+	var (
+		kv  map[interface{}]interface{}
+		kvs string
+		err error
+	)
+
+	if kvs, err = redis.String(c.Do("GET", sid)); err != nil {
+		return nil, err
+	}
+
 	if len(kvs) == 0 {
 		kv = make(map[interface{}]interface{})
 	} else {
-		kv, err = session.DecodeGob([]byte(kvs))
-		if err != nil {
+		if kv, err = session.DecodeGob([]byte(kvs)); err != nil {
 			return nil, err
 		}
 	}
@@ -216,20 +223,7 @@ func (rp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error)
 		c.Do("RENAME", oldsid, sid)
 		c.Do("EXPIRE", sid, rp.maxlifetime)
 	}
-
-	kvs, err := redis.String(c.Do("GET", sid))
-	var kv map[interface{}]interface{}
-	if len(kvs) == 0 {
-		kv = make(map[interface{}]interface{})
-	} else {
-		kv, err = session.DecodeGob([]byte(kvs))
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	rs := &SessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime}
-	return rs, nil
+	return rp.SessionRead(sid)
 }
 
 // SessionDestroy delete redis session by id
@@ -243,7 +237,6 @@ func (rp *Provider) SessionDestroy(sid string) error {
 
 // SessionGC Impelment method, no used.
 func (rp *Provider) SessionGC() {
-	return
 }
 
 // SessionAll return all activeSession
diff --git a/session/sess_cookie.go b/session/sess_cookie.go
index 3fefa360..145e53c9 100644
--- a/session/sess_cookie.go
+++ b/session/sess_cookie.go
@@ -74,21 +74,16 @@ func (st *CookieSessionStore) SessionID() string {
 
 // SessionRelease Write cookie session to http response cookie
 func (st *CookieSessionStore) SessionRelease(w http.ResponseWriter) {
-	str, err := encodeCookie(cookiepder.block,
-		cookiepder.config.SecurityKey,
-		cookiepder.config.SecurityName,
-		st.values)
-	if err != nil {
-		return
+	encodedCookie, err := encodeCookie(cookiepder.block, cookiepder.config.SecurityKey, cookiepder.config.SecurityName, st.values)
+	if err == nil {
+		cookie := &http.Cookie{Name: cookiepder.config.CookieName,
+			Value:    url.QueryEscape(encodedCookie),
+			Path:     "/",
+			HttpOnly: true,
+			Secure:   cookiepder.config.Secure,
+			MaxAge:   cookiepder.config.Maxage}
+		http.SetCookie(w, cookie)
 	}
-	cookie := &http.Cookie{Name: cookiepder.config.CookieName,
-		Value:    url.QueryEscape(str),
-		Path:     "/",
-		HttpOnly: true,
-		Secure:   cookiepder.config.Secure,
-		MaxAge:   cookiepder.config.Maxage}
-	http.SetCookie(w, cookie)
-	return
 }
 
 type cookieConfig struct {
@@ -166,7 +161,6 @@ func (pder *CookieProvider) SessionDestroy(sid string) error {
 
 // SessionGC Implement method, no used.
 func (pder *CookieProvider) SessionGC() {
-	return
 }
 
 // SessionAll Implement method, return 0.
diff --git a/session/ssdb/sess_ssdb.go b/session/ssdb/sess_ssdb.go
index c846e73a..03b60793 100644
--- a/session/ssdb/sess_ssdb.go
+++ b/session/ssdb/sess_ssdb.go
@@ -30,13 +30,13 @@ func (p *SsdbProvider) connectInit() error {
 }
 
 func (p *SsdbProvider) SessionInit(maxLifetime int64, savePath string) error {
-	var e error = nil
 	p.maxLifetime = maxLifetime
 	address := strings.Split(savePath, ":")
 	p.host = address[0]
-	p.port, e = strconv.Atoi(address[1])
-	if e != nil {
-		return e
+
+	var err error
+	if p.port, err = strconv.Atoi(address[1]); err != nil {
+		return err
 	}
 	return p.connectInit()
 }
@@ -78,8 +78,8 @@ func (p *SsdbProvider) SessionExist(sid string) bool {
 		return false
 	}
 	return true
-
 }
+
 func (p *SsdbProvider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
 	//conn.Do("setx", key, v, ttl)
 	if p.client == nil {
@@ -123,7 +123,6 @@ func (p *SsdbProvider) SessionDestroy(sid string) error {
 }
 
 func (p *SsdbProvider) SessionGC() {
-	return
 }
 
 func (p *SsdbProvider) SessionAll() int {
diff --git a/staticfile.go b/staticfile.go
index 7c270947..bbb2a1fb 100644
--- a/staticfile.go
+++ b/staticfile.go
@@ -90,8 +90,6 @@ func serverStaticRouter(ctx *context.Context) {
 	}
 
 	http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, sch.modTime, sch)
-	return
-
 }
 
 type serveContentHolder struct {

From 52f916a28a8b73e81606ac2b6142e113f64e1e8d Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Mon, 24 Apr 2017 21:10:03 +0800
Subject: [PATCH 31/35] support Go1.8 default GOPATH

---
 router.go      |  7 ++-----
 utils/utils.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 utils/utils.go

diff --git a/router.go b/router.go
index 9f573f26..55a6553f 100644
--- a/router.go
+++ b/router.go
@@ -17,7 +17,6 @@ package beego
 import (
 	"fmt"
 	"net/http"
-	"os"
 	"path"
 	"path/filepath"
 	"reflect"
@@ -219,13 +218,11 @@ func (p *ControllerRegister) Include(cList ...ControllerInterface) {
 		for _, c := range cList {
 			reflectVal := reflect.ValueOf(c)
 			t := reflect.Indirect(reflectVal).Type()
-			gopath := os.Getenv("GOPATH")
-			if gopath == "" {
+			wgopath := utils.GetGOPATHs()
+			if len(wgopath) == 0 {
 				panic("you are in dev mode. So please set gopath")
 			}
 			pkgpath := ""
-
-			wgopath := filepath.SplitList(gopath)
 			for _, wg := range wgopath {
 				wg, _ = filepath.EvalSymlinks(filepath.Join(wg, "src", t.PkgPath()))
 				if utils.FileExists(wg) {
diff --git a/utils/utils.go b/utils/utils.go
new file mode 100644
index 00000000..ed885787
--- /dev/null
+++ b/utils/utils.go
@@ -0,0 +1,30 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+)
+
+// GetGOPATHs returns all paths in GOPATH variable.
+func GetGOPATHs() []string {
+	gopath := os.Getenv("GOPATH")
+	if gopath == "" && strings.Compare(runtime.Version(), "go1.8") >= 0 {
+		gopath = defaultGOPATH()
+	}
+	return filepath.SplitList(gopath)
+}
+
+func defaultGOPATH() string {
+	env := "HOME"
+	if runtime.GOOS == "windows" {
+		env = "USERPROFILE"
+	} else if runtime.GOOS == "plan9" {
+		env = "home"
+	}
+	if home := os.Getenv(env); home != "" {
+		return filepath.Join(home, "go")
+	}
+	return ""
+}

From e810f2e93070919cb9afe287f0091d905408e4d6 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Mon, 24 Apr 2017 21:36:07 +0800
Subject: [PATCH 32/35] add more oracle alias

---
 orm/db_alias.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/orm/db_alias.go b/orm/db_alias.go
index 8daa4b23..e70db9f0 100644
--- a/orm/db_alias.go
+++ b/orm/db_alias.go
@@ -60,6 +60,8 @@ var (
 		"sqlite3":  DRSqlite,
 		"tidb":     DRTiDB,
 		"oracle":   DROracle,
+		"oci8":     DROracle, // github.com/mattn/go-oci8
+		"ora":      DROracle, //https://github.com/rana/ora
 	}
 	dbBasers = map[DriverType]dbBaser{
 		DRMySQL:    newdbBaseMysql(),

From 3742d1178ca9b2c429ed8fe91360002a941d4b89 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 25 Apr 2017 20:42:43 +0800
Subject: [PATCH 33/35] httplib support delete params fix #2593

---
 httplib/httplib.go      | 2 +-
 httplib/httplib_test.go | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/httplib/httplib.go b/httplib/httplib.go
index 32edc5c4..f232f31b 100644
--- a/httplib/httplib.go
+++ b/httplib/httplib.go
@@ -344,7 +344,7 @@ func (b *BeegoHTTPRequest) buildURL(paramBody string) {
 	}
 
 	// build POST/PUT/PATCH url and body
-	if (b.req.Method == "POST" || b.req.Method == "PUT" || b.req.Method == "PATCH") && b.req.Body == nil {
+	if (b.req.Method == "POST" || b.req.Method == "PUT" || b.req.Method == "PATCH" || b.req.Method == "DELETE") && b.req.Body == nil {
 		// with files
 		if len(b.files) > 0 {
 			pr, pw := io.Pipe()
diff --git a/httplib/httplib_test.go b/httplib/httplib_test.go
index 05815054..32d3e7f6 100644
--- a/httplib/httplib_test.go
+++ b/httplib/httplib_test.go
@@ -102,6 +102,14 @@ func TestSimpleDelete(t *testing.T) {
 	t.Log(str)
 }
 
+func TestSimpleDeleteParam(t *testing.T) {
+	str, err := Delete("http://httpbin.org/delete").Param("key", "val").String()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(str)
+}
+
 func TestWithCookie(t *testing.T) {
 	v := "smallfish"
 	str, err := Get("http://httpbin.org/cookies/set?k1=" + v).SetEnableCookie(true).String()

From 0f554d9b1a498580006ff6140fae2b5e0ab8e328 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 25 Apr 2017 22:21:08 +0800
Subject: [PATCH 34/35] update travis to latest go version

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4b19015..e3960c70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: go
 
 go:
-  - 1.6
-  - 1.7
-  - 1.8
+  - 1.6.4
+  - 1.7.5
+  - 1.8.1
 services:
   - redis-server
   - mysql

From cd67f13bf91666ac78363dfd9ed1c7e69ee6c9f8 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 25 Apr 2017 22:21:27 +0800
Subject: [PATCH 35/35] add template layout test #2481

---
 template_test.go | 114 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/template_test.go b/template_test.go
index 17690965..16967382 100644
--- a/template_test.go
+++ b/template_test.go
@@ -15,6 +15,7 @@
 package beego
 
 import (
+	"bytes"
 	"os"
 	"path/filepath"
 	"testing"
@@ -142,3 +143,116 @@ func TestRelativeTemplate(t *testing.T) {
 	}
 	os.RemoveAll(dir)
 }
+
+var add = `{{ template "layout_blog.tpl" . }}
+{{ define "css" }}
+        <link rel="stylesheet" href="/static/css/current.css">
+{{ end}}
+
+
+{{ define "content" }}
+        <h2>{{ .Title }}</h2>
+        <p> This is SomeVar: {{ .SomeVar }}</p>
+{{ end }}
+
+{{ define "js" }}
+    <script src="/static/js/current.js"></script>
+{{ end}}`
+
+var layout_blog = `<!DOCTYPE html>
+<html>
+<head>
+    <title>Lin Li</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css">
+     {{ block "css" . }}{{ end }}
+</head>
+<body>
+
+    <div class="container">
+        {{ block "content" . }}{{ end }}
+    </div>
+    <script type="text/javascript" src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
+    <script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+     {{ block "js" . }}{{ end }}
+</body>
+</html>`
+
+var output = `<!DOCTYPE html>
+<html>
+<head>
+    <title>Lin Li</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
+    <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css">
+     
+        <link rel="stylesheet" href="/static/css/current.css">
+
+</head>
+<body>
+
+    <div class="container">
+        
+        <h2>Hello</h2>
+        <p> This is SomeVar: val</p>
+
+    </div>
+    <script type="text/javascript" src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
+    <script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
+     
+    <script src="/static/js/current.js"></script>
+
+</body>
+</html>
+
+
+
+
+
+`
+
+func TestTemplateLayout(t *testing.T) {
+	dir := "_beeTmp"
+	files := []string{
+		"add.tpl",
+		"layout_blog.tpl",
+	}
+	if err := os.MkdirAll(dir, 0777); err != nil {
+		t.Fatal(err)
+	}
+	for k, name := range files {
+		os.MkdirAll(filepath.Dir(filepath.Join(dir, name)), 0777)
+		if f, err := os.Create(filepath.Join(dir, name)); err != nil {
+			t.Fatal(err)
+		} else {
+			if k == 0 {
+				f.WriteString(add)
+			} else if k == 1 {
+				f.WriteString(layout_blog)
+			}
+			f.Close()
+		}
+	}
+	if err := AddViewPath(dir); err != nil {
+		t.Fatal(err)
+	}
+	beeTemplates := beeViewPathTemplates[dir]
+	if len(beeTemplates) != 2 {
+		t.Fatalf("should be 2 but got %v", len(beeTemplates))
+	}
+	out := bytes.NewBufferString("")
+	if err := beeTemplates["add.tpl"].ExecuteTemplate(out, "add.tpl", map[string]string{"Title": "Hello", "SomeVar": "val"}); err != nil {
+		t.Fatal(err)
+	}
+	if out.String() != output {
+		t.Log(out.String())
+		t.Fatal("Compare failed")
+	}
+	for _, name := range files {
+		os.RemoveAll(filepath.Join(dir, name))
+	}
+	os.RemoveAll(dir)
+}