数据库where增加[##]操作

userinfo接口返回企业统一社会信用代码和营业执照路径

.gitignore

@@ -1,2 +1,3 @@
 /.idea/*
-.idea
+.idea
+/example/config/app.json

LICENSE

@@ -7,17 +7,17 @@ AND DISTRIBUTION
 
    1. Definitions.
 
-      
+
 
 "License" shall mean the terms and conditions for use, reproduction, and distribution
 as defined by Sections 1 through 9 of that document.
 
-      
+
 
 "Licensor" shall mean the copyright owner or entity authorized by the copyright
 owner that is granting the License.
 
-      
+
 
 "Legal Entity" shall mean the union of the acting entity and all other entities
 that control, are controlled by, or are under common control with that entity.
@@ -26,31 +26,31 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
 of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-      
+
 
 "You" (or "Your") shall mean an individual or Legal Entity exercising permissions
 granted by that License.
 
-      
+
 
 "Source" form shall mean the preferred form for making modifications, including
 but not limited to software source code, documentation source, and configuration
 files.
 
-      
+
 
 "Object" form shall mean any form resulting from mechanical transformation
 or translation of a Source form, including but not limited to compiled object
 code, generated documentation, and conversions to other media types.
 
-      
+
 
 "Work" shall mean the work of authorship, whether in Source or Object form,
 made available under the License, as indicated by a copyright notice that
 is included in or attached to the work (an example is provided in the Appendix
 below).
 
-      
+
 
 "Derivative Works" shall mean any work, whether in Source or Object form,
 that is based on (or derived from) the Work and for which the editorial revisions,
@@ -59,7 +59,7 @@ original work of authorship. For the purposes of that License, Derivative
 Works shall not include works that remain separable from, or merely link (or
 bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-      
+
 
 "Contribution" shall mean any work of authorship, including the original version
 of the Work and any modifications or additions to that Work or Derivative
@@ -74,7 +74,7 @@ for the purpose of discussing and improving the Work, but excluding communicatio
 that is conspicuously marked or otherwise designated in writing by the copyright
 owner as "Not a Contribution."
 
-      
+
 
 "Contributor" shall mean Licensor and any individual or Legal Entity on behalf
 of whom a Contribution has been received by Licensor and subsequently incorporated
@@ -142,7 +142,7 @@ any additional terms or conditions. Notwithstanding the above, nothing herein
 shall supersede or modify the terms of any separate license agreement you
 may have executed with Licensor regarding such Contributions.
 
-6. Trademarks. This License does not grant permission to use the trade names,
+6. Trademarks. that License does not grant permission to use the trade names,
 trademarks, service marks, or product names of the Licensor, except as required
 for reasonable and customary use in describing the origin of the Work and
 reproducing the content of the NOTICE file.

application.go

@@ -1,11 +1,11 @@
 package hotime
 
 import (
-	. "./cache"
-	"./code"
-	. "./common"
-	. "./db"
-	. "./log"
+	. "code.hoteas.com/golang/hotime/cache"
+	"code.hoteas.com/golang/hotime/code"
+	. "code.hoteas.com/golang/hotime/common"
+	. "code.hoteas.com/golang/hotime/db"
+	. "code.hoteas.com/golang/hotime/log"
 	"database/sql"
 	"github.com/sirupsen/logrus"
 	"io"
@@ -20,8 +20,7 @@ import (
 )
 
 type Application struct {
-	*code.MakeCode
-	MakeCodeRouter Router
+	MakeCodeRouter map[string]*code.MakeCode
 	MethodRouter
 	Router
 	ContextBase
@@ -30,7 +29,7 @@ type Application struct {
 	WebConnectLog   *logrus.Logger
 	Port            string                     //端口号
 	TLSPort         string                     //ssl访问端口号
-	connectListener []func(this *Context) bool //所有的访问监听,true按原计划继续使用，false表示有监听器处理
+	connectListener []func(that *Context) bool //所有的访问监听,true按原计划继续使用，false表示有监听器处理
 	connectDbFunc   func(err ...*Error) (master, slave *sql.DB)
 	configPath      string
 	Config          Map
@@ -71,7 +70,13 @@ func (that *Application) Run(router Router) {
 		that.Router = Router{}
 	}
 	for k, v := range router {
-		that.Router[k] = v
+		if that.Router[k] == nil {
+			that.Router[k] = v
+		}
+
+		for k1, v1 := range v {
+			that.Router[k][k1] = v1
+		}
 	}
 	//重新设置MethodRouter//直达路由
 	that.MethodRouter = MethodRouter{}
@@ -257,13 +262,13 @@ func (that *Application) SetConfig(configPath ...string) {
 
 }
 
-// SetConnectListener 连接判断,返回true继续传输至控制层，false则停止传输
-func (that *Application) SetConnectListener(lis func(this *Context) bool) {
+// SetConnectListener 连接判断,返回false继续传输至控制层，true则停止传输
+func (that *Application) SetConnectListener(lis func(that *Context) (isFinished bool)) {
 	that.connectListener = append(that.connectListener, lis)
 }
 
 //网络错误
-//func (this *Application) session(w http.ResponseWriter, req *http.Request) {
+//func (that *Application) session(w http.ResponseWriter, req *http.Request) {
 //
 //}
 
@@ -359,14 +364,13 @@ func (that *Application) handler(w http.ResponseWriter, req *http.Request) {
 
 	//访问拦截true继续false暂停
 	connectListenerLen := len(that.connectListener)
-	if connectListenerLen != 0 {
-		for i := 0; i < connectListenerLen; i++ {
 
-			if !that.connectListener[i](&context) {
+	for i := connectListenerLen - 1; i >= 0; i-- {
 
-				context.View()
-				return
-			}
+		if that.connectListener[i](&context) {
+
+			context.View()
+			return
 		}
 	}
 
@@ -420,8 +424,14 @@ func (that *Application) handler(w http.ResponseWriter, req *http.Request) {
 		header.Set("Cache-Control", "no-cache")
 	}
 
-	if strings.Index(path, ".m3u8") != -1 {
-		header.Add("Content-Type", "audio/mpegurl")
+	t := strings.LastIndex(path, ".")
+	if t != -1 {
+		tt := path[t:]
+
+		if MimeMaps[tt] != "" {
+
+			header.Add("Content-Type", MimeMaps[tt])
+		}
 	}
 
 	//w.Write(data)
@@ -520,40 +530,65 @@ func (that *Application) crossDomain(context *Context, sessionId string) {
 }
 
 //Init 初始化application
-func Init(config string) Application {
+func Init(config string) *Application {
 	appIns := Application{}
 	//手动模式，
 	appIns.SetConfig(config)
 
 	SetDB(&appIns)
 	appIns.SetCache()
-	appIns.MakeCode = &code.MakeCode{}
-	codeConfig := appIns.Config.GetMap("codeConfig")
+	codeConfig := appIns.Config.GetSlice("codeConfig")
+
 	if codeConfig != nil {
+
 		for k, _ := range codeConfig {
-			if appIns.Config.GetInt("mode") == 2 {
-				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), &appIns.Db, true)
-			} else if appIns.Config.GetInt("mode") == 3 {
-				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), &appIns.Db, false)
+			codeMake := codeConfig.GetMap(k)
+			if codeMake == nil {
+				continue
+			}
+			//codeMake["table"] = k
+			if appIns.MakeCodeRouter == nil {
+				appIns.MakeCodeRouter = map[string]*code.MakeCode{}
+			}
+
+			if codeMake.GetString("name") == "" {
+				codeMake["name"] = codeMake.GetString("table")
+			}
+
+			if appIns.Config.GetInt("mode") > 0 {
+				appIns.MakeCodeRouter[codeMake.GetString("name")] = &code.MakeCode{}
+				appIns.MakeCodeRouter[codeMake.GetString("name")].Db2JSON(&appIns.Db, codeMake)
 			} else {
-				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), nil, false)
+				appIns.MakeCodeRouter[codeMake.GetString("name")] = &code.MakeCode{}
+				appIns.MakeCodeRouter[codeMake.GetString("name")].Db2JSON(nil, codeMake)
 			}
 			//接入动态代码层
 			if appIns.Router == nil {
 				appIns.Router = Router{}
 			}
-			appIns.Router[k] = TptProject
-			for k1, _ := range appIns.MakeCode.TableColumns {
-				appIns.Router[k][k1] = appIns.Router[k]["hotimeCommon"]
+
+			//appIns.Router[codeMake.GetString("name")] = TptProject
+			appIns.Router[codeMake.GetString("name")] = Proj{}
+			for k2, _ := range TptProject {
+				appIns.Router[codeMake.GetString("name")][k2] = Ctr{}
+				for k3, v3 := range TptProject[k2] {
+					appIns.Router[codeMake.GetString("name")][k2][k3] = v3
+				}
 			}
 
-			setMakeCodeLintener(k, &appIns)
+			for k1, _ := range appIns.MakeCodeRouter[codeMake.GetString("name")].TableColumns {
+				appIns.Router[codeMake.GetString("name")][k1] = appIns.Router[codeMake.GetString("name")]["hotimeCommon"]
+			}
+
+			go func() {
+				setMakeCodeLintener(codeMake.GetString("name"), &appIns)
+			}()
 
 		}
 
 	}
 
-	return appIns
+	return &appIns
 }
 
 // SetDB 智能数据库设置
@@ -614,80 +649,86 @@ func SetSqliteDB(appIns *Application, config Map) {
 }
 
 func setMakeCodeLintener(name string, appIns *Application) {
-	appIns.SetConnectListener(func(context *Context) bool {
-		if len(context.RouterString) > 1 && context.RouterString[0] == name {
-			if context.RouterString[1] == "hotime" && context.RouterString[2] == "login" {
-				return true
-			}
-			if context.RouterString[1] == "hotime" && context.RouterString[2] == "logout" {
-				return true
-			}
-
-			if context.Session(name+"_id").Data == nil {
-				context.Display(2, "你还没有登录")
-				return false
-			}
-		}
+	appIns.SetConnectListener(func(context *Context) (isFinished bool) {
 
+		codeIns := appIns.MakeCodeRouter[name]
 		//文件上传接口
 		if len(context.RouterString) == 1 && context.RouterString[0] == "file" && context.Req.Method == "POST" {
-			if context.Session(name+"_id").Data == nil {
+			if context.Session(codeIns.FileConfig.GetString("table")+"_id").Data == nil {
 				context.Display(2, "你还没有登录")
-				return false
+				return true
 			}
 			//读取网络文件
 			fi, fheader, err := context.Req.FormFile("file")
 			if err != nil {
 				context.Display(3, err)
-				return false
+				return true
 
 			}
 			filePath := context.Config.GetString("filePath")
 			if filePath == "" {
-				filePath = "file/2006/01/02/"
+				filePath = "/file/2006/01/02/"
 			}
 
 			path := time.Now().Format(filePath)
-			e := os.MkdirAll(context.Config.GetString("tpt")+"/"+path, os.ModeDir)
+			e := os.MkdirAll(context.Config.GetString("tpt")+path, os.ModeDir)
 			if e != nil {
 				context.Display(3, e)
-				return false
+				return true
 			}
 			filePath = path + Md5(ObjToStr(RandX(100000, 9999999))) + fheader.Filename[strings.LastIndex(fheader.Filename, "."):]
-			newFile, e := os.Create(context.Config.GetString("tpt") + "/" + filePath)
+			newFile, e := os.Create(context.Config.GetString("tpt") + filePath)
 
 			if e != nil {
 				context.Display(3, e)
-				return false
+				return true
 			}
 
 			_, e = io.Copy(newFile, fi)
 
 			if e != nil {
 				context.Display(3, e)
-				return false
+				return true
 			}
 
 			context.Display(0, filePath)
-			return false
+			return true
+		}
+
+		if len(context.RouterString) < 2 || appIns.MakeCodeRouter[context.RouterString[0]] == nil {
+			return isFinished
+		}
+
+		if len(context.RouterString) > 1 && context.RouterString[0] == name {
+			if context.RouterString[1] == "hotime" && context.RouterString[2] == "login" {
+				return isFinished
+			}
+			if context.RouterString[1] == "hotime" && context.RouterString[2] == "logout" {
+				return isFinished
+			}
+
+			if context.Session(codeIns.FileConfig.GetString("table")+"_id").Data == nil {
+				context.Display(2, "你还没有登录")
+				return true
+			}
 		}
 
 		if len(context.RouterString) < 2 || len(context.RouterString) > 3 ||
 			!(context.Router[context.RouterString[0]] != nil &&
 				context.Router[context.RouterString[0]][context.RouterString[1]] != nil) {
-			return true
+			return isFinished
 		}
 		//排除无效操作
 		if len(context.RouterString) == 2 &&
 			context.Req.Method != "GET" &&
 			context.Req.Method != "POST" {
-			return true
+			return isFinished
 		}
 		//列表检索
 		if len(context.RouterString) == 2 &&
 			context.Req.Method == "GET" {
 			if context.Router[context.RouterString[0]][context.RouterString[1]]["search"] == nil {
-				return true
+				return isFinished
 			}
 			context.Router[context.RouterString[0]][context.RouterString[1]]["search"](context)
 		}
@@ -701,14 +742,14 @@ func setMakeCodeLintener(name string, appIns *Application) {
 		}
 		if len(context.RouterString) == 3 &&
 			context.Req.Method == "POST" {
-			return true
+			return isFinished
 		}
 		//查询单条
 		if len(context.RouterString) == 3 &&
 			context.Req.Method == "GET" {
 
 			if context.Router[context.RouterString[0]][context.RouterString[1]]["info"] == nil {
-				return true
+				return isFinished
 			}
 
 			context.Router[context.RouterString[0]][context.RouterString[1]]["info"](context)
@@ -733,7 +774,8 @@ func setMakeCodeLintener(name string, appIns *Application) {
 
 			context.Router[context.RouterString[0]][context.RouterString[1]]["remove"](context)
 		}
+
 		context.View()
-		return false
+		return true
 	})
 }

cache/cache.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 	"errors"
 )
 

cache/cache_db.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 	"database/sql"
 	"encoding/json"
 	"strings"
@@ -30,14 +30,14 @@ type CacheDb struct {
 	isInit bool
 }
 
-func (this *CacheDb) GetError() *Error {
+func (that *CacheDb) GetError() *Error {
 
-	return this.Error
+	return that.Error
 
 }
 
-func (this *CacheDb) SetError(err *Error) {
-	this.Error = err
+func (that *CacheDb) SetError(err *Error) {
+	that.Error = err
 }
 
 func (that *CacheDb) initDbTable() {
@@ -58,7 +58,7 @@ func (that *CacheDb) initDbTable() {
 			return
 		}
 
-		_, e := that.Db.Exec("CREATE TABLE `" + that.Db.GetPrefix() + "cached` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `ckey` varchar(60) DEFAULT NULL, `cvalue` varchar(2000) DEFAULT NULL, `time` bigint(20) DEFAULT NULL, `endtime` bigint(20) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=198740 DEFAULT CHARSET=utf8")
+		_, e := that.Db.Exec("CREATE TABLE `" + that.Db.GetPrefix() + "cached` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `key` varchar(60) DEFAULT NULL, `value` varchar(2000) DEFAULT NULL, `time` bigint(20) DEFAULT NULL, `endtime` bigint(20) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=198740 DEFAULT CHARSET=utf8")
 		if e.GetError() == nil {
 			that.isInit = true
 		}
@@ -74,8 +74,8 @@ func (that *CacheDb) initDbTable() {
 		}
 		_, e := that.Db.Exec(`CREATE TABLE "` + that.Db.GetPrefix() + `cached" (
 			"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-				"ckey" TEXT(60),
-				"cvalue" TEXT(2000),
+				"key" TEXT(60),
+				"value" TEXT(2000),
 				"time" integer,
 				"endtime" integer
 			);`)
@@ -90,7 +90,7 @@ func (that *CacheDb) initDbTable() {
 //获取Cache键只能为string类型
 func (that *CacheDb) get(key string) interface{} {
 
-	cached := that.Db.Get("cached", "*", Map{"ckey": key})
+	cached := that.Db.Get("cached", "*", Map{"key": key})
 
 	if cached == nil {
 		return nil
@@ -103,7 +103,7 @@ func (that *CacheDb) get(key string) interface{} {
 	}
 
 	data := Map{}
-	data.JsonToMap(cached.GetString("cvalue"))
+	data.JsonToMap(cached.GetString("value"))
 
 	return data.Get("data")
 }
@@ -113,9 +113,9 @@ func (that *CacheDb) set(key string, value interface{}, tim int64) {
 
 	bte, _ := json.Marshal(Map{"data": value})
 
-	num := that.Db.Update("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim}, Map{"ckey": key})
+	num := that.Db.Update("cached", Map{"value": string(bte), "time": time.Now().UnixNano(), "endtime": tim}, Map{"key": key})
 	if num == int64(0) {
-		that.Db.Insert("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim, "ckey": key})
+		that.Db.Insert("cached", Map{"value": string(bte), "time": time.Now().UnixNano(), "endtime": tim, "key": key})
 	}
 
 	//随机执行删除命令
@@ -130,10 +130,10 @@ func (that *CacheDb) delete(key string) {
 	//如果通配删除
 	if del != -1 {
 		key = Substr(key, 0, del)
-		that.Db.Delete("cached", Map{"ckey": key + "%"})
+		that.Db.Delete("cached", Map{"key": key + "%"})
 
 	} else {
-		that.Db.Delete("cached", Map{"ckey": key})
+		that.Db.Delete("cached", Map{"key": key})
 	}
 }
 

cache/cache_memory.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 	"strings"
 	"sync"
 	"time"
@@ -17,47 +17,47 @@ type CacheMemory struct {
 	mutex *sync.RWMutex
 }
 
-func (this *CacheMemory) GetError() *Error {
+func (that *CacheMemory) GetError() *Error {
 
-	return this.Error
+	return that.Error
 
 }
 
-func (this *CacheMemory) SetError(err *Error) {
-	this.Error = err
+func (that *CacheMemory) SetError(err *Error) {
+	that.Error = err
 }
 
 //获取Cache键只能为string类型
-func (this *CacheMemory) get(key string) interface{} {
-	this.Error.SetError(nil)
-	if this.Map == nil {
-		this.Map = Map{}
+func (that *CacheMemory) get(key string) interface{} {
+	that.Error.SetError(nil)
+	if that.Map == nil {
+		that.Map = Map{}
 	}
 
-	if this.Map[key] == nil {
+	if that.Map[key] == nil {
 		return nil
 	}
-	data := this.Map.Get(key, this.Error).(cacheData)
-	if this.Error.GetError() != nil {
+	data := that.Map.Get(key, that.Error).(cacheData)
+	if that.Error.GetError() != nil {
 		return nil
 	}
 
 	if data.time < time.Now().Unix() {
-		delete(this.Map, key)
+		delete(that.Map, key)
 		return nil
 	}
 	return data.data
 }
 
-func (this *CacheMemory) refreshMap() {
+func (that *CacheMemory) refreshMap() {
 
 	go func() {
-		this.mutex.Lock()
-		defer this.mutex.Unlock()
-		for key, v := range this.Map {
+		that.mutex.Lock()
+		defer that.mutex.Unlock()
+		for key, v := range that.Map {
 			data := v.(cacheData)
 			if data.time <= time.Now().Unix() {
-				delete(this.Map, key)
+				delete(that.Map, key)
 			}
 		}
 
@@ -66,15 +66,15 @@ func (this *CacheMemory) refreshMap() {
 }
 
 //key value ,时间为时间戳
-func (this *CacheMemory) set(key string, value interface{}, time int64) {
-	this.Error.SetError(nil)
+func (that *CacheMemory) set(key string, value interface{}, time int64) {
+	that.Error.SetError(nil)
 	var data cacheData
 
-	if this.Map == nil {
-		this.Map = Map{}
+	if that.Map == nil {
+		that.Map = Map{}
 	}
 
-	dd := this.Map[key]
+	dd := that.Map[key]
 
 	if dd == nil {
 		data = cacheData{}
@@ -85,74 +85,74 @@ func (this *CacheMemory) set(key string, value interface{}, time int64) {
 	data.time = time
 	data.data = value
 
-	this.Map.Put(key, data)
+	that.Map.Put(key, data)
 }
 
-func (this *CacheMemory) delete(key string) {
+func (that *CacheMemory) delete(key string) {
 	del := strings.Index(key, "*")
 	//如果通配删除
 	if del != -1 {
 		key = Substr(key, 0, del)
-		for k, _ := range this.Map {
+		for k, _ := range that.Map {
 			if strings.Index(k, key) != -1 {
-				delete(this.Map, k)
+				delete(that.Map, k)
 
 			}
 		}
 
 	} else {
-		delete(this.Map, key)
+		delete(that.Map, key)
 	}
 
 }
 
-func (this *CacheMemory) Cache(key string, data ...interface{}) *Obj {
+func (that *CacheMemory) Cache(key string, data ...interface{}) *Obj {
 
 	x := RandX(1, 100000)
 	if x > 99950 {
-		this.refreshMap()
+		that.refreshMap()
 	}
-	if this.mutex == nil {
-		this.mutex = &sync.RWMutex{}
+	if that.mutex == nil {
+		that.mutex = &sync.RWMutex{}
 	}
 
 	reData := &Obj{Data: nil}
 
 	if len(data) == 0 {
-		this.mutex.RLock()
-		reData.Data = this.get(key)
-		this.mutex.RUnlock()
+		that.mutex.RLock()
+		reData.Data = that.get(key)
+		that.mutex.RUnlock()
 		return reData
 	}
 	tim := time.Now().Unix()
 
 	if len(data) == 1 && data[0] == nil {
-		this.mutex.Lock()
-		this.delete(key)
-		this.mutex.Unlock()
+		that.mutex.Lock()
+		that.delete(key)
+		that.mutex.Unlock()
 		return reData
 	}
 
 	if len(data) == 1 {
 
-		tim = tim + this.TimeOut
+		tim = tim + that.TimeOut
 
 	}
 	if len(data) == 2 {
-		this.Error.SetError(nil)
-		tempt := ObjToInt64(data[1], this.Error)
+		that.Error.SetError(nil)
+		tempt := ObjToInt64(data[1], that.Error)
 
 		if tempt > tim {
 
 			tim = tempt
-		} else if this.Error.GetError() == nil {
+		} else if that.Error.GetError() == nil {
 
 			tim = tim + tempt
 		}
 	}
-	this.mutex.Lock()
-	this.set(key, data[0], tim)
-	this.mutex.Unlock()
+	that.mutex.Lock()
+	that.set(key, data[0], tim)
+	that.mutex.Unlock()
 	return reData
 
 }

cache/cache_redis.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 	"github.com/garyburd/redigo/redis"
 	"strings"
 	"time"
@@ -20,65 +20,65 @@ type CacheRedis struct {
 	*Error
 }
 
-func (this *CacheRedis) GetError() *Error {
+func (that *CacheRedis) GetError() *Error {
 
-	return this.Error
+	return that.Error
 
 }
 
-func (this *CacheRedis) SetError(err *Error) {
-	this.Error = err
+func (that *CacheRedis) SetError(err *Error) {
+	that.Error = err
 }
 
 //唯一标志
-func (this *CacheRedis) GetTag() int64 {
+func (that *CacheRedis) GetTag() int64 {
 
-	if this.tag == int64(0) {
-		this.tag = time.Now().UnixNano()
+	if that.tag == int64(0) {
+		that.tag = time.Now().UnixNano()
 	}
-	return this.tag
+	return that.tag
 }
 
-func (this *CacheRedis) reCon() bool {
+func (that *CacheRedis) reCon() bool {
 	var err error
-	this.conn, err = redis.Dial("tcp", this.Host+":"+ObjToStr(this.Port))
+	that.conn, err = redis.Dial("tcp", that.Host+":"+ObjToStr(that.Port))
 	if err != nil {
-		this.conn = nil
-		this.Error.SetError(err)
+		that.conn = nil
+		that.Error.SetError(err)
 		return false
 	}
 
-	if this.Pwd != "" {
-		_, err = this.conn.Do("AUTH", this.Pwd)
+	if that.Pwd != "" {
+		_, err = that.conn.Do("AUTH", that.Pwd)
 		if err != nil {
-			this.conn = nil
-			this.Error.SetError(err)
+			that.conn = nil
+			that.Error.SetError(err)
 			return false
 		}
 	}
 
 	return true
 }
-func (this *CacheRedis) del(key string) {
+func (that *CacheRedis) del(key string) {
 	del := strings.Index(key, "*")
 	if del != -1 {
-		val, err := redis.Strings(this.conn.Do("KEYS", key))
+		val, err := redis.Strings(that.conn.Do("KEYS", key))
 		if err != nil {
 			return
 		}
-		this.conn.Send("MULTI")
+		that.conn.Send("MULTI")
 		for i, _ := range val {
-			this.conn.Send("DEL", val[i])
+			that.conn.Send("DEL", val[i])
 		}
-		this.conn.Do("EXEC")
+		that.conn.Do("EXEC")
 	} else {
-		_, err := this.conn.Do("DEL", key)
+		_, err := that.conn.Do("DEL", key)
 		if err != nil {
-			this.Error.SetError(err)
-			_, err = this.conn.Do("PING")
+			that.Error.SetError(err)
+			_, err = that.conn.Do("PING")
 			if err != nil {
-				if this.reCon() {
-					_, err = this.conn.Do("DEL", key)
+				if that.reCon() {
+					_, err = that.conn.Do("DEL", key)
 				}
 			}
 		}
@@ -86,32 +86,32 @@ func (this *CacheRedis) del(key string) {
 }
 
 //key value ,时间为时间戳
-func (this *CacheRedis) set(key string, value string, time int64) {
-	_, err := this.conn.Do("SET", key, value, "EX", ObjToStr(time))
+func (that *CacheRedis) set(key string, value string, time int64) {
+	_, err := that.conn.Do("SET", key, value, "EX", ObjToStr(time))
 	if err != nil {
 
-		this.Error.SetError(err)
-		_, err = this.conn.Do("PING")
+		that.Error.SetError(err)
+		_, err = that.conn.Do("PING")
 		if err != nil {
-			if this.reCon() {
-				_, err = this.conn.Do("SET", key, value, "EX", ObjToStr(time))
+			if that.reCon() {
+				_, err = that.conn.Do("SET", key, value, "EX", ObjToStr(time))
 			}
 		}
 	}
 }
 
-func (this *CacheRedis) get(key string) *Obj {
+func (that *CacheRedis) get(key string) *Obj {
 	reData := &Obj{}
 	var err error
-	reData.Data, err = redis.String(this.conn.Do("GET", key))
+	reData.Data, err = redis.String(that.conn.Do("GET", key))
 	if err != nil {
 		reData.Data = nil
 		if !strings.Contains(err.Error(), "nil returned") {
-			this.Error.SetError(err)
-			_, err = this.conn.Do("PING")
+			that.Error.SetError(err)
+			_, err = that.conn.Do("PING")
 			if err != nil {
-				if this.reCon() {
-					reData.Data, err = redis.String(this.conn.Do("GET", key))
+				if that.reCon() {
+					reData.Data, err = redis.String(that.conn.Do("GET", key))
 				}
 			}
 
@@ -121,10 +121,10 @@ func (this *CacheRedis) get(key string) *Obj {
 	return reData
 }
 
-func (this *CacheRedis) Cache(key string, data ...interface{}) *Obj {
+func (that *CacheRedis) Cache(key string, data ...interface{}) *Obj {
 	reData := &Obj{}
-	if this.conn == nil {
-		re := this.reCon()
+	if that.conn == nil {
+		re := that.reCon()
 		if !re {
 			return reData
 		}
@@ -132,38 +132,38 @@ func (this *CacheRedis) Cache(key string, data ...interface{}) *Obj {
 	//查询缓存
 	if len(data) == 0 {
 
-		reData = this.get(key)
+		reData = that.get(key)
 		return reData
 
 	}
 	tim := int64(0)
 	//删除缓存
 	if len(data) == 1 && data[0] == nil {
-		this.del(key)
+		that.del(key)
 		return reData
 	}
 	//添加缓存
 	if len(data) == 1 {
 
-		if this.TimeOut == 0 {
-			//this.Time = Config.GetInt64("cacheShortTime")
+		if that.TimeOut == 0 {
+			//that.Time = Config.GetInt64("cacheShortTime")
 		}
 
-		tim += this.TimeOut
+		tim += that.TimeOut
 	}
 	if len(data) == 2 {
-		this.Error.SetError(nil)
-		tempt := ObjToInt64(data[1], this.Error)
+		that.Error.SetError(nil)
+		tempt := ObjToInt64(data[1], that.Error)
 		if tempt > tim {
 
 			tim = tempt
-		} else if this.GetError() == nil {
+		} else if that.GetError() == nil {
 
 			tim = tim + tempt
 		}
 	}
 
-	this.set(key, ObjToStr(data[0]), tim)
+	that.set(key, ObjToStr(data[0]), tim)
 
 	return reData
 

cache/type.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 )
 
 type CacheIns interface {

code.go

@@ -1,7 +1,7 @@
 package hotime
 
 import (
-	. "../hotime/common"
+	. "code.hoteas.com/golang/hotime/common"
 	"strings"
 )
 
@@ -11,8 +11,9 @@ var TptProject = Proj{
 	"hotimeCommon": Ctr{
 		"info": func(that *Context) {
 			hotimeName := that.RouterString[0]
-			data := that.Db.Get(hotimeName, "*", Map{"id": that.Session(hotimeName + "_id").ToCeilInt()})
-			str, inData := that.MakeCode.Info(that.RouterString[1], data, that.Db)
+			fileConfig := that.MakeCodeRouter[hotimeName].FileConfig
+			data := that.Db.Get(fileConfig.GetString("table"), "*", Map{"id": that.Session(fileConfig.GetString("table") + "_id").ToCeilInt()})
+			str, inData := that.MakeCodeRouter[hotimeName].Info(that.RouterString[1], data, that.Db)
 			where := Map{"id": that.RouterString[2]}
 
 			if len(inData) == 1 {
@@ -31,19 +32,54 @@ var TptProject = Proj{
 			}
 
 			for k, v := range re {
-				column := that.MakeCode.TableColumns[that.RouterString[1]][k]
+				column := that.MakeCodeRouter[hotimeName].TableColumns[that.RouterString[1]][k]
 				if column == nil {
 					continue
 				}
+
 				if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
-					re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
+					seStr := "id," + column.GetString("value")
+					if that.MakeCodeRouter[hotimeName].TableColumns[column.GetString("link")]["phone"] != nil {
+						seStr = seStr + ",phone"
+					}
+
+					link := strings.Replace(column.GetString("name"), "_id", "", -1)
+					if link == "parent" {
+						link = that.RouterString[1]
+					}
+					re[link] = that.Db.Get(column.GetString("link"), seStr, Map{"id": v})
 				}
 			}
 
+			//如果有table字段则代为link
+			if re["table"] != nil && re["table_id"] != nil {
+
+				column := that.MakeCodeRouter[hotimeName].TableColumns[that.RouterString[1]][re.GetString("table")]
+				v := re.GetCeilInt64("table_id")
+
+				seStr := "id," + column.GetString("value")
+
+				if that.MakeCodeRouter[hotimeName].TableColumns[column.GetString("link")]["phone"] != nil {
+					seStr = seStr + ",phone"
+				}
+
+				link := strings.Replace(column.GetString("name"), "_id", "", -1)
+				if link == "parent" {
+					link = that.RouterString[1]
+				}
+				re[link] = that.Db.Get(column.GetString("link"), seStr, Map{"id": v})
+
+			}
+
 			that.Display(0, re)
 		},
 		"add": func(that *Context) {
-			inData := that.MakeCode.Add(that.RouterString[1], that.Req)
+			that.Log = Map{"table": that.RouterString[1], "type": 1}
+
+			hotimeName := that.RouterString[0]
+			fileConfig := that.MakeCodeRouter[hotimeName].FileConfig
+			data := that.Db.Get(fileConfig.GetString("table"), "*", Map{"id": that.Session(fileConfig.GetString("table") + "_id").ToCeilInt()})
+			inData := that.MakeCodeRouter[hotimeName].Add(that.RouterString[1], data, that.Req)
 			if inData == nil {
 				that.Display(3, "请求参数不足")
 				return
@@ -64,27 +100,36 @@ var TptProject = Proj{
 				inData["index"] = "," + ObjToStr(re) + ","
 				that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
 			}
-
+			that.Log["table_id"] = re
 			that.Display(0, re)
 		},
 		"update": func(that *Context) {
-			inData := that.MakeCode.Edit(that.RouterString[1], that.Req)
+
+			that.Log = Map{"table": that.RouterString[1], "type": 2, "table_id": that.RouterString[2]}
+
+			hotimeName := that.RouterString[0]
+			inData := that.MakeCodeRouter[hotimeName].Edit(that.RouterString[1], that.Req)
+
 			if inData == nil {
 				that.Display(3, "没有找到要更新的数据")
 				return
 			}
 
 			//索引管理，便于检索以及权限
-			if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-				Index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": that.RouterString[2]})
-				parentIndex := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-				inData["index"] = parentIndex.GetString("index") + that.RouterString[2] + ","
+			if inData.GetString("index") != "" {
+				if inData.Get("parent_id") != nil {
+					Index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": that.RouterString[2]})
+					parentIndex := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
+					inData["index"] = parentIndex.GetString("index") + that.RouterString[2] + ","
 
-				childNodes := that.Db.Select(that.RouterString[1], "id,`index``", Map{"index[~]": "," + that.RouterString[2] + ","})
+					childNodes := that.Db.Select(that.RouterString[1], "id,`index``", Map{"index[~]": "," + that.RouterString[2] + ","})
 
-				for _, v := range childNodes {
-					v["index"] = strings.Replace(v.GetString("index"), Index.GetString("index"), inData.GetString("index"), -1)
-					that.Db.Update(that.RouterString[1], Map{"index": v["index"]}, Map{"id": v.GetCeilInt("id")})
+					for _, v := range childNodes {
+						v["index"] = strings.Replace(v.GetString("index"), Index.GetString("index"), inData.GetString("index"), -1)
+						that.Db.Update(that.RouterString[1], Map{"index": v["index"]}, Map{"id": v.GetCeilInt("id")})
+					}
+				} else {
+					delete(inData, "index")
 				}
 
 			}
@@ -99,7 +144,9 @@ var TptProject = Proj{
 			that.Display(0, re)
 		},
 		"remove": func(that *Context) {
-			inData := that.MakeCode.Delete(that.RouterString[1], that.Req)
+			that.Log = Map{"table": that.RouterString[1], "type": 3, "table_id": that.RouterString[2]}
+			hotimeName := that.RouterString[0]
+			inData := that.MakeCodeRouter[hotimeName].Delete(that.RouterString[1], that.Req)
 			if inData == nil {
 				that.Display(3, "请求参数不足")
 				return
@@ -121,9 +168,11 @@ var TptProject = Proj{
 
 		"search": func(that *Context) {
 			hotimeName := that.RouterString[0]
-			data := that.Db.Get(hotimeName, "*", Map{"id": that.Session(hotimeName + "_id").ToCeilInt()})
+			fileConfig := that.MakeCodeRouter[hotimeName].FileConfig
 
-			columnStr, leftJoin, where := that.MakeCode.Search(that.RouterString[1], data, that.Req, that.Db)
+			data := that.Db.Get(fileConfig.GetString("table"), "*", Map{"id": that.Session(fileConfig.GetString("table") + "_id").ToCeilInt()})
+
+			columnStr, leftJoin, where := that.MakeCodeRouter[hotimeName].Search(that.RouterString[1], data, that.Req, that.Db)
 
 			page := ObjToInt(that.Req.FormValue("page"))
 			pageSize := ObjToInt(that.Req.FormValue("pageSize"))
@@ -141,13 +190,30 @@ var TptProject = Proj{
 				PageSelect(that.RouterString[1], leftJoin, columnStr, where)
 
 			for _, v := range reData {
-				for k, _ := range v {
-					column := that.MakeCode.TableColumns[that.RouterString[1]][k]
-					if column == nil {
-						continue
+				v.RangeSort(func(k string, v1 interface{}) (isEnd bool) {
+
+					//如果有table字段则代为link
+					if v["table"] != nil && v["table_id"] != nil {
+
+						id := v.GetCeilInt64("table_id")
+						tableName := that.MakeCodeRouter[hotimeName].TableConfig.GetMap(v.GetString("table")).GetString("label")
+						v["table_table_name"] = strings.Replace(tableName, "管理", "", -1)
+						parentC := that.Db.Get(v.GetString("table"), "name", Map{"id": id})
+						v["table_table_id_name"] = ""
+						if parentC != nil {
+							v["table_table_id_name"] = parentC.GetString("name")
+						}
+
 					}
 
-					if column["list"] != false && column["name"] == "parent_id" && column.GetString("link") != "" {
+					column := that.MakeCodeRouter[hotimeName].TableColumns[that.RouterString[1]][k]
+
+					if column == nil {
+						return isEnd
+					}
+
+					if (column["list"] == nil || column["list"] == true) && column["name"] == "parent_id" && column.GetString("link") != "" {
+
 						parentC := that.Db.Get(column.GetString("link"), column.GetString("value"), Map{"id": v.GetCeilInt(k)})
 						v[column.GetString("link")+"_"+column.GetString("name")+"_"+column.GetString("value")] = ""
 						if parentC != nil {
@@ -155,41 +221,49 @@ var TptProject = Proj{
 						}
 					}
 
-				}
+					return isEnd
+				})
 			}
 
 			that.Display(0, Map{"count": count, "data": reData})
 		},
 	},
 	"hotime": Ctr{
-		"login": func(this *Context) {
-			hotimeName := this.RouterString[0]
-			name := this.Req.FormValue("name")
-			password := this.Req.FormValue("password")
+		"login": func(that *Context) {
+			hotimeName := that.RouterString[0]
+			fileConfig := that.MakeCodeRouter[hotimeName].FileConfig
+
+			name := that.Req.FormValue("name")
+			password := that.Req.FormValue("password")
 			if name == "" || password == "" {
-				this.Display(3, "参数不足")
+				that.Display(3, "参数不足")
 				return
 			}
-			user := this.Db.Get(hotimeName, "*", Map{"AND": Map{"OR": Map{"name": name, "phone": name}, "password": Md5(password)}})
+			user := that.Db.Get(fileConfig.GetString("table"), "*", Map{"AND": Map{"OR": Map{"name": name, "phone": name}, "password": Md5(password)}})
+
 			if user == nil {
-				this.Display(5, "登录失败")
+				that.Display(5, "登录失败")
 				return
 			}
-			this.Session(hotimeName+"_id", user.GetCeilInt("id"))
-			this.Session(hotimeName+"_name", name)
-			this.Display(0, this.SessionId)
+			that.Session(fileConfig.GetString("table")+"_id", user.GetCeilInt("id"))
+			that.Session(fileConfig.GetString("table")+"_name", name)
+			delete(user, "password")
+			that.Display(0, user)
 		},
-		"logout": func(this *Context) {
-			hotimeName := this.RouterString[0]
-			this.Session(hotimeName+"_id", nil)
-			this.Session(hotimeName+"_name", nil)
-			this.Display(0, "退出登录成功")
+		"logout": func(that *Context) {
+			hotimeName := that.RouterString[0]
+			fileConfig := that.MakeCodeRouter[hotimeName].FileConfig
+			that.Session(fileConfig.GetString("table")+"_id", nil)
+			that.Session(fileConfig.GetString("table")+"_name", nil)
+			that.Display(0, "退出登录成功")
 		},
 		"info": func(that *Context) {
 			hotimeName := that.RouterString[0]
-			data := that.Db.Get(hotimeName, "*", Map{"id": that.Session(hotimeName + "_id").ToCeilInt()})
-			str, inData := that.MakeCode.Info(hotimeName, data, that.Db)
-			where := Map{"id": that.Session(hotimeName + "_id").ToCeilInt()}
+			fileConfig := that.MakeCodeRouter[hotimeName].FileConfig
+
+			data := that.Db.Get(fileConfig.GetString("table"), "*", Map{"id": that.Session(fileConfig.GetString("table") + "_id").ToCeilInt()})
+			str, inData := that.MakeCodeRouter[hotimeName].Info(fileConfig.GetString("table"), data, that.Db)
+			where := Map{"id": that.Session(fileConfig.GetString("table") + "_id").ToCeilInt()}
 			if len(inData) == 1 {
 				inData["id"] = where["id"]
 				where = Map{"AND": inData}
@@ -197,18 +271,27 @@ var TptProject = Proj{
 				where["OR"] = inData
 				where = Map{"AND": where}
 			}
-			re := that.Db.Get(hotimeName, str, where)
+			re := that.Db.Get(fileConfig.GetString("table"), str, where)
 			if re == nil {
 				that.Display(4, "找不到对应信息")
 				return
 			}
 			for k, v := range re {
-				column := that.MakeCode.TableColumns[hotimeName][k]
+				column := that.MakeCodeRouter[hotimeName].TableColumns[fileConfig.GetString("table")][k]
 				if column == nil {
 					continue
 				}
 				if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
-					re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
+
+					//是角色表则取下角色值
+					if column.GetString("link") == "role" {
+
+						re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,auth,"+column.GetString("value"), Map{"id": v})
+
+					} else {
+
+						re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
+					}
 				}
 			}
 

code/config.go

@@ -1,7 +1,7 @@
 package code
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 )
 
 var Config = Map{
@@ -14,7 +14,13 @@ var Config = Map{
 		//{"label": "测试表格", "table": "table", "icon": "el-icon-suitcase"},
 		//{"label": "系统管理", "name": "setting", "icon": "el-icon-setting",
 		//	"menus": []Map{
-		//		{"label": "用户管理", "table": "user"},
+		//		{"label": "用户管理", "table": "user",
+		//			"default": {
+		//				"path": "info",
+		//				"id": "1"
+		//			},
+		//			"auth": ["show","edit","info","add","delete"],
+		//		},
 		//		{"label": "组织管理", "table": "organization"},
 		//		{"label": "地区管理", "table": "area"},
 		//		{"label": "角色管理", "table": "role"},
@@ -58,6 +64,9 @@ var ColumnNameType = []ColumnShow{
 	{"idcard", false, true, true, false, "", false},
 	{"id", true, false, true, false, "", true},
 	{"parent_id", true, true, true, false, "", true},
+	{"amount", true, true, true, false, "money", true},
+	{"content", false, false, false, false, "textArea", false},
+	{"info", false, true, true, false, "textArea", false},
 	//"sn"{true,true,true,""},
 	{"status", true, true, true, false, "select", false},
 	{"state", true, true, true, false, "select", false},
@@ -72,7 +81,7 @@ var ColumnNameType = []ColumnShow{
 	{"index", false, false, false, false, "index", false},
 	{"password", false, true, false, false, "password", false},
 	{"pwd", false, true, false, false, "password", false},
-	{"info", false, true, true, false, "", false},
+
 	{"version", false, false, false, false, "", false},
 	{"seq", false, true, true, false, "", false},
 	{"sort", false, true, true, false, "", false},
@@ -80,7 +89,7 @@ var ColumnNameType = []ColumnShow{
 	{"description", false, true, true, false, "", false},
 	{"abstract", false, true, true, false, "", false},
 	{"content", false, true, true, false, "", false},
-	{"address", false, true, true, false, "", false},
+	{"address", true, true, true, false, "", false},
 	{"full_name", false, true, true, false, "", false},
 	{"create_time", false, false, true, false, "time", true},
 	{"modify_time", true, false, true, false, "time", true},
@@ -91,7 +100,9 @@ var ColumnNameType = []ColumnShow{
 	{"file", false, true, true, false, "file", false},
 	{"age", false, true, true, false, "", false},
 	{"email", false, true, true, false, "", false},
-	{"time", true, true, true, true, "time", false},
+	{"time", true, true, true, false, "time", false},
 	{"level", false, false, true, false, "", false},
 	{"rule", true, true, true, false, "form", false},
+	{"table", true, false, true, false, "table", false},
+	{"table_id", true, false, true, false, "table_id", false},
 }

code/makecode.go

@@ -1,31 +1,34 @@
 package code
 
 import (
-	. "../common"
-	"../db"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/db"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"time"
 )
 
 type MakeCode struct {
+	FileConfig    Map
 	IndexMenus    Map
 	TableConfig   Map
 	TableColumns  map[string]map[string]Map
 	SearchColumns map[string]map[string]Map
 	Config        Map
+	RuleConfig    []Map
 	Error
 }
 
-func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCode bool) {
+func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 	isMake := false
 	idSlice := Slice{}
-
+	that.FileConfig = config
 	if that.TableColumns == nil {
 		that.TableColumns = make(map[string]map[string]Map)
 	}
@@ -34,20 +37,48 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 	}
 
 	//加载配置文件
-	btes, err := ioutil.ReadFile(path)
-	Config["name"] = name
+	btes, err := ioutil.ReadFile(config.GetString("config"))
+
 	that.Config = DeepCopyMap(Config).(Map)
+
+	that.Config["name"] = config.GetString("table")
 	if err == nil {
 		cmap := Map{}
 		//文件是否损坏
 		cmap.JsonToMap(string(btes), &that.Error)
 		for k, v := range cmap {
 			that.Config[k] = v //程序配置
-			Config[k] = v      //系统配置
+			//Config[k] = v      //系统配置
 		}
 	} else {
-		that.Error.SetError(errors.New("配置文件不存在，或者配置出错，使用缺省默认配置"))
+		that.Error.SetError(errors.New("config配置文件不存在，或者配置出错，使用缺省默认配置"))
 	}
+	//加载规则文件
+	btesRule, errRule := ioutil.ReadFile(config.GetString("rule"))
+	that.RuleConfig = []Map{}
+	if errRule == nil {
+		//cmap := Map{}
+		//文件是否损坏
+		ruleLis := ObjToSlice(string(btesRule), &that.Error)
+		//cmap.JSON()
+		for k, _ := range ruleLis {
+			that.RuleConfig = append(that.RuleConfig, ruleLis.GetMap(k))
+		}
+	} else {
+		for _, v := range ColumnNameType {
+			that.RuleConfig = append(that.RuleConfig, Map{"name": v.Name, "list": v.List, "edit": v.Edit, "info": v.Info, "must": v.Must, "strict": v.Strict, "type": v.Type})
+		}
+		if db != nil {
+			_ = os.MkdirAll(filepath.Dir(config.GetString("rule")), os.ModeDir)
+			err = ioutil.WriteFile(config.GetString("rule"), []byte(ObjToStr(that.RuleConfig)), os.ModePerm)
+			if err != nil {
+				that.Error.SetError(err)
+			}
+		}
+
+		that.Error.SetError(errors.New("rule配置文件不存在，或者配置出错，使用缺省默认配置"))
+	}
+
 	that.IndexMenus = Map{}
 	menusConfig := that.Config.GetSlice("menus")
 	//将配置写入到内存中仅作为判断用
@@ -119,7 +150,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 	}
 
 	//数据库反哺
-	myInit := strings.Replace(InitTpt, "{{name}}", name, -1)
+	myInit := strings.Replace(InitTpt, "{{name}}", config.GetString("table"), -1)
 	ctrList := ""
 
 	nowTables := make([]Map, 0)
@@ -141,7 +172,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 			that.TableConfig[v.GetString("name")] = Map{
 				"label":   v.GetString("label"),
 				"table":   v.GetString("name"),
-				"auth":    []string{"add", "delete", "edit", "info"},
+				"auth":    []string{"show", "add", "delete", "edit", "info"},
 				"columns": []Map{},
 				"search": []Map{
 
@@ -171,8 +202,8 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 		}
 
 		idSlice = append(idSlice, tableInfo)
-		for _, info := range tableInfo {
-
+		for _, info1 := range tableInfo {
+			info := DeepCopyMap(info1).(Map)
 			if info.GetString("label") == "" {
 				info["label"] = info.GetString("name")
 			}
@@ -193,44 +224,54 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 					//"add":   false, "info": false, "edit": false, "list": true,
 					//"must": false,
 				}
+
 				//备注以空格隔开，空格后的是其他备注
-				indexNum := strings.Index(info.GetString("label"), ":")
-				if indexNum > 0 {
+				indexNum := strings.Index(info.GetString("label"), " ")
+				if indexNum > -1 {
 					coloum["label"] = info.GetString("label")[:indexNum]
 				}
+				//去除数据信息，是用：号分割的
+				indexNum = strings.Index(coloum.GetString("label"), ":")
+				if indexNum > -1 {
+					coloum["label"] = coloum.GetString("label")[:indexNum]
+				}
 
-				for _, ColumnName := range ColumnNameType {
-					if (ColumnName.Strict && coloum.GetString("name") == ColumnName.Name) ||
-						(!ColumnName.Strict && strings.Contains(coloum.GetString("name"), ColumnName.Name)) {
+				for _, ColumnName := range that.RuleConfig {
+					if (ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name")) ||
+						(!ColumnName.GetBool("strict") && strings.Contains(coloum.GetString("name"), ColumnName.GetString("name"))) {
 						//全部都不需要则不加入
-						if ColumnName.Edit == false && ColumnName.List == false && ColumnName.Info == false {
+						if ColumnName.GetBool("edit") == false && ColumnName.GetBool("list") == false && ColumnName.GetBool("info") == false {
 							coloum["notUse"] = true
 							//continue
 						}
-						coloum["info"] = ColumnName.Info
-						coloum["edit"] = ColumnName.Edit
-						coloum["add"] = ColumnName.Edit
-						coloum["list"] = ColumnName.List
-						coloum["must"] = ColumnName.Must
+						coloum["info"] = ColumnName.GetBool("info")
+						coloum["edit"] = ColumnName.GetBool("edit")
+						coloum["add"] = ColumnName.GetBool("edit")
+						coloum["list"] = ColumnName.GetBool("list")
+						coloum["must"] = ColumnName.GetBool("must")
 
-						if ColumnName.Info {
+						if ColumnName.GetBool("info") {
 							delete(coloum, "info")
 						}
-						if ColumnName.Edit {
+						if ColumnName.GetBool("edit") {
 							delete(coloum, "edit")
 							delete(coloum, "add")
 						}
-						if ColumnName.List {
+						if ColumnName.GetBool("list") {
 							delete(coloum, "list")
 						}
-						if ColumnName.Must {
+						if !ColumnName.GetBool("must") {
 							delete(coloum, "must")
 						}
 
-						if ColumnName.Type != "" {
-							coloum["type"] = ColumnName.Type
+						if ColumnName.GetString("type") != "" {
+							if ColumnName.GetString("type") == "time" && coloum["type"] == "number" {
+								coloum["type"] = "unixTime"
+							} else {
+								coloum["type"] = ColumnName.GetString("type")
+							}
 						}
-						if ColumnName.Strict && coloum.GetString("name") == ColumnName.Name {
+						if ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name") {
 							break
 						}
 
@@ -261,10 +302,10 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 				}
 
 				if coloum.GetString("type") == "select" {
-					coloum["must"] = true
+					//coloum["must"] = true
 					coloum["options"] = options
 				} else if len(options) > 0 {
-					coloum["must"] = true
+					//coloum["must"] = true
 					coloum["options"] = options
 					coloum["type"] = "select"
 
@@ -285,16 +326,16 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 
 		}
 
-		if makeCode {
+		if config.GetInt("mode") != 0 {
 			//创建模块文件
 			//判断文件是否存在
 			//_, err := os.OpenFile(name+"/"+v.GetString("name"), os.O_RDONLY, os.ModePerm)
-			_, err := os.Stat(name + "/" + v.GetString("name") + ".go")
+			_, err := os.Stat(config.GetString("name") + "/" + v.GetString("name") + ".go")
 			if err != nil { //文件不存在，则根据模板创建
-				myCtr := strings.Replace(CtrTpt, "{{name}}", name, -1)
+				myCtr := strings.Replace(CtrTpt, "{{name}}", config.GetString("name"), -1)
 				myCtr = strings.Replace(myCtr, "{{table}}", v.GetString("name"), -1)
-				_ = os.MkdirAll(name, os.ModeDir)
-				err = ioutil.WriteFile(name+"/"+v.GetString("name")+".go", []byte(myCtr), os.ModePerm)
+				_ = os.MkdirAll(config.GetString("name"), os.ModeDir)
+				err = ioutil.WriteFile(config.GetString("name")+"/"+v.GetString("name")+".go", []byte(myCtr), os.ModePerm)
 				if err != nil {
 					that.Error.SetError(err)
 				}
@@ -311,7 +352,6 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 
 	//生成id，判断数据库是否有改变，以保证数据库和配置文件匹配唯一
 	id := Md5(ObjToStr(idSlice))
-
 	if id == that.Config.GetString("id") {
 		if isMake { //有生成包文件
 			fmt.Println("有新的业务代码生成，请重新运行")
@@ -326,7 +366,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 		isMenusGet := false //判断是否被目录收录
 		for indexKey, _ := range that.IndexMenus {
 			indexCode := strings.Index(indexKey, fk)
-			if indexCode == 0 {
+			if indexCode == 0 || indexCode == 4 {
 				isMenusGet = false
 				continue
 			}
@@ -352,7 +392,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 			//if tablePrefixCode != -1 {
 			for ck, _ := range that.TableColumns {
 				//判断不止一个前缀相同
-				if strings.Index(ck, prefixName) == 0 && ck != fk {
+				if (strings.Index(ck, prefixName) == 0 || strings.Index(prefixName, ck) == 4) && ck != fk {
 					isNewPrefix = true
 					break
 				}
@@ -372,8 +412,15 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 			}
 			//没有新前缀
 			if that.IndexMenus[prefixName] != nil {
-				that.IndexMenus.GetMap(prefixName)["menus"] = append(that.IndexMenus.GetMap(prefixName).GetSlice("menus"), menuIns)
-				that.IndexMenus[prefixName+"/"+fk] = menuIns
+				if that.IndexMenus[prefixName+"/"+fk] == nil {
+					that.IndexMenus.GetMap(prefixName)["menus"] = append(that.IndexMenus.GetMap(prefixName).GetSlice("menus"), menuIns)
+					that.IndexMenus[prefixName+"/"+fk] = menuIns
+				} else {
+					for k, v := range menuIns {
+						that.IndexMenus.GetMap(prefixName + "/" + fk)[k] = v
+					}
+				}
+
 			} else {
 
 				that.Config["menus"] = append(that.Config.GetSlice("menus"), mMenu) //注入配置
@@ -465,8 +512,17 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 					v["value"] = "label"
 					continue
 				}
+				tempC := that.TableConfig.GetMap(tableName).GetSlice("columns")
+				isGet := true
+				for k2, _ := range tempC {
+					if strings.Contains(tempC.GetMap(k2).GetString("name"), "name") || strings.Contains(tempC.GetMap(k2).GetString("name"), "title") {
+						v["value"] = tempC.GetMap(k2).GetString("name")
+						isGet = false
+						break
+					}
+				}
 
-				if len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
+				if isGet && len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
 					v["value"] = that.TableConfig.GetMap(tableName).GetSlice("columns").GetMap(1).GetString("name")
 					continue
 				}
@@ -494,25 +550,25 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 	fmt.Println(id, "---", that.Config.GetString("id"))
 	that.Config["id"] = id
 
-	if makeCode {
+	if config.GetInt("mode") != 0 {
 		//init文件初始化
 		myInit = strings.Replace(myInit, "{{id}}", id, -1)
 		myInit = strings.Replace(myInit, "{{tablesCtr}}", ctrList, -1)
-		_ = os.MkdirAll(name, os.ModeDir)
-		err = ioutil.WriteFile(name+"/init.go", []byte(myInit), os.ModePerm)
+		_ = os.MkdirAll(config.GetString("name"), os.ModeDir)
+		err = ioutil.WriteFile(config.GetString("name")+"/init.go", []byte(myInit), os.ModePerm)
 		if err != nil {
 			that.Error.SetError(err)
 		}
 	}
-	//写入配置文件
-	//var configByte bytes.Buffer
 
+	//写入配置文件
 	//err = json.Indent(&configByte, []byte(that.Config.ToJsonString()), "", "\t")
-	_ = os.MkdirAll(filepath.Dir(path), os.ModeDir)
-	err = ioutil.WriteFile(path, []byte(that.Config.ToJsonString()), os.ModePerm)
+	_ = os.MkdirAll(filepath.Dir(config.GetString("config")), os.ModeDir)
+	err = ioutil.WriteFile(config.GetString("config"), []byte(that.Config.ToJsonString()), os.ModePerm)
 	if err != nil {
 		that.Error.SetError(err)
 	}
+
 	fmt.Println("有新的代码生成，请重新运行")
 	os.Exit(-1)
 
@@ -522,7 +578,16 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 	reStr := ""
 	data := Map{}
 	var ruleData Map
-	for _, v := range that.TableColumns[table] {
+	testQu := []string{}
+	testQuData := that.TableColumns[table]
+	for key, _ := range testQuData {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+
+	for _, k := range testQu {
+		v := testQuData[k]
 		if v == nil {
 			continue
 		}
@@ -533,7 +598,7 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 			//初始化ruleData
 			if ruleData == nil {
 				ruleData = Map{}
-				for _, v := range that.TableColumns["admin"] {
+				for _, v := range that.TableColumns[that.FileConfig.GetString("table")] {
 					if v.GetString("link") != "" &&
 						v.GetString("name") != "parent_id" &&
 						userData.Get(v.GetString("name")) != nil {
@@ -567,7 +632,7 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 	}
 	return reStr, data
 }
-func (that *MakeCode) Add(table string, req *http.Request) Map {
+func (that *MakeCode) Add(table string, user Map, req *http.Request) Map {
 	data := Map{}
 	for _, v := range that.TableColumns[table] {
 		//不可使用，未在前端展示，但在内存中保持有
@@ -581,6 +646,17 @@ func (that *MakeCode) Add(table string, req *http.Request) Map {
 		if v.Get("add") == nil || v.GetBool("add") {
 
 			if len(req.Form[v.GetString("name")]) == 0 {
+
+				if user[v.GetString("name")] != nil {
+					data[v.GetString("name")] = user[v.GetString("name")]
+					continue
+				}
+
+				if that.FileConfig.GetString("table")+"_id" == v.GetString("name") {
+					data[v.GetString("name")] = user["id"]
+					continue
+				}
+
 				if v.GetBool("must") {
 					return nil
 				} else {
@@ -602,12 +678,22 @@ func (that *MakeCode) Add(table string, req *http.Request) Map {
 		}
 
 		if v.GetString("name") == "create_time" {
-			data[v.GetString("name")] = time.Now().Unix()
+			if v.GetString("type") == "unixTime" {
+				data[v.GetString("name")] = time.Now().Unix()
+			}
+			if v.GetString("type") == "time" {
+				data[v.GetString("name")] = time.Now().Format("2006-01-02 15-04-05")
+			}
 			continue
 		}
 
 		if v.GetString("name") == "modify_time" {
-			data[v.GetString("name")] = time.Now().Unix()
+			if v.GetString("type") == "unixTime" {
+				data[v.GetString("name")] = time.Now().Unix()
+			}
+			if v.GetString("type") == "time" {
+				data[v.GetString("name")] = time.Now().Format("2006-01-02 15-04-05")
+			}
 		}
 	}
 	if len(data) == 0 {
@@ -670,12 +756,22 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 	data := Map{}
 	keyword := Map{}
 	daterange := Map{}
-	sort := Map{}
+	sortMap := Map{}
 	var ruleData Map
 	hasUser := false
 
 	keywordStr := req.FormValue("keyword")
-	for _, v := range that.TableColumns[table] {
+
+	testQu := []string{}
+	testQuData := that.TableColumns[table]
+	for key, _ := range testQuData {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+
+	for _, k := range testQu {
+		v := testQuData[k]
 		//不可使用，未在前端展示，但在内存中保持有
 		if v.GetBool("notUse") {
 
@@ -690,6 +786,16 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 					v.GetString("link") + "." + v.GetString("value") + " AS " +
 					v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
 
+				if v.GetString("value") == "name" && that.TableColumns[v.GetString("link")]["nickname"] != nil {
+					reStr += v.GetString("link") + ".nickname AS " +
+						v.GetString("link") + "_" + v.GetString("name") + "_nickname,"
+				}
+
+				if that.TableColumns[v.GetString("link")]["phone"] != nil {
+					reStr += v.GetString("link") + ".phone AS " +
+						v.GetString("link") + "_" + v.GetString("name") + "_phone,"
+				}
+
 				leftJoin["[>]"+v.GetString("link")] =
 					table + "." + v.GetString("name") + "=" +
 						v.GetString("link") + ".id"
@@ -713,7 +819,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 				//初始化ruleData
 				if ruleData == nil {
 					ruleData = Map{}
-					for _, v := range that.TableColumns["admin"] {
+					for _, v := range that.TableColumns[that.FileConfig.GetString("table")] {
 						if v.GetString("link") != "" &&
 							v.GetString("name") != "parent_id" &&
 							userData.Get(v.GetString("name")) != nil {
@@ -784,14 +890,36 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 					continue
 				}
 				//日期类型
-				if searchItemName == "daterange" && v.GetString("type") == "time" {
-					//fmt.Println(req.Form["daterange"])
-					daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+				if searchItemName == "daterange" {
+					if v.GetString("type") == "unixtime" {
+						//fmt.Println(req.Form["daterange"])
+						if len(req.Form["daterange"]) == 1 {
+							daterange[table+"."+v.GetString("name")+"[<]"] = req.FormValue("daterange")
+						} else if len(req.Form["daterange"]) == 2 {
+
+							daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+						}
+					}
+					if v.GetString("type") == "time" {
+						//fmt.Println(req.Form["daterange"])
+
+						if len(req.Form["daterange"]) == 1 {
+							t := time.Unix(ObjToCeilInt64(req.FormValue("daterange")), 0).Format("2006-01-02 15:04:05")
+
+							daterange[table+"."+v.GetString("name")+"[<]"] = t
+
+						} else if len(req.Form["daterange"]) == 2 {
+							t1 := time.Unix(ObjToCeilInt64(req.Form["daterange"][0]), 0).Format("2006-01-02 15:04:05")
+							t2 := time.Unix(ObjToCeilInt64(req.Form["daterange"][1]), 0).Format("2006-01-02 15:04:05")
+							daterange[table+"."+v.GetString("name")+"[<>]"] = Slice{t1, t2}
+						}
+					}
+
 				}
 			}
 
 			if searchItem.GetString("name") == "sort" {
-				sort["ORDER"] = table + "." + reqValue
+				sortMap["ORDER"] = table + "." + reqValue
 			}
 
 			continue
@@ -811,8 +939,8 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 		data[table+"."+searchItemName] = reqValue
 
 	}
-	if sort["ORDER"] == nil {
-		sort["ORDER"] = table + ".id DESC"
+	if sortMap["ORDER"] == nil {
+		sortMap["ORDER"] = table + ".id DESC"
 	}
 
 	where := Map{}
@@ -838,7 +966,9 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 	}
 
 	if len(daterange) > 1 {
-		if data["AND"] != nil {
+		if data == nil || len(data) == 0 {
+			data = Map{"OR": daterange}
+		} else {
 			data = Map{"AND": Map{"AND": data, "OR": daterange}}
 		}
 	}
@@ -857,8 +987,8 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 
 	}
 
-	if len(sort) != 0 {
-		for k, v := range sort {
+	if len(sortMap) != 0 {
+		for k, v := range sortMap {
 			where[k] = v
 		}
 	}

code/template.go

@@ -3,8 +3,8 @@ package code
 var InitTpt = `package {{name}}
 
 import (
-	. "../../../hotime"
-	. "../../../hotime/common"
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
 )
 
 var ID = "{{id}}"
@@ -14,30 +14,32 @@ var Project = Proj{
 	//"user": UserCtr,
 	{{tablesCtr}}
     "hotime":Ctr{
-		"login": func(this *Context) {
-			name := this.Req.FormValue("name")
-			password := this.Req.FormValue("password")
+		"login": func(that *Context) {
+
+			name := that.Req.FormValue("name")
+			password := that.Req.FormValue("password")
 			if name == "" || password == "" {
-				this.Display(3, "参数不足")
+				that.Display(3, "参数不足")
 				return
 			}
-			user := this.Db.Get("admin", "*", Map{"AND": Map{"OR":Map{"name": name,"phone":name}, "password": Md5(password)}})
+			user := that.Db.Get("admin", "*", Map{"AND": Map{"OR":Map{"name": name,"phone":name}, "password": Md5(password)}})
 			if user == nil {
-				this.Display(5, "登录失败")
+				that.Display(5, "登录失败")
 				return
 			}
-			this.Session("admin_id", user.GetCeilInt("id"))
-			this.Session("admin_name", name)
-			this.Display(0, this.SessionId)
+			that.Session("admin_id", user.GetCeilInt("id"))
+			that.Session("admin_name", name)
+			that.Display(0, that.SessionId)
 		},
-		"logout": func(this *Context) {
-			this.Session("admin_id", nil)
-			this.Session("admin_name", nil)
-			this.Display(0, "退出登录成功")
+		"logout": func(that *Context) {
+			that.Session("admin_id", nil)
+			that.Session("admin_name", nil)
+			that.Display(0, "退出登录成功")
 		},
 		"info": func(that *Context) {
+			hotimeName := that.RouterString[0]
 			data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
-			str, inData := that.MakeCode.Info("admin", data, that.Db)
+			str, inData := that.MakeCodeRouter[hotimeName].Info("admin", data, that.Db)
 			where := Map{"id": that.Session("admin_id").ToCeilInt()}
 			if len(inData) ==1 {
 				inData["id"] =where["id"]
@@ -52,7 +54,7 @@ var Project = Proj{
 				return
 			}
 			for k, v := range re {
-				column := that.MakeCode.TableColumns["admin"][k]
+				column := that.MakeCodeRouter[hotimeName].TableColumns["admin"][k]
 				if column == nil {
 					continue
 				}
@@ -69,15 +71,16 @@ var Project = Proj{
 var CtrTpt = `package {{name}}
 
 import (
-	. "../../../hotime"
-	. "../../../hotime/common"
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
 	"strings"
 )
 
 var {{table}}Ctr = Ctr{
 	"info": func(that *Context) {
+			hotimeName := that.RouterString[0]
 		data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
-		str, inData := that.MakeCode.Info(that.RouterString[1], data, that.Db)
+		str, inData := that.MakeCodeRouter[hotimeName].Info(that.RouterString[1], data, that.Db)
 		where := Map{"id": that.RouterString[2]}
 
 		if len(inData) ==1 {
@@ -96,7 +99,7 @@ var {{table}}Ctr = Ctr{
 		}
 
 		for k, v := range re {
-			column := that.MakeCode.TableColumns[that.RouterString[1]][k]
+			column := that.MakeCodeRouter[hotimeName].TableColumns[that.RouterString[1]][k]
 			if column == nil {
 				continue
 			}
@@ -108,7 +111,8 @@ var {{table}}Ctr = Ctr{
 		that.Display(0, re)
 	},
 	"add": func(that *Context) {
-		inData := that.MakeCode.Add(that.RouterString[1], that.Req)
+		hotimeName := that.RouterString[0]
+		inData := that.MakeCodeRouter[hotimeName].Add(that.RouterString[1], that.Req)
 		if inData == nil {
 			that.Display(3, "请求参数不足")
 			return
@@ -134,7 +138,8 @@ var {{table}}Ctr = Ctr{
 		that.Display(0, re)
 	},
 	"update": func(that *Context) {
-		inData := that.MakeCode.Edit(that.RouterString[1], that.Req)
+		hotimeName := that.RouterString[0]
+		inData := that.MakeCodeRouter[hotimeName].Edit(that.RouterString[1], that.Req)
 		if inData == nil {
 			that.Display(3, "没有找到要更新的数据")
 			return
@@ -165,7 +170,8 @@ var {{table}}Ctr = Ctr{
 		that.Display(0, re)
 	},
 	"remove": func(that *Context) {
-		inData := that.MakeCode.Delete(that.RouterString[1], that.Req)
+		hotimeName := that.RouterString[0]
+		inData := that.MakeCodeRouter[hotimeName].Delete(that.RouterString[1], that.Req)
 		if inData == nil {
 			that.Display(3, "请求参数不足")
 			return
@@ -186,10 +192,10 @@ var {{table}}Ctr = Ctr{
 	},
 
 	"search": func(that *Context) {
-
+		hotimeName := that.RouterString[0]
 		data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
 
-		columnStr, leftJoin, where := that.MakeCode.Search(that.RouterString[1], data, that.Req, that.Db)
+		columnStr, leftJoin, where := that.MakeCodeRouter[hotimeName].Search(that.RouterString[1], data, that.Req, that.Db)
 
 		page := ObjToInt(that.Req.FormValue("page"))
 		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
@@ -208,7 +214,7 @@ var {{table}}Ctr = Ctr{
 
 		for _, v := range reData {
 			for k, _ := range v {
-				column := that.MakeCode.TableColumns[that.RouterString[1]][k]
+				column := that.MakeCodeRouter[hotimeName].TableColumns[that.RouterString[1]][k]
 				if column == nil {
 					continue
 				}

common/context_base.go

@@ -9,10 +9,10 @@ type ContextBase struct {
 }
 
 //唯一标志
-func (this *ContextBase) GetTag() string {
+func (that *ContextBase) GetTag() string {
 
-	if this.tag == "" {
-		this.tag = ObjToStr(time.Now().Unix()) + ":" + ObjToStr(Random())
+	if that.tag == "" {
+		that.tag = ObjToStr(time.Now().Unix()) + ":" + ObjToStr(Random())
 	}
-	return this.tag
+	return that.tag
 }

common/func.go

@@ -36,7 +36,7 @@ func StrFirstToUpper(str string) string {
 	return strings.ToUpper(first) + other
 }
 
-//相似度计算 ld compares two strings and returns the levenshtein distance between them.
+// StrLd 相似度计算 ld compares two strings and returns the levenshtein distance between them.
 func StrLd(s, t string, ignoreCase bool) int {
 	if ignoreCase {
 		s = strings.ToLower(s)
@@ -142,7 +142,7 @@ func Md5(req string) string {
 	return hex.EncodeToString(cipherStr)
 }
 
-//随机数
+// Rand 随机数
 func Rand(count int) int {
 	res := Random()
 	for i := 0; i < count; i++ {
@@ -167,7 +167,7 @@ func Random() float64 {
 
 }
 
-//随机数范围
+// RandX 随机数范围
 func RandX(small int, max int) int {
 	res := 0
 	//随机对象
@@ -219,7 +219,7 @@ func RandX(small int, max int) int {
 //	GetDb()
 //}
 
-//复制返回数组
+// DeepCopyMap 复制返回数组
 func DeepCopyMap(value interface{}) interface{} {
 	if valueMap, ok := value.(Map); ok {
 		newMap := make(Map)
@@ -278,7 +278,7 @@ func DeepCopyMap(value interface{}) interface{} {
 //	}
 //}
 
-//浮点数四舍五入保留小数
+// Round 浮点数四舍五入保留小数
 func Round(f float64, n int) float64 {
 	pow10_n := math.Pow10(n)
 	return math.Trunc((f+0.5/pow10_n)*pow10_n) / pow10_n

common/map.go

@@ -4,114 +4,140 @@ import (
 	"encoding/json"
 	"errors"
 	"reflect"
+	"sort"
+	"time"
 )
 
 //hotime的常用map
 type Map map[string]interface{}
 
 //获取string
-func (this Map) GetString(key string, err ...*Error) string {
+func (that Map) GetString(key string, err ...*Error) string {
 
 	if len(err) != 0 {
 		err[0].SetError(nil)
 	}
-	return ObjToStr((this)[key])
+	return ObjToStr((that)[key])
 
 }
 
-func (this *Map) Pointer() *Map {
+func (that *Map) Pointer() *Map {
 
-	return this
+	return that
 }
 
 //增加接口
-func (this Map) Put(key string, value interface{}) {
-	//if this==nil{
-	//	this=Map{}
+func (that Map) Put(key string, value interface{}) {
+	//if that==nil{
+	//	that=Map{}
 	//}
-	this[key] = value
+	that[key] = value
 }
 
 //删除接口
-func (this Map) Delete(key string) {
-	delete(this, key)
+func (that Map) Delete(key string) {
+	delete(that, key)
 
 }
 
 //获取Int
-func (this Map) GetInt(key string, err ...*Error) int {
-	v := ObjToInt((this)[key], err...)
+func (that Map) GetInt(key string, err ...*Error) int {
+	v := ObjToInt((that)[key], err...)
 
 	return v
 
 }
 
 //获取Int
-func (this Map) GetInt64(key string, err ...*Error) int64 {
-	v := ObjToInt64((this)[key], err...)
+func (that Map) GetInt64(key string, err ...*Error) int64 {
+	v := ObjToInt64((that)[key], err...)
 	return v
 
 }
 
 //获取向上取整Int64
-func (this Map) GetCeilInt64(key string, err ...*Error) int64 {
-	v := ObjToCeilInt64((this)[key], err...)
+func (that Map) GetCeilInt64(key string, err ...*Error) int64 {
+	v := ObjToCeilInt64((that)[key], err...)
 	return v
 
 }
 
 //获取向上取整Int
-func (this Map) GetCeilInt(key string, err ...*Error) int {
-	v := ObjToCeilInt((this)[key], err...)
+func (that Map) GetCeilInt(key string, err ...*Error) int {
+	v := ObjToCeilInt((that)[key], err...)
 	return v
 
 }
 
 //获取向上取整float64
-func (this Map) GetCeilFloat64(key string, err ...*Error) float64 {
-	v := ObjToCeilFloat64((this)[key], err...)
+func (that Map) GetCeilFloat64(key string, err ...*Error) float64 {
+	v := ObjToCeilFloat64((that)[key], err...)
 	return v
 
 }
 
 //获取Float64
-func (this Map) GetFloat64(key string, err ...*Error) float64 {
+func (that Map) GetFloat64(key string, err ...*Error) float64 {
 
-	v := ObjToFloat64((this)[key], err...)
+	v := ObjToFloat64((that)[key], err...)
 
 	return v
 
 }
 
-func (this Map) GetSlice(key string, err ...*Error) Slice {
+func (that Map) GetSlice(key string, err ...*Error) Slice {
 
 	//var v Slice
-	v := ObjToSlice((this)[key], err...)
+	v := ObjToSlice((that)[key], err...)
 
 	return v
 
 }
-func (this Map) GetBool(key string, err ...*Error) bool {
+func (that Map) GetBool(key string, err ...*Error) bool {
 
 	//var v Slice
-	v := ObjToBool((this)[key], err...)
+	v := ObjToBool((that)[key], err...)
 
 	return v
 
 }
 
-func (this Map) GetMap(key string, err ...*Error) Map {
+func (that Map) GetTime(key string, err ...*Error) time.Time {
+
+	v := ObjToTime((that)[key], err...)
+	return v
+
+}
+
+func (that Map) RangeSort(callback func(k string, v interface{}) (isEnd bool)) {
+	testQu := []string{}
+	//testQuData:= qu[0].(Map)
+	for key, _ := range that {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+	for _, k := range testQu {
+		re := callback(k, that[k])
+		if re {
+			return
+		}
+	}
+
+}
+
+func (that Map) GetMap(key string, err ...*Error) Map {
 	//var data Slice
 
-	v := ObjToMap((this)[key], err...)
+	v := ObjToMap((that)[key], err...)
 
 	return v
 
 }
 
-func (this Map) Get(key string, err ...*Error) interface{} {
+func (that Map) Get(key string, err ...*Error) interface{} {
 
-	if v, ok := (this)[key]; ok {
+	if v, ok := (that)[key]; ok {
 		return v
 	}
 	e := errors.New("没有存储key及对应的数据")
@@ -124,10 +150,10 @@ func (this Map) Get(key string, err ...*Error) interface{} {
 }
 
 //请传递指针过来
-func (this Map) ToStruct(stct interface{}) {
+func (that Map) ToStruct(stct interface{}) {
 
 	data := reflect.ValueOf(stct).Elem()
-	for k, v := range this {
+	for k, v := range that {
 		ks := StrFirstToUpper(k)
 		dkey := data.FieldByName(ks)
 		if !dkey.IsValid() {
@@ -135,13 +161,13 @@ func (this Map) ToStruct(stct interface{}) {
 		}
 		switch dkey.Type().String() {
 		case "int":
-			dkey.SetInt(this.GetInt64(k))
+			dkey.SetInt(that.GetInt64(k))
 		case "int64":
-			dkey.Set(reflect.ValueOf(this.GetInt64(k)))
+			dkey.Set(reflect.ValueOf(that.GetInt64(k)))
 		case "float64":
-			dkey.Set(reflect.ValueOf(this.GetFloat64(k)))
+			dkey.Set(reflect.ValueOf(that.GetFloat64(k)))
 		case "string":
-			dkey.Set(reflect.ValueOf(this.GetString(k)))
+			dkey.Set(reflect.ValueOf(that.GetString(k)))
 		case "interface{}":
 			dkey.Set(reflect.ValueOf(v))
 		}
@@ -149,13 +175,13 @@ func (this Map) ToStruct(stct interface{}) {
 
 }
 
-func (this Map) ToJsonString() string {
-	return ObjToStr(this)
+func (that Map) ToJsonString() string {
+	return ObjToStr(that)
 
 }
 
-func (this Map) JsonToMap(jsonStr string, err ...*Error) {
-	e := json.Unmarshal([]byte(jsonStr), &this)
+func (that Map) JsonToMap(jsonStr string, err ...*Error) {
+	e := json.Unmarshal([]byte(jsonStr), &that)
 	if e != nil && len(err) != 0 {
 		err[0].SetError(e)
 	}

common/obj.go

@@ -1,5 +1,7 @@
 package common
 
+import "time"
+
 //对象封装方便取用
 type Obj struct {
 	Data interface{}
@@ -18,6 +20,13 @@ func (that *Obj) ToInt(err ...Error) int {
 	return ObjToInt(that.Data, &that.Error)
 }
 
+func (that *Obj) ToTime(err ...Error) time.Time {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToTime(that.Data, &that.Error)
+}
+
 func (that *Obj) ToInt64(err ...Error) int64 {
 	if len(err) != 0 {
 		that.Error = err[0]

common/objtoobj.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"math"
 	"strconv"
+	"time"
 )
 
 //仅限于hotime.Slice
@@ -96,6 +97,65 @@ func ObjToSlice(obj interface{}, e ...*Error) Slice {
 	return v
 }
 
+func ObjToTime(obj interface{}, e ...*Error) time.Time {
+
+	tInt := ObjToInt64(obj)
+	//字符串类型，只支持标准mysql datetime格式
+	if tInt == 0 {
+		tStr := ObjToStr(obj)
+
+		if len(tStr) > 18 {
+			t, e := time.Parse("2006-01-02 15:04:05", tStr)
+			if e == nil {
+				return t
+			}
+		} else if len(tStr) > 15 {
+			t, e := time.Parse("2006-01-02 15:04", tStr)
+			if e == nil {
+				return t
+			}
+		} else if len(tStr) > 12 {
+			t, e := time.Parse("2006-01-02 15", tStr)
+			if e == nil {
+				return t
+			}
+		} else if len(tStr) > 9 {
+			t, e := time.Parse("2006-01-02", tStr)
+			if e == nil {
+				return t
+			}
+		} else if len(tStr) > 6 {
+			t, e := time.Parse("2006-01", tStr)
+			if e == nil {
+				return t
+			}
+		}
+
+	}
+
+	//纳秒级别
+	if len(ObjToStr(tInt)) > 16 {
+
+		return time.Time{}.Add(time.Nanosecond * time.Duration(tInt))
+		//微秒级别
+	} else if len(ObjToStr(tInt)) > 13 {
+		return time.Time{}.Add(time.Microsecond * time.Duration(tInt))
+		//毫秒级别
+	} else if len(ObjToStr(tInt)) > 10 {
+		return time.Time{}.Add(time.Millisecond * time.Duration(tInt))
+		//秒级别
+	} else if len(ObjToStr(tInt)) > 9 {
+		return time.Time{}.Add(time.Second * time.Duration(tInt))
+	} else if len(ObjToStr(tInt)) > 3 {
+		t, e := time.Parse("2006", ObjToStr(tInt))
+		if e == nil {
+			return t
+		}
+	}
+
+	return time.Time{}
+}
+
 func ObjToFloat64(obj interface{}, e ...*Error) float64 {
 	var err error
 	v := float64(0)
@@ -135,6 +195,15 @@ func ObjToFloat64(obj interface{}, e ...*Error) float64 {
 			err = errors.New("没有合适的转换对象！")
 		}
 	}
+
+	if math.IsNaN(v) {
+		err = errors.New("float64 is NaN")
+		v = 0
+	}
+	if math.IsInf(v, 0) {
+		err = errors.New("float64 is Inf")
+		v = 0
+	}
 	if len(e) != 0 {
 		e[0].SetError(err)
 	}

common/slice.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"errors"
+	"time"
 )
 
 type Slice []interface{}
@@ -14,6 +15,13 @@ func (that Slice) GetString(key int, err ...*Error) string {
 	return ObjToStr((that)[key])
 }
 
+func (that Slice) GetTime(key int, err ...*Error) time.Time {
+
+	v := ObjToTime((that)[key], err...)
+	return v
+
+}
+
 // GetInt 获取Int
 func (that Slice) GetInt(key int, err ...*Error) int {
 	v := ObjToInt((that)[key], err...)

context.go

@@ -1,21 +1,24 @@
 package hotime
 
 import (
-	. "./cache"
-	. "./common"
-	. "./db"
+	. "code.hoteas.com/golang/hotime/cache"
+	. "code.hoteas.com/golang/hotime/common"
+	. "code.hoteas.com/golang/hotime/db"
 	"encoding/json"
 	"net/http"
+	"time"
 )
 
 type Context struct {
 	*Application
 	Resp         http.ResponseWriter
 	Req          *http.Request
+	Log          Map //日志有则创建
 	RouterString []string
 	Config       Map
 	Db           *HoTimeDB
 	RespData     Map
+	RespFunc     func()
 	CacheIns
 	SessionIns
 	DataSize   int
@@ -57,12 +60,28 @@ func (that *Context) Display(statu int, data interface{}) {
 }
 
 func (that *Context) View() {
-
+	if that.RespFunc != nil {
+		that.RespFunc()
+	}
 	if that.RespData == nil {
 		return
 	}
+	//创建日志
+	if that.Log != nil {
+		that.Log["time"] = time.Now().Unix()
+		if that.Session("admin_id").Data != nil {
+			that.Log["admin_id"] = that.Session("admin_id").ToCeilInt()
+		}
+		if that.Session("user_id").Data != nil {
+			that.Log["user_id"] = that.Session("user_id").ToCeilInt()
+		}
+		that.Db.Insert("logs", that.Log)
+	}
+
 	d, err := json.Marshal(that.RespData)
 	if err != nil {
+		that.Display(1, err.Error())
+		that.View()
 		return
 	}
 	that.DataSize = len(d)

db/hotimedb.go

@@ -1,8 +1,8 @@
 package db
 
 import (
-	"../cache"
-	. "../common"
+	"code.hoteas.com/golang/hotime/cache"
+	. "code.hoteas.com/golang/hotime/common"
 	"database/sql"
 	"encoding/json"
 	"errors"
@@ -10,6 +10,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 	"os"
 	"reflect"
+	"sort"
 	"strings"
 )
 
@@ -42,32 +43,32 @@ func (that *HoTimeDB) GetType() string {
 }
 
 // Action 事务，如果action返回true则执行成功；false则回滚
-func (that *HoTimeDB) Action(action func(db HoTimeDB) bool) bool {
+func (that *HoTimeDB) Action(action func(db HoTimeDB) (isSuccess bool)) (isSuccess bool) {
 	db := HoTimeDB{DB: that.DB, HoTimeCache: that.HoTimeCache, Prefix: that.Prefix}
 	tx, err := db.Begin()
 	if err != nil {
 		that.LastErr.SetError(err)
-		return false
+		return isSuccess
 	}
 
 	db.Tx = tx
 
-	result := action(db)
+	isSuccess = action(db)
 
-	if !result {
+	if !isSuccess {
 		err = db.Tx.Rollback()
 		if err != nil {
 			that.LastErr.SetError(err)
-			return false
+			return isSuccess
 		}
-		return result
+		return isSuccess
 	}
 	err = db.Tx.Commit()
 	if err != nil {
 		that.LastErr.SetError(err)
 		return false
 	}
-	return result
+	return true
 }
 
 func (that *HoTimeDB) InitDb(err ...*Error) *Error {
@@ -165,7 +166,7 @@ func (that *HoTimeDB) Row(resl *sql.Rows) []Map {
 
 //
 ////code=0,1,2 0 backup all,1 backup data,2 backup ddl
-//func (this *HoTimeDB) Backup(path string, code int) {
+//func (that *HoTimeDB) Backup(path string, code int) {
 //	var cmd *exec.Cmd
 //	switch code {
 //	case 0:cmd= exec.Command("mysqldump","-h"+ObjToStr(Config["dbHost"]), "-P"+ObjToStr(Config["dbPort"]),"-u"+ObjToStr(Config["dbUser"]), "-p"+ObjToStr(Config["dbPwd"]),ObjToStr(Config["dbName"]))
@@ -197,7 +198,7 @@ func (that *HoTimeDB) Row(resl *sql.Rows) []Map {
 //	//db := ``
 //	//fmt.Println(db)
 //	//
-//	//tables := this.Query("show tables")
+//	//tables := that.Query("show tables")
 //	//lth := len(tables)
 //	//if lth == 0 {
 //	//	return
@@ -212,7 +213,7 @@ func (that *HoTimeDB) Row(resl *sql.Rows) []Map {
 //	//
 //	//for i := 0; i < lth; i++ {
 //	//	tt := tables[i]["Tables_in_"+db].(string)
-//	//	this.backupSave(path, tt, code)
+//	//	that.backupSave(path, tt, code)
 //	//	debug.FreeOSMemory()
 //	//}
 //
@@ -383,7 +384,7 @@ func (that *HoTimeDB) Exec(query string, args ...interface{}) (sql.Result, *Erro
 	return resl, that.LastErr
 }
 
-//func (this *HoTimeDB)copy(data []Map)[]Map{
+//func (that *HoTimeDB)copy(data []Map)[]Map{
 //	if data==nil{
 //		return nil
 //	}
@@ -447,18 +448,27 @@ func (that *HoTimeDB) Select(table string, qu ...interface{}) []Map {
 	}
 
 	if join {
-		for k, v := range qu[0].(Map) {
+		var testQu = []string{}
+		testQuData := qu[0].(Map)
+		for key, _ := range testQuData {
+			//fmt.Println(key, ":", value)
+			testQu = append(testQu, key)
+		}
+		sort.Strings(testQu)
+
+		for _, k := range testQu {
+			v := testQuData[k]
 			switch Substr(k, 0, 3) {
 			case "[>]":
-				query += " LEFT JOIN " + Substr(k, 3, len(k)-3) + " ON " + v.(string)
+				query += " LEFT JOIN `" + Substr(k, 3, len(k)-3) + "` ON " + v.(string)
 			case "[<]":
-				query += " RIGHT JOIN " + Substr(k, 3, len(k)-3) + " ON " + v.(string)
+				query += " RIGHT JOIN `" + Substr(k, 3, len(k)-3) + "` ON " + v.(string)
 			}
 			switch Substr(k, 0, 4) {
 			case "[<>]":
-				query += " FULL JOIN " + Substr(k, 4, len(k)-4) + " ON " + v.(string)
+				query += " FULL JOIN `" + Substr(k, 4, len(k)-4) + "` ON " + v.(string)
 			case "[><]":
-				query += " INNER JOIN " + Substr(k, 4, len(k)-4) + " ON " + v.(string)
+				query += " INNER JOIN `" + Substr(k, 4, len(k)-4) + "` ON " + v.(string)
 			}
 		}
 	}
@@ -560,7 +570,15 @@ func (that *HoTimeDB) where(data Map) (string, []interface{}) {
 
 	res := make([]interface{}, 0)
 	//AND OR判断
-	for k, v := range data {
+	testQu := []string{}
+	//testQuData:= qu[0].(Map)
+	for key, _ := range data {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+	for _, k := range testQu {
+		v := data[k]
 		x := 0
 		for i := 0; i < len(condition); i++ {
 
@@ -607,7 +625,15 @@ func (that *HoTimeDB) where(data Map) (string, []interface{}) {
 
 	//特殊字符
 	for j := 0; j < len(vcond); j++ {
-		for k, v := range data {
+		testQu := []string{}
+		//testQuData:= qu[0].(Map)
+		for key, _ := range data {
+			//fmt.Println(key, ":", value)
+			testQu = append(testQu, key)
+		}
+		sort.Strings(testQu)
+		for _, k := range testQu {
+			v := data[k]
 			if vcond[j] == k {
 				if k == "ORDER" {
 					where += " " + k + " BY "
@@ -685,6 +711,9 @@ func (that *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 				k = "`" + k + "`"
 			}
 			where += " " + k + "=" + ObjToStr(v)
+		case "[##]": //直接添加value到sql，需要考虑防注入，value比如："a>b"
+
+			where += " " + ObjToStr(v)
 		case "[#!]":
 			k = strings.Replace(k, "[#!]", "", -1)
 			if !strings.Contains(k, ".") {
@@ -836,7 +865,7 @@ func (that *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 	return where, res
 }
 
-//	this.Db.Update("user",hotime.Map{"ustate":"1"},hotime.Map{"AND":hotime.Map{"OR":hotime.Map{"uid":4,"uname":"dasda"}},"ustate":1})
+//	that.Db.Update("user",hotime.Map{"ustate":"1"},hotime.Map{"AND":hotime.Map{"OR":hotime.Map{"uid":4,"uname":"dasda"}},"ustate":1})
 func (that *HoTimeDB) notIn(k string, v interface{}, where string, res []interface{}) (string, []interface{}) {
 	//where:=""
 	//fmt.Println(reflect.ValueOf(v).Type().String())
@@ -881,7 +910,15 @@ func (that *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {
 	res := make([]interface{}, 0)
 	lens := len(data)
 	//fmt.Println(lens)
-	for k, v := range data {
+	testQu := []string{}
+	//testQuData:= qu[0].(Map)
+	for key, _ := range data {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+	for _, k := range testQu {
+		v := data[k]
 		x := 0
 		for i := 0; i < len(condition); i++ {
 
@@ -999,13 +1036,29 @@ func (that *HoTimeDB) Insert(table string, data map[string]interface{}) int64 {
 	tempLen := 0
 	for k, v := range data {
 		tempLen++
-		values = append(values, v)
-		if tempLen < lens {
-			queryString += "`" + k + "`,"
-			valueString += "?,"
+
+		vstr := "?"
+		if Substr(k, len(k)-3, 3) == "[#]" {
+			k = strings.Replace(k, "[#]", "", -1)
+
+			vstr = ObjToStr(v)
+			if tempLen < lens {
+				queryString += "`" + k + "`,"
+				valueString += vstr + ","
+			} else {
+				queryString += "`" + k + "`) "
+				valueString += vstr + ");"
+			}
 		} else {
-			queryString += "`" + k + "`) "
-			valueString += "?);"
+
+			values = append(values, v)
+			if tempLen < lens {
+				queryString += "`" + k + "`,"
+				valueString += "?,"
+			} else {
+				queryString += "`" + k + "`) "
+				valueString += "?);"
+			}
 		}
 
 	}

dri/aliyun/company.go

@@ -0,0 +1,142 @@
+package aliyun
+
+import (
+	. "code.hoteas.com/golang/hotime/common"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	//"fmt"
+)
+
+type company struct {
+	ApiCode string
+	Url     string
+}
+
+var Company = company{}
+
+func (that *company) Init(apiCode string) {
+	//"06c6a07e89dd45c88de040ee1489eef7"
+	that.ApiCode = apiCode
+	that.Url = "http://api.81api.com"
+}
+
+// GetCompanyOtherAll  获取企业基础信息
+func (that *company) GetCompanyOtherAll(name string) Map {
+
+	res := Map{}
+	data, e := that.GetCompanyPatentsInfo(name) //获取专利信息
+	if e != nil {
+		fmt.Println(e)
+	} else {
+		res["PatentsInfo"] = data.GetMap("data")
+	}
+	data, e = that.GetCompanyOtherCopyrightsInfo(name) //获取其他专利
+	if e != nil {
+		fmt.Println(e)
+	} else {
+		res["OtherCopyrightsInfo"] = data.GetMap("data")
+	}
+	data, e = that.GetCompanyTrademarksInfo(name) //获取商标
+	if e != nil {
+		fmt.Println(e)
+	} else {
+		res["TrademarksInfo"] = data.GetMap("data")
+	}
+	data, e = that.GetCompanySoftwareCopyrightsInfo(name) //获取软著
+	if e != nil {
+		fmt.Println(e)
+	} else {
+		res["SoftwareCopyrightsInfo"] = data.GetMap("data")
+	}
+	data, e = that.GetCompanyProfileTags(name) //获取大数据标签
+	if e != nil {
+		fmt.Println(e)
+	} else {
+		res["ProfileTags"] = data.GetSlice("data")
+	}
+	return res
+}
+
+// GetCompanyBaseInfo 获取企业基础信息
+func (that *company) GetCompanyList(name string) (Map, error) {
+	url := "/fuzzyQueryCompanyInfo/"
+
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+
+// GetCompanyBaseInfo 获取企业基础信息
+func (that *company) GetCompanyBaseInfo(name string) (Map, error) {
+	url := "/getCompanyBaseInfo/"
+
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+
+// GetCompanyPatentsInfo  获取专利信息
+func (that *company) GetCompanyPatentsInfo(name string) (Map, error) {
+	url := "/getCompanyPatentsInfo/"
+
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+
+// GetCompanyTrademarksInfo 获取商标信息
+func (that *company) GetCompanyTrademarksInfo(name string) (Map, error) {
+	url := "/getCompanyTrademarksInfo/"
+
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+
+// GetCompanySoftwareCopyrightsInfo 获取软著信息
+func (that *company) GetCompanySoftwareCopyrightsInfo(name string) (Map, error) {
+	url := "/getCompanySoftwareCopyrightsInfo/"
+
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+
+// GetCompanyOtherCopyrightsInfo 获取其他著作信息
+func (that *company) GetCompanyOtherCopyrightsInfo(name string) (Map, error) {
+	url := "/getCompanyOtherCopyrightsInfo/"
+
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+
+// GetCompanyProfileTags 获取大数据标签
+func (that *company) GetCompanyProfileTags(name string) (Map, error) {
+	url := "/getCompanyProfileTags/"
+	body, err := that.basePost(url, name)
+	return ObjToMap(body), err
+}
+func (that *company) basePost(url string, name string) (string, error) {
+
+	client := &http.Client{}
+
+	reqest, err := http.NewRequest("GET", that.Url+url+name+"/?isRaiseErrorCode=1", nil)
+
+	if err != nil {
+		fmt.Println("Fatal error ", err.Error())
+		return "", err
+	}
+
+	reqest.Header.Add("Authorization", "APPCODE "+that.ApiCode)
+	response, err := client.Do(reqest)
+	defer response.Body.Close()
+
+	if err != nil {
+		fmt.Println("Fatal error ", err.Error())
+		return "", err
+	}
+
+	body, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		return "", err
+	}
+	res := string(body)
+	fmt.Println(res)
+	return res, err
+}

dri/baidu/map.go

@@ -0,0 +1,54 @@
+package baidu
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+)
+
+type baiduMap struct {
+	Ak  string
+	Url string
+}
+
+var BaiDuMap = baiduMap{}
+
+func (that *baiduMap) Init(Ak string) {
+	//"ak=ZeT902EZvVgIoGVWEFK3osUm"
+	that.Ak = Ak
+	that.Url = "https://api.map.baidu.com/place/v2/suggestion?output=json" + "&ak=" + Ak
+	//query
+}
+
+// GetPosition  获取定位列表
+func (that *baiduMap) GetPosition(name string, region string) (string, error) {
+
+	client := &http.Client{}
+	if region == "" {
+		region = "全国"
+	}
+	reqest, err := http.NewRequest("GET", that.Url+"&query="+url.PathEscape(name)+"&region="+url.PathEscape(region), nil)
+
+	if err != nil {
+		fmt.Println("Fatal error ", err.Error())
+		return "", err
+	}
+	response, err := client.Do(reqest)
+	defer response.Body.Close()
+
+	if err != nil {
+		fmt.Println("Fatal error ", err.Error())
+		return "", err
+	}
+
+	body, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		return "", err
+	}
+
+	//fmt.Println(string(body))
+
+	return string(body), err
+
+}

dri/ddsms/ddsms.go

@@ -10,29 +10,31 @@ import (
 	//"fmt"
 )
 
-type DDY struct {
+type dingdongyun struct {
 	ApiKey string
 	YzmUrl string
 	TzUrl  string
 }
 
-func (this *DDY) Init(apikey string) {
-	this.ApiKey = apikey
-	this.YzmUrl = "https://api.dingdongcloud.com/v2/sms/captcha/send.json"
-	this.TzUrl = "https://api.dingdongcloud.com/v2/sms/notice/send.json"
+var DDY = dingdongyun{}
+
+func (that *dingdongyun) Init(apikey string) {
+	that.ApiKey = apikey
+	that.YzmUrl = "https://api.dingdongcloud.com/v2/sms/captcha/send.json"
+	that.TzUrl = "https://api.dingdongcloud.com/v2/sms/notice/send.json"
 }
 
-//发送短信验证码 code验证码如：123456 返回true表示发送成功flase表示发送失败
-func (this *DDY) SendYZM(umoblie string, tpt string, data map[string]string) (bool, error) {
+// SendYZM 发送短信验证码 code验证码如：123456 返回true表示发送成功flase表示发送失败
+func (that *dingdongyun) SendYZM(umoblie string, tpt string, data map[string]string) (bool, error) {
 	for k, v := range data {
 		tpt = strings.Replace(tpt, "{"+k+"}", v, -1)
 	}
 
-	return this.send(this.YzmUrl, umoblie, tpt)
+	return that.send(that.YzmUrl, umoblie, tpt)
 }
 
-//发送通知
-func (this *DDY) SendTz(umoblie []string, tpt string, data map[string]string) (bool, error) {
+// SendTz 发送通知
+func (that *dingdongyun) SendTz(umoblie []string, tpt string, data map[string]string) (bool, error) {
 	for k, v := range data {
 		tpt = strings.Replace(tpt, "{"+k+"}", v, -1)
 	}
@@ -44,14 +46,14 @@ func (this *DDY) SendTz(umoblie []string, tpt string, data map[string]string) (b
 		}
 		umobleStr += "," + v
 	}
-	return this.send(this.TzUrl, umobleStr, tpt)
+	return that.send(that.TzUrl, umobleStr, tpt)
 }
 
 //发送短信
-func (this *DDY) send(mUrl string, umoblie string, content string) (bool, error) {
+func (that *dingdongyun) send(mUrl string, umoblie string, content string) (bool, error) {
 
-	data_send_sms_yzm := url.Values{"apikey": {this.ApiKey}, "mobile": {umoblie}, "content": {content}}
-	res, err := this.httpsPostForm(mUrl, data_send_sms_yzm)
+	data_send_sms_yzm := url.Values{"apikey": {that.ApiKey}, "mobile": {umoblie}, "content": {content}}
+	res, err := that.httpsPostForm(mUrl, data_send_sms_yzm)
 	if err != nil && res == "" {
 		return false, errors.New("连接错误")
 	}
@@ -73,7 +75,7 @@ func (this *DDY) send(mUrl string, umoblie string, content string) (bool, error)
 }
 
 //调用url发送短信的连接
-func (this *DDY) httpsPostForm(url string, data url.Values) (string, error) {
+func (that *dingdongyun) httpsPostForm(url string, data url.Values) (string, error) {
 	resp, err := http.PostForm(url, data)
 
 	if err != nil {
@@ -89,9 +91,3 @@ func (this *DDY) httpsPostForm(url string, data url.Values) (string, error) {
 	return string(body), nil
 
 }
-
-var DefaultDDY DDY
-
-func init() {
-	DefaultDDY = DDY{}
-}

dri/download/download.go

@@ -1,15 +1,15 @@
 package download
 
 import (
-	. "../../common"
 	"bytes"
+	. "code.hoteas.com/golang/hotime/common"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
 )
 
-//下载文件
+// Down 下载文件
 func Down(url, path, name string, e ...*Error) bool {
 
 	os.MkdirAll(path, os.ModeDir)

dri/rsa/deencrypt.go

@@ -23,7 +23,7 @@ func FileGet(path string) []byte {
 	return buf
 }
 
-//RSA加密
+// RSA_Encrypt RSA加密
 // plainText 要加密的数据
 // path 公钥匙文件地址
 func RSA_Encrypt(plainText []byte, buf []byte) []byte {
@@ -46,7 +46,7 @@ func RSA_Encrypt(plainText []byte, buf []byte) []byte {
 	return cipherText
 }
 
-//RSA解密
+// RSA_Decrypt RSA解密
 // cipherText 需要解密的byte数据
 // path 私钥文件路径
 func RSA_Decrypt(cipherText []byte, buf []byte) []byte {
@@ -97,7 +97,7 @@ func Demo() {
 	fmt.Println(string(decrypt))
 }
 
-//生成RSA私钥和公钥，保存到文件中
+// GenerateRSAKey 生成RSA私钥和公钥，保存到文件中
 // bits 证书大小
 func GenerateRSAKey(bits int, path string) {
 	//GenerateKey函数使用随机数据生成器random生成一对具有指定字位数的RSA密钥

dri/tencent/company.go

@@ -0,0 +1,119 @@
+package tencent
+
+import (
+	. "code.hoteas.com/golang/hotime/common"
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/base64"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	gourl "net/url"
+
+	"strings"
+	"time"
+)
+
+type company struct {
+	secretId  string
+	secretKey string
+}
+
+var Company = company{}
+
+func (that *company) Init(secretId, secretKey string) {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	that.secretId = secretId
+	that.secretKey = secretKey
+}
+
+func (that *company) calcAuthorization(source string) (auth string, datetime string, err error) {
+
+	timeLocation, _ := time.LoadLocation("Etc/GMT")
+	datetime = time.Now().In(timeLocation).Format("Mon, 02 Jan 2006 15:04:05 GMT")
+	signStr := fmt.Sprintf("x-date: %s\nx-source: %s", datetime, source)
+
+	// hmac-sha1
+	mac := hmac.New(sha1.New, []byte(that.secretKey))
+	mac.Write([]byte(signStr))
+	sign := base64.StdEncoding.EncodeToString(mac.Sum(nil))
+
+	auth = fmt.Sprintf("hmac id=\"%s\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"%s\"",
+		that.secretId, sign)
+
+	return auth, datetime, nil
+}
+
+func (that *company) urlencode(params map[string]string) string {
+	var p = gourl.Values{}
+	for k, v := range params {
+		p.Add(k, v)
+	}
+	return p.Encode()
+}
+
+func (that *company) GetCompany(name string) Map {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	source := "market"
+
+	// 签名
+	auth, datetime, _ := that.calcAuthorization(source)
+
+	// 请求方法
+	method := "GET"
+	// 请求头
+	headers := map[string]string{"X-Source": source, "X-Date": datetime, "Authorization": auth}
+
+	// 查询参数
+	queryParams := make(map[string]string)
+	queryParams["keyword"] = name
+	// body参数
+	bodyParams := make(map[string]string)
+
+	// url参数拼接
+	url := "https://service-3jnh3ku8-1256140209.gz.apigw.tencentcs.com/release/business4/geet"
+	if len(queryParams) > 0 {
+		url = fmt.Sprintf("%s?%s", url, that.urlencode(queryParams))
+	}
+
+	bodyMethods := map[string]bool{"POST": true, "PUT": true, "PATCH": true}
+	var body io.Reader = nil
+	if bodyMethods[method] {
+		body = strings.NewReader(that.urlencode(bodyParams))
+		headers["Content-Type"] = "application/x-www-form-urlencoded"
+	}
+
+	client := &http.Client{
+		Timeout: 5 * time.Second,
+	}
+	request, err := http.NewRequest(method, url, body)
+	if err != nil {
+		fmt.Println(err)
+		return nil
+	}
+	for k, v := range headers {
+		request.Header.Set(k, v)
+	}
+	response, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err)
+		return nil
+	}
+	defer response.Body.Close()
+
+	bodyBytes, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		fmt.Println(err)
+		return nil
+	}
+	res := string(bodyBytes)
+	fmt.Println(res)
+	return ObjToMap(res)
+}

dri/tencent/tencent.go

@@ -8,16 +8,57 @@ import (
 	ocr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr/v20181119"
 )
 
-var credential = common.NewCredential(
-	"AKIDOgT8cKCQksnY7yKATaYO7j9ORJzSYohP",
-	"GNXgjdN4czA9ya0FNMApVJzTmsmU0KSN",
-)
+type tencent struct {
+	secretId   string
+	secretKey  string
+	credential *common.Credential
+}
 
-func OCR(base64Str string) string {
+var Tencent = tencent{}
+
+func (that *tencent) Init(secretId, secretKey string) {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	that.secretId = secretId
+	that.secretKey = secretKey
+	that.credential = common.NewCredential(
+		that.secretId,
+		that.secretKey,
+	)
+}
+
+func (that *tencent) OCRCOMPANY(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
+
+	request := ocr.NewBizLicenseOCRRequest()
+
+	//request.ImageUrl = common.StringPtr("https://img0.baidu.com/it/u=2041013181,3227632688&fm=26&fmt=auto")
+	request.ImageBase64 = common.StringPtr(base64Str)
+
+	response, err := client.BizLicenseOCR(request)
+	if _, ok := err.(*errors.TencentCloudSDKError); ok {
+		fmt.Println("An API error has returned: %s", err)
+		return ""
+	}
+	if err != nil {
+		fmt.Println("An API error has returned: %s", err)
+		return ""
+	}
+	//fmt.Printf("%s", response.ToJsonString())
+
+	return response.ToJsonString()
+}
+
+func (that *tencent) OCR(base64Str string) string {
+
+	cpf := profile.NewClientProfile()
+	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewGeneralAccurateOCRRequest()
 
@@ -38,11 +79,11 @@ func OCR(base64Str string) string {
 	return response.ToJsonString()
 }
 
-func Qrcode(base64Str string) string {
+func (that *tencent) Qrcode(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewQrcodeOCRRequest()
 

dri/upload/upload.go

@@ -1,7 +1,7 @@
 package upload
 
 import (
-	. "../../common"
+	. "code.hoteas.com/golang/hotime/common"
 	"errors"
 	"io"
 	"mime/multipart"
@@ -15,7 +15,7 @@ type Upload struct {
 	Path string
 }
 
-func (this *Upload) UpFile(Request *http.Request, fieldName, savefilepath, savePath string) (string, error) {
+func (that *Upload) UpFile(Request *http.Request, fieldName, savefilepath, savePath string) (string, error) {
 	Request.ParseMultipartForm(32 << 20)
 	var filePath string
 	files := Request.MultipartForm.File
@@ -36,7 +36,7 @@ func (this *Upload) UpFile(Request *http.Request, fieldName, savefilepath, saveP
 		data := time.Unix(int64(t), 0).Format("2006-01")
 		path := ""
 		if strings.EqualFold(savefilepath, "") {
-			path = this.Path + data
+			path = that.Path + data
 		} else {
 			path = savefilepath + data
 		}
@@ -51,7 +51,7 @@ func (this *Upload) UpFile(Request *http.Request, fieldName, savefilepath, saveP
 			}
 		}
 		filename := time.Unix(int64(t), 0).Format("2006-01-02-15-22-25") + ObjToStr(Rand(6))
-		filePath = path + "/" + filename + this.Path
+		filePath = path + "/" + filename + that.Path
 	} else {
 		filePath = savePath
 	}

dri/wechat/h5program.go

@@ -0,0 +1,79 @@
+package wechat
+
+import (
+	"github.com/silenceper/wechat/v2"
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/officialaccount"
+	h5config "github.com/silenceper/wechat/v2/officialaccount/config"
+	"github.com/silenceper/wechat/v2/officialaccount/js"
+	"github.com/silenceper/wechat/v2/officialaccount/oauth"
+)
+
+//基于此文档开发
+//https://github.com/silenceper/wechat/blob/v2/doc/api/officialaccount.md
+type h5Program struct {
+	Memory *cache.Memory
+	Config *h5config.Config
+	*officialaccount.OfficialAccount
+	weixin *wechat.Wechat //微信登录实例
+}
+
+var H5Program = h5Program{}
+
+// Init 初始化
+func (that *h5Program) Init(appid string, appsecret string) {
+	that.weixin = wechat.NewWechat()
+	that.Memory = cache.NewMemory()
+	that.Config = &h5config.Config{
+		AppID:     appid,
+		AppSecret: appsecret,
+		//Token:     "xxx",
+		//EncodingAESKey: "xxxx",
+		Cache: that.Memory,
+	}
+	that.OfficialAccount = that.weixin.GetOfficialAccount(that.Config)
+}
+
+// GetUserInfo 获取用户信息
+func (that *h5Program) GetUserInfo(code string) (appid string, resToken oauth.ResAccessToken, userInfo oauth.UserInfo, err error) {
+	auth := that.GetOauth()
+	//weixin.GetOpenPlatform()
+	resToken, err = auth.GetUserAccessToken(code)
+	if err != nil {
+
+		return auth.AppID, resToken, userInfo, err
+	}
+
+	//getUserInfo
+	userInfo, err = auth.GetUserInfo(resToken.AccessToken, resToken.OpenID, "")
+	if err != nil {
+		return auth.AppID, resToken, userInfo, err
+	}
+
+	return auth.AppID, resToken, userInfo, err
+}
+
+// GetSignUrl js url签名
+func (that *h5Program) GetSignUrl(signUrl string) (*js.Config, error) {
+
+	js := that.OfficialAccount.GetJs()
+	cfg1, e := js.GetConfig(signUrl)
+	if e != nil {
+		return nil, e
+	}
+
+	return cfg1, nil
+}
+
+// GetSignUrl js url签名
+//func (that *h5Program) GetJsPay(signUrl string) (*js.Config, error) {
+//	//
+//	//js := that.OfficialAccount().GetJs()
+//	//
+//	//cfg1, e := js.GetConfig(signUrl)
+//	//if e != nil {
+//	//	return nil, e
+//	//}
+//
+//	return cfg1, nil
+//}

dri/wechat/miniprogram.go

@@ -0,0 +1,66 @@
+package wechat
+
+import (
+	"errors"
+	"github.com/silenceper/wechat/v2"
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/miniprogram"
+	"github.com/silenceper/wechat/v2/miniprogram/auth"
+	"github.com/silenceper/wechat/v2/miniprogram/config"
+	"github.com/silenceper/wechat/v2/miniprogram/encryptor"
+)
+
+type miniProgram struct {
+	Memory *cache.Memory
+	Config *config.Config
+	weixin *wechat.Wechat //微信登录实例
+	*miniprogram.MiniProgram
+}
+
+var MiniProgram = miniProgram{}
+
+// Init 初始化
+func (that *miniProgram) Init(appid string, appsecret string) {
+
+	that.weixin = wechat.NewWechat()
+	that.Memory = cache.NewMemory()
+	that.Config = &config.Config{
+		AppID:     appid,
+		AppSecret: appsecret,
+		//Token:     "xxx",
+		//EncodingAESKey: "xxxx",
+		Cache: that.Memory,
+	}
+	that.MiniProgram = that.weixin.GetMiniProgram(that.Config)
+}
+
+func (that *miniProgram) GetBaseUserInfo(code string) (appid string, re auth.ResCode2Session, err error) {
+	appid = that.Config.AppID
+	a := that.GetAuth()
+	re, err = a.Code2Session(code)
+
+	if err != nil {
+		return appid, re, err
+	}
+
+	return appid, re, err
+}
+
+func (that *miniProgram) GetPhoneNumber(sessionkey, encryptedData, iv string) (appid string, re *encryptor.PlainData, err error) {
+	appid = that.Config.AppID
+
+	if sessionkey == "" || encryptedData == "" || iv == "" {
+		return appid, re, errors.New("参数不足")
+	}
+
+	eny := that.GetEncryptor()
+
+	re, err = eny.Decrypt(sessionkey, encryptedData, iv)
+
+	if err != nil {
+		return appid, re, err
+	}
+
+	return appid, re, err
+
+}

dri/wechat/pay.go

@@ -0,0 +1,142 @@
+package wechat
+
+import (
+	"context"
+	"fmt"
+	"github.com/go-pay/gopay"
+	"github.com/go-pay/gopay/wechat/v3"
+	"net/http"
+	"time"
+)
+
+//基于此文档开发
+//https://github.com/silenceper/wechat/blob/v2/doc/api/officialaccount.md
+type wxpay struct {
+	client   *wechat.ClientV3
+	ctx      context.Context
+	apiV3Key string
+	MchId    string
+}
+
+var WxPay = wxpay{}
+
+// Init 初始化
+func (that *wxpay) Init(MchId, SerialNo, APIv3Key, PrivateKey string) {
+	client, err := wechat.NewClientV3(MchId, SerialNo, APIv3Key, PrivateKey)
+	if err != nil {
+		//xlog.Error(err)
+		fmt.Println(err)
+		return
+	}
+	that.client = client
+	that.apiV3Key = APIv3Key
+	that.MchId = MchId
+	// 设置微信平台API证书和序列号（如开启自动验签，请忽略此步骤）
+	//client.SetPlatformCert([]byte(""), "")
+	that.ctx = context.Background()
+	// 启用自动同步返回验签，并定时更新微信平台API证书（开启自动验签时，无需单独设置微信平台API证书和序列号）
+	err = client.AutoVerifySign()
+	if err != nil {
+		//xlog.Error(err)
+		fmt.Println(err)
+		return
+	}
+
+	// 打开Debug开关，输出日志，默认是关闭的
+	client.DebugSwitch = gopay.DebugOn
+}
+
+// GetUserInfo 获取用户信息
+func (that *wxpay) GetJsOrder(money int64, appid, openid, name, tradeNo, notifyUrl string) (jsApiParams *wechat.JSAPIPayParams, err error) {
+	fmt.Println("dasdas", money, appid, name, tradeNo, notifyUrl)
+	PrepayId, err := that.getPrepayId(money, appid, that.MchId, openid, name, tradeNo, notifyUrl)
+	if err != nil {
+		return nil, err
+	}
+
+	//小程序
+	jsapi, err := that.client.PaySignOfJSAPI(appid, PrepayId)
+	return jsapi, err
+}
+
+func (that *wxpay) CallbackJsOrder(req *http.Request) (*wechat.V3DecryptResult, error) {
+
+	notifyReq, err := wechat.V3ParseNotify(req)
+	if err != nil {
+		//xlog.Error(err)
+		return nil, err
+	}
+
+	// wxPublicKey 通过 client.WxPublicKey() 获取
+	err = notifyReq.VerifySignByPK(that.client.WxPublicKey())
+	if err != nil {
+		//xlog.Error(err)
+		return nil, err
+	}
+
+	// ========异步通知敏感信息解密========
+	// 普通支付通知解密
+	result, err := notifyReq.DecryptCipherText(that.apiV3Key)
+
+	//that.client.V3TransactionQueryOrder(that.ctx,result.BankType,result.OR)
+
+	return result, err
+
+	// 合单支付通知解密
+	//result, err := notifyReq.DecryptCombineCipherText(apiV3Key)
+	//// 退款通知解密
+	//result, err := notifyReq.DecryptRefundCipherText(apiV3Key)
+
+	// ========异步通知应答========
+	// 退款通知http应答码为200且返回状态码为SUCCESS才会当做商户接收成功，否则会重试。
+	// 注意：重试过多会导致微信支付端积压过多通知而堵塞，影响其他正常通知。
+
+	// 此写法是 gin 框架返回微信的写法
+	//c.JSON(http.StatusOK, &wechat.V3NotifyRsp{Code: gopay.SUCCESS, Message: "成功"})
+	//
+	//// 此写法是 echo 框架返回微信的写法
+	//return c.JSON(http.StatusOK, &wechat.V3NotifyRsp{Code: gopay.SUCCESS, Message: "成功"})
+}
+
+// GetUserInfo 获取用户信息
+//func (that *wxpay) GetMiniOrder(money int64,appid,name,tradeNo,notifyUrl string) (jsApiParams *wechat.AppletParams,err error){
+//
+//	PrepayId,err:=that.getPrepayId(money,name,tradeNo,notifyUrl)
+//	if err!=nil{
+//		return nil,err
+//	}
+//
+//	//小程序
+//	applet, err := that.client.PaySignOfApplet(appid,PrepayId)
+//
+//	return applet,err
+//}
+
+func (that *wxpay) getPrepayId(money int64, appid, mchid, openid, name, tradeNo, notifyUrl string) (prepayid string, err error) {
+	expire := time.Now().Add(10 * time.Minute).Format(time.RFC3339)
+	// 初始化 BodyMap
+	bm := make(gopay.BodyMap)
+	bm.Set("appid", appid).
+		Set("mchid", mchid).
+		//Set("sub_mchid", "sub_mchid").
+		Set("description", name).
+		Set("out_trade_no", tradeNo).
+		Set("time_expire", expire).
+		Set("notify_url", notifyUrl).
+		SetBodyMap("amount", func(bm gopay.BodyMap) {
+			bm.Set("total", money).
+				Set("currency", "CNY")
+		}).
+		SetBodyMap("payer", func(bm gopay.BodyMap) {
+			bm.Set("openid", openid)
+		})
+	//ctx:=context.Context()
+
+	wxRsp, err := that.client.V3TransactionJsapi(that.ctx, bm)
+	fmt.Println("获取PrepayId", wxRsp, err)
+	if err != nil {
+		//xlog.Error(err)
+		return "", err
+	}
+	return wxRsp.Response.PrepayId, nil
+}

example/app/admin.go

@@ -1,53 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-)
-
-var adminCtr = Ctr{
-	"token": func(this *Context) {
-		this.Display(0, this.SessionId)
-	},
-	"test": func(this *Context) {
-		this.Session("id", this.SessionId)
-	},
-	//自带的登录
-	"login": func(this *Context) {
-
-		name := this.Req.FormValue("name")
-		pwd := this.Req.FormValue("password")
-		if len(name) < 2 ||
-			len(pwd) < 3 {
-			this.Display(3, "数据校验不通过")
-		}
-		where := Map{"password": Md5(pwd)}
-		if len(name) == 11 {
-			where["phone"] = name
-		} else {
-			where["name"] = name
-		}
-
-		admin := this.Db.Get("admin", "*", Map{"AND": where})
-		if admin == nil {
-			this.Display(4, "账户密码错误")
-			return
-		}
-
-		this.Session("id", admin.GetCeilInt("id"))
-		admin["password"] = nil
-		this.Display(0, admin)
-
-	},
-	"info": func(this *Context) {
-		admin := this.Db.Get("admin", "*", Map{"id": this.Session("id").ToInt()})
-
-		if admin == nil {
-			this.Display(2, "登录失效，请重新登录")
-			return
-		}
-		admin["password"] = nil
-
-		this.Display(0, admin)
-	},
-}

example/app/init.go

@@ -1,29 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-)
-
-// Project 管理端项目
-var Project = Proj{
-	//"user": UserCtr,
-	"product_spot_check": product_spot_checkCtr,
-	"product":            productCtr,
-	"admin":              adminCtr,
-	"sms":                Sms,
-	"material":           materialCtr,
-	"material_inout":     material_inoutCtr,
-	"produce_product":    produce_productCtr,
-	"produce":            produceCtr,
-	"product_line":       product_lineCtr,
-}
-
-//生成随机码的4位随机数
-func getCode() string {
-	//res := ""
-	//for i := 0; i < 4; i++ {
-	res := ObjToStr(RandX(1000, 9999))
-	//}
-	return res
-}

example/app/material.go

@@ -1,213 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"strings"
-	"time"
-)
-
-var materialCtr = Ctr{
-	"info": func(that *Context) {
-		data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
-		str, inData := that.MakeCode.Info(that.RouterString[1], data, that.Db)
-		where := Map{"id": that.RouterString[2]}
-
-		if len(inData) == 1 {
-			inData["id"] = where["id"]
-			where = Map{"AND": inData}
-		} else if len(inData) > 1 {
-			where["OR"] = inData
-			where = Map{"AND": where}
-		}
-
-		re := that.Db.Get(that.RouterString[1], str, where)
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		for k, v := range re {
-			column := that.MakeCode.TableColumns[that.RouterString[1]][k]
-			if column == nil {
-				continue
-			}
-			if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
-				re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
-			}
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		name := that.Req.FormValue("name")
-		img := that.Req.FormValue("img")
-		validity := ObjToInt(that.Req.FormValue("validity"))
-		num := ObjToInt(that.Req.FormValue("num"))
-		rule := that.Req.FormValue("rule")
-		content := that.Req.FormValue("content")
-		description := that.Req.FormValue("description")
-		if name == "" || rule == "" {
-			that.Display(3, "参数不足，请补充参数")
-			return
-		}
-
-		data := Map{
-			"name":        name,
-			"img":         img,
-			"rule":        rule,
-			"admin_id":    adminID,
-			"count":       0,
-			"used":        0,
-			"saved":       0,
-			"num":         num,
-			"validity":    validity,
-			"description": description,
-			"content":     content,
-			"create_time": time.Now().Unix(),
-			"modify_time": time.Now().Unix(),
-		}
-
-		id := that.Db.Insert("material", data)
-		if id == 0 {
-			that.Display(4, "添加材料失败，请重新添加")
-			return
-		}
-
-		data["id"] = id
-
-		that.Display(0, data)
-	},
-	"update": func(that *Context) {
-		inData := that.MakeCode.Edit(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "没有找到要更新的数据")
-			return
-		}
-
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			Index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": that.RouterString[2]})
-			parentIndex := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = parentIndex.GetString("index") + that.RouterString[2] + ","
-
-			childNodes := that.Db.Select(that.RouterString[1], "id,`index`", Map{"index[~]": "," + that.RouterString[2] + ","})
-
-			for _, v := range childNodes {
-				v["index"] = strings.Replace(v.GetString("index"), Index.GetString("index"), inData.GetString("index"), -1)
-				that.Db.Update(that.RouterString[1], Map{"index": v["index"]}, Map{"id": v.GetCeilInt("id")})
-			}
-
-		}
-
-		re := that.Db.Update(that.RouterString[1], inData, Map{"id": that.RouterString[2]})
-
-		if re == 0 {
-			that.Display(4, "更新数据失败")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"inout": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		data := ObjToMap(that.Req.FormValue("data"))
-
-		texts := data.GetSlice("text")
-		textData := []Map{}
-		for k, _ := range texts {
-			v := texts.GetString(k)
-			if len(v) < 4 {
-				continue
-			}
-			vs := that.Db.Select("material", "name,id,content,rule,num", Map{"content[~]": v[:len(v)/2]})
-			for _, v1 := range vs {
-				if len(textData) == 0 {
-					textData = append(textData, v1)
-				}
-				for _, vt := range textData {
-					if v1.GetString("id") != vt.GetString("id") {
-
-						add := true
-						for _, vt1 := range textData {
-							if vt1.GetCeilInt("id") == v1.GetCeilInt("id") {
-								add = false
-								break
-							}
-						}
-						if add {
-							v1["count"] = 1
-							textData = append(textData, v1)
-						}
-					} else {
-						vt["count"] = vt.GetCeilInt("count") + 1
-					}
-				}
-			}
-		}
-		qrcode := data.GetSlice("qrcode")
-		for k, _ := range qrcode {
-			v := qrcode.GetString(k)
-			if len(v) < 4 {
-				continue
-			}
-			vs := that.Db.Select("material", "name,id,content,rule,num", Map{"content[~]": v[:len(v)/2]})
-			for _, v1 := range vs {
-				if len(textData) == 0 {
-					textData = append(textData, v1)
-				}
-				for _, vt := range textData {
-					if v1.GetString("id") != vt.GetString("id") {
-						v1["count"] = 1
-						textData = append(textData, v1)
-					} else {
-						vt["count"] = vt.GetCeilInt("count") + 1
-					}
-				}
-			}
-		}
-
-		that.Display(0, textData)
-
-	},
-	"search": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		page := ObjToInt(that.Req.FormValue("page"))
-		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
-
-		if page < 1 {
-			page = 1
-		}
-		if pageSize <= 0 {
-			pageSize = 10
-		}
-		leftJoin := Map{"[><]admin": "material.admin_id=admin.id"}
-		columnStr := "material.id,material.name,material.img,material.count,material.used,material.saved,material.admin_id,admin.name AS admin_name,material.modify_time,material.state"
-		where := Map{"ORDER": "modify_time DESC"}
-		count := that.Db.Count("material", where)
-		reData := that.Db.Page(page, pageSize).
-			PageSelect("material", leftJoin, columnStr, where)
-
-		that.Display(0, Map{"count": count, "data": reData})
-	},
-}

example/app/material_inout.go

@@ -1,188 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"strings"
-	"time"
-)
-
-var material_inoutCtr = Ctr{
-	"info": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		id := ObjToInt(that.Req.FormValue("id"))
-		if id == 0 {
-			that.Display(3, "请求参数不足，请检查参数")
-			return
-		}
-
-		re := that.Db.Get("material_inout", "*", Map{"id": id})
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		img := that.Req.FormValue("img")
-		rule := that.Req.FormValue("rule")
-		materialId := ObjToInt(that.Req.FormValue("material_id"))
-		produceId := ObjToInt(that.Req.FormValue("produce_id"))
-		count := ObjToInt(that.Req.FormValue("num"))
-		state := ObjToInt(that.Req.FormValue("state"))
-
-		content := that.Req.FormValue("content")
-		description := that.Req.FormValue("description")
-
-		if rule == "" || materialId == 0 || count == 0 {
-			that.Display(3, "参数不足，请补充参数")
-			return
-		}
-		count1 := count
-		if state > 0 {
-			count = -count
-		}
-
-		produce_material := that.Db.Get("produce_material", "id", Map{"AND": Map{"produce_id": produceId, "material_id": materialId}})
-		if produce_material == nil {
-			that.Db.Insert("produce_material", Map{"produce_id": produceId,
-				"create_time": time.Now().Unix(),
-				"modify_time": time.Now().Unix(),
-				"admin_id":    adminID,
-				"material_id": materialId})
-		}
-		if state == 0 {
-
-			that.Db.Update("material", Map{"count[#]": "count+" + ObjToStr(count), "saved[#]": "saved+" + ObjToStr(count)}, Map{"id": materialId})
-		} else {
-			that.Db.Update("material", Map{"count[#]": "count" + ObjToStr(count), "used[#]": "used+" + ObjToStr(-count)}, Map{"id": materialId})
-		}
-
-		material := that.Db.Get("material", "*", Map{"id": materialId})
-		data := Map{
-			"img":         img,
-			"rule":        rule,
-			"admin_id":    adminID,
-			"material_id": materialId,
-			"count":       count1,
-			"saved":       material.GetCeilInt("count"),
-			"create_time": time.Now().Unix(),
-			"modify_time": time.Now().Unix(),
-			"produce_id":  produceId,
-			"description": description,
-			"content":     content,
-			"state":       state,
-		}
-		id := that.Db.Insert("material_inout", data)
-
-		if id == 0 {
-			that.Display(4, "添加出入库记录失败，请重新添加")
-			return
-		}
-
-		data["id"] = id
-
-		that.Display(0, data)
-	},
-	"update": func(that *Context) {
-		inData := that.MakeCode.Edit(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "没有找到要更新的数据")
-			return
-		}
-
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			Index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": that.RouterString[2]})
-			parentIndex := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = parentIndex.GetString("index") + that.RouterString[2] + ","
-
-			childNodes := that.Db.Select(that.RouterString[1], "id,`index`", Map{"index[~]": "," + that.RouterString[2] + ","})
-
-			for _, v := range childNodes {
-				v["index"] = strings.Replace(v.GetString("index"), Index.GetString("index"), inData.GetString("index"), -1)
-				that.Db.Update(that.RouterString[1], Map{"index": v["index"]}, Map{"id": v.GetCeilInt("id")})
-			}
-
-		}
-
-		re := that.Db.Update(that.RouterString[1], inData, Map{"id": that.RouterString[2]})
-
-		if re == 0 {
-			that.Display(4, "更新数据失败")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"remove": func(that *Context) {
-		inData := that.MakeCode.Delete(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "请求参数不足")
-			return
-		}
-		re := int64(0)
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetSlice("index") != nil {
-			re = that.Db.Delete(that.RouterString[1], Map{"index[~]": "," + that.RouterString[2] + ","})
-		} else {
-			re = that.Db.Delete(that.RouterString[1], Map{"id": that.RouterString[2]})
-		}
-
-		if re == 0 {
-			that.Display(4, "删除数据失败")
-			return
-		}
-		that.Display(0, "删除成功")
-	},
-
-	"search": func(that *Context) {
-
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-		page := ObjToInt(that.Req.FormValue("page"))
-		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
-		materialId := ObjToInt(that.Req.FormValue("id"))
-		if page < 1 {
-			page = 1
-		}
-
-		if pageSize <= 0 {
-			pageSize = 10
-		}
-		columnStr := "material_inout.id,material_inout.material_id,material.name,material_inout.img,material_inout.count,material_inout.saved,material_inout.admin_id,admin.name AS admin_name,material_inout.modify_time,material_inout.state"
-		leftJoin := Map{"[><]material": "material_inout.material_id=material.id",
-			"[><]admin": "material_inout.admin_id=admin.id",
-		}
-		where := Map{"ORDER": "modify_time DESC"}
-
-		if materialId != 0 {
-			where["material_id"] = materialId
-		}
-		count := that.Db.Count("material_inout", where)
-		reData := that.Db.Page(page, pageSize).
-			PageSelect("material_inout", leftJoin, columnStr, where)
-
-		that.Display(0, Map{"count": count, "data": reData})
-	},
-}

example/app/produce.go

@@ -1,201 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"strings"
-)
-
-var produceCtr = Ctr{
-	"info": func(that *Context) {
-		data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
-		str, inData := that.MakeCode.Info(that.RouterString[1], data, that.Db)
-		where := Map{"id": that.RouterString[2]}
-
-		if len(inData) == 1 {
-			inData["id"] = where["id"]
-			where = Map{"AND": inData}
-		} else if len(inData) > 1 {
-			where["OR"] = inData
-			where = Map{"AND": where}
-		}
-
-		re := that.Db.Get(that.RouterString[1], str, where)
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		for k, v := range re {
-			column := that.MakeCode.TableColumns[that.RouterString[1]][k]
-			if column == nil {
-				continue
-			}
-			if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
-				re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
-			}
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-		inData := that.MakeCode.Add(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "请求参数不足")
-			return
-		}
-
-		re := that.Db.Insert(that.RouterString[1], inData)
-
-		if re == 0 {
-			that.Display(4, "无法插入对应数据")
-			return
-		}
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = index.GetString("index") + ObjToStr(re) + ","
-			that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
-		} else if inData.GetString("index") != "" {
-			inData["index"] = "," + ObjToStr(re) + ","
-			that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
-		}
-
-		that.Display(0, re)
-	},
-	"update": func(that *Context) {
-		inData := that.MakeCode.Edit(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "没有找到要更新的数据")
-			return
-		}
-
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			Index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": that.RouterString[2]})
-			parentIndex := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = parentIndex.GetString("index") + that.RouterString[2] + ","
-
-			childNodes := that.Db.Select(that.RouterString[1], "id,`index`", Map{"index[~]": "," + that.RouterString[2] + ","})
-
-			for _, v := range childNodes {
-				v["index"] = strings.Replace(v.GetString("index"), Index.GetString("index"), inData.GetString("index"), -1)
-				that.Db.Update(that.RouterString[1], Map{"index": v["index"]}, Map{"id": v.GetCeilInt("id")})
-			}
-
-		}
-
-		re := that.Db.Update(that.RouterString[1], inData, Map{"id": that.RouterString[2]})
-
-		if re == 0 {
-			that.Display(4, "更新数据失败")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"remove": func(that *Context) {
-		inData := that.MakeCode.Delete(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "请求参数不足")
-			return
-		}
-		re := int64(0)
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetSlice("index") != nil {
-			re = that.Db.Delete(that.RouterString[1], Map{"index[~]": "," + that.RouterString[2] + ","})
-		} else {
-			re = that.Db.Delete(that.RouterString[1], Map{"id": that.RouterString[2]})
-		}
-
-		if re == 0 {
-			that.Display(4, "删除数据失败")
-			return
-		}
-		that.Display(0, "删除成功")
-	},
-	"check": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		data := ObjToMap(that.Req.FormValue("data"))
-
-		texts := data.GetSlice("text")
-		textData := []Map{}
-		for k, _ := range texts {
-			v := texts.GetString(k)
-			if len(v) < 3 {
-				continue
-			}
-			vs := that.Db.Select("produce", Map{"[>]product": "produce.product_id=product.id"}, "produce.name,produce.id,produce.product_id,product.name AS product_name,product.rule_check,product.rule_spot_check", Map{"produce.sn[~]": v[:len(v)/2+1]})
-			for _, v1 := range vs {
-				if len(textData) == 0 {
-					textData = append(textData, v1)
-				}
-				for _, vt := range textData {
-					if v1.GetString("id") != vt.GetString("id") {
-
-						add := true
-						for _, vt1 := range textData {
-							if vt1.GetCeilInt("id") == v1.GetCeilInt("id") {
-								add = false
-								break
-							}
-						}
-						if add {
-							v1["count"] = 1
-							textData = append(textData, v1)
-						}
-					} else {
-						vt["count"] = vt.GetCeilInt("count") + 1
-					}
-				}
-			}
-		}
-		qrcode := data.GetSlice("qrcode")
-		for k, _ := range qrcode {
-			v := qrcode.GetString(k)
-			if len(v) < 3 {
-				continue
-			}
-			vs := that.Db.Select("produce", Map{"[>]product": "produce.product_id=product.id"}, "produce.name,produce.id,produce.product_id,product.name AS product_name,product.rule_check,product.rule_spot_check", Map{"produce.sn[~]": v[:len(v)/2+1]})
-			for _, v1 := range vs {
-				if len(textData) == 0 {
-					textData = append(textData, v1)
-				}
-				for _, vt := range textData {
-					if v1.GetString("id") != vt.GetString("id") {
-						v1["count"] = 1
-						textData = append(textData, v1)
-					} else {
-						vt["count"] = vt.GetCeilInt("count") + 1
-					}
-				}
-			}
-		}
-
-		that.Display(0, textData)
-
-	},
-	"search": func(that *Context) {
-
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		columnStr := "produce.id,produce.sn,produce.name,produce.state,produce.product_id,product.name AS product_name"
-		where := Map{"produce.state[!]": 0, "ORDER": "produce.modify_time DESC"}
-
-		reData := that.Db.Select("produce", Map{"[>]product": "produce.product_id=product.id"}, columnStr, where)
-
-		that.Display(0, reData)
-	},
-}

example/app/produce_product.go

@@ -1,96 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"time"
-)
-
-var produce_productCtr = Ctr{
-	"info": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		id := ObjToInt(that.Req.FormValue("id"))
-		sn := that.Req.FormValue("sn")
-		if id == 0 && sn == "" {
-			that.Display(3, "请求参数不足，请检查参数")
-			return
-		}
-
-		where := Map{}
-		if id != 0 {
-			where["produce_product.id"] = id
-		} else {
-			where["produce_product.sn"] = sn
-		}
-
-		re := that.Db.Get("produce_product",
-
-			Map{"[><]product": "produce_product.product_id=product.id",
-				"[><]produce": "produce_product.produce_id=produce.id",
-			},
-			"produce_product.id,produce_product.product_id,product.name AS product_name,"+
-				"produce_product.modify_time,produce_product.state,product.rule_spot_check,produce_product.produce_id,produce.name AS produce_name", where)
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		sn := that.Req.FormValue("sn")
-		product_id := ObjToInt(that.Req.FormValue("product_id"))
-		produce_id := ObjToInt(that.Req.FormValue("produce_id"))
-		product_line_id := ObjToInt(that.Req.FormValue("product_line_id"))
-		//state := ObjToInt(that.Req.FormValue("state"))
-		//rule_check := that.Req.FormValue("rule_check")
-		//description := that.Req.FormValue("description")
-		if sn == "" {
-			that.Display(3, "参数不足，请补充参数")
-			return
-		}
-
-		data := Map{
-
-			"sn":          sn,
-			"product_id":  product_id,
-			"produce_id":  produce_id,
-			"create_time": time.Now().Unix(),
-			"modify_time": time.Now().Unix(),
-		}
-
-		data1 := ObjToMap(data.ToJsonString())
-		data1["product_line_id"] = product_line_id
-		id := that.Db.Insert("produce_product", data1)
-		if id == 0 {
-			that.Display(4, "添加新成品失败，请重新添加")
-			return
-		}
-
-		//data["id"] = id
-		//data["rule"] = rule_check
-		//data["produce_product_id"] = id
-		//data["state"] = state
-		//data["description"] = description
-		//id = that.Db.Insert("product_check", data)
-		//if id == 0 {
-		//	that.Display(4, "添加质检失败，请重新添加")
-		//	return
-		//}
-		that.Display(0, data)
-	},
-}

example/app/product.go

@@ -1,138 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"time"
-)
-
-var productCtr = Ctr{
-	"info": func(that *Context) {
-		data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
-		str, inData := that.MakeCode.Info(that.RouterString[1], data, that.Db)
-		where := Map{"id": that.RouterString[2]}
-
-		if len(inData) == 1 {
-			inData["id"] = where["id"]
-			where = Map{"AND": inData}
-		} else if len(inData) > 1 {
-			where["OR"] = inData
-			where = Map{"AND": where}
-		}
-
-		re := that.Db.Get(that.RouterString[1], str, where)
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		for k, v := range re {
-			column := that.MakeCode.TableColumns[that.RouterString[1]][k]
-			if column == nil {
-				continue
-			}
-			if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
-				re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
-			}
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-		inData := that.MakeCode.Add(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "请求参数不足")
-			return
-		}
-
-		re := that.Db.Insert(that.RouterString[1], inData)
-
-		if re == 0 {
-			that.Display(4, "无法插入对应数据")
-			return
-		}
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = index.GetString("index") + ObjToStr(re) + ","
-			that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
-		} else if inData.GetString("index") != "" {
-			inData["index"] = "," + ObjToStr(re) + ","
-			that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
-		}
-
-		that.Display(0, re)
-	},
-	"update": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		id := ObjToInt(that.Req.FormValue("id"))
-		//抽检更新
-		ruleSpotCheck := that.Req.FormValue("rule_spot_check")
-		if ruleSpotCheck != "" {
-			spotCheckPercentage := ObjToInt(that.Req.FormValue("spot_check_percentage"))
-			if id == 0 || ruleSpotCheck == "" {
-				that.Display(3, "请求参数不足，请检查参数")
-				return
-			}
-
-			re := that.Db.Update("product", Map{"rule_spot_check": ruleSpotCheck, "spot_check_percentage": spotCheckPercentage, "modify_time": time.Now().Unix()}, Map{"id": id})
-			if re == 0 {
-				that.Display(4, "更新失败，无法更新抽检参数")
-				return
-			}
-		} else {
-			//质检更新
-			ruleCheck := that.Req.FormValue("rule_check")
-			if id == 0 || ruleCheck == "" {
-				that.Display(3, "请求参数不足，请检查参数")
-				return
-			}
-
-			re := that.Db.Update("product", Map{"rule_check": ruleCheck, "modify_time": time.Now().Unix()}, Map{"id": id})
-
-			if re == 0 {
-				that.Display(4, "更新失败，无法更新质检参数")
-				return
-			}
-
-		}
-
-		that.Display(0, "更新成功")
-	},
-
-	"search": func(that *Context) {
-
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		page := ObjToInt(that.Req.FormValue("page"))
-		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
-
-		if page < 1 {
-			page = 1
-		}
-		if pageSize <= 0 {
-			pageSize = 10
-		}
-
-		leftJoin := Map{"[><]admin": "product.admin_id=admin.id"}
-		columnStr := "product.id,product.name,product.img,product.count,product.used,product.saved,product.spot_check_count,product.admin_id,admin.name AS admin_name,product.modify_time,product.state"
-		where := Map{"ORDER": "modify_time DESC"}
-		count := that.Db.Count("product", where)
-		reData := that.Db.Page(page, pageSize).
-			PageSelect("product", leftJoin, columnStr, where)
-
-		that.Display(0, Map{"count": count, "data": reData})
-	},
-}

example/app/product_line.go

@@ -1,146 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"strings"
-)
-
-var product_lineCtr = Ctr{
-	"info": func(that *Context) {
-		data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
-		str, inData := that.MakeCode.Info(that.RouterString[1], data, that.Db)
-		where := Map{"id": that.RouterString[2]}
-
-		if len(inData) == 1 {
-			inData["id"] = where["id"]
-			where = Map{"AND": inData}
-		} else if len(inData) > 1 {
-			where["OR"] = inData
-			where = Map{"AND": where}
-		}
-
-		re := that.Db.Get(that.RouterString[1], str, where)
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		for k, v := range re {
-			column := that.MakeCode.TableColumns[that.RouterString[1]][k]
-			if column == nil {
-				continue
-			}
-			if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
-				re[column.GetString("link")] = that.Db.Get(column.GetString("link"), "id,"+column.GetString("value"), Map{"id": v})
-			}
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-		inData := that.MakeCode.Add(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "请求参数不足")
-			return
-		}
-
-		re := that.Db.Insert(that.RouterString[1], inData)
-
-		if re == 0 {
-			that.Display(4, "无法插入对应数据")
-			return
-		}
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = index.GetString("index") + ObjToStr(re) + ","
-			that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
-		} else if inData.GetString("index") != "" {
-			inData["index"] = "," + ObjToStr(re) + ","
-			that.Db.Update(that.RouterString[1], Map{"index": inData["index"]}, Map{"id": re})
-		}
-
-		that.Display(0, re)
-	},
-	"update": func(that *Context) {
-		inData := that.MakeCode.Edit(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "没有找到要更新的数据")
-			return
-		}
-
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetString("index") != "" {
-			Index := that.Db.Get(that.RouterString[1], "`index`", Map{"id": that.RouterString[2]})
-			parentIndex := that.Db.Get(that.RouterString[1], "`index`", Map{"id": inData.Get("parent_id")})
-			inData["index"] = parentIndex.GetString("index") + that.RouterString[2] + ","
-
-			childNodes := that.Db.Select(that.RouterString[1], "id,`index`", Map{"index[~]": "," + that.RouterString[2] + ","})
-
-			for _, v := range childNodes {
-				v["index"] = strings.Replace(v.GetString("index"), Index.GetString("index"), inData.GetString("index"), -1)
-				that.Db.Update(that.RouterString[1], Map{"index": v["index"]}, Map{"id": v.GetCeilInt("id")})
-			}
-
-		}
-
-		re := that.Db.Update(that.RouterString[1], inData, Map{"id": that.RouterString[2]})
-
-		if re == 0 {
-			that.Display(4, "更新数据失败")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"remove": func(that *Context) {
-		inData := that.MakeCode.Delete(that.RouterString[1], that.Req)
-		if inData == nil {
-			that.Display(3, "请求参数不足")
-			return
-		}
-		re := int64(0)
-		//索引管理，便于检索以及权限
-		if inData.Get("parent_id") != nil && inData.GetSlice("index") != nil {
-			re = that.Db.Delete(that.RouterString[1], Map{"index[~]": "," + that.RouterString[2] + ","})
-		} else {
-			re = that.Db.Delete(that.RouterString[1], Map{"id": that.RouterString[2]})
-		}
-
-		if re == 0 {
-			that.Display(4, "删除数据失败")
-			return
-		}
-		that.Display(0, "删除成功")
-	},
-
-	"search": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		//page := ObjToInt(that.Req.FormValue("page"))
-		//pageSize := ObjToInt(that.Req.FormValue("pageSize"))
-		//
-		//if page < 1 {
-		//	page = 1
-		//}
-		//if pageSize <= 0 {
-		//	pageSize = 10
-		//}
-
-		//leftJoin := Map{"[><]admin": "product.admin_id=admin.id"}
-
-		where := Map{"state": 0, "ORDER": "modify_time DESC"}
-		//count := that.Db.Count("product", where)
-		reData := that.Db.Select("product_line", "*", where)
-
-		that.Display(0, reData)
-
-	},
-}

example/app/product_spot_check.go

@@ -1,138 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	. "../../../hotime/common"
-	"time"
-)
-
-var product_spot_checkCtr = Ctr{
-	"info": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		id := ObjToInt(that.Req.FormValue("id"))
-		if id == 0 {
-			that.Display(3, "请求参数不足，请检查参数")
-			return
-		}
-
-		re := that.Db.Get("product_spot_check",
-
-			Map{"[><]product": "product_spot_check.product_id=product.id",
-				"[><]produce": "product_spot_check.produce_id=produce.id",
-			},
-			"id,img,product_id,product.name AS product_name,admin_id,"+
-				"modify_time,state,rule,produce_id,produce.name AS produce_name", Map{"id": id})
-
-		if re == nil {
-			that.Display(4, "找不到对应信息")
-			return
-		}
-
-		that.Display(0, re)
-	},
-	"add": func(that *Context) {
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-
-		//img := that.Req.FormValue("img")
-		sn := that.Req.FormValue("sn")
-		rule := that.Req.FormValue("rule_spot_check")
-		description := that.Req.FormValue("description")
-		produceProductId := ObjToInt(that.Req.FormValue("produce_product_id"))
-
-		//count := ObjToInt(that.Req.FormValue("count"))
-		state := ObjToInt(that.Req.FormValue("state"))
-		if rule == "" || produceProductId == 0 {
-			that.Display(3, "参数不足，请补充参数")
-			return
-		}
-
-		produceProduct := that.Db.Get("produce_product", "*", Map{"id": produceProductId})
-		if produceProduct == nil {
-			that.Display(4, "找不到成品记录，无法进行抽检")
-			return
-		}
-		//判断是否已经抽检了
-		alreadyCheck := that.Db.Get("product_spot_check", "id", Map{"produce_product_id": produceProductId})
-
-		if alreadyCheck == nil {
-
-			that.Db.Update("product", Map{"spot_check_count[#]": "spot_check_count+1"},
-				Map{"id": produceProduct.GetCeilInt("product_id")})
-
-			that.Db.Update("produce", Map{"spot_check_count[#]": "spot_check_count+1"},
-				Map{"id": produceProduct.GetCeilInt("produce_id")})
-		}
-
-		data := Map{
-			"sn":                 sn,
-			"rule":               rule,
-			"admin_id":           adminID,
-			"create_time":        time.Now().Unix(),
-			"modify_time":        time.Now().Unix(),
-			"product_id":         produceProduct.GetCeilInt("product_id"),
-			"produce_id":         produceProduct.GetCeilInt("produce_id"),
-			"produce_product_id": produceProductId,
-			"description":        description,
-			"state":              state,
-		}
-
-		id := that.Db.Insert("product_spot_check", data)
-		if id == 0 {
-			that.Display(4, "添加抽检记录失败，请重新添加")
-			return
-		}
-
-		data["id"] = id
-
-		that.Display(0, data)
-	},
-	"search": func(that *Context) {
-
-		adminID := that.Session("id").ToInt()
-
-		if adminID == 0 {
-			that.Display(2, "登录失效，请重新登录")
-			return
-		}
-		page := ObjToInt(that.Req.FormValue("page"))
-		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
-		productId := ObjToInt(that.Req.FormValue("id"))
-
-		if page < 1 {
-			page = 1
-		}
-
-		if pageSize <= 0 {
-			pageSize = 10
-		}
-
-		columnStr := "product_spot_check.id,product_spot_check.product_id,product_spot_check.sn,product.name,product_spot_check.img,product_spot_check.admin_id,admin.name AS admin_name,product_spot_check.modify_time,product_spot_check.state"
-		leftJoin := Map{"[><]product": "product_spot_check.product_id=product.id",
-			"[><]admin": "product_spot_check.admin_id=admin.id",
-		}
-
-		where := Map{"ORDER": "id DESC"}
-
-		if productId != 0 {
-			where["product_id"] = productId
-		}
-
-		count := that.Db.Count("product_spot_check", where)
-
-		reData := that.Db.Page(page, pageSize).
-			PageSelect("product_spot_check", leftJoin, columnStr, where)
-
-		that.Display(0, Map{"count": count, "data": reData})
-	},
-}

example/app/sms.go

@@ -1,33 +0,0 @@
-package app
-
-import (
-	. "../../../hotime"
-	"../../dri/ddsms"
-)
-
-var Sms = Ctr{
-	//只允许微信验证过的或者登录成功的发送短信
-	"send": func(this *Context) {
-		//if this.Session("uid").Data == nil && this.Session("wechatInfo").Data == nil {
-		//	this.Display(2, "没有授权")
-		//	return
-		//}
-		if len(this.Req.FormValue("token")) != 32 {
-			this.Display(2, "没有授权")
-			return
-		}
-
-		phone := this.Req.FormValue("phone")
-		if len(phone) < 11 {
-			this.Display(3, "手机号格式错误")
-			return
-		}
-		code := getCode()
-		this.Session("phone", phone)
-		this.Session("code", code)
-
-		ddsms.DefaultDDY.SendYZM(phone, this.Config.GetString("smsLogin"), map[string]string{"code": code})
-
-		this.Display(0, "发送成功")
-	},
-}

example/config/config.json

@@ -1,49 +0,0 @@
-{
-	"cache": {
-		"db": {
-			"db": false,
-			"session": true
-		},
-		"memory": {
-			"db": true,
-			"session": true,
-			"timeout": 7200
-		}
-	},
-	"codeConfig": {
-		"admin": "config/app.json"
-	},
-	"codeConfig1": {
-		"admin": {
-			"config": "config/app.json",
-			"package": "admin",
-			"rule": "config/rule.json"
-		}
-	},
-	"crossDomain": "auto",
-	"db": {
-		"mysql": {
-			"host": "192.168.6.253",
-			"name": "myhs",
-			"password": "dasda8454456",
-			"port": "3306",
-			"prefix": "",
-			"user": "root"
-		}
-	},
-	"defFile": [
-		"index.html",
-		"index.htm"
-	],
-	"error": {
-		"1": "内部系统异常",
-		"2": "访问权限异常",
-		"3": "请求参数异常",
-		"4": "数据处理异常",
-		"5": "数据结果异常"
-	},
-	"mode": 3,
-	"port": "8080",
-	"sessionName": "HOTIME",
-	"tpt": "tpt"
-}

example/config/configNote.json

@@ -1,72 +0,0 @@
-{
-	"cache": {
-		"db": {
-			"db": "默认false，非必须，缓存数据库，启用后能减少数据库的读写压力",
-			"session": "默认true，非必须，缓存web session，同时缓存session保持的用户缓存",
-			"timeout": "默认60 * 60 * 24 * 30，非必须，过期时间，超时自动删除"
-		},
-		"memory": {
-			"db": "默认true，非必须，缓存数据库，启用后能减少数据库的读写压力",
-			"session": "默认true，非必须，缓存web session，同时缓存session保持的用户缓存",
-			"timeout": "默认60 * 60 * 2，非必须，过期时间，超时自动删除"
-		},
-		"redis": {
-			"db": "默认true，非必须，缓存数据库，启用后能减少数据库的读写压力",
-			"host": "默认服务ip：127.0.0.1，必须，如果需要使用redis服务时配置，",
-			"password": "默认密码空，必须，如果需要使用redis服务时配置，默认密码空",
-			"port": "默认服务端口：6379，必须，如果需要使用redis服务时配置，",
-			"session": "默认true，非必须，缓存web session，同时缓存session保持的用户缓存",
-			"timeout": "默认60 * 60 * 24 * 15，非必须，过期时间，超时自动删除"
-		},
-		"注释": "可配置memory，db，redis，默认启用memory，默认优先级为memory\u003eredis\u003edb,memory与数据库缓存设置项一致，缓存数据填充会自动反方向反哺，加入memory缓存过期将自动从redis更新，但memory永远不会更新redis，如果是集群建议不要开启memory，配置即启用"
-	},
-	"codeConfig": {
-		"packageName": "默认无，必须，包名称以及应用名，生成代码的配置文件地址，比如config/app.json，数据库有更新时自动更新配置文件以及对应的生成文件",
-		"注释": "配置即启用，非必须，默认无"
-	},
-	"crossDomain": "默认空 非必须，空字符串为不开启，如果需要跨域设置，auto为智能开启所有网站允许跨域，http://www.baidu.com为指定域允许跨域",
-	"db": {
-		"mysql": {
-			"host": "默认127.0.0.1，必须，数据库ip地址",
-			"name": "默认test，必须，数据库名称",
-			"password": "默认root，必须，数据库密码",
-			"port": "默认3306，必须，数据库端口",
-			"prefix": "默认空，非必须，数据表前缀",
-			"slave": {
-				"host": "默认127.0.0.1，必须，数据库ip地址",
-				"name": "默认test，必须，数据库名称",
-				"password": "默认root，必须，数据库密码",
-				"port": "默认3306，必须，数据库端口",
-				"user": "默认root，必须，数据库用户名",
-				"注释": "从数据库配置，mysql里配置slave项即启用主从读写，减少数据库压力"
-			},
-			"user": "默认root，必须，数据库用户名",
-			"注释": "除prefix及主从数据库slave项，其他全部必须"
-		},
-		"sqlite": {
-			"path": "默认config/data.db，必须，数据库位置"
-		},
-		"注释": "配置即启用，非必须，默认使用sqlite数据库"
-	},
-	"defFile": "默认访问index.html或者index.htm文件，必须，默认访问文件类型",
-	"error": {
-		"1": "内部系统异常，在环境配置，文件访问权限等基础运行环境条件不足造成严重错误时使用",
-		"2": "访问权限异常，没有登录或者登录异常等时候使用",
-		"3": "请求参数异常，request参数不满足要求，比如参数不足，参数类型错误，参数不满足要求等时候使用",
-		"4": "数据处理异常,数据库操作或者三方请求返回的结果非正常结果，比如数据库突然中断等时候使用",
-		"5": "数据结果异常，一般用于无法给出response要求的格式要求下使用，比如response需要的是string格式但你只能提供int数据时",
-		"注释": "web服务内置错误提示，自定义异常建议10开始"
-	},
-	"logFile": "无默认，非必须，如果需要存储日志文件时使用，保存格式为:a/b/c/20060102150405.txt,将生成：a/b/c/年月日时分秒.txt，按需设置",
-	"logLevel": "默认0，必须，0关闭，1打印，日志等级",
-	"mode": "默认0,非必须，0生产模式，1，测试模式，2开发模式，3内嵌代码模式，在开发模式下会显示更多的数据用于开发测试，并能够辅助研发，自动生成配置文件、代码等功能,web无缓存，数据库不启用缓存",
-	"modeRouterStrict": "默认false,必须，路由严格模式false,为大小写忽略必须匹配，true必须大小写匹配",
-	"port": "默认80，必须，web服务开启Http端口，0为不启用http服务,默认80",
-	"sessionName": "默认HOTIME，必须，设置session的cookie名",
-	"tlsCert": "默认空，非必须，https证书",
-	"tlsKey": "默认空，非必须，https密钥",
-	"tlsPort": "默认空，非必须，web服务https端口，0为不启用https服务",
-	"tpt": "默认tpt，必须，web静态文件目录，默认为程序目录下tpt目录",
-	"webConnectLogFile": "无默认，非必须，webConnectLogShow开启之后才能使用，如果需要存储日志文件时使用，保存格式为:a/b/c/20060102150405.txt,将生成：a/b/c/年月日时分秒.txt，按需设置",
-	"webConnectLogShow": "默认true，非必须，访问日志如果需要web访问链接、访问ip、访问时间打印，false为关闭true开启此功能"
-}

example/main.go

@@ -1,31 +0,0 @@
-package main
-
-import (
-	"../../hotime"
-	"../dri/ddsms"
-	"./app"
-	"fmt"
-	"time"
-)
-
-func main() {
-	date, _ := time.Parse("2006-01-02 15:04", time.Now().Format("2006-01-02")+" 14:00")
-	fmt.Println(date, date.Unix())
-	//fmt.Println("0123456"[1:7])
-	appIns := hotime.Init("config/config.json")
-	//RESTfull接口适配
-	appIns.SetConnectListener(func(context *hotime.Context) bool {
-
-		return true
-	})
-
-	//makeCode := code.MakeCode{}
-	//fmt.Println(common.ObjToStr(makeCode.Db2JSON("admin","test",appIns.Db)))
-	if ddsms.DefaultDDY.ApiKey == "" {
-		ddsms.DefaultDDY.Init(appIns.Config.GetString("smsKey"))
-	}
-
-	appIns.Run(hotime.Router{
-		"app": app.Project,
-	})
-}

example/tpt/css/chunk-1afce11c.7ec257c2.css

@@ -1 +0,0 @@
-.left-nav-home-bar{background:#2c3759!important}.left-nav-home-bar,.left-nav-home-bar i{color:#fff!important}.el-submenu .el-menu-item{height:40px;line-height:40px}.el-menu .el-submenu__title{height:46px;line-height:46px}.left-nav-home-bar i{margin-bottom:6px!important}.el-menu-item-group__title{padding:0 0 0 20px}.head-left[data-v-297b6686],.head-right[data-v-297b6686]{display:flex;justify-content:center;flex-direction:column}.head-right[data-v-297b6686]{align-items:flex-end}.el-upload{height:100px;width:100px}.el-upload img[data-v-012633a9]{height:100%;width:100%;-o-object-fit:cover;object-fit:cover;display:block}.el-upload i[data-v-012633a9]{font-size:40px;margin:30% 31%;display:block}.form-file-item .upload-file .el-upload{width:100px;height:auto;line-height:0;background-color:transparent}.form-file-item .el-button--small{height:32px}.el-input-number--mini{width:100px;margin-right:5px}.el-input-number--mini .el-input{width:100px!important}.basic-form{width:400px}.basic-form .el-input,.basic-form .el-select{width:84px;margin-right:5px}.form-file-item{margin-bottom:5px}.form-file-item .el-upload{width:60px;height:60px;line-height:60px}.form-file-item .file-item .name{width:100px}.form-file-item .name{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.form-list .form-common-item{display:flex;margin-bottom:5px}.form-common-item .name,.form-common-item .value{width:88px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.select-list .select-list-item{display:flex;margin-bottom:5px}.select-list-item .name{width:76px}.select-list-item .name,.select-list-item .value{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.select-list-item .value{width:77px}.select-wrap{text-align:left;margin-bottom:5px}.select-wrap .select-add-name{display:inline-block;width:87px;text-align:right}.select-wrap .el-input{width:84px}.el-input__inner{padding-left:10px;padding-right:5px}.el-upload{height:60px;width:60px;background:#eee;overflow:hidden}

example/tpt/css/chunk-1dd2a8d0.e4ca99de.css

@@ -1 +0,0 @@
-.not-show-tab-label .el-tabs__header,.not-show-tab-search{display:none}

example/tpt/css/chunk-2f62f180.5c448e68.css

@@ -1 +0,0 @@
-.el-upload{height:100px;width:100px}.el-upload img[data-v-012633a9]{height:100%;width:100%;-o-object-fit:cover;object-fit:cover;display:block}.el-upload i[data-v-012633a9]{font-size:40px;margin:30% 31%;display:block}.form-file-item .upload-file .el-upload{width:100px;height:auto;line-height:0;background-color:transparent}.form-file-item .el-button--small{height:32px}.el-input-number--mini{width:100px;margin-right:5px}.el-input-number--mini .el-input{width:100px!important}.basic-form{width:400px}.basic-form .el-input,.basic-form .el-select{width:84px;margin-right:5px}.form-file-item{margin-bottom:5px}.form-file-item .el-upload{width:60px;height:60px;line-height:60px}.form-file-item .file-item .name{width:100px}.form-file-item .name{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.form-list .form-common-item{display:flex;margin-bottom:5px}.form-common-item .name,.form-common-item .value{width:88px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.select-list .select-list-item{display:flex;margin-bottom:5px}.select-list-item .name{width:76px}.select-list-item .name,.select-list-item .value{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.select-list-item .value{width:77px}.select-wrap{text-align:left;margin-bottom:5px}.select-wrap .select-add-name{display:inline-block;width:87px;text-align:right}.select-wrap .el-input{width:84px}.el-input__inner{padding-left:10px;padding-right:5px}.el-upload{height:60px;width:60px;background:#eee;overflow:hidden}

example/tpt/css/chunk-a74869b6.c460e209.css

@@ -1 +0,0 @@
-body[data-v-581864d3],dd[data-v-581864d3],dl[data-v-581864d3],form[data-v-581864d3],h1[data-v-581864d3],h2[data-v-581864d3],h3[data-v-581864d3],h4[data-v-581864d3],h5[data-v-581864d3],h6[data-v-581864d3],html[data-v-581864d3],ol[data-v-581864d3],p[data-v-581864d3],pre[data-v-581864d3],tbody[data-v-581864d3],textarea[data-v-581864d3],tfoot[data-v-581864d3],thead[data-v-581864d3],ul[data-v-581864d3]{margin:0;font-size:14px;font-family:Microsoft YaHei}dl[data-v-581864d3],ol[data-v-581864d3],ul[data-v-581864d3]{padding:0}li[data-v-581864d3]{list-style:none}input[data-v-581864d3]{border:none;outline:none;font-family:Microsoft YaHei;background-color:#fff}a[data-v-581864d3]{font-family:Microsoft YaHei;text-decoration:none}[data-v-581864d3]{margin:0;padding:0}.login[data-v-581864d3]{position:relative;width:100%;height:100%;background-color:#353d56}.login-item[data-v-581864d3]{position:absolute;top:calc(50% - 244px);left:calc(50% - 244px);width:488px;height:488px;padding:80px 0 152px 0;box-sizing:border-box;background-size:468px 468px}.login-item .left-title[data-v-581864d3]{display:inline-block;width:236px;height:100%;border-right:2px solid #88919e;text-align:center;padding-top:68px;box-sizing:border-box}.login-item .left-title p[data-v-581864d3]{font-size:30px;line-height:50px;color:#fff}.login-item .right-content[data-v-581864d3]{display:inline-block;vertical-align:top;padding-left:42px;box-sizing:border-box}.login-item .right-content .login-title[data-v-581864d3]{font-size:16px;color:#fff}.errorMsg[data-v-581864d3]{width:100%;height:34px;line-height:34px;color:red;font-size:14px;overflow:hidden}.login-item .right-content .inputWrap[data-v-581864d3]{width:204px;height:36px;line-height:36px;color:#99a3b2;font-size:14px;border-bottom:3px solid #98a2b1;margin-bottom:10px}.login-item .right-content .inputWrap input[data-v-581864d3]{background-color:transparent;color:#99a3b2}.login-btn[data-v-581864d3]{width:88px;height:36px;text-align:center;line-height:36px;font-size:14px;color:#fff;background-color:#4f619b;border-radius:18px;margin-top:60px;cursor:pointer}

example/tpt/css/chunk-b504df5c.61d7456c.css

@@ -1 +0,0 @@
-.form-file-item .upload-file .el-upload{width:100px;height:auto;line-height:0;background-color:transparent}.form-file-item .el-button--small{height:32px}.el-input-number--mini{width:100px;margin-right:5px}.el-input-number--mini .el-input{width:100px!important}.basic-form{width:400px}.basic-form .el-input,.basic-form .el-select{width:84px;margin-right:5px}.form-file-item{margin-bottom:5px}.form-file-item .el-upload{width:60px;height:60px;line-height:60px}.form-file-item .file-item .name{width:100px}.form-file-item .name{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.form-list .form-common-item{display:flex;margin-bottom:5px}.form-common-item .name,.form-common-item .value{width:88px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.select-list .select-list-item{display:flex;margin-bottom:5px}.select-list-item .name{width:76px}.select-list-item .name,.select-list-item .value{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.select-list-item .value{width:77px}.select-wrap{text-align:left;margin-bottom:5px}.select-wrap .select-add-name{display:inline-block;width:87px;text-align:right}.select-wrap .el-input{width:84px}.el-input__inner{padding-left:10px;padding-right:5px}.el-upload,.el-upload-list--picture-card .el-upload-list__item{height:60px;width:60px}.el-upload-list__item.is-success.focusing .el-icon-close-tip{display:none!important}.el-upload{height:100px;width:100px;background:#eee;overflow:hidden}.file-upload .el-upload{background:transparent;width:100%;height:auto;text-align:left;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.file-upload .el-upload .el-button{margin-right:10px}.el-upload img[data-v-4b440c12]{height:100%;width:100%;-o-object-fit:cover;object-fit:cover;display:block}.el-upload i[data-v-4b440c12]{font-size:40px;margin:30% 31%;display:block}

example/tpt/css/chunk-d1a9ebe6.5cc24c46.css

@@ -1 +0,0 @@
-h3[data-v-28af1b93]{margin:40px 0 0}ul[data-v-28af1b93]{list-style-type:none;padding:0}li[data-v-28af1b93]{display:inline-block;margin:0 10px}a[data-v-28af1b93]{color:#42b983}

example/tpt/index.html

@@ -1,3 +0,0 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title></title><style>body{
-              margin: 0px;
-          }</style><link href="css/chunk-2b8aef56.7087d841.css" rel="prefetch"><link href="css/chunk-38db7d04.2b6ce0ac.css" rel="prefetch"><link href="css/chunk-5c99f384.31e35517.css" rel="prefetch"><link href="css/chunk-60f282ff.83752cba.css" rel="prefetch"><link href="css/chunk-a74869b6.c460e209.css" rel="prefetch"><link href="css/chunk-d1a9ebe6.5cc24c46.css" rel="prefetch"><link href="js/chunk-28c289a1.0ed6fefe.js" rel="prefetch"><link href="js/chunk-2b8aef56.8330998b.js" rel="prefetch"><link href="js/chunk-2c065dd6.d9c3e429.js" rel="prefetch"><link href="js/chunk-38db7d04.18ee879a.js" rel="prefetch"><link href="js/chunk-58db4e7f.c298e695.js" rel="prefetch"><link href="js/chunk-5c99f384.be52d852.js" rel="prefetch"><link href="js/chunk-60f282ff.cbb91cc0.js" rel="prefetch"><link href="js/chunk-78ba61e2.520b239c.js" rel="prefetch"><link href="js/chunk-a74869b6.01e5db7b.js" rel="prefetch"><link href="js/chunk-d1a9ebe6.fba0f501.js" rel="prefetch"><link href="css/app.5e2eb449.css" rel="preload" as="style"><link href="js/app.c87636c4.js" rel="preload" as="script"><link href="css/app.5e2eb449.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but hotime doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/app.c87636c4.js"></script></body></html>

example/tpt/js/chunk-2c065dd6.99c035f4.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-2c065dd6"],{1:function(t,e){},2934:function(t,e,n){"use strict";n.d(e,"e",function(){return o}),n.d(e,"d",function(){return a}),n.d(e,"b",function(){return s}),n.d(e,"c",function(){return u}),n.d(e,"a",function(){return c}),n.d(e,"f",function(){return d});var e=n("b0c0"),r=n("b775"),e=n("4328"),i=n.n(e);function o(t,e){return Object(r.b)({url:t,method:"GET",params:e})}function a(t,e){return Object(r.b)({url:t,method:"GET",params:e})}function s(t,e){return Object(r.b)({url:t,method:"DELETE",data:i.a.stringify(e)})}function u(t,e){return Object(r.b)({url:t,method:"PUT",data:i.a.stringify(e)})}function c(t,e){return Object(r.b)({url:t,method:"POST",data:i.a.stringify(e)})}function d(t){var e=new FormData;return e.append("file",t,t.name),Object(r.b)({url:"file",headers:{"Content-Type":"multipart/form-data"},method:"POST",data:e})}},"83c5":function(t,e,n){"use strict";n("159b");e.a={list:{},constructor:function(){this.list={}},$on:function(t,e){this.list[t]=this.list[t]||[],this.list[t].push(e)},$emit:function(t,e){this.list[t]&&this.list[t].forEach(function(t){t(e)})},$off:function(t){this.list[t]&&delete this.list[t]}}},b775:function(t,e,n){"use strict";n.d(e,"a",function(){return u});var r=n("d3b7"),i=n("bc3a"),r=n.n(i),i=n("4328"),o=n.n(i),a=n("2bea"),s=n("56d7"),u="";r.a.defaults.withCredentials=!0,r.a.defaults.headers.post["Content-Type"]="application/x-www-form-urlencoded;charset=UTF-8";r=r.a.create({baseURL:u,timeout:2e4});r.interceptors.request.use(function(t){return"get"===t.method&&(t.paramsSerializer=function(t){return o.a.stringify(t,{arrayFormat:"repeat"})}),t.withCredentials=!0,t},function(t){Promise.reject(t)}),r.interceptors.response.use(function(t){return 2!==t.data.statu?t.data:(a.b.Message({showClose:!0,message:"登录信息丢失，请重新登陆！",type:"error",duration:2e3,offset:100}),void s.app.$router.push({path:"/login"}))},function(t){var e="err:"+t,n={};return t.response?n=t.response.data:(-1!=e.indexOf("timeout")?(n.code=500,n.message="请求超时，请稍后再试"):-1!=e.indexOf("Network Error")?(n.code=500,n.message="网络错误，请稍后再试"):(n.code=500,n.message=""+t),n)}),e.b=r}}]);

example/tpt/js/chunk-58db4e7f.c298e695.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-58db4e7f"],{"159b":function(c,n,o){var r,t=o("da84"),a=o("fdbc"),f=o("17c2"),i=o("9112");for(r in a){var u=t[r],u=u&&u.prototype;if(u&&u.forEach!==f)try{i(u,"forEach",f)}catch(c){u.forEach=f}}},"17c2":function(c,n,o){"use strict";var r=o("b727").forEach,o=o("a640")("forEach");c.exports=o?[].forEach:function(c){return r(this,c,1<arguments.length?arguments[1]:void 0)}},a640:function(c,n,o){"use strict";var r=o("d039");c.exports=function(c,n){var o=[][c];return!!o&&r(function(){o.call(null,n||function(){throw 1},1)})}}}]);

example/tpt/js/chunk-a74869b6.59e9b13d.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-a74869b6"],{1:function(t,e){},2934:function(t,e,n){"use strict";n.d(e,"e",function(){return a}),n.d(e,"d",function(){return s}),n.d(e,"b",function(){return i}),n.d(e,"c",function(){return c}),n.d(e,"a",function(){return u}),n.d(e,"f",function(){return d});var e=n("b0c0"),o=n("b775"),e=n("4328"),r=n.n(e);function a(t,e){return Object(o.b)({url:t,method:"GET",params:e})}function s(t,e){return Object(o.b)({url:t,method:"GET",params:e})}function i(t,e){return Object(o.b)({url:t,method:"DELETE",data:r.a.stringify(e)})}function c(t,e){return Object(o.b)({url:t,method:"PUT",data:r.a.stringify(e)})}function u(t,e){return Object(o.b)({url:t,method:"POST",data:r.a.stringify(e)})}function d(t){var e=new FormData;return e.append("file",t,t.name),Object(o.b)({url:"file",headers:{"Content-Type":"multipart/form-data"},method:"POST",data:e})}},"40a7":function(t,e,n){},"578a":function(t,e,n){"use strict";n.r(e);n("b0c0");var s=n("9f9f");Object(s.O)("data-v-581864d3");var i={class:"login",style:{width:"100%",height:"100vh"}},c={class:"login-item"},u={class:"left-title"},d={class:"right-content"},l=Object(s.o)("p",{class:"login-title"},"登录",-1),f={style:{height:"40px"}},b={class:"inputWrap"},p=Object(s.r)(" 账号："),m={class:"inputWrap"},h=Object(s.r)(" 密码：");Object(s.M)();var o=n("2934"),r={name:"Login",data:function(){return{showLog:!1,showLogInfo:"",label:"HoTime DashBoard",form:{name:"",password:""}}},methods:{login:function(){var e=this;if(""==this.name||""==this.password)return this.showLogInfo="参数不足！",void(this.showLog=!0);Object(o.a)(window.Hotime.data.name+"/hotime/login",e.form).then(function(t){return 0!=t.status?(e.showLogInfo=t.error.msg,void(e.showLog=!0)):void e.$router.push({path:"/"})})}},mounted:function(){this.label=window.Hotime.data.label}};n("8d39");r.render=function(t,e,n,o,r,a){return Object(s.L)(),Object(s.n)("div",i,[Object(s.o)("div",c,[Object(s.o)("div",u,[Object(s.o)("p",null,Object(s.Y)(r.label),1)]),Object(s.o)("div",d,[l,Object(s.o)("div",f,[Object(s.kb)(Object(s.o)("p",{class:"errorMsg"},Object(s.Y)(r.showLogInfo),513),[[s.gb,r.showLog]])]),Object(s.o)("p",b,[p,Object(s.kb)(Object(s.o)("input",{type:"text","onUpdate:modelValue":e[0]||(e[0]=function(t){return r.form.name=t}),class:"accountVal"},null,512),[[s.fb,r.form.name]])]),Object(s.o)("p",m,[h,Object(s.kb)(Object(s.o)("input",{type:"password","onUpdate:modelValue":e[1]||(e[1]=function(t){return r.form.password=t}),class:"passwordVal"},null,512),[[s.fb,r.form.password]])]),Object(s.o)("p",{class:"login-btn",onClick:e[2]||(e[2]=function(){return a.login&&a.login.apply(a,arguments)})},"登录")])])])},r.__scopeId="data-v-581864d3";e.default=r},"8d39":function(t,e,n){"use strict";n("40a7")},b775:function(t,e,n){"use strict";n.d(e,"a",function(){return c});var o=n("d3b7"),r=n("bc3a"),o=n.n(r),r=n("4328"),a=n.n(r),s=n("2bea"),i=n("56d7"),c="";o.a.defaults.withCredentials=!0,o.a.defaults.headers.post["Content-Type"]="application/x-www-form-urlencoded;charset=UTF-8";o=o.a.create({baseURL:c,timeout:2e4});o.interceptors.request.use(function(t){return"get"===t.method&&(t.paramsSerializer=function(t){return a.a.stringify(t,{arrayFormat:"repeat"})}),t.withCredentials=!0,t},function(t){Promise.reject(t)}),o.interceptors.response.use(function(t){return 2!==t.data.statu?t.data:(s.b.Message({showClose:!0,message:"登录信息丢失，请重新登陆！",type:"error",duration:2e3,offset:100}),void i.app.$router.push({path:"/login"}))},function(t){var e="err:"+t,n={};return t.response?n=t.response.data:(-1!=e.indexOf("timeout")?(n.code=500,n.message="请求超时，请稍后再试"):-1!=e.indexOf("Network Error")?(n.code=500,n.message="网络错误，请稍后再试"):(n.code=500,n.message=""+t),n)}),e.b=o}}]);

example/tpt/js/chunk-d1a9ebe6.fba0f501.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-d1a9ebe6"],{"587e":function(a,e,t){"use strict";t.r(e);var n=t("9f9f");Object(n.O)("data-v-28af1b93");var v={class:"hello"},b=Object(n.q)('<p data-v-28af1b93> For a guide and recipes on how to configure / customize this project,<br data-v-28af1b93> check out the <a href="https://cli.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>vue-cli documentation</a>. </p><h3 data-v-28af1b93>Installed CLI Plugins</h3><ul data-v-28af1b93><li data-v-28af1b93><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel" target="_blank" rel="noopener" data-v-28af1b93>babel</a></li><li data-v-28af1b93><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint" target="_blank" rel="noopener" data-v-28af1b93>eslint</a></li></ul><h3 data-v-28af1b93>Essential Links</h3><ul data-v-28af1b93><li data-v-28af1b93><a href="https://vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>Core Docs</a></li><li data-v-28af1b93><a href="https://forum.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>Forum</a></li><li data-v-28af1b93><a href="https://chat.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>Community Chat</a></li><li data-v-28af1b93><a href="https://twitter.com/vuejs" target="_blank" rel="noopener" data-v-28af1b93>Twitter</a></li><li data-v-28af1b93><a href="https://news.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>News</a></li></ul><h3 data-v-28af1b93>Ecosystem</h3><ul data-v-28af1b93><li data-v-28af1b93><a href="https://router.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>vue-router</a></li><li data-v-28af1b93><a href="https://vuex.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>vuex</a></li><li data-v-28af1b93><a href="https://github.com/vuejs/vue-devtools#vue-devtools" target="_blank" rel="noopener" data-v-28af1b93>vue-devtools</a></li><li data-v-28af1b93><a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener" data-v-28af1b93>vue-loader</a></li><li data-v-28af1b93><a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener" data-v-28af1b93>awesome-vue</a></li></ul>',7);Object(n.M)();var r={name:"HelloWorld",props:{msg:String}};t("6fe9");r.render=function(a,e,t,r,l,o){return Object(n.L)(),Object(n.n)("div",v,[Object(n.o)("h1",null,Object(n.Y)(t.msg),1),b])},r.__scopeId="data-v-28af1b93";e.default=r},"6fe9":function(a,e,t){"use strict";t("e8a7")},e8a7:function(a,e,t){}}]);

go.mod

@@ -0,0 +1,15 @@
+module code.hoteas.com/golang/hotime
+
+go 1.16
+
+require (
+	github.com/garyburd/redigo v1.6.3
+	github.com/go-pay/gopay v1.5.78
+	github.com/go-sql-driver/mysql v1.6.0
+	github.com/mattn/go-sqlite3 v1.14.12
+	github.com/silenceper/wechat/v2 v2.1.2
+	github.com/sirupsen/logrus v1.8.1
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.364
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr v1.0.364
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+)

go.sum

@@ -0,0 +1,72 @@
+github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
+github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/garyburd/redigo v1.6.3 h1:HCeeRluvAgMusMomi1+6Y5dmFOdYV/JzoRrrbFlkGIc=
+github.com/garyburd/redigo v1.6.3/go.mod h1:rTb6epsqigu3kYKBnaF028A7Tf/Aw5s0cqA47doKKqw=
+github.com/go-pay/gopay v1.5.78 h1:wIHp8g/jK0ik5bZo2MWt3jAQsktT3nkdXZxlRZvljko=
+github.com/go-pay/gopay v1.5.78/go.mod h1:M6Nlk2VdZHCbWphOw3rtbnz4SiOk6Xvxg6mxwDfg+Ps=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/gomodule/redigo v1.8.5 h1:nRAxCa+SVsyjSBrtZmG/cqb6VbTmuRzpg/PoTFlpumc=
+github.com/gomodule/redigo v1.8.5/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
+github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/silenceper/wechat/v2 v2.1.2 h1:+QfIMiYfwST2ZloTwmYp0O0p5Y1LYRZxfLWfMuSE30k=
+github.com/silenceper/wechat/v2 v2.1.2/go.mod h1:0OprxYCCp2CZAKw06BBlnaczInTk2KxOLsKeiopshGg=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
+github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.364 h1:X1Jws4XqrTH+p7FBQ7BpjW4qFXObKHWm0/XhW/GvqRs=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.364/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr v1.0.364 h1:kbor60vo37v7Hu+i17gooox9Rw281fVHNna8zwtDG1w=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr v1.0.364/go.mod h1:LeIUBOLhc+Y5YCEpZrULPD9lgoXXV4/EmIcoEvmHz9c=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o=
+golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

manage/manage.go

@@ -44,17 +44,17 @@ func Run() {
 	appIns.Run(hotime.Router{
 		"app": hotime.Proj{
 			"index": hotime.Ctr{
-				"test": func(this *hotime.Context) {
-					fmt.Println(this.Db.GetTag())
-					//x := this.Db.Action(func(db hotime.HoTimeDB) bool {
+				"test": func(that *hotime.Context) {
+					fmt.Println(that.Db.GetTag())
+					//x := that.Db.Action(func(db hotime.HoTimeDB) bool {
 					//
 					//	db.Insert("user", hotime.Map{"unickname": "dasdas"})
 					//
 					//	return true
 					//})
-					this.Display(0, 1)
+					that.Display(0, 1)
 				},
-				"websocket": func(this *hotime.Context) {
+				"websocket": func(that *hotime.Context) {
 					hdler := websocket.Handler(func(ws *websocket.Conn) {
 						for true {
 							msg := make([]byte, 5120)
@@ -73,7 +73,7 @@ func Run() {
 							fmt.Printf("Send: %s\n", msg[:m])
 						}
 					})
-					hdler.ServeHTTP(this.Resp, this.Req)
+					hdler.ServeHTTP(that.Resp, that.Req)
 				},
 			},
 		},

session.go

@@ -1,8 +1,8 @@
 package hotime
 
 import (
-	. "./cache"
-	. "./common"
+	. "code.hoteas.com/golang/hotime/cache"
+	. "code.hoteas.com/golang/hotime/common"
 )
 
 //session对象

type.go

@@ -5,4 +5,4 @@ type Ctr map[string]Method
 type Proj map[string]Ctr
 type Router map[string]Proj
 type MethodRouter map[string]Method //直接字符串关联函数
-type Method func(this *Context)
+type Method func(that *Context)

var.go

@@ -1,7 +1,7 @@
 package hotime
 
 import (
-	. "./common"
+	. "code.hoteas.com/golang/hotime/common"
 )
 
 var IsRun = false                   //当前状态
@@ -10,15 +10,17 @@ var App = map[string]*Application{} //整个项目
 //var Db = HoTimeDB{}                         //数据库实例
 
 var Config = Map{
-	"mode": 3, //模式 0生产模式，1，测试模式，2，开发模式,3，内嵌代码模式
-	"codeConfig": Map{
-		"admin": "config/app.json",
-	},
-	"codeConfig1": Map{
-		"admin": Map{ //默认无，必须，接口类别名称
-			"package": "admin",            //默认admin，非必须，有则生成代码到此目录，无则采用缺省模式不生成代码只生成接口
-			"config":  "config/app.json",  //默认config/app.json，必须，接口描述配置文件
-			"rule":    "config/rule.json", //默认config/rule.json，非必须，有则按改规则生成接口，无则按系统内嵌方式生成
+	"mode": 2, //模式 0生产模式，1，测试模式，2，开发模式
+	//"codeConfig": Map{
+	//	"admin": "config/app.json",
+	//},
+	"codeConfig": Slice{
+		Map{
+			"table":  "admin",            //默认admin，必须，有则根据数据库内当前表名做为用户生成数据
+			"name":   "",                 //默认admin，非必须，有则生成代码到此目录，无则采用缺省模式使用表名
+			"config": "config/app.json",  //默认config/app.json，必须，接口描述配置文件
+			"rule":   "config/rule.json", //默认config/rule.json，非必须，有则按改规则生成接口，无则按系统内嵌方式生成
+			"mode":   0,                  //默认0，非必须，0为内嵌代码模式，1为生成代码模式
 		},
 	},
 	"db": Map{
@@ -52,12 +54,23 @@ var ConfigNote = Map{
 	"webConnectLogShow": "默认true，非必须，访问日志如果需要web访问链接、访问ip、访问时间打印，false为关闭true开启此功能",
 	"webConnectLogFile": "无默认，非必须，webConnectLogShow开启之后才能使用，如果需要存储日志文件时使用，保存格式为:a/b/c/20060102150405.txt,将生成：a/b/c/年月日时分秒.txt，按需设置",
 	"mode":              "默认0,非必须，0生产模式，1，测试模式，2开发模式，3内嵌代码模式，在开发模式下会显示更多的数据用于开发测试，并能够辅助研发，自动生成配置文件、代码等功能,web无缓存，数据库不启用缓存", //debug 0关闭1开启
-	"codeConfig": Map{
-		"注释": "配置即启用，非必须，默认无",
-		//"package":"默认admin，必须，mode模式为2时会自动生成包文件夹和代码文件",
-		//"path":""
-
-		"packageName": "默认无，必须，包名称以及应用名，生成代码的配置文件地址，比如config/app.json，数据库有更新时自动更新配置文件以及对应的生成文件",
+	//"codeConfig": Map{
+	//	"注释": "配置即启用，非必须，默认无",
+	//	//"package":"默认admin，必须，mode模式为2时会自动生成包文件夹和代码文件",
+	//	//"path":""
+	//
+	//	"packageName": "默认无，必须，包名称以及应用名，生成代码的配置文件地址，比如config/app.json，数据库有更新时自动更新配置文件以及对应的生成文件",
+	//},
+	"codeConfig": Slice{
+		"注释:配置即启用，非必须，默认无",
+		Map{ //默认无，必须，接口类别名称
+			//"注释":     "", //
+			"table":  "默认admin，必须，根据数据库内当前表名做为用户生成数据",
+			"name":   "默认无，非必须，有则生成代码到此目录，无则采用缺省模式使用表名，如设置为：admin，将在admin目录生成包名为admin的代码",
+			"config": "默认config/app.json，必须，接口描述配置文件", //
+			"rule":   "默认config/rule.json，非必须，有则按改规则生成接口，无则按系统内嵌方式生成",
+			"mode":   "默认0，非必须，0为内嵌代码模式，1为生成代码模式",
+		},
 	},
 	"db": Map{
 		"注释": "配置即启用，非必须，默认使用sqlite数据库",

vendor/github.com/bradfitz/gomemcache/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

vendor/github.com/bradfitz/gomemcache/memcache/memcache.go

@@ -0,0 +1,718 @@
+/*
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package memcache provides a client for the memcached cache server.
+package memcache
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+// Similar to:
+// https://godoc.org/google.golang.org/appengine/memcache
+
+var (
+	// ErrCacheMiss means that a Get failed because the item wasn't present.
+	ErrCacheMiss = errors.New("memcache: cache miss")
+
+	// ErrCASConflict means that a CompareAndSwap call failed due to the
+	// cached value being modified between the Get and the CompareAndSwap.
+	// If the cached value was simply evicted rather than replaced,
+	// ErrNotStored will be returned instead.
+	ErrCASConflict = errors.New("memcache: compare-and-swap conflict")
+
+	// ErrNotStored means that a conditional write operation (i.e. Add or
+	// CompareAndSwap) failed because the condition was not satisfied.
+	ErrNotStored = errors.New("memcache: item not stored")
+
+	// ErrServer means that a server error occurred.
+	ErrServerError = errors.New("memcache: server error")
+
+	// ErrNoStats means that no statistics were available.
+	ErrNoStats = errors.New("memcache: no statistics available")
+
+	// ErrMalformedKey is returned when an invalid key is used.
+	// Keys must be at maximum 250 bytes long and not
+	// contain whitespace or control characters.
+	ErrMalformedKey = errors.New("malformed: key is too long or contains invalid characters")
+
+	// ErrNoServers is returned when no servers are configured or available.
+	ErrNoServers = errors.New("memcache: no servers configured or available")
+)
+
+const (
+	// DefaultTimeout is the default socket read/write timeout.
+	DefaultTimeout = 100 * time.Millisecond
+
+	// DefaultMaxIdleConns is the default maximum number of idle connections
+	// kept for any single address.
+	DefaultMaxIdleConns = 2
+)
+
+const buffered = 8 // arbitrary buffered channel size, for readability
+
+// resumableError returns true if err is only a protocol-level cache error.
+// This is used to determine whether or not a server connection should
+// be re-used or not. If an error occurs, by default we don't reuse the
+// connection, unless it was just a cache error.
+func resumableError(err error) bool {
+	switch err {
+	case ErrCacheMiss, ErrCASConflict, ErrNotStored, ErrMalformedKey:
+		return true
+	}
+	return false
+}
+
+func legalKey(key string) bool {
+	if len(key) > 250 {
+		return false
+	}
+	for i := 0; i < len(key); i++ {
+		if key[i] <= ' ' || key[i] == 0x7f {
+			return false
+		}
+	}
+	return true
+}
+
+var (
+	crlf            = []byte("\r\n")
+	space           = []byte(" ")
+	resultOK        = []byte("OK\r\n")
+	resultStored    = []byte("STORED\r\n")
+	resultNotStored = []byte("NOT_STORED\r\n")
+	resultExists    = []byte("EXISTS\r\n")
+	resultNotFound  = []byte("NOT_FOUND\r\n")
+	resultDeleted   = []byte("DELETED\r\n")
+	resultEnd       = []byte("END\r\n")
+	resultOk        = []byte("OK\r\n")
+	resultTouched   = []byte("TOUCHED\r\n")
+
+	resultClientErrorPrefix = []byte("CLIENT_ERROR ")
+	versionPrefix           = []byte("VERSION")
+)
+
+// New returns a memcache client using the provided server(s)
+// with equal weight. If a server is listed multiple times,
+// it gets a proportional amount of weight.
+func New(server ...string) *Client {
+	ss := new(ServerList)
+	ss.SetServers(server...)
+	return NewFromSelector(ss)
+}
+
+// NewFromSelector returns a new Client using the provided ServerSelector.
+func NewFromSelector(ss ServerSelector) *Client {
+	return &Client{selector: ss}
+}
+
+// Client is a memcache client.
+// It is safe for unlocked use by multiple concurrent goroutines.
+type Client struct {
+	// Timeout specifies the socket read/write timeout.
+	// If zero, DefaultTimeout is used.
+	Timeout time.Duration
+
+	// MaxIdleConns specifies the maximum number of idle connections that will
+	// be maintained per address. If less than one, DefaultMaxIdleConns will be
+	// used.
+	//
+	// Consider your expected traffic rates and latency carefully. This should
+	// be set to a number higher than your peak parallel requests.
+	MaxIdleConns int
+
+	selector ServerSelector
+
+	lk       sync.Mutex
+	freeconn map[string][]*conn
+}
+
+// Item is an item to be got or stored in a memcached server.
+type Item struct {
+	// Key is the Item's key (250 bytes maximum).
+	Key string
+
+	// Value is the Item's value.
+	Value []byte
+
+	// Flags are server-opaque flags whose semantics are entirely
+	// up to the app.
+	Flags uint32
+
+	// Expiration is the cache expiration time, in seconds: either a relative
+	// time from now (up to 1 month), or an absolute Unix epoch time.
+	// Zero means the Item has no expiration time.
+	Expiration int32
+
+	// Compare and swap ID.
+	casid uint64
+}
+
+// conn is a connection to a server.
+type conn struct {
+	nc   net.Conn
+	rw   *bufio.ReadWriter
+	addr net.Addr
+	c    *Client
+}
+
+// release returns this connection back to the client's free pool
+func (cn *conn) release() {
+	cn.c.putFreeConn(cn.addr, cn)
+}
+
+func (cn *conn) extendDeadline() {
+	cn.nc.SetDeadline(time.Now().Add(cn.c.netTimeout()))
+}
+
+// condRelease releases this connection if the error pointed to by err
+// is nil (not an error) or is only a protocol level error (e.g. a
+// cache miss).  The purpose is to not recycle TCP connections that
+// are bad.
+func (cn *conn) condRelease(err *error) {
+	if *err == nil || resumableError(*err) {
+		cn.release()
+	} else {
+		cn.nc.Close()
+	}
+}
+
+func (c *Client) putFreeConn(addr net.Addr, cn *conn) {
+	c.lk.Lock()
+	defer c.lk.Unlock()
+	if c.freeconn == nil {
+		c.freeconn = make(map[string][]*conn)
+	}
+	freelist := c.freeconn[addr.String()]
+	if len(freelist) >= c.maxIdleConns() {
+		cn.nc.Close()
+		return
+	}
+	c.freeconn[addr.String()] = append(freelist, cn)
+}
+
+func (c *Client) getFreeConn(addr net.Addr) (cn *conn, ok bool) {
+	c.lk.Lock()
+	defer c.lk.Unlock()
+	if c.freeconn == nil {
+		return nil, false
+	}
+	freelist, ok := c.freeconn[addr.String()]
+	if !ok || len(freelist) == 0 {
+		return nil, false
+	}
+	cn = freelist[len(freelist)-1]
+	c.freeconn[addr.String()] = freelist[:len(freelist)-1]
+	return cn, true
+}
+
+func (c *Client) netTimeout() time.Duration {
+	if c.Timeout != 0 {
+		return c.Timeout
+	}
+	return DefaultTimeout
+}
+
+func (c *Client) maxIdleConns() int {
+	if c.MaxIdleConns > 0 {
+		return c.MaxIdleConns
+	}
+	return DefaultMaxIdleConns
+}
+
+// ConnectTimeoutError is the error type used when it takes
+// too long to connect to the desired host. This level of
+// detail can generally be ignored.
+type ConnectTimeoutError struct {
+	Addr net.Addr
+}
+
+func (cte *ConnectTimeoutError) Error() string {
+	return "memcache: connect timeout to " + cte.Addr.String()
+}
+
+func (c *Client) dial(addr net.Addr) (net.Conn, error) {
+	type connError struct {
+		cn  net.Conn
+		err error
+	}
+
+	nc, err := net.DialTimeout(addr.Network(), addr.String(), c.netTimeout())
+	if err == nil {
+		return nc, nil
+	}
+
+	if ne, ok := err.(net.Error); ok && ne.Timeout() {
+		return nil, &ConnectTimeoutError{addr}
+	}
+
+	return nil, err
+}
+
+func (c *Client) getConn(addr net.Addr) (*conn, error) {
+	cn, ok := c.getFreeConn(addr)
+	if ok {
+		cn.extendDeadline()
+		return cn, nil
+	}
+	nc, err := c.dial(addr)
+	if err != nil {
+		return nil, err
+	}
+	cn = &conn{
+		nc:   nc,
+		addr: addr,
+		rw:   bufio.NewReadWriter(bufio.NewReader(nc), bufio.NewWriter(nc)),
+		c:    c,
+	}
+	cn.extendDeadline()
+	return cn, nil
+}
+
+func (c *Client) onItem(item *Item, fn func(*Client, *bufio.ReadWriter, *Item) error) error {
+	addr, err := c.selector.PickServer(item.Key)
+	if err != nil {
+		return err
+	}
+	cn, err := c.getConn(addr)
+	if err != nil {
+		return err
+	}
+	defer cn.condRelease(&err)
+	if err = fn(c, cn.rw, item); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *Client) FlushAll() error {
+	return c.selector.Each(c.flushAllFromAddr)
+}
+
+// Get gets the item for the given key. ErrCacheMiss is returned for a
+// memcache cache miss. The key must be at most 250 bytes in length.
+func (c *Client) Get(key string) (item *Item, err error) {
+	err = c.withKeyAddr(key, func(addr net.Addr) error {
+		return c.getFromAddr(addr, []string{key}, func(it *Item) { item = it })
+	})
+	if err == nil && item == nil {
+		err = ErrCacheMiss
+	}
+	return
+}
+
+// Touch updates the expiry for the given key. The seconds parameter is either
+// a Unix timestamp or, if seconds is less than 1 month, the number of seconds
+// into the future at which time the item will expire. Zero means the item has
+// no expiration time. ErrCacheMiss is returned if the key is not in the cache.
+// The key must be at most 250 bytes in length.
+func (c *Client) Touch(key string, seconds int32) (err error) {
+	return c.withKeyAddr(key, func(addr net.Addr) error {
+		return c.touchFromAddr(addr, []string{key}, seconds)
+	})
+}
+
+func (c *Client) withKeyAddr(key string, fn func(net.Addr) error) (err error) {
+	if !legalKey(key) {
+		return ErrMalformedKey
+	}
+	addr, err := c.selector.PickServer(key)
+	if err != nil {
+		return err
+	}
+	return fn(addr)
+}
+
+func (c *Client) withAddrRw(addr net.Addr, fn func(*bufio.ReadWriter) error) (err error) {
+	cn, err := c.getConn(addr)
+	if err != nil {
+		return err
+	}
+	defer cn.condRelease(&err)
+	return fn(cn.rw)
+}
+
+func (c *Client) withKeyRw(key string, fn func(*bufio.ReadWriter) error) error {
+	return c.withKeyAddr(key, func(addr net.Addr) error {
+		return c.withAddrRw(addr, fn)
+	})
+}
+
+func (c *Client) getFromAddr(addr net.Addr, keys []string, cb func(*Item)) error {
+	return c.withAddrRw(addr, func(rw *bufio.ReadWriter) error {
+		if _, err := fmt.Fprintf(rw, "gets %s\r\n", strings.Join(keys, " ")); err != nil {
+			return err
+		}
+		if err := rw.Flush(); err != nil {
+			return err
+		}
+		if err := parseGetResponse(rw.Reader, cb); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+// flushAllFromAddr send the flush_all command to the given addr
+func (c *Client) flushAllFromAddr(addr net.Addr) error {
+	return c.withAddrRw(addr, func(rw *bufio.ReadWriter) error {
+		if _, err := fmt.Fprintf(rw, "flush_all\r\n"); err != nil {
+			return err
+		}
+		if err := rw.Flush(); err != nil {
+			return err
+		}
+		line, err := rw.ReadSlice('\n')
+		if err != nil {
+			return err
+		}
+		switch {
+		case bytes.Equal(line, resultOk):
+			break
+		default:
+			return fmt.Errorf("memcache: unexpected response line from flush_all: %q", string(line))
+		}
+		return nil
+	})
+}
+
+// ping sends the version command to the given addr
+func (c *Client) ping(addr net.Addr) error {
+	return c.withAddrRw(addr, func(rw *bufio.ReadWriter) error {
+		if _, err := fmt.Fprintf(rw, "version\r\n"); err != nil {
+			return err
+		}
+		if err := rw.Flush(); err != nil {
+			return err
+		}
+		line, err := rw.ReadSlice('\n')
+		if err != nil {
+			return err
+		}
+
+		switch {
+		case bytes.HasPrefix(line, versionPrefix):
+			break
+		default:
+			return fmt.Errorf("memcache: unexpected response line from ping: %q", string(line))
+		}
+		return nil
+	})
+}
+
+func (c *Client) touchFromAddr(addr net.Addr, keys []string, expiration int32) error {
+	return c.withAddrRw(addr, func(rw *bufio.ReadWriter) error {
+		for _, key := range keys {
+			if _, err := fmt.Fprintf(rw, "touch %s %d\r\n", key, expiration); err != nil {
+				return err
+			}
+			if err := rw.Flush(); err != nil {
+				return err
+			}
+			line, err := rw.ReadSlice('\n')
+			if err != nil {
+				return err
+			}
+			switch {
+			case bytes.Equal(line, resultTouched):
+				break
+			case bytes.Equal(line, resultNotFound):
+				return ErrCacheMiss
+			default:
+				return fmt.Errorf("memcache: unexpected response line from touch: %q", string(line))
+			}
+		}
+		return nil
+	})
+}
+
+// GetMulti is a batch version of Get. The returned map from keys to
+// items may have fewer elements than the input slice, due to memcache
+// cache misses. Each key must be at most 250 bytes in length.
+// If no error is returned, the returned map will also be non-nil.
+func (c *Client) GetMulti(keys []string) (map[string]*Item, error) {
+	var lk sync.Mutex
+	m := make(map[string]*Item)
+	addItemToMap := func(it *Item) {
+		lk.Lock()
+		defer lk.Unlock()
+		m[it.Key] = it
+	}
+
+	keyMap := make(map[net.Addr][]string)
+	for _, key := range keys {
+		if !legalKey(key) {
+			return nil, ErrMalformedKey
+		}
+		addr, err := c.selector.PickServer(key)
+		if err != nil {
+			return nil, err
+		}
+		keyMap[addr] = append(keyMap[addr], key)
+	}
+
+	ch := make(chan error, buffered)
+	for addr, keys := range keyMap {
+		go func(addr net.Addr, keys []string) {
+			ch <- c.getFromAddr(addr, keys, addItemToMap)
+		}(addr, keys)
+	}
+
+	var err error
+	for _ = range keyMap {
+		if ge := <-ch; ge != nil {
+			err = ge
+		}
+	}
+	return m, err
+}
+
+// parseGetResponse reads a GET response from r and calls cb for each
+// read and allocated Item
+func parseGetResponse(r *bufio.Reader, cb func(*Item)) error {
+	for {
+		line, err := r.ReadSlice('\n')
+		if err != nil {
+			return err
+		}
+		if bytes.Equal(line, resultEnd) {
+			return nil
+		}
+		it := new(Item)
+		size, err := scanGetResponseLine(line, it)
+		if err != nil {
+			return err
+		}
+		it.Value = make([]byte, size+2)
+		_, err = io.ReadFull(r, it.Value)
+		if err != nil {
+			it.Value = nil
+			return err
+		}
+		if !bytes.HasSuffix(it.Value, crlf) {
+			it.Value = nil
+			return fmt.Errorf("memcache: corrupt get result read")
+		}
+		it.Value = it.Value[:size]
+		cb(it)
+	}
+}
+
+// scanGetResponseLine populates it and returns the declared size of the item.
+// It does not read the bytes of the item.
+func scanGetResponseLine(line []byte, it *Item) (size int, err error) {
+	pattern := "VALUE %s %d %d %d\r\n"
+	dest := []interface{}{&it.Key, &it.Flags, &size, &it.casid}
+	if bytes.Count(line, space) == 3 {
+		pattern = "VALUE %s %d %d\r\n"
+		dest = dest[:3]
+	}
+	n, err := fmt.Sscanf(string(line), pattern, dest...)
+	if err != nil || n != len(dest) {
+		return -1, fmt.Errorf("memcache: unexpected line in get response: %q", line)
+	}
+	return size, nil
+}
+
+// Set writes the given item, unconditionally.
+func (c *Client) Set(item *Item) error {
+	return c.onItem(item, (*Client).set)
+}
+
+func (c *Client) set(rw *bufio.ReadWriter, item *Item) error {
+	return c.populateOne(rw, "set", item)
+}
+
+// Add writes the given item, if no value already exists for its
+// key. ErrNotStored is returned if that condition is not met.
+func (c *Client) Add(item *Item) error {
+	return c.onItem(item, (*Client).add)
+}
+
+func (c *Client) add(rw *bufio.ReadWriter, item *Item) error {
+	return c.populateOne(rw, "add", item)
+}
+
+// Replace writes the given item, but only if the server *does*
+// already hold data for this key
+func (c *Client) Replace(item *Item) error {
+	return c.onItem(item, (*Client).replace)
+}
+
+func (c *Client) replace(rw *bufio.ReadWriter, item *Item) error {
+	return c.populateOne(rw, "replace", item)
+}
+
+// CompareAndSwap writes the given item that was previously returned
+// by Get, if the value was neither modified or evicted between the
+// Get and the CompareAndSwap calls. The item's Key should not change
+// between calls but all other item fields may differ. ErrCASConflict
+// is returned if the value was modified in between the
+// calls. ErrNotStored is returned if the value was evicted in between
+// the calls.
+func (c *Client) CompareAndSwap(item *Item) error {
+	return c.onItem(item, (*Client).cas)
+}
+
+func (c *Client) cas(rw *bufio.ReadWriter, item *Item) error {
+	return c.populateOne(rw, "cas", item)
+}
+
+func (c *Client) populateOne(rw *bufio.ReadWriter, verb string, item *Item) error {
+	if !legalKey(item.Key) {
+		return ErrMalformedKey
+	}
+	var err error
+	if verb == "cas" {
+		_, err = fmt.Fprintf(rw, "%s %s %d %d %d %d\r\n",
+			verb, item.Key, item.Flags, item.Expiration, len(item.Value), item.casid)
+	} else {
+		_, err = fmt.Fprintf(rw, "%s %s %d %d %d\r\n",
+			verb, item.Key, item.Flags, item.Expiration, len(item.Value))
+	}
+	if err != nil {
+		return err
+	}
+	if _, err = rw.Write(item.Value); err != nil {
+		return err
+	}
+	if _, err := rw.Write(crlf); err != nil {
+		return err
+	}
+	if err := rw.Flush(); err != nil {
+		return err
+	}
+	line, err := rw.ReadSlice('\n')
+	if err != nil {
+		return err
+	}
+	switch {
+	case bytes.Equal(line, resultStored):
+		return nil
+	case bytes.Equal(line, resultNotStored):
+		return ErrNotStored
+	case bytes.Equal(line, resultExists):
+		return ErrCASConflict
+	case bytes.Equal(line, resultNotFound):
+		return ErrCacheMiss
+	}
+	return fmt.Errorf("memcache: unexpected response line from %q: %q", verb, string(line))
+}
+
+func writeReadLine(rw *bufio.ReadWriter, format string, args ...interface{}) ([]byte, error) {
+	_, err := fmt.Fprintf(rw, format, args...)
+	if err != nil {
+		return nil, err
+	}
+	if err := rw.Flush(); err != nil {
+		return nil, err
+	}
+	line, err := rw.ReadSlice('\n')
+	return line, err
+}
+
+func writeExpectf(rw *bufio.ReadWriter, expect []byte, format string, args ...interface{}) error {
+	line, err := writeReadLine(rw, format, args...)
+	if err != nil {
+		return err
+	}
+	switch {
+	case bytes.Equal(line, resultOK):
+		return nil
+	case bytes.Equal(line, expect):
+		return nil
+	case bytes.Equal(line, resultNotStored):
+		return ErrNotStored
+	case bytes.Equal(line, resultExists):
+		return ErrCASConflict
+	case bytes.Equal(line, resultNotFound):
+		return ErrCacheMiss
+	}
+	return fmt.Errorf("memcache: unexpected response line: %q", string(line))
+}
+
+// Delete deletes the item with the provided key. The error ErrCacheMiss is
+// returned if the item didn't already exist in the cache.
+func (c *Client) Delete(key string) error {
+	return c.withKeyRw(key, func(rw *bufio.ReadWriter) error {
+		return writeExpectf(rw, resultDeleted, "delete %s\r\n", key)
+	})
+}
+
+// DeleteAll deletes all items in the cache.
+func (c *Client) DeleteAll() error {
+	return c.withKeyRw("", func(rw *bufio.ReadWriter) error {
+		return writeExpectf(rw, resultDeleted, "flush_all\r\n")
+	})
+}
+
+// Ping checks all instances if they are alive. Returns error if any
+// of them is down.
+func (c *Client) Ping() error {
+	return c.selector.Each(c.ping)
+}
+
+// Increment atomically increments key by delta. The return value is
+// the new value after being incremented or an error. If the value
+// didn't exist in memcached the error is ErrCacheMiss. The value in
+// memcached must be an decimal number, or an error will be returned.
+// On 64-bit overflow, the new value wraps around.
+func (c *Client) Increment(key string, delta uint64) (newValue uint64, err error) {
+	return c.incrDecr("incr", key, delta)
+}
+
+// Decrement atomically decrements key by delta. The return value is
+// the new value after being decremented or an error. If the value
+// didn't exist in memcached the error is ErrCacheMiss. The value in
+// memcached must be an decimal number, or an error will be returned.
+// On underflow, the new value is capped at zero and does not wrap
+// around.
+func (c *Client) Decrement(key string, delta uint64) (newValue uint64, err error) {
+	return c.incrDecr("decr", key, delta)
+}
+
+func (c *Client) incrDecr(verb, key string, delta uint64) (uint64, error) {
+	var val uint64
+	err := c.withKeyRw(key, func(rw *bufio.ReadWriter) error {
+		line, err := writeReadLine(rw, "%s %s %d\r\n", verb, key, delta)
+		if err != nil {
+			return err
+		}
+		switch {
+		case bytes.Equal(line, resultNotFound):
+			return ErrCacheMiss
+		case bytes.HasPrefix(line, resultClientErrorPrefix):
+			errMsg := line[len(resultClientErrorPrefix) : len(line)-2]
+			return errors.New("memcache: client error: " + string(errMsg))
+		}
+		val, err = strconv.ParseUint(string(line[:len(line)-2]), 10, 64)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+	return val, err
+}

vendor/github.com/bradfitz/gomemcache/memcache/selector.go

@@ -0,0 +1,129 @@
+/*
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package memcache
+
+import (
+	"hash/crc32"
+	"net"
+	"strings"
+	"sync"
+)
+
+// ServerSelector is the interface that selects a memcache server
+// as a function of the item's key.
+//
+// All ServerSelector implementations must be safe for concurrent use
+// by multiple goroutines.
+type ServerSelector interface {
+	// PickServer returns the server address that a given item
+	// should be shared onto.
+	PickServer(key string) (net.Addr, error)
+	Each(func(net.Addr) error) error
+}
+
+// ServerList is a simple ServerSelector. Its zero value is usable.
+type ServerList struct {
+	mu    sync.RWMutex
+	addrs []net.Addr
+}
+
+// staticAddr caches the Network() and String() values from any net.Addr.
+type staticAddr struct {
+	ntw, str string
+}
+
+func newStaticAddr(a net.Addr) net.Addr {
+	return &staticAddr{
+		ntw: a.Network(),
+		str: a.String(),
+	}
+}
+
+func (s *staticAddr) Network() string { return s.ntw }
+func (s *staticAddr) String() string  { return s.str }
+
+// SetServers changes a ServerList's set of servers at runtime and is
+// safe for concurrent use by multiple goroutines.
+//
+// Each server is given equal weight. A server is given more weight
+// if it's listed multiple times.
+//
+// SetServers returns an error if any of the server names fail to
+// resolve. No attempt is made to connect to the server. If any error
+// is returned, no changes are made to the ServerList.
+func (ss *ServerList) SetServers(servers ...string) error {
+	naddr := make([]net.Addr, len(servers))
+	for i, server := range servers {
+		if strings.Contains(server, "/") {
+			addr, err := net.ResolveUnixAddr("unix", server)
+			if err != nil {
+				return err
+			}
+			naddr[i] = newStaticAddr(addr)
+		} else {
+			tcpaddr, err := net.ResolveTCPAddr("tcp", server)
+			if err != nil {
+				return err
+			}
+			naddr[i] = newStaticAddr(tcpaddr)
+		}
+	}
+
+	ss.mu.Lock()
+	defer ss.mu.Unlock()
+	ss.addrs = naddr
+	return nil
+}
+
+// Each iterates over each server calling the given function
+func (ss *ServerList) Each(f func(net.Addr) error) error {
+	ss.mu.RLock()
+	defer ss.mu.RUnlock()
+	for _, a := range ss.addrs {
+		if err := f(a); nil != err {
+			return err
+		}
+	}
+	return nil
+}
+
+// keyBufPool returns []byte buffers for use by PickServer's call to
+// crc32.ChecksumIEEE to avoid allocations. (but doesn't avoid the
+// copies, which at least are bounded in size and small)
+var keyBufPool = sync.Pool{
+	New: func() interface{} {
+		b := make([]byte, 256)
+		return &b
+	},
+}
+
+func (ss *ServerList) PickServer(key string) (net.Addr, error) {
+	ss.mu.RLock()
+	defer ss.mu.RUnlock()
+	if len(ss.addrs) == 0 {
+		return nil, ErrNoServers
+	}
+	if len(ss.addrs) == 1 {
+		return ss.addrs[0], nil
+	}
+	bufp := keyBufPool.Get().(*[]byte)
+	n := copy(*bufp, key)
+	cs := crc32.ChecksumIEEE((*bufp)[:n])
+	keyBufPool.Put(bufp)
+
+	return ss.addrs[cs%uint32(len(ss.addrs))], nil
+}

vendor/github.com/fatih/structs/.gitignore

@@ -0,0 +1,23 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test

vendor/github.com/fatih/structs/.travis.yml

@@ -0,0 +1,13 @@
+language: go
+go: 
+ - 1.7.x
+ - 1.8.x
+ - 1.9.x
+ - tip
+sudo: false
+before_install:
+- go get github.com/axw/gocov/gocov
+- go get github.com/mattn/goveralls
+- if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
+script:
+- $HOME/gopath/bin/goveralls -service=travis-ci

vendor/github.com/fatih/structs/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Fatih Arslan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

vendor/github.com/fatih/structs/README.md

@@ -0,0 +1,163 @@
+# Structs [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/fatih/structs) [![Build Status](http://img.shields.io/travis/fatih/structs.svg?style=flat-square)](https://travis-ci.org/fatih/structs) [![Coverage Status](http://img.shields.io/coveralls/fatih/structs.svg?style=flat-square)](https://coveralls.io/r/fatih/structs)
+
+Structs contains various utilities to work with Go (Golang) structs. It was
+initially used by me to convert a struct into a `map[string]interface{}`. With
+time I've added other utilities for structs.  It's basically a high level
+package based on primitives from the reflect package. Feel free to add new
+functions or improve the existing code.
+
+## Install
+
+```bash
+go get github.com/fatih/structs
+```
+
+## Usage and Examples
+
+Just like the standard lib `strings`, `bytes` and co packages, `structs` has
+many global functions to manipulate or organize your struct data. Lets define
+and declare a struct:
+
+```go
+type Server struct {
+	Name        string `json:"name,omitempty"`
+	ID          int
+	Enabled     bool
+	users       []string // not exported
+	http.Server          // embedded
+}
+
+server := &Server{
+	Name:    "gopher",
+	ID:      123456,
+	Enabled: true,
+}
+```
+
+```go
+// Convert a struct to a map[string]interface{}
+// => {"Name":"gopher", "ID":123456, "Enabled":true}
+m := structs.Map(server)
+
+// Convert the values of a struct to a []interface{}
+// => ["gopher", 123456, true]
+v := structs.Values(server)
+
+// Convert the names of a struct to a []string
+// (see "Names methods" for more info about fields)
+n := structs.Names(server)
+
+// Convert the values of a struct to a []*Field
+// (see "Field methods" for more info about fields)
+f := structs.Fields(server)
+
+// Return the struct name => "Server"
+n := structs.Name(server)
+
+// Check if any field of a struct is initialized or not.
+h := structs.HasZero(server)
+
+// Check if all fields of a struct is initialized or not.
+z := structs.IsZero(server)
+
+// Check if server is a struct or a pointer to struct
+i := structs.IsStruct(server)
+```
+
+### Struct methods
+
+The structs functions can be also used as independent methods by creating a new
+`*structs.Struct`. This is handy if you want to have more control over the
+structs (such as retrieving a single Field).
+
+```go
+// Create a new struct type:
+s := structs.New(server)
+
+m := s.Map()              // Get a map[string]interface{}
+v := s.Values()           // Get a []interface{}
+f := s.Fields()           // Get a []*Field
+n := s.Names()            // Get a []string
+f := s.Field(name)        // Get a *Field based on the given field name
+f, ok := s.FieldOk(name)  // Get a *Field based on the given field name
+n := s.Name()             // Get the struct name
+h := s.HasZero()          // Check if any field is uninitialized
+z := s.IsZero()           // Check if all fields are uninitialized
+```
+
+### Field methods
+
+We can easily examine a single Field for more detail. Below you can see how we
+get and interact with various field methods:
+
+
+```go
+s := structs.New(server)
+
+// Get the Field struct for the "Name" field
+name := s.Field("Name")
+
+// Get the underlying value,  value => "gopher"
+value := name.Value().(string)
+
+// Set the field's value
+name.Set("another gopher")
+
+// Get the field's kind, kind =>  "string"
+name.Kind()
+
+// Check if the field is exported or not
+if name.IsExported() {
+	fmt.Println("Name field is exported")
+}
+
+// Check if the value is a zero value, such as "" for string, 0 for int
+if !name.IsZero() {
+	fmt.Println("Name is initialized")
+}
+
+// Check if the field is an anonymous (embedded) field
+if !name.IsEmbedded() {
+	fmt.Println("Name is not an embedded field")
+}
+
+// Get the Field's tag value for tag name "json", tag value => "name,omitempty"
+tagValue := name.Tag("json")
+```
+
+Nested structs are supported too:
+
+```go
+addrField := s.Field("Server").Field("Addr")
+
+// Get the value for addr
+a := addrField.Value().(string)
+
+// Or get all fields
+httpServer := s.Field("Server").Fields()
+```
+
+We can also get a slice of Fields from the Struct type to iterate over all
+fields. This is handy if you wish to examine all fields:
+
+```go
+s := structs.New(server)
+
+for _, f := range s.Fields() {
+	fmt.Printf("field name: %+v\n", f.Name())
+
+	if f.IsExported() {
+		fmt.Printf("value   : %+v\n", f.Value())
+		fmt.Printf("is zero : %+v\n", f.IsZero())
+	}
+}
+```
+
+## Credits
+
+ * [Fatih Arslan](https://github.com/fatih)
+ * [Cihangir Savas](https://github.com/cihangir)
+
+## License
+
+The MIT License (MIT) - see LICENSE.md for more details

vendor/github.com/fatih/structs/field.go

@@ -0,0 +1,141 @@
+package structs
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+)
+
+var (
+	errNotExported = errors.New("field is not exported")
+	errNotSettable = errors.New("field is not settable")
+)
+
+// Field represents a single struct field that encapsulates high level
+// functions around the field.
+type Field struct {
+	value      reflect.Value
+	field      reflect.StructField
+	defaultTag string
+}
+
+// Tag returns the value associated with key in the tag string. If there is no
+// such key in the tag, Tag returns the empty string.
+func (f *Field) Tag(key string) string {
+	return f.field.Tag.Get(key)
+}
+
+// Value returns the underlying value of the field. It panics if the field
+// is not exported.
+func (f *Field) Value() interface{} {
+	return f.value.Interface()
+}
+
+// IsEmbedded returns true if the given field is an anonymous field (embedded)
+func (f *Field) IsEmbedded() bool {
+	return f.field.Anonymous
+}
+
+// IsExported returns true if the given field is exported.
+func (f *Field) IsExported() bool {
+	return f.field.PkgPath == ""
+}
+
+// IsZero returns true if the given field is not initialized (has a zero value).
+// It panics if the field is not exported.
+func (f *Field) IsZero() bool {
+	zero := reflect.Zero(f.value.Type()).Interface()
+	current := f.Value()
+
+	return reflect.DeepEqual(current, zero)
+}
+
+// Name returns the name of the given field
+func (f *Field) Name() string {
+	return f.field.Name
+}
+
+// Kind returns the fields kind, such as "string", "map", "bool", etc ..
+func (f *Field) Kind() reflect.Kind {
+	return f.value.Kind()
+}
+
+// Set sets the field to given value v. It returns an error if the field is not
+// settable (not addressable or not exported) or if the given value's type
+// doesn't match the fields type.
+func (f *Field) Set(val interface{}) error {
+	// we can't set unexported fields, so be sure this field is exported
+	if !f.IsExported() {
+		return errNotExported
+	}
+
+	// do we get here? not sure...
+	if !f.value.CanSet() {
+		return errNotSettable
+	}
+
+	given := reflect.ValueOf(val)
+
+	if f.value.Kind() != given.Kind() {
+		return fmt.Errorf("wrong kind. got: %s want: %s", given.Kind(), f.value.Kind())
+	}
+
+	f.value.Set(given)
+	return nil
+}
+
+// Zero sets the field to its zero value. It returns an error if the field is not
+// settable (not addressable or not exported).
+func (f *Field) Zero() error {
+	zero := reflect.Zero(f.value.Type()).Interface()
+	return f.Set(zero)
+}
+
+// Fields returns a slice of Fields. This is particular handy to get the fields
+// of a nested struct . A struct tag with the content of "-" ignores the
+// checking of that particular field. Example:
+//
+//   // Field is ignored by this package.
+//   Field *http.Request `structs:"-"`
+//
+// It panics if field is not exported or if field's kind is not struct
+func (f *Field) Fields() []*Field {
+	return getFields(f.value, f.defaultTag)
+}
+
+// Field returns the field from a nested struct. It panics if the nested struct
+// is not exported or if the field was not found.
+func (f *Field) Field(name string) *Field {
+	field, ok := f.FieldOk(name)
+	if !ok {
+		panic("field not found")
+	}
+
+	return field
+}
+
+// FieldOk returns the field from a nested struct. The boolean returns whether
+// the field was found (true) or not (false).
+func (f *Field) FieldOk(name string) (*Field, bool) {
+	value := &f.value
+	// value must be settable so we need to make sure it holds the address of the
+	// variable and not a copy, so we can pass the pointer to strctVal instead of a
+	// copy (which is not assigned to any variable, hence not settable).
+	// see "https://blog.golang.org/laws-of-reflection#TOC_8."
+	if f.value.Kind() != reflect.Ptr {
+		a := f.value.Addr()
+		value = &a
+	}
+	v := strctVal(value.Interface())
+	t := v.Type()
+
+	field, ok := t.FieldByName(name)
+	if !ok {
+		return nil, false
+	}
+
+	return &Field{
+		field: field,
+		value: v.FieldByName(name),
+	}, true
+}

vendor/github.com/fatih/structs/structs.go

@@ -0,0 +1,584 @@
+// Package structs contains various utilities functions to work with structs.
+package structs
+
+import (
+	"fmt"
+
+	"reflect"
+)
+
+var (
+	// DefaultTagName is the default tag name for struct fields which provides
+	// a more granular to tweak certain structs. Lookup the necessary functions
+	// for more info.
+	DefaultTagName = "structs" // struct's field default tag name
+)
+
+// Struct encapsulates a struct type to provide several high level functions
+// around the struct.
+type Struct struct {
+	raw     interface{}
+	value   reflect.Value
+	TagName string
+}
+
+// New returns a new *Struct with the struct s. It panics if the s's kind is
+// not struct.
+func New(s interface{}) *Struct {
+	return &Struct{
+		raw:     s,
+		value:   strctVal(s),
+		TagName: DefaultTagName,
+	}
+}
+
+// Map converts the given struct to a map[string]interface{}, where the keys
+// of the map are the field names and the values of the map the associated
+// values of the fields. The default key string is the struct field name but
+// can be changed in the struct field's tag value. The "structs" key in the
+// struct's field tag value is the key name. Example:
+//
+//   // Field appears in map as key "myName".
+//   Name string `structs:"myName"`
+//
+// A tag value with the content of "-" ignores that particular field. Example:
+//
+//   // Field is ignored by this package.
+//   Field bool `structs:"-"`
+//
+// A tag value with the content of "string" uses the stringer to get the value. Example:
+//
+//   // The value will be output of Animal's String() func.
+//   // Map will panic if Animal does not implement String().
+//   Field *Animal `structs:"field,string"`
+//
+// A tag value with the option of "flatten" used in a struct field is to flatten its fields
+// in the output map. Example:
+//
+//   // The FieldStruct's fields will be flattened into the output map.
+//   FieldStruct time.Time `structs:",flatten"`
+//
+// A tag value with the option of "omitnested" stops iterating further if the type
+// is a struct. Example:
+//
+//   // Field is not processed further by this package.
+//   Field time.Time     `structs:"myName,omitnested"`
+//   Field *http.Request `structs:",omitnested"`
+//
+// A tag value with the option of "omitempty" ignores that particular field if
+// the field value is empty. Example:
+//
+//   // Field appears in map as key "myName", but the field is
+//   // skipped if empty.
+//   Field string `structs:"myName,omitempty"`
+//
+//   // Field appears in map as key "Field" (the default), but
+//   // the field is skipped if empty.
+//   Field string `structs:",omitempty"`
+//
+// Note that only exported fields of a struct can be accessed, non exported
+// fields will be neglected.
+func (s *Struct) Map() map[string]interface{} {
+	out := make(map[string]interface{})
+	s.FillMap(out)
+	return out
+}
+
+// FillMap is the same as Map. Instead of returning the output, it fills the
+// given map.
+func (s *Struct) FillMap(out map[string]interface{}) {
+	if out == nil {
+		return
+	}
+
+	fields := s.structFields()
+
+	for _, field := range fields {
+		name := field.Name
+		val := s.value.FieldByName(name)
+		isSubStruct := false
+		var finalVal interface{}
+
+		tagName, tagOpts := parseTag(field.Tag.Get(s.TagName))
+		if tagName != "" {
+			name = tagName
+		}
+
+		// if the value is a zero value and the field is marked as omitempty do
+		// not include
+		if tagOpts.Has("omitempty") {
+			zero := reflect.Zero(val.Type()).Interface()
+			current := val.Interface()
+
+			if reflect.DeepEqual(current, zero) {
+				continue
+			}
+		}
+
+		if !tagOpts.Has("omitnested") {
+			finalVal = s.nested(val)
+
+			v := reflect.ValueOf(val.Interface())
+			if v.Kind() == reflect.Ptr {
+				v = v.Elem()
+			}
+
+			switch v.Kind() {
+			case reflect.Map, reflect.Struct:
+				isSubStruct = true
+			}
+		} else {
+			finalVal = val.Interface()
+		}
+
+		if tagOpts.Has("string") {
+			s, ok := val.Interface().(fmt.Stringer)
+			if ok {
+				out[name] = s.String()
+			}
+			continue
+		}
+
+		if isSubStruct && (tagOpts.Has("flatten")) {
+			for k := range finalVal.(map[string]interface{}) {
+				out[k] = finalVal.(map[string]interface{})[k]
+			}
+		} else {
+			out[name] = finalVal
+		}
+	}
+}
+
+// Values converts the given s struct's field values to a []interface{}.  A
+// struct tag with the content of "-" ignores the that particular field.
+// Example:
+//
+//   // Field is ignored by this package.
+//   Field int `structs:"-"`
+//
+// A value with the option of "omitnested" stops iterating further if the type
+// is a struct. Example:
+//
+//   // Fields is not processed further by this package.
+//   Field time.Time     `structs:",omitnested"`
+//   Field *http.Request `structs:",omitnested"`
+//
+// A tag value with the option of "omitempty" ignores that particular field and
+// is not added to the values if the field value is empty. Example:
+//
+//   // Field is skipped if empty
+//   Field string `structs:",omitempty"`
+//
+// Note that only exported fields of a struct can be accessed, non exported
+// fields  will be neglected.
+func (s *Struct) Values() []interface{} {
+	fields := s.structFields()
+
+	var t []interface{}
+
+	for _, field := range fields {
+		val := s.value.FieldByName(field.Name)
+
+		_, tagOpts := parseTag(field.Tag.Get(s.TagName))
+
+		// if the value is a zero value and the field is marked as omitempty do
+		// not include
+		if tagOpts.Has("omitempty") {
+			zero := reflect.Zero(val.Type()).Interface()
+			current := val.Interface()
+
+			if reflect.DeepEqual(current, zero) {
+				continue
+			}
+		}
+
+		if tagOpts.Has("string") {
+			s, ok := val.Interface().(fmt.Stringer)
+			if ok {
+				t = append(t, s.String())
+			}
+			continue
+		}
+
+		if IsStruct(val.Interface()) && !tagOpts.Has("omitnested") {
+			// look out for embedded structs, and convert them to a
+			// []interface{} to be added to the final values slice
+			t = append(t, Values(val.Interface())...)
+		} else {
+			t = append(t, val.Interface())
+		}
+	}
+
+	return t
+}
+
+// Fields returns a slice of Fields. A struct tag with the content of "-"
+// ignores the checking of that particular field. Example:
+//
+//   // Field is ignored by this package.
+//   Field bool `structs:"-"`
+//
+// It panics if s's kind is not struct.
+func (s *Struct) Fields() []*Field {
+	return getFields(s.value, s.TagName)
+}
+
+// Names returns a slice of field names. A struct tag with the content of "-"
+// ignores the checking of that particular field. Example:
+//
+//   // Field is ignored by this package.
+//   Field bool `structs:"-"`
+//
+// It panics if s's kind is not struct.
+func (s *Struct) Names() []string {
+	fields := getFields(s.value, s.TagName)
+
+	names := make([]string, len(fields))
+
+	for i, field := range fields {
+		names[i] = field.Name()
+	}
+
+	return names
+}
+
+func getFields(v reflect.Value, tagName string) []*Field {
+	if v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	t := v.Type()
+
+	var fields []*Field
+
+	for i := 0; i < t.NumField(); i++ {
+		field := t.Field(i)
+
+		if tag := field.Tag.Get(tagName); tag == "-" {
+			continue
+		}
+
+		f := &Field{
+			field: field,
+			value: v.FieldByName(field.Name),
+		}
+
+		fields = append(fields, f)
+
+	}
+
+	return fields
+}
+
+// Field returns a new Field struct that provides several high level functions
+// around a single struct field entity. It panics if the field is not found.
+func (s *Struct) Field(name string) *Field {
+	f, ok := s.FieldOk(name)
+	if !ok {
+		panic("field not found")
+	}
+
+	return f
+}
+
+// FieldOk returns a new Field struct that provides several high level functions
+// around a single struct field entity. The boolean returns true if the field
+// was found.
+func (s *Struct) FieldOk(name string) (*Field, bool) {
+	t := s.value.Type()
+
+	field, ok := t.FieldByName(name)
+	if !ok {
+		return nil, false
+	}
+
+	return &Field{
+		field:      field,
+		value:      s.value.FieldByName(name),
+		defaultTag: s.TagName,
+	}, true
+}
+
+// IsZero returns true if all fields in a struct is a zero value (not
+// initialized) A struct tag with the content of "-" ignores the checking of
+// that particular field. Example:
+//
+//   // Field is ignored by this package.
+//   Field bool `structs:"-"`
+//
+// A value with the option of "omitnested" stops iterating further if the type
+// is a struct. Example:
+//
+//   // Field is not processed further by this package.
+//   Field time.Time     `structs:"myName,omitnested"`
+//   Field *http.Request `structs:",omitnested"`
+//
+// Note that only exported fields of a struct can be accessed, non exported
+// fields  will be neglected. It panics if s's kind is not struct.
+func (s *Struct) IsZero() bool {
+	fields := s.structFields()
+
+	for _, field := range fields {
+		val := s.value.FieldByName(field.Name)
+
+		_, tagOpts := parseTag(field.Tag.Get(s.TagName))
+
+		if IsStruct(val.Interface()) && !tagOpts.Has("omitnested") {
+			ok := IsZero(val.Interface())
+			if !ok {
+				return false
+			}
+
+			continue
+		}
+
+		// zero value of the given field, such as "" for string, 0 for int
+		zero := reflect.Zero(val.Type()).Interface()
+
+		//  current value of the given field
+		current := val.Interface()
+
+		if !reflect.DeepEqual(current, zero) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// HasZero returns true if a field in a struct is not initialized (zero value).
+// A struct tag with the content of "-" ignores the checking of that particular
+// field. Example:
+//
+//   // Field is ignored by this package.
+//   Field bool `structs:"-"`
+//
+// A value with the option of "omitnested" stops iterating further if the type
+// is a struct. Example:
+//
+//   // Field is not processed further by this package.
+//   Field time.Time     `structs:"myName,omitnested"`
+//   Field *http.Request `structs:",omitnested"`
+//
+// Note that only exported fields of a struct can be accessed, non exported
+// fields  will be neglected. It panics if s's kind is not struct.
+func (s *Struct) HasZero() bool {
+	fields := s.structFields()
+
+	for _, field := range fields {
+		val := s.value.FieldByName(field.Name)
+
+		_, tagOpts := parseTag(field.Tag.Get(s.TagName))
+
+		if IsStruct(val.Interface()) && !tagOpts.Has("omitnested") {
+			ok := HasZero(val.Interface())
+			if ok {
+				return true
+			}
+
+			continue
+		}
+
+		// zero value of the given field, such as "" for string, 0 for int
+		zero := reflect.Zero(val.Type()).Interface()
+
+		//  current value of the given field
+		current := val.Interface()
+
+		if reflect.DeepEqual(current, zero) {
+			return true
+		}
+	}
+
+	return false
+}
+
+// Name returns the structs's type name within its package. For more info refer
+// to Name() function.
+func (s *Struct) Name() string {
+	return s.value.Type().Name()
+}
+
+// structFields returns the exported struct fields for a given s struct. This
+// is a convenient helper method to avoid duplicate code in some of the
+// functions.
+func (s *Struct) structFields() []reflect.StructField {
+	t := s.value.Type()
+
+	var f []reflect.StructField
+
+	for i := 0; i < t.NumField(); i++ {
+		field := t.Field(i)
+		// we can't access the value of unexported fields
+		if field.PkgPath != "" {
+			continue
+		}
+
+		// don't check if it's omitted
+		if tag := field.Tag.Get(s.TagName); tag == "-" {
+			continue
+		}
+
+		f = append(f, field)
+	}
+
+	return f
+}
+
+func strctVal(s interface{}) reflect.Value {
+	v := reflect.ValueOf(s)
+
+	// if pointer get the underlying element≤
+	for v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	if v.Kind() != reflect.Struct {
+		panic("not struct")
+	}
+
+	return v
+}
+
+// Map converts the given struct to a map[string]interface{}. For more info
+// refer to Struct types Map() method. It panics if s's kind is not struct.
+func Map(s interface{}) map[string]interface{} {
+	return New(s).Map()
+}
+
+// FillMap is the same as Map. Instead of returning the output, it fills the
+// given map.
+func FillMap(s interface{}, out map[string]interface{}) {
+	New(s).FillMap(out)
+}
+
+// Values converts the given struct to a []interface{}. For more info refer to
+// Struct types Values() method.  It panics if s's kind is not struct.
+func Values(s interface{}) []interface{} {
+	return New(s).Values()
+}
+
+// Fields returns a slice of *Field. For more info refer to Struct types
+// Fields() method.  It panics if s's kind is not struct.
+func Fields(s interface{}) []*Field {
+	return New(s).Fields()
+}
+
+// Names returns a slice of field names. For more info refer to Struct types
+// Names() method.  It panics if s's kind is not struct.
+func Names(s interface{}) []string {
+	return New(s).Names()
+}
+
+// IsZero returns true if all fields is equal to a zero value. For more info
+// refer to Struct types IsZero() method.  It panics if s's kind is not struct.
+func IsZero(s interface{}) bool {
+	return New(s).IsZero()
+}
+
+// HasZero returns true if any field is equal to a zero value. For more info
+// refer to Struct types HasZero() method.  It panics if s's kind is not struct.
+func HasZero(s interface{}) bool {
+	return New(s).HasZero()
+}
+
+// IsStruct returns true if the given variable is a struct or a pointer to
+// struct.
+func IsStruct(s interface{}) bool {
+	v := reflect.ValueOf(s)
+	if v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	// uninitialized zero value of a struct
+	if v.Kind() == reflect.Invalid {
+		return false
+	}
+
+	return v.Kind() == reflect.Struct
+}
+
+// Name returns the structs's type name within its package. It returns an
+// empty string for unnamed types. It panics if s's kind is not struct.
+func Name(s interface{}) string {
+	return New(s).Name()
+}
+
+// nested retrieves recursively all types for the given value and returns the
+// nested value.
+func (s *Struct) nested(val reflect.Value) interface{} {
+	var finalVal interface{}
+
+	v := reflect.ValueOf(val.Interface())
+	if v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+
+	switch v.Kind() {
+	case reflect.Struct:
+		n := New(val.Interface())
+		n.TagName = s.TagName
+		m := n.Map()
+
+		// do not add the converted value if there are no exported fields, ie:
+		// time.Time
+		if len(m) == 0 {
+			finalVal = val.Interface()
+		} else {
+			finalVal = m
+		}
+	case reflect.Map:
+		// get the element type of the map
+		mapElem := val.Type()
+		switch val.Type().Kind() {
+		case reflect.Ptr, reflect.Array, reflect.Map,
+			reflect.Slice, reflect.Chan:
+			mapElem = val.Type().Elem()
+			if mapElem.Kind() == reflect.Ptr {
+				mapElem = mapElem.Elem()
+			}
+		}
+
+		// only iterate over struct types, ie: map[string]StructType,
+		// map[string][]StructType,
+		if mapElem.Kind() == reflect.Struct ||
+			(mapElem.Kind() == reflect.Slice &&
+				mapElem.Elem().Kind() == reflect.Struct) {
+			m := make(map[string]interface{}, val.Len())
+			for _, k := range val.MapKeys() {
+				m[k.String()] = s.nested(val.MapIndex(k))
+			}
+			finalVal = m
+			break
+		}
+
+		// TODO(arslan): should this be optional?
+		finalVal = val.Interface()
+	case reflect.Slice, reflect.Array:
+		if val.Type().Kind() == reflect.Interface {
+			finalVal = val.Interface()
+			break
+		}
+
+		// TODO(arslan): should this be optional?
+		// do not iterate of non struct types, just pass the value. Ie: []int,
+		// []string, co... We only iterate further if it's a struct.
+		// i.e []foo or []*foo
+		if val.Type().Elem().Kind() != reflect.Struct &&
+			!(val.Type().Elem().Kind() == reflect.Ptr &&
+				val.Type().Elem().Elem().Kind() == reflect.Struct) {
+			finalVal = val.Interface()
+			break
+		}
+
+		slices := make([]interface{}, val.Len())
+		for x := 0; x < val.Len(); x++ {
+			slices[x] = s.nested(val.Index(x))
+		}
+		finalVal = slices
+	default:
+		finalVal = val.Interface()
+	}
+
+	return finalVal
+}

vendor/github.com/fatih/structs/tags.go

@@ -0,0 +1,32 @@
+package structs
+
+import "strings"
+
+// tagOptions contains a slice of tag options
+type tagOptions []string
+
+// Has returns true if the given option is available in tagOptions
+func (t tagOptions) Has(opt string) bool {
+	for _, tagOpt := range t {
+		if tagOpt == opt {
+			return true
+		}
+	}
+
+	return false
+}
+
+// parseTag splits a struct field's tag into its name and a list of options
+// which comes after a name. A tag is in the form of: "name,option1,option2".
+// The name can be neglectected.
+func parseTag(tag string) (string, tagOptions) {
+	// tag is one of followings:
+	// ""
+	// "name"
+	// "name,opt"
+	// "name,opt,opt2"
+	// ",opt"
+
+	res := strings.Split(tag, ",")
+	return res[0], res[1:]
+}

vendor/github.com/garyburd/redigo/LICENSE

@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

vendor/github.com/garyburd/redigo/internal/commandinfo.go

@@ -0,0 +1,54 @@
+// Copyright 2014 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package internal // import "github.com/garyburd/redigo/internal"
+
+import (
+	"strings"
+)
+
+const (
+	WatchState = 1 << iota
+	MultiState
+	SubscribeState
+	MonitorState
+)
+
+type CommandInfo struct {
+	Set, Clear int
+}
+
+var commandInfos = map[string]CommandInfo{
+	"WATCH":      {Set: WatchState},
+	"UNWATCH":    {Clear: WatchState},
+	"MULTI":      {Set: MultiState},
+	"EXEC":       {Clear: WatchState | MultiState},
+	"DISCARD":    {Clear: WatchState | MultiState},
+	"PSUBSCRIBE": {Set: SubscribeState},
+	"SUBSCRIBE":  {Set: SubscribeState},
+	"MONITOR":    {Set: MonitorState},
+}
+
+func init() {
+	for n, ci := range commandInfos {
+		commandInfos[strings.ToLower(n)] = ci
+	}
+}
+
+func LookupCommandInfo(commandName string) CommandInfo {
+	if ci, ok := commandInfos[commandName]; ok {
+		return ci
+	}
+	return commandInfos[strings.ToUpper(commandName)]
+}

vendor/github.com/garyburd/redigo/redis/conn.go

@@ -0,0 +1,673 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/url"
+	"regexp"
+	"strconv"
+	"sync"
+	"time"
+)
+
+var (
+	_ ConnWithTimeout = (*conn)(nil)
+)
+
+// conn is the low-level implementation of Conn
+type conn struct {
+	// Shared
+	mu      sync.Mutex
+	pending int
+	err     error
+	conn    net.Conn
+
+	// Read
+	readTimeout time.Duration
+	br          *bufio.Reader
+
+	// Write
+	writeTimeout time.Duration
+	bw           *bufio.Writer
+
+	// Scratch space for formatting argument length.
+	// '*' or '$', length, "\r\n"
+	lenScratch [32]byte
+
+	// Scratch space for formatting integers and floats.
+	numScratch [40]byte
+}
+
+// DialTimeout acts like Dial but takes timeouts for establishing the
+// connection to the server, writing a command and reading a reply.
+//
+// Deprecated: Use Dial with options instead.
+func DialTimeout(network, address string, connectTimeout, readTimeout, writeTimeout time.Duration) (Conn, error) {
+	return Dial(network, address,
+		DialConnectTimeout(connectTimeout),
+		DialReadTimeout(readTimeout),
+		DialWriteTimeout(writeTimeout))
+}
+
+// DialOption specifies an option for dialing a Redis server.
+type DialOption struct {
+	f func(*dialOptions)
+}
+
+type dialOptions struct {
+	readTimeout  time.Duration
+	writeTimeout time.Duration
+	dialer       *net.Dialer
+	dial         func(network, addr string) (net.Conn, error)
+	db           int
+	password     string
+	useTLS       bool
+	skipVerify   bool
+	tlsConfig    *tls.Config
+}
+
+// DialReadTimeout specifies the timeout for reading a single command reply.
+func DialReadTimeout(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.readTimeout = d
+	}}
+}
+
+// DialWriteTimeout specifies the timeout for writing a single command.
+func DialWriteTimeout(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.writeTimeout = d
+	}}
+}
+
+// DialConnectTimeout specifies the timeout for connecting to the Redis server when
+// no DialNetDial option is specified.
+func DialConnectTimeout(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.dialer.Timeout = d
+	}}
+}
+
+// DialKeepAlive specifies the keep-alive period for TCP connections to the Redis server
+// when no DialNetDial option is specified.
+// If zero, keep-alives are not enabled. If no DialKeepAlive option is specified then
+// the default of 5 minutes is used to ensure that half-closed TCP sessions are detected.
+func DialKeepAlive(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.dialer.KeepAlive = d
+	}}
+}
+
+// DialNetDial specifies a custom dial function for creating TCP
+// connections, otherwise a net.Dialer customized via the other options is used.
+// DialNetDial overrides DialConnectTimeout and DialKeepAlive.
+func DialNetDial(dial func(network, addr string) (net.Conn, error)) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.dial = dial
+	}}
+}
+
+// DialDatabase specifies the database to select when dialing a connection.
+func DialDatabase(db int) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.db = db
+	}}
+}
+
+// DialPassword specifies the password to use when connecting to
+// the Redis server.
+func DialPassword(password string) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.password = password
+	}}
+}
+
+// DialTLSConfig specifies the config to use when a TLS connection is dialed.
+// Has no effect when not dialing a TLS connection.
+func DialTLSConfig(c *tls.Config) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.tlsConfig = c
+	}}
+}
+
+// DialTLSSkipVerify disables server name verification when connecting over
+// TLS. Has no effect when not dialing a TLS connection.
+func DialTLSSkipVerify(skip bool) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.skipVerify = skip
+	}}
+}
+
+// DialUseTLS specifies whether TLS should be used when connecting to the
+// server. This option is ignore by DialURL.
+func DialUseTLS(useTLS bool) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.useTLS = useTLS
+	}}
+}
+
+// Dial connects to the Redis server at the given network and
+// address using the specified options.
+func Dial(network, address string, options ...DialOption) (Conn, error) {
+	do := dialOptions{
+		dialer: &net.Dialer{
+			KeepAlive: time.Minute * 5,
+		},
+	}
+	for _, option := range options {
+		option.f(&do)
+	}
+	if do.dial == nil {
+		do.dial = do.dialer.Dial
+	}
+
+	netConn, err := do.dial(network, address)
+	if err != nil {
+		return nil, err
+	}
+
+	if do.useTLS {
+		var tlsConfig *tls.Config
+		if do.tlsConfig == nil {
+			tlsConfig = &tls.Config{InsecureSkipVerify: do.skipVerify}
+		} else {
+			tlsConfig = cloneTLSConfig(do.tlsConfig)
+		}
+		if tlsConfig.ServerName == "" {
+			host, _, err := net.SplitHostPort(address)
+			if err != nil {
+				netConn.Close()
+				return nil, err
+			}
+			tlsConfig.ServerName = host
+		}
+
+		tlsConn := tls.Client(netConn, tlsConfig)
+		if err := tlsConn.Handshake(); err != nil {
+			netConn.Close()
+			return nil, err
+		}
+		netConn = tlsConn
+	}
+
+	c := &conn{
+		conn:         netConn,
+		bw:           bufio.NewWriter(netConn),
+		br:           bufio.NewReader(netConn),
+		readTimeout:  do.readTimeout,
+		writeTimeout: do.writeTimeout,
+	}
+
+	if do.password != "" {
+		if _, err := c.Do("AUTH", do.password); err != nil {
+			netConn.Close()
+			return nil, err
+		}
+	}
+
+	if do.db != 0 {
+		if _, err := c.Do("SELECT", do.db); err != nil {
+			netConn.Close()
+			return nil, err
+		}
+	}
+
+	return c, nil
+}
+
+var pathDBRegexp = regexp.MustCompile(`/(\d*)\z`)
+
+// DialURL connects to a Redis server at the given URL using the Redis
+// URI scheme. URLs should follow the draft IANA specification for the
+// scheme (https://www.iana.org/assignments/uri-schemes/prov/redis).
+func DialURL(rawurl string, options ...DialOption) (Conn, error) {
+	u, err := url.Parse(rawurl)
+	if err != nil {
+		return nil, err
+	}
+
+	if u.Scheme != "redis" && u.Scheme != "rediss" {
+		return nil, fmt.Errorf("invalid redis URL scheme: %s", u.Scheme)
+	}
+
+	// As per the IANA draft spec, the host defaults to localhost and
+	// the port defaults to 6379.
+	host, port, err := net.SplitHostPort(u.Host)
+	if err != nil {
+		// assume port is missing
+		host = u.Host
+		port = "6379"
+	}
+	if host == "" {
+		host = "localhost"
+	}
+	address := net.JoinHostPort(host, port)
+
+	if u.User != nil {
+		password, isSet := u.User.Password()
+		if isSet {
+			options = append(options, DialPassword(password))
+		}
+	}
+
+	match := pathDBRegexp.FindStringSubmatch(u.Path)
+	if len(match) == 2 {
+		db := 0
+		if len(match[1]) > 0 {
+			db, err = strconv.Atoi(match[1])
+			if err != nil {
+				return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
+			}
+		}
+		if db != 0 {
+			options = append(options, DialDatabase(db))
+		}
+	} else if u.Path != "" {
+		return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
+	}
+
+	options = append(options, DialUseTLS(u.Scheme == "rediss"))
+
+	return Dial("tcp", address, options...)
+}
+
+// NewConn returns a new Redigo connection for the given net connection.
+func NewConn(netConn net.Conn, readTimeout, writeTimeout time.Duration) Conn {
+	return &conn{
+		conn:         netConn,
+		bw:           bufio.NewWriter(netConn),
+		br:           bufio.NewReader(netConn),
+		readTimeout:  readTimeout,
+		writeTimeout: writeTimeout,
+	}
+}
+
+func (c *conn) Close() error {
+	c.mu.Lock()
+	err := c.err
+	if c.err == nil {
+		c.err = errors.New("redigo: closed")
+		err = c.conn.Close()
+	}
+	c.mu.Unlock()
+	return err
+}
+
+func (c *conn) fatal(err error) error {
+	c.mu.Lock()
+	if c.err == nil {
+		c.err = err
+		// Close connection to force errors on subsequent calls and to unblock
+		// other reader or writer.
+		c.conn.Close()
+	}
+	c.mu.Unlock()
+	return err
+}
+
+func (c *conn) Err() error {
+	c.mu.Lock()
+	err := c.err
+	c.mu.Unlock()
+	return err
+}
+
+func (c *conn) writeLen(prefix byte, n int) error {
+	c.lenScratch[len(c.lenScratch)-1] = '\n'
+	c.lenScratch[len(c.lenScratch)-2] = '\r'
+	i := len(c.lenScratch) - 3
+	for {
+		c.lenScratch[i] = byte('0' + n%10)
+		i -= 1
+		n = n / 10
+		if n == 0 {
+			break
+		}
+	}
+	c.lenScratch[i] = prefix
+	_, err := c.bw.Write(c.lenScratch[i:])
+	return err
+}
+
+func (c *conn) writeString(s string) error {
+	c.writeLen('$', len(s))
+	c.bw.WriteString(s)
+	_, err := c.bw.WriteString("\r\n")
+	return err
+}
+
+func (c *conn) writeBytes(p []byte) error {
+	c.writeLen('$', len(p))
+	c.bw.Write(p)
+	_, err := c.bw.WriteString("\r\n")
+	return err
+}
+
+func (c *conn) writeInt64(n int64) error {
+	return c.writeBytes(strconv.AppendInt(c.numScratch[:0], n, 10))
+}
+
+func (c *conn) writeFloat64(n float64) error {
+	return c.writeBytes(strconv.AppendFloat(c.numScratch[:0], n, 'g', -1, 64))
+}
+
+func (c *conn) writeCommand(cmd string, args []interface{}) error {
+	c.writeLen('*', 1+len(args))
+	if err := c.writeString(cmd); err != nil {
+		return err
+	}
+	for _, arg := range args {
+		if err := c.writeArg(arg, true); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *conn) writeArg(arg interface{}, argumentTypeOK bool) (err error) {
+	switch arg := arg.(type) {
+	case string:
+		return c.writeString(arg)
+	case []byte:
+		return c.writeBytes(arg)
+	case int:
+		return c.writeInt64(int64(arg))
+	case int64:
+		return c.writeInt64(arg)
+	case float64:
+		return c.writeFloat64(arg)
+	case bool:
+		if arg {
+			return c.writeString("1")
+		} else {
+			return c.writeString("0")
+		}
+	case nil:
+		return c.writeString("")
+	case Argument:
+		if argumentTypeOK {
+			return c.writeArg(arg.RedisArg(), false)
+		}
+		// See comment in default clause below.
+		var buf bytes.Buffer
+		fmt.Fprint(&buf, arg)
+		return c.writeBytes(buf.Bytes())
+	default:
+		// This default clause is intended to handle builtin numeric types.
+		// The function should return an error for other types, but this is not
+		// done for compatibility with previous versions of the package.
+		var buf bytes.Buffer
+		fmt.Fprint(&buf, arg)
+		return c.writeBytes(buf.Bytes())
+	}
+}
+
+type protocolError string
+
+func (pe protocolError) Error() string {
+	return fmt.Sprintf("redigo: %s (possible server error or unsupported concurrent read by application)", string(pe))
+}
+
+func (c *conn) readLine() ([]byte, error) {
+	p, err := c.br.ReadSlice('\n')
+	if err == bufio.ErrBufferFull {
+		return nil, protocolError("long response line")
+	}
+	if err != nil {
+		return nil, err
+	}
+	i := len(p) - 2
+	if i < 0 || p[i] != '\r' {
+		return nil, protocolError("bad response line terminator")
+	}
+	return p[:i], nil
+}
+
+// parseLen parses bulk string and array lengths.
+func parseLen(p []byte) (int, error) {
+	if len(p) == 0 {
+		return -1, protocolError("malformed length")
+	}
+
+	if p[0] == '-' && len(p) == 2 && p[1] == '1' {
+		// handle $-1 and $-1 null replies.
+		return -1, nil
+	}
+
+	var n int
+	for _, b := range p {
+		n *= 10
+		if b < '0' || b > '9' {
+			return -1, protocolError("illegal bytes in length")
+		}
+		n += int(b - '0')
+	}
+
+	return n, nil
+}
+
+// parseInt parses an integer reply.
+func parseInt(p []byte) (interface{}, error) {
+	if len(p) == 0 {
+		return 0, protocolError("malformed integer")
+	}
+
+	var negate bool
+	if p[0] == '-' {
+		negate = true
+		p = p[1:]
+		if len(p) == 0 {
+			return 0, protocolError("malformed integer")
+		}
+	}
+
+	var n int64
+	for _, b := range p {
+		n *= 10
+		if b < '0' || b > '9' {
+			return 0, protocolError("illegal bytes in length")
+		}
+		n += int64(b - '0')
+	}
+
+	if negate {
+		n = -n
+	}
+	return n, nil
+}
+
+var (
+	okReply   interface{} = "OK"
+	pongReply interface{} = "PONG"
+)
+
+func (c *conn) readReply() (interface{}, error) {
+	line, err := c.readLine()
+	if err != nil {
+		return nil, err
+	}
+	if len(line) == 0 {
+		return nil, protocolError("short response line")
+	}
+	switch line[0] {
+	case '+':
+		switch {
+		case len(line) == 3 && line[1] == 'O' && line[2] == 'K':
+			// Avoid allocation for frequent "+OK" response.
+			return okReply, nil
+		case len(line) == 5 && line[1] == 'P' && line[2] == 'O' && line[3] == 'N' && line[4] == 'G':
+			// Avoid allocation in PING command benchmarks :)
+			return pongReply, nil
+		default:
+			return string(line[1:]), nil
+		}
+	case '-':
+		return Error(string(line[1:])), nil
+	case ':':
+		return parseInt(line[1:])
+	case '$':
+		n, err := parseLen(line[1:])
+		if n < 0 || err != nil {
+			return nil, err
+		}
+		p := make([]byte, n)
+		_, err = io.ReadFull(c.br, p)
+		if err != nil {
+			return nil, err
+		}
+		if line, err := c.readLine(); err != nil {
+			return nil, err
+		} else if len(line) != 0 {
+			return nil, protocolError("bad bulk string format")
+		}
+		return p, nil
+	case '*':
+		n, err := parseLen(line[1:])
+		if n < 0 || err != nil {
+			return nil, err
+		}
+		r := make([]interface{}, n)
+		for i := range r {
+			r[i], err = c.readReply()
+			if err != nil {
+				return nil, err
+			}
+		}
+		return r, nil
+	}
+	return nil, protocolError("unexpected response line")
+}
+
+func (c *conn) Send(cmd string, args ...interface{}) error {
+	c.mu.Lock()
+	c.pending += 1
+	c.mu.Unlock()
+	if c.writeTimeout != 0 {
+		c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
+	}
+	if err := c.writeCommand(cmd, args); err != nil {
+		return c.fatal(err)
+	}
+	return nil
+}
+
+func (c *conn) Flush() error {
+	if c.writeTimeout != 0 {
+		c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
+	}
+	if err := c.bw.Flush(); err != nil {
+		return c.fatal(err)
+	}
+	return nil
+}
+
+func (c *conn) Receive() (interface{}, error) {
+	return c.ReceiveWithTimeout(c.readTimeout)
+}
+
+func (c *conn) ReceiveWithTimeout(timeout time.Duration) (reply interface{}, err error) {
+	var deadline time.Time
+	if timeout != 0 {
+		deadline = time.Now().Add(timeout)
+	}
+	c.conn.SetReadDeadline(deadline)
+
+	if reply, err = c.readReply(); err != nil {
+		return nil, c.fatal(err)
+	}
+	// When using pub/sub, the number of receives can be greater than the
+	// number of sends. To enable normal use of the connection after
+	// unsubscribing from all channels, we do not decrement pending to a
+	// negative value.
+	//
+	// The pending field is decremented after the reply is read to handle the
+	// case where Receive is called before Send.
+	c.mu.Lock()
+	if c.pending > 0 {
+		c.pending -= 1
+	}
+	c.mu.Unlock()
+	if err, ok := reply.(Error); ok {
+		return nil, err
+	}
+	return
+}
+
+func (c *conn) Do(cmd string, args ...interface{}) (interface{}, error) {
+	return c.DoWithTimeout(c.readTimeout, cmd, args...)
+}
+
+func (c *conn) DoWithTimeout(readTimeout time.Duration, cmd string, args ...interface{}) (interface{}, error) {
+	c.mu.Lock()
+	pending := c.pending
+	c.pending = 0
+	c.mu.Unlock()
+
+	if cmd == "" && pending == 0 {
+		return nil, nil
+	}
+
+	if c.writeTimeout != 0 {
+		c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
+	}
+
+	if cmd != "" {
+		if err := c.writeCommand(cmd, args); err != nil {
+			return nil, c.fatal(err)
+		}
+	}
+
+	if err := c.bw.Flush(); err != nil {
+		return nil, c.fatal(err)
+	}
+
+	var deadline time.Time
+	if readTimeout != 0 {
+		deadline = time.Now().Add(readTimeout)
+	}
+	c.conn.SetReadDeadline(deadline)
+
+	if cmd == "" {
+		reply := make([]interface{}, pending)
+		for i := range reply {
+			r, e := c.readReply()
+			if e != nil {
+				return nil, c.fatal(e)
+			}
+			reply[i] = r
+		}
+		return reply, nil
+	}
+
+	var err error
+	var reply interface{}
+	for i := 0; i <= pending; i++ {
+		var e error
+		if reply, e = c.readReply(); e != nil {
+			return nil, c.fatal(e)
+		}
+		if e, ok := reply.(Error); ok && err == nil {
+			err = e
+		}
+	}
+	return reply, err
+}

vendor/github.com/garyburd/redigo/redis/doc.go

@@ -0,0 +1,177 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package redis is a client for the Redis database.
+//
+// The Redigo FAQ (https://github.com/garyburd/redigo/wiki/FAQ) contains more
+// documentation about this package.
+//
+// Connections
+//
+// The Conn interface is the primary interface for working with Redis.
+// Applications create connections by calling the Dial, DialWithTimeout or
+// NewConn functions. In the future, functions will be added for creating
+// sharded and other types of connections.
+//
+// The application must call the connection Close method when the application
+// is done with the connection.
+//
+// Executing Commands
+//
+// The Conn interface has a generic method for executing Redis commands:
+//
+//  Do(commandName string, args ...interface{}) (reply interface{}, err error)
+//
+// The Redis command reference (http://redis.io/commands) lists the available
+// commands. An example of using the Redis APPEND command is:
+//
+//  n, err := conn.Do("APPEND", "key", "value")
+//
+// The Do method converts command arguments to bulk strings for transmission
+// to the server as follows:
+//
+//  Go Type                 Conversion
+//  []byte                  Sent as is
+//  string                  Sent as is
+//  int, int64              strconv.FormatInt(v)
+//  float64                 strconv.FormatFloat(v, 'g', -1, 64)
+//  bool                    true -> "1", false -> "0"
+//  nil                     ""
+//  all other types         fmt.Fprint(w, v)
+//
+// Redis command reply types are represented using the following Go types:
+//
+//  Redis type              Go type
+//  error                   redis.Error
+//  integer                 int64
+//  simple string           string
+//  bulk string             []byte or nil if value not present.
+//  array                   []interface{} or nil if value not present.
+//
+// Use type assertions or the reply helper functions to convert from
+// interface{} to the specific Go type for the command result.
+//
+// Pipelining
+//
+// Connections support pipelining using the Send, Flush and Receive methods.
+//
+//  Send(commandName string, args ...interface{}) error
+//  Flush() error
+//  Receive() (reply interface{}, err error)
+//
+// Send writes the command to the connection's output buffer. Flush flushes the
+// connection's output buffer to the server. Receive reads a single reply from
+// the server. The following example shows a simple pipeline.
+//
+//  c.Send("SET", "foo", "bar")
+//  c.Send("GET", "foo")
+//  c.Flush()
+//  c.Receive() // reply from SET
+//  v, err = c.Receive() // reply from GET
+//
+// The Do method combines the functionality of the Send, Flush and Receive
+// methods. The Do method starts by writing the command and flushing the output
+// buffer. Next, the Do method receives all pending replies including the reply
+// for the command just sent by Do. If any of the received replies is an error,
+// then Do returns the error. If there are no errors, then Do returns the last
+// reply. If the command argument to the Do method is "", then the Do method
+// will flush the output buffer and receive pending replies without sending a
+// command.
+//
+// Use the Send and Do methods to implement pipelined transactions.
+//
+//  c.Send("MULTI")
+//  c.Send("INCR", "foo")
+//  c.Send("INCR", "bar")
+//  r, err := c.Do("EXEC")
+//  fmt.Println(r) // prints [1, 1]
+//
+// Concurrency
+//
+// Connections support one concurrent caller to the Receive method and one
+// concurrent caller to the Send and Flush methods. No other concurrency is
+// supported including concurrent calls to the Do method.
+//
+// For full concurrent access to Redis, use the thread-safe Pool to get, use
+// and release a connection from within a goroutine. Connections returned from
+// a Pool have the concurrency restrictions described in the previous
+// paragraph.
+//
+// Publish and Subscribe
+//
+// Use the Send, Flush and Receive methods to implement Pub/Sub subscribers.
+//
+//  c.Send("SUBSCRIBE", "example")
+//  c.Flush()
+//  for {
+//      reply, err := c.Receive()
+//      if err != nil {
+//          return err
+//      }
+//      // process pushed message
+//  }
+//
+// The PubSubConn type wraps a Conn with convenience methods for implementing
+// subscribers. The Subscribe, PSubscribe, Unsubscribe and PUnsubscribe methods
+// send and flush a subscription management command. The receive method
+// converts a pushed message to convenient types for use in a type switch.
+//
+//  psc := redis.PubSubConn{Conn: c}
+//  psc.Subscribe("example")
+//  for {
+//      switch v := psc.Receive().(type) {
+//      case redis.Message:
+//          fmt.Printf("%s: message: %s\n", v.Channel, v.Data)
+//      case redis.Subscription:
+//          fmt.Printf("%s: %s %d\n", v.Channel, v.Kind, v.Count)
+//      case error:
+//          return v
+//      }
+//  }
+//
+// Reply Helpers
+//
+// The Bool, Int, Bytes, String, Strings and Values functions convert a reply
+// to a value of a specific type. To allow convenient wrapping of calls to the
+// connection Do and Receive methods, the functions take a second argument of
+// type error.  If the error is non-nil, then the helper function returns the
+// error. If the error is nil, the function converts the reply to the specified
+// type:
+//
+//  exists, err := redis.Bool(c.Do("EXISTS", "foo"))
+//  if err != nil {
+//      // handle error return from c.Do or type conversion error.
+//  }
+//
+// The Scan function converts elements of a array reply to Go types:
+//
+//  var value1 int
+//  var value2 string
+//  reply, err := redis.Values(c.Do("MGET", "key1", "key2"))
+//  if err != nil {
+//      // handle error
+//  }
+//   if _, err := redis.Scan(reply, &value1, &value2); err != nil {
+//      // handle error
+//  }
+//
+// Errors
+//
+// Connection methods return error replies from the server as type redis.Error.
+//
+// Call the connection Err() method to determine if the connection encountered
+// non-recoverable error such as a network error or protocol parsing error. If
+// Err() returns a non-nil value, then the connection is not usable and should
+// be closed.
+package redis // import "github.com/garyburd/redigo/redis"

vendor/github.com/garyburd/redigo/redis/go16.go

@@ -0,0 +1,27 @@
+// +build !go1.7
+
+package redis
+
+import "crypto/tls"
+
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+	return &tls.Config{
+		Rand:                     cfg.Rand,
+		Time:                     cfg.Time,
+		Certificates:             cfg.Certificates,
+		NameToCertificate:        cfg.NameToCertificate,
+		GetCertificate:           cfg.GetCertificate,
+		RootCAs:                  cfg.RootCAs,
+		NextProtos:               cfg.NextProtos,
+		ServerName:               cfg.ServerName,
+		ClientAuth:               cfg.ClientAuth,
+		ClientCAs:                cfg.ClientCAs,
+		InsecureSkipVerify:       cfg.InsecureSkipVerify,
+		CipherSuites:             cfg.CipherSuites,
+		PreferServerCipherSuites: cfg.PreferServerCipherSuites,
+		ClientSessionCache:       cfg.ClientSessionCache,
+		MinVersion:               cfg.MinVersion,
+		MaxVersion:               cfg.MaxVersion,
+		CurvePreferences:         cfg.CurvePreferences,
+	}
+}

vendor/github.com/garyburd/redigo/redis/go17.go

@@ -0,0 +1,29 @@
+// +build go1.7,!go1.8
+
+package redis
+
+import "crypto/tls"
+
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+	return &tls.Config{
+		Rand:                        cfg.Rand,
+		Time:                        cfg.Time,
+		Certificates:                cfg.Certificates,
+		NameToCertificate:           cfg.NameToCertificate,
+		GetCertificate:              cfg.GetCertificate,
+		RootCAs:                     cfg.RootCAs,
+		NextProtos:                  cfg.NextProtos,
+		ServerName:                  cfg.ServerName,
+		ClientAuth:                  cfg.ClientAuth,
+		ClientCAs:                   cfg.ClientCAs,
+		InsecureSkipVerify:          cfg.InsecureSkipVerify,
+		CipherSuites:                cfg.CipherSuites,
+		PreferServerCipherSuites:    cfg.PreferServerCipherSuites,
+		ClientSessionCache:          cfg.ClientSessionCache,
+		MinVersion:                  cfg.MinVersion,
+		MaxVersion:                  cfg.MaxVersion,
+		CurvePreferences:            cfg.CurvePreferences,
+		DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled,
+		Renegotiation:               cfg.Renegotiation,
+	}
+}

vendor/github.com/garyburd/redigo/redis/go18.go

@@ -0,0 +1,9 @@
+// +build go1.8
+
+package redis
+
+import "crypto/tls"
+
+func cloneTLSConfig(cfg *tls.Config) *tls.Config {
+	return cfg.Clone()
+}

vendor/github.com/garyburd/redigo/redis/log.go

@@ -0,0 +1,134 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"time"
+)
+
+var (
+	_ ConnWithTimeout = (*loggingConn)(nil)
+)
+
+// NewLoggingConn returns a logging wrapper around a connection.
+func NewLoggingConn(conn Conn, logger *log.Logger, prefix string) Conn {
+	if prefix != "" {
+		prefix = prefix + "."
+	}
+	return &loggingConn{conn, logger, prefix}
+}
+
+type loggingConn struct {
+	Conn
+	logger *log.Logger
+	prefix string
+}
+
+func (c *loggingConn) Close() error {
+	err := c.Conn.Close()
+	var buf bytes.Buffer
+	fmt.Fprintf(&buf, "%sClose() -> (%v)", c.prefix, err)
+	c.logger.Output(2, buf.String())
+	return err
+}
+
+func (c *loggingConn) printValue(buf *bytes.Buffer, v interface{}) {
+	const chop = 32
+	switch v := v.(type) {
+	case []byte:
+		if len(v) > chop {
+			fmt.Fprintf(buf, "%q...", v[:chop])
+		} else {
+			fmt.Fprintf(buf, "%q", v)
+		}
+	case string:
+		if len(v) > chop {
+			fmt.Fprintf(buf, "%q...", v[:chop])
+		} else {
+			fmt.Fprintf(buf, "%q", v)
+		}
+	case []interface{}:
+		if len(v) == 0 {
+			buf.WriteString("[]")
+		} else {
+			sep := "["
+			fin := "]"
+			if len(v) > chop {
+				v = v[:chop]
+				fin = "...]"
+			}
+			for _, vv := range v {
+				buf.WriteString(sep)
+				c.printValue(buf, vv)
+				sep = ", "
+			}
+			buf.WriteString(fin)
+		}
+	default:
+		fmt.Fprint(buf, v)
+	}
+}
+
+func (c *loggingConn) print(method, commandName string, args []interface{}, reply interface{}, err error) {
+	var buf bytes.Buffer
+	fmt.Fprintf(&buf, "%s%s(", c.prefix, method)
+	if method != "Receive" {
+		buf.WriteString(commandName)
+		for _, arg := range args {
+			buf.WriteString(", ")
+			c.printValue(&buf, arg)
+		}
+	}
+	buf.WriteString(") -> (")
+	if method != "Send" {
+		c.printValue(&buf, reply)
+		buf.WriteString(", ")
+	}
+	fmt.Fprintf(&buf, "%v)", err)
+	c.logger.Output(3, buf.String())
+}
+
+func (c *loggingConn) Do(commandName string, args ...interface{}) (interface{}, error) {
+	reply, err := c.Conn.Do(commandName, args...)
+	c.print("Do", commandName, args, reply, err)
+	return reply, err
+}
+
+func (c *loggingConn) DoWithTimeout(timeout time.Duration, commandName string, args ...interface{}) (interface{}, error) {
+	reply, err := DoWithTimeout(c.Conn, timeout, commandName, args...)
+	c.print("DoWithTimeout", commandName, args, reply, err)
+	return reply, err
+}
+
+func (c *loggingConn) Send(commandName string, args ...interface{}) error {
+	err := c.Conn.Send(commandName, args...)
+	c.print("Send", commandName, args, nil, err)
+	return err
+}
+
+func (c *loggingConn) Receive() (interface{}, error) {
+	reply, err := c.Conn.Receive()
+	c.print("Receive", "", nil, reply, err)
+	return reply, err
+}
+
+func (c *loggingConn) ReceiveWithTimeout(timeout time.Duration) (interface{}, error) {
+	reply, err := ReceiveWithTimeout(c.Conn, timeout)
+	c.print("ReceiveWithTimeout", "", nil, reply, err)
+	return reply, err
+}

vendor/github.com/garyburd/redigo/redis/pool.go

@@ -0,0 +1,562 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bytes"
+	"crypto/rand"
+	"crypto/sha1"
+	"errors"
+	"io"
+	"strconv"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/garyburd/redigo/internal"
+)
+
+var (
+	_ ConnWithTimeout = (*activeConn)(nil)
+	_ ConnWithTimeout = (*errorConn)(nil)
+)
+
+var nowFunc = time.Now // for testing
+
+// ErrPoolExhausted is returned from a pool connection method (Do, Send,
+// Receive, Flush, Err) when the maximum number of database connections in the
+// pool has been reached.
+var ErrPoolExhausted = errors.New("redigo: connection pool exhausted")
+
+var (
+	errPoolClosed = errors.New("redigo: connection pool closed")
+	errConnClosed = errors.New("redigo: connection closed")
+)
+
+// Pool maintains a pool of connections. The application calls the Get method
+// to get a connection from the pool and the connection's Close method to
+// return the connection's resources to the pool.
+//
+// The following example shows how to use a pool in a web application. The
+// application creates a pool at application startup and makes it available to
+// request handlers using a package level variable. The pool configuration used
+// here is an example, not a recommendation.
+//
+//  func newPool(addr string) *redis.Pool {
+//    return &redis.Pool{
+//      MaxIdle: 3,
+//      IdleTimeout: 240 * time.Second,
+//      Dial: func () (redis.Conn, error) { return redis.Dial("tcp", addr) },
+//    }
+//  }
+//
+//  var (
+//    pool *redis.Pool
+//    redisServer = flag.String("redisServer", ":6379", "")
+//  )
+//
+//  func main() {
+//    flag.Parse()
+//    pool = newPool(*redisServer)
+//    ...
+//  }
+//
+// A request handler gets a connection from the pool and closes the connection
+// when the handler is done:
+//
+//  func serveHome(w http.ResponseWriter, r *http.Request) {
+//      conn := pool.Get()
+//      defer conn.Close()
+//      ...
+//  }
+//
+// Use the Dial function to authenticate connections with the AUTH command or
+// select a database with the SELECT command:
+//
+//  pool := &redis.Pool{
+//    // Other pool configuration not shown in this example.
+//    Dial: func () (redis.Conn, error) {
+//      c, err := redis.Dial("tcp", server)
+//      if err != nil {
+//        return nil, err
+//      }
+//      if _, err := c.Do("AUTH", password); err != nil {
+//        c.Close()
+//        return nil, err
+//      }
+//      if _, err := c.Do("SELECT", db); err != nil {
+//        c.Close()
+//        return nil, err
+//      }
+//      return c, nil
+//    },
+//  }
+//
+// Use the TestOnBorrow function to check the health of an idle connection
+// before the connection is returned to the application. This example PINGs
+// connections that have been idle more than a minute:
+//
+//  pool := &redis.Pool{
+//    // Other pool configuration not shown in this example.
+//    TestOnBorrow: func(c redis.Conn, t time.Time) error {
+//      if time.Since(t) < time.Minute {
+//        return nil
+//      }
+//      _, err := c.Do("PING")
+//      return err
+//    },
+//  }
+//
+type Pool struct {
+	// Dial is an application supplied function for creating and configuring a
+	// connection.
+	//
+	// The connection returned from Dial must not be in a special state
+	// (subscribed to pubsub channel, transaction started, ...).
+	Dial func() (Conn, error)
+
+	// TestOnBorrow is an optional application supplied function for checking
+	// the health of an idle connection before the connection is used again by
+	// the application. Argument t is the time that the connection was returned
+	// to the pool. If the function returns an error, then the connection is
+	// closed.
+	TestOnBorrow func(c Conn, t time.Time) error
+
+	// Maximum number of idle connections in the pool.
+	MaxIdle int
+
+	// Maximum number of connections allocated by the pool at a given time.
+	// When zero, there is no limit on the number of connections in the pool.
+	MaxActive int
+
+	// Close connections after remaining idle for this duration. If the value
+	// is zero, then idle connections are not closed. Applications should set
+	// the timeout to a value less than the server's timeout.
+	IdleTimeout time.Duration
+
+	// If Wait is true and the pool is at the MaxActive limit, then Get() waits
+	// for a connection to be returned to the pool before returning.
+	Wait bool
+
+	// Close connections older than this duration. If the value is zero, then
+	// the pool does not close connections based on age.
+	MaxConnLifetime time.Duration
+
+	chInitialized uint32 // set to 1 when field ch is initialized
+
+	mu     sync.Mutex    // mu protects the following fields
+	closed bool          // set to true when the pool is closed.
+	active int           // the number of open connections in the pool
+	ch     chan struct{} // limits open connections when p.Wait is true
+	idle   idleList      // idle connections
+}
+
+// NewPool creates a new pool.
+//
+// Deprecated: Initialize the Pool directory as shown in the example.
+func NewPool(newFn func() (Conn, error), maxIdle int) *Pool {
+	return &Pool{Dial: newFn, MaxIdle: maxIdle}
+}
+
+// Get gets a connection. The application must close the returned connection.
+// This method always returns a valid connection so that applications can defer
+// error handling to the first use of the connection. If there is an error
+// getting an underlying connection, then the connection Err, Do, Send, Flush
+// and Receive methods return that error.
+func (p *Pool) Get() Conn {
+	pc, err := p.get(nil)
+	if err != nil {
+		return errorConn{err}
+	}
+	return &activeConn{p: p, pc: pc}
+}
+
+// PoolStats contains pool statistics.
+type PoolStats struct {
+	// ActiveCount is the number of connections in the pool. The count includes
+	// idle connections and connections in use.
+	ActiveCount int
+	// IdleCount is the number of idle connections in the pool.
+	IdleCount int
+}
+
+// Stats returns pool's statistics.
+func (p *Pool) Stats() PoolStats {
+	p.mu.Lock()
+	stats := PoolStats{
+		ActiveCount: p.active,
+		IdleCount:   p.idle.count,
+	}
+	p.mu.Unlock()
+
+	return stats
+}
+
+// ActiveCount returns the number of connections in the pool. The count
+// includes idle connections and connections in use.
+func (p *Pool) ActiveCount() int {
+	p.mu.Lock()
+	active := p.active
+	p.mu.Unlock()
+	return active
+}
+
+// IdleCount returns the number of idle connections in the pool.
+func (p *Pool) IdleCount() int {
+	p.mu.Lock()
+	idle := p.idle.count
+	p.mu.Unlock()
+	return idle
+}
+
+// Close releases the resources used by the pool.
+func (p *Pool) Close() error {
+	p.mu.Lock()
+	if p.closed {
+		p.mu.Unlock()
+		return nil
+	}
+	p.closed = true
+	p.active -= p.idle.count
+	pc := p.idle.front
+	p.idle.count = 0
+	p.idle.front, p.idle.back = nil, nil
+	if p.ch != nil {
+		close(p.ch)
+	}
+	p.mu.Unlock()
+	for ; pc != nil; pc = pc.next {
+		pc.c.Close()
+	}
+	return nil
+}
+
+func (p *Pool) lazyInit() {
+	// Fast path.
+	if atomic.LoadUint32(&p.chInitialized) == 1 {
+		return
+	}
+	// Slow path.
+	p.mu.Lock()
+	if p.chInitialized == 0 {
+		p.ch = make(chan struct{}, p.MaxActive)
+		if p.closed {
+			close(p.ch)
+		} else {
+			for i := 0; i < p.MaxActive; i++ {
+				p.ch <- struct{}{}
+			}
+		}
+		atomic.StoreUint32(&p.chInitialized, 1)
+	}
+	p.mu.Unlock()
+}
+
+// get prunes stale connections and returns a connection from the idle list or
+// creates a new connection.
+func (p *Pool) get(ctx interface {
+	Done() <-chan struct{}
+	Err() error
+}) (*poolConn, error) {
+
+	// Handle limit for p.Wait == true.
+	if p.Wait && p.MaxActive > 0 {
+		p.lazyInit()
+		if ctx == nil {
+			<-p.ch
+		} else {
+			select {
+			case <-p.ch:
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			}
+		}
+	}
+
+	p.mu.Lock()
+
+	// Prune stale connections at the back of the idle list.
+	if p.IdleTimeout > 0 {
+		n := p.idle.count
+		for i := 0; i < n && p.idle.back != nil && p.idle.back.t.Add(p.IdleTimeout).Before(nowFunc()); i++ {
+			pc := p.idle.back
+			p.idle.popBack()
+			p.mu.Unlock()
+			pc.c.Close()
+			p.mu.Lock()
+			p.active--
+		}
+	}
+
+	// Get idle connection from the front of idle list.
+	for p.idle.front != nil {
+		pc := p.idle.front
+		p.idle.popFront()
+		p.mu.Unlock()
+		if (p.TestOnBorrow == nil || p.TestOnBorrow(pc.c, pc.t) == nil) &&
+			(p.MaxConnLifetime == 0 || nowFunc().Sub(pc.created) < p.MaxConnLifetime) {
+			return pc, nil
+		}
+		pc.c.Close()
+		p.mu.Lock()
+		p.active--
+	}
+
+	// Check for pool closed before dialing a new connection.
+	if p.closed {
+		p.mu.Unlock()
+		return nil, errors.New("redigo: get on closed pool")
+	}
+
+	// Handle limit for p.Wait == false.
+	if !p.Wait && p.MaxActive > 0 && p.active >= p.MaxActive {
+		p.mu.Unlock()
+		return nil, ErrPoolExhausted
+	}
+
+	p.active++
+	p.mu.Unlock()
+	c, err := p.Dial()
+	if err != nil {
+		c = nil
+		p.mu.Lock()
+		p.active--
+		if p.ch != nil && !p.closed {
+			p.ch <- struct{}{}
+		}
+		p.mu.Unlock()
+	}
+	return &poolConn{c: c, created: nowFunc()}, err
+}
+
+func (p *Pool) put(pc *poolConn, forceClose bool) error {
+	p.mu.Lock()
+	if !p.closed && !forceClose {
+		pc.t = nowFunc()
+		p.idle.pushFront(pc)
+		if p.idle.count > p.MaxIdle {
+			pc = p.idle.back
+			p.idle.popBack()
+		} else {
+			pc = nil
+		}
+	}
+
+	if pc != nil {
+		p.mu.Unlock()
+		pc.c.Close()
+		p.mu.Lock()
+		p.active--
+	}
+
+	if p.ch != nil && !p.closed {
+		p.ch <- struct{}{}
+	}
+	p.mu.Unlock()
+	return nil
+}
+
+type activeConn struct {
+	p     *Pool
+	pc    *poolConn
+	state int
+}
+
+var (
+	sentinel     []byte
+	sentinelOnce sync.Once
+)
+
+func initSentinel() {
+	p := make([]byte, 64)
+	if _, err := rand.Read(p); err == nil {
+		sentinel = p
+	} else {
+		h := sha1.New()
+		io.WriteString(h, "Oops, rand failed. Use time instead.")
+		io.WriteString(h, strconv.FormatInt(time.Now().UnixNano(), 10))
+		sentinel = h.Sum(nil)
+	}
+}
+
+func (ac *activeConn) Close() error {
+	pc := ac.pc
+	if pc == nil {
+		return nil
+	}
+	ac.pc = nil
+
+	if ac.state&internal.MultiState != 0 {
+		pc.c.Send("DISCARD")
+		ac.state &^= (internal.MultiState | internal.WatchState)
+	} else if ac.state&internal.WatchState != 0 {
+		pc.c.Send("UNWATCH")
+		ac.state &^= internal.WatchState
+	}
+	if ac.state&internal.SubscribeState != 0 {
+		pc.c.Send("UNSUBSCRIBE")
+		pc.c.Send("PUNSUBSCRIBE")
+		// To detect the end of the message stream, ask the server to echo
+		// a sentinel value and read until we see that value.
+		sentinelOnce.Do(initSentinel)
+		pc.c.Send("ECHO", sentinel)
+		pc.c.Flush()
+		for {
+			p, err := pc.c.Receive()
+			if err != nil {
+				break
+			}
+			if p, ok := p.([]byte); ok && bytes.Equal(p, sentinel) {
+				ac.state &^= internal.SubscribeState
+				break
+			}
+		}
+	}
+	pc.c.Do("")
+	ac.p.put(pc, ac.state != 0 || pc.c.Err() != nil)
+	return nil
+}
+
+func (ac *activeConn) Err() error {
+	pc := ac.pc
+	if pc == nil {
+		return errConnClosed
+	}
+	return pc.c.Err()
+}
+
+func (ac *activeConn) Do(commandName string, args ...interface{}) (reply interface{}, err error) {
+	pc := ac.pc
+	if pc == nil {
+		return nil, errConnClosed
+	}
+	ci := internal.LookupCommandInfo(commandName)
+	ac.state = (ac.state | ci.Set) &^ ci.Clear
+	return pc.c.Do(commandName, args...)
+}
+
+func (ac *activeConn) DoWithTimeout(timeout time.Duration, commandName string, args ...interface{}) (reply interface{}, err error) {
+	pc := ac.pc
+	if pc == nil {
+		return nil, errConnClosed
+	}
+	cwt, ok := pc.c.(ConnWithTimeout)
+	if !ok {
+		return nil, errTimeoutNotSupported
+	}
+	ci := internal.LookupCommandInfo(commandName)
+	ac.state = (ac.state | ci.Set) &^ ci.Clear
+	return cwt.DoWithTimeout(timeout, commandName, args...)
+}
+
+func (ac *activeConn) Send(commandName string, args ...interface{}) error {
+	pc := ac.pc
+	if pc == nil {
+		return errConnClosed
+	}
+	ci := internal.LookupCommandInfo(commandName)
+	ac.state = (ac.state | ci.Set) &^ ci.Clear
+	return pc.c.Send(commandName, args...)
+}
+
+func (ac *activeConn) Flush() error {
+	pc := ac.pc
+	if pc == nil {
+		return errConnClosed
+	}
+	return pc.c.Flush()
+}
+
+func (ac *activeConn) Receive() (reply interface{}, err error) {
+	pc := ac.pc
+	if pc == nil {
+		return nil, errConnClosed
+	}
+	return pc.c.Receive()
+}
+
+func (ac *activeConn) ReceiveWithTimeout(timeout time.Duration) (reply interface{}, err error) {
+	pc := ac.pc
+	if pc == nil {
+		return nil, errConnClosed
+	}
+	cwt, ok := pc.c.(ConnWithTimeout)
+	if !ok {
+		return nil, errTimeoutNotSupported
+	}
+	return cwt.ReceiveWithTimeout(timeout)
+}
+
+type errorConn struct{ err error }
+
+func (ec errorConn) Do(string, ...interface{}) (interface{}, error) { return nil, ec.err }
+func (ec errorConn) DoWithTimeout(time.Duration, string, ...interface{}) (interface{}, error) {
+	return nil, ec.err
+}
+func (ec errorConn) Send(string, ...interface{}) error                     { return ec.err }
+func (ec errorConn) Err() error                                            { return ec.err }
+func (ec errorConn) Close() error                                          { return nil }
+func (ec errorConn) Flush() error                                          { return ec.err }
+func (ec errorConn) Receive() (interface{}, error)                         { return nil, ec.err }
+func (ec errorConn) ReceiveWithTimeout(time.Duration) (interface{}, error) { return nil, ec.err }
+
+type idleList struct {
+	count       int
+	front, back *poolConn
+}
+
+type poolConn struct {
+	c          Conn
+	t          time.Time
+	created    time.Time
+	next, prev *poolConn
+}
+
+func (l *idleList) pushFront(pc *poolConn) {
+	pc.next = l.front
+	pc.prev = nil
+	if l.count == 0 {
+		l.back = pc
+	} else {
+		l.front.prev = pc
+	}
+	l.front = pc
+	l.count++
+	return
+}
+
+func (l *idleList) popFront() {
+	pc := l.front
+	l.count--
+	if l.count == 0 {
+		l.front, l.back = nil, nil
+	} else {
+		pc.next.prev = nil
+		l.front = pc.next
+	}
+	pc.next, pc.prev = nil, nil
+}
+
+func (l *idleList) popBack() {
+	pc := l.back
+	l.count--
+	if l.count == 0 {
+		l.front, l.back = nil, nil
+	} else {
+		pc.prev.next = nil
+		l.back = pc.prev
+	}
+	pc.next, pc.prev = nil, nil
+}

vendor/github.com/garyburd/redigo/redis/pool17.go

@@ -0,0 +1,35 @@
+// Copyright 2018 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// +build go1.7
+
+package redis
+
+import "context"
+
+// GetContext gets a connection using the provided context.
+//
+// The provided Context must be non-nil. If the context expires before the
+// connection is complete, an error is returned. Any expiration on the context
+// will not affect the returned connection.
+//
+// If the function completes without error, then the application must close the
+// returned connection.
+func (p *Pool) GetContext(ctx context.Context) (Conn, error) {
+	pc, err := p.get(ctx)
+	if err != nil {
+		return errorConn{err}, err
+	}
+	return &activeConn{p: p, pc: pc}, nil
+}

vendor/github.com/garyburd/redigo/redis/pubsub.go

@@ -0,0 +1,157 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"errors"
+	"time"
+)
+
+// Subscription represents a subscribe or unsubscribe notification.
+type Subscription struct {
+	// Kind is "subscribe", "unsubscribe", "psubscribe" or "punsubscribe"
+	Kind string
+
+	// The channel that was changed.
+	Channel string
+
+	// The current number of subscriptions for connection.
+	Count int
+}
+
+// Message represents a message notification.
+type Message struct {
+	// The originating channel.
+	Channel string
+
+	// The message data.
+	Data []byte
+}
+
+// PMessage represents a pmessage notification.
+type PMessage struct {
+	// The matched pattern.
+	Pattern string
+
+	// The originating channel.
+	Channel string
+
+	// The message data.
+	Data []byte
+}
+
+// Pong represents a pubsub pong notification.
+type Pong struct {
+	Data string
+}
+
+// PubSubConn wraps a Conn with convenience methods for subscribers.
+type PubSubConn struct {
+	Conn Conn
+}
+
+// Close closes the connection.
+func (c PubSubConn) Close() error {
+	return c.Conn.Close()
+}
+
+// Subscribe subscribes the connection to the specified channels.
+func (c PubSubConn) Subscribe(channel ...interface{}) error {
+	c.Conn.Send("SUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// PSubscribe subscribes the connection to the given patterns.
+func (c PubSubConn) PSubscribe(channel ...interface{}) error {
+	c.Conn.Send("PSUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// Unsubscribe unsubscribes the connection from the given channels, or from all
+// of them if none is given.
+func (c PubSubConn) Unsubscribe(channel ...interface{}) error {
+	c.Conn.Send("UNSUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// PUnsubscribe unsubscribes the connection from the given patterns, or from all
+// of them if none is given.
+func (c PubSubConn) PUnsubscribe(channel ...interface{}) error {
+	c.Conn.Send("PUNSUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// Ping sends a PING to the server with the specified data.
+//
+// The connection must be subscribed to at least one channel or pattern when
+// calling this method.
+func (c PubSubConn) Ping(data string) error {
+	c.Conn.Send("PING", data)
+	return c.Conn.Flush()
+}
+
+// Receive returns a pushed message as a Subscription, Message, PMessage, Pong
+// or error. The return value is intended to be used directly in a type switch
+// as illustrated in the PubSubConn example.
+func (c PubSubConn) Receive() interface{} {
+	return c.receiveInternal(c.Conn.Receive())
+}
+
+// ReceiveWithTimeout is like Receive, but it allows the application to
+// override the connection's default timeout.
+func (c PubSubConn) ReceiveWithTimeout(timeout time.Duration) interface{} {
+	return c.receiveInternal(ReceiveWithTimeout(c.Conn, timeout))
+}
+
+func (c PubSubConn) receiveInternal(replyArg interface{}, errArg error) interface{} {
+	reply, err := Values(replyArg, errArg)
+	if err != nil {
+		return err
+	}
+
+	var kind string
+	reply, err = Scan(reply, &kind)
+	if err != nil {
+		return err
+	}
+
+	switch kind {
+	case "message":
+		var m Message
+		if _, err := Scan(reply, &m.Channel, &m.Data); err != nil {
+			return err
+		}
+		return m
+	case "pmessage":
+		var pm PMessage
+		if _, err := Scan(reply, &pm.Pattern, &pm.Channel, &pm.Data); err != nil {
+			return err
+		}
+		return pm
+	case "subscribe", "psubscribe", "unsubscribe", "punsubscribe":
+		s := Subscription{Kind: kind}
+		if _, err := Scan(reply, &s.Channel, &s.Count); err != nil {
+			return err
+		}
+		return s
+	case "pong":
+		var p Pong
+		if _, err := Scan(reply, &p.Data); err != nil {
+			return err
+		}
+		return p
+	}
+	return errors.New("redigo: unknown pubsub notification")
+}