修复太过于严格的bug

增加自适应模式
2022-01-03 01:42:35 +08:00 · 2021-12-31 02:38:51 +08:00 · 2021-12-30 22:19:52 +08:00 · 2021-12-29 00:46:07 +08:00 · 2021-12-28 09:26:26 +08:00 · 2021-12-27 21:30:33 +08:00
202 changed files with 8669 additions and 264256 deletions
@@ -0,0 +1,208 @@
+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 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.
+For the purposes of that 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 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,
+annotations, elaborations, or other modifications represent, as a whole, an
+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
+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 that 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 that
+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 that License,
+each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in that 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 that 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 that 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 that 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 that 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 that 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 that 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 that 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 that 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.
@@ -0,0 +1,6 @@
+# hotime
+golang web服务框架
+支持数据库db：mysql、sqlite3
+支持缓存cache：redis，memory，数据库
+自带工具类，上下文，以及session等功能
+
@@ -1,9 +1,14 @@
 package hotime

 import (
-	"bytes"
+	. "./cache"
+	"./code"
+	. "./common"
+	. "./db"
+	. "./log"
 	"database/sql"
-	"encoding/json"
+	"github.com/sirupsen/logrus"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -11,61 +16,71 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"time"
 )

 type Application struct {
+	*code.MakeCode
+	MakeCodeRouter Router
 	MethodRouter
 	Router
-	contextBase
+	ContextBase
+	Error
+	Log             *logrus.Logger
+	WebConnectLog   *logrus.Logger
 	Port            string                     //端口号
 	TLSPort         string                     //ssl访问端口号
 	connectListener []func(this *Context) bool //所有的访问监听,true按原计划继续使用，false表示有监听器处理
-	connectDbFunc   func(err ...*Error) *sql.DB
+	connectDbFunc   func(err ...*Error) (master, slave *sql.DB)
 	configPath      string
 	Config          Map
 	Db              HoTimeDB
-	Server          *http.Server
-	CacheIns
-	sessionLong  CacheIns
-	sessionShort CacheIns
+	*HoTimeCache
+	*http.Server
 	http.Handler
 }

-func (this *Application) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	this.handler(w, req)
+func (that *Application) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	that.handler(w, req)
 }

-//启动实例
-func (this *Application) Run(router Router) {
+// Run 启动实例
+func (that *Application) Run(router Router) {
 	//如果没有设置配置自动生成配置
-	if this.configPath == "" || len(this.Config) == 0 {
-		this.SetConfig()
+	if that.configPath == "" || len(that.Config) == 0 {
+		that.SetConfig()
 	}

 	//防止手动设置缓存误伤
-	if this.CacheIns == nil {
-		this.SetCache(CacheIns(&CacheMemory{}))
+	if that.HoTimeCache == nil {
+		that.SetCache()
 	}

 	//防止手动设置session误伤
-	if this.sessionShort == nil && this.sessionLong == nil {
-		if this.connectDbFunc == nil {
-			this.SetSession(CacheIns(&CacheMemory{}), nil)
-		} else {
-			this.SetSession(CacheIns(&CacheMemory{}), CacheIns(&CacheDb{Db: &this.Db, Time: this.Config.GetInt64("cacheLongTime")}))
-		}
+	//if that.sessionShort == nil && that.sessionLong == nil {
+	//	if that.connectDbFunc == nil {
+	//		that.SetSession(CacheIns(&CacheMemory{}), nil)
+	//	} else {
+	//		that.SetSession(CacheIns(&CacheMemory{}), CacheIns(&CacheDb{Db: &that.Db, Time: that.Config.GetInt64("cacheLongTime")}))
+	//	}
+	//
+	//}

+	//that.Router = router
+	if that.Router == nil {
+		that.Router = Router{}
+	}
+	for k, v := range router {
+		that.Router[k] = v
 	}
-
-	this.Router = router
 	//重新设置MethodRouter//直达路由
-	this.MethodRouter = MethodRouter{}
+	that.MethodRouter = MethodRouter{}
 	modeRouterStrict := true
-	if this.Config.Get("modeRouterStrict").(bool) == false {
+	if that.Config.GetBool("modeRouterStrict") == false {
 		modeRouterStrict = false
 	}
-	if router != nil {
-		for pk, pv := range router {
+	if that.Router != nil {
+		for pk, pv := range that.Router {
 			if !modeRouterStrict {
 				pk = strings.ToLower(pk)
 			}
@@ -79,7 +94,7 @@ func (this *Application) Run(router Router) {
 							if !modeRouterStrict {
 								mk = strings.ToLower(mk)
 							}
-							this.MethodRouter["/"+pk+"/"+ck+"/"+mk] = mv
+							that.MethodRouter["/"+pk+"/"+ck+"/"+mk] = mv
 						}
 					}
 				}
@@ -87,169 +102,164 @@ func (this *Application) Run(router Router) {
 		}
 	}

-	//this.Port = port
-	this.Port = this.Config.GetString("port")
-	this.TLSPort = this.Config.GetString("tlsPort")
+	//that.Port = port
+	that.Port = that.Config.GetString("port")
+	that.TLSPort = that.Config.GetString("tlsPort")

-	if this.connectDbFunc != nil && (this.Db.DB == nil || this.Db.DB.Ping() != nil) {
-		this.Db.SetConnect(this.connectDbFunc)
-	}
-
-	if this.CacheIns == nil {
-		this.CacheIns = CacheIns(&CacheMemory{Map: Map{}, Time: this.Config.GetInt64("cacheShortTime")})
+	if that.connectDbFunc != nil && (that.Db.DB == nil || that.Db.DB.Ping() != nil) {
+		that.Db.SetConnect(that.connectDbFunc)
 	}

 	//异常处理
 	defer func() {
 		if err := recover(); err != nil {
-			//this.SetError(errors.New(fmt.Sprint(err)), LOG_FMT)
-			logFmt(err, 2, LOG_ERROR)
+			//that.SetError(errors.New(fmt.Sprint(err)), LOG_FMT)
+			that.Log.Warn(err)

-			this.Run(router)
+			that.Run(router)
 		}
 	}()

-	this.Server = &http.Server{}
+	that.Server = &http.Server{}
 	if !IsRun {
 		IsRun = true
 	}

 	ch := make(chan int)
-	if ObjToCeilInt(this.Port) != 0 {
+	if ObjToCeilInt(that.Port) != 0 {
 		go func() {

-			App[this.Port] = this
-			this.Server.Handler = this
+			App[that.Port] = that
+			that.Server.Handler = that
 			//启动服务
-			this.Server.Addr = ":" + this.Port
-			err := this.Server.ListenAndServe()
-			logFmt(err, 2)
+			that.Server.Addr = ":" + that.Port
+			err := that.Server.ListenAndServe()
+			that.Log.Error(err)
 			ch <- 1

 		}()
-	} else if ObjToCeilInt(this.TLSPort) != 0 {
+	}
+
+	if ObjToCeilInt(that.TLSPort) != 0 {
 		go func() {

-			App[this.TLSPort] = this
-			this.Server.Handler = this
+			App[that.TLSPort] = that
+			that.Server.Handler = that
 			//启动服务
-			this.Server.Addr = ":" + this.TLSPort
-			err := this.Server.ListenAndServeTLS(this.Config.GetString("tlsCert"), this.Config.GetString("tlsKey"))
-			logFmt(err, 2)
+			that.Server.Addr = ":" + that.TLSPort
+			err := that.Server.ListenAndServeTLS(that.Config.GetString("tlsCert"), that.Config.GetString("tlsKey"))
+			that.Log.Error(err)
 			ch <- 2

 		}()
-	} else {
-		logFmt("没有端口启用", 2, LOG_INFO)
+	}
+	if ObjToCeilInt(that.Port) == 0 && ObjToCeilInt(that.TLSPort) == 0 {
+		that.Log.Error("没有端口启用")
 		return

 	}

 	value := <-ch

-	logFmt("启动服务失败 : "+ObjToStr(value), 2, LOG_ERROR)
+	that.Log.Error("启动服务失败 : " + ObjToStr(value))
 }

-//启动实例
-func (this *Application) SetConnectDB(connect func(err ...*Error) *sql.DB) {
+// SetConnectDB 启动实例
+func (that *Application) SetConnectDB(connect func(err ...*Error) (master, slave *sql.DB)) {

-	//this.Db.DBCached=false
-	//if this.Config.GetCeilInt("dbCached")!=0{
-	//	this.Db.DBCached=true
-	//}
+	that.connectDbFunc = connect

-	this.connectDbFunc = connect
-	this.Db.SetConnect(this.connectDbFunc)
-
-	this.Db.DBCached = false
-	if this.Config.GetCeilInt("dbCached") != 0 {
-		this.Db.DBCached = true
-	}
-
-	this.Db.Type = this.Config.GetString("dbType")
+	that.Db.SetConnect(that.connectDbFunc, &that.Error)

 }

-//设置配置文件路径全路径或者相对路径
-func (this *Application) SetSession(short CacheIns, Long CacheIns) {
-	this.sessionLong = Long
-	this.sessionShort = short
-
-}
-
-//默认配置缓存和session实现
-func (this *Application) SetDefault(connect func(err ...*Error) *sql.DB) {
-	this.SetConfig()
+// SetDefault 默认配置缓存和session实现
+func (that *Application) SetDefault(connect func(err ...*Error) (*sql.DB, *sql.DB)) {
+	that.SetConfig()

 	if connect != nil {
-		this.connectDbFunc = connect
-		this.Db.SetConnect(this.connectDbFunc)
+		that.connectDbFunc = connect
+		that.Db.SetConnect(that.connectDbFunc)
 	}

 }

-//设置配置文件路径全路径或者相对路径
-func (this *Application) SetCache(cache CacheIns) {
-
-	this.CacheIns = cache
-
+// SetCache 设置配置文件路径全路径或者相对路径
+func (that *Application) SetCache() {
+	cacheIns := HoTimeCache{}
+	cacheIns.Init(that.Config.GetMap("cache"), HoTimeDBInterface(&that.Db), &that.Error)
+	that.HoTimeCache = &cacheIns
+	//mode生产模式开启的时候才开启数据库缓存，防止调试出问题
+	if that.Config.GetInt("mode") == 0 {
+		that.Db.HoTimeCache = &cacheIns
+	}
 }

-//设置配置文件路径全路径或者相对路径
-func (this *Application) SetConfig(configPath ...string) {
+// SetConfig 设置配置文件路径全路径或者相对路径
+func (that *Application) SetConfig(configPath ...string) {
+
+	that.Log = GetLog("", true)
+	that.Error = Error{Logger: that.Log}
 	if len(configPath) != 0 {
-		this.configPath = configPath[0]
+		that.configPath = configPath[0]
 	}

-	if this.configPath == "" {
-		this.configPath = "config/config.json"
+	if that.configPath == "" {
+		that.configPath = "config/config.json"
 	}
 	//加载配置文件
-	btes, err := ioutil.ReadFile(this.configPath)
-	this.Config = DeepCopyMap(Config).(Map)
+	btes, err := ioutil.ReadFile(that.configPath)
+	that.Config = DeepCopyMap(Config).(Map)
 	if err == nil {

 		cmap := Map{}
 		//文件是否损坏
-		cmap.JsonToMap(string(btes), &this.Error)
+		cmap.JsonToMap(string(btes), &that.Error)

 		for k, v := range cmap {
-			this.Config[k] = v //程序配置
+			that.Config[k] = v //程序配置
 			Config[k] = v      //系统配置
 		}
 	} else {
-		logFmt("配置文件不存在，或者配置出错，使用缺省默认配置", 2)
+		that.Log.Error("配置文件不存在，或者配置出错，使用缺省默认配置")

 	}

-	//文件如果损坏则不写入配置防止配置文件数据丢失
-	if this.Error.GetError() == nil {
-		var configByte bytes.Buffer
+	that.Log = GetLog(that.Config.GetString("logFile"), true)
+	that.Error = Error{Logger: that.Log}
+	if that.Config.Get("webConnectLogShow") == nil || that.Config.GetBool("webConnectLogShow") {
+		that.WebConnectLog = GetLog(that.Config.GetString("webConnectLogFile"), false)
+	}

-		err = json.Indent(&configByte, []byte(this.Config.ToJsonString()), "", "\t")
-		//判断配置文件是否序列有变化有则修改配置，五则不变
+	//文件如果损坏则不写入配置防止配置文件数据丢失
+	if that.Error.GetError() == nil {
+		//var configByte bytes.Buffer
+
+		//判断配置文件是否序列有变化，有则修改配置，无则不变
 		//fmt.Println(len(btes))
-		if len(btes) != 0 && configByte.String() == string(btes) {
+		configStr := that.Config.ToJsonString()
+		if len(btes) != 0 && configStr == string(btes) {
 			return
 		}
 		//写入配置说明
-		var configNoteByte bytes.Buffer
-		json.Indent(&configNoteByte, []byte(ConfigNote.ToJsonString()), "", "\t")
+		//var configNoteByte bytes.Buffer
+		configNoteStr := ConfigNote.ToJsonString()
+		//_ = json.Indent(&configNoteByte, []byte(ConfigNote.ToJsonString()), "", "\t")

-		os.MkdirAll(filepath.Dir(this.configPath), os.ModeDir)
-		err = ioutil.WriteFile(this.configPath, configByte.Bytes(), os.ModeAppend)
+		_ = os.MkdirAll(filepath.Dir(that.configPath), os.ModeDir)
+		err = ioutil.WriteFile(that.configPath, []byte(configStr), os.ModePerm)
 		if err != nil {
-			this.Error.SetError(err)
+			that.Error.SetError(err)
 		}
-		ioutil.WriteFile(filepath.Dir(this.configPath)+"/confignote.json", configNoteByte.Bytes(), os.ModeAppend)
+		_ = ioutil.WriteFile(filepath.Dir(that.configPath)+"/configNote.json", []byte(configNoteStr), os.ModePerm)

 	}

 }

-//连接判断,返回true继续传输至控制层，false则停止传输
-func (this *Application) SetConnectListener(lis func(this *Context) bool) {
-	this.connectListener = append(this.connectListener, lis)
+// SetConnectListener 连接判断,返回true继续传输至控制层，false则停止传输
+func (that *Application) SetConnectListener(lis func(this *Context) bool) {
+	that.connectListener = append(that.connectListener, lis)
 }

 //网络错误
@@ -258,7 +268,7 @@ func (this *Application) SetConnectListener(lis func(this *Context) bool) {
 //}

 //序列化链接
-func (this *Application) urlSer(url string) (string, []string) {
+func (that *Application) urlSer(url string) (string, []string) {
 	q := strings.Index(url, "?")
 	if q == -1 {
 		q = len(url)
@@ -279,9 +289,10 @@ func (this *Application) urlSer(url string) (string, []string) {

 //访问

-func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
+func (that *Application) handler(w http.ResponseWriter, req *http.Request) {
+	nowUnixTime := time.Now()

-	_, s := this.urlSer(req.RequestURI)
+	_, s := that.urlSer(req.RequestURI)
 	//获取cookie
 	// 如果cookie存在直接将sessionId赋值为cookie.Value
 	// 如果cookie不存在就查找传入的参数中是否有token
@@ -289,20 +300,24 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
 	// 如果token存在就判断token是否在Session中有保存
 	// 如果有取出token并复制给cookie
 	// 没有保存就生成随机的session
-	cookie, err := req.Cookie(this.Config.GetString("sessionName"))
+	cookie, err := req.Cookie(that.Config.GetString("sessionName"))
 	sessionId := Md5(strconv.Itoa(Rand(10)))
-	token := req.FormValue("token")
-	//isFirst:=false
-	if err != nil || (len(token) == 32 && cookie.Value != token) {
-		if len(token) == 32 {
-			sessionId = token
-		}
-		//else{
-		//	isFirst=true;
-		//}
-		http.SetCookie(w, &http.Cookie{Name: this.Config.GetString("sessionName"), Value: sessionId, Path: "/"})
-	} else {
+	needSetCookie := ""
+	token := req.Header.Get("Authorization")
+	if len(token) != 32 {
+
+		token = req.FormValue("token")
+	}
+	//没有cookie或者cookie不等于token
+	//有token优先token
+	if len(token) == 32 {
+		sessionId = token
+		//没有token，则查阅session
+	} else if err == nil && cookie.Value != "" {
 		sessionId = cookie.Value
+		//session也没有则判断是否创建cookie
+	} else {
+		needSetCookie = sessionId
 	}

 	unescapeUrl, err := url.QueryUnescape(req.RequestURI)
@@ -310,32 +325,44 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
 		unescapeUrl = req.RequestURI
 	}
 	//访问实例
-	context := Context{SessionIns: SessionIns{SessionId: sessionId,
-		LongCache:  this.sessionLong,
-		ShortCache: this.sessionShort,
-	},
-		CacheIns: this.CacheIns,
-		Resp:     w, Req: req, Application: this, RouterString: s, Config: this.Config, Db: &this.Db, HandlerStr: unescapeUrl}
+	context := Context{SessionIns: SessionIns{SessionId: sessionId, HoTimeCache: that.HoTimeCache},
+		Resp: w, Req: req, Application: that, RouterString: s, Config: that.Config, Db: &that.Db,
+		HandlerStr: unescapeUrl}
 	//header默认设置
 	header := w.Header()
 	header.Set("Content-Type", "text/html; charset=utf-8")

 	//url去掉参数并序列化
-	context.HandlerStr, context.RouterString = this.urlSer(context.HandlerStr)
+	context.HandlerStr, context.RouterString = that.urlSer(context.HandlerStr)

 	//跨域设置
-	this.crossDomain(&context)
-	//是否展示日志
-	if this.Config.GetInt("connectLogShow") != 0 {
-		logFmt(Substr(context.Req.RemoteAddr, 0, strings.Index(context.Req.RemoteAddr, ":"))+" "+context.HandlerStr, 0, LOG_INFO)
-	}
+	that.crossDomain(&context, needSetCookie)
+
+	defer func() {
+		//是否展示日志
+		if that.WebConnectLog != nil {
+			ipStr := Substr(context.Req.RemoteAddr, 0, strings.Index(context.Req.RemoteAddr, ":"))
+			//负载均衡优化
+			if ipStr == "127.0.0.1" {
+				if req.Header.Get("X-Forwarded-For") != "" {
+					ipStr = req.Header.Get("X-Forwarded-For")
+				} else if req.Header.Get("X-Real-IP") != "" {
+					ipStr = req.Header.Get("X-Real-IP")
+				}
+			}
+
+			that.WebConnectLog.Infoln(ipStr, context.Req.Method,
+				"time cost:", ObjToFloat64(time.Now().UnixNano()-nowUnixTime.UnixNano())/1000000.00, "ms",
+				"data length:", ObjToFloat64(context.DataSize)/1000.00, "KB", context.HandlerStr)
+		}
+	}()

 	//访问拦截true继续false暂停
-	connectListenerLen := len(this.connectListener)
+	connectListenerLen := len(that.connectListener)
 	if connectListenerLen != 0 {
 		for i := 0; i < connectListenerLen; i++ {

-			if !this.connectListener[i](&context) {
+			if !that.connectListener[i](&context) {

 				context.View()
 				return
@@ -344,37 +371,26 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
 	}

 	//接口服务
-	//if len(s) == 3 {
-	//	//如果满足规则则路由到对应控制器去
-	//	if this.Router[s[0]] != nil && this.Router[s[0]][s[1]] != nil && this.Router[s[0]][s[1]][s[2]] != nil {
-	//		//控制层
-	//		this.Router[s[0]][s[1]][s[2]](&context)
-	//		//header.Set("Content-Type", "text/html; charset=utf-8")
-	//		context.View()
-	//		return
-	//	}
-	//
-	//}
 	//验证接口严格模式
-	modeRouterStrict := this.Config.Get("modeRouterStrict").(bool)
+	modeRouterStrict := that.Config.GetBool("modeRouterStrict")
 	tempHandlerStr := context.HandlerStr
 	if !modeRouterStrict {
 		tempHandlerStr = strings.ToLower(tempHandlerStr)
 	}

 	//执行接口
-	if this.MethodRouter[tempHandlerStr] != nil {
-		this.MethodRouter[tempHandlerStr](&context)
+	if that.MethodRouter[tempHandlerStr] != nil {
+		that.MethodRouter[tempHandlerStr](&context)
 		context.View()
 		return
 	}

 	//url赋值
-	path := this.Config.GetString("tpt") + tempHandlerStr
+	path := that.Config.GetString("tpt") + tempHandlerStr

 	//判断是否为默认
 	if path[len(path)-1] == '/' {
-		defFile := this.Config.GetSlice("defFile")
+		defFile := that.Config.GetSlice("defFile")

 		for i := 0; i < len(defFile); i++ {
 			temp := path + defFile.GetString(i)
@@ -398,8 +414,10 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {

 	//设置header
 	delete(header, "Content-Type")
-	if this.Config.GetInt("debug") != 1 {
+	if that.Config.GetInt("mode") == 0 {
 		header.Set("Cache-Control", "public")
+	} else {
+		header.Set("Cache-Control", "no-cache")
 	}

 	if strings.Index(path, ".m3u8") != -1 {
@@ -411,32 +429,66 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {

 }

-func (this *Application) crossDomain(context *Context) {
+func (that *Application) crossDomain(context *Context, sessionId string) {
+
 	//没有跨域设置
 	if context.Config.GetString("crossDomain") == "" {
+		if sessionId != "" {
+			http.SetCookie(context.Resp, &http.Cookie{Name: that.Config.GetString("sessionName"), Value: sessionId, Path: "/"})
+		}
+
 		return
 	}

 	header := context.Resp.Header()
-	header.Set("Access-Control-Allow-Origin", "*")
-	header.Set("Access-Control-Allow-Methods", "*")
-	header.Set("Access-Control-Allow-Credentials", "true")
-	header.Set("Access-Control-Expose-Headers", "*")
-	header.Set("Access-Control-Allow-Headers", "X-Requested-With,Content-Type,Access-Token")

-	if context.Config.GetString("crossDomain") != "*" {
-		header.Set("Access-Control-Allow-Origin", this.Config.GetString("crossDomain"))
+	//不跨域,则不设置
+	remoteHost := context.Req.Host
+	if context.Config.GetString("port") == "80" || context.Config.GetString("port") == "443" {
+		remoteHost = remoteHost + ":" + context.Config.GetString("port")
+	}
+	if context.Config.GetString("crossDomain") != "auto" {
+		//不跨域,则不设置
+		if strings.Contains(context.Config.GetString("crossDomain"), remoteHost) {
+
+			if sessionId != "" {
+				http.SetCookie(context.Resp, &http.Cookie{Name: that.Config.GetString("sessionName"), Value: sessionId, Path: "/"})
+			}
+			return
+		}
+		header.Set("Access-Control-Allow-Origin", that.Config.GetString("crossDomain"))
+		// 后端设置，2592000单位秒，这里是30天
+		header.Set("Access-Control-Max-Age", "2592000")
+
+		//header.Set("Access-Control-Allow-Origin", "*")
+		header.Set("Access-Control-Allow-Methods", "GET,POST,OPTIONS,PUT,DELETE")
+		header.Set("Access-Control-Allow-Credentials", "true")
+		header.Set("Access-Control-Expose-Headers", "*")
+		header.Set("Access-Control-Allow-Headers", "X-Requested-With,Content-Type,Access-Token")
+
+		if sessionId != "" {
+			//跨域允许需要设置cookie的允许跨域https才有效果
+			context.Resp.Header().Set("Set-Cookie", that.Config.GetString("sessionName")+"="+sessionId+"; Path=/; SameSite=None; Secure")
+		}
 		return
 	}

 	origin := context.Req.Header.Get("Origin")
-	if origin != "" {
-		header.Set("Access-Control-Allow-Origin", origin)
+
+	refer := context.Req.Header.Get("Referer")
+	if (origin != "" && strings.Contains(origin, remoteHost)) || strings.Contains(refer, remoteHost) {
+
+		if sessionId != "" {
+			http.SetCookie(context.Resp, &http.Cookie{Name: that.Config.GetString("sessionName"), Value: sessionId, Path: "/"})
+		}
+
 		return
 	}

-	refer := context.Req.Header.Get("Referer")
-	if refer != "" {
+	if origin != "" {
+		header.Set("Access-Control-Allow-Origin", origin)
+		//return
+	} else if refer != "" {
 		tempInt := 0
 		lastInt := strings.IndexFunc(refer, func(r rune) bool {
 			if r == '/' && tempInt > 8 {
@@ -451,5 +503,237 @@ func (this *Application) crossDomain(context *Context) {
 		}
 		refer = Substr(refer, 0, lastInt)
 		header.Set("Access-Control-Allow-Origin", refer)
+		//header.Set("Access-Control-Allow-Origin", "*")
+
+	}
+
+	header.Set("Access-Control-Allow-Methods", "GET,POST,OPTIONS,PUT,DELETE")
+	header.Set("Access-Control-Allow-Credentials", "true")
+	header.Set("Access-Control-Expose-Headers", "*")
+	header.Set("Access-Control-Allow-Headers", "X-Requested-With,Content-Type,Access-Token")
+
+	if sessionId != "" {
+		//跨域允许需要设置cookie的允许跨域https才有效果
+		context.Resp.Header().Set("Set-Cookie", that.Config.GetString("sessionName")+"="+sessionId+"; Path=/; SameSite=None; Secure")
+	}
+
+}
+
+//Init 初始化application
+func Init(config string) Application {
+	appIns := Application{}
+	//手动模式，
+	appIns.SetConfig(config)
+
+	SetDB(&appIns)
+	appIns.SetCache()
+	appIns.MakeCode = &code.MakeCode{}
+	codeConfig := appIns.Config.GetMap("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)
+			} else {
+				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), nil, false)
+			}
+			//接入动态代码层
+			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"]
+			}
+
+			setMakeCodeLintener(k, &appIns)
+
+		}
+
+	}
+
+	return appIns
+}
+
+// SetDB 智能数据库设置
+func SetDB(appIns *Application) {
+	db := appIns.Config.GetMap("db")
+	dbSqlite := db.GetMap("sqlite")
+	dbMysql := db.GetMap("mysql")
+	if db != nil && dbSqlite != nil {
+		SetSqliteDB(appIns, dbSqlite)
+	}
+	if db != nil && dbMysql != nil {
+		SetMysqlDB(appIns, dbMysql)
 	}
 }
+func SetMysqlDB(appIns *Application, config Map) {
+
+	appIns.Db.Type = "mysql"
+	appIns.Db.DBName = config.GetString("name")
+	appIns.Db.Prefix = config.GetString("prefix")
+	appIns.SetConnectDB(func(err ...*Error) (master, slave *sql.DB) {
+		//master数据库配置
+		query := config.GetString("user") + ":" + config.GetString("password") +
+			"@tcp(" + config.GetString("host") + ":" + config.GetString("port") + ")/" + config.GetString("name") + "?charset=utf8"
+		DB, e := sql.Open("mysql", query)
+		if e != nil && len(err) != 0 {
+			err[0].SetError(e)
+		}
+		master = DB
+		//slave数据库配置
+		configSlave := config.GetMap("slave")
+		if configSlave != nil {
+			query := configSlave.GetString("user") + ":" + configSlave.GetString("password") +
+				"@tcp(" + config.GetString("host") + ":" + configSlave.GetString("port") + ")/" + configSlave.GetString("name") + "?charset=utf8"
+			DB1, e := sql.Open("mysql", query)
+			if e != nil && len(err) != 0 {
+				err[0].SetError(e)
+			}
+			slave = DB1
+		}
+
+		return master, slave
+		//return DB
+	})
+}
+func SetSqliteDB(appIns *Application, config Map) {
+
+	appIns.Db.Type = "sqlite"
+	appIns.Db.Prefix = config.GetString("prefix")
+	appIns.SetConnectDB(func(err ...*Error) (master, slave *sql.DB) {
+		db, e := sql.Open("sqlite3", config.GetString("path"))
+		if e != nil && len(err) != 0 {
+			err[0].SetError(e)
+		}
+		master = db
+
+		return master, slave
+	})
+}
+
+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
+			}
+		}
+
+		//文件上传接口
+		if len(context.RouterString) == 1 && context.RouterString[0] == "file" && context.Req.Method == "POST" {
+			if context.Session(name+"_id").Data == nil {
+				context.Display(2, "你还没有登录")
+				return false
+			}
+			//读取网络文件
+			fi, fheader, err := context.Req.FormFile("file")
+			if err != nil {
+				context.Display(3, err)
+				return false
+
+			}
+			filePath := context.Config.GetString("filePath")
+			if filePath == "" {
+				filePath = "file/2006/01/02/"
+			}
+
+			path := time.Now().Format(filePath)
+			e := os.MkdirAll(context.Config.GetString("tpt")+"/"+path, os.ModeDir)
+			if e != nil {
+				context.Display(3, e)
+				return false
+			}
+			filePath = path + Md5(ObjToStr(RandX(100000, 9999999))) + fheader.Filename[strings.LastIndex(fheader.Filename, "."):]
+			newFile, e := os.Create(context.Config.GetString("tpt") + "/" + filePath)
+
+			if e != nil {
+				context.Display(3, e)
+				return false
+			}
+
+			_, e = io.Copy(newFile, fi)
+
+			if e != nil {
+				context.Display(3, e)
+				return false
+			}
+
+			context.Display(0, filePath)
+			return false
+		}
+
+		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
+		}
+		//排除无效操作
+		if len(context.RouterString) == 2 &&
+			context.Req.Method != "GET" &&
+			context.Req.Method != "POST" {
+			return true
+		}
+		//列表检索
+		if len(context.RouterString) == 2 &&
+			context.Req.Method == "GET" {
+			if context.Router[context.RouterString[0]][context.RouterString[1]]["search"] == nil {
+				return true
+			}
+			context.Router[context.RouterString[0]][context.RouterString[1]]["search"](context)
+		}
+		//新建
+		if len(context.RouterString) == 2 &&
+			context.Req.Method == "POST" {
+			if context.Router[context.RouterString[0]][context.RouterString[1]]["add"] == nil {
+				return true
+			}
+			context.Router[context.RouterString[0]][context.RouterString[1]]["add"](context)
+		}
+		if len(context.RouterString) == 3 &&
+			context.Req.Method == "POST" {
+			return true
+		}
+		//查询单条
+		if len(context.RouterString) == 3 &&
+			context.Req.Method == "GET" {
+
+			if context.Router[context.RouterString[0]][context.RouterString[1]]["info"] == nil {
+				return true
+			}
+
+			context.Router[context.RouterString[0]][context.RouterString[1]]["info"](context)
+		}
+		//更新
+		if len(context.RouterString) == 3 &&
+			context.Req.Method == "PUT" {
+
+			if context.Router[context.RouterString[0]][context.RouterString[1]]["update"] == nil {
+				return true
+			}
+
+			context.Router[context.RouterString[0]][context.RouterString[1]]["update"](context)
+		}
+		//移除
+		if len(context.RouterString) == 3 &&
+			context.Req.Method == "DELETE" {
+
+			if context.Router[context.RouterString[0]][context.RouterString[1]]["remove"] == nil {
+				return true
+			}
+
+			context.Router[context.RouterString[0]][context.RouterString[1]]["remove"](context)
+		}
+		context.View()
+		return false
+	})
+}
@@ -0,0 +1,277 @@
+package cache
+
+import (
+	. "../common"
+	"errors"
+)
+
+// HoTimeCache 可配置memory，db，redis，默认启用memory，默认优先级为memory>redis>db,memory与数据库缓存设置项一致，
+//缓存数据填充会自动反方向反哺，加入memory缓存过期将自动从redis更新，但memory永远不会更新redis，如果是集群建议不要开启memory，配置即启用
+type HoTimeCache struct {
+	*Error
+	dbCache     *CacheDb
+	redisCache  *CacheRedis
+	memoryCache *CacheMemory
+	Config      Map
+}
+
+func (that *HoTimeCache) Session(key string, data ...interface{}) *Obj {
+	var reData *Obj
+	if len(data) == 0 {
+		//内存缓存有
+		if that.memoryCache != nil && that.memoryCache.SessionSet {
+			reData = that.memoryCache.Cache(key, data...)
+			if reData.Data != nil {
+				return reData
+			}
+		}
+
+		//redis缓存有
+		if that.redisCache != nil && that.redisCache.SessionSet {
+			reData = that.redisCache.Cache(key, data...)
+			if reData.Data != nil {
+				if that.memoryCache != nil && that.memoryCache.SessionSet {
+					that.memoryCache.Cache(key, reData.Data)
+				}
+				return reData
+			}
+		}
+
+		//db缓存有
+		if that.dbCache != nil && that.dbCache.SessionSet {
+			reData = that.dbCache.Cache(key, data...)
+			if reData.Data != nil {
+				if that.memoryCache != nil && that.memoryCache.SessionSet {
+					that.memoryCache.Cache(key, reData.Data)
+				}
+				if that.redisCache != nil && that.redisCache.SessionSet {
+					that.redisCache.Cache(key, reData.Data)
+				}
+
+				return reData
+			}
+		}
+		return reData
+	}
+
+	//设置缓存
+	//设置内存缓存
+	if that.memoryCache != nil && that.memoryCache.SessionSet {
+		reData = that.memoryCache.Cache(key, data...)
+	}
+	//redis缓存有
+	if that.redisCache != nil && that.redisCache.SessionSet {
+		reData = that.redisCache.Cache(key, data...)
+	}
+	//redis缓存有
+	if that.dbCache != nil && that.dbCache.SessionSet {
+		reData = that.dbCache.Cache(key, data...)
+	}
+	return reData
+
+}
+func (that *HoTimeCache) Db(key string, data ...interface{}) *Obj {
+	var reData *Obj
+	if len(data) == 0 {
+		//内存缓存有
+		if that.memoryCache != nil && that.memoryCache.DbSet {
+			reData = that.memoryCache.Cache(key, data...)
+			if reData.Data != nil {
+				return reData
+			}
+		}
+
+		//redis缓存有
+		if that.redisCache != nil && that.redisCache.DbSet {
+			reData = that.redisCache.Cache(key, data...)
+			if reData.Data != nil {
+				if that.memoryCache != nil && that.memoryCache.DbSet {
+					that.memoryCache.Cache(key, reData.Data)
+				}
+				return reData
+			}
+		}
+
+		//redis缓存有
+		if that.dbCache != nil && that.dbCache.DbSet {
+			reData = that.dbCache.Cache(key, data...)
+			if reData.Data != nil {
+				if that.memoryCache != nil && that.memoryCache.DbSet {
+					that.memoryCache.Cache(key, reData.Data)
+				}
+
+				if that.redisCache != nil && that.redisCache.DbSet {
+					that.redisCache.Cache(key, reData.Data)
+				}
+
+				return reData
+			}
+		}
+		return reData
+	}
+
+	//设置缓存
+	//设置内存缓存
+	if that.memoryCache != nil && that.memoryCache.DbSet {
+		reData = that.memoryCache.Cache(key, data...)
+	}
+	//redis缓存有
+	if that.redisCache != nil && that.redisCache.DbSet {
+		reData = that.redisCache.Cache(key, data...)
+	}
+	//redis缓存有
+	if that.dbCache != nil && that.dbCache.DbSet {
+		reData = that.dbCache.Cache(key, data...)
+	}
+	return reData
+}
+
+func (that *HoTimeCache) Cache(key string, data ...interface{}) *Obj {
+	var reData *Obj
+	if len(data) == 0 {
+		//内存缓存有
+		if that.memoryCache != nil {
+			reData = that.memoryCache.Cache(key, data...)
+			if reData != nil {
+				return reData
+			}
+		}
+
+		//redis缓存有
+		if that.redisCache != nil {
+			reData = that.redisCache.Cache(key, data...)
+			if reData.Data != nil {
+
+				if that.memoryCache != nil {
+					that.memoryCache.Cache(key, reData.Data)
+				}
+				return reData
+			}
+		}
+
+		//redis缓存有
+		if that.dbCache != nil {
+			reData = that.dbCache.Cache(key, data...)
+			if reData.Data != nil {
+				if that.memoryCache != nil {
+					that.memoryCache.Cache(key, reData.Data)
+				}
+				if that.redisCache != nil {
+					that.redisCache.Cache(key, reData.Data)
+				}
+				return reData
+			}
+		}
+		return reData
+	}
+
+	//设置缓存
+	//设置内存缓存
+	if that.memoryCache != nil {
+		reData = that.memoryCache.Cache(key, data...)
+	}
+	//redis缓存有
+	if that.redisCache != nil {
+		reData = that.redisCache.Cache(key, data...)
+	}
+	//redis缓存有
+	if that.dbCache != nil {
+		reData = that.dbCache.Cache(key, data...)
+	}
+	return reData
+}
+
+func (that *HoTimeCache) Init(config Map, hotimeDb HoTimeDBInterface, err ...*Error) {
+	//防止空数据问题
+	if config == nil {
+		config = Map{}
+	}
+	if err[0] != nil {
+		that.Error = err[0]
+	}
+	that.Config = config
+	//memory配置初始化
+	memory := that.Config.GetMap("memory")
+	if memory == nil {
+		memory = Map{
+			"db":      true,
+			"session": true,
+			"sort":    0,
+			"timeout": 60 * 60 * 2,
+		}
+
+	}
+	if memory.Get("db") == nil {
+		memory["db"] = true
+	}
+
+	if memory.Get("session") == nil {
+		memory["session"] = true
+	}
+
+	if memory.Get("timeout") == nil {
+		memory["timeout"] = 60 * 60 * 2
+	}
+	that.Config["memory"] = memory
+	that.memoryCache = &CacheMemory{TimeOut: memory.GetCeilInt64("timeout"),
+		DbSet: memory.GetBool("db"), SessionSet: memory.GetBool("session")}
+	if err[0] != nil {
+		that.memoryCache.SetError(err[0])
+	}
+
+	//db配置初始化
+	redis := that.Config.GetMap("redis")
+	if redis != nil {
+		if redis.GetString("host") == "" || redis.GetString("port") == "" {
+			if err[0] != nil {
+				err[0].SetError(errors.New("请检查redis配置host和port配置"))
+			}
+			return
+		}
+		if redis.Get("db") == nil {
+			redis["db"] = true
+		}
+
+		if redis.Get("session") == nil {
+			redis["session"] = true
+		}
+
+		if redis.Get("timeout") == nil {
+			redis["timeout"] = 60 * 60 * 24 * 15
+		}
+		that.Config["redis"] = redis
+		that.redisCache = &CacheRedis{TimeOut: redis.GetCeilInt64("timeout"),
+			DbSet: redis.GetBool("db"), SessionSet: redis.GetBool("session"), Host: redis.GetString("host"),
+			Pwd: redis.GetString("password"), Port: redis.GetCeilInt64("port")}
+
+		if err[0] != nil {
+			that.redisCache.SetError(err[0])
+		}
+	}
+
+	//db配置初始化
+	db := that.Config.GetMap("db")
+	if db != nil {
+
+		if db.Get("db") == nil {
+			db["db"] = false
+		}
+
+		if db.Get("session") == nil {
+			db["session"] = true
+		}
+		if db.Get("timeout") == nil {
+			db["timeout"] = 60 * 60 * 24 * 30
+		}
+		that.Config["db"] = db
+
+		that.dbCache = &CacheDb{TimeOut: db.GetCeilInt64("timeout"),
+			DbSet: db.GetBool("db"), SessionSet: db.GetBool("session"),
+			Db: hotimeDb}
+
+		if err[0] != nil {
+			that.dbCache.SetError(err[0])
+		}
+	}
+
+}
@@ -0,0 +1,173 @@
+package cache
+
+import (
+	. "../common"
+	"database/sql"
+	"encoding/json"
+	"strings"
+	"time"
+)
+
+type HoTimeDBInterface interface {
+	GetPrefix() string
+	Query(query string, args ...interface{}) []Map
+	Exec(query string, args ...interface{}) (sql.Result, *Error)
+	Get(table string, qu ...interface{}) Map
+	Select(table string, qu ...interface{}) []Map
+	Delete(table string, data map[string]interface{}) int64
+	Update(table string, data Map, where Map) int64
+	Insert(table string, data map[string]interface{}) int64
+	GetType() string
+}
+
+type CacheDb struct {
+	TimeOut    int64
+	DbSet      bool
+	SessionSet bool
+	Db         HoTimeDBInterface
+	*Error
+	ContextBase
+	isInit bool
+}
+
+func (this *CacheDb) GetError() *Error {
+
+	return this.Error
+
+}
+
+func (this *CacheDb) SetError(err *Error) {
+	this.Error = err
+}
+
+func (that *CacheDb) initDbTable() {
+	if that.isInit {
+		return
+	}
+	if that.Db.GetType() == "mysql" {
+
+		dbNames := that.Db.Query("SELECT DATABASE()")
+
+		if len(dbNames) == 0 {
+			return
+		}
+		dbName := dbNames[0].GetString("DATABASE()")
+		res := that.Db.Query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='" + dbName + "' AND TABLE_NAME='" + that.Db.GetPrefix() + "cached'")
+		if len(res) != 0 {
+			that.isInit = true
+			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")
+		if e.GetError() == nil {
+			that.isInit = true
+		}
+
+	}
+
+	if that.Db.GetType() == "sqlite" {
+		res := that.Db.Query(`select * from sqlite_master where type = 'table' and name = '` + that.Db.GetPrefix() + `cached'`)
+
+		if len(res) != 0 {
+			that.isInit = true
+			return
+		}
+		_, e := that.Db.Exec(`CREATE TABLE "` + that.Db.GetPrefix() + `cached" (
+			"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+				"ckey" TEXT(60),
+				"cvalue" TEXT(2000),
+				"time" integer,
+				"endtime" integer
+			);`)
+		if e.GetError() == nil {
+			that.isInit = true
+		}
+
+	}
+
+}
+
+//获取Cache键只能为string类型
+func (that *CacheDb) get(key string) interface{} {
+
+	cached := that.Db.Get("cached", "*", Map{"ckey": key})
+
+	if cached == nil {
+		return nil
+	}
+	//data:=cacheMap[key];
+	if cached.GetInt64("endtime") <= time.Now().Unix() {
+
+		that.Db.Delete("cached", Map{"id": cached.GetString("id")})
+		return nil
+	}
+
+	data := Map{}
+	data.JsonToMap(cached.GetString("cvalue"))
+
+	return data.Get("data")
+}
+
+//key value ,时间为时间戳
+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})
+	if num == int64(0) {
+		that.Db.Insert("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim, "ckey": key})
+	}
+
+	//随机执行删除命令
+	if Rand(1000) > 950 {
+		that.Db.Delete("cached", Map{"endtime[<]": time.Now().Unix()})
+	}
+}
+
+func (that *CacheDb) delete(key string) {
+
+	del := strings.Index(key, "*")
+	//如果通配删除
+	if del != -1 {
+		key = Substr(key, 0, del)
+		that.Db.Delete("cached", Map{"ckey": key + "%"})
+
+	} else {
+		that.Db.Delete("cached", Map{"ckey": key})
+	}
+}
+
+func (that *CacheDb) Cache(key string, data ...interface{}) *Obj {
+
+	that.initDbTable()
+
+	if len(data) == 0 {
+		return &Obj{Data: that.get(key)}
+	}
+	tim := time.Now().Unix()
+
+	if len(data) == 1 && data[0] == nil {
+		that.delete(key)
+		return &Obj{Data: nil}
+	}
+
+	if len(data) == 1 {
+		if that.TimeOut == 0 {
+			//that.Time = Config.GetInt64("cacheLongTime")
+		}
+		tim += that.TimeOut
+	}
+	if len(data) == 2 {
+		that.SetError(nil)
+		tempt := ObjToInt64(data[1], that.Error)
+
+		if tempt > tim {
+			tim = tempt
+		} else if that.GetError() == nil {
+
+			tim = tim + tempt
+		}
+	}
+	that.set(key, data[0], tim)
+	return &Obj{Data: nil}
+}
@@ -1,18 +1,32 @@
-package hotime
+package cache

 import (
+	. "../common"
 	"strings"
 	"sync"
 	"time"
 )

 type CacheMemory struct {
-	Time int64
+	TimeOut    int64
+	DbSet      bool
+	SessionSet bool
 	Map
-	contextBase
+	*Error
+	ContextBase
 	mutex *sync.RWMutex
 }

+func (this *CacheMemory) GetError() *Error {
+
+	return this.Error
+
+}
+
+func (this *CacheMemory) SetError(err *Error) {
+	this.Error = err
+}
+
 //获取Cache键只能为string类型
 func (this *CacheMemory) get(key string) interface{} {
 	this.Error.SetError(nil)
@@ -23,8 +37,8 @@ func (this *CacheMemory) get(key string) interface{} {
 	if this.Map[key] == nil {
 		return nil
 	}
-	data := this.Map.Get(key, &this.Error).(cacheData)
-	if this.GetError() != nil {
+	data := this.Map.Get(key, this.Error).(cacheData)
+	if this.Error.GetError() != nil {
 		return nil
 	}

@@ -81,7 +95,8 @@ func (this *CacheMemory) delete(key string) {
 		key = Substr(key, 0, del)
 		for k, _ := range this.Map {
 			if strings.Index(k, key) != -1 {
-				delete(this.Map, key)
+				delete(this.Map, k)
+
 			}
 		}

@@ -119,21 +134,18 @@ func (this *CacheMemory) Cache(key string, data ...interface{}) *Obj {
 	}

 	if len(data) == 1 {
-		if this.Time == 0 {
-			this.Time = Config.GetInt64("cacheShortTime")
-		}

-		tim = tim + this.Time
+		tim = tim + this.TimeOut

 	}
 	if len(data) == 2 {
 		this.Error.SetError(nil)
-		tempt := ObjToInt64(data[1], &this.Error)
+		tempt := ObjToInt64(data[1], this.Error)

 		if tempt > tim {

 			tim = tempt
-		} else if this.GetError() == nil {
+		} else if this.Error.GetError() == nil {

 			tim = tim + tempt
 		}
@@ -1,19 +1,33 @@
 package cache

 import (
-	. "code.hoteas.com/golang/hotime"
+	. "../common"
 	"github.com/garyburd/redigo/redis"
 	"strings"
 	"time"
 )

 type CacheRedis struct {
-	Host string
-	Pwd  string
-	Time int64
-	conn redis.Conn
-	tag  int64
-	Error
+	TimeOut    int64
+	DbSet      bool
+	SessionSet bool
+	Host       string
+	Pwd        string
+	Port       int64
+	conn       redis.Conn
+	tag        int64
+	ContextBase
+	*Error
+}
+
+func (this *CacheRedis) GetError() *Error {
+
+	return this.Error
+
+}
+
+func (this *CacheRedis) SetError(err *Error) {
+	this.Error = err
 }

 //唯一标志
@@ -27,19 +41,22 @@ func (this *CacheRedis) GetTag() int64 {

 func (this *CacheRedis) reCon() bool {
 	var err error
-	this.conn, err = redis.Dial("tcp", this.Host)
+	this.conn, err = redis.Dial("tcp", this.Host+":"+ObjToStr(this.Port))
 	if err != nil {
 		this.conn = nil
 		this.Error.SetError(err)
 		return false
 	}

-	_, err = this.conn.Do("AUTH", this.Pwd)
-	if err != nil {
-		this.conn = nil
-		this.Error.SetError(err)
-		return false
+	if this.Pwd != "" {
+		_, err = this.conn.Do("AUTH", this.Pwd)
+		if err != nil {
+			this.conn = nil
+			this.Error.SetError(err)
+			return false
+		}
 	}
+
 	return true
 }
 func (this *CacheRedis) del(key string) {
@@ -128,15 +145,15 @@ func (this *CacheRedis) Cache(key string, data ...interface{}) *Obj {
 	//添加缓存
 	if len(data) == 1 {

-		if this.Time == 0 {
-			this.Time = Config.GetInt64("cacheShortTime")
+		if this.TimeOut == 0 {
+			//this.Time = Config.GetInt64("cacheShortTime")
 		}

-		tim += this.Time
+		tim += this.TimeOut
 	}
 	if len(data) == 2 {
 		this.Error.SetError(nil)
-		tempt := ObjToInt64(data[1], &this.Error)
+		tempt := ObjToInt64(data[1], this.Error)
 		if tempt > tim {

 			tim = tempt
@@ -1,16 +1,15 @@
-package hotime
+package cache

-//控制器
-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)
+import (
+	. "../common"
+)

 type CacheIns interface {
 	//set(key string, value interface{}, time int64)
 	//get(key string) interface{}
 	//delete(key string)
+	GetError() *Error
+	SetError(err *Error)
 	Cache(key string, data ...interface{}) *Obj
 }

@@ -1,146 +0,0 @@
-package hotime
-
-import (
-	"encoding/json"
-	"strings"
-	"time"
-)
-
-type CacheDb struct {
-	Time int64
-	Db   *HoTimeDB
-	contextBase
-	isInit bool
-}
-
-func (this *CacheDb) initDbTable() {
-	if this.isInit {
-		return
-	}
-	if this.Db.Type == "mysql" {
-
-		dbNames := this.Db.Query("SELECT DATABASE()")
-
-		if len(dbNames) == 0 {
-			return
-		}
-		dbName := dbNames[0].GetString("DATABASE()")
-		res := this.Db.Query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='" + dbName + "' AND TABLE_NAME='cached'")
-		if len(res) != 0 {
-			this.isInit = true
-			return
-		}
-
-		_, e := this.Db.Exec("CREATE TABLE `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")
-		if e.GetError() == nil {
-			this.isInit = true
-		}
-
-	}
-
-	if this.Db.Type == "sqlite" {
-		res := this.Db.Query(`select * from sqlite_master where type = 'table' and name = 'cached'`)
-
-		if len(res) != 0 {
-			this.isInit = true
-			return
-		}
-		_, e := this.Db.Exec(`CREATE TABLE "cached" (
-			"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-				"ckey" TEXT(60),
-				"cvalue" TEXT(2000),
-				"time" integer,
-				"endtime" integer
-			);`)
-		if e.GetError() == nil {
-			this.isInit = true
-		}
-
-	}
-
-}
-
-//获取Cache键只能为string类型
-func (this *CacheDb) get(key string) interface{} {
-
-	cached := this.Db.Get("cached", "*", Map{"ckey": key})
-
-	if cached == nil {
-		return nil
-	}
-	//data:=cacheMap[key];
-	if cached.GetInt64("endtime") <= time.Now().Unix() {
-
-		this.Db.Delete("cached", Map{"id": cached.GetString("id")})
-		return nil
-	}
-
-	data := Map{}
-	data.JsonToMap(cached.GetString("cvalue"))
-
-	return data.Get("data")
-}
-
-//key value ,时间为时间戳
-func (this *CacheDb) set(key string, value interface{}, tim int64) {
-
-	bte, _ := json.Marshal(Map{"data": value})
-
-	num := this.Db.Update("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim}, Map{"ckey": key})
-	if num == int64(0) {
-		this.Db.Insert("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim, "ckey": key})
-	}
-
-	//随机执行删除命令
-	if Rand(1000) > 950 {
-		this.Db.Delete("cached", Map{"endtime[<]": time.Now().Unix()})
-	}
-}
-
-func (this *CacheDb) delete(key string) {
-
-	del := strings.Index(key, "*")
-	//如果通配删除
-	if del != -1 {
-		key = Substr(key, 0, del)
-		this.Db.Delete("cached", Map{"ckey": key + "%"})
-
-	} else {
-		this.Db.Delete("cached", Map{"ckey": key})
-	}
-}
-
-func (this *CacheDb) Cache(key string, data ...interface{}) *Obj {
-
-	this.initDbTable()
-
-	if len(data) == 0 {
-		return &Obj{Data: this.get(key)}
-	}
-	tim := time.Now().Unix()
-
-	if len(data) == 1 && data[0] == nil {
-		this.delete(key)
-		return &Obj{Data: nil}
-	}
-
-	if len(data) == 1 {
-		if this.Time == 0 {
-			this.Time = Config.GetInt64("cacheLongTime")
-		}
-		tim += this.Time
-	}
-	if len(data) == 2 {
-		this.SetError(nil)
-		tempt := ObjToInt64(data[1], &this.Error)
-
-		if tempt > tim {
-			tim = tempt
-		} else if this.GetError() == nil {
-
-			tim = tim + tempt
-		}
-	}
-	this.set(key, data[0], tim)
-	return &Obj{Data: nil}
-}
@@ -0,0 +1,218 @@
+package hotime
+
+import (
+	. "../hotime/common"
+	"strings"
+)
+
+// Project 管理端项目
+var TptProject = Proj{
+	//"user": UserCtr,
+	"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)
+			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) {
+			hotimeName := that.RouterString[0]
+			data := that.Db.Get(hotimeName, "*", Map{"id": that.Session(hotimeName + "_id").ToCeilInt()})
+
+			columnStr, leftJoin, where := that.MakeCode.Search(that.RouterString[1], data, that.Req, that.Db)
+
+			page := ObjToInt(that.Req.FormValue("page"))
+			pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+			if page < 1 {
+				page = 1
+			}
+
+			if pageSize <= 0 {
+				pageSize = 20
+			}
+
+			count := that.Db.Count(that.RouterString[1], leftJoin, where)
+			reData := that.Db.Page(page, pageSize).
+				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
+					}
+
+					if column["list"] != false && 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 {
+							v[column.GetString("link")+"_"+column.GetString("name")+"_"+column.GetString("value")] = parentC.GetString(column.GetString("value"))
+						}
+					}
+
+				}
+			}
+
+			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")
+			if name == "" || password == "" {
+				this.Display(3, "参数不足")
+				return
+			}
+			user := this.Db.Get(hotimeName, "*", Map{"AND": Map{"OR": Map{"name": name, "phone": name}, "password": Md5(password)}})
+			if user == nil {
+				this.Display(5, "登录失败")
+				return
+			}
+			this.Session(hotimeName+"_id", user.GetCeilInt("id"))
+			this.Session(hotimeName+"_name", name)
+			this.Display(0, this.SessionId)
+		},
+		"logout": func(this *Context) {
+			hotimeName := this.RouterString[0]
+			this.Session(hotimeName+"_id", nil)
+			this.Session(hotimeName+"_name", nil)
+			this.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()}
+			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(hotimeName, str, where)
+			if re == nil {
+				that.Display(4, "找不到对应信息")
+				return
+			}
+			for k, v := range re {
+				column := that.MakeCode.TableColumns[hotimeName][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)
+		},
+	},
+}
@@ -0,0 +1,97 @@
+package code
+
+import (
+	. "../common"
+)
+
+var Config = Map{
+	"name":  "HoTimeDashBoard",
+	"id":    "2f92h3herh23rh2y8",
+	"label": "HoTime管理平台",
+
+	"menus": []Map{
+		{"label": "平台首页", "name": "HelloWorld", "icon": "el-icon-s-home"},
+		//{"label": "测试表格", "table": "table", "icon": "el-icon-suitcase"},
+		//{"label": "系统管理", "name": "setting", "icon": "el-icon-setting",
+		//	"menus": []Map{
+		//		{"label": "用户管理", "table": "user"},
+		//		{"label": "组织管理", "table": "organization"},
+		//		{"label": "地区管理", "table": "area"},
+		//		{"label": "角色管理", "table": "role"},
+		//		{"label": "日志管理", "table": "log"},
+		//		{"label": "系统设置", "table": "system", "default": "edit"},
+		//	},
+		//},
+	},
+}
+var DefaultMenuParentName = "sys"
+
+var ColumnDataType = map[string]string{
+	//sqlite专有类型
+	"real": "number",
+	//mysql数据类型宽泛类型
+	"int":      "number",
+	"float":    "number",
+	"double":   "number",
+	"decimal":  "number",
+	"char":     "text",
+	"text":     "text",
+	"blob":     "text",
+	"date":     "time",
+	"time":     "time",
+	"year":     "time",
+	"geometry": "gis", //不建议使用gis类型，建议使用其他代替
+}
+
+type ColumnShow struct {
+	Name   string
+	List   bool
+	Edit   bool
+	Info   bool
+	Must   bool
+	Type   string //空字符串表示
+	Strict bool   //name严格匹配必须是这个词才行
+}
+
+var ColumnNameType = []ColumnShow{
+	//通用
+	{"idcard", false, true, true, false, "", false},
+	{"id", true, false, true, false, "", true},
+	{"parent_id", true, true, true, false, "", true},
+	//"sn"{true,true,true,""},
+	{"status", true, true, true, false, "select", false},
+	{"state", true, true, true, false, "select", false},
+	{"sex", true, true, true, false, "select", false},
+	{"delete", false, false, false, false, "", false},
+
+	{"lat", false, true, true, false, "", false},
+	{"lng", false, true, true, false, "", false},
+	{"latitude", false, true, true, false, "", false},
+	{"longitude", false, true, true, false, "", false},
+
+	{"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},
+	{"note", false, true, true, false, "", false},
+	{"description", false, true, true, false, "", false},
+	{"abstract", false, true, true, false, "", false},
+	{"content", false, true, true, false, "", false},
+	{"address", false, 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},
+	{"image", false, true, true, false, "image", false},
+	{"img", false, true, true, false, "image", false},
+	{"icon", false, true, true, false, "image", false},
+	{"avatar", false, true, true, false, "image", false},
+	{"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},
+	{"level", false, false, true, false, "", false},
+	{"rule", true, true, true, false, "form", false},
+}
@@ -0,0 +1,871 @@
+package code
+
+import (
+	. "../common"
+	"../db"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+type MakeCode struct {
+	IndexMenus    Map
+	TableConfig   Map
+	TableColumns  map[string]map[string]Map
+	SearchColumns map[string]map[string]Map
+	Config        Map
+	Error
+}
+
+func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCode bool) {
+	isMake := false
+	idSlice := Slice{}
+
+	if that.TableColumns == nil {
+		that.TableColumns = make(map[string]map[string]Map)
+	}
+	if that.SearchColumns == nil {
+		that.SearchColumns = make(map[string]map[string]Map)
+	}
+
+	//加载配置文件
+	btes, err := ioutil.ReadFile(path)
+	Config["name"] = name
+	that.Config = DeepCopyMap(Config).(Map)
+	if err == nil {
+		cmap := Map{}
+		//文件是否损坏
+		cmap.JsonToMap(string(btes), &that.Error)
+		for k, v := range cmap {
+			that.Config[k] = v //程序配置
+			Config[k] = v      //系统配置
+		}
+	} else {
+		that.Error.SetError(errors.New("配置文件不存在，或者配置出错，使用缺省默认配置"))
+	}
+	that.IndexMenus = Map{}
+	menusConfig := that.Config.GetSlice("menus")
+	//将配置写入到内存中仅作为判断用
+	if menusConfig != nil {
+		for kmenu, _ := range menusConfig {
+			menu := menusConfig.GetMap(kmenu)
+			if menu != nil {
+				mname := menu.GetString("table")
+				if mname == "" { //如果为空则不是表格
+					mname = menu.GetString("name")
+				}
+				that.IndexMenus[mname] = menu
+				childMenus := menu.GetSlice("menus")
+				if childMenus != nil {
+					for ckmenu, _ := range childMenus {
+						cmenu := childMenus.GetMap(ckmenu)
+						if cmenu != nil {
+							cname := cmenu.GetString("table")
+							if cmenu.GetString("table") == "" {
+								continue
+							}
+							that.IndexMenus[mname+"/"+cname] = cmenu
+						}
+
+					}
+
+				}
+
+			}
+
+		}
+	}
+
+	that.TableConfig = that.Config.GetMap("tables")
+	if that.TableConfig == nil {
+		that.TableConfig = Map{}
+	}
+
+	for tableName, _ := range that.TableConfig {
+
+		columns := that.TableConfig.GetMap(tableName).GetSlice("columns")
+		search := that.TableConfig.GetMap(tableName).GetSlice("search")
+		//初始化
+		if that.TableColumns[tableName] == nil {
+			that.TableColumns[tableName] = map[string]Map{}
+		}
+		//初始化搜索项
+		if that.SearchColumns[tableName] == nil {
+			that.SearchColumns[tableName] = map[string]Map{}
+		}
+
+		//注入源数据
+		for index, _ := range columns {
+			columnsName := columns.GetMap(index).GetString("name")
+			that.TableColumns[tableName][columnsName] = columns.GetMap(index)
+		}
+
+		//注入search源数据
+		for index, _ := range search {
+			searchName := search.GetMap(index).GetString("name")
+			that.SearchColumns[tableName][searchName] = search.GetMap(index)
+		}
+
+	}
+
+	if db == nil {
+
+		return
+	}
+
+	//数据库反哺
+	myInit := strings.Replace(InitTpt, "{{name}}", name, -1)
+	ctrList := ""
+
+	nowTables := make([]Map, 0)
+	if db.Type == "mysql" {
+		nowTables = db.Select("INFORMATION_SCHEMA.TABLES", "TABLE_NAME as name,TABLE_COMMENT as label", Map{"TABLE_SCHEMA": db.DBName})
+	}
+	if db.Type == "sqlite" {
+		nowTables = db.Select("sqlite_sequence", "name")
+	}
+	//idSlice=append(idSlice,nowTables)
+	for _, v := range nowTables {
+		if v.GetString("name") == "cached" {
+			continue
+		}
+		if that.TableConfig.GetMap(v.GetString("name")) == nil {
+			if v.GetString("label") == "" {
+				v["label"] = v.GetString("name")
+			}
+			that.TableConfig[v.GetString("name")] = Map{
+				"label":   v.GetString("label"),
+				"table":   v.GetString("name"),
+				"auth":    []string{"add", "delete", "edit", "info"},
+				"columns": []Map{},
+				"search": []Map{
+
+					{"type": "search", "name": "keyword", "label": "请输入关键词", "value": nil},
+					{"type": "search", "name": "daterange", "label": "时间段", "value": nil},
+					{"type": "search", "name": "sort", "label": "排序", "value": nil},
+				},
+			}
+		}
+
+		//初始化
+		if that.TableColumns[v.GetString("name")] == nil {
+			that.TableColumns[v.GetString("name")] = make(map[string]Map)
+		}
+
+		//初始化
+		if that.SearchColumns[v.GetString("name")] == nil {
+			that.SearchColumns[v.GetString("name")] = make(map[string]Map)
+		}
+
+		tableInfo := make([]Map, 0)
+		if db.Type == "mysql" {
+			tableInfo = db.Select("INFORMATION_SCHEMA.COLUMNS", "COLUMN_NAME AS name,COLUMN_TYPE AS type,COLUMN_COMMENT AS label", Map{"AND": Map{"TABLE_SCHEMA": db.DBName, "TABLE_NAME": v.GetString("name")}})
+		}
+		if db.Type == "sqlite" {
+			tableInfo = db.Query("pragma table_info([" + v.GetString("name") + "]);")
+		}
+
+		idSlice = append(idSlice, tableInfo)
+		for _, info := range tableInfo {
+
+			if info.GetString("label") == "" {
+				info["label"] = info.GetString("name")
+			}
+			coloum := that.TableColumns[v.GetString("name")][info.GetString("name")]
+
+			if coloum == nil {
+				//根据类型判断真实类型
+				for k, v1 := range ColumnDataType {
+					if strings.Contains(info.GetString("name"), k) || strings.Contains(info.GetString("type"), k) {
+						info["type"] = v1
+					}
+				}
+
+				coloum = Map{
+					"name":  info.GetString("name"),
+					"type":  info.GetString("type"),
+					"label": info.GetString("label"),
+					//"add":   false, "info": false, "edit": false, "list": true,
+					//"must": false,
+				}
+				//备注以空格隔开，空格后的是其他备注
+				indexNum := strings.Index(info.GetString("label"), ":")
+				if indexNum > 0 {
+					coloum["label"] = info.GetString("label")[:indexNum]
+				}
+
+				for _, ColumnName := range ColumnNameType {
+					if (ColumnName.Strict && coloum.GetString("name") == ColumnName.Name) ||
+						(!ColumnName.Strict && strings.Contains(coloum.GetString("name"), ColumnName.Name)) {
+						//全部都不需要则不加入
+						if ColumnName.Edit == false && ColumnName.List == false && ColumnName.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
+
+						if ColumnName.Info {
+							delete(coloum, "info")
+						}
+						if ColumnName.Edit {
+							delete(coloum, "edit")
+							delete(coloum, "add")
+						}
+						if ColumnName.List {
+							delete(coloum, "list")
+						}
+						if ColumnName.Must {
+							delete(coloum, "must")
+						}
+
+						if ColumnName.Type != "" {
+							coloum["type"] = ColumnName.Type
+						}
+						if ColumnName.Strict && coloum.GetString("name") == ColumnName.Name {
+							break
+						}
+
+					}
+				}
+
+				//如果是select类型需要设置options
+				if coloum.GetString("type") == "number" {
+					coloum["sortable"] = true
+				}
+
+				//if !coloum.GetBool("notUse") {
+				that.TableConfig.GetMap(v.GetString("name"))["columns"] = append(that.TableConfig.GetMap(v.GetString("name")).GetSlice("columns"), coloum)
+				//}
+				//如果是select类型需要设置options
+				//if coloum.GetString("type") == "select" {
+
+				options := Slice{}
+				comments := strings.Split(info.GetString("label"), ":")
+				if len(comments) >= 2 {
+					optionComment := strings.Split(comments[1], ",")
+					for _, v := range optionComment {
+						optionSlice := strings.Split(v, "-")
+						if len(optionSlice) >= 2 {
+							options = append(options, Map{"name": optionSlice[1], "value": optionSlice[0]})
+						}
+					}
+				}
+
+				if coloum.GetString("type") == "select" {
+					coloum["must"] = true
+					coloum["options"] = options
+				} else if len(options) > 0 {
+					coloum["must"] = true
+					coloum["options"] = options
+					coloum["type"] = "select"
+
+				}
+				//}
+
+			}
+			//else {
+			//
+			//	//if !(coloum.GetString("label") != "备注" && info.GetString("label") == "备注") {
+			//	//	coloum["label"] = info.GetString("label")
+			//	//}
+			//	//coloum["type"] = info.GetString("type")
+			//}
+
+			//暂时不关闭参数，保证表数据完全读取到
+			that.TableColumns[v.GetString("name")][info.GetString("name")] = coloum
+
+		}
+
+		if makeCode {
+			//创建模块文件
+			//判断文件是否存在
+			//_, err := os.OpenFile(name+"/"+v.GetString("name"), os.O_RDONLY, os.ModePerm)
+			_, err := os.Stat(name + "/" + v.GetString("name") + ".go")
+			if err != nil { //文件不存在，则根据模板创建
+				myCtr := strings.Replace(CtrTpt, "{{name}}", 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)
+				if err != nil {
+					that.Error.SetError(err)
+				}
+				isMake = true
+			}
+
+			ctrList = ctrList + `"` + v.GetString("name") + `":` + v.GetString("name") + "Ctr,\r\n    "
+
+		}
+
+	}
+
+	that.Config["tables"] = that.TableConfig
+
+	//生成id，判断数据库是否有改变，以保证数据库和配置文件匹配唯一
+	id := Md5(ObjToStr(idSlice))
+
+	if id == that.Config.GetString("id") {
+		if isMake { //有生成包文件
+			fmt.Println("有新的业务代码生成，请重新运行")
+			os.Exit(-1)
+		}
+		return
+	}
+	//数据生成完后进一步解析
+	for fk, fv := range that.TableColumns {
+
+		//判断是否将表写入menu中
+		isMenusGet := false //判断是否被目录收录
+		for indexKey, _ := range that.IndexMenus {
+			indexCode := strings.Index(indexKey, fk)
+			if indexCode == 0 {
+				isMenusGet = false
+				continue
+			}
+			//如果相等或者表名在目录中已经设置（主要前一位是/并且他是最后一个字符串）
+			if indexKey == fk || (indexCode != -1 && indexKey[indexCode-1] == '/' && indexKey[indexCode:] == fk) {
+				isMenusGet = true
+				break
+			}
+		}
+
+		//目录没有收录
+		if !isMenusGet {
+
+			tablePrefixCode := strings.Index(fk, "_")
+			isNewPrefix := false //假定表名没有前缀
+			prefixName := ""
+			//并且代表有前缀，根据数据表分库设定使用
+			if tablePrefixCode != -1 {
+				prefixName = fk[:tablePrefixCode]
+			} else {
+				prefixName = fk
+			}
+			//if tablePrefixCode != -1 {
+			for ck, _ := range that.TableColumns {
+				//判断不止一个前缀相同
+				if strings.Index(ck, prefixName) == 0 && ck != fk {
+					isNewPrefix = true
+					break
+				}
+			}
+			//}
+
+			prefixName = DefaultMenuParentName + ":" + prefixName
+
+			menuIns := Map{"label": that.TableConfig.GetMap(fk).GetString("label"), "table": fk}
+			//多耗费一点内存
+			mMenu := Map{"menus": Slice{menuIns}, "label": that.TableConfig.GetMap(fk).GetString("label"), "name": prefixName, "icon": "el-icon-setting"}
+			//表名有前缀
+			if !isNewPrefix {
+				//是否已有对应前缀，已经有对应的menu只需要push进去即可
+				prefixName = DefaultMenuParentName
+				mMenu = Map{"menus": Slice{menuIns}, "label": "系统管理", "name": prefixName, "icon": "el-icon-setting"}
+			}
+			//没有新前缀
+			if that.IndexMenus[prefixName] != nil {
+				that.IndexMenus.GetMap(prefixName)["menus"] = append(that.IndexMenus.GetMap(prefixName).GetSlice("menus"), menuIns)
+				that.IndexMenus[prefixName+"/"+fk] = menuIns
+			} else {
+
+				that.Config["menus"] = append(that.Config.GetSlice("menus"), mMenu) //注入配置
+				//写入Index
+				that.IndexMenus[prefixName] = mMenu
+				that.IndexMenus[prefixName+"/"+fk] = menuIns
+			}
+		}
+
+		for k, v := range fv {
+
+			//搜索服务
+			if that.SearchColumns[fk][v.GetString("name")] == nil &&
+				v.GetString("type") == "select" {
+				search := that.TableConfig.GetMap(fk).GetSlice("search")
+				sv := DeepCopyMap(v).(Map)
+				sv["value"] = nil
+				sv["options"] = append(sv.GetSlice("options"), Map{"name": "全部", "value": nil})
+				that.TableConfig.GetMap(fk)["search"] = append(search, sv)
+				that.SearchColumns[fk][k] = sv
+			}
+
+			//虚招后缀是_id结尾的表字段 假设org_id
+			if len(k) <= 3 || strings.LastIndex(k, "_id") != len(k)-3 {
+				continue
+			}
+			//普通表匹配 org_id匹配为org
+			oldTableName := k[:len(k)-3]
+			//上级ID匹配
+			if oldTableName == "parent" {
+				oldTableName = fk
+			}
+			//如果本身匹配则不再继续精简匹配
+			if that.TableConfig[oldTableName] == nil {
+
+				//如果依然找不到则查询system_org是否存在
+				if that.TableConfig[DefaultMenuParentName+"_"+oldTableName] != nil {
+					oldTableName = DefaultMenuParentName + "_" + oldTableName
+				}
+
+				//字段有动词前缀，自动进行解析
+				prefixColumn := strings.Index(oldTableName, "_")
+
+				//sys_org_id oldTableName即为sys此处判断为org表存在
+
+				if prefixColumn > -1 && that.TableConfig[oldTableName[prefixColumn+1:]] != nil {
+					oldTableName = oldTableName[prefixColumn+1:]
+				}
+				if prefixColumn >= len(oldTableName) {
+					prefixColumn = -1
+				}
+				//如果依然找不到则查询system_org是否存在
+				if prefixColumn > -1 && that.TableConfig[DefaultMenuParentName+"_"+oldTableName[prefixColumn+1:]] != nil {
+					oldTableName = DefaultMenuParentName + "_" + oldTableName[prefixColumn+1:]
+				}
+			}
+
+			//普通方式查询不到，则转换为大型项目模块划分,暂时只支持一级模块划分，
+			//比如表sys_user 字段org_id，查询不到sys_org表则查询org表，org表查询不到则查询默认前缀system_org表
+			//都查询不到则找不到，
+			prefix := strings.Index(fk, "_")
+			tableName := oldTableName
+			if prefix > 0 {
+				//表模块前缀sys_user sys即为前缀 sys_org
+				tableName = fk[:prefix+1] + oldTableName
+				if that.TableConfig[tableName] == nil || that.TableConfig[oldTableName] != nil {
+					//不存在则改为org
+					tableName = oldTableName
+				}
+				//表前缀+去除字段前缀
+				prefixColumn := strings.Index(oldTableName, "_")
+				if prefixColumn > -1 {
+					tableName = fk[:prefix+1] + oldTableName[prefixColumn+1:]
+					if that.TableConfig[tableName] == nil {
+						tableName = oldTableName
+					}
+				}
+			}
+
+			//如果数据匹配则写入到配置中
+			if that.TableConfig[tableName] != nil {
+				v["link"] = tableName
+				//一般查询name字段或者label字段，如果没有name字段则默认第二个地段
+				if that.TableColumns[tableName]["name"] != nil {
+					v["value"] = "name"
+					continue
+				}
+				if that.TableColumns[tableName]["label"] != nil {
+					v["value"] = "label"
+					continue
+				}
+
+				if len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
+					v["value"] = that.TableConfig.GetMap(tableName).GetSlice("columns").GetMap(1).GetString("name")
+					continue
+				}
+
+			}
+
+		}
+	}
+
+	//搜索增加树节点
+	for fk, fv := range that.TableColumns {
+		for k, v := range fv {
+			if v.GetString("link") != "" && that.SearchColumns[fk][k] == nil &&
+				that.TableColumns[v.GetString("link")]["parent_id"] != nil {
+				//搜索服务
+				search := that.TableConfig.GetMap(fk).GetSlice("search")
+				sv := Map{"type": "tree", "label": v["label"], "name": v["name"], "value": v["value"], "link": v["link"]}
+				that.TableConfig.GetMap(fk)["search"] = append(search, sv)
+
+				that.SearchColumns[fk][k] = sv
+			}
+		}
+	}
+
+	fmt.Println(id, "---", that.Config.GetString("id"))
+	that.Config["id"] = id
+
+	if makeCode {
+		//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)
+		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)
+	if err != nil {
+		that.Error.SetError(err)
+	}
+	fmt.Println("有新的代码生成，请重新运行")
+	os.Exit(-1)
+
+}
+
+func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string, Map) {
+	reStr := ""
+	data := Map{}
+	var ruleData Map
+	for _, v := range that.TableColumns[table] {
+		if v == nil {
+			continue
+		}
+		//准备加入索引权限
+		if v.GetString("link") != "" &&
+			userData != nil &&
+			that.TableColumns[v.GetString("link")]["parent_id"] != nil {
+			//初始化ruleData
+			if ruleData == nil {
+				ruleData = Map{}
+				for _, v := range that.TableColumns["admin"] {
+					if v.GetString("link") != "" &&
+						v.GetString("name") != "parent_id" &&
+						userData.Get(v.GetString("name")) != nil {
+						ruleData[v.GetString("link")] = userData.Get(v.GetString("name"))
+					}
+				}
+			}
+			if ruleData[v.GetString("link")] != nil {
+
+				if v.GetString("name") == "parent_id" {
+					data["index[~]"] = "," + ruleData.GetString(v.GetString("link")) + ","
+
+				} else {
+					idMap := db.Select(v.GetString("link"), "id", Map{"index[~]": "," + ruleData.GetString(v.GetString("link")) + ","})
+					ids := Slice{ruleData.GetCeilInt(v.GetString("link"))}
+					for _, v := range idMap {
+						ids = append(ids, v.GetCeilInt("id"))
+					}
+					data[v.GetString("name")] = ids
+				}
+
+			}
+		}
+
+		if v.Get("info") == nil || v.GetBool("info") {
+			reStr += "`" + v.GetString("name") + "`,"
+		}
+	}
+	if len(reStr) != 0 {
+		reStr = reStr[:len(reStr)-1]
+	}
+	return reStr, data
+}
+func (that *MakeCode) Add(table string, req *http.Request) Map {
+	data := Map{}
+	for _, v := range that.TableColumns[table] {
+		//不可使用，未在前端展示，但在内存中保持有
+		if v.GetBool("notUse") {
+			if v.GetString("type") == "index" && that.TableColumns[table]["parent_id"] != nil {
+				data[v.GetString("name")] = ","
+			}
+
+			continue
+		}
+		if v.Get("add") == nil || v.GetBool("add") {
+
+			if len(req.Form[v.GetString("name")]) == 0 {
+				if v.GetBool("must") {
+					return nil
+				} else {
+					continue
+				}
+
+			}
+			reqValue := req.FormValue(v.GetString("name"))
+			if (reqValue == "" || reqValue == "null") && strings.Contains(v.GetString("name"), "id") {
+				data[v.GetString("name")] = nil
+			} else {
+				if v.GetString("type") == "password" {
+					data[v.GetString("name")] = Md5(reqValue)
+				} else {
+					data[v.GetString("name")] = reqValue
+				}
+
+			}
+		}
+
+		if v.GetString("name") == "create_time" {
+			data[v.GetString("name")] = time.Now().Unix()
+			continue
+		}
+
+		if v.GetString("name") == "modify_time" {
+			data[v.GetString("name")] = time.Now().Unix()
+		}
+	}
+	if len(data) == 0 {
+		return nil
+	}
+
+	return data
+}
+func (that *MakeCode) Edit(table string, req *http.Request) Map {
+	data := Map{}
+	for _, v := range that.TableColumns[table] {
+		//不可使用，未在前端展示，但在内存中保持有
+		if v.GetBool("notUse") {
+			if v.GetString("type") == "index" && that.TableColumns[table]["parent_id"] != nil {
+				data[v.GetString("name")] = ","
+			}
+			continue
+		}
+
+		if v.Get("edit") == nil || v.GetBool("edit") {
+			reqValue := req.FormValue(v.GetString("name"))
+			if reqValue == "" || reqValue == "null" {
+				continue
+			}
+			if v.GetString("type") == "password" {
+				data[v.GetString("name")] = Md5(reqValue)
+			} else {
+				data[v.GetString("name")] = reqValue
+			}
+		}
+		if v.GetString("name") == "modify_time" {
+			data[v.GetString("name")] = time.Now().Unix()
+		}
+	}
+
+	if len(data) == 0 {
+		return nil
+	}
+
+	return data
+}
+func (that *MakeCode) Delete(table string, req *http.Request) Map {
+	data := Map{}
+	for _, v := range that.TableColumns[table] {
+		//不可使用，未在前端展示，但在内存中保持有
+		if v.GetBool("notUse") {
+			if v.GetString("type") == "index" && that.TableColumns[table]["parent_id"] != nil {
+				data[v.GetString("name")] = ","
+			}
+			continue
+		}
+
+	}
+	return data
+}
+
+func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *db.HoTimeDB) (string, Map, Map) {
+	reStr := ""
+	leftJoin := Map{}
+	data := Map{}
+	keyword := Map{}
+	daterange := Map{}
+	sort := Map{}
+	var ruleData Map
+	hasUser := false
+
+	keywordStr := req.FormValue("keyword")
+	for _, v := range that.TableColumns[table] {
+		//不可使用，未在前端展示，但在内存中保持有
+		if v.GetBool("notUse") {
+
+			continue
+		}
+		if v["list"] != false {
+
+			if v.GetString("link") != "" &&
+				v.GetString("name") != "parent_id" {
+
+				reStr += table + "." + v.GetString("name") + "," +
+					v.GetString("link") + "." + v.GetString("value") + " AS " +
+					v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
+
+				leftJoin["[>]"+v.GetString("link")] =
+					table + "." + v.GetString("name") + "=" +
+						v.GetString("link") + ".id"
+				if v.GetString("link") == "admin" {
+					hasUser = true
+				}
+
+				reqValue := req.FormValue(v.GetString("name"))
+				if reqValue != "" {
+					data[table+"."+v.GetString("name")] = reqValue
+				}
+
+			} else {
+				reStr += table + "." + v.GetString("name") + ","
+			}
+
+			//准备加入索引权限
+			if v.GetString("link") != "" &&
+				userData != nil &&
+				that.TableColumns[v.GetString("link")]["parent_id"] != nil {
+				//初始化ruleData
+				if ruleData == nil {
+					ruleData = Map{}
+					for _, v := range that.TableColumns["admin"] {
+						if v.GetString("link") != "" &&
+							v.GetString("name") != "parent_id" &&
+							userData.Get(v.GetString("name")) != nil {
+							ruleData[v.GetString("link")] = userData.Get(v.GetString("name"))
+						}
+					}
+				}
+				if ruleData[v.GetString("link")] != nil {
+
+					if v.GetString("name") == "parent_id" {
+						data[table+".index[~]"] = "," + ruleData.GetString(v.GetString("link")) + ","
+
+					} else {
+						idMap := db.Select(v.GetString("link"), "id", Map{"index[~]": "," + ruleData.GetString(v.GetString("link")) + ","})
+						ids := Slice{ruleData.GetCeilInt(v.GetString("link"))}
+						for _, v := range idMap {
+							ids = append(ids, v.GetCeilInt("id"))
+						}
+						data[table+"."+v.GetString("name")] = ids
+					}
+
+				}
+
+			}
+
+			if keywordStr != "" {
+				if v.GetString("type") == "text" {
+					keyword[table+"."+v.GetString("name")+"[~]"] = keywordStr
+
+				}
+				if v.GetString("name") == "id" {
+					keyword[table+"."+v.GetString("name")] = keywordStr
+				}
+				if v.GetString("link") != "" &&
+					v.GetString("name") != "parent_id" {
+					childs := db.Select(v.GetString("link"), "id", Map{v.GetString("value") + "[~]": keywordStr})
+					childIds := Slice{}
+					for _, cv := range childs {
+						childIds = append(childIds, cv.GetString("id"))
+					}
+					if len(childIds) != 0 {
+						keyword[v.GetString("link")+".id"] = childIds
+					}
+
+				}
+			}
+
+		}
+	}
+	if len(reStr) != 0 {
+		reStr = reStr[:len(reStr)-1]
+	}
+
+	search := that.TableConfig.GetMap(table).GetSlice("search")
+	for k, _ := range search {
+
+		reqValue := req.FormValue(search.GetMap(k).GetString("name"))
+		if reqValue == "" {
+			continue
+		}
+		searchItem := search.GetMap(k)
+		searchItemName := searchItem.GetString("name")
+
+		//columns := that.TableConfig.GetMap(table).GetSlice("columns")
+		if searchItem.GetString("type") == "search" {
+			for _, v := range that.TableColumns[table] {
+				if v["list"] == false {
+					continue
+				}
+				//日期类型
+				if searchItemName == "daterange" && v.GetString("type") == "time" {
+					//fmt.Println(req.Form["daterange"])
+					daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+				}
+			}
+
+			if searchItem.GetString("name") == "sort" {
+				sort["ORDER"] = table + "." + reqValue
+			}
+
+			continue
+		}
+		//树节点模式搜索
+		if searchItemName == "parent_id" {
+			parentID := ObjToInt(req.FormValue("parent_id"))
+			if parentID == 0 {
+				parentID = userData.GetCeilInt(table + "_id")
+				data["OR"] = Map{table + ".id": parentID, table + ".parent_id": nil}
+			} else {
+				data[table+".parent_id"] = parentID
+			}
+			continue
+		}
+
+		data[table+"."+searchItemName] = reqValue
+
+	}
+	if sort["ORDER"] == nil {
+		sort["ORDER"] = table + ".id DESC"
+	}
+
+	where := Map{}
+
+	if len(keyword) == 1 {
+		for k, v := range keyword {
+			data[k] = v
+		}
+	}
+	if len(keyword) > 1 {
+		if data["OR"] != nil {
+			data = Map{"AND": data, "OR": keyword}
+		} else {
+			data["OR"] = keyword
+		}
+
+	}
+
+	if len(daterange) == 1 {
+		for k, v := range daterange {
+			data[k] = v
+		}
+	}
+
+	if len(daterange) > 1 {
+		if data["AND"] != nil {
+			data = Map{"AND": Map{"AND": data, "OR": daterange}}
+		}
+	}
+
+	if len(data) > 1 {
+		where["AND"] = data
+	}
+
+	if len(data) == 1 {
+		where = data
+	}
+
+	if len(where) == 0 && hasUser {
+
+		//where["admin.id"] = userData["id"]
+
+	}
+
+	if len(sort) != 0 {
+		for k, v := range sort {
+			where[k] = v
+		}
+	}
+
+	return reStr, leftJoin, where
+}
+
+func setListener() {
+
+}
@@ -0,0 +1,230 @@
+package code
+
+var InitTpt = `package {{name}}
+
+import (
+	. "../../../hotime"
+	. "../../../hotime/common"
+)
+
+var ID = "{{id}}"
+
+// Project 管理端项目
+var Project = Proj{
+	//"user": UserCtr,
+	{{tablesCtr}}
+    "hotime":Ctr{
+		"login": func(this *Context) {
+			name := this.Req.FormValue("name")
+			password := this.Req.FormValue("password")
+			if name == "" || password == "" {
+				this.Display(3, "参数不足")
+				return
+			}
+			user := this.Db.Get("admin", "*", Map{"AND": Map{"OR":Map{"name": name,"phone":name}, "password": Md5(password)}})
+			if user == nil {
+				this.Display(5, "登录失败")
+				return
+			}
+			this.Session("admin_id", user.GetCeilInt("id"))
+			this.Session("admin_name", name)
+			this.Display(0, this.SessionId)
+		},
+		"logout": func(this *Context) {
+			this.Session("admin_id", nil)
+			this.Session("admin_name", nil)
+			this.Display(0, "退出登录成功")
+		},
+		"info": func(that *Context) {
+			data := that.Db.Get("admin", "*", Map{"id": that.Session("admin_id").ToCeilInt()})
+			str, inData := that.MakeCode.Info("admin", data, that.Db)
+			where := Map{"id": that.Session("admin_id").ToCeilInt()}
+			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("admin", str, where)
+			if re == nil {
+				that.Display(4, "找不到对应信息")
+				return
+			}
+			for k, v := range re {
+				column := that.MakeCode.TableColumns["admin"][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)
+		},
+	},
+}
+`
+var CtrTpt = `package {{name}}
+
+import (
+	. "../../../hotime"
+	. "../../../hotime/common"
+	"strings"
+)
+
+var {{table}}Ctr = 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) {
+
+		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)
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		count := that.Db.Count(that.RouterString[1], leftJoin, where)
+		reData := that.Db.Page(page, pageSize).
+			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
+				}
+
+				if column["list"] != false && 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 {
+						v[column.GetString("link")+"_"+column.GetString("name")+"_"+column.GetString("value")] = parentC.GetString(column.GetString("value"))
+					}
+				}
+
+			}
+		}
+
+		that.Display(0, Map{"count": count, "data": reData})
+	},
+}
+`
@@ -0,0 +1,18 @@
+package common
+
+import (
+	"time"
+)
+
+type ContextBase struct {
+	tag string
+}
+
+//唯一标志
+func (this *ContextBase) GetTag() string {
+
+	if this.tag == "" {
+		this.tag = ObjToStr(time.Now().Unix()) + ":" + ObjToStr(Random())
+	}
+	return this.tag
+}
@@ -0,0 +1,27 @@
+package common
+
+import (
+	"github.com/sirupsen/logrus"
+)
+
+// Error 框架层处理错误
+type Error struct {
+	Logger *logrus.Logger
+	error
+}
+
+func (that *Error) GetError() error {
+
+	return that.error
+
+}
+
+func (that *Error) SetError(err error) {
+	that.error = err
+	if that.Logger != nil && err != nil {
+		//that.Logger=log.GetLog("",false)
+		that.Logger.Warn(err)
+	}
+
+	return
+}
@@ -1,15 +1,10 @@
-package hotime
+package common

 import (
 	"crypto/md5"
 	"encoding/hex"
-	"fmt"
 	"math"
-	"os"
-	"path/filepath"
-	"runtime"
 	"strings"
-	"time"
 )

 //安全锁
@@ -29,83 +24,7 @@ import (
 //	return res
 //}

-func LogError(logMsg interface{}) {
-
-	logFmt(fmt.Sprintln(logMsg), 2, LOG_ERROR)
-}
-func LogWarn(logMsg interface{}) {
-
-	logFmt(fmt.Sprintln(logMsg), 2, LOG_WARN)
-}
-func LogInfo(logMsg ...interface{}) {
-
-	logFmt(fmt.Sprintln(logMsg), 2, LOG_INFO)
-}
-
-//func LogFmt(logMsg interface{}, loglevel ...LOG_MODE) {
-//
-//	logFmt(logMsg, 2, loglevel...)
-//}
-
-//日志打印以及存储到文件
-func logFmt(logMsg interface{}, printLevel int, loglevel ...LOG_MODE) {
-
-	if Config.GetInt("logLevel") == int(LOG_NIL) {
-		return
-	}
-
-	lev := LOG_INFO
-	if len(loglevel) != 0 {
-		lev = loglevel[0]
-	}
-	gofile := ""
-
-	if Config.GetInt("debug") != 0 && printLevel != 0 {
-		_, file, line, ok := runtime.Caller(printLevel)
-		if ok {
-			gofile = " " + file + ":" + ObjToStr(line)
-		}
-	}
-
-	logStr := ""
-
-	if lev == LOG_INFO {
-		logStr = "info:"
-	}
-	if printLevel == 0 {
-		logStr = "connect:"
-	}
-
-	if lev == LOG_WARN {
-		logStr = "warn:"
-	}
-
-	if lev == LOG_ERROR {
-		logStr = "error:"
-	}
-
-	logStr = fmt.Sprintln(time.Now().Format("2006/01/02 15:04:05"), logStr, logMsg, gofile)
-	//打印日志
-	fmt.Print(logStr)
-	//不需要存储到文件
-	if Config.GetString("logFile") == "" {
-		return
-	}
-	//存储到文件
-	logFilePath := time.Now().Format(Config.GetString("logFile"))
-
-	os.MkdirAll(filepath.Dir(logFilePath), os.ModeAppend)
-	//os.Create(logFilePath)
-	f, err := os.OpenFile(logFilePath, os.O_APPEND|os.O_CREATE, 0644)
-	if err != nil {
-		return
-	}
-	f.Write([]byte(logStr))
-	f.Close()
-
-}
-
-//字符串首字符大写
+// StrFirstToUpper 字符串首字符大写
 func StrFirstToUpper(str string) string {
 	if len(str) == 0 {
 		return str
@@ -117,7 +36,43 @@ func StrFirstToUpper(str string) string {
 	return strings.ToUpper(first) + other
 }

-//字符串截取
+//相似度计算 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)
+		t = strings.ToLower(t)
+	}
+	d := make([][]int, len(s)+1)
+	for i := range d {
+		d[i] = make([]int, len(t)+1)
+	}
+	for i := range d {
+		d[i][0] = i
+	}
+	for j := range d[0] {
+		d[0][j] = j
+	}
+	for j := 1; j <= len(t); j++ {
+		for i := 1; i <= len(s); i++ {
+			if s[i-1] == t[j-1] {
+				d[i][j] = d[i-1][j-1]
+			} else {
+				min := d[i-1][j]
+				if d[i][j-1] < min {
+					min = d[i][j-1]
+				}
+				if d[i-1][j-1] < min {
+					min = d[i-1][j-1]
+				}
+				d[i][j] = min + 1
+			}
+		}
+
+	}
+	return d[len(s)][len(t)]
+}
+
+// Substr 字符串截取
 func Substr(str string, start int, length int) string {
 	rs := []rune(str)
 	rl := len(rs)
@@ -148,7 +103,7 @@ func Substr(str string, start int, length int) string {
 	return string(rs[start:end])
 }

-//获取最后出现字符串的下标
+// IndexLastStr 获取最后出现字符串的下标
 //return  找不到返回 -1
 func IndexLastStr(str, sep string) int {
 	sepSlice := []rune(sep)
@@ -179,7 +134,7 @@ func IndexLastStr(str, sep string) int {
 	return -1
 }

-//md5
+// Md5 md5
 func Md5(req string) string {
 	md5Ctx := md5.New()
 	md5Ctx.Write([]byte(req))
@@ -1,4 +1,4 @@
-package hotime
+package common

 import (
 	"encoding/json"
@@ -90,6 +90,14 @@ func (this Map) GetSlice(key string, err ...*Error) Slice {

 	return v

+}
+func (this Map) GetBool(key string, err ...*Error) bool {
+
+	//var v Slice
+	v := ObjToBool((this)[key], err...)
+
+	return v
+
 }

 func (this Map) GetMap(key string, err ...*Error) Map {
@@ -0,0 +1,94 @@
+package common
+
+//对象封装方便取用
+type Obj struct {
+	Data interface{}
+	Error
+	ContextBase
+}
+
+func (that *Obj) Put(data interface{}) {
+	that.Data = data
+}
+
+func (that *Obj) ToInt(err ...Error) int {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToInt(that.Data, &that.Error)
+}
+
+func (that *Obj) ToInt64(err ...Error) int64 {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToInt64(that.Data, &that.Error)
+}
+
+func (that *Obj) ToFloat64(err ...Error) float64 {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToFloat64(that.Data, &that.Error)
+}
+
+// ToCeilFloat64 获取向上取整float64
+func (that *Obj) ToCeilFloat64(err ...*Error) float64 {
+	if len(err) != 0 {
+		that.Error = *err[0]
+	}
+	v := ObjToCeilFloat64(that.Data, err...)
+	return v
+
+}
+
+func (that *Obj) ToStr() string {
+
+	return ObjToStr(that.Data)
+}
+
+func (that *Obj) ToMap(err ...Error) Map {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToMap(that.Data, &that.Error)
+}
+
+func (that *Obj) ToSlice(err ...Error) Slice {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToSlice(that.Data, &that.Error)
+}
+
+func (that *Obj) ToMapArray(err ...Error) []Map {
+	if len(err) != 0 {
+		that.Error = err[0]
+	}
+	return ObjToMapArray(that.Data, &that.Error)
+}
+
+func (that *Obj) ToObj() interface{} {
+
+	return that.Data
+}
+
+//获取向上取整Int64
+func (that *Obj) ToCeilInt64(err ...*Error) int64 {
+	if len(err) != 0 {
+		that.Error = *err[0]
+	}
+	v := ObjToCeilInt64(that.Data, err...)
+	return v
+
+}
+
+//获取向上取整Int
+func (that *Obj) ToCeilInt(err ...*Error) int {
+	if len(err) != 0 {
+		that.Error = *err[0]
+	}
+	v := ObjToCeilInt(that.Data, err...)
+	return v
+
+}
@@ -1,4 +1,4 @@
-package hotime
+package common

 import (
 	"encoding/json"
@@ -212,6 +212,31 @@ func ObjToInt(obj interface{}, e ...*Error) int {
 	return int(v)
 }

+func ObjToBool(obj interface{}, e ...*Error) bool {
+	var err error
+	v := false
+
+	if obj == nil {
+
+		err = errors.New("没有合适的转换对象！")
+	} else {
+		switch obj.(type) {
+		case bool:
+			v = obj.(bool)
+		default:
+			toInt := ObjToInt(obj)
+			if toInt != 0 {
+				v = true
+			}
+			err = errors.New("没有合适的转换对象！")
+		}
+	}
+	if len(e) != 0 {
+		e[0].SetError(err)
+	}
+	return v
+}
+
 func ObjToStr(obj interface{}) string {
 	//	fmt.Println(reflect.ValueOf(obj).Type().String() )
 	str := ""
@@ -232,7 +257,8 @@ func ObjToStr(obj interface{}) string {
 	case float64:
 		str = strconv.FormatFloat(obj.(float64), 'f', -1, 64)
 	default:
-		strbte, err := json.Marshal(obj)
+		strbte, err := json.MarshalIndent(obj, "", "\t")
+
 		if err == nil {
 			str = string(strbte)
 		}
@@ -0,0 +1,96 @@
+package common
+
+import (
+	"errors"
+)
+
+type Slice []interface{}
+
+// GetString 获取string
+func (that Slice) GetString(key int, err ...*Error) string {
+	if len(err) != 0 {
+		err[0].SetError(nil)
+	}
+	return ObjToStr((that)[key])
+}
+
+// GetInt 获取Int
+func (that Slice) GetInt(key int, err ...*Error) int {
+	v := ObjToInt((that)[key], err...)
+	return v
+}
+
+// GetInt64 获取Int
+func (that Slice) GetInt64(key int, err ...*Error) int64 {
+	v := ObjToInt64((that)[key], err...)
+
+	return v
+}
+
+// GetCeilInt64 获取向上取整Int64
+func (that Slice) GetCeilInt64(key int, err ...*Error) int64 {
+	v := ObjToCeilInt64((that)[key], err...)
+	return v
+
+}
+
+// GetCeilInt 获取向上取整Int
+func (that Slice) GetCeilInt(key int, err ...*Error) int {
+	v := ObjToCeilInt((that)[key], err...)
+	return v
+
+}
+
+// GetCeilFloat64 获取向上取整float64
+func (that Slice) GetCeilFloat64(key int, err ...*Error) float64 {
+	v := ObjToCeilFloat64((that)[key], err...)
+	return v
+
+}
+
+// GetFloat64 获取Float64
+func (that Slice) GetFloat64(key int, err ...*Error) float64 {
+	v := ObjToFloat64((that)[key], err...)
+
+	return v
+}
+
+func (that Slice) GetSlice(key int, err ...*Error) Slice {
+	v := ObjToSlice((that)[key], err...)
+	return v
+}
+
+func (that Slice) GetBool(key int, err ...*Error) bool {
+
+	//var v Slice
+	v := ObjToBool((that)[key], err...)
+
+	return v
+
+}
+
+func (that Slice) GetMap(key int, err ...*Error) Map {
+	//var v Map
+	v := ObjToMap((that)[key], err...)
+	return v
+}
+
+func (that Slice) Get(key int, err ...*Error) interface{} {
+
+	if key < len(that) {
+		return that[key]
+	}
+	e := errors.New("没有存储key及对应的数据")
+	if len(err) != 0 {
+		err[0].SetError(e)
+	}
+	return nil
+}
+
+func (that Slice) Put(key int, value interface{}) {
+	that[key] = value
+}
+
+func (that Slice) ToJsonString() string {
+	return ObjToStr(that)
+}
@@ -1,16 +1,4 @@
 package hotime

-type LOG_MODE int
-
-const (
-	LOG_NIL = 0
-	LOG_FMT = 1
-	//LOG_FILE  = 2
-
-	LOG_INFO  LOG_MODE = 0
-	LOG_WARN  LOG_MODE = 1
-	LOG_ERROR LOG_MODE = 2
-)
-
-//session储存头
+// HEAD_SESSION_ADD session储存头
 const HEAD_SESSION_ADD = "session#"
@@ -1,65 +1,72 @@
 package hotime

 import (
+	. "./cache"
+	. "./common"
+	. "./db"
 	"encoding/json"
-	"errors"
 	"net/http"
 )

 type Context struct {
-	contextBase
+	*Application
 	Resp         http.ResponseWriter
 	Req          *http.Request
-	Application  *Application
 	RouterString []string
 	Config       Map
 	Db           *HoTimeDB
 	RespData     Map
 	CacheIns
 	SessionIns
+	DataSize   int
 	HandlerStr string //复写请求url
 }

-//唯一标志
-func (this *Context) Mtd(router [3]string) Map {
-	this.Application.Router[router[0]][router[1]][router[2]](this)
-	d := this.RespData
-	this.RespData = nil
+// Mtd 唯一标志
+func (that *Context) Mtd(router [3]string) Map {
+	that.Application.Router[router[0]][router[1]][router[2]](that)
+	d := that.RespData
+	that.RespData = nil
 	return d
 }

 //打印
-func (this *Context) Display(statu int, data interface{}) {
+func (that *Context) Display(statu int, data interface{}) {

-	resp := Map{"statu": statu}
+	resp := Map{"status": statu}
 	if statu != 0 {
 		temp := Map{}

-		tpe := this.Config.GetMap("error").GetString(ObjToStr(statu))
+		tpe := that.Config.GetMap("error").GetString(ObjToStr(statu))
 		if tpe == "" {
-			logFmt(errors.New("找不到对应的错误码"), 2, LOG_WARN)
+			//logFmt(errors.New("找不到对应的错误码"), 2, LOG_WARN)
 		}

 		temp["type"] = tpe
 		temp["msg"] = data
 		resp["result"] = temp
+		//兼容android等需要json转对象的服务
+		resp["error"] = temp
 	} else {
 		resp["result"] = data
 	}

-	this.RespData = resp
+	that.RespData = resp

-	//this.Data=d;
+	//that.Data=d;
 }

-func (this *Context) View() {
-	if this.RespData == nil {
+func (that *Context) View() {
+
+	if that.RespData == nil {
 		return
 	}
-	d, err := json.Marshal(this.RespData)
+	d, err := json.Marshal(that.RespData)
 	if err != nil {
 		return
 	}
-	this.RespData = nil
-	this.Resp.Write(d)
+	that.DataSize = len(d)
+	that.RespData = nil
+	that.Resp.Write(d)
+	return
 }
@@ -1,17 +0,0 @@
-package hotime
-
-import "time"
-
-type contextBase struct {
-	Error
-	tag int64
-}
-
-//唯一标志
-func (this *contextBase) GetTag() int64 {
-
-	if this.tag == int64(0) {
-		this.tag = time.Now().UnixNano()
-	}
-	return this.tag
-}
@@ -1,935 +0,0 @@
-package hotime
-
-import (
-	"database/sql"
-	"encoding/json"
-	"errors"
-	"os"
-	"reflect"
-	"strings"
-)
-
-type HoTimeDB struct {
-	*sql.DB
-	contextBase
-	CacheIns
-	Type        string
-	DBCached    bool
-	LastQuery   string
-	LastData    []interface{}
-	ConnectFunc func(err ...*Error) *sql.DB
-	LastErr     Error
-	limit       Slice
-	Tx          *sql.Tx //事务对象
-
-}
-
-//设置数据库配置连接
-func (this *HoTimeDB) SetConnect(connect func(err ...*Error) *sql.DB, err ...*Error) {
-	this.ConnectFunc = connect
-	this.InitDb()
-}
-
-//事务，如果action返回true则执行成功；false则回滚
-func (this *HoTimeDB) Action(action func(db HoTimeDB) bool) bool {
-	db := HoTimeDB{DB: this.DB, CacheIns: this.CacheIns, DBCached: this.DBCached}
-	tx, err := db.Begin()
-	if err != nil {
-		this.LastErr.SetError(err)
-		return false
-	}
-
-	db.Tx = tx
-
-	result := action(db)
-
-	if !result {
-		db.Tx.Rollback()
-		return result
-	}
-	db.Tx.Commit()
-	return result
-}
-
-func (this *HoTimeDB) InitDb(err ...*Error) Error {
-	if len(err) != 0 {
-		this.LastErr = *(err[0])
-	}
-	this.DB = this.ConnectFunc(&this.LastErr)
-	if this.DB == nil {
-
-		return this.LastErr
-	}
-	e := this.DB.Ping()
-
-	this.LastErr.SetError(e)
-
-	return this.LastErr
-}
-
-func (this *HoTimeDB) Page(page, pageRow int) *HoTimeDB {
-	page = (page - 1) * pageRow
-	if page < 0 {
-		page = 1
-	}
-
-	this.limit = Slice{page, pageRow}
-	return this
-}
-
-func (this *HoTimeDB) PageSelect(table string, qu ...interface{}) []Map {
-
-	if len(qu) == 1 {
-		qu = append(qu, Map{"LIMIT": this.limit})
-	}
-	if len(qu) == 2 {
-		temp := qu[1].(Map)
-		temp["LIMIT"] = this.limit
-		qu[1] = temp
-	}
-	if len(qu) == 3 {
-		temp := qu[2].(Map)
-		temp["LIMIT"] = this.limit
-		qu[2] = temp
-	}
-	//fmt.Println(qu)
-	data := this.Select(table, qu...)
-
-	return data
-}
-
-//数据库数据解析
-func (this *HoTimeDB) Row(resl *sql.Rows) []Map {
-	dest := make([]Map, 0)
-	strs, _ := resl.Columns()
-
-	for i := 0; resl.Next(); i++ {
-		lis := make(Map, 0)
-		a := make([]interface{}, len(strs))
-
-		b := make([]interface{}, len(a))
-		for j := 0; j < len(a); j++ {
-			b[j] = &a[j]
-		}
-		resl.Scan(b...)
-		for j := 0; j < len(a); j++ {
-			if a[j] != nil && reflect.ValueOf(a[j]).Type().String() == "[]uint8" {
-				lis[strs[j]] = string(a[j].([]byte))
-			} else {
-				lis[strs[j]] = a[j]
-			}
-
-		}
-		//防止int被误读为float64
-		jlis, e := json.Marshal(lis)
-		if e != nil {
-			this.LastErr.SetError(e)
-		} else {
-			lis.JsonToMap(string(jlis), &this.LastErr)
-		}
-
-		dest = append(dest, lis)
-
-	}
-
-	return dest
-}
-
-//
-////code=0,1,2 0 backup all,1 backup data,2 backup ddl
-//func (this *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"]))
-//	case 1:cmd= exec.Command("mysqldump","-h"+ObjToStr(Config["dbHost"]), "-P"+ObjToStr(Config["dbPort"]),"-u"+ObjToStr(Config["dbUser"]), "-p"+ObjToStr(Config["dbPwd"]), ObjToStr(Config["dbName"]))
-//	case 2:cmd= exec.Command("mysqldump","--no-data","-h"+ObjToStr(Config["dbHost"]), "-P"+ObjToStr(Config["dbPort"]),"-u"+ObjToStr(Config["dbUser"]), "-p"+ObjToStr(Config["dbPwd"]),ObjToStr(Config["dbName"]))
-//	}
-//
-//
-//
-//	stdout, err := cmd.StdoutPipe()
-//	if err != nil {
-//		log.Println(err)
-//	}
-//
-//	if err := cmd.Start(); err != nil {
-//		log.Println(err)
-//	}
-//
-//	bytes, err := ioutil.ReadAll(stdout)
-//	if err != nil {
-//		log.Println(err)
-//	}
-//	err = ioutil.WriteFile(path, bytes, 0644)
-//	if err != nil {
-//		panic(err)
-//	}
-//	return ;
-//	//
-//	//db := ``
-//	//fmt.Println(db)
-//	//
-//	//tables := this.Query("show tables")
-//	//lth := len(tables)
-//	//if lth == 0 {
-//	//	return
-//	//}
-//	//for k, _ := range tables[0] {
-//	//	db = Substr(k, 10, len(k))
-//	//}
-//	//
-//	//fd, _ := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
-//	//fd.Write([]byte("/*datetime " + time.Now().Format("2006-01-02 15:04:05") + "  */ \r\n"))
-//	//fd.Close()
-//	//
-//	//for i := 0; i < lth; i++ {
-//	//	tt := tables[i]["Tables_in_"+db].(string)
-//	//	this.backupSave(path, tt, code)
-//	//	debug.FreeOSMemory()
-//	//}
-//
-//}
-
-func (this *HoTimeDB) backupSave(path string, tt string, code int) {
-	fd, _ := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
-	defer fd.Close()
-
-	str := "\r\n"
-	if code == 0 || code == 2 {
-		str += this.backupDdl(tt)
-	}
-
-	if code == 0 || code == 1 {
-		str += "insert  into `" + tt + "`\r\n\r\n("
-		str += this.backupCol(tt)
-	}
-
-	fd.Write([]byte(str))
-}
-func (this *HoTimeDB) backupDdl(tt string) string {
-
-	data := this.Query("show create table " + tt)
-	if len(data) == 0 {
-		return ""
-	}
-
-	return ObjToStr(data[0]["Create Table"]) + ";\r\n\r\n"
-}
-
-func (this *HoTimeDB) backupCol(tt string) string {
-	str := ""
-	data := this.Select(tt, "*")
-
-	lthData := len(data)
-
-	if lthData == 0 {
-		return str
-	}
-	lthCol := len(data[0])
-	col := make([]string, lthCol)
-	tempLthData := 0
-	for k, _ := range data[0] {
-
-		if tempLthData == lthCol-1 {
-			str += "`" + k + "`)"
-		} else {
-			str += "`" + k + "`,"
-		}
-		col[tempLthData] = k
-		tempLthData++
-	}
-
-	str += " values"
-
-	for j := 0; j < lthData; j++ {
-
-		for m := 0; m < lthCol; m++ {
-
-			if m == 0 {
-				str += "("
-			}
-
-			v := "NULL"
-			if data[j][col[m]] != nil {
-				v = "'" + strings.Replace(ObjToStr(data[j][col[m]]), "'", `\'`, -1) + "'"
-			}
-
-			if m == lthCol-1 {
-				str += v + ")"
-
-			} else {
-				str += v + ","
-			}
-		}
-		if j == lthData-1 {
-			str += ";\r\n\r\n"
-		} else {
-			str += ",\r\n\r\n"
-		}
-	}
-	return str
-}
-
-func (this *HoTimeDB) md5(query string, args ...interface{}) string {
-	strByte, _ := json.Marshal(args)
-	str := Md5(query + ":" + string(strByte))
-	return str
-}
-
-func (this *HoTimeDB) Query(query string, args ...interface{}) []Map {
-
-	//fmt.Println(query)
-	var err error
-	var resl *sql.Rows
-
-	this.LastQuery = query
-	this.LastData = args
-
-	if this.DB == nil {
-		err = errors.New("没有初始化数据库")
-		this.LastErr.SetError(err)
-		return nil
-	}
-
-	if this.Tx != nil {
-		resl, err = this.Tx.Query(query, args...)
-	} else {
-		resl, err = this.DB.Query(query, args...)
-	}
-
-	this.LastErr.SetError(err)
-	if err != nil {
-		if err = this.DB.Ping(); err != nil {
-			this.LastErr.SetError(err)
-			this.InitDb()
-			if this.LastErr.GetError() != nil {
-				return nil
-			}
-			return this.Query(query, args...)
-		}
-		return nil
-	}
-
-	return this.Row(resl)
-}
-
-func (this *HoTimeDB) Exec(query string, args ...interface{}) (sql.Result, Error) {
-
-	this.LastQuery = query
-	this.LastData = args
-	var e error
-	var resl sql.Result
-
-	if this.DB == nil {
-		err := errors.New("没有初始化数据库")
-		this.LastErr.SetError(err)
-		return nil, this.LastErr
-	}
-
-	if this.Tx != nil {
-		resl, e = this.Tx.Exec(query, args...)
-	} else {
-		resl, e = this.DB.Exec(query, args...)
-	}
-
-	this.LastErr.SetError(e)
-
-	//判断是否连接断开了
-	if e != nil {
-
-		if e = this.DB.Ping(); e != nil {
-			this.LastErr.SetError(e)
-			this.InitDb()
-			if this.LastErr.GetError() != nil {
-				return resl, this.LastErr
-			}
-			return this.Exec(query, args...)
-		}
-	}
-
-	return resl, this.LastErr
-}
-
-//func (this *HoTimeDB)copy(data []Map)[]Map{
-//	if data==nil{
-//		return nil
-//	}
-//
-//	lth:=len(data)
-//
-//	res:=make([]Map,lth)
-//
-//
-//	for i:=0;i<lth;i++{
-//
-//		res[i]=DeepCopy(data[i]).(Map)
-//	}
-//
-//	return res
-//
-//}
-func (this *HoTimeDB) Select(table string, qu ...interface{}) []Map {
-
-	query := "SELECT"
-	where := Map{}
-	qs := make([]interface{}, 0)
-	intQs, intWhere := 0, 1
-	join := false
-	if len(qu) == 3 {
-		intQs = 1
-		intWhere = 2
-		join = true
-
-	}
-
-	if len(qu) > 0 {
-		if reflect.ValueOf(qu[intQs]).Type().String() == "string" {
-			query += " " + qu[intQs].(string)
-		} else {
-			for i := 0; i < len(qu[intQs].(Slice)); i++ {
-				k := qu[intQs].(Slice)[i].(string)
-				if strings.Contains(k, " AS ") {
-
-					query += " " + k + " "
-
-				} else {
-					query += " `" + k + "` "
-				}
-
-				if i+1 != len(qu[intQs].(Slice)) {
-					query = query + ", "
-				}
-
-			}
-		}
-
-	} else {
-		query += " *"
-	}
-
-	query += " FROM " + table
-
-	if join {
-		for k, v := range qu[0].(Map) {
-			switch Substr(k, 0, 3) {
-			case "[>]":
-				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)
-			}
-			switch Substr(k, 0, 4) {
-			case "[<>]":
-				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)
-			}
-		}
-	}
-
-	if len(qu) > 1 {
-		where = qu[intWhere].(Map)
-	}
-
-	temp, resWhere := this.where(where)
-
-	query += temp
-	qs = append(qs, resWhere...)
-	md5 := this.md5(query, qs...)
-
-	if this.DBCached && this.CacheIns != nil {
-		//如果缓存有则从缓存取
-		cacheData := this.Cache(table + ":" + md5)
-
-		if cacheData.Data != nil {
-			return cacheData.ToMapArray()
-		}
-	}
-
-	//无缓存则数据库取
-	res := this.Query(query, qs...)
-
-	if res == nil {
-		res = []Map{}
-	}
-
-	//缓存
-	if this.DBCached && this.CacheIns != nil {
-
-		this.Cache(table+":"+md5, res)
-	}
-
-	return res
-
-}
-
-func (this *HoTimeDB) Get(table string, qu ...interface{}) Map {
-	//fmt.Println(qu)
-	if len(qu) == 1 {
-		qu = append(qu, Map{"LIMIT": 1})
-	}
-	if len(qu) == 2 {
-		temp := qu[1].(Map)
-		temp["LIMIT"] = 1
-		qu[1] = temp
-	}
-	if len(qu) == 3 {
-		temp := qu[2].(Map)
-		temp["LIMIT"] = 1
-		qu[2] = temp
-	}
-	//fmt.Println(qu)
-	data := this.Select(table, qu...)
-	if len(data) == 0 {
-		return nil
-	}
-	return data[0]
-}
-
-/**
-** 计数
- */
-func (this *HoTimeDB) Count(table string, qu ...interface{}) int {
-	req := []interface{}{}
-
-	if len(qu) == 2 {
-		req = append(req, qu[0])
-		req = append(req, "COUNT(*)")
-		req = append(req, qu[1])
-	} else {
-		req = append(req, "COUNT(*)")
-		req = append(req, qu...)
-	}
-
-	//req=append(req,qu...)
-	data := this.Select(table, req...)
-	//fmt.Println(data)
-	if len(data) == 0 {
-		return 0
-	}
-	//res,_:=StrToInt(data[0]["COUNT(*)"].(string))
-	res := ObjToStr(data[0]["COUNT(*)"])
-	count, _ := StrToInt(res)
-	return count
-
-}
-
-var condition = []string{"AND", "OR"}
-var vcond = []string{"GROUP", "ORDER", "LIMIT"}
-
-//where语句解析
-func (this *HoTimeDB) where(data Map) (string, []interface{}) {
-
-	where := ""
-
-	res := make([]interface{}, 0)
-	//AND OR判断
-	for k, v := range data {
-		x := 0
-		for i := 0; i < len(condition); i++ {
-
-			if condition[i] == k {
-
-				tw, ts := this.cond(k, v.(Map))
-
-				where += tw
-				res = append(res, ts...)
-				break
-			}
-			x++
-		}
-
-		y := 0
-		for j := 0; j < len(vcond); j++ {
-
-			if vcond[j] == k {
-				break
-			}
-			y++
-		}
-		if x == len(condition) && y == len(vcond) {
-			tv, vv := this.varCond(k, v)
-
-			where += tv
-			res = append(res, vv...)
-		}
-
-	}
-
-	if len(where) != 0 {
-		where = " WHERE " + where
-	}
-
-	//特殊字符
-	for j := 0; j < len(vcond); j++ {
-		for k, v := range data {
-			if vcond[j] == k {
-				if k == "ORDER" {
-					where += " " + k + " BY "
-					//fmt.Println(reflect.ValueOf(v).Type())
-
-					//break
-				} else if k == "GROUP" {
-
-					where += " " + k + " BY "
-				} else {
-
-					where += " " + k
-				}
-
-				if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
-					for i := 0; i < len(v.(Slice)); i++ {
-						where += " " + ObjToStr(v.(Slice)[i])
-
-						if len(v.(Slice)) != i+1 {
-							where += ","
-						}
-
-					}
-
-				} else {
-					//fmt.Println(v)
-					where += " " + ObjToStr(v)
-				}
-
-				break
-			}
-		}
-
-	}
-
-	return where, res
-
-}
-
-func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
-	where := ""
-	res := make([]interface{}, 0)
-	length := len(k)
-	if length > 4 {
-		def := false
-
-		switch Substr(k, length-3, 3) {
-		case "[>]":
-			k = strings.Replace(k, "[>]", "", -1)
-			where += "`" + k + "`>? "
-			res = append(res, v)
-		case "[<]":
-			k = strings.Replace(k, "[<]", "", -1)
-			where += "`" + k + "`<? "
-			res = append(res, v)
-		case "[!]":
-			k = strings.Replace(k, "[!]", "", -1)
-			where, res = this.notIn(k, v, where, res)
-		case "[#]":
-			k = strings.Replace(k, "[#]", "", -1)
-			where += " " + k + "=" + ObjToStr(v)
-		case "[#!]":
-			k = strings.Replace(k, "[#!]", "", -1)
-			where += " " + k + "!=" + ObjToStr(v)
-		case "[!#]":
-			k = strings.Replace(k, "[!#]", "", -1)
-			where += " " + k + "!=" + ObjToStr(v)
-		case "[~]":
-			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
-			v = "%" + ObjToStr(v) + "%"
-			res = append(res, v)
-		case "[!~]": //左边任意
-			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
-			v = "%" + ObjToStr(v)
-			res = append(res, v)
-		case "[~!]": //右边任意
-			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
-			v = ObjToStr(v) + "%"
-			res = append(res, v)
-		case "[~~]": //手动任意
-			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
-			//v = ObjToStr(v)
-			res = append(res, v)
-		default:
-			def = true
-
-		}
-		if def {
-			switch Substr(k, length-4, 4) {
-			case "[>=]":
-				k = strings.Replace(k, "[>=]", "", -1)
-				where += "`" + k + "`>=? "
-				res = append(res, v)
-			case "[<=]":
-				k = strings.Replace(k, "[<=]", "", -1)
-				where += "`" + k + "`<=? "
-				res = append(res, v)
-			case "[><]":
-				k = strings.Replace(k, "[><]", "", -1)
-				where += "`" + k + "` NOT BETWEEN ? AND ? "
-				res = append(res, v.(Slice)[0])
-				res = append(res, v.(Slice)[1])
-			case "[<>]":
-				k = strings.Replace(k, "[<>]", "", -1)
-				where += "`" + k + "` BETWEEN ? AND ? "
-				res = append(res, v.(Slice)[0])
-				res = append(res, v.(Slice)[1])
-			default:
-				if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
-					where += "`" + k + "` IN ("
-					res = append(res, (v.(Slice))...)
-					if len(v.(Slice)) == 0 {
-						where += ") "
-					} else {
-						for i := 0; i < len(v.(Slice)); i++ {
-							if i+1 != len(v.(Slice)) {
-								where += "?,"
-							} else {
-								where += "?) "
-							}
-							//res=append(res,(v.(Slice))[i])
-						}
-					}
-
-				} else {
-					where += "`" + k + "`=? "
-					res = append(res, v)
-				}
-
-			}
-		}
-
-	} else if k == "[#]" {
-		k = strings.Replace(k, "[#]", "", -1)
-		where += " " + ObjToStr(v) + " "
-	} else {
-		//fmt.Println(reflect.ValueOf(v).Type().String())
-		if v == nil {
-			where += "`" + k + "` IS NULL"
-		} else if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
-
-			//fmt.Println(v)
-			where += "`" + k + "` IN ("
-			res = append(res, (v.(Slice))...)
-			for i := 0; i < len(v.(Slice)); i++ {
-				if i+1 != len(v.(Slice)) {
-					where += "?,"
-				} else {
-					where += "?) "
-				}
-				//res=append(res,(v.(Slice))[i])
-			}
-		} else if reflect.ValueOf(v).Type().String() == "[]interface {}" {
-			where += "`" + k + "` IN ("
-			res = append(res, (v.([]interface{}))...)
-			for i := 0; i < len(v.([]interface{})); i++ {
-				if i+1 != len(v.([]interface{})) {
-					where += "?,"
-				} else {
-					where += "?) "
-				}
-				//res=append(res,(v.(Slice))[i])
-			}
-		} else {
-
-			where += "`" + k + "`=? "
-			res = append(res, v)
-
-		}
-	}
-
-	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})
-func (this *HoTimeDB) notIn(k string, v interface{}, where string, res []interface{}) (string, []interface{}) {
-	//where:=""
-	//fmt.Println(reflect.ValueOf(v).Type().String())
-	if v == nil {
-
-		where += "`" + k + "` IS NOT NULL "
-
-	} else if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
-		where += "`" + k + "` NOT IN ("
-		res = append(res, (v.(Slice))...)
-		for i := 0; i < len(v.(Slice)); i++ {
-			if i+1 != len(v.(Slice)) {
-				where += "?,"
-			} else {
-				where += "?) "
-			}
-			//res=append(res,(v.(Slice))[i])
-		}
-	} else if reflect.ValueOf(v).Type().String() == "[]interface {}" {
-		where += "`" + k + "` NOT IN ("
-		res = append(res, (v.([]interface{}))...)
-		for i := 0; i < len(v.([]interface{})); i++ {
-			if i+1 != len(v.([]interface{})) {
-				where += "?,"
-			} else {
-				where += "?) "
-			}
-			//res=append(res,(v.(Slice))[i])
-		}
-	} else {
-
-		where += "`" + k + "` !=? "
-		res = append(res, v)
-
-	}
-
-	return where, res
-}
-
-func (this *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {
-	where := " "
-	res := make([]interface{}, 0)
-	lens := len(data)
-	//fmt.Println(lens)
-	for k, v := range data {
-		x := 0
-		for i := 0; i < len(condition); i++ {
-
-			if condition[i] == k {
-
-				tw, ts := this.cond(k, v.(Map))
-				if lens--; lens <= 0 {
-					//fmt.Println(lens)
-					where += "(" + tw + ") "
-				} else {
-					where += "(" + tw + ") " + tag + " "
-				}
-
-				res = append(res, ts...)
-				break
-			}
-			x++
-		}
-
-		if x == len(condition) {
-
-			tv, vv := this.varCond(k, v)
-
-			res = append(res, vv...)
-			if lens--; lens <= 0 {
-				where += tv + ""
-			} else {
-				where += tv + " " + tag + " "
-			}
-		}
-
-	}
-
-	return where, res
-}
-
-//更新数据
-func (this *HoTimeDB) Update(table string, data Map, where Map) int64 {
-
-	query := "UPDATE " + table + " SET "
-	//UPDATE Person SET Address = 'Zhongshan 23', City = 'Nanjing' WHERE LastName = 'Wilson'
-	qs := make([]interface{}, 0)
-	tp := len(data)
-
-	for k, v := range data {
-		vstr := "?"
-		if Substr(k, len(k)-3, 3) == "[#]" {
-			k = strings.Replace(k, "[#]", "", -1)
-
-			vstr = ObjToStr(v)
-		} else {
-			qs = append(qs, v)
-		}
-		query += "`" + k + "`=" + vstr + ""
-		if tp--; tp != 0 {
-			query += ", "
-		}
-	}
-
-	temp, resWhere := this.where(where)
-	//fmt.Println(resWhere)
-
-	query += temp
-	qs = append(qs, resWhere...)
-
-	res, err := this.Exec(query, qs...)
-
-	rows := int64(0)
-	if err.GetError() == nil && res != nil {
-		rows, _ = res.RowsAffected()
-	}
-
-	//如果更新成功，则删除缓存
-	if rows != 0 {
-		if this.DBCached && this.CacheIns != nil {
-			this.Cache(table+"*", nil)
-		}
-	}
-
-	return rows
-}
-
-func (this *HoTimeDB) Delete(table string, data map[string]interface{}) int64 {
-
-	query := "DELETE FROM " + table + " "
-
-	temp, resWhere := this.where(data)
-	query += temp
-
-	res, err := this.Exec(query, resWhere...)
-	rows := int64(0)
-	if err.GetError() == nil && res != nil {
-		rows, _ = res.RowsAffected()
-	}
-
-	//如果删除成功,删除对应缓存
-	if rows != 0 {
-		if this.DBCached && this.CacheIns != nil {
-			this.Cache(table+"*", nil)
-		}
-	}
-	//return 0
-
-	return rows
-}
-
-//插入新数据
-func (this *HoTimeDB) Insert(table string, data map[string]interface{}) int64 {
-
-	values := make([]interface{}, 0)
-	queryString := " ("
-	valueString := " ("
-
-	lens := len(data)
-	tempLen := 0
-	for k, v := range data {
-		tempLen++
-		values = append(values, v)
-		if tempLen < lens {
-			queryString += "`" + k + "`,"
-			valueString += "?,"
-		} else {
-			queryString += "`" + k + "`) "
-			valueString += "?);"
-		}
-
-	}
-	query := "INSERT INTO " + table + queryString + "VALUES" + valueString
-
-	res, err := this.Exec(query, values...)
-
-	id := int64(0)
-	if err.GetError() == nil && res != nil {
-		id, this.LastErr.err = res.LastInsertId()
-
-	}
-
-	//如果插入成功，删除缓存
-	if id != 0 {
-		if this.DBCached && this.CacheIns != nil {
-			this.Cache(table+"*", nil)
-		}
-	}
-
-	//fmt.Println(id)
-	return id
-}
@@ -1,9 +1,13 @@
-package hotime
+package db

 import (
+	"../cache"
+	. "../common"
 	"database/sql"
 	"encoding/json"
 	"errors"
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/mattn/go-sqlite3"
 	"os"
 	"reflect"
 	"strings"
@@ -11,31 +15,38 @@ import (

 type HoTimeDB struct {
 	*sql.DB
-	contextBase
-	CacheIns
+	ContextBase
+	DBName string
+	*cache.HoTimeCache
 	Type        string
-	DBCached    bool
+	Prefix      string
 	LastQuery   string
 	LastData    []interface{}
-	ConnectFunc func(err ...*Error) *sql.DB
-	LastErr     Error
+	ConnectFunc func(err ...*Error) (*sql.DB, *sql.DB)
+	LastErr     *Error
 	limit       Slice
-	Tx          *sql.Tx //事务对象
+	*sql.Tx     //事务对象
+	SlaveDB     *sql.DB
+}
+
+// SetConnect 设置数据库配置连接
+func (that *HoTimeDB) SetConnect(connect func(err ...*Error) (master, slave *sql.DB), err ...*Error) {
+	that.ConnectFunc = connect
+	_ = that.InitDb(err...)

 }

-//设置数据库配置连接
-func (this *HoTimeDB) SetConnect(connect func(err ...*Error) *sql.DB, err ...*Error) {
-	this.ConnectFunc = connect
-	this.InitDb()
+// GetType 设置数据库配置连接
+func (that *HoTimeDB) GetType() string {
+	return that.Type
 }

-//事务，如果action返回true则执行成功；false则回滚
-func (this *HoTimeDB) Action(action func(db HoTimeDB) bool) bool {
-	db := HoTimeDB{DB: this.DB, CacheIns: this.CacheIns, DBCached: this.DBCached}
+// Action 事务，如果action返回true则执行成功；false则回滚
+func (that *HoTimeDB) Action(action func(db HoTimeDB) bool) bool {
+	db := HoTimeDB{DB: that.DB, HoTimeCache: that.HoTimeCache, Prefix: that.Prefix}
 	tx, err := db.Begin()
 	if err != nil {
-		this.LastErr.SetError(err)
+		that.LastErr.SetError(err)
 		return false
 	}

@@ -44,62 +55,74 @@ func (this *HoTimeDB) Action(action func(db HoTimeDB) bool) bool {
 	result := action(db)

 	if !result {
-		db.Tx.Rollback()
+		err = db.Tx.Rollback()
+		if err != nil {
+			that.LastErr.SetError(err)
+			return false
+		}
 		return result
 	}
-	db.Tx.Commit()
+	err = db.Tx.Commit()
+	if err != nil {
+		that.LastErr.SetError(err)
+		return false
+	}
 	return result
 }

-func (this *HoTimeDB) InitDb(err ...*Error) Error {
+func (that *HoTimeDB) InitDb(err ...*Error) *Error {
 	if len(err) != 0 {
-		this.LastErr = *(err[0])
+		that.LastErr = err[0]
 	}
-	this.DB = this.ConnectFunc(&this.LastErr)
-	if this.DB == nil {
-
-		return this.LastErr
+	that.DB, that.SlaveDB = that.ConnectFunc(that.LastErr)
+	if that.DB == nil {
+		return that.LastErr
 	}
-	e := this.DB.Ping()
+	e := that.DB.Ping()

-	this.LastErr.SetError(e)
+	that.LastErr.SetError(e)

-	return this.LastErr
+	if that.SlaveDB != nil {
+		e := that.SlaveDB.Ping()
+		that.LastErr.SetError(e)
+	}
+
+	return that.LastErr
 }

-func (this *HoTimeDB) Page(page, pageRow int) *HoTimeDB {
+func (that *HoTimeDB) Page(page, pageRow int) *HoTimeDB {
 	page = (page - 1) * pageRow
 	if page < 0 {
 		page = 1
 	}

-	this.limit = Slice{page, pageRow}
-	return this
+	that.limit = Slice{page, pageRow}
+	return that
 }

-func (this *HoTimeDB) PageSelect(table string, qu ...interface{}) []Map {
+func (that *HoTimeDB) PageSelect(table string, qu ...interface{}) []Map {

 	if len(qu) == 1 {
-		qu = append(qu, Map{"LIMIT": this.limit})
+		qu = append(qu, Map{"LIMIT": that.limit})
 	}
 	if len(qu) == 2 {
-		temp := qu[1].(Map)
-		temp["LIMIT"] = this.limit
+		temp := DeepCopyMap(qu[1]).(Map)
+		temp["LIMIT"] = that.limit
 		qu[1] = temp
 	}
 	if len(qu) == 3 {
-		temp := qu[2].(Map)
-		temp["LIMIT"] = this.limit
+		temp := DeepCopyMap(qu[2]).(Map)
+		temp["LIMIT"] = that.limit
 		qu[2] = temp
 	}
 	//fmt.Println(qu)
-	data := this.Select(table, qu...)
+	data := that.Select(table, qu...)

 	return data
 }

-//数据库数据解析
-func (this *HoTimeDB) Row(resl *sql.Rows) []Map {
+// Row 数据库数据解析
+func (that *HoTimeDB) Row(resl *sql.Rows) []Map {
 	dest := make([]Map, 0)
 	strs, _ := resl.Columns()

@@ -111,22 +134,27 @@ func (this *HoTimeDB) Row(resl *sql.Rows) []Map {
 		for j := 0; j < len(a); j++ {
 			b[j] = &a[j]
 		}
-		resl.Scan(b...)
+		err := resl.Scan(b...)
+		if err != nil {
+			that.LastErr.SetError(err)
+			return nil
+		}
 		for j := 0; j < len(a); j++ {
+			//fmt.Println(reflect.ValueOf(a[j]).Type().String() )
 			if a[j] != nil && reflect.ValueOf(a[j]).Type().String() == "[]uint8" {
 				lis[strs[j]] = string(a[j].([]byte))
 			} else {
-				lis[strs[j]] = a[j]
+				lis[strs[j]] = a[j] //取实际类型
 			}

 		}
 		//防止int被误读为float64
-		jlis, e := json.Marshal(lis)
-		if e != nil {
-			this.LastErr.SetError(e)
-		} else {
-			lis.JsonToMap(string(jlis), &this.LastErr)
-		}
+		//jlis, e := json.Marshal(lis)
+		//if e != nil {
+		//	that.LastErr.SetError(e)
+		//} else {
+		//	lis.JsonToMap(string(jlis), that.LastErr)
+		//}

 		dest = append(dest, lis)

@@ -190,25 +218,25 @@ func (this *HoTimeDB) Row(resl *sql.Rows) []Map {
 //
 //}

-func (this *HoTimeDB) backupSave(path string, tt string, code int) {
+func (that *HoTimeDB) backupSave(path string, tt string, code int) {
 	fd, _ := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
 	defer fd.Close()

 	str := "\r\n"
 	if code == 0 || code == 2 {
-		str += this.backupDdl(tt)
+		str += that.backupDdl(tt)
 	}

 	if code == 0 || code == 1 {
 		str += "insert  into `" + tt + "`\r\n\r\n("
-		str += this.backupCol(tt)
+		str += that.backupCol(tt)
 	}

-	fd.Write([]byte(str))
+	_, _ = fd.Write([]byte(str))
 }
-func (this *HoTimeDB) backupDdl(tt string) string {
+func (that *HoTimeDB) backupDdl(tt string) string {

-	data := this.Query("show create table " + tt)
+	data := that.Query("show create table " + tt)
 	if len(data) == 0 {
 		return ""
 	}
@@ -216,9 +244,9 @@ func (this *HoTimeDB) backupDdl(tt string) string {
 	return ObjToStr(data[0]["Create Table"]) + ";\r\n\r\n"
 }

-func (this *HoTimeDB) backupCol(tt string) string {
+func (that *HoTimeDB) backupCol(tt string) string {
 	str := ""
-	data := this.Select(tt, "*")
+	data := that.Select(tt, "*")

 	lthData := len(data)

@@ -228,7 +256,7 @@ func (this *HoTimeDB) backupCol(tt string) string {
 	lthCol := len(data[0])
 	col := make([]string, lthCol)
 	tempLthData := 0
-	for k, _ := range data[0] {
+	for k := range data[0] {

 		if tempLthData == lthCol-1 {
 			str += "`" + k + "`)"
@@ -270,84 +298,89 @@ func (this *HoTimeDB) backupCol(tt string) string {
 	return str
 }

-func (this *HoTimeDB) md5(query string, args ...interface{}) string {
+func (that *HoTimeDB) md5(query string, args ...interface{}) string {
 	strByte, _ := json.Marshal(args)
 	str := Md5(query + ":" + string(strByte))
 	return str
 }

-func (this *HoTimeDB) Query(query string, args ...interface{}) []Map {
+func (that *HoTimeDB) Query(query string, args ...interface{}) []Map {

 	//fmt.Println(query)
 	var err error
 	var resl *sql.Rows

-	this.LastQuery = query
-	this.LastData = args
+	that.LastQuery = query
+	that.LastData = args
+	//主从数据库切换，只有select语句有从数据库
+	db := that.DB
+	if that.SlaveDB != nil {
+		db = that.SlaveDB
+	}

-	if this.DB == nil {
+	if db == nil {
 		err = errors.New("没有初始化数据库")
-		this.LastErr.SetError(err)
+		that.LastErr.SetError(err)
 		return nil
 	}

-	if this.Tx != nil {
-		resl, err = this.Tx.Query(query, args...)
+	if that.Tx != nil {
+		resl, err = that.Tx.Query(query, args...)
 	} else {
-		resl, err = this.DB.Query(query, args...)
+		resl, err = db.Query(query, args...)
 	}

-	this.LastErr.SetError(err)
+	that.LastErr.SetError(err)
 	if err != nil {
-		if err = this.DB.Ping(); err != nil {
-			this.LastErr.SetError(err)
-			this.InitDb()
-			if this.LastErr.GetError() != nil {
+		if err = db.Ping(); err != nil {
+			that.LastErr.SetError(err)
+			_ = that.InitDb()
+			if that.LastErr.GetError() != nil {
 				return nil
 			}
-			return this.Query(query, args...)
+			return that.Query(query, args...)
 		}
 		return nil
 	}

-	return this.Row(resl)
+	return that.Row(resl)
 }

-func (this *HoTimeDB) Exec(query string, args ...interface{}) (sql.Result, Error) {
+func (that *HoTimeDB) Exec(query string, args ...interface{}) (sql.Result, *Error) {

-	this.LastQuery = query
-	this.LastData = args
+	that.LastQuery = query
+	that.LastData = args
 	var e error
 	var resl sql.Result

-	if this.DB == nil {
+	if that.DB == nil {
 		err := errors.New("没有初始化数据库")
-		this.LastErr.SetError(err)
-		return nil, this.LastErr
+		that.LastErr.SetError(err)
+		return nil, that.LastErr
 	}

-	if this.Tx != nil {
-		resl, e = this.Tx.Exec(query, args...)
+	if that.Tx != nil {
+		resl, e = that.Tx.Exec(query, args...)
 	} else {
-		resl, e = this.DB.Exec(query, args...)
+		resl, e = that.DB.Exec(query, args...)
 	}

-	this.LastErr.SetError(e)
+	that.LastErr.SetError(e)

 	//判断是否连接断开了
 	if e != nil {

-		if e = this.DB.Ping(); e != nil {
-			this.LastErr.SetError(e)
-			this.InitDb()
-			if this.LastErr.GetError() != nil {
-				return resl, this.LastErr
+		if e = that.DB.Ping(); e != nil {
+			that.LastErr.SetError(e)
+			_ = that.InitDb()
+			if that.LastErr.GetError() != nil {
+				return resl, that.LastErr
 			}
-			return this.Exec(query, args...)
+			return that.Exec(query, args...)
 		}
 	}

-	return resl, this.LastErr
+	return resl, that.LastErr
 }

 //func (this *HoTimeDB)copy(data []Map)[]Map{
@@ -368,7 +401,8 @@ func (this *HoTimeDB) Exec(query string, args ...interface{}) (sql.Result, Error
 //	return res
 //
 //}
-func (this *HoTimeDB) Select(table string, qu ...interface{}) []Map {
+
+func (that *HoTimeDB) Select(table string, qu ...interface{}) []Map {

 	query := "SELECT"
 	where := Map{}
@@ -406,8 +440,11 @@ func (this *HoTimeDB) Select(table string, qu ...interface{}) []Map {
 	} else {
 		query += " *"
 	}
-
-	query += " FROM " + table
+	if !strings.Contains(table, ".") && !strings.Contains(table, " AS ") {
+		query += " FROM `" + that.Prefix + table + "`"
+	} else {
+		query += " FROM " + that.Prefix + table
+	}

 	if join {
 		for k, v := range qu[0].(Map) {
@@ -430,39 +467,39 @@ func (this *HoTimeDB) Select(table string, qu ...interface{}) []Map {
 		where = qu[intWhere].(Map)
 	}

-	temp, resWhere := this.where(where)
+	temp, resWhere := that.where(where)

 	query += temp
 	qs = append(qs, resWhere...)
-	md5 := this.md5(query, qs...)
+	md5 := that.md5(query, qs...)

-	if this.DBCached && this.CacheIns != nil {
+	if that.HoTimeCache != nil && table != "cached" {
 		//如果缓存有则从缓存取
-		cacheData := this.Cache(table + ":" + md5)
+		cacheData := that.HoTimeCache.Db(table + ":" + md5)

-		if cacheData.Data != nil {
+		if cacheData != nil && cacheData.Data != nil {
 			return cacheData.ToMapArray()
 		}
 	}

 	//无缓存则数据库取
-	res := this.Query(query, qs...)
+	res := that.Query(query, qs...)

 	if res == nil {
 		res = []Map{}
 	}

 	//缓存
-	if this.DBCached && this.CacheIns != nil {
+	if that.HoTimeCache != nil && table != "cached" {

-		this.Cache(table+":"+md5, res)
+		_ = that.HoTimeCache.Db(table+":"+md5, res)
 	}

 	return res

 }

-func (this *HoTimeDB) Get(table string, qu ...interface{}) Map {
+func (that *HoTimeDB) Get(table string, qu ...interface{}) Map {
 	//fmt.Println(qu)
 	if len(qu) == 1 {
 		qu = append(qu, Map{"LIMIT": 1})
@@ -478,19 +515,19 @@ func (this *HoTimeDB) Get(table string, qu ...interface{}) Map {
 		qu[2] = temp
 	}
 	//fmt.Println(qu)
-	data := this.Select(table, qu...)
+	data := that.Select(table, qu...)
 	if len(data) == 0 {
 		return nil
 	}
 	return data[0]
 }
+func (that *HoTimeDB) GetPrefix() string {
+	return that.Prefix
+}

-/**
-** 计数
- */
-func (this *HoTimeDB) Count(table string, qu ...interface{}) int {
-	req := []interface{}{}
-
+// Count 计数
+func (that *HoTimeDB) Count(table string, qu ...interface{}) int {
+	var req = []interface{}{}
 	if len(qu) == 2 {
 		req = append(req, qu[0])
 		req = append(req, "COUNT(*)")
@@ -501,7 +538,7 @@ func (this *HoTimeDB) Count(table string, qu ...interface{}) int {
 	}

 	//req=append(req,qu...)
-	data := this.Select(table, req...)
+	data := that.Select(table, req...)
 	//fmt.Println(data)
 	if len(data) == 0 {
 		return 0
@@ -517,7 +554,7 @@ var condition = []string{"AND", "OR"}
 var vcond = []string{"GROUP", "ORDER", "LIMIT"}

 //where语句解析
-func (this *HoTimeDB) where(data Map) (string, []interface{}) {
+func (that *HoTimeDB) where(data Map) (string, []interface{}) {

 	where := ""

@@ -529,7 +566,7 @@ func (this *HoTimeDB) where(data Map) (string, []interface{}) {

 			if condition[i] == k {

-				tw, ts := this.cond(k, v.(Map))
+				tw, ts := that.cond(k, v.(Map))

 				where += tw
 				res = append(res, ts...)
@@ -547,7 +584,16 @@ func (this *HoTimeDB) where(data Map) (string, []interface{}) {
 			y++
 		}
 		if x == len(condition) && y == len(vcond) {
-			tv, vv := this.varCond(k, v)
+
+			if v != nil && reflect.ValueOf(v).Type().String() == "common.Slice" && len(v.(Slice)) == 0 {
+				continue
+			}
+
+			if v != nil && reflect.ValueOf(v).Type().String() == "[]interface {}" && len(v.([]interface{})) == 0 {
+				continue
+			}
+
+			tv, vv := that.varCond(k, v)

 			where += tv
 			res = append(res, vv...)
@@ -576,7 +622,7 @@ func (this *HoTimeDB) where(data Map) (string, []interface{}) {
 					where += " " + k
 				}

-				if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
+				if reflect.ValueOf(v).Type().String() == "common.Slice" {
 					for i := 0; i < len(v.(Slice)); i++ {
 						where += " " + ObjToStr(v.(Slice)[i])

@@ -601,52 +647,86 @@ func (this *HoTimeDB) where(data Map) (string, []interface{}) {

 }

-func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
+func (that *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
+
 	where := ""
 	res := make([]interface{}, 0)
 	length := len(k)
-	if length > 4 {
+	if k == "[#]" {
+		k = strings.Replace(k, "[#]", "", -1)
+		where += " " + ObjToStr(v) + " "
+	} else if length > 0 && strings.Contains(k, "[") && k[length-1] == ']' {
 		def := false

 		switch Substr(k, length-3, 3) {
 		case "[>]":
 			k = strings.Replace(k, "[>]", "", -1)
-			where += "`" + k + "`>? "
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where += k + ">? "
 			res = append(res, v)
 		case "[<]":
 			k = strings.Replace(k, "[<]", "", -1)
-			where += "`" + k + "`<? "
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where += k + "<? "
 			res = append(res, v)
 		case "[!]":
 			k = strings.Replace(k, "[!]", "", -1)
-			where, res = this.notIn(k, v, where, res)
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where, res = that.notIn(k, v, where, res)
 		case "[#]":
 			k = strings.Replace(k, "[#]", "", -1)
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
 			where += " " + k + "=" + ObjToStr(v)
 		case "[#!]":
 			k = strings.Replace(k, "[#!]", "", -1)
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
 			where += " " + k + "!=" + ObjToStr(v)
 		case "[!#]":
 			k = strings.Replace(k, "[!#]", "", -1)
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
 			where += " " + k + "!=" + ObjToStr(v)
 		case "[~]":
 			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where += k + " LIKE ? "
 			v = "%" + ObjToStr(v) + "%"
 			res = append(res, v)
 		case "[!~]": //左边任意
 			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where += k + " LIKE ? "
 			v = "%" + ObjToStr(v)
 			res = append(res, v)
 		case "[~!]": //右边任意
 			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where += k + " LIKE ? "
 			v = ObjToStr(v) + "%"
 			res = append(res, v)
 		case "[~~]": //手动任意
 			k = strings.Replace(k, "[~]", "", -1)
-			where += "`" + k + "` LIKE ? "
+			if !strings.Contains(k, ".") {
+				k = "`" + k + "`"
+			}
+			where += k + " LIKE ? "
 			//v = ObjToStr(v)
 			res = append(res, v)
 		default:
@@ -657,26 +737,41 @@ func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 			switch Substr(k, length-4, 4) {
 			case "[>=]":
 				k = strings.Replace(k, "[>=]", "", -1)
-				where += "`" + k + "`>=? "
+				if !strings.Contains(k, ".") {
+					k = "`" + k + "`"
+				}
+				where += k + ">=? "
 				res = append(res, v)
 			case "[<=]":
 				k = strings.Replace(k, "[<=]", "", -1)
-				where += "`" + k + "`<=? "
+				if !strings.Contains(k, ".") {
+					k = "`" + k + "`"
+				}
+				where += k + "<=? "
 				res = append(res, v)
 			case "[><]":
 				k = strings.Replace(k, "[><]", "", -1)
-				where += "`" + k + "` NOT BETWEEN ? AND ? "
+				if !strings.Contains(k, ".") {
+					k = "`" + k + "`"
+				}
+				where += k + " NOT BETWEEN ? AND ? "
 				res = append(res, v.(Slice)[0])
 				res = append(res, v.(Slice)[1])
 			case "[<>]":
 				k = strings.Replace(k, "[<>]", "", -1)
-				where += "`" + k + "` BETWEEN ? AND ? "
+				if !strings.Contains(k, ".") {
+					k = "`" + k + "`"
+				}
+				where += k + " BETWEEN ? AND ? "
 				res = append(res, v.(Slice)[0])
 				res = append(res, v.(Slice)[1])
 			default:
-				if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
-					where += "`" + k + "` IN ("
-					res = append(res, (v.(Slice))...)
+				if !strings.Contains(k, ".") {
+					k = "`" + k + "`"
+				}
+				if reflect.ValueOf(v).Type().String() == "common.Slice" {
+					where += k + " IN ("
+					res = append(res, v.(Slice)...)
 					if len(v.(Slice)) == 0 {
 						where += ") "
 					} else {
@@ -691,25 +786,25 @@ func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 					}

 				} else {
-					where += "`" + k + "`=? "
+					where += k + "=? "
 					res = append(res, v)
 				}

 			}
 		}

-	} else if k == "[#]" {
-		k = strings.Replace(k, "[#]", "", -1)
-		where += " " + ObjToStr(v) + " "
 	} else {
 		//fmt.Println(reflect.ValueOf(v).Type().String())
+		if !strings.Contains(k, ".") {
+			k = "`" + k + "`"
+		}
 		if v == nil {
-			where += "`" + k + "` IS NULL"
-		} else if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
+			where += k + " IS NULL"
+		} else if reflect.ValueOf(v).Type().String() == "common.Slice" {

 			//fmt.Println(v)
-			where += "`" + k + "` IN ("
-			res = append(res, (v.(Slice))...)
+			where += k + " IN ("
+			res = append(res, v.(Slice)...)
 			for i := 0; i < len(v.(Slice)); i++ {
 				if i+1 != len(v.(Slice)) {
 					where += "?,"
@@ -719,8 +814,9 @@ func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 				//res=append(res,(v.(Slice))[i])
 			}
 		} else if reflect.ValueOf(v).Type().String() == "[]interface {}" {
-			where += "`" + k + "` IN ("
-			res = append(res, (v.([]interface{}))...)
+
+			where += k + " IN ("
+			res = append(res, v.([]interface{})...)
 			for i := 0; i < len(v.([]interface{})); i++ {
 				if i+1 != len(v.([]interface{})) {
 					where += "?,"
@@ -731,7 +827,7 @@ func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 			}
 		} else {

-			where += "`" + k + "`=? "
+			where += k + "=? "
 			res = append(res, v)

 		}
@@ -741,16 +837,16 @@ func (this *HoTimeDB) varCond(k string, v interface{}) (string, []interface{}) {
 }

 //	this.Db.Update("user",hotime.Map{"ustate":"1"},hotime.Map{"AND":hotime.Map{"OR":hotime.Map{"uid":4,"uname":"dasda"}},"ustate":1})
-func (this *HoTimeDB) notIn(k string, v interface{}, where string, res []interface{}) (string, []interface{}) {
+func (that *HoTimeDB) notIn(k string, v interface{}, where string, res []interface{}) (string, []interface{}) {
 	//where:=""
 	//fmt.Println(reflect.ValueOf(v).Type().String())
 	if v == nil {

-		where += "`" + k + "` IS NOT NULL "
+		where += k + " IS NOT NULL "

-	} else if reflect.ValueOf(v).Type().String() == "hotime.Slice" {
-		where += "`" + k + "` NOT IN ("
-		res = append(res, (v.(Slice))...)
+	} else if reflect.ValueOf(v).Type().String() == "common.Slice" {
+		where += k + " NOT IN ("
+		res = append(res, v.(Slice)...)
 		for i := 0; i < len(v.(Slice)); i++ {
 			if i+1 != len(v.(Slice)) {
 				where += "?,"
@@ -760,8 +856,8 @@ func (this *HoTimeDB) notIn(k string, v interface{}, where string, res []interfa
 			//res=append(res,(v.(Slice))[i])
 		}
 	} else if reflect.ValueOf(v).Type().String() == "[]interface {}" {
-		where += "`" + k + "` NOT IN ("
-		res = append(res, (v.([]interface{}))...)
+		where += k + " NOT IN ("
+		res = append(res, v.([]interface{})...)
 		for i := 0; i < len(v.([]interface{})); i++ {
 			if i+1 != len(v.([]interface{})) {
 				where += "?,"
@@ -772,7 +868,7 @@ func (this *HoTimeDB) notIn(k string, v interface{}, where string, res []interfa
 		}
 	} else {

-		where += "`" + k + "` !=? "
+		where += k + " !=? "
 		res = append(res, v)

 	}
@@ -780,7 +876,7 @@ func (this *HoTimeDB) notIn(k string, v interface{}, where string, res []interfa
 	return where, res
 }

-func (this *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {
+func (that *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {
 	where := " "
 	res := make([]interface{}, 0)
 	lens := len(data)
@@ -791,7 +887,7 @@ func (this *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {

 			if condition[i] == k {

-				tw, ts := this.cond(k, v.(Map))
+				tw, ts := that.cond(k, v.(Map))
 				if lens--; lens <= 0 {
 					//fmt.Println(lens)
 					where += "(" + tw + ") "
@@ -807,7 +903,7 @@ func (this *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {

 		if x == len(condition) {

-			tv, vv := this.varCond(k, v)
+			tv, vv := that.varCond(k, v)

 			res = append(res, vv...)
 			if lens--; lens <= 0 {
@@ -822,10 +918,10 @@ func (this *HoTimeDB) cond(tag string, data Map) (string, []interface{}) {
 	return where, res
 }

-//更新数据
-func (this *HoTimeDB) Update(table string, data Map, where Map) int64 {
+// Update 更新数据
+func (that *HoTimeDB) Update(table string, data Map, where Map) int64 {

-	query := "UPDATE " + table + " SET "
+	query := "UPDATE `" + that.Prefix + table + "` SET "
 	//UPDATE Person SET Address = 'Zhongshan 23', City = 'Nanjing' WHERE LastName = 'Wilson'
 	qs := make([]interface{}, 0)
 	tp := len(data)
@@ -845,13 +941,13 @@ func (this *HoTimeDB) Update(table string, data Map, where Map) int64 {
 		}
 	}

-	temp, resWhere := this.where(where)
+	temp, resWhere := that.where(where)
 	//fmt.Println(resWhere)

 	query += temp
 	qs = append(qs, resWhere...)

-	res, err := this.Exec(query, qs...)
+	res, err := that.Exec(query, qs...)

 	rows := int64(0)
 	if err.GetError() == nil && res != nil {
@@ -860,22 +956,22 @@ func (this *HoTimeDB) Update(table string, data Map, where Map) int64 {

 	//如果更新成功，则删除缓存
 	if rows != 0 {
-		if this.DBCached && this.CacheIns != nil {
-			this.Cache(table+"*", nil)
+		if that.HoTimeCache != nil && table != "cached" {
+			_ = that.HoTimeCache.Db(table+"*", nil)
 		}
 	}

 	return rows
 }

-func (this *HoTimeDB) Delete(table string, data map[string]interface{}) int64 {
+func (that *HoTimeDB) Delete(table string, data map[string]interface{}) int64 {

-	query := "DELETE FROM " + table + " "
+	query := "DELETE FROM " + that.Prefix + table + " "

-	temp, resWhere := this.where(data)
+	temp, resWhere := that.where(data)
 	query += temp

-	res, err := this.Exec(query, resWhere...)
+	res, err := that.Exec(query, resWhere...)
 	rows := int64(0)
 	if err.GetError() == nil && res != nil {
 		rows, _ = res.RowsAffected()
@@ -883,8 +979,8 @@ func (this *HoTimeDB) Delete(table string, data map[string]interface{}) int64 {

 	//如果删除成功,删除对应缓存
 	if rows != 0 {
-		if this.DBCached && this.CacheIns != nil {
-			this.Cache(table+"*", nil)
+		if that.HoTimeCache != nil && table != "cached" {
+			_ = that.HoTimeCache.Db(table+"*", nil)
 		}
 	}
 	//return 0
@@ -892,8 +988,8 @@ func (this *HoTimeDB) Delete(table string, data map[string]interface{}) int64 {
 	return rows
 }

-//插入新数据
-func (this *HoTimeDB) Insert(table string, data map[string]interface{}) int64 {
+// Insert 插入新数据
+func (that *HoTimeDB) Insert(table string, data map[string]interface{}) int64 {

 	values := make([]interface{}, 0)
 	queryString := " ("
@@ -913,20 +1009,21 @@ func (this *HoTimeDB) Insert(table string, data map[string]interface{}) int64 {
 		}

 	}
-	query := "INSERT INTO " + table + queryString + "VALUES" + valueString
+	query := "INSERT INTO `" + that.Prefix + table + "` " + queryString + "VALUES" + valueString

-	res, err := this.Exec(query, values...)
+	res, err := that.Exec(query, values...)

 	id := int64(0)
 	if err.GetError() == nil && res != nil {
-		id, this.LastErr.err = res.LastInsertId()
-
+		id1, err := res.LastInsertId()
+		that.LastErr.SetError(err)
+		id = id1
 	}

 	//如果插入成功，删除缓存
 	if id != 0 {
-		if this.DBCached && this.CacheIns != nil {
-			this.Cache(table+"*", nil)
+		if that.HoTimeCache != nil && table != "cached" {
+			_ = that.HoTimeCache.Db(table+"*", nil)
 		}
 	}

@@ -18,8 +18,8 @@ type DDY struct {

 func (this *DDY) Init(apikey string) {
 	this.ApiKey = apikey
-	this.YzmUrl = "https://api.dingdongcloud.com/v2/sms/single_send"
-	this.TzUrl = "https://api.dingdongcloud.com/v1/sms/notice/multi_send"
+	this.YzmUrl = "https://api.dingdongcloud.com/v2/sms/captcha/send.json"
+	this.TzUrl = "https://api.dingdongcloud.com/v2/sms/notice/send.json"
 }

 //发送短信验证码 code验证码如：123456 返回true表示发送成功flase表示发送失败
@@ -34,7 +34,7 @@ func (this *DDY) SendYZM(umoblie string, tpt string, data map[string]string) (bo
 //发送通知
 func (this *DDY) SendTz(umoblie []string, tpt string, data map[string]string) (bool, error) {
 	for k, v := range data {
-		tpt = strings.Replace(tpt, "["+k+"]", v, -1)
+		tpt = strings.Replace(tpt, "{"+k+"}", v, -1)
 	}
 	umobleStr := ""
 	for i, v := range umoblie {
@@ -89,3 +89,9 @@ func (this *DDY) httpsPostForm(url string, data url.Values) (string, error) {
 	return string(body), nil

 }
+
+var DefaultDDY DDY
+
+func init() {
+	DefaultDDY = DDY{}
+}
@@ -1,8 +1,8 @@
 package download

 import (
+	. "../../common"
 	"bytes"
-	"code.hoteas.com/golang/hotime"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -10,29 +10,30 @@ import (
 )

 //下载文件
-func Down(url, path, name string) bool {
+func Down(url, path, name string, e ...*Error) bool {

 	os.MkdirAll(path, os.ModeDir)
-	if hotime.Substr(path, len(path)-1, len(path)) != "/" {
+	if Substr(path, len(path)-1, len(path)) != "/" {
 		path = path + "/"
 	}
 	out, err := os.Create(path + name)
-	e := hotime.Error{}
-	if err != nil {
-		e.SetError(err)
+
+	if err != nil && e[0] != nil {
+		e[0].SetError(err)
 		return false
 	}
 	defer out.Close()
 	resp, err := http.Get(url)
-	if err != nil {
+	if err != nil && e[0] != nil {
+		e[0].SetError(err)
 		return false
 	}
 	defer resp.Body.Close()

 	pix, err := ioutil.ReadAll(resp.Body)
 	_, err = io.Copy(out, bytes.NewReader(pix))
-	if err != nil {
-		e.SetError(err)
+	if err != nil && e[0] != nil {
+		e[0].SetError(err)
 		return false
 	}
 	return true
@@ -0,0 +1,143 @@
+package rsa
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/asn1"
+	"encoding/pem"
+	"fmt"
+	"os"
+)
+
+func FileGet(path string) []byte {
+	file, err := os.Open(path)
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+	//读取文件的内容
+	info, _ := file.Stat()
+	buf := make([]byte, info.Size())
+	file.Read(buf)
+	return buf
+}
+
+//RSA加密
+// plainText 要加密的数据
+// path 公钥匙文件地址
+func RSA_Encrypt(plainText []byte, buf []byte) []byte {
+	//pem解码
+	block, _ := pem.Decode(buf)
+	//x509解码
+
+	publicKeyInterface, err := x509.ParsePKIXPublicKey(block.Bytes)
+	if err != nil {
+		panic(err)
+	}
+	//类型断言
+	publicKey := publicKeyInterface.(*rsa.PublicKey)
+	//对明文进行加密
+	cipherText, err := rsa.EncryptPKCS1v15(rand.Reader, publicKey, plainText)
+	if err != nil {
+		panic(err)
+	}
+	//返回密文
+	return cipherText
+}
+
+//RSA解密
+// cipherText 需要解密的byte数据
+// path 私钥文件路径
+func RSA_Decrypt(cipherText []byte, buf []byte) []byte {
+
+	//pem解码
+	block, _ := pem.Decode(buf)
+	//X509解码
+	private, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+
+	if err != nil {
+		panic(err)
+	}
+	//对密文进行解密
+	//plainText,_:=rsa.DecryptPKCS1v15(rand.Reader,privateKey,cipherText)
+
+	v, err := rsa.DecryptPKCS1v15(rand.Reader, private.(*rsa.PrivateKey), cipherText)
+	//返回明文
+	return v
+}
+func MarshalPKCS8PrivateKey(key *rsa.PrivateKey) []byte {
+	info := struct {
+		Version             int
+		PrivateKeyAlgorithm []asn1.ObjectIdentifier
+		PrivateKey          []byte
+	}{}
+	info.Version = 0
+	info.PrivateKeyAlgorithm = make([]asn1.ObjectIdentifier, 1)
+	info.PrivateKeyAlgorithm[0] = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 1}
+	info.PrivateKey = x509.MarshalPKCS1PrivateKey(key)
+
+	k, err := asn1.Marshal(info)
+	if err != nil {
+		panic(err.Error())
+	}
+	return k
+}
+
+func Demo() {
+	//生成密钥对，保存到文件
+	GenerateRSAKey(2048, "./")
+	//加密
+	data := []byte("hello world")
+	encrypt := RSA_Encrypt(data, FileGet("public.pem"))
+	fmt.Println(string(encrypt))
+
+	// 解密
+	decrypt := RSA_Decrypt(encrypt, FileGet("private.pem"))
+	fmt.Println(string(decrypt))
+}
+
+//生成RSA私钥和公钥，保存到文件中
+// bits 证书大小
+func GenerateRSAKey(bits int, path string) {
+	//GenerateKey函数使用随机数据生成器random生成一对具有指定字位数的RSA密钥
+	//Reader是一个全局、共享的密码用强随机数生成器
+	privateKey, err := rsa.GenerateKey(rand.Reader, bits)
+	if err != nil {
+		panic(err)
+	}
+	//保存私钥
+	//通过x509标准将得到的ras私钥序列化为ASN.1 的 DER编码字符串
+	X509PrivateKey := x509.MarshalPKCS1PrivateKey(privateKey)
+	//使用pem格式对x509输出的内容进行编码
+	//创建文件保存私钥
+	privateFile, err := os.Create(path + "private.pem")
+	if err != nil {
+		panic(err)
+	}
+	defer privateFile.Close()
+	//构建一个pem.Block结构体对象
+	privateBlock := pem.Block{Type: "RSA Private Key", Bytes: X509PrivateKey}
+	//将数据保存到文件
+	pem.Encode(privateFile, &privateBlock)
+
+	//保存公钥
+	//获取公钥的数据
+	publicKey := privateKey.PublicKey
+	//X509对公钥编码
+	X509PublicKey, err := x509.MarshalPKIXPublicKey(&publicKey)
+	if err != nil {
+		panic(err)
+	}
+	//pem格式编码
+	//创建用于保存公钥的文件
+	publicFile, err := os.Create(path + "public.pem")
+	if err != nil {
+		panic(err)
+	}
+	defer publicFile.Close()
+	//创建一个pem.Block结构体对象
+	publicBlock := pem.Block{Type: "RSA Public Key", Bytes: X509PublicKey}
+	//保存到文件
+	pem.Encode(publicFile, &publicBlock)
+}
@@ -0,0 +1,63 @@
+package tencent
+
+import (
+	"fmt"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
+	ocr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr/v20181119"
+)
+
+var credential = common.NewCredential(
+	"AKIDOgT8cKCQksnY7yKATaYO7j9ORJzSYohP",
+	"GNXgjdN4czA9ya0FNMApVJzTmsmU0KSN",
+)
+
+func OCR(base64Str string) string {
+
+	cpf := profile.NewClientProfile()
+	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
+	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+
+	request := ocr.NewGeneralAccurateOCRRequest()
+
+	//request.ImageUrl = common.StringPtr("https://img0.baidu.com/it/u=2041013181,3227632688&fm=26&fmt=auto")
+	request.ImageBase64 = common.StringPtr(base64Str)
+
+	response, err := client.GeneralAccurateOCR(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 Qrcode(base64Str string) string {
+
+	cpf := profile.NewClientProfile()
+	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
+	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+
+	request := ocr.NewQrcodeOCRRequest()
+
+	request.ImageBase64 = common.StringPtr(base64Str)
+
+	response, err := client.QrcodeOCR(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()
+}
@@ -1,7 +1,7 @@
 package upload

 import (
-	"code.hoteas.com/golang/hotime"
+	. "../../common"
 	"errors"
 	"io"
 	"mime/multipart"
@@ -50,7 +50,7 @@ func (this *Upload) UpFile(Request *http.Request, fieldName, savefilepath, saveP
 				}
 			}
 		}
-		filename := time.Unix(int64(t), 0).Format("2006-01-02-15-22-25") + hotime.ObjToStr(hotime.Rand(6))
+		filename := time.Unix(int64(t), 0).Format("2006-01-02-15-22-25") + ObjToStr(Rand(6))
 		filePath = path + "/" + filename + this.Path
 	} else {
 		filePath = savePath
@@ -1,25 +0,0 @@
-package hotime
-
-//框架层处理错误
-type Error struct {
-	error
-	err error
-}
-
-func (this *Error) GetError() error {
-
-	return this.error
-
-}
-
-func (this *Error) SetError(err error, loglevel ...int) {
-
-	this.error = nil
-	if err == nil {
-		this.error = err
-		this.err = err
-		return
-	}
-	this.error = err
-	return
-}
@@ -0,0 +1,53 @@
+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)
+	},
+}
@@ -0,0 +1,29 @@
+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
+}
@@ -0,0 +1,213 @@
+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})
+	},
+}
@@ -0,0 +1,188 @@
+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})
+	},
+}
@@ -0,0 +1,201 @@
+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)
+	},
+}
@@ -0,0 +1,96 @@
+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)
+	},
+}
@@ -0,0 +1,138 @@
+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})
+	},
+}
@@ -0,0 +1,146 @@
+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)
+
+	},
+}
@@ -0,0 +1,138 @@
+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})
+	},
+}
@@ -0,0 +1,33 @@
+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, "发送成功")
+	},
+}
@@ -0,0 +1,49 @@
+{
+	"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"
+}
@@ -0,0 +1,72 @@
+{
+	"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开启此功能"
+}
@@ -1,106 +1,31 @@
 package main

 import (
-	"code.hoteas.com/golang/hotime"
-	"code.hoteas.com/golang/hotime/tools/db"
+	"../../hotime"
+	"../dri/ddsms"
+	"./app"
 	"fmt"
-	//"go.hoteas.com/hotime/cache"
-	"golang.org/x/net/websocket"
 	"time"
-	//"go.hoteas.com/hotime/cache"
 )

 func main() {
-
-	appIns := hotime.Application{}
-
+	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 {
-		//fmt.Println(context.HandlerStr + time.Now().Format(" 2006-01-02 15:04 ") + hotime.Substr(context.Req.RemoteAddr, 0, strings.Index(context.Req.RemoteAddr, ":")))

-		//this.HandlerStr = "/test.html"
 		return true
 	})

-	//手动模式，
-	appIns.SetConfig("example/config/config.json")
-	//redis缓存接入
-	//ca:=hotime.CacheIns(&cache.CacheRedis{Host:appIns.Config.GetString("redisHost"),Pwd:appIns.Config.GetString("redisPwd"),Time:appIns.Config.GetCeilInt64("cacheLongTime")})
-	//ca.Cache("xyzm","dasdas")
-	//ca.Cache("xyzn","dasdas")
-	//ca.Cache("xyzo","dasdas")
-	//ca.Cache("xyz*",nil)
-	//fmt.Println(ca.Cache("xyzm").Data)
-	//mysql
-	//mysql.SetDB(&appIns)
-	//自动选择数据库
-	db.SetDB(&appIns)
-
-	//appIns.SetConnectDB(func(err ...*hotime.Error) *sql.DB {
-	//	query := appIns.Config.GetString("dbUser") + ":" + appIns.Config.GetString("dbPwd") +
-	//		"@tcp(" + appIns.Config.GetString("dbHost") + ":" + appIns.Config.GetString("dbPort") + ")/" + appIns.Config.GetString("dbName") + "?charset=utf8"
-	//	DB, e := sql.Open("mysql", query)
-	//	if e != nil && len(err) != 0 {
-	//		err[0].SetError(e)
-	//	}
-	//	return DB
-	//})
-	//内存缓存数据库数据，错误则删除
-	//	appIns.Db.CacheIns=hotime.CacheIns(&hotime.CacheMemory{})
-
-	appIns.SetSession(hotime.CacheIns(&hotime.CacheMemory{}), hotime.CacheIns(&hotime.CacheDb{Db: &appIns.Db, Time: appIns.Config.GetInt64("cacheTime")}))
-	appIns.SetCache(hotime.CacheIns(&hotime.CacheMemory{}))
-
-	//快捷模式
-	//appIns.SetDefault(func(err ...*hotime.Error) *sql.DB {
-	//	query := appIns.Config.GetString("dbUser") + ":" + appIns.Config.GetString("dbPwd") +
-	//		"@tcp(" + appIns.Config.GetString("dbHost") + ":" + appIns.Config.GetString("dbPort") + ")/" + appIns.Config.GetString("dbName") + "?charset=utf8"
-	//	DB, e := sql.Open("mysql", query)
-	//	if e != nil && len(err) != 0 {
-	//		err[0].SetError(e)
-	//	}
-	//	return DB
-	//})
+	//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": hotime.Proj{
-			"index": hotime.Ctr{
-				"test": func(this *hotime.Context) {
-					fmt.Println(this.Db.GetTag())
-					//x:=this.Db.Action(func(db hotime.HoTimeDB) bool {
-					//
-					//	db.Insert("user",hotime.Map{"unickname":"dasdas"})
-					//
-					//	return true
-					//})
-					hotime.LogError("dasdasdasdasdas")
-					this.Display(5, "dsadas")
-				},
-				"websocket": func(this *hotime.Context) {
-					hdler := websocket.Handler(func(ws *websocket.Conn) {
-						for true {
-							msg := make([]byte, 5120)
-							n, err := ws.Read(msg)
-							go func() {
-								time.Sleep(time.Second * 5)
-								ws.Write([]byte("dsadasdasgregergrerge"))
-
-							}()
-							if err != nil {
-								return
-							}
-							fmt.Printf("Receive: %s\n", msg[:n])
-
-							send_msg := "[" + string(msg[:n]) + "]"
-							m, err := ws.Write([]byte(send_msg))
-							if err != nil {
-								return
-							}
-							fmt.Printf("Send: %s\n", msg[:m])
-						}
-					})
-					hdler.ServeHTTP(this.Resp, this.Req)
-				},
-			},
-		},
+		"app": app.Project,
 	})
 }
@@ -0,0 +1 @@
+.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}
@@ -0,0 +1 @@
+.not-show-tab-label .el-tabs__header,.not-show-tab-search{display:none}
@@ -0,0 +1 @@
+.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}
@@ -0,0 +1 @@
+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}
@@ -0,0 +1 @@
+.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}
@@ -0,0 +1 @@
+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}
@@ -1,28 +1,3 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8"/>
-    <title>Sample of websocket with golang</title>
-    <script src="http://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
-
-    <script>
-        $(function() {
-            var ws = new WebSocket("ws://localhost:8080/app/index/websocket");
-            ws.onmessage = function(e) {
-
-                $('<li>').text(e.data).appendTo($ul);
-            };
-            var $ul = $('#msg-list');
-            $('#sendBtn').click(function(){
-                var data = $('#name').val();
-                ws.send(data);
-            });
-        });
-    </script>
-</head>
-<body>
-<input id="name" type="text"/>
-<input type="button" id="sendBtn" value="send"/>
-<ul id="msg-list"></ul>
-</body>
-</html>
+<!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>
@@ -0,0 +1 @@
+(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}}]);
@@ -0,0 +1 @@
+(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)})}}}]);
@@ -0,0 +1 @@
+(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}}]);
@@ -0,0 +1 @@
+(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){}}]);
@@ -1,11 +0,0 @@
-module hotime
-
-go 1.14
-
-require (
-	code.hoteas.com/golang/hotime v0.8.3
-	github.com/garyburd/redigo v1.6.0
-	github.com/go-sql-driver/mysql v1.5.0
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible
-	golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0
-)
@@ -1,19 +0,0 @@
-code.hoteas.com/golang/hotime v0.8.2 h1:FncA1c6/GbFDjkTOXCaA7Eea24jAaqun+2ttxhR+6o0=
-code.hoteas.com/golang/hotime v0.8.2/go.mod h1:NbboV59PdOAskM09JBLnK8Vn6lHCEiC5hJT4xhbsWOw=
-code.hoteas.com/golang/hotime v0.8.3 h1:R2rdPtJJUk//1bmVUbLYnIn5adWtQOosaf8H1WyqXH8=
-code.hoteas.com/golang/hotime v0.8.3/go.mod h1:NbboV59PdOAskM09JBLnK8Vn6lHCEiC5hJT4xhbsWOw=
-code.hoteas.com/hoteas/hotime v0.8.2 h1:7rzjsQfEcGn16bZbdDqwkpuLQGVB5BT+AaaII6yLgyM=
-code.hoteas.com/hoteas/hotime v0.8.2/go.mod h1:SGLzLvvi8eJmsgbGXABIniWvOq/dmu4i+K8e0CF8Qog=
-github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
-github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U=
-golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -0,0 +1,117 @@
+package log
+
+import (
+	"fmt"
+	log "github.com/sirupsen/logrus"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"time"
+)
+
+func GetLog(path string, showCodeLine bool) *log.Logger {
+
+	hook := MyHook{
+		Field: "line",
+		Skip:  5,
+		Path:  path, ShowCodeLine: showCodeLine,
+	}
+
+	loger := log.New()
+	loger.SetFormatter(&log.TextFormatter{})
+	loger.AddHook(&hook)
+	return loger
+}
+
+// MyHook ...
+type MyHook struct {
+	Path         string //存储日志的位置
+	ShowCodeLine bool   //输出代码文件名称和日志行
+	Field        string
+	Skip         int
+	levels       []log.Level
+}
+
+// Levels 只定义 error 和 panic 等级的日志,其他日志等级不会触发 hook
+func (that *MyHook) Levels() []log.Level {
+	return log.AllLevels
+}
+
+// Fire 将异常日志写入到指定日志文件中
+func (that *MyHook) Fire(entry *log.Entry) error {
+	if that.ShowCodeLine {
+		entry.Data[that.Field] = findCaller(that.Skip)
+	}
+	//不需要存储到文件
+	if that.Path == "" {
+		return nil
+	}
+	//存储到文件
+	logFilePath := time.Now().Format(that.Path)
+
+	err := os.MkdirAll(filepath.Dir(logFilePath), os.ModeAppend)
+	if err != nil {
+		return err
+	}
+	//os.Create(logFilePath)
+	f, err := os.OpenFile(logFilePath, os.O_APPEND|os.O_CREATE, 0644)
+	if err != nil {
+		return err
+	}
+	bte, _ := entry.Bytes()
+	_, err = f.Write(bte)
+	if err != nil {
+		return err
+	}
+
+	err = f.Close()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// 对caller进行递归查询, 直到找到非logrus包产生的第一个调用.
+// 因为filename我获取到了上层目录名, 因此所有logrus包的调用的文件名都是 logrus/...
+// 因此通过排除logrus开头的文件名, 就可以排除所有logrus包的自己的函数调用
+func findCaller(skip int) string {
+	file := ""
+	line := 0
+	for i := 0; i < 10; i++ {
+		file, line = getCaller(skip + i)
+		if !strings.HasPrefix(file, "logrus") {
+
+			if file == "common/error.go" {
+				file, line = getCaller(skip + i + 1)
+			}
+			break
+		}
+	}
+	return fmt.Sprintf("%s:%d", file, line)
+}
+
+// 这里其实可以获取函数名称的: fnName := runtime.FuncForPC(pc).Name()
+// 但是我觉得有 文件名和行号就够定位问题, 因此忽略了caller返回的第一个值:pc
+// 在标准库log里面我们可以选择记录文件的全路径或者文件名, 但是在使用过程成并发最合适的,
+// 因为文件的全路径往往很长, 而文件名在多个包中往往有重复, 因此这里选择多取一层, 取到文件所在的上层目录那层.
+func getCaller(skip int) (string, int) {
+	_, file, line, ok := runtime.Caller(skip)
+	//fmt.Println(file)
+	//fmt.Println(line)
+	if !ok {
+		return "", 0
+	}
+	n := 0
+	for i := len(file) - 1; i > 0; i-- {
+		if file[i] == '/' {
+			n++
+			if n >= 2 {
+				file = file[i+1:]
+				break
+			}
+		}
+	}
+	return file, line
+}
@@ -1,155 +0,0 @@
-package hotime
-
-import (
-	"encoding/json"
-	"errors"
-	"reflect"
-)
-
-//hotime的常用map
-type Map map[string]interface{}
-
-//获取string
-func (this Map) GetString(key string, err ...*Error) string {
-
-	if len(err) != 0 {
-		err[0].SetError(nil)
-	}
-	return ObjToStr((this)[key])
-
-}
-
-func (this *Map) Pointer() *Map {
-
-	return this
-}
-
-//增加接口
-func (this Map) Put(key string, value interface{}) {
-	//if this==nil{
-	//	this=Map{}
-	//}
-	this[key] = value
-}
-
-//删除接口
-func (this Map) Delete(key string) {
-	delete(this, key)
-
-}
-
-//获取Int
-func (this Map) GetInt(key string, err ...*Error) int {
-	v := ObjToInt((this)[key], err...)
-
-	return v
-
-}
-
-//获取Int
-func (this Map) GetInt64(key string, err ...*Error) int64 {
-	v := ObjToInt64((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整Int64
-func (this Map) GetCeilInt64(key string, err ...*Error) int64 {
-	v := ObjToCeilInt64((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整Int
-func (this Map) GetCeilInt(key string, err ...*Error) int {
-	v := ObjToCeilInt((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整float64
-func (this Map) GetCeilFloat64(key string, err ...*Error) float64 {
-	v := ObjToCeilFloat64((this)[key], err...)
-	return v
-
-}
-
-//获取Float64
-func (this Map) GetFloat64(key string, err ...*Error) float64 {
-
-	v := ObjToFloat64((this)[key], err...)
-
-	return v
-
-}
-
-func (this Map) GetSlice(key string, err ...*Error) Slice {
-
-	//var v Slice
-	v := ObjToSlice((this)[key], err...)
-
-	return v
-
-}
-
-func (this Map) GetMap(key string, err ...*Error) Map {
-	//var data Slice
-
-	v := ObjToMap((this)[key], err...)
-
-	return v
-
-}
-
-func (this Map) Get(key string, err ...*Error) interface{} {
-
-	if v, ok := (this)[key]; ok {
-		return v
-	}
-	e := errors.New("没有存储key及对应的数据")
-
-	if len(err) != 0 {
-		err[0].SetError(e)
-
-	}
-	return nil
-}
-
-//请传递指针过来
-func (this Map) ToStruct(stct interface{}) {
-
-	data := reflect.ValueOf(stct).Elem()
-	for k, v := range this {
-		ks := StrFirstToUpper(k)
-		dkey := data.FieldByName(ks)
-		if !dkey.IsValid() {
-			continue
-		}
-		switch dkey.Type().String() {
-		case "int":
-			dkey.SetInt(this.GetInt64(k))
-		case "int64":
-			dkey.Set(reflect.ValueOf(this.GetInt64(k)))
-		case "float64":
-			dkey.Set(reflect.ValueOf(this.GetFloat64(k)))
-		case "string":
-			dkey.Set(reflect.ValueOf(this.GetString(k)))
-		case "interface{}":
-			dkey.Set(reflect.ValueOf(v))
-		}
-	}
-
-}
-
-func (this Map) ToJsonString() string {
-	return ObjToStr(this)
-
-}
-
-func (this Map) JsonToMap(jsonStr string, err ...*Error) {
-	e := json.Unmarshal([]byte(jsonStr), &this)
-	if e != nil && len(err) != 0 {
-		err[0].SetError(e)
-	}
-
-}
@@ -1,93 +0,0 @@
-package hotime
-
-//对象封装方便取用
-type Obj struct {
-	Data interface{}
-	contextBase
-}
-
-func (this *Obj) Put(data interface{}) {
-	this.Data = data
-}
-
-func (this *Obj) ToInt(err ...Error) int {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToInt(this.Data, &this.Error)
-}
-
-func (this *Obj) ToInt64(err ...Error) int64 {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToInt64(this.Data, &this.Error)
-}
-
-func (this *Obj) ToFloat64(err ...Error) float64 {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToFloat64(this.Data, &this.Error)
-}
-
-//获取向上取整float64
-func (this *Obj) ToCeilFloat64(err ...*Error) float64 {
-	if len(err) != 0 {
-		this.Error = *err[0]
-	}
-	v := ObjToCeilFloat64(this.Data, err...)
-	return v
-
-}
-
-func (this *Obj) ToStr() string {
-
-	return ObjToStr(this.Data)
-}
-
-func (this *Obj) ToMap(err ...Error) Map {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToMap(this.Data, &this.Error)
-}
-
-func (this *Obj) ToSlice(err ...Error) Slice {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToSlice(this.Data, &this.Error)
-}
-
-func (this *Obj) ToMapArray(err ...Error) []Map {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToMapArray(this.Data, &this.Error)
-}
-
-func (this *Obj) ToObj() interface{} {
-
-	return this.Data
-}
-
-//获取向上取整Int64
-func (this *Obj) ToCeilInt64(err ...*Error) int64 {
-	if len(err) != 0 {
-		this.Error = *err[0]
-	}
-	v := ObjToCeilInt64(this.Data, err...)
-	return v
-
-}
-
-//获取向上取整Int
-func (this *Obj) ToCeilInt(err ...*Error) int {
-	if len(err) != 0 {
-		this.Error = *err[0]
-	}
-	v := ObjToCeilInt(this.Data, err...)
-	return v
-
-}
@@ -1,294 +0,0 @@
-package hotime
-
-import (
-	"encoding/json"
-	"errors"
-	"math"
-	"strconv"
-)
-
-//仅限于hotime.Slice
-func ObjToMap(obj interface{}, e ...*Error) Map {
-	var err error
-	var v Map
-
-	if obj == nil {
-		v = nil
-		err = errors.New("没有合适的转换对象！")
-	} else {
-		switch obj.(type) {
-		case Map:
-			v = obj.(Map)
-		case map[string]interface{}:
-			v = obj.(map[string]interface{})
-		case string:
-			v = Map{}
-			e := json.Unmarshal([]byte(obj.(string)), &v)
-			if e != nil {
-				err = errors.New("没有合适的转换对象！" + e.Error())
-				v = nil
-			}
-		default:
-			data, err := json.Marshal(obj)
-			if err != nil {
-				err = errors.New("没有合适的转换对象！" + err.Error())
-				v = nil
-			}
-			v = Map{}
-			e := json.Unmarshal(data, &v)
-			if e != nil {
-				err = errors.New("没有合适的转换对象！" + e.Error())
-				v = nil
-			}
-
-		}
-	}
-	if len(e) != 0 {
-		e[0].SetError(err)
-	}
-	return v
-}
-
-func ObjToMapArray(obj interface{}, e ...*Error) []Map {
-	s := ObjToSlice(obj, e...)
-	res := []Map{}
-	for i := 0; i < len(s); i++ {
-		res = append(res, s.GetMap(i))
-	}
-	return res
-}
-
-//仅限于hotime.Slice
-func ObjToSlice(obj interface{}, e ...*Error) Slice {
-	var err error
-	var v Slice
-
-	if obj == nil {
-		v = nil
-		err = errors.New("没有合适的转换对象！")
-	} else {
-		switch obj.(type) {
-		case Slice:
-			v = obj.(Slice)
-		case []interface{}:
-			v = obj.([]interface{})
-		case []string:
-			v = Slice{}
-			for i := 0; i < len(obj.([]string)); i++ {
-				v = append(v, obj.([]string)[i])
-			}
-		case string:
-			v = Slice{}
-			err = json.Unmarshal([]byte(obj.(string)), &v)
-
-		default:
-			v = Slice{}
-			var data []byte
-			data, err = json.Marshal(obj)
-			err = json.Unmarshal(data, &v)
-		}
-	}
-
-	if len(e) != 0 {
-		e[0].SetError(err)
-	}
-
-	return v
-}
-
-func ObjToFloat64(obj interface{}, e ...*Error) float64 {
-	var err error
-	v := float64(0)
-
-	if obj == nil {
-
-		err = errors.New("没有合适的转换对象！")
-	} else {
-
-		switch obj.(type) {
-		case int:
-			v = float64(obj.(int))
-		case int64:
-			v = float64(obj.(int64))
-		case string:
-			value, e := strconv.ParseFloat(obj.(string), 64)
-			if e != nil {
-				v = float64(0)
-				err = e
-			} else {
-				v = value
-			}
-		case float64:
-			v = obj.(float64)
-		case float32:
-			v = float64(obj.(float32))
-		case uint8:
-			value, e := strconv.ParseFloat(obj.(string), 64)
-			if e != nil {
-				v = float64(0)
-				err = e
-			} else {
-				v = value
-			}
-		default:
-			v = float64(0)
-			err = errors.New("没有合适的转换对象！")
-		}
-	}
-	if len(e) != 0 {
-		e[0].SetError(err)
-	}
-
-	return v
-}
-
-//向上取整
-func ObjToCeilInt64(obj interface{}, e ...*Error) int64 {
-	f := ObjToCeilFloat64(obj, e...)
-	return ObjToInt64(math.Ceil(f))
-
-}
-
-//向上取整
-func ObjToCeilFloat64(obj interface{}, e ...*Error) float64 {
-	f := ObjToFloat64(obj, e...)
-	return math.Ceil(f)
-
-}
-
-//向上取整
-func ObjToCeilInt(obj interface{}, e ...*Error) int {
-	f := ObjToCeilFloat64(obj, e...)
-	return ObjToInt(f)
-
-}
-
-func ObjToInt64(obj interface{}, e ...*Error) int64 {
-	var err error
-	v := int64(0)
-
-	if obj == nil {
-
-		err = errors.New("没有合适的转换对象！")
-	} else {
-		switch obj.(type) {
-		case int:
-			v = int64(obj.(int))
-		case int64:
-			v = obj.(int64)
-		case string:
-			value, e := StrToInt(obj.(string))
-			if e != nil {
-				v = int64(0)
-				err = e
-			} else {
-				v = int64(value)
-			}
-		case uint8:
-			value, e := StrToInt(obj.(string))
-			if e != nil {
-				v = int64(0)
-				err = e
-			} else {
-				v = int64(value)
-			}
-		case float64:
-			v = int64(obj.(float64))
-		case float32:
-			v = int64(obj.(float32))
-		default:
-			v = int64(0)
-			err = errors.New("没有合适的转换对象！")
-		}
-	}
-	if len(e) != 0 {
-		e[0].SetError(err)
-	}
-	return v
-}
-
-func ObjToInt(obj interface{}, e ...*Error) int {
-	v := ObjToInt64(obj, e...)
-	return int(v)
-}
-
-func ObjToStr(obj interface{}) string {
-	//	fmt.Println(reflect.ValueOf(obj).Type().String() )
-	str := ""
-	if obj == nil {
-		return str
-	}
-	switch obj.(type) {
-	case int:
-		str = strconv.Itoa(obj.(int))
-	case uint8:
-		str = obj.(string)
-	case int64:
-		str = strconv.FormatInt(obj.(int64), 10)
-	case []byte:
-		str = string(obj.([]byte))
-	case string:
-		str = obj.(string)
-	case float64:
-		str = strconv.FormatFloat(obj.(float64), 'f', -1, 64)
-	default:
-		strbte, err := json.Marshal(obj)
-		if err == nil {
-			str = string(strbte)
-		}
-
-	}
-
-	return str
-}
-
-//转换为Map
-func StrToMap(string string) Map {
-	data := Map{}
-	data.JsonToMap(string)
-
-	return data
-}
-
-//转换为Slice
-func StrToSlice(string string) Slice {
-
-	data := ObjToSlice(string)
-
-	return data
-}
-
-//字符串数组: a1,a2,a3转["a1","a2","a3"]
-func StrArrayToJsonStr(a string) string {
-
-	if len(a) > 2 {
-		if a[0] == ',' {
-			a = Substr(a, 1, len(a)-1)
-		}
-		if a[len(a)-1] == ',' {
-			a = Substr(a, 0, len(a)-1)
-		}
-		//a = strings.Replace(a, ",", `,`, -1)
-		a = `[` + a + `]`
-	} else {
-		a = "[]"
-	}
-	return a
-}
-
-//字符串数组: a1,a2,a3转["a1","a2","a3"]
-func JsonStrToStrArray(a string) string {
-	//a = strings.Replace(a, `"`, "", -1)
-	if len(a) != 0 {
-		a = Substr(a, 1, len(a)-2)
-	}
-
-	return "," + a + ","
-}
-
-//字符串转int
-func StrToInt(s string) (int, error) {
-	i, err := strconv.Atoi(s)
-	return i, err
-
-}
@@ -1,71 +1,56 @@
 package hotime

+import (
+	. "./cache"
+	. "./common"
+)
+
 //session对象
 type SessionIns struct {
-	ShortCache CacheIns
-	LongCache  CacheIns
-	SessionId  string
+	*HoTimeCache
+	SessionId string
 	Map
-	contextBase
+	ContextBase
 }

-func (this *SessionIns) set() {
-
-	if this.ShortCache != nil {
-		this.ShortCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-	}
-	if this.LongCache != nil {
-		this.LongCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-	}
-
+func (that *SessionIns) set() {
+	that.HoTimeCache.Session(HEAD_SESSION_ADD+that.SessionId, that.Map)
 }

-func (this *SessionIns) Session(key string, data ...interface{}) *Obj {
+func (that *SessionIns) Session(key string, data ...interface{}) *Obj {

-	if this.Map == nil {
-		this.get()
+	if that.Map == nil {
+		that.get()
 	}

 	if len(data) != 0 {
 		if data[0] == nil {
-			delete(this.Map, key)
-			this.set()
+			delete(that.Map, key)
+			that.set()
 		} else {
-			this.Map[key] = data[0]
-			this.set()
+			that.Map[key] = data[0]
+			that.set()
 		}
 		return &Obj{Data: nil}
 	}

-	return &Obj{Data: this.Map.Get(key)}
+	return &Obj{Data: that.Map.Get(key)}

 }

-func (this *SessionIns) get() {
+func (that *SessionIns) get() {

-	if this.ShortCache != nil {
-		this.Map = this.ShortCache.Cache(HEAD_SESSION_ADD + this.SessionId).ToMap()
-		if this.Map != nil {
-			return
-		}
+	that.Map = that.HoTimeCache.Session(HEAD_SESSION_ADD + that.SessionId).ToMap()
+	if that.Map != nil {
+		return
 	}

-	if this.LongCache != nil {
-		this.Map = this.LongCache.Cache(HEAD_SESSION_ADD + this.SessionId).ToMap()
-		if this.Map != nil {
-			if this.ShortCache != nil {
-				this.ShortCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-			}
-			return
-		}
-	}
-	this.Map = Map{}
-	this.ShortCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
+	that.Map = Map{}
+	that.HoTimeCache.Session(HEAD_SESSION_ADD+that.SessionId, that.Map)

 	return
 }

-func (this *SessionIns) Init(short CacheIns, long CacheIns) {
-	this.ShortCache = short
-	this.LongCache = long
+func (that *SessionIns) Init(cache *HoTimeCache) {
+	that.HoTimeCache = cache
 }
@@ -1,87 +0,0 @@
-package hotime
-
-import (
-	"errors"
-)
-
-type Slice []interface{}
-
-//获取string
-func (this Slice) GetString(key int, err ...*Error) string {
-	if len(err) != 0 {
-		err[0].SetError(nil)
-	}
-	return ObjToStr((this)[key])
-}
-
-//获取Int
-func (this Slice) GetInt(key int, err ...*Error) int {
-	v := ObjToInt((this)[key], err...)
-	return v
-}
-
-//获取Int
-func (this Slice) GetInt64(key int, err ...*Error) int64 {
-	v := ObjToInt64((this)[key], err...)
-
-	return v
-}
-
-//获取向上取整Int64
-func (this Slice) GetCeilInt64(key int, err ...*Error) int64 {
-	v := ObjToCeilInt64((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整Int
-func (this Slice) GetCeilInt(key int, err ...*Error) int {
-	v := ObjToCeilInt((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整float64
-func (this Slice) GetCeilFloat64(key int, err ...*Error) float64 {
-	v := ObjToCeilFloat64((this)[key], err...)
-	return v
-
-}
-
-//获取Float64
-func (this Slice) GetFloat64(key int, err ...*Error) float64 {
-	v := ObjToFloat64((this)[key], err...)
-
-	return v
-}
-
-func (this Slice) GetSlice(key int, err ...*Error) Slice {
-	v := ObjToSlice((this)[key], err...)
-	return v
-}
-
-func (this Slice) GetMap(key int, err ...*Error) Map {
-	//var v Map
-	v := ObjToMap((this)[key], err...)
-	return v
-}
-
-func (this Slice) Get(key int, err ...*Error) interface{} {
-
-	if key < len(this) {
-		return this[key]
-	}
-	e := errors.New("没有存储key及对应的数据")
-	if len(err) != 0 {
-		err[0].SetError(e)
-	}
-	return nil
-}
-
-func (this Slice) Put(key int, value interface{}) {
-	this[key] = value
-}
-
-func (this Slice) ToJsonString() string {
-	return ObjToStr(this)
-}
@@ -1,18 +0,0 @@
-package db
-
-import (
-	"code.hoteas.com/golang/hotime"
-	"code.hoteas.com/golang/hotime/tools/mysql"
-	"code.hoteas.com/golang/hotime/tools/sqlite"
-	"strings"
-)
-
-func SetDB(appIns *hotime.Application) {
-	if appIns.Config.GetString("dbType") == "sqlite" || strings.Index(appIns.Config.GetString("dbName"), ".db") == len(appIns.Config.GetString("dbName"))-3 {
-		appIns.Config["dbType"] = "sqlite"
-		sqlite.SetDB(appIns)
-	} else {
-		appIns.Config["dbType"] = "mysql"
-		mysql.SetDB(appIns)
-	}
-}
@@ -1,19 +0,0 @@
-package mysql
-
-import (
-	"code.hoteas.com/golang/hotime"
-	"database/sql"
-	_ "github.com/go-sql-driver/mysql"
-)
-
-func SetDB(appIns *hotime.Application) {
-	appIns.SetConnectDB(func(err ...*hotime.Error) *sql.DB {
-		query := appIns.Config.GetString("dbUser") + ":" + appIns.Config.GetString("dbPwd") +
-			"@tcp(" + appIns.Config.GetString("dbHost") + ":" + appIns.Config.GetString("dbPort") + ")/" + appIns.Config.GetString("dbName") + "?charset=utf8"
-		DB, e := sql.Open("mysql", query)
-		if e != nil && len(err) != 0 {
-			err[0].SetError(e)
-		}
-		return DB
-	})
-}
@@ -1,17 +0,0 @@
-package sqlite
-
-import (
-	"code.hoteas.com/golang/hotime"
-	"database/sql"
-	_ "github.com/mattn/go-sqlite3"
-)
-
-func SetDB(appIns *hotime.Application) {
-	appIns.SetConnectDB(func(err ...*hotime.Error) *sql.DB {
-		db, e := sql.Open("sqlite3", appIns.Config.GetString("dbName"))
-		if e != nil && len(err) != 0 {
-			err[0].SetError(e)
-		}
-		return db
-	})
-}
@@ -1,21 +1,8 @@
 package hotime

-//控制器
+// Ctr 控制器
 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 CacheIns interface {
-	//set(key string, value interface{}, time int64)
-	//get(key string) interface{}
-	//delete(key string)
-	Cache(key string, data ...interface{}) *Obj
-}
-
-//单条缓存数据
-type cacheData struct {
-	time int64
-	data interface{}
-}
@@ -1,21 +1,38 @@
 package hotime

+import (
+	. "./common"
+)
+
 var IsRun = false                   //当前状态
 var App = map[string]*Application{} //整个项目

 //var Db = HoTimeDB{}                         //数据库实例

 var Config = Map{
-	"debug":          1, //debug 0关闭1开启
-	"logLevel":       LOG_FMT,
-	"dbHost":         "127.0.0.1",
-	"dbName":         "test",
-	"dbUser":         "root",
-	"dbPwd":          "root",
-	"dbPort":         "3306",
-	"dbCached":       0, //0不开启缓存
-	"cacheShortTime": 60 * 60 * 2,
-	"cacheLongTime":  60 * 60 * 24 * 30,
+	"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，非必须，有则按改规则生成接口，无则按系统内嵌方式生成
+		},
+	},
+	"db": Map{
+		"sqlite": Map{
+			"path": "config/data.db",
+		},
+	},
+	"cache": Map{
+		"memory": Map{
+			"timeout": 60 * 60 * 2,
+			"db":      true,
+			"session": true,
+		},
+	},
 	"error": Map{
 		"1": "内部系统异常",
 		"2": "访问权限异常",
@@ -23,32 +40,69 @@ var Config = Map{
 		"4": "数据处理异常",
 		"5": "数据结果异常",
 	},
-	"tpt":              "tpt",
-	"defFile":          []string{"index.html", "index.htm"},
-	"modeRouterStrict": false, //路由严格模式/a/b/c
-	"port":             "80",
-	"sessionName":      "HOTIME",
-	"tlsPort":          "0",
-	"tlsKey":           "",
-	"tlsCert":          "",
+	"tpt":         "tpt",
+	"defFile":     []string{"index.html", "index.htm"},
+	"port":        "80",
+	"sessionName": "HOTIME",
 }

 var ConfigNote = Map{
-	"logLevel":       "日志等级，0关闭，1打印",
-	"logFile":        "如果需要存储日志文件时使用，保存格式为:a/b/c/20060102150405.txt,将生成：a/b/c/年月日时分秒.txt，按需设置",
-	"debug":          "是否开启debug模式，0关闭，其他开启，debug模式下日志展示更全", //debug 0关闭1开启
-	"dbHost":         "数据库ip地址默认127.0.0.1",
-	"dbName":         "数据库名称，sqlite为文件路径比如a/x.db",
-	"dbUser":         "数据库用户名",
-	"dbPwd":          "数据库密码",
-	"dbPort":         "数据库端口",
-	"dbType":         "如果需要使用自动数据库配置，请设置此项，手动配置数据库不需要，目前支持mysql，sqlite",
-	"dbCached":       "是否开启数据库缓存0为关闭，其他开启", //0不开启缓存
-	"redisHost":      "如果需要使用redis服务时配置，默认服务ip：127.0.0.1",
-	"redisPort":      "如果需要使用redis服务时配置，默认服务端口：6379",
-	"redisPwd":       "如果需要使用redis服务时配置，默认服务密码：123456",
-	"cacheShortTime": "两级缓存，短缓存存储时间60 * 60 * 2，一般为内存缓存",
-	"cacheLongTime":  "两级缓存，长缓存存储时间60 * 60 * 24 * 30，一般为数据库或者redis缓存",
+	"logLevel":          "默认0，必须，0关闭，1打印，日志等级",
+	"logFile":           "无默认，非必须，如果需要存储日志文件时使用，保存格式为:a/b/c/20060102150405.txt,将生成：a/b/c/年月日时分秒.txt，按需设置",
+	"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，数据库有更新时自动更新配置文件以及对应的生成文件",
+	},
+	"db": Map{
+		"注释": "配置即启用，非必须，默认使用sqlite数据库",
+		"mysql": Map{
+			"注释":       "除prefix及主从数据库slave项，其他全部必须",
+			"host":     "默认127.0.0.1，必须，数据库ip地址",
+			"name":     "默认test，必须，数据库名称",
+			"user":     "默认root，必须，数据库用户名",
+			"password": "默认root，必须，数据库密码",
+			"port":     "默认3306，必须，数据库端口",
+			"prefix":   "默认空，非必须，数据表前缀",
+			"slave": Map{
+				"注释":       "从数据库配置，mysql里配置slave项即启用主从读写，减少数据库压力",
+				"host":     "默认127.0.0.1，必须，数据库ip地址",
+				"name":     "默认test，必须，数据库名称",
+				"user":     "默认root，必须，数据库用户名",
+				"password": "默认root，必须，数据库密码",
+				"port":     "默认3306，必须，数据库端口",
+			},
+		},
+		"sqlite": Map{
+			"path": "默认config/data.db，必须，数据库位置",
+		},
+	},
+	"cache": Map{
+		"注释": "可配置memory，db，redis，默认启用memory，默认优先级为memory>redis>db,memory与数据库缓存设置项一致，缓存数据填充会自动反方向反哺，加入memory缓存过期将自动从redis更新，但memory永远不会更新redis，如果是集群建议不要开启memory，配置即启用",
+		"memory": Map{
+			"timeout": "默认60 * 60 * 2，非必须，过期时间，超时自动删除",
+			"db":      "默认true，非必须，缓存数据库，启用后能减少数据库的读写压力",
+			"session": "默认true，非必须，缓存web session，同时缓存session保持的用户缓存",
+		},
+		"db": Map{
+			"timeout": "默认60 * 60 * 24 * 30，非必须，过期时间，超时自动删除",
+			"db":      "默认false，非必须，缓存数据库，启用后能减少数据库的读写压力",
+			"session": "默认true，非必须，缓存web session，同时缓存session保持的用户缓存",
+		},
+		"redis": Map{
+			"host":     "默认服务ip：127.0.0.1，必须，如果需要使用redis服务时配置，",
+			"port":     "默认服务端口：6379，必须，如果需要使用redis服务时配置，",
+			"password": "默认密码空，必须，如果需要使用redis服务时配置，默认密码空",
+			"timeout":  "默认60 * 60 * 24 * 15，非必须，过期时间，超时自动删除",
+			"db":       "默认true，非必须，缓存数据库，启用后能减少数据库的读写压力",
+			"session":  "默认true，非必须，缓存web session，同时缓存session保持的用户缓存",
+		},
+	},
 	"error": Map{
 		"1":  "内部系统异常，在环境配置，文件访问权限等基础运行环境条件不足造成严重错误时使用",
 		"2":  "访问权限异常，没有登录或者登录异常等时候使用",
@@ -57,14 +111,13 @@ var ConfigNote = Map{
 		"5":  "数据结果异常，一般用于无法给出response要求的格式要求下使用，比如response需要的是string格式但你只能提供int数据时",
 		"注释": "web服务内置错误提示，自定义异常建议10开始",
 	},
-	"tpt":              "静态文件目录，默认为程序目录下tpt目录",
-	"defFile":          "默认访问文件，默认访问index.html或者index.htm文件",
-	"crossDomain":      "如果需要跨域设置，空字符串为不开启，*为开启所有网站允许跨域，http://www.baidu.com为指定域允许跨域", //是否开启跨域
-	"modeRouterStrict": "路由严格模式false,为大小写忽略必须匹配，true必须大小写匹配",                          //路由严格模式/a/b/c
-	"connectLogShow":   "如果需要web访问链接、访问ip、访问时间打印，0为关闭其他数字开启此功能",
-	"sessionName":      "设置session的cookie名默认HOTIME",
-	"port":             "web服务开启Http端口，0为不启用http服务,默认80",
-	"tlsPort":          "web服务https端口，0为不启用https服务",
-	"tlsKey":           "https密钥",
-	"tlsCert":          "https证书",
+	"tpt":              "默认tpt，必须，web静态文件目录，默认为程序目录下tpt目录",
+	"defFile":          "默认访问index.html或者index.htm文件，必须，默认访问文件类型",
+	"crossDomain":      "默认空 非必须，空字符串为不开启，如果需要跨域设置，auto为智能开启所有网站允许跨域，http://www.baidu.com为指定域允许跨域", //是否开启跨域
+	"modeRouterStrict": "默认false,必须，路由严格模式false,为大小写忽略必须匹配，true必须大小写匹配",                            //路由严格模式/a/b/c
+	"sessionName":      "默认HOTIME，必须，设置session的cookie名",
+	"port":             "默认80，必须，web服务开启Http端口，0为不启用http服务,默认80",
+	"tlsPort":          "默认空，非必须，web服务https端口，0为不启用https服务",
+	"tlsKey":           "默认空，非必须，https密钥",
+	"tlsCert":          "默认空，非必须，https证书",
 }
@@ -1 +0,0 @@
-/.idea/*
@@ -1,455 +0,0 @@
-package hotime
-
-import (
-	"bytes"
-	"database/sql"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-type Application struct {
-	MethodRouter
-	Router
-	contextBase
-	Port            string                     //端口号
-	TLSPort         string                     //ssl访问端口号
-	connectListener []func(this *Context) bool //所有的访问监听,true按原计划继续使用，false表示有监听器处理
-	connectDbFunc   func(err ...*Error) *sql.DB
-	configPath      string
-	Config          Map
-	Db              HoTimeDB
-	Server          *http.Server
-	CacheIns
-	sessionLong  CacheIns
-	sessionShort CacheIns
-	http.Handler
-}
-
-func (this *Application) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	this.handler(w, req)
-}
-
-//启动实例
-func (this *Application) Run(router Router) {
-	//如果没有设置配置自动生成配置
-	if this.configPath == "" || len(this.Config) == 0 {
-		this.SetConfig()
-	}
-
-	//防止手动设置缓存误伤
-	if this.CacheIns == nil {
-		this.SetCache(CacheIns(&CacheMemory{}))
-	}
-
-	//防止手动设置session误伤
-	if this.sessionShort == nil && this.sessionLong == nil {
-		if this.connectDbFunc == nil {
-			this.SetSession(CacheIns(&CacheMemory{}), nil)
-		} else {
-			this.SetSession(CacheIns(&CacheMemory{}), CacheIns(&CacheDb{Db: &this.Db, Time: this.Config.GetInt64("cacheLongTime")}))
-		}
-
-	}
-
-	this.Router = router
-	//重新设置MethodRouter//直达路由
-	this.MethodRouter = MethodRouter{}
-	modeRouterStrict := true
-	if this.Config.Get("modeRouterStrict").(bool) == false {
-		modeRouterStrict = false
-	}
-	if router != nil {
-		for pk, pv := range router {
-			if !modeRouterStrict {
-				pk = strings.ToLower(pk)
-			}
-			if pv != nil {
-				for ck, cv := range pv {
-					if !modeRouterStrict {
-						ck = strings.ToLower(ck)
-					}
-					if cv != nil {
-						for mk, mv := range cv {
-							if !modeRouterStrict {
-								mk = strings.ToLower(mk)
-							}
-							this.MethodRouter["/"+pk+"/"+ck+"/"+mk] = mv
-						}
-					}
-				}
-			}
-		}
-	}
-
-	//this.Port = port
-	this.Port = this.Config.GetString("port")
-	this.TLSPort = this.Config.GetString("tlsPort")
-
-	if this.connectDbFunc != nil && (this.Db.DB == nil || this.Db.DB.Ping() != nil) {
-		this.Db.SetConnect(this.connectDbFunc)
-	}
-
-	if this.CacheIns == nil {
-		this.CacheIns = CacheIns(&CacheMemory{Map: Map{}, Time: this.Config.GetInt64("cacheShortTime")})
-	}
-
-	//异常处理
-	defer func() {
-		if err := recover(); err != nil {
-			//this.SetError(errors.New(fmt.Sprint(err)), LOG_FMT)
-			logFmt(err, 2, LOG_ERROR)
-
-			this.Run(router)
-		}
-	}()
-
-	this.Server = &http.Server{}
-	if !IsRun {
-		IsRun = true
-	}
-
-	ch := make(chan int)
-	if ObjToCeilInt(this.Port) != 0 {
-		go func() {
-
-			App[this.Port] = this
-			this.Server.Handler = this
-			//启动服务
-			this.Server.Addr = ":" + this.Port
-			err := this.Server.ListenAndServe()
-			logFmt(err, 2)
-			ch <- 1
-
-		}()
-	} else if ObjToCeilInt(this.TLSPort) != 0 {
-		go func() {
-
-			App[this.TLSPort] = this
-			this.Server.Handler = this
-			//启动服务
-			this.Server.Addr = ":" + this.TLSPort
-			err := this.Server.ListenAndServeTLS(this.Config.GetString("tlsCert"), this.Config.GetString("tlsKey"))
-			logFmt(err, 2)
-			ch <- 2
-
-		}()
-	} else {
-		logFmt("没有端口启用", 2, LOG_INFO)
-		return
-
-	}
-
-	value := <-ch
-
-	logFmt("启动服务失败 : "+ObjToStr(value), 2, LOG_ERROR)
-}
-
-//启动实例
-func (this *Application) SetConnectDB(connect func(err ...*Error) *sql.DB) {
-
-	//this.Db.DBCached=false
-	//if this.Config.GetCeilInt("dbCached")!=0{
-	//	this.Db.DBCached=true
-	//}
-
-	this.connectDbFunc = connect
-	this.Db.SetConnect(this.connectDbFunc)
-
-	this.Db.DBCached = false
-	if this.Config.GetCeilInt("dbCached") != 0 {
-		this.Db.DBCached = true
-	}
-
-	this.Db.Type = this.Config.GetString("dbType")
-
-}
-
-//设置配置文件路径全路径或者相对路径
-func (this *Application) SetSession(short CacheIns, Long CacheIns) {
-	this.sessionLong = Long
-	this.sessionShort = short
-
-}
-
-//默认配置缓存和session实现
-func (this *Application) SetDefault(connect func(err ...*Error) *sql.DB) {
-	this.SetConfig()
-
-	if connect != nil {
-		this.connectDbFunc = connect
-		this.Db.SetConnect(this.connectDbFunc)
-	}
-
-}
-
-//设置配置文件路径全路径或者相对路径
-func (this *Application) SetCache(cache CacheIns) {
-
-	this.CacheIns = cache
-
-}
-
-//设置配置文件路径全路径或者相对路径
-func (this *Application) SetConfig(configPath ...string) {
-	if len(configPath) != 0 {
-		this.configPath = configPath[0]
-	}
-
-	if this.configPath == "" {
-		this.configPath = "config/config.json"
-	}
-	//加载配置文件
-	btes, err := ioutil.ReadFile(this.configPath)
-	this.Config = DeepCopyMap(Config).(Map)
-	if err == nil {
-
-		cmap := Map{}
-		//文件是否损坏
-		cmap.JsonToMap(string(btes), &this.Error)
-
-		for k, v := range cmap {
-			this.Config[k] = v //程序配置
-			Config[k] = v      //系统配置
-		}
-	} else {
-		logFmt("配置文件不存在，或者配置出错，使用缺省默认配置", 2)
-
-	}
-
-	//文件如果损坏则不写入配置防止配置文件数据丢失
-	if this.Error.GetError() == nil {
-		var configByte bytes.Buffer
-
-		err = json.Indent(&configByte, []byte(this.Config.ToJsonString()), "", "\t")
-		//判断配置文件是否序列有变化有则修改配置，五则不变
-		//fmt.Println(len(btes))
-		if len(btes) != 0 && configByte.String() == string(btes) {
-			return
-		}
-		//写入配置说明
-		var configNoteByte bytes.Buffer
-		json.Indent(&configNoteByte, []byte(ConfigNote.ToJsonString()), "", "\t")
-
-		os.MkdirAll(filepath.Dir(this.configPath), os.ModeDir)
-		err = ioutil.WriteFile(this.configPath, configByte.Bytes(), os.ModeAppend)
-		if err != nil {
-			this.Error.SetError(err)
-		}
-		ioutil.WriteFile(filepath.Dir(this.configPath)+"/confignote.json", configNoteByte.Bytes(), os.ModeAppend)
-
-	}
-
-}
-
-//连接判断,返回true继续传输至控制层，false则停止传输
-func (this *Application) SetConnectListener(lis func(this *Context) bool) {
-	this.connectListener = append(this.connectListener, lis)
-}
-
-//网络错误
-//func (this *Application) session(w http.ResponseWriter, req *http.Request) {
-//
-//}
-
-//序列化链接
-func (this *Application) urlSer(url string) (string, []string) {
-	q := strings.Index(url, "?")
-	if q == -1 {
-		q = len(url)
-	}
-	o := Substr(url, 0, q)
-
-	r := strings.SplitN(o, "/", -1)
-
-	var s = make([]string, 0)
-
-	for i := 0; i < len(r); i++ {
-		if !strings.EqualFold("", r[i]) {
-			s = append(s, r[i])
-		}
-	}
-	return o, s
-}
-
-//访问
-
-func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
-
-	_, s := this.urlSer(req.RequestURI)
-	//获取cookie
-	// 如果cookie存在直接将sessionId赋值为cookie.Value
-	// 如果cookie不存在就查找传入的参数中是否有token
-	// 如果token不存在就生成随机的sessionId
-	// 如果token存在就判断token是否在Session中有保存
-	// 如果有取出token并复制给cookie
-	// 没有保存就生成随机的session
-	cookie, err := req.Cookie(this.Config.GetString("sessionName"))
-	sessionId := Md5(strconv.Itoa(Rand(10)))
-	token := req.FormValue("token")
-	//isFirst:=false
-	if err != nil || (len(token) == 32 && cookie.Value != token) {
-		if len(token) == 32 {
-			sessionId = token
-		}
-		//else{
-		//	isFirst=true;
-		//}
-		http.SetCookie(w, &http.Cookie{Name: this.Config.GetString("sessionName"), Value: sessionId, Path: "/"})
-	} else {
-		sessionId = cookie.Value
-	}
-
-	unescapeUrl, err := url.QueryUnescape(req.RequestURI)
-	if err != nil {
-		unescapeUrl = req.RequestURI
-	}
-	//访问实例
-	context := Context{SessionIns: SessionIns{SessionId: sessionId,
-		LongCache:  this.sessionLong,
-		ShortCache: this.sessionShort,
-	},
-		CacheIns: this.CacheIns,
-		Resp:     w, Req: req, Application: this, RouterString: s, Config: this.Config, Db: &this.Db, HandlerStr: unescapeUrl}
-	//header默认设置
-	header := w.Header()
-	header.Set("Content-Type", "text/html; charset=utf-8")
-
-	//url去掉参数并序列化
-	context.HandlerStr, context.RouterString = this.urlSer(context.HandlerStr)
-
-	//跨域设置
-	this.crossDomain(&context)
-	//是否展示日志
-	if this.Config.GetInt("connectLogShow") != 0 {
-		logFmt(Substr(context.Req.RemoteAddr, 0, strings.Index(context.Req.RemoteAddr, ":"))+" "+context.HandlerStr, 0, LOG_INFO)
-	}
-
-	//访问拦截true继续false暂停
-	connectListenerLen := len(this.connectListener)
-	if connectListenerLen != 0 {
-		for i := 0; i < connectListenerLen; i++ {
-
-			if !this.connectListener[i](&context) {
-
-				context.View()
-				return
-			}
-		}
-	}
-
-	//接口服务
-	//if len(s) == 3 {
-	//	//如果满足规则则路由到对应控制器去
-	//	if this.Router[s[0]] != nil && this.Router[s[0]][s[1]] != nil && this.Router[s[0]][s[1]][s[2]] != nil {
-	//		//控制层
-	//		this.Router[s[0]][s[1]][s[2]](&context)
-	//		//header.Set("Content-Type", "text/html; charset=utf-8")
-	//		context.View()
-	//		return
-	//	}
-	//
-	//}
-	//验证接口严格模式
-	modeRouterStrict := this.Config.Get("modeRouterStrict").(bool)
-	tempHandlerStr := context.HandlerStr
-	if !modeRouterStrict {
-		tempHandlerStr = strings.ToLower(tempHandlerStr)
-	}
-
-	//执行接口
-	if this.MethodRouter[tempHandlerStr] != nil {
-		this.MethodRouter[tempHandlerStr](&context)
-		context.View()
-		return
-	}
-
-	//url赋值
-	path := this.Config.GetString("tpt") + tempHandlerStr
-
-	//判断是否为默认
-	if path[len(path)-1] == '/' {
-		defFile := this.Config.GetSlice("defFile")
-
-		for i := 0; i < len(defFile); i++ {
-			temp := path + defFile.GetString(i)
-			_, err := os.Stat(temp)
-
-			if err == nil {
-				path = temp
-				break
-			}
-		}
-		if path[len(path)-1] == '/' {
-			w.WriteHeader(404)
-			return
-		}
-	}
-
-	if strings.Contains(path, "/.") {
-		w.WriteHeader(404)
-		return
-	}
-
-	//设置header
-	delete(header, "Content-Type")
-	if this.Config.GetInt("debug") != 1 {
-		header.Set("Cache-Control", "public")
-	}
-
-	if strings.Index(path, ".m3u8") != -1 {
-		header.Add("Content-Type", "audio/mpegurl")
-	}
-
-	//w.Write(data)
-	http.ServeFile(w, req, path)
-
-}
-
-func (this *Application) crossDomain(context *Context) {
-	//没有跨域设置
-	if context.Config.GetString("crossDomain") == "" {
-		return
-	}
-
-	header := context.Resp.Header()
-	header.Set("Access-Control-Allow-Origin", "*")
-	header.Set("Access-Control-Allow-Methods", "*")
-	header.Set("Access-Control-Allow-Credentials", "true")
-	header.Set("Access-Control-Expose-Headers", "*")
-	header.Set("Access-Control-Allow-Headers", "X-Requested-With,Content-Type,Access-Token")
-
-	if context.Config.GetString("crossDomain") != "*" {
-		header.Set("Access-Control-Allow-Origin", this.Config.GetString("crossDomain"))
-		return
-	}
-
-	origin := context.Req.Header.Get("Origin")
-	if origin != "" {
-		header.Set("Access-Control-Allow-Origin", origin)
-		return
-	}
-
-	refer := context.Req.Header.Get("Referer")
-	if refer != "" {
-		tempInt := 0
-		lastInt := strings.IndexFunc(refer, func(r rune) bool {
-			if r == '/' && tempInt > 8 {
-				return true
-			}
-			tempInt++
-			return false
-		})
-
-		if lastInt < 0 {
-			lastInt = len(refer)
-		}
-		refer = Substr(refer, 0, lastInt)
-		header.Set("Access-Control-Allow-Origin", refer)
-	}
-}
@@ -1,146 +0,0 @@
-package hotime
-
-import (
-	"encoding/json"
-	"strings"
-	"time"
-)
-
-type CacheDb struct {
-	Time int64
-	Db   *HoTimeDB
-	contextBase
-	isInit bool
-}
-
-func (this *CacheDb) initDbTable() {
-	if this.isInit {
-		return
-	}
-	if this.Db.Type == "mysql" {
-
-		dbNames := this.Db.Query("SELECT DATABASE()")
-
-		if len(dbNames) == 0 {
-			return
-		}
-		dbName := dbNames[0].GetString("DATABASE()")
-		res := this.Db.Query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='" + dbName + "' AND TABLE_NAME='cached'")
-		if len(res) != 0 {
-			this.isInit = true
-			return
-		}
-
-		_, e := this.Db.Exec("CREATE TABLE `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")
-		if e.GetError() == nil {
-			this.isInit = true
-		}
-
-	}
-
-	if this.Db.Type == "sqlite" {
-		res := this.Db.Query(`select * from sqlite_master where type = 'table' and name = 'cached'`)
-
-		if len(res) != 0 {
-			this.isInit = true
-			return
-		}
-		_, e := this.Db.Exec(`CREATE TABLE "cached" (
-			"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-				"ckey" TEXT(60),
-				"cvalue" TEXT(2000),
-				"time" integer,
-				"endtime" integer
-			);`)
-		if e.GetError() == nil {
-			this.isInit = true
-		}
-
-	}
-
-}
-
-//获取Cache键只能为string类型
-func (this *CacheDb) get(key string) interface{} {
-
-	cached := this.Db.Get("cached", "*", Map{"ckey": key})
-
-	if cached == nil {
-		return nil
-	}
-	//data:=cacheMap[key];
-	if cached.GetInt64("endtime") <= time.Now().Unix() {
-
-		this.Db.Delete("cached", Map{"id": cached.GetString("id")})
-		return nil
-	}
-
-	data := Map{}
-	data.JsonToMap(cached.GetString("cvalue"))
-
-	return data.Get("data")
-}
-
-//key value ,时间为时间戳
-func (this *CacheDb) set(key string, value interface{}, tim int64) {
-
-	bte, _ := json.Marshal(Map{"data": value})
-
-	num := this.Db.Update("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim}, Map{"ckey": key})
-	if num == int64(0) {
-		this.Db.Insert("cached", Map{"cvalue": string(bte), "time": time.Now().UnixNano(), "endtime": tim, "ckey": key})
-	}
-
-	//随机执行删除命令
-	if Rand(1000) > 950 {
-		this.Db.Delete("cached", Map{"endtime[<]": time.Now().Unix()})
-	}
-}
-
-func (this *CacheDb) delete(key string) {
-
-	del := strings.Index(key, "*")
-	//如果通配删除
-	if del != -1 {
-		key = Substr(key, 0, del)
-		this.Db.Delete("cached", Map{"ckey": key + "%"})
-
-	} else {
-		this.Db.Delete("cached", Map{"ckey": key})
-	}
-}
-
-func (this *CacheDb) Cache(key string, data ...interface{}) *Obj {
-
-	this.initDbTable()
-
-	if len(data) == 0 {
-		return &Obj{Data: this.get(key)}
-	}
-	tim := time.Now().Unix()
-
-	if len(data) == 1 && data[0] == nil {
-		this.delete(key)
-		return &Obj{Data: nil}
-	}
-
-	if len(data) == 1 {
-		if this.Time == 0 {
-			this.Time = Config.GetInt64("cacheLongTime")
-		}
-		tim += this.Time
-	}
-	if len(data) == 2 {
-		this.SetError(nil)
-		tempt := ObjToInt64(data[1], &this.Error)
-
-		if tempt > tim {
-			tim = tempt
-		} else if this.GetError() == nil {
-
-			tim = tim + tempt
-		}
-	}
-	this.set(key, data[0], tim)
-	return &Obj{Data: nil}
-}
@@ -1,146 +0,0 @@
-package hotime
-
-import (
-	"strings"
-	"sync"
-	"time"
-)
-
-type CacheMemory struct {
-	Time int64
-	Map
-	contextBase
-	mutex *sync.RWMutex
-}
-
-//获取Cache键只能为string类型
-func (this *CacheMemory) get(key string) interface{} {
-	this.Error.SetError(nil)
-	if this.Map == nil {
-		this.Map = Map{}
-	}
-
-	if this.Map[key] == nil {
-		return nil
-	}
-	data := this.Map.Get(key, &this.Error).(cacheData)
-	if this.GetError() != nil {
-		return nil
-	}
-
-	if data.time < time.Now().Unix() {
-		delete(this.Map, key)
-		return nil
-	}
-	return data.data
-}
-
-func (this *CacheMemory) refreshMap() {
-
-	go func() {
-		this.mutex.Lock()
-		defer this.mutex.Unlock()
-		for key, v := range this.Map {
-			data := v.(cacheData)
-			if data.time <= time.Now().Unix() {
-				delete(this.Map, key)
-			}
-		}
-
-	}()
-
-}
-
-//key value ,时间为时间戳
-func (this *CacheMemory) set(key string, value interface{}, time int64) {
-	this.Error.SetError(nil)
-	var data cacheData
-
-	if this.Map == nil {
-		this.Map = Map{}
-	}
-
-	dd := this.Map[key]
-
-	if dd == nil {
-		data = cacheData{}
-	} else {
-		data = dd.(cacheData)
-	}
-
-	data.time = time
-	data.data = value
-
-	this.Map.Put(key, data)
-}
-
-func (this *CacheMemory) delete(key string) {
-	del := strings.Index(key, "*")
-	//如果通配删除
-	if del != -1 {
-		key = Substr(key, 0, del)
-		for k, _ := range this.Map {
-			if strings.Index(k, key) != -1 {
-				delete(this.Map, key)
-			}
-		}
-
-	} else {
-		delete(this.Map, key)
-	}
-
-}
-
-func (this *CacheMemory) Cache(key string, data ...interface{}) *Obj {
-
-	x := RandX(1, 100000)
-	if x > 99950 {
-		this.refreshMap()
-	}
-	if this.mutex == nil {
-		this.mutex = &sync.RWMutex{}
-	}
-
-	reData := &Obj{Data: nil}
-
-	if len(data) == 0 {
-		this.mutex.RLock()
-		reData.Data = this.get(key)
-		this.mutex.RUnlock()
-		return reData
-	}
-	tim := time.Now().Unix()
-
-	if len(data) == 1 && data[0] == nil {
-		this.mutex.Lock()
-		this.delete(key)
-		this.mutex.Unlock()
-		return reData
-	}
-
-	if len(data) == 1 {
-		if this.Time == 0 {
-			this.Time = Config.GetInt64("cacheShortTime")
-		}
-
-		tim = tim + this.Time
-
-	}
-	if len(data) == 2 {
-		this.Error.SetError(nil)
-		tempt := ObjToInt64(data[1], &this.Error)
-
-		if tempt > tim {
-
-			tim = tempt
-		} else if this.GetError() == nil {
-
-			tim = tim + tempt
-		}
-	}
-	this.mutex.Lock()
-	this.set(key, data[0], tim)
-	this.mutex.Unlock()
-	return reData
-
-}
@@ -1,16 +0,0 @@
-package hotime
-
-type LOG_MODE int
-
-const (
-	LOG_NIL = 0
-	LOG_FMT = 1
-	//LOG_FILE  = 2
-
-	LOG_INFO  LOG_MODE = 0
-	LOG_WARN  LOG_MODE = 1
-	LOG_ERROR LOG_MODE = 2
-)
-
-//session储存头
-const HEAD_SESSION_ADD = "session#"
@@ -1,65 +0,0 @@
-package hotime
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-)
-
-type Context struct {
-	contextBase
-	Resp         http.ResponseWriter
-	Req          *http.Request
-	Application  *Application
-	RouterString []string
-	Config       Map
-	Db           *HoTimeDB
-	RespData     Map
-	CacheIns
-	SessionIns
-	HandlerStr string //复写请求url
-}
-
-//唯一标志
-func (this *Context) Mtd(router [3]string) Map {
-	this.Application.Router[router[0]][router[1]][router[2]](this)
-	d := this.RespData
-	this.RespData = nil
-	return d
-}
-
-//打印
-func (this *Context) Display(statu int, data interface{}) {
-
-	resp := Map{"statu": statu}
-	if statu != 0 {
-		temp := Map{}
-
-		tpe := this.Config.GetMap("error").GetString(ObjToStr(statu))
-		if tpe == "" {
-			logFmt(errors.New("找不到对应的错误码"), 2, LOG_WARN)
-		}
-
-		temp["type"] = tpe
-		temp["msg"] = data
-		resp["result"] = temp
-	} else {
-		resp["result"] = data
-	}
-
-	this.RespData = resp
-
-	//this.Data=d;
-}
-
-func (this *Context) View() {
-	if this.RespData == nil {
-		return
-	}
-	d, err := json.Marshal(this.RespData)
-	if err != nil {
-		return
-	}
-	this.RespData = nil
-	this.Resp.Write(d)
-}
@@ -1,17 +0,0 @@
-package hotime
-
-import "time"
-
-type contextBase struct {
-	Error
-	tag int64
-}
-
-//唯一标志
-func (this *contextBase) GetTag() int64 {
-
-	if this.tag == int64(0) {
-		this.tag = time.Now().UnixNano()
-	}
-	return this.tag
-}
@@ -1,25 +0,0 @@
-package hotime
-
-//框架层处理错误
-type Error struct {
-	error
-	err error
-}
-
-func (this *Error) GetError() error {
-
-	return this.error
-
-}
-
-func (this *Error) SetError(err error, loglevel ...int) {
-
-	this.error = nil
-	if err == nil {
-		this.error = err
-		this.err = err
-		return
-	}
-	this.error = err
-	return
-}
@@ -1,382 +0,0 @@
-package hotime
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-	"fmt"
-	"math"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-)
-
-//安全锁
-//func SafeMutex(tag int, f func() interface{}) interface{} {
-//
-//	mutexer.Lock()
-//	if mutex[tag] == nil {
-//
-//		mutex[tag] = &sync.RWMutex{}
-//
-//	}
-//	mutexer.Unlock()
-//
-//	mutex[tag].Lock()
-//	res := f()
-//	mutex[tag].Unlock()
-//	return res
-//}
-
-func LogError(logMsg interface{}) {
-
-	logFmt(fmt.Sprintln(logMsg), 2, LOG_ERROR)
-}
-func LogWarn(logMsg interface{}) {
-
-	logFmt(fmt.Sprintln(logMsg), 2, LOG_WARN)
-}
-func LogInfo(logMsg ...interface{}) {
-
-	logFmt(fmt.Sprintln(logMsg), 2, LOG_INFO)
-}
-
-//func LogFmt(logMsg interface{}, loglevel ...LOG_MODE) {
-//
-//	logFmt(logMsg, 2, loglevel...)
-//}
-
-//日志打印以及存储到文件
-func logFmt(logMsg interface{}, printLevel int, loglevel ...LOG_MODE) {
-
-	if Config.GetInt("logLevel") == int(LOG_NIL) {
-		return
-	}
-
-	lev := LOG_INFO
-	if len(loglevel) != 0 {
-		lev = loglevel[0]
-	}
-	gofile := ""
-
-	if Config.GetInt("debug") != 0 && printLevel != 0 {
-		_, file, line, ok := runtime.Caller(printLevel)
-		if ok {
-			gofile = " " + file + ":" + ObjToStr(line)
-		}
-	}
-
-	logStr := ""
-
-	if lev == LOG_INFO {
-		logStr = "info:"
-	}
-	if printLevel == 0 {
-		logStr = "connect:"
-	}
-
-	if lev == LOG_WARN {
-		logStr = "warn:"
-	}
-
-	if lev == LOG_ERROR {
-		logStr = "error:"
-	}
-
-	logStr = fmt.Sprintln(time.Now().Format("2006/01/02 15:04:05"), logStr, logMsg, gofile)
-	//打印日志
-	fmt.Print(logStr)
-	//不需要存储到文件
-	if Config.GetString("logFile") == "" {
-		return
-	}
-	//存储到文件
-	logFilePath := time.Now().Format(Config.GetString("logFile"))
-
-	os.MkdirAll(filepath.Dir(logFilePath), os.ModeAppend)
-	//os.Create(logFilePath)
-	f, err := os.OpenFile(logFilePath, os.O_APPEND|os.O_CREATE, 0644)
-	if err != nil {
-		return
-	}
-	f.Write([]byte(logStr))
-	f.Close()
-
-}
-
-//字符串首字符大写
-func StrFirstToUpper(str string) string {
-	if len(str) == 0 {
-		return str
-	}
-
-	first := Substr(str, 0, 1)
-	other := Substr(str, 1, len(str)-1)
-
-	return strings.ToUpper(first) + other
-}
-
-//字符串截取
-func Substr(str string, start int, length int) string {
-	rs := []rune(str)
-	rl := len(rs)
-	end := 0
-
-	if start < 0 {
-		start = rl - 1 + start
-	}
-	end = start + length
-
-	if start > end {
-		start, end = end, start
-	}
-
-	if start < 0 {
-		start = 0
-	}
-	if start > rl {
-		start = rl
-	}
-	if end < 0 {
-		end = 0
-	}
-	if end > rl {
-		end = rl
-	}
-
-	return string(rs[start:end])
-}
-
-//获取最后出现字符串的下标
-//return  找不到返回 -1
-func IndexLastStr(str, sep string) int {
-	sepSlice := []rune(sep)
-	strSlice := []rune(str)
-	if len(sepSlice) > len(strSlice) {
-		return -1
-	}
-
-	v := sepSlice[len(sepSlice)-1]
-
-	for i := len(strSlice) - 1; i >= 0; i-- {
-		vs := strSlice[i]
-		if v == vs {
-			j := len(sepSlice) - 2
-			for ; j >= 0; j-- {
-				vj := sepSlice[j]
-				vsj := strSlice[i-(len(sepSlice)-j-1)]
-				if vj != vsj {
-					break
-				}
-			}
-			if j < 0 {
-				return i - len(sepSlice) + 1
-			}
-		}
-
-	}
-	return -1
-}
-
-//md5
-func Md5(req string) string {
-	md5Ctx := md5.New()
-	md5Ctx.Write([]byte(req))
-	cipherStr := md5Ctx.Sum(nil)
-	return hex.EncodeToString(cipherStr)
-}
-
-//随机数
-func Rand(count int) int {
-	res := Random()
-	for i := 0; i < count; i++ {
-		res = res * 10
-	}
-	return ObjToInt(res)
-}
-func Random() float64 {
-	v := float64(0)
-	m := float64(0.1)
-	for i := 0; i < 15; i++ {
-		facter := map[int]int{4: 1, 9: 1, 2: 1, 3: 1, 1: 1, 7: 1, 0: 1, 5: 1, 6: 1, 8: 1}
-		for k, _ := range facter {
-
-			v = v + float64(k)*m
-			break
-		}
-		m = m * 0.1
-	}
-
-	return v
-
-}
-
-//随机数范围
-func RandX(small int, max int) int {
-	res := 0
-	//随机对象
-	if small == max {
-		return small
-	}
-
-	for {
-		res = ObjToInt(Random() * float64(max+1))
-		if res >= small {
-			break
-		}
-	}
-	return res
-}
-
-//
-////路由
-//func Router(ctr CtrInterface) {
-//
-//	str := reflect.ValueOf(ctr).Type().String()
-//	a := strings.IndexByte(str, '.')
-//
-//	c := len(str) - len("Ctr") - 1
-//
-//	app := Substr(str, 0, a)    //属于哪个app
-//	ct := Substr(str, a+1, c-a) //属于哪个控制器
-//	var x = map[string]CtrInterface{}
-//	if _, ok := Proj[app]; ok {
-//		//存在APP
-//		x = Proj[app]
-//	} else {
-//		x = map[string]CtrInterface{}
-//	}
-//	x[ct] = ctr //将控制器存入APP
-//	//	fmt.Println(c)
-//	Proj[app] = x //将APP存入测试
-//}
-//
-//func RunMethodListener(test func(app []string)) {
-//	RunMethodListenerFunc = test
-//}
-
-//func SetDb(db *sql.DB) {
-//	db.SetMaxOpenConns(2000)
-//	db.SetMaxIdleConns(1000)
-//	db.Ping()
-//	SqlDB = &*db
-//	GetDb()
-//}
-
-//复制返回数组
-func DeepCopyMap(value interface{}) interface{} {
-	if valueMap, ok := value.(Map); ok {
-		newMap := make(Map)
-		for k, v := range valueMap {
-			newMap[k] = DeepCopyMap(v)
-		}
-
-		return newMap
-	} else if valueSlice, ok := value.([]interface{}); ok {
-		newSlice := make([]interface{}, len(valueSlice))
-		for k, v := range valueSlice {
-			newSlice[k] = DeepCopyMap(v)
-		}
-
-		return newSlice
-	} else if valueMap, ok := value.(map[string]interface{}); ok {
-		newMap := make(map[string]interface{})
-		for k, v := range valueMap {
-			newMap[k] = DeepCopyMap(v)
-		}
-
-		return newMap
-
-	} else if valueSlice, ok := value.(Slice); ok {
-		newSlice := make(Slice, len(valueSlice))
-		for k, v := range valueSlice {
-			newSlice[k] = DeepCopyMap(v)
-		}
-
-		return newSlice
-	}
-
-	return value
-}
-
-////获取数据库
-//func GetDb() (HoTimeDB, error) {
-//	Db.DB = &*SqlDB
-//	Db.Cached = true
-//	return Db, nil
-//}
-
-//初始化方法
-//func Init() {
-//
-//	http.HandleFunc("/", PublicCore.myHandler)
-//
-//	InitCache()
-//	http.ListenAndServe(":"+Config["port"].(string), nil)
-//}
-
-////设置Config
-//func SetCfg(tData Map) {
-//	for k, v := range tData {
-//		Config[k] = v
-//	}
-//}
-
-//浮点数四舍五入保留小数
-func Round(f float64, n int) float64 {
-	pow10_n := math.Pow10(n)
-	return math.Trunc((f+0.5/pow10_n)*pow10_n) / pow10_n
-}
-
-//func InitDbCache(tim int64) {
-//	res := Db.Query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='" + Config.GetString("dbName") + "' AND TABLE_NAME='cached'")
-//	if len(res) == 0 {
-//		Db.Exec("CREATE TABLE `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` int(11) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=198740 DEFAULT CHARSET=utf8")
-//	}
-//	cacheConfig := Config.GetMap("cacheConfig").GetObj("db").(CacheConfg)
-//	cacheConfig.Used = true
-//	if tim != 0 {
-//		cacheConfig.Time = tim
-//	}
-//	Config.GetMap("cacheConfig")["db"] = cacheConfig
-//}
-//
-//func Cache(key interface{}, data ...interface{}) interface{} {
-//	cachePRI := Config["cachePRI"].([]string)
-//	var res interface{}
-//	for i := 0; i < len(cachePRI); i++ {
-//		if cachePRI[i] == "ridis" && Config["cacheConfig"].(Map)["ridis"].(CacheConfg).Used {
-//			res = CacheMemIns.Cache(ObjToStr(key), data...)
-//		}
-//		if cachePRI[i] == "db" && Config["cacheConfig"].(Map)["db"].(CacheConfg).Used {
-//			res = CacheDBIns.Cache(ObjToStr(key), data...)
-//		}
-//		if cachePRI[i] == "memory" && Config["cacheConfig"].(Map)["memory"].(CacheConfg).Used {
-//			res = CacheMemIns.Cache(ObjToStr(key), data...)
-//		}
-//		//将缓存送到前面的可缓存仓库去
-//		if res != nil {
-//			for j := 0; j < i; j++ {
-//				if cachePRI[j] == "ridis" && Config["cacheConfig"].(Map)["ridis"].(CacheConfg).Used {
-//					CacheMemIns.Cache(ObjToStr(key), res)
-//				}
-//				if cachePRI[j] == "db" && Config["cacheConfig"].(Map)["db"].(CacheConfg).Used {
-//					CacheDBIns.Cache(ObjToStr(key), res)
-//				}
-//				if cachePRI[j] == "memory" && Config["cacheConfig"].(Map)["memory"].(CacheConfg).Used {
-//					CacheMemIns.Cache(ObjToStr(key), res)
-//				}
-//
-//			}
-//			break
-//		}
-//
-//	}
-//	return res
-//}
-
-//func InitCache() {
-//	CacheMemIns.Init(Config["cacheConfig"].(Map)["memory"].(CacheConfg).Time)
-//	CacheDBIns.Init(Config["cacheConfig"].(Map)["db"].(CacheConfg).Time)
-//}
@@ -1,543 +0,0 @@
-package hotime
-
-var MimeMaps = map[string]string{
-	".3dm":         "x-world/x-3dmf",
-	".3dmf":        "x-world/x-3dmf",
-	".7z":          "application/x-7z-compressed",
-	".a":           "application/octet-stream",
-	".aab":         "application/x-authorware-bin",
-	".aam":         "application/x-authorware-map",
-	".aas":         "application/x-authorware-seg",
-	".abc":         "text/vndabc",
-	".ace":         "application/x-ace-compressed",
-	".acgi":        "text/html",
-	".m3u8":        "audio/mpegurl",
-	".afl":         "video/animaflex",
-	".ai":          "application/postscript",
-	".aif":         "audio/aiff",
-	".aifc":        "audio/aiff",
-	".aiff":        "audio/aiff",
-	".aim":         "application/x-aim",
-	".aip":         "text/x-audiosoft-intra",
-	".alz":         "application/x-alz-compressed",
-	".ani":         "application/x-navi-animation",
-	".aos":         "application/x-nokia-9000-communicator-add-on-software",
-	".aps":         "application/mime",
-	".apk":         "application/vnd.android.package-archive",
-	".arc":         "application/x-arc-compressed",
-	".arj":         "application/arj",
-	".art":         "image/x-jg",
-	".asf":         "video/x-ms-asf",
-	".asm":         "text/x-asm",
-	".asp":         "text/asp",
-	".asx":         "application/x-mplayer2",
-	".au":          "audio/basic",
-	".avi":         "video/x-msvideo",
-	".avs":         "video/avs-video",
-	".bcpio":       "application/x-bcpio",
-	".bin":         "application/mac-binary",
-	".bmp":         "image/bmp",
-	".boo":         "application/book",
-	".book":        "application/book",
-	".boz":         "application/x-bzip2",
-	".bsh":         "application/x-bsh",
-	".bz2":         "application/x-bzip2",
-	".bz":          "application/x-bzip",
-	".c++":         "text/plain",
-	".c":           "text/x-c",
-	".cab":         "application/vnd.ms-cab-compressed",
-	".cat":         "application/vndms-pkiseccat",
-	".cc":          "text/x-c",
-	".ccad":        "application/clariscad",
-	".cco":         "application/x-cocoa",
-	".cdf":         "application/cdf",
-	".cer":         "application/pkix-cert",
-	".cha":         "application/x-chat",
-	".chat":        "application/x-chat",
-	".chrt":        "application/vnd.kde.kchart",
-	".class":       "application/java",
-	".com":         "text/plain",
-	".conf":        "text/plain",
-	".cpio":        "application/x-cpio",
-	".cpp":         "text/x-c",
-	".cpt":         "application/mac-compactpro",
-	".crl":         "application/pkcs-crl",
-	".crt":         "application/pkix-cert",
-	".crx":         "application/x-chrome-extension",
-	".csh":         "text/x-scriptcsh",
-	".css":         "text/css;charset=utf-8",
-	".csv":         "text/csv",
-	".cxx":         "text/plain",
-	".dar":         "application/x-dar",
-	".dcr":         "application/x-director",
-	".deb":         "application/x-debian-package",
-	".deepv":       "application/x-deepv",
-	".def":         "text/plain",
-	".der":         "application/x-x509-ca-cert",
-	".dif":         "video/x-dv",
-	".dir":         "application/x-director",
-	".divx":        "video/divx",
-	".dl":          "video/dl",
-	".dmg":         "application/x-apple-diskimage",
-	".doc":         "application/msword",
-	".dot":         "application/msword",
-	".dp":          "application/commonground",
-	".drw":         "application/drafting",
-	".dump":        "application/octet-stream",
-	".dv":          "video/x-dv",
-	".dvi":         "application/x-dvi",
-	".dwf":         "drawing/x-dwf=(old)",
-	".dwg":         "application/acad",
-	".dxf":         "application/dxf",
-	".dxr":         "application/x-director",
-	".el":          "text/x-scriptelisp",
-	".elc":         "application/x-bytecodeelisp=(compiled=elisp)",
-	".eml":         "message/rfc822",
-	".env":         "application/x-envoy",
-	".eps":         "application/postscript",
-	".es":          "application/x-esrehber",
-	".etx":         "text/x-setext",
-	".evy":         "application/envoy",
-	".exe":         "application/octet-stream",
-	".f77":         "text/x-fortran",
-	".f90":         "text/x-fortran",
-	".f":           "text/x-fortran",
-	".fdf":         "application/vndfdf",
-	".fif":         "application/fractals",
-	".fli":         "video/fli",
-	".flo":         "image/florian",
-	".flv":         "video/x-flv",
-	".flx":         "text/vndfmiflexstor",
-	".fmf":         "video/x-atomic3d-feature",
-	".for":         "text/x-fortran",
-	".fpx":         "image/vndfpx",
-	".frl":         "application/freeloader",
-	".funk":        "audio/make",
-	".g3":          "image/g3fax",
-	".g":           "text/plain",
-	".gif":         "image/gif",
-	".gl":          "video/gl",
-	".gsd":         "audio/x-gsm",
-	".gsm":         "audio/x-gsm",
-	".gsp":         "application/x-gsp",
-	".gss":         "application/x-gss",
-	".gtar":        "application/x-gtar",
-	".gz":          "application/x-compressed",
-	".gzip":        "application/x-gzip",
-	".h":           "text/x-h",
-	".hdf":         "application/x-hdf",
-	".help":        "application/x-helpfile",
-	".hgl":         "application/vndhp-hpgl",
-	".hh":          "text/x-h",
-	".hlb":         "text/x-script",
-	".hlp":         "application/hlp",
-	".hpg":         "application/vndhp-hpgl",
-	".hpgl":        "application/vndhp-hpgl",
-	".hqx":         "application/binhex",
-	".hta":         "application/hta",
-	".htc":         "text/x-component",
-	".htm":         "text/html;charset=utf-8",
-	".html":        "text/html;charset=utf-8",
-	".htmls":       "text/html",
-	".htt":         "text/webviewhtml",
-	".htx":         "text/html",
-	".ice":         "x-conference/x-cooltalk",
-	".ico":         "image/x-icon",
-	".ics":         "text/calendar",
-	".icz":         "text/calendar",
-	".idc":         "text/plain",
-	".ief":         "image/ief",
-	".iefs":        "image/ief",
-	".iges":        "application/iges",
-	".igs":         "application/iges",
-	".ima":         "application/x-ima",
-	".imap":        "application/x-httpd-imap",
-	".inf":         "application/inf",
-	".ins":         "application/x-internett-signup",
-	".ip":          "application/x-ip2",
-	".isu":         "video/x-isvideo",
-	".it":          "audio/it",
-	".iv":          "application/x-inventor",
-	".ivr":         "i-world/i-vrml",
-	".ivy":         "application/x-livescreen",
-	".jam":         "audio/x-jam",
-	".jav":         "text/x-java-source",
-	".java":        "text/x-java-source",
-	".jcm":         "application/x-java-commerce",
-	".jfif-tbnl":   "image/jpeg",
-	".jfif":        "image/jpeg",
-	".jnlp":        "application/x-java-jnlp-file",
-	".jpe":         "image/jpeg",
-	".jpeg":        "image/jpeg",
-	".jpg":         "image/jpeg",
-	".jps":         "image/x-jps",
-	".js":          "application/javascript;charset=utf-8",
-	".json":        "application/json",
-	".jut":         "image/jutvision",
-	".kar":         "audio/midi",
-	".karbon":      "application/vnd.kde.karbon",
-	".kfo":         "application/vnd.kde.kformula",
-	".flw":         "application/vnd.kde.kivio",
-	".kml":         "application/vnd.google-earth.kml+xml",
-	".kmz":         "application/vnd.google-earth.kmz",
-	".kon":         "application/vnd.kde.kontour",
-	".kpr":         "application/vnd.kde.kpresenter",
-	".kpt":         "application/vnd.kde.kpresenter",
-	".ksp":         "application/vnd.kde.kspread",
-	".kwd":         "application/vnd.kde.kword",
-	".kwt":         "application/vnd.kde.kword",
-	".ksh":         "text/x-scriptksh",
-	".la":          "audio/nspaudio",
-	".lam":         "audio/x-liveaudio",
-	".latex":       "application/x-latex",
-	".lha":         "application/lha",
-	".lhx":         "application/octet-stream",
-	".list":        "text/plain",
-	".lma":         "audio/nspaudio",
-	".log":         "text/plain",
-	".lsp":         "text/x-scriptlisp",
-	".lst":         "text/plain",
-	".lsx":         "text/x-la-asf",
-	".ltx":         "application/x-latex",
-	".lzh":         "application/octet-stream",
-	".lzx":         "application/lzx",
-	".m1v":         "video/mpeg",
-	".m2a":         "audio/mpeg",
-	".m2v":         "video/mpeg",
-	".m3u":         "audio/x-mpegurl",
-	".m":           "text/x-m",
-	".man":         "application/x-troff-man",
-	".manifest":    "text/cache-manifest",
-	".map":         "application/x-navimap",
-	".mar":         "text/plain",
-	".mbd":         "application/mbedlet",
-	".mc$":         "application/x-magic-cap-package-10",
-	".mcd":         "application/mcad",
-	".mcf":         "text/mcf",
-	".mcp":         "application/netmc",
-	".me":          "application/x-troff-me",
-	".mht":         "message/rfc822",
-	".mhtml":       "message/rfc822",
-	".mid":         "application/x-midi",
-	".midi":        "application/x-midi",
-	".mif":         "application/x-frame",
-	".mime":        "message/rfc822",
-	".mjf":         "audio/x-vndaudioexplosionmjuicemediafile",
-	".mjpg":        "video/x-motion-jpeg",
-	".mm":          "application/base64",
-	".mme":         "application/base64",
-	".mod":         "audio/mod",
-	".moov":        "video/quicktime",
-	".mov":         "video/quicktime",
-	".movie":       "video/x-sgi-movie",
-	".mp2":         "audio/mpeg",
-	".mp3":         "audio/mpeg3",
-	".mp4":         "video/mp4",
-	".mpa":         "audio/mpeg",
-	".mpc":         "application/x-project",
-	".mpe":         "video/mpeg",
-	".mpeg":        "video/mpeg",
-	".mpg":         "video/mpeg",
-	".mpga":        "audio/mpeg",
-	".mpp":         "application/vndms-project",
-	".mpt":         "application/x-project",
-	".mpv":         "application/x-project",
-	".mpx":         "application/x-project",
-	".mrc":         "application/marc",
-	".ms":          "application/x-troff-ms",
-	".mv":          "video/x-sgi-movie",
-	".my":          "audio/make",
-	".mzz":         "application/x-vndaudioexplosionmzz",
-	".nap":         "image/naplps",
-	".naplps":      "image/naplps",
-	".nc":          "application/x-netcdf",
-	".ncm":         "application/vndnokiaconfiguration-message",
-	".nif":         "image/x-niff",
-	".niff":        "image/x-niff",
-	".nix":         "application/x-mix-transfer",
-	".nsc":         "application/x-conference",
-	".nvd":         "application/x-navidoc",
-	".o":           "application/octet-stream",
-	".oda":         "application/oda",
-	".odb":         "application/vnd.oasis.opendocument.database",
-	".odc":         "application/vnd.oasis.opendocument.chart",
-	".odf":         "application/vnd.oasis.opendocument.formula",
-	".odg":         "application/vnd.oasis.opendocument.graphics",
-	".odi":         "application/vnd.oasis.opendocument.image",
-	".odm":         "application/vnd.oasis.opendocument.text-master",
-	".odp":         "application/vnd.oasis.opendocument.presentation",
-	".ods":         "application/vnd.oasis.opendocument.spreadsheet",
-	".odt":         "application/vnd.oasis.opendocument.text",
-	".oga":         "audio/ogg",
-	".ogg":         "audio/ogg",
-	".ogv":         "video/ogg",
-	".omc":         "application/x-omc",
-	".omcd":        "application/x-omcdatamaker",
-	".omcr":        "application/x-omcregerator",
-	".otc":         "application/vnd.oasis.opendocument.chart-template",
-	".otf":         "application/vnd.oasis.opendocument.formula-template",
-	".otg":         "application/vnd.oasis.opendocument.graphics-template",
-	".oth":         "application/vnd.oasis.opendocument.text-web",
-	".oti":         "application/vnd.oasis.opendocument.image-template",
-	".otm":         "application/vnd.oasis.opendocument.text-master",
-	".otp":         "application/vnd.oasis.opendocument.presentation-template",
-	".ots":         "application/vnd.oasis.opendocument.spreadsheet-template",
-	".ott":         "application/vnd.oasis.opendocument.text-template",
-	".p10":         "application/pkcs10",
-	".p12":         "application/pkcs-12",
-	".p7a":         "application/x-pkcs7-signature",
-	".p7c":         "application/pkcs7-mime",
-	".p7m":         "application/pkcs7-mime",
-	".p7r":         "application/x-pkcs7-certreqresp",
-	".p7s":         "application/pkcs7-signature",
-	".p":           "text/x-pascal",
-	".part":        "application/pro_eng",
-	".pas":         "text/pascal",
-	".pbm":         "image/x-portable-bitmap",
-	".pcl":         "application/vndhp-pcl",
-	".pct":         "image/x-pict",
-	".pcx":         "image/x-pcx",
-	".pdb":         "chemical/x-pdb",
-	".pdf":         "application/pdf",
-	".pfunk":       "audio/make",
-	".pgm":         "image/x-portable-graymap",
-	".pic":         "image/pict",
-	".pict":        "image/pict",
-	".pkg":         "application/x-newton-compatible-pkg",
-	".pko":         "application/vndms-pkipko",
-	".pl":          "text/x-scriptperl",
-	".plx":         "application/x-pixclscript",
-	".pm4":         "application/x-pagemaker",
-	".pm5":         "application/x-pagemaker",
-	".pm":          "text/x-scriptperl-module",
-	".png":         "image/png",
-	".pnm":         "application/x-portable-anymap",
-	".pot":         "application/mspowerpoint",
-	".pov":         "model/x-pov",
-	".ppa":         "application/vndms-powerpoint",
-	".ppm":         "image/x-portable-pixmap",
-	".pps":         "application/mspowerpoint",
-	".ppt":         "application/mspowerpoint",
-	".ppz":         "application/mspowerpoint",
-	".pre":         "application/x-freelance",
-	".prt":         "application/pro_eng",
-	".ps":          "application/postscript",
-	".psd":         "application/octet-stream",
-	".pvu":         "paleovu/x-pv",
-	".pwz":         "application/vndms-powerpoint",
-	".py":          "text/x-scriptphyton",
-	".pyc":         "applicaiton/x-bytecodepython",
-	".qcp":         "audio/vndqcelp",
-	".qd3":         "x-world/x-3dmf",
-	".qd3d":        "x-world/x-3dmf",
-	".qif":         "image/x-quicktime",
-	".qt":          "video/quicktime",
-	".qtc":         "video/x-qtc",
-	".qti":         "image/x-quicktime",
-	".qtif":        "image/x-quicktime",
-	".ra":          "audio/x-pn-realaudio",
-	".ram":         "audio/x-pn-realaudio",
-	".rar":         "application/x-rar-compressed",
-	".ras":         "application/x-cmu-raster",
-	".rast":        "image/cmu-raster",
-	".rexx":        "text/x-scriptrexx",
-	".rf":          "image/vndrn-realflash",
-	".rgb":         "image/x-rgb",
-	".rm":          "application/vndrn-realmedia",
-	".rmi":         "audio/mid",
-	".rmm":         "audio/x-pn-realaudio",
-	".rmp":         "audio/x-pn-realaudio",
-	".rng":         "application/ringing-tones",
-	".rnx":         "application/vndrn-realplayer",
-	".roff":        "application/x-troff",
-	".rp":          "image/vndrn-realpix",
-	".rpm":         "audio/x-pn-realaudio-plugin",
-	".rt":          "text/vndrn-realtext",
-	".rtf":         "text/richtext",
-	".rtx":         "text/richtext",
-	".rv":          "video/vndrn-realvideo",
-	".s":           "text/x-asm",
-	".s3m":         "audio/s3m",
-	".s7z":         "application/x-7z-compressed",
-	".saveme":      "application/octet-stream",
-	".sbk":         "application/x-tbook",
-	".scm":         "text/x-scriptscheme",
-	".sdml":        "text/plain",
-	".sdp":         "application/sdp",
-	".sdr":         "application/sounder",
-	".sea":         "application/sea",
-	".set":         "application/set",
-	".sgm":         "text/x-sgml",
-	".sgml":        "text/x-sgml",
-	".sh":          "text/x-scriptsh",
-	".shar":        "application/x-bsh",
-	".shtml":       "text/x-server-parsed-html",
-	".sid":         "audio/x-psid",
-	".skd":         "application/x-koan",
-	".skm":         "application/x-koan",
-	".skp":         "application/x-koan",
-	".skt":         "application/x-koan",
-	".sit":         "application/x-stuffit",
-	".sitx":        "application/x-stuffitx",
-	".sl":          "application/x-seelogo",
-	".smi":         "application/smil",
-	".smil":        "application/smil",
-	".snd":         "audio/basic",
-	".sol":         "application/solids",
-	".spc":         "text/x-speech",
-	".spl":         "application/futuresplash",
-	".spr":         "application/x-sprite",
-	".sprite":      "application/x-sprite",
-	".spx":         "audio/ogg",
-	".src":         "application/x-wais-source",
-	".ssi":         "text/x-server-parsed-html",
-	".ssm":         "application/streamingmedia",
-	".sst":         "application/vndms-pkicertstore",
-	".step":        "application/step",
-	".stl":         "application/sla",
-	".stp":         "application/step",
-	".sv4cpio":     "application/x-sv4cpio",
-	".sv4crc":      "application/x-sv4crc",
-	".svf":         "image/vnddwg",
-	".svg":         "image/svg+xml",
-	".svr":         "application/x-world",
-	".swf":         "application/x-shockwave-flash",
-	".t":           "application/x-troff",
-	".talk":        "text/x-speech",
-	".tar":         "application/x-tar",
-	".tbk":         "application/toolbook",
-	".tcl":         "text/x-scripttcl",
-	".tcsh":        "text/x-scripttcsh",
-	".tex":         "application/x-tex",
-	".texi":        "application/x-texinfo",
-	".texinfo":     "application/x-texinfo",
-	".text":        "text/plain",
-	".tgz":         "application/gnutar",
-	".tif":         "image/tiff",
-	".tiff":        "image/tiff",
-	".tr":          "application/x-troff",
-	".tsi":         "audio/tsp-audio",
-	".tsp":         "application/dsptype",
-	".tsv":         "text/tab-separated-values",
-	".turbot":      "image/florian",
-	".txt":         "text/plain",
-	".uil":         "text/x-uil",
-	".uni":         "text/uri-list",
-	".unis":        "text/uri-list",
-	".unv":         "application/i-deas",
-	".uri":         "text/uri-list",
-	".uris":        "text/uri-list",
-	".ustar":       "application/x-ustar",
-	".uu":          "text/x-uuencode",
-	".uue":         "text/x-uuencode",
-	".vcd":         "application/x-cdlink",
-	".vcf":         "text/x-vcard",
-	".vcard":       "text/x-vcard",
-	".vcs":         "text/x-vcalendar",
-	".vda":         "application/vda",
-	".vdo":         "video/vdo",
-	".vew":         "application/groupwise",
-	".viv":         "video/vivo",
-	".vivo":        "video/vivo",
-	".vmd":         "application/vocaltec-media-desc",
-	".vmf":         "application/vocaltec-media-file",
-	".voc":         "audio/voc",
-	".vos":         "video/vosaic",
-	".vox":         "audio/voxware",
-	".vqe":         "audio/x-twinvq-plugin",
-	".vqf":         "audio/x-twinvq",
-	".vql":         "audio/x-twinvq-plugin",
-	".vrml":        "application/x-vrml",
-	".vrt":         "x-world/x-vrt",
-	".vsd":         "application/x-visio",
-	".vst":         "application/x-visio",
-	".vsw":         "application/x-visio",
-	".w60":         "application/wordperfect60",
-	".w61":         "application/wordperfect61",
-	".w6w":         "application/msword",
-	".wav":         "audio/wav",
-	".wb1":         "application/x-qpro",
-	".wbmp":        "image/vnd.wap.wbmp",
-	".web":         "application/vndxara",
-	".wiz":         "application/msword",
-	".wk1":         "application/x-123",
-	".wmf":         "windows/metafile",
-	".wml":         "text/vnd.wap.wml",
-	".wmlc":        "application/vnd.wap.wmlc",
-	".wmls":        "text/vnd.wap.wmlscript",
-	".wmlsc":       "application/vnd.wap.wmlscriptc",
-	".word":        "application/msword",
-	".wp5":         "application/wordperfect",
-	".wp6":         "application/wordperfect",
-	".wp":          "application/wordperfect",
-	".wpd":         "application/wordperfect",
-	".wq1":         "application/x-lotus",
-	".wri":         "application/mswrite",
-	".wrl":         "application/x-world",
-	".wrz":         "model/vrml",
-	".wsc":         "text/scriplet",
-	".wsrc":        "application/x-wais-source",
-	".wtk":         "application/x-wintalk",
-	".x-png":       "image/png",
-	".xbm":         "image/x-xbitmap",
-	".xdr":         "video/x-amt-demorun",
-	".xgz":         "xgl/drawing",
-	".xif":         "image/vndxiff",
-	".xl":          "application/excel",
-	".xla":         "application/excel",
-	".xlb":         "application/excel",
-	".xlc":         "application/excel",
-	".xld":         "application/excel",
-	".xlk":         "application/excel",
-	".xll":         "application/excel",
-	".xlm":         "application/excel",
-	".xls":         "application/excel",
-	".xlt":         "application/excel",
-	".xlv":         "application/excel",
-	".xlw":         "application/excel",
-	".xm":          "audio/xm",
-	".xml":         "text/xml",
-	".xmz":         "xgl/movie",
-	".xpix":        "application/x-vndls-xpix",
-	".xpm":         "image/x-xpixmap",
-	".xsr":         "video/x-amt-showrun",
-	".xwd":         "image/x-xwd",
-	".xyz":         "chemical/x-pdb",
-	".z":           "application/x-compress",
-	".zip":         "application/zip",
-	".zoo":         "application/octet-stream",
-	".zsh":         "text/x-scriptzsh",
-	".docx":        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-	".docm":        "application/vnd.ms-word.document.macroEnabled.12",
-	".dotx":        "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
-	".dotm":        "application/vnd.ms-word.template.macroEnabled.12",
-	".xlsx":        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-	".xlsm":        "application/vnd.ms-excel.sheet.macroEnabled.12",
-	".xltx":        "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
-	".xltm":        "application/vnd.ms-excel.template.macroEnabled.12",
-	".xlsb":        "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
-	".xlam":        "application/vnd.ms-excel.addin.macroEnabled.12",
-	".pptx":        "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-	".pptm":        "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
-	".ppsx":        "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
-	".ppsm":        "application/vnd.ms-powerpoint.slideshow.macroEnabled.12",
-	".potx":        "application/vnd.openxmlformats-officedocument.presentationml.template",
-	".potm":        "application/vnd.ms-powerpoint.template.macroEnabled.12",
-	".ppam":        "application/vnd.ms-powerpoint.addin.macroEnabled.12",
-	".sldx":        "application/vnd.openxmlformats-officedocument.presentationml.slide",
-	".sldm":        "application/vnd.ms-powerpoint.slide.macroEnabled.12",
-	".thmx":        "application/vnd.ms-officetheme",
-	".onetoc":      "application/onenote",
-	".onetoc2":     "application/onenote",
-	".onetmp":      "application/onenote",
-	".onepkg":      "application/onenote",
-	".key":         "application/x-iwork-keynote-sffkey",
-	".kth":         "application/x-iwork-keynote-sffkth",
-	".nmbtemplate": "application/x-iwork-numbers-sfftemplate",
-	".numbers":     "application/x-iwork-numbers-sffnumbers",
-	".pages":       "application/x-iwork-pages-sffpages",
-	".template":    "application/x-iwork-pages-sfftemplate",
-	".xpi":         "application/x-xpinstall",
-	".oex":         "application/x-opera-extension",
-	".mustache":    "text/html",
-}
@@ -1,93 +0,0 @@
-package hotime
-
-//对象封装方便取用
-type Obj struct {
-	Data interface{}
-	contextBase
-}
-
-func (this *Obj) Put(data interface{}) {
-	this.Data = data
-}
-
-func (this *Obj) ToInt(err ...Error) int {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToInt(this.Data, &this.Error)
-}
-
-func (this *Obj) ToInt64(err ...Error) int64 {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToInt64(this.Data, &this.Error)
-}
-
-func (this *Obj) ToFloat64(err ...Error) float64 {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToFloat64(this.Data, &this.Error)
-}
-
-//获取向上取整float64
-func (this *Obj) ToCeilFloat64(err ...*Error) float64 {
-	if len(err) != 0 {
-		this.Error = *err[0]
-	}
-	v := ObjToCeilFloat64(this.Data, err...)
-	return v
-
-}
-
-func (this *Obj) ToStr() string {
-
-	return ObjToStr(this.Data)
-}
-
-func (this *Obj) ToMap(err ...Error) Map {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToMap(this.Data, &this.Error)
-}
-
-func (this *Obj) ToSlice(err ...Error) Slice {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToSlice(this.Data, &this.Error)
-}
-
-func (this *Obj) ToMapArray(err ...Error) []Map {
-	if len(err) != 0 {
-		this.Error = err[0]
-	}
-	return ObjToMapArray(this.Data, &this.Error)
-}
-
-func (this *Obj) ToObj() interface{} {
-
-	return this.Data
-}
-
-//获取向上取整Int64
-func (this *Obj) ToCeilInt64(err ...*Error) int64 {
-	if len(err) != 0 {
-		this.Error = *err[0]
-	}
-	v := ObjToCeilInt64(this.Data, err...)
-	return v
-
-}
-
-//获取向上取整Int
-func (this *Obj) ToCeilInt(err ...*Error) int {
-	if len(err) != 0 {
-		this.Error = *err[0]
-	}
-	v := ObjToCeilInt(this.Data, err...)
-	return v
-
-}
@@ -1,71 +0,0 @@
-package hotime
-
-//session对象
-type SessionIns struct {
-	ShortCache CacheIns
-	LongCache  CacheIns
-	SessionId  string
-	Map
-	contextBase
-}
-
-func (this *SessionIns) set() {
-
-	if this.ShortCache != nil {
-		this.ShortCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-	}
-	if this.LongCache != nil {
-		this.LongCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-	}
-
-}
-
-func (this *SessionIns) Session(key string, data ...interface{}) *Obj {
-
-	if this.Map == nil {
-		this.get()
-	}
-
-	if len(data) != 0 {
-		if data[0] == nil {
-			delete(this.Map, key)
-			this.set()
-		} else {
-			this.Map[key] = data[0]
-			this.set()
-		}
-		return &Obj{Data: nil}
-	}
-
-	return &Obj{Data: this.Map.Get(key)}
-
-}
-
-func (this *SessionIns) get() {
-
-	if this.ShortCache != nil {
-		this.Map = this.ShortCache.Cache(HEAD_SESSION_ADD + this.SessionId).ToMap()
-		if this.Map != nil {
-			return
-		}
-	}
-
-	if this.LongCache != nil {
-		this.Map = this.LongCache.Cache(HEAD_SESSION_ADD + this.SessionId).ToMap()
-		if this.Map != nil {
-			if this.ShortCache != nil {
-				this.ShortCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-			}
-			return
-		}
-	}
-	this.Map = Map{}
-	this.ShortCache.Cache(HEAD_SESSION_ADD+this.SessionId, this.Map)
-
-	return
-}
-
-func (this *SessionIns) Init(short CacheIns, long CacheIns) {
-	this.ShortCache = short
-	this.LongCache = long
-}
@@ -1,87 +0,0 @@
-package hotime
-
-import (
-	"errors"
-)
-
-type Slice []interface{}
-
-//获取string
-func (this Slice) GetString(key int, err ...*Error) string {
-	if len(err) != 0 {
-		err[0].SetError(nil)
-	}
-	return ObjToStr((this)[key])
-}
-
-//获取Int
-func (this Slice) GetInt(key int, err ...*Error) int {
-	v := ObjToInt((this)[key], err...)
-	return v
-}
-
-//获取Int
-func (this Slice) GetInt64(key int, err ...*Error) int64 {
-	v := ObjToInt64((this)[key], err...)
-
-	return v
-}
-
-//获取向上取整Int64
-func (this Slice) GetCeilInt64(key int, err ...*Error) int64 {
-	v := ObjToCeilInt64((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整Int
-func (this Slice) GetCeilInt(key int, err ...*Error) int {
-	v := ObjToCeilInt((this)[key], err...)
-	return v
-
-}
-
-//获取向上取整float64
-func (this Slice) GetCeilFloat64(key int, err ...*Error) float64 {
-	v := ObjToCeilFloat64((this)[key], err...)
-	return v
-
-}
-
-//获取Float64
-func (this Slice) GetFloat64(key int, err ...*Error) float64 {
-	v := ObjToFloat64((this)[key], err...)
-
-	return v
-}
-
-func (this Slice) GetSlice(key int, err ...*Error) Slice {
-	v := ObjToSlice((this)[key], err...)
-	return v
-}
-
-func (this Slice) GetMap(key int, err ...*Error) Map {
-	//var v Map
-	v := ObjToMap((this)[key], err...)
-	return v
-}
-
-func (this Slice) Get(key int, err ...*Error) interface{} {
-
-	if key < len(this) {
-		return this[key]
-	}
-	e := errors.New("没有存储key及对应的数据")
-	if len(err) != 0 {
-		err[0].SetError(e)
-	}
-	return nil
-}
-
-func (this Slice) Put(key int, value interface{}) {
-	this[key] = value
-}
-
-func (this Slice) ToJsonString() string {
-	return ObjToStr(this)
-}
@@ -1,18 +0,0 @@
-package db
-
-import (
-	"code.hoteas.com/golang/hotime"
-	"code.hoteas.com/golang/hotime/tools/mysql"
-	"code.hoteas.com/golang/hotime/tools/sqlite"
-	"strings"
-)
-
-func SetDB(appIns *hotime.Application) {
-	if appIns.Config.GetString("dbType") == "sqlite" || strings.Index(appIns.Config.GetString("dbName"), ".db") == len(appIns.Config.GetString("dbName"))-3 {
-		appIns.Config["dbType"] = "sqlite"
-		sqlite.SetDB(appIns)
-	} else {
-		appIns.Config["dbType"] = "mysql"
-		mysql.SetDB(appIns)
-	}
-}
@@ -1,19 +0,0 @@
-package mysql
-
-import (
-	"code.hoteas.com/golang/hotime"
-	"database/sql"
-	_ "github.com/go-sql-driver/mysql"
-)
-
-func SetDB(appIns *hotime.Application) {
-	appIns.SetConnectDB(func(err ...*hotime.Error) *sql.DB {
-		query := appIns.Config.GetString("dbUser") + ":" + appIns.Config.GetString("dbPwd") +
-			"@tcp(" + appIns.Config.GetString("dbHost") + ":" + appIns.Config.GetString("dbPort") + ")/" + appIns.Config.GetString("dbName") + "?charset=utf8"
-		DB, e := sql.Open("mysql", query)
-		if e != nil && len(err) != 0 {
-			err[0].SetError(e)
-		}
-		return DB
-	})
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hoteas	136232dd57	修复太过于严格的bug	2022-01-03 01:42:35 +08:00
hoteas	008f19355c	增加自适应模式	2021-12-31 02:38:51 +08:00
hoteas	1fc0a5bbbc	增加自适应模式	2021-12-30 22:19:52 +08:00
hoteas	ce099b8fc8	增加自适应模式	2021-12-29 00:46:07 +08:00
hoteas	9c00ac6ba1	增加自适应模式	2021-12-28 09:26:26 +08:00
hoteas	a5c002bbce	增加自适应模式	2021-12-27 21:30:33 +08:00
hoteas	cf50a699a6	增加自适应模式	2021-12-27 21:30:24 +08:00
hoteas	662003c0ca	增加自适应模式	2021-12-27 20:40:16 +08:00
hoteas	f24de2562a	优化系统	2021-12-27 18:21:41 +08:00
hoteas	b84bd7e16f	优化系统	2021-12-27 14:09:49 +08:00
hoteas	2fb6abf53a	Merge branch 'master' into myhs # Conflicts: # example/admin/init.go # example/bzyy.exe # example/main.go	2021-12-27 14:02:39 +08:00
hoteas	2eab29f428	优化系统	2021-12-27 14:01:04 +08:00
hoteas	84ee0d259f	优化系统	2021-12-27 14:00:08 +08:00
hoteas	eccab42fc8	优化系统	2021-12-18 00:07:35 +08:00
hoteas	1465ba36d3	优化系统	2021-12-17 14:37:41 +08:00
hoteas	8380b097b2	调试	2021-12-17 01:21:08 +08:00
hoteas	6b8f901163	调试	2021-12-16 13:40:19 +08:00
hoteas	bb16f0a75b	调试	2021-12-16 13:24:31 +08:00
hoteas	84dbc5d71e	出入库完成	2021-12-16 10:49:35 +08:00
hoteas	166eeee64c	出入库完成	2021-12-15 09:24:41 +08:00
hoteas	7a649fd652	出入库完成	2021-12-15 05:56:31 +08:00
hoteas	94ae568526	书写前端接口	2021-12-12 04:22:30 +08:00
hoteas	9ec597f26c	书写前端接口	2021-12-11 23:53:47 +08:00
hoteas	388bc5006d	书写前端代码	2021-12-11 17:59:02 +08:00
hoteas	0e33c2ad9d	ocr增加	2021-12-09 11:16:15 +08:00
hoteas	af726fbcfb	ocr增加	2021-12-09 10:58:53 +08:00
hoteas	1e82a5964d	优化makecode	2021-11-29 03:27:07 +08:00
hoteas	d62ba8b0cd	优化makecode	2021-11-23 18:31:00 +08:00
hoteas	320ebe25ec	优化makecode	2021-11-18 12:22:14 +08:00
hoteas	68257d1742	绵阳宏升代码优化	2021-11-15 03:35:13 +08:00
hoteas	80d167cb1b	绵阳宏升代码优化	2021-11-15 03:34:45 +08:00
hoteas	cd911e8fa4	巴中代码提交	2021-11-15 03:32:50 +08:00
hoteas	faa6fcb00c	初次提交	2021-11-15 03:30:21 +08:00
hoteas	836c1f461f	初次提交	2021-11-15 03:28:14 +08:00
hoteas	97b2f54383	初次提交	2021-11-15 03:26:54 +08:00
hoteas	9d5f8438c5	初次提交	2021-11-13 21:06:29 +08:00
hoteas	3f7963e7cf	初次提交	2021-11-08 09:16:28 +08:00
hoteas	269df85d27	初次提交	2021-11-08 09:15:52 +08:00
hoteas	d28c6863e4	初次提交	2021-11-08 06:50:37 +08:00
hoteas	bba4990ccc	完善访问日志	2021-11-08 06:49:34 +08:00
hoteas	c57afd6a5d	修复短信发送bug	2021-10-27 00:27:24 +08:00
hoteas	25f355c8d0	增加天府通办登录	2021-10-25 23:18:27 +08:00
hoteas	b1b0673e69	修复bug	2021-10-21 23:20:58 +08:00
hoteas	72c086d726	修复bug	2021-10-21 23:19:32 +08:00
hoteas	3810ba6c0b	修复bug	2021-10-21 22:52:40 +08:00
hoteas	5c775b4539	修复bug	2021-10-18 04:49:55 +08:00
hoteas	deb3e54cc3	修复bug	2021-09-25 04:36:07 +08:00
hoteas	d1a8f6c668	短信变更	2021-09-24 15:01:03 +08:00
hoteas	2291ba7402	巴中恩阳适配	2021-09-24 10:49:07 +08:00
hoteas	20390091f2	巴中恩阳适配	2021-09-17 04:45:43 +08:00
hoteas	123d819b0f	开始新增代码生成配置2.0功能，配置文件格式规定完成	2021-09-17 04:00:49 +08:00
hoteas	30e275a27d	开始新增代码生成配置2.0功能，配置文件格式规定完成	2021-09-16 04:33:10 +08:00
hoteas	1a53f587e8	增加表关联新建功能，同时修复数据库bug	2021-09-12 06:14:01 +08:00
hoteas	9c3ba81135	测试	2021-09-12 05:35:14 +08:00
hoteas	62cf625fe9	增加表关联新建功能，同时修复数据库bug	2021-08-30 07:36:17 +08:00
hoteas	e1f4876621	增加表关联新建功能，同时修复数据库bug	2021-08-29 06:08:19 +08:00
hoteas	b480659a22	增加表关联新建功能，同时修复数据库bug	2021-08-28 13:06:00 +08:00
hoteas	09b1d37ae3	增加表关联新建功能，同时修复数据库bug	2021-08-28 13:05:12 +08:00
hoteas	47b28e7b57	开始新增代码生成配置2.0功能，配置文件格式规定完成	2021-07-21 00:55:59 +08:00
hoteas	9cd7ad34b3	修复浏览器cookie不识别	2021-07-21 00:09:13 +08:00
hoteas	d736a74198	增加表关联新建功能，同时修复数据库bug	2021-07-14 00:48:34 +08:00
hoteas	ada4a926c0	增加表关联新建功能，同时修复数据库bug	2021-07-07 04:08:40 +08:00
hoteas	4ad401bafc	增加上传接口	2021-07-05 02:20:10 +08:00
hoteas	05c8159601	增加上传接口	2021-07-04 04:03:29 +08:00
hoteas	efb6cb980e	优化	2021-06-18 04:56:22 +08:00
hoteas	00ad6487b6	加入树节点功能	2021-06-16 06:10:57 +08:00
hoteas	9aa836a72c	加入树节点功能	2021-06-14 01:19:05 +08:00
hoteas	9ea6082d04	接入搜索功能	2021-06-13 10:40:19 +08:00
hoteas	9e595ab6e8	接入搜索功能	2021-06-13 09:53:37 +08:00
hoteas	8b6dd5fdad	接入搜索功能	2021-06-13 03:08:43 +08:00
hoteas	5c8df885a2	优化表单生成规则	2021-06-12 13:33:35 +08:00
hoteas	cc4d91cdbb	优化表单生成规则	2021-06-11 09:41:23 +08:00
hoteas	32167d4721	增加menu自动化添加功能	2021-06-11 08:06:44 +08:00
hoteas	1077f09755	优化代码	2021-06-07 11:32:47 +08:00
hoteas	642bf97272	优化代码	2021-06-06 07:50:58 +08:00
hoteas	4038598470	优化代码	2021-06-06 02:27:22 +08:00
hoteas	79453d4d2a	生成代码，逐步进行优化	2021-06-05 02:18:56 +08:00
hoteas	6aa2b74840	生成代码，逐步进行优化	2021-06-04 10:05:07 +08:00
hoteas	a003612810	生成代码，逐步进行优化	2021-06-04 10:04:37 +08:00
hoteas	d6c11a5d93	已经接入配置文件，开始准备生成代码	2021-06-04 03:03:48 +08:00
hoteas	fe085ce889	已经接入配置文件，开始准备生成代码	2021-06-04 02:57:56 +08:00
hoteas	99933e02f4	引入数据库，代码，配置文件三位一体内容，准备进行一体化配置	2021-06-03 05:31:09 +08:00
hoteas	9af232840c	接入RESTfull风格接口	2021-05-30 00:10:07 +08:00
hoteas	465ea889a2	接入RESTfull风格接口	2021-05-30 00:01:15 +08:00
hoteas	c46fdd8985	接入RESTfull风格接口	2021-05-29 02:57:03 +08:00
hoteas	9fd0a5fd61	完善error库	2021-05-29 00:54:27 +08:00
hoteas	95489fcf49	完善error库	2021-05-29 00:41:17 +08:00
hoteas	0e2932ca89	完善error库	2021-05-29 00:37:20 +08:00
hoteas	764d88894e	完善error库	2021-05-29 00:15:13 +08:00
hoteas	339302956a	缓存测试成功	2021-05-28 23:48:33 +08:00
hoteas	1101937028	缓存驱动更换成功，支持3级缓存，memory，以及db	2021-05-28 22:52:22 +08:00
hoteas	fc315064e7	optimize log tool	2021-05-25 20:27:24 +08:00
hoteas	740059075a	optimize log tool	2021-05-25 19:53:34 +08:00
hoteas	770f0a94c9	optimize log tool	2021-05-25 05:28:56 +08:00
hoteas	df07afb744	use logrus to project default log tools	2021-05-25 05:08:17 +08:00
hoteas	9bc930750d	整个包结构重构	2021-05-24 07:27:41 +08:00
hoteas	77ded19742	move redis code to package hotime	2021-05-24 06:16:32 +08:00
hoteas	2632517fab	mysql add master and slave mode	2021-05-24 06:14:58 +08:00
hoteas	c8e926446e	add cache to framework	2021-05-24 05:47:56 +08:00
hoteas	253f836571	调整配置项设置	2021-05-23 03:35:49 +08:00
hoteas	babf6595ee	测试demo调整	2021-05-22 04:52:03 +08:00
hoteas	91dc207a78	增加readme文件和授权文件	2021-04-30 00:27:12 +08:00
hoteas	d334856c6c	升级同时支持http与https	2020-07-17 01:10:28 +08:00
hoteas	51b1eb3149	删除go mod防止影响	2020-07-04 02:27:52 +08:00
hoteas	91d9a069ac	删除go mod防止影响	2020-07-04 02:24:39 +08:00
hoteas	2a4bf676c9	修正gomod	2020-06-15 14:51:55 +08:00
hoteas	0723555b2d	修正gomod	2020-06-15 14:51:06 +08:00
hoteas	a519249dfc	修正gomod	2020-06-15 14:42:53 +08:00
hoteas	aa7ab49df9	修正gomod	2020-06-15 14:40:57 +08:00
hoteas	5132e67921	修正gomod	2020-06-15 14:39:28 +08:00
				`@@ -0,0 +1 @@`
				.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}
				`@@ -0,0 +1 @@`
				`.not-show-tab-label .el-tabs__header,.not-show-tab-search{display:none}`
				`@@ -0,0 +1 @@`
				.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}
				`@@ -0,0 +1 @@`
				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}
				`@@ -0,0 +1 @@`
				.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}
				`@@ -0,0 +1 @@`
				`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}`
				`@@ -0,0 +1 @@`
				(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}}]);