导出功能修改关联salesman关联关系

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

LICENSE

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

application.go

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

cache/cache.go

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

cache/cache_db.go

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

cache/cache_memory.go

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

cache/cache_redis.go

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

cache/type.go

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

code.go

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

code/config.go

@@ -1,7 +1,7 @@
 package code
 
 import (
-	. "../common"
+	. "code.hoteas.com/golang/hotime/common"
 )
 
 var Config = Map{
@@ -64,6 +64,9 @@ var ColumnNameType = []ColumnShow{
 	{"idcard", false, true, true, false, "", false},
 	{"id", true, false, true, false, "", true},
 	{"parent_id", true, true, true, false, "", true},
+	{"amount", true, true, true, false, "money", true},
+	{"content", false, false, false, false, "textArea", false},
+	{"info", false, true, true, false, "textArea", false},
 	//"sn"{true,true,true,""},
 	{"status", true, true, true, false, "select", false},
 	{"state", true, true, true, false, "select", false},
@@ -78,7 +81,7 @@ var ColumnNameType = []ColumnShow{
 	{"index", false, false, false, false, "index", false},
 	{"password", false, true, false, false, "password", false},
 	{"pwd", false, true, false, false, "password", false},
-	{"info", false, true, true, false, "", false},
+
 	{"version", false, false, false, false, "", false},
 	{"seq", false, true, true, false, "", false},
 	{"sort", false, true, true, false, "", false},
@@ -86,7 +89,7 @@ var ColumnNameType = []ColumnShow{
 	{"description", false, true, true, false, "", false},
 	{"abstract", false, true, true, false, "", false},
 	{"content", false, true, true, false, "", false},
-	{"address", false, true, true, false, "", false},
+	{"address", true, true, true, false, "", false},
 	{"full_name", false, true, true, false, "", false},
 	{"create_time", false, false, true, false, "time", true},
 	{"modify_time", true, false, true, false, "time", true},
@@ -97,7 +100,9 @@ var ColumnNameType = []ColumnShow{
 	{"file", false, true, true, false, "file", false},
 	{"age", false, true, true, false, "", false},
 	{"email", false, true, true, false, "", false},
-	{"time", true, true, true, true, "time", false},
+	{"time", true, true, true, false, "time", false},
 	{"level", false, false, true, false, "", false},
 	{"rule", true, true, true, false, "form", false},
+	{"table", true, false, true, false, "table", false},
+	{"table_id", true, false, true, false, "table_id", false},
 }

code/makecode.go

@@ -1,31 +1,34 @@
 package code
 
 import (
-	. "../common"
-	"../db"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/db"
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"time"
 )
 
 type MakeCode struct {
+	FileConfig    Map
 	IndexMenus    Map
 	TableConfig   Map
 	TableColumns  map[string]map[string]Map
 	SearchColumns map[string]map[string]Map
 	Config        Map
+	RuleConfig    []Map
 	Error
 }
 
-func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCode bool) {
+func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 	isMake := false
 	idSlice := Slice{}
-
+	that.FileConfig = config
 	if that.TableColumns == nil {
 		that.TableColumns = make(map[string]map[string]Map)
 	}
@@ -34,20 +37,48 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 	}
 
 	//加载配置文件
-	btes, err := ioutil.ReadFile(path)
-	Config["name"] = name
+	btes, err := ioutil.ReadFile(config.GetString("config"))
+
 	that.Config = DeepCopyMap(Config).(Map)
+
+	that.Config["name"] = config.GetString("table")
 	if err == nil {
 		cmap := Map{}
 		//文件是否损坏
 		cmap.JsonToMap(string(btes), &that.Error)
 		for k, v := range cmap {
 			that.Config[k] = v //程序配置
-			Config[k] = v      //系统配置
+			//Config[k] = v      //系统配置
 		}
 	} else {
-		that.Error.SetError(errors.New("配置文件不存在，或者配置出错，使用缺省默认配置"))
+		that.Error.SetError(errors.New("config配置文件不存在，或者配置出错，使用缺省默认配置"))
 	}
+	//加载规则文件
+	btesRule, errRule := ioutil.ReadFile(config.GetString("rule"))
+	that.RuleConfig = []Map{}
+	if errRule == nil {
+		//cmap := Map{}
+		//文件是否损坏
+		ruleLis := ObjToSlice(string(btesRule), &that.Error)
+		//cmap.JSON()
+		for k, _ := range ruleLis {
+			that.RuleConfig = append(that.RuleConfig, ruleLis.GetMap(k))
+		}
+	} else {
+		for _, v := range ColumnNameType {
+			that.RuleConfig = append(that.RuleConfig, Map{"name": v.Name, "list": v.List, "edit": v.Edit, "info": v.Info, "must": v.Must, "strict": v.Strict, "type": v.Type})
+		}
+		if db != nil {
+			_ = os.MkdirAll(filepath.Dir(config.GetString("rule")), os.ModeDir)
+			err = ioutil.WriteFile(config.GetString("rule"), []byte(ObjToStr(that.RuleConfig)), os.ModePerm)
+			if err != nil {
+				that.Error.SetError(err)
+			}
+		}
+
+		that.Error.SetError(errors.New("rule配置文件不存在，或者配置出错，使用缺省默认配置"))
+	}
+
 	that.IndexMenus = Map{}
 	menusConfig := that.Config.GetSlice("menus")
 	//将配置写入到内存中仅作为判断用
@@ -119,7 +150,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 	}
 
 	//数据库反哺
-	myInit := strings.Replace(InitTpt, "{{name}}", name, -1)
+	myInit := strings.Replace(InitTpt, "{{name}}", config.GetString("table"), -1)
 	ctrList := ""
 
 	nowTables := make([]Map, 0)
@@ -205,38 +236,42 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 					coloum["label"] = coloum.GetString("label")[:indexNum]
 				}
 
-				for _, ColumnName := range ColumnNameType {
-					if (ColumnName.Strict && coloum.GetString("name") == ColumnName.Name) ||
-						(!ColumnName.Strict && strings.Contains(coloum.GetString("name"), ColumnName.Name)) {
+				for _, ColumnName := range that.RuleConfig {
+					if (ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name")) ||
+						(!ColumnName.GetBool("strict") && strings.Contains(coloum.GetString("name"), ColumnName.GetString("name"))) {
 						//全部都不需要则不加入
-						if ColumnName.Edit == false && ColumnName.List == false && ColumnName.Info == false {
+						if ColumnName.GetBool("edit") == false && ColumnName.GetBool("list") == false && ColumnName.GetBool("info") == false {
 							coloum["notUse"] = true
 							//continue
 						}
-						coloum["info"] = ColumnName.Info
-						coloum["edit"] = ColumnName.Edit
-						coloum["add"] = ColumnName.Edit
-						coloum["list"] = ColumnName.List
-						coloum["must"] = ColumnName.Must
+						coloum["info"] = ColumnName.GetBool("info")
+						coloum["edit"] = ColumnName.GetBool("edit")
+						coloum["add"] = ColumnName.GetBool("edit")
+						coloum["list"] = ColumnName.GetBool("list")
+						coloum["must"] = ColumnName.GetBool("must")
 
-						if ColumnName.Info {
+						if ColumnName.GetBool("info") {
 							delete(coloum, "info")
 						}
-						if ColumnName.Edit {
+						if ColumnName.GetBool("edit") {
 							delete(coloum, "edit")
 							delete(coloum, "add")
 						}
-						if ColumnName.List {
+						if ColumnName.GetBool("list") {
 							delete(coloum, "list")
 						}
-						if ColumnName.Must {
+						if !ColumnName.GetBool("must") {
 							delete(coloum, "must")
 						}
 
-						if ColumnName.Type != "" {
-							coloum["type"] = ColumnName.Type
+						if ColumnName.GetString("type") != "" {
+							if ColumnName.GetString("type") == "time" && coloum["type"] == "number" {
+								coloum["type"] = "unixTime"
+							} else {
+								coloum["type"] = ColumnName.GetString("type")
+							}
 						}
-						if ColumnName.Strict && coloum.GetString("name") == ColumnName.Name {
+						if ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name") {
 							break
 						}
 
@@ -267,10 +302,10 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 				}
 
 				if coloum.GetString("type") == "select" {
-					coloum["must"] = true
+					//coloum["must"] = true
 					coloum["options"] = options
 				} else if len(options) > 0 {
-					coloum["must"] = true
+					//coloum["must"] = true
 					coloum["options"] = options
 					coloum["type"] = "select"
 
@@ -291,16 +326,16 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 
 		}
 
-		if makeCode {
+		if config.GetInt("mode") != 0 {
 			//创建模块文件
 			//判断文件是否存在
 			//_, err := os.OpenFile(name+"/"+v.GetString("name"), os.O_RDONLY, os.ModePerm)
-			_, err := os.Stat(name + "/" + v.GetString("name") + ".go")
+			_, err := os.Stat(config.GetString("name") + "/" + v.GetString("name") + ".go")
 			if err != nil { //文件不存在，则根据模板创建
-				myCtr := strings.Replace(CtrTpt, "{{name}}", name, -1)
+				myCtr := strings.Replace(CtrTpt, "{{name}}", config.GetString("name"), -1)
 				myCtr = strings.Replace(myCtr, "{{table}}", v.GetString("name"), -1)
-				_ = os.MkdirAll(name, os.ModeDir)
-				err = ioutil.WriteFile(name+"/"+v.GetString("name")+".go", []byte(myCtr), os.ModePerm)
+				_ = os.MkdirAll(config.GetString("name"), os.ModeDir)
+				err = ioutil.WriteFile(config.GetString("name")+"/"+v.GetString("name")+".go", []byte(myCtr), os.ModePerm)
 				if err != nil {
 					that.Error.SetError(err)
 				}
@@ -477,8 +512,17 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 					v["value"] = "label"
 					continue
 				}
+				tempC := that.TableConfig.GetMap(tableName).GetSlice("columns")
+				isGet := true
+				for k2, _ := range tempC {
+					if strings.Contains(tempC.GetMap(k2).GetString("name"), "name") || strings.Contains(tempC.GetMap(k2).GetString("name"), "title") {
+						v["value"] = tempC.GetMap(k2).GetString("name")
+						isGet = false
+						break
+					}
+				}
 
-				if len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
+				if isGet && len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
 					v["value"] = that.TableConfig.GetMap(tableName).GetSlice("columns").GetMap(1).GetString("name")
 					continue
 				}
@@ -506,25 +550,25 @@ func (that *MakeCode) Db2JSON(name string, path string, db *db.HoTimeDB, makeCod
 	fmt.Println(id, "---", that.Config.GetString("id"))
 	that.Config["id"] = id
 
-	if makeCode {
+	if config.GetInt("mode") != 0 {
 		//init文件初始化
 		myInit = strings.Replace(myInit, "{{id}}", id, -1)
 		myInit = strings.Replace(myInit, "{{tablesCtr}}", ctrList, -1)
-		_ = os.MkdirAll(name, os.ModeDir)
-		err = ioutil.WriteFile(name+"/init.go", []byte(myInit), os.ModePerm)
+		_ = os.MkdirAll(config.GetString("name"), os.ModeDir)
+		err = ioutil.WriteFile(config.GetString("name")+"/init.go", []byte(myInit), os.ModePerm)
 		if err != nil {
 			that.Error.SetError(err)
 		}
 	}
-	//写入配置文件
-	//var configByte bytes.Buffer
 
+	//写入配置文件
 	//err = json.Indent(&configByte, []byte(that.Config.ToJsonString()), "", "\t")
-	_ = os.MkdirAll(filepath.Dir(path), os.ModeDir)
-	err = ioutil.WriteFile(path, []byte(that.Config.ToJsonString()), os.ModePerm)
+	_ = os.MkdirAll(filepath.Dir(config.GetString("config")), os.ModeDir)
+	err = ioutil.WriteFile(config.GetString("config"), []byte(that.Config.ToJsonString()), os.ModePerm)
 	if err != nil {
 		that.Error.SetError(err)
 	}
+
 	fmt.Println("有新的代码生成，请重新运行")
 	os.Exit(-1)
 
@@ -534,7 +578,16 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 	reStr := ""
 	data := Map{}
 	var ruleData Map
-	for _, v := range that.TableColumns[table] {
+	testQu := []string{}
+	testQuData := that.TableColumns[table]
+	for key, _ := range testQuData {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+
+	for _, k := range testQu {
+		v := testQuData[k]
 		if v == nil {
 			continue
 		}
@@ -545,7 +598,7 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 			//初始化ruleData
 			if ruleData == nil {
 				ruleData = Map{}
-				for _, v := range that.TableColumns["admin"] {
+				for _, v := range that.TableColumns[that.FileConfig.GetString("table")] {
 					if v.GetString("link") != "" &&
 						v.GetString("name") != "parent_id" &&
 						userData.Get(v.GetString("name")) != nil {
@@ -579,7 +632,7 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 	}
 	return reStr, data
 }
-func (that *MakeCode) Add(table string, req *http.Request) Map {
+func (that *MakeCode) Add(table string, user Map, req *http.Request) Map {
 	data := Map{}
 	for _, v := range that.TableColumns[table] {
 		//不可使用，未在前端展示，但在内存中保持有
@@ -593,6 +646,17 @@ func (that *MakeCode) Add(table string, req *http.Request) Map {
 		if v.Get("add") == nil || v.GetBool("add") {
 
 			if len(req.Form[v.GetString("name")]) == 0 {
+
+				if user[v.GetString("name")] != nil {
+					data[v.GetString("name")] = user[v.GetString("name")]
+					continue
+				}
+
+				if that.FileConfig.GetString("table")+"_id" == v.GetString("name") {
+					data[v.GetString("name")] = user["id"]
+					continue
+				}
+
 				if v.GetBool("must") {
 					return nil
 				} else {
@@ -614,12 +678,22 @@ func (that *MakeCode) Add(table string, req *http.Request) Map {
 		}
 
 		if v.GetString("name") == "create_time" {
-			data[v.GetString("name")] = time.Now().Unix()
+			if v.GetString("type") == "unixTime" {
+				data[v.GetString("name")] = time.Now().Unix()
+			}
+			if v.GetString("type") == "time" {
+				data[v.GetString("name")] = time.Now().Format("2006-01-02 15-04-05")
+			}
 			continue
 		}
 
 		if v.GetString("name") == "modify_time" {
-			data[v.GetString("name")] = time.Now().Unix()
+			if v.GetString("type") == "unixTime" {
+				data[v.GetString("name")] = time.Now().Unix()
+			}
+			if v.GetString("type") == "time" {
+				data[v.GetString("name")] = time.Now().Format("2006-01-02 15-04-05")
+			}
 		}
 	}
 	if len(data) == 0 {
@@ -682,12 +756,22 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 	data := Map{}
 	keyword := Map{}
 	daterange := Map{}
-	sort := Map{}
+	sortMap := Map{}
 	var ruleData Map
 	hasUser := false
 
 	keywordStr := req.FormValue("keyword")
-	for _, v := range that.TableColumns[table] {
+
+	testQu := []string{}
+	testQuData := that.TableColumns[table]
+	for key, _ := range testQuData {
+		//fmt.Println(key, ":", value)
+		testQu = append(testQu, key)
+	}
+	sort.Strings(testQu)
+
+	for _, k := range testQu {
+		v := testQuData[k]
 		//不可使用，未在前端展示，但在内存中保持有
 		if v.GetBool("notUse") {
 
@@ -702,6 +786,16 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 					v.GetString("link") + "." + v.GetString("value") + " AS " +
 					v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
 
+				if v.GetString("value") == "name" && that.TableColumns[v.GetString("link")]["nickname"] != nil {
+					reStr += v.GetString("link") + ".nickname AS " +
+						v.GetString("link") + "_" + v.GetString("name") + "_nickname,"
+				}
+
+				if that.TableColumns[v.GetString("link")]["phone"] != nil {
+					reStr += v.GetString("link") + ".phone AS " +
+						v.GetString("link") + "_" + v.GetString("name") + "_phone,"
+				}
+
 				leftJoin["[>]"+v.GetString("link")] =
 					table + "." + v.GetString("name") + "=" +
 						v.GetString("link") + ".id"
@@ -725,7 +819,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 				//初始化ruleData
 				if ruleData == nil {
 					ruleData = Map{}
-					for _, v := range that.TableColumns["admin"] {
+					for _, v := range that.TableColumns[that.FileConfig.GetString("table")] {
 						if v.GetString("link") != "" &&
 							v.GetString("name") != "parent_id" &&
 							userData.Get(v.GetString("name")) != nil {
@@ -796,14 +890,36 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 					continue
 				}
 				//日期类型
-				if searchItemName == "daterange" && v.GetString("type") == "time" {
-					//fmt.Println(req.Form["daterange"])
-					daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+				if searchItemName == "daterange" {
+					if v.GetString("type") == "unixtime" {
+						//fmt.Println(req.Form["daterange"])
+						if len(req.Form["daterange"]) == 1 {
+							daterange[table+"."+v.GetString("name")+"[<]"] = req.FormValue("daterange")
+						} else if len(req.Form["daterange"]) == 2 {
+
+							daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+						}
+					}
+					if v.GetString("type") == "time" {
+						//fmt.Println(req.Form["daterange"])
+
+						if len(req.Form["daterange"]) == 1 {
+							t := time.Unix(ObjToCeilInt64(req.FormValue("daterange")), 0).Format("2006-01-02 15:04:05")
+
+							daterange[table+"."+v.GetString("name")+"[<]"] = t
+
+						} else if len(req.Form["daterange"]) == 2 {
+							t1 := time.Unix(ObjToCeilInt64(req.Form["daterange"][0]), 0).Format("2006-01-02 15:04:05")
+							t2 := time.Unix(ObjToCeilInt64(req.Form["daterange"][1]), 0).Format("2006-01-02 15:04:05")
+							daterange[table+"."+v.GetString("name")+"[<>]"] = Slice{t1, t2}
+						}
+					}
+
 				}
 			}
 
 			if searchItem.GetString("name") == "sort" {
-				sort["ORDER"] = table + "." + reqValue
+				sortMap["ORDER"] = table + "." + reqValue
 			}
 
 			continue
@@ -823,8 +939,8 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 		data[table+"."+searchItemName] = reqValue
 
 	}
-	if sort["ORDER"] == nil {
-		sort["ORDER"] = table + ".id DESC"
+	if sortMap["ORDER"] == nil {
+		sortMap["ORDER"] = table + ".id DESC"
 	}
 
 	where := Map{}
@@ -850,7 +966,9 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 	}
 
 	if len(daterange) > 1 {
-		if data["AND"] != nil {
+		if data == nil || len(data) == 0 {
+			data = Map{"OR": daterange}
+		} else {
 			data = Map{"AND": Map{"AND": data, "OR": daterange}}
 		}
 	}
@@ -869,8 +987,8 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 
 	}
 
-	if len(sort) != 0 {
-		for k, v := range sort {
+	if len(sortMap) != 0 {
+		for k, v := range sortMap {
 			where[k] = v
 		}
 	}

code/template.go

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

common/context_base.go

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

common/func.go

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

common/map.go

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

common/obj.go

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

common/objtoobj.go

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

common/slice.go

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

context.go

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

db/hotimedb.go

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

dri/aliyun/company.go

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

dri/baidu/map.go

@@ -7,26 +7,28 @@ import (
 	"net/url"
 )
 
-type BaiduMap struct {
+type baiduMap struct {
 	Ak  string
 	Url string
 }
 
-func (this *BaiduMap) Init(Ak string) {
+var BaiDuMap = baiduMap{}
+
+func (that *baiduMap) Init(Ak string) {
 	//"ak=ZeT902EZvVgIoGVWEFK3osUm"
-	this.Ak = Ak
-	this.Url = "https://api.map.baidu.com/place/v2/suggestion?output=json" + "&ak=" + Ak
+	that.Ak = Ak
+	that.Url = "https://api.map.baidu.com/place/v2/suggestion?output=json" + "&ak=" + Ak
 	//query
 }
 
 // GetPosition  获取定位列表
-func (this *BaiduMap) GetPosition(name string, region string) (string, error) {
+func (that *baiduMap) GetPosition(name string, region string) (string, error) {
 
 	client := &http.Client{}
 	if region == "" {
 		region = "全国"
 	}
-	reqest, err := http.NewRequest("GET", this.Url+"&query="+url.PathEscape(name)+"&region="+url.PathEscape(region), nil)
+	reqest, err := http.NewRequest("GET", that.Url+"&query="+url.PathEscape(name)+"&region="+url.PathEscape(region), nil)
 
 	if err != nil {
 		fmt.Println("Fatal error ", err.Error())
@@ -50,9 +52,3 @@ func (this *BaiduMap) GetPosition(name string, region string) (string, error) {
 	return string(body), err
 
 }
-
-var DefaultBaiDuMap BaiduMap
-
-func init() {
-	DefaultBaiDuMap = BaiduMap{}
-}

dri/ddsms/ddsms.go

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

dri/download/download.go

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

dri/rsa/deencrypt.go

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

dri/tencent/company.go

@@ -1,7 +1,7 @@
 package tencent
 
 import (
-	. "../../common"
+	. "code.hoteas.com/golang/hotime/common"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
@@ -15,24 +15,40 @@ import (
 	"time"
 )
 
-func calcAuthorization(source string, secretId string, secretKey string) (auth string, datetime string, err error) {
+type company struct {
+	secretId  string
+	secretKey string
+}
+
+var Company = company{}
+
+func (that *company) Init(secretId, secretKey string) {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	that.secretId = secretId
+	that.secretKey = secretKey
+}
+
+func (that *company) calcAuthorization(source string) (auth string, datetime string, err error) {
 
 	timeLocation, _ := time.LoadLocation("Etc/GMT")
 	datetime = time.Now().In(timeLocation).Format("Mon, 02 Jan 2006 15:04:05 GMT")
 	signStr := fmt.Sprintf("x-date: %s\nx-source: %s", datetime, source)
 
 	// hmac-sha1
-	mac := hmac.New(sha1.New, []byte(secretKey))
+	mac := hmac.New(sha1.New, []byte(that.secretKey))
 	mac.Write([]byte(signStr))
 	sign := base64.StdEncoding.EncodeToString(mac.Sum(nil))
 
 	auth = fmt.Sprintf("hmac id=\"%s\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"%s\"",
-		secretId, sign)
+		that.secretId, sign)
 
 	return auth, datetime, nil
 }
 
-func urlencode(params map[string]string) string {
+func (that *company) urlencode(params map[string]string) string {
 	var p = gourl.Values{}
 	for k, v := range params {
 		p.Add(k, v)
@@ -40,7 +56,7 @@ func urlencode(params map[string]string) string {
 	return p.Encode()
 }
 
-func GetCompany(secretId, secretKey, name string) Map {
+func (that *company) GetCompany(name string) Map {
 	// 云市场分配的密钥Id
 	//secretId := "xxxx"
 	//// 云市场分配的密钥Key
@@ -48,7 +64,7 @@ func GetCompany(secretId, secretKey, name string) Map {
 	source := "market"
 
 	// 签名
-	auth, datetime, _ := calcAuthorization(source, secretId, secretKey)
+	auth, datetime, _ := that.calcAuthorization(source)
 
 	// 请求方法
 	method := "GET"
@@ -64,13 +80,13 @@ func GetCompany(secretId, secretKey, name string) Map {
 	// url参数拼接
 	url := "https://service-3jnh3ku8-1256140209.gz.apigw.tencentcs.com/release/business4/geet"
 	if len(queryParams) > 0 {
-		url = fmt.Sprintf("%s?%s", url, urlencode(queryParams))
+		url = fmt.Sprintf("%s?%s", url, that.urlencode(queryParams))
 	}
 
 	bodyMethods := map[string]bool{"POST": true, "PUT": true, "PATCH": true}
 	var body io.Reader = nil
 	if bodyMethods[method] {
-		body = strings.NewReader(urlencode(bodyParams))
+		body = strings.NewReader(that.urlencode(bodyParams))
 		headers["Content-Type"] = "application/x-www-form-urlencoded"
 	}
 

dri/tencent/tencent.go

@@ -8,16 +8,32 @@ import (
 	ocr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr/v20181119"
 )
 
-var credential = common.NewCredential(
-	"AKIDOgT8cKCQksnY7yKATaYO7j9ORJzSYohP",
-	"GNXgjdN4czA9ya0FNMApVJzTmsmU0KSN",
-)
+type tencent struct {
+	secretId   string
+	secretKey  string
+	credential *common.Credential
+}
 
-func OCRCOMPANY(base64Str string) string {
+var Tencent = tencent{}
+
+func (that *tencent) Init(secretId, secretKey string) {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	that.secretId = secretId
+	that.secretKey = secretKey
+	that.credential = common.NewCredential(
+		that.secretId,
+		that.secretKey,
+	)
+}
+
+func (that *tencent) OCRCOMPANY(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewBizLicenseOCRRequest()
 
@@ -38,11 +54,11 @@ func OCRCOMPANY(base64Str string) string {
 	return response.ToJsonString()
 }
 
-func OCR(base64Str string) string {
+func (that *tencent) OCR(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewGeneralAccurateOCRRequest()
 
@@ -63,11 +79,11 @@ func OCR(base64Str string) string {
 	return response.ToJsonString()
 }
 
-func Qrcode(base64Str string) string {
+func (that *tencent) Qrcode(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewQrcodeOCRRequest()
 

dri/upload/upload.go

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

dri/wechat/h5program.go

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

dri/wechat/miniprogram.go

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

dri/wechat/pay.go

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

example/app/AES.go

@@ -0,0 +1,118 @@
+package app
+
+import (
+	"bytes"
+	"code.hoteas.com/golang/hotime/common"
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/base64"
+	"errors"
+	"fmt"
+)
+
+//高级加密标准（Adevanced Encryption Standard ,AES）
+
+//16,24,32位字符串的话，分别对应AES-128，AES-192，AES-256 加密方法
+//key不能泄露
+var PwdKey = []byte("mif022h3g9geAHUHY432,:da1adag389")
+
+//PKCS7 填充模式
+func pKCS7Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	//Repeat()函数的功能是把切片[]byte{byte(padding)}复制padding个，然后合并成新的字节切片返回
+	padtext := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padtext...)
+}
+
+//填充的反向操作，删除填充字符串
+func pKCS7UnPadding(origData []byte) ([]byte, error) {
+	//获取数据长度
+	length := len(origData)
+	if length == 0 {
+		return nil, errors.New("加密字符串错误！")
+	} else {
+		//获取填充字符串长度
+		unpadding := int(origData[length-1])
+		//截取切片，删除填充字节，并且返回明文
+		return origData[:(length - unpadding)], nil
+	}
+}
+
+//实现加密
+func AesEcrypt(origData []byte, key []byte) ([]byte, error) {
+	//创建加密算法实例
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+	//获取块的大小
+	blockSize := block.BlockSize()
+	//对数据进行填充，让数据长度满足需求
+	origData = pKCS7Padding(origData, blockSize)
+	//采用AES加密方法中CBC加密模式
+	blocMode := cipher.NewCBCEncrypter(block, key[:blockSize])
+	crypted := make([]byte, len(origData))
+	//执行加密
+	blocMode.CryptBlocks(crypted, origData)
+	return crypted, nil
+}
+
+//实现解密
+func AesDeCrypt(cypted []byte, key []byte) (bytes []byte, err error) {
+	//异常处理
+	defer func() {
+		if e := recover(); e != nil {
+			//that.SetError(errors.New(fmt.Sprint(err)), LOG_FMT)
+			fmt.Println(err)
+			err = errors.New(common.ObjToStr(e))
+		}
+	}()
+	//创建加密算法实例
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+
+	//获取块大小
+	blockSize := block.BlockSize()
+	//创建加密客户端实例
+	blockMode := cipher.NewCBCDecrypter(block, key[:blockSize])
+	origData := make([]byte, len(cypted))
+	//这个函数也可以用来解密
+	blockMode.CryptBlocks(origData, cypted)
+	//去除填充字符串
+	origData, err = pKCS7UnPadding(origData)
+	if err != nil {
+		return nil, err
+	}
+	return origData, err
+}
+
+//加密base64
+func EnPwdCode(pwd []byte) (string, error) {
+	result, err := AesEcrypt(pwd, PwdKey)
+	if err != nil {
+		return "", err
+	}
+	return base64.StdEncoding.EncodeToString(result), err
+}
+
+//解密
+func DePwdCode(pwd string) ([]byte, error) {
+	//解密base64字符串
+	pwdByte, err := base64.StdEncoding.DecodeString(pwd)
+	if err != nil {
+		fmt.Println(err)
+		return nil, err
+	}
+	//执行AES解密
+	return AesDeCrypt(pwdByte, PwdKey)
+
+}
+
+//func main() {
+//	str := []byte("12fff我是ww.topgoer.com的站长枯藤")
+//	pwd, _ := EnPwdCode(str)
+//	bytes, _ := DePwdCode(pwd)
+//	fmt.Println(string(bytes))
+//}

example/app/article.go

@@ -0,0 +1,110 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var ArticleCtr = Ctr{
+
+	"getdispatchs": func(that *Context) {
+
+		//判断类型
+		tp := that.Req.FormValue("type")
+		//判断类型
+		data := Map{"del_flag": 0}
+		if tp == "notify" {
+			data["notify_id[!]"] = nil
+		}
+
+		if tp == "policy" {
+			data["policy_id[!]"] = nil
+		}
+
+		if tp == "declare" {
+			data["declare_id[!]"] = nil
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "GROUP": "dispatch_name"}
+		} else {
+			data["GROUP"] = "dispatch_name"
+		}
+
+		res := that.Db.Select("article", "dispatch_name", data)
+		that.Display(0, res)
+
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"title[~]": keywords, "description[~]": keywords, "content[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["release_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["release_time[<=]"] = finishTime
+		}
+
+		dispatchName := that.Req.FormValue("dispatch_name")
+		if dispatchName != "" {
+			data["dispatch_name"] = dispatchName
+		}
+
+		//判断类型
+		tp := that.Req.FormValue("type")
+		if tp == "notify" {
+			data["notify_id[!]"] = nil
+		}
+
+		if tp == "policy" {
+			data["policy_id[!]"] = nil
+		}
+
+		if tp == "declare" {
+			data["declare_id[!]"] = nil
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "release_time DESC"}
+		}
+
+		count := that.Db.Count("article", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("article", "id,title,description,department_id,click_num+click_num_base AS click_num,"+
+			"favorite_num_base+favorite_num AS favorite_num,dispatch_num,dispatch_name,prepare_date,release_time,expire_date,area_id,status,policy_id,declare_id,notify_id,dispatch_name,policy_level", data)
+		for _, v := range res {
+
+			if v.GetCeilInt("notify_id") > 0 {
+				v["notify"] = that.Db.Get("notify", "tag", Map{"id": v.GetCeilInt("notify_id")})
+			}
+			if v.GetCeilInt("policy_id") > 0 {
+				v["policy"] = that.Db.Get("policy", "tag", Map{"id": v.GetCeilInt("policy_id")})
+			}
+			if v.GetCeilInt("declare_id") > 0 {
+				v["declare"] = that.Db.Get("declare", "money_scope_min,money_scope_max,status", Map{"id": v.GetCeilInt("declare_id")})
+			}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/company.go

@@ -0,0 +1,259 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/aliyun"
+	"code.hoteas.com/golang/hotime/dri/tencent"
+	"encoding/base64"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+	"time"
+)
+
+var CompanyCtr = Ctr{
+
+	"search": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		keywords := that.Req.FormValue("keywords")
+		if keywords == "" {
+			keywords = that.Req.FormValue("company_name")
+		}
+		if keywords == "" {
+			keywords = that.Req.FormValue("name")
+		}
+
+		if len(keywords) < 2 {
+			that.Display(0, Slice{})
+			return
+		}
+
+		res, err := aliyun.Company.GetCompanyList(keywords)
+		if err != nil {
+			fmt.Println(err)
+			that.Display(0, Slice{})
+			return
+		}
+		if res.GetCeilInt64("status") != 200 {
+			fmt.Println(err)
+			that.Display(0, Slice{})
+			return
+		}
+
+		that.Display(0, res.GetMap("data").GetSlice("list"))
+	},
+	"search_info": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		name := that.Req.FormValue("name")
+
+		if len(name) < 2 {
+			that.Display(3, "找不到企业")
+			return
+		}
+
+		res, err := aliyun.Company.GetCompanyBaseInfo(name)
+		if err != nil {
+			fmt.Println(err)
+			that.Display(4, "查询失败")
+			return
+		}
+		if res.GetBool("status") != true {
+			fmt.Println(err)
+			that.Display(4, "查询失败")
+			return
+		}
+
+		that.Display(0, res.GetMap("data"))
+	},
+	"info": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		user := that.Db.Get("user", "*", Map{"id": that.Session("user_id").Data})
+		if user == nil {
+			that.Display(4, "找不到用户")
+			return
+		}
+
+		res := that.Db.Get("company", "*", Map{"id": user.GetCeilInt("company_id")})
+		if res == nil {
+			that.Display(4, "找不到企业")
+			return
+		}
+		//先不做限制
+		//if res.GetCeilInt("salesman_id")!=that.Session("salesman_id").ToCeilInt(){
+		//	that.Display(4,"不是你的企业")
+		//	return
+		//}
+
+		//res["technology_center_flag"] = ObjToSlice(res["technology_center_flag"])
+		//res["engineering_center_flag"] = ObjToSlice(res["engineering_center_flag"])
+		//res["engineering_laboratory_flag"] = ObjToSlice(res["engineering_laboratory_flag"])
+		//res["key_laboratory_flag"] = ObjToSlice(res["key_laboratory_flag"])
+		//res["industrial_design_center_flag"] = ObjToSlice(res["industrial_design_center_flag"])
+		//
+		//res["high_level_talents_flag1"] = ObjToSlice(res["high_level_talents_flag1"])
+		//
+		//res["tags"] = ObjToSlice(res["tags"])
+
+		res["technology_center_flag"] = strToArray(res.GetString("technology_center_flag"))
+		res["engineering_center_flag"] = strToArray(res.GetString("engineering_center_flag"))
+		res["engineering_laboratory_flag"] = strToArray(res.GetString("engineering_laboratory_flag"))
+		res["key_laboratory_flag"] = strToArray(res.GetString("key_laboratory_flag"))
+		res["industrial_design_center_flag"] = strToArray(res.GetString("industrial_design_center_flag"))
+		res["high_level_talents_flag1"] = strToArray(res.GetString("high_level_talents_flag1"))
+		res["tags"] = strToArray(res.GetString("tags"))
+
+		that.Display(0, res)
+	},
+	"edit": func(that *Context) {
+
+		//if that.Session("user_id").Data == nil {
+		//	that.Display(2, "没有登录")
+		//	return
+		//}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		//统一社会信用代码
+		social_code := that.Req.FormValue("social_code")
+		if social_code == "" {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		//企业名称
+		company_name := that.Req.FormValue("company_name")
+		if company_name == "" {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		//手机号
+		phone := that.Req.FormValue("phone")
+		if phone == "" {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		//姓名
+		name := that.Req.FormValue("user_name")
+		if name == "" {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		//验证码
+		err := auth(that, phone, company_name, name)
+		if err != nil {
+			that.Display(3, err.Error())
+			return
+		}
+		//营业执照路径
+		business_license := that.Req.FormValue("business_license")
+		if business_license == "" {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		user_id := that.Session("user_id").Data
+		user := that.Db.Get("user", "*", Map{"id": user_id})
+		if user == nil {
+			that.Display(1, "没有找到该用户")
+			return
+		}
+		company := that.Db.Get("company", "*", Map{"AND": Map{"id": id, "user_id": user_id}})
+		if company == nil {
+			that.Display(4, "不是属于你的企业")
+			return
+		}
+		//认证
+		authentication_flag := 1
+		//if user.GetCeilInt("authentication_flag") == 0 {
+		//	authentication_flag = 1
+		//}
+		//通过base64图片获取信息
+
+		that.Db.Update("user", Map{"name": name, "phone": phone, "authentication_flag": authentication_flag}, Map{"id": user_id})
+
+		that.Db.Update("company", Map{"social_code": social_code, "name": company_name, "phone": phone, "business_license": business_license, "modify_time[#]": "now()"}, Map{"id": id})
+
+		//赠送一张券
+		data := Map{
+			"user_id":                 user_id,
+			"coupon_id":               1,
+			"code_no":                 "SN" + time.Now().Format("20060102150405") + getSn(),
+			"effective_start_time[#]": "NOW()",
+			"effective_end_time":      time.Now().AddDate(0, 6, 0).Format("2006-01-02 15:04:05"),
+			"source_type":             2,
+			"status":                  0,
+			"admin_id":                user.GetCeilInt("admin_id"),
+			"create_time[#]":          "NOW()",
+		}
+		//先判断是否领取过 source_type=2 是通过认证赠送的券
+		couponCount := that.Db.Count("coupon_user", Map{"AND": Map{"user_id": user_id, "source_type": 2}})
+		if couponCount == 0 {
+			that.Db.Insert("coupon_user", data)
+		}
+		that.Display(0, "认证成功")
+	},
+	//上传营业执照
+	"upload": func(this *Context) {
+		file := this.Req.FormValue("file")
+
+		if len(file) < 100 {
+			this.Display(3, "图片上传错误")
+			return
+		}
+
+		//fmt.Println(uimg)
+		btes, e := base64.StdEncoding.DecodeString(file[strings.Index(file, ",")+1:]) //成图片文件并把文件写入到buffer
+		//btes, e := base64.StdEncoding.DecodeString(file) //成图片文件并把文件写入到buffer
+		if e != nil {
+			this.Display(3, "无法解析图片")
+			return
+		}
+
+		//uimgPath:=time.Now().Format(this.Config.GetString("uimgPath"))
+		path := time.Now().Format(this.Config.GetString("wxFilePath"))
+		os.MkdirAll(this.Config.GetString("tpt")+"/"+path, os.ModeDir)
+		filePath := path + Md5(ObjToStr(time.Now().Unix())) + ".jpg"
+
+		err2 := ioutil.WriteFile(this.Config.GetString("tpt")+"/"+filePath, btes, 0666) //buffer输出到jpg文件中（不做处理，直接写到文件）
+		if err2 != nil {
+			this.Display(3, "图片保存失败")
+			return
+		}
+		tp := this.Req.FormValue("type")
+
+		if tp == "company" {
+			data := tencent.Tencent.OCRCOMPANY(file)
+			c := ObjToMap(data)
+			if c != nil {
+				c = c.GetMap("Response")
+				c["url"] = filePath
+
+			} else {
+				c = Map{"url": filePath}
+			}
+			this.Display(0, c)
+			return
+		}
+	},
+}

example/app/coupon.go

@@ -0,0 +1,67 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var CouponCtr = Ctr{
+
+	"search": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			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 = 20
+		}
+
+		user_id := that.Session("user_id").Data
+		user := that.Db.Get("user", "*", Map{"id": user_id})
+		if user == nil {
+			that.Display(1, "没有找到该用户")
+			return
+		}
+
+		//0-待使用,1-已使用,2-已过期
+
+		status := ObjToInt(that.Req.FormValue("status"))
+		var data = Map{
+			"coupon_user.user_id": user_id,
+			"coupon_user.state":   0,
+		}
+		if that.Req.FormValue("status") != "" {
+			data.Put("coupon_user.status", status)
+		}
+
+		specMap := Map{"AND": data}
+		if status == 0 {
+			specMap.Put("ORDER", "coupon_user.status ASC,coupon_user.effective_end_time ASC,coupon_user.create_time DESC")
+		}
+		if status == 1 {
+			specMap.Put("ORDER", "coupon_user.use_time DESC")
+		}
+		if status == 2 {
+			specMap.Put("ORDER", "coupon_user.effective_end_time DESC")
+		}
+
+		count := that.Db.Count("coupon_user", Map{"AND": data})
+
+		res := that.Db.Page(page, pageSize).PageSelect("coupon_user",
+			Map{"[>]coupon": "coupon_user.coupon_id = coupon.id"},
+			"coupon_user.code_no,coupon_user.effective_start_time,coupon_user.effective_end_time,coupon_user.status,"+
+				"coupon.coupon_amount,coupon.coupon_type,coupon.name,"+
+				"coupon.description",
+			specMap,
+		)
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/favorite.go

@@ -0,0 +1,241 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var FavoriteCtr = Ctr{
+	//关注
+	"follow": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		policyId := ObjToInt(that.Req.FormValue("policy_id"))
+		notifyId := ObjToInt(that.Req.FormValue("notify_id"))
+		declareId := ObjToInt(that.Req.FormValue("declare_id"))
+		providerId := ObjToInt(that.Req.FormValue("provider_id"))
+
+		favorite := Map{}
+		data := Map{}
+		if providerId != 0 {
+			data = Map{"provider_id": providerId, "user_id": that.Session("user_id").Data}
+			favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+			data["modify_time[#]"] = "now()"
+			data["del_flag"] = 0
+			data["type"] = 1
+
+		} else if notifyId != 0 {
+			article := that.Db.Get("article", "id", Map{"notify_id": notifyId})
+			if article != nil {
+				data = Map{"notify_id": notifyId, "article_id": article.GetCeilInt("id"), "user_id": that.Session("user_id").Data}
+				favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+				data["modify_time[#]"] = "now()"
+				data["del_flag"] = 0
+				data["type"] = 2
+			}
+
+		} else if policyId != 0 {
+			article := that.Db.Get("article", "id", Map{"policy_id": policyId})
+			if article != nil {
+				data = Map{"policy_id": policyId, "article_id": article.GetCeilInt("id"), "user_id": that.Session("user_id").Data}
+				favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+				data["modify_time[#]"] = "now()"
+				data["del_flag"] = 0
+				data["type"] = 3
+			}
+
+		} else if declareId != 0 {
+			article := that.Db.Get("article", "id", Map{"declare_id": declareId})
+			if article != nil {
+				data = Map{"declare_id": declareId, "article_id": article.GetCeilInt("id"), "user_id": that.Session("user_id").Data}
+				favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+				data["modify_time[#]"] = "now()"
+				data["del_flag"] = 0
+				data["type"] = 4
+			}
+		}
+
+		if len(data) != 0 {
+			isFavorite := int64(0)
+			if favorite != nil {
+				isFavorite = that.Db.Update("favorite", data, Map{"id": favorite.GetCeilInt("id")})
+			} else {
+				data["create_time[#]"] = "now()"
+				isFavorite = that.Db.Insert("favorite", data)
+			}
+
+			if isFavorite != 0 {
+				if data.GetCeilInt("article_id") != 0 {
+					that.Db.Update("article", Map{"favorite_num[#]": "favorite_num+1"}, Map{"id": data.GetCeilInt("article_id")})
+				}
+				if data.GetCeilInt("notify_id") != 0 {
+					that.Db.Update("notify", Map{"favorite_num[#]": "favorite_num+1"}, Map{"id": data.GetCeilInt("notify_id")})
+				}
+				if data.GetCeilInt("policy_id") != 0 {
+					that.Db.Update("policy", Map{"favorite_num[#]": "favorite_num+1"}, Map{"id": data.GetCeilInt("policy_id")})
+				}
+
+				if data.GetCeilInt("declare_id") != 0 {
+					that.Db.Update("declare", Map{"favorite_num[#]": "favorite_num+1"}, Map{"id": data.GetCeilInt("declare_id")})
+				}
+
+				if data.GetCeilInt("provider_id") != 0 {
+					that.Db.Update("provider", Map{"favorite_num[#]": "favorite_num+1"}, Map{"id": data.GetCeilInt("provider_id")})
+				}
+			}
+
+			that.Display(0, "关注成功")
+			return
+		}
+
+		that.Display(4, "找不到关注对象")
+		return
+
+	},
+
+	//关注
+	"unfollow": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		policyId := ObjToInt(that.Req.FormValue("policy_id"))
+		notifyId := ObjToInt(that.Req.FormValue("notify_id"))
+		declareId := ObjToInt(that.Req.FormValue("declare_id"))
+		providerId := ObjToInt(that.Req.FormValue("provider_id"))
+
+		favorite := Map{}
+		data := Map{}
+		if providerId != 0 {
+			data = Map{"provider_id": providerId, "user_id": that.Session("user_id").Data}
+			favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+			data["modify_time[#]"] = "now()"
+			data["del_flag"] = 1
+			data["type"] = 1
+
+		} else if notifyId != 0 {
+			article := that.Db.Get("article", "id", Map{"notify_id": notifyId})
+			if article != nil {
+				data = Map{"notify_id": notifyId, "article_id": article.GetCeilInt("id"), "user_id": that.Session("user_id").Data}
+				favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+				data["modify_time[#]"] = "now()"
+				data["del_flag"] = 1
+				data["type"] = 2
+			}
+		} else if policyId != 0 {
+
+			article := that.Db.Get("article", "id", Map{"policy_id": policyId})
+			if article != nil {
+				data = Map{"policy_id": policyId, "article_id": article.GetCeilInt("id"), "user_id": that.Session("user_id").Data}
+				favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+				data["modify_time[#]"] = "now()"
+				data["del_flag"] = 1
+				data["type"] = 3
+			}
+
+		} else if declareId != 0 {
+			article := that.Db.Get("article", "id", Map{"declare_id": declareId})
+			if article != nil {
+				data = Map{"declare_id": declareId, "article_id": article.GetCeilInt("id"), "user_id": that.Session("user_id").Data}
+				favorite = that.Db.Get("favorite", "*", Map{"AND": data})
+				data["modify_time[#]"] = "now()"
+				data["del_flag"] = 1
+				data["type"] = 4
+			}
+		}
+
+		if len(data) != 0 && favorite != nil {
+
+			isFavorite := that.Db.Update("favorite", data, Map{"id": favorite.GetCeilInt("id")})
+
+			if isFavorite != 0 {
+				if data.GetCeilInt("article_id") != 0 {
+					that.Db.Update("article", Map{"favorite_num[#]": "favorite_num-1"}, Map{"id": data.GetCeilInt("article_id")})
+				}
+				if data.GetCeilInt("notify_id") != 0 {
+					that.Db.Update("notify", Map{"favorite_num[#]": "favorite_num-1"}, Map{"id": data.GetCeilInt("notify_id")})
+				}
+				if data.GetCeilInt("policy_id") != 0 {
+					that.Db.Update("policy", Map{"favorite_num[#]": "favorite_num-1"}, Map{"id": data.GetCeilInt("policy_id")})
+				}
+
+				if data.GetCeilInt("declare_id") != 0 {
+					that.Db.Update("declare", Map{"favorite_num[#]": "favorite_num-1"}, Map{"id": data.GetCeilInt("declare_id")})
+				}
+
+				if data.GetCeilInt("provider_id") != 0 {
+					that.Db.Update("provider", Map{"favorite_num[#]": "favorite_num-1"}, Map{"id": data.GetCeilInt("provider_id")})
+				}
+			}
+
+			that.Display(0, "取消关注成功")
+			return
+		}
+
+		that.Display(0, "没有关注")
+		return
+	},
+
+	"search": func(that *Context) {
+
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+		tp := ObjToInt(that.Req.FormValue("type"))
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "user_id": that.Session("user_id").Data}
+
+		if tp != 0 {
+			data["type"] = tp
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "modify_time DESC"}
+		}
+
+		count := that.Db.Count("favorite", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("favorite", "*", data)
+
+		for _, v := range res {
+			if v.GetCeilInt64("policy_id") != 0 {
+				v["policy"] = that.Db.Get("policy", "id,tag", Map{"id": v.GetCeilInt64("policy_id")})
+			}
+			if v.GetCeilInt64("declare_id") != 0 {
+				v["declare"] = that.Db.Get("declare", "id,money_scope_min,money_scope_max,status", Map{"id": v.GetCeilInt64("declare_id")})
+			}
+
+			if v.GetCeilInt64("notify_id") != 0 {
+				v["notify"] = that.Db.Get("notify", "id,tag", Map{"id": v.GetCeilInt64("notify_id")})
+			}
+
+			if v.GetCeilInt64("article_id") != 0 {
+				v["article"] = that.Db.Get("article", "id,title,description,department_id,click_num+click_num_base AS click_num,"+
+					"favorite_num_base+favorite_num AS favorite_num,dispatch_num,dispatch_name,prepare_date,release_time,expire_date,area_id,status", Map{"id": v.GetCeilInt64("article_id")})
+			}
+
+			if v.GetCeilInt64("provider_id") != 0 {
+				v["provider"] = that.Db.Get("provider", "id,name,level,discount,avatar,title,description,"+
+					"click_num_base+click_num AS click_num,handle_num_base+handle_num AS handle_num,favorite_num_base+favorite_num AS favorite_num,modify_time", Map{"id": v.GetCeilInt64("provider_id")})
+			}
+
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/func.go

@@ -0,0 +1,44 @@
+package app
+
+import (
+	"bytes"
+	"code.hoteas.com/golang/hotime/common"
+	"fmt"
+	"github.com/tealeg/xlsx"
+	"net/http"
+	"time"
+)
+
+func DataToExcel(w http.ResponseWriter, r *http.Request, titleList []string, dataList []common.Map, fileName string) {
+	// 生成一个新的文件
+	file := xlsx.NewFile()
+	// 添加sheet页
+	sheet, _ := file.AddSheet("Sheet1")
+	// 插入表头
+	titleRow := sheet.AddRow()
+	for _, v := range titleList {
+		cell := titleRow.AddCell()
+		cell.Value = v
+		cell.GetStyle().Font.Color = "00FF0000"
+	}
+	for _, v1 := range dataList {
+		row := sheet.AddRow()
+		// 插入内容
+		for _, v := range titleList {
+			cell := row.AddCell()
+			cell.SetValue(v1.Get(v))
+		}
+
+	}
+	//file.Save("D:\\temp\\vip_excel"+fileName)
+
+	fileName = fmt.Sprintf("%s.xlsx", fileName)
+	//_ = file.Save(fileName)
+	w.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
+	w.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
+	var buffer bytes.Buffer
+	_ = file.Write(&buffer)
+	content := bytes.NewReader(buffer.Bytes())
+	http.ServeContent(w, r, fileName, time.Now(), content)
+}

example/app/init.go

@@ -0,0 +1,154 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"errors"
+	"strings"
+	"time"
+	"unicode/utf8"
+)
+
+// Project 管理端项目
+var Project = Proj{
+	"article":       ArticleCtr,
+	"company":       CompanyCtr,
+	"declare":       DeclareCtr,
+	"favorite":      FavoriteCtr,
+	"lxcx":          Lxcx,
+	"matters":       MattersCtr,
+	"notify":        NotifyCtr,
+	"order":         OrderCtr,
+	"policy":        PolicyCtr,
+	"provider":      ProviderCtr,
+	"search_record": SearchRecordCtr,
+	"sms":           Sms,
+	"tag":           TagCtr,
+	"upan":          UpanCtr,
+	"user":          UserCtr,
+	"vip_order":     VipOrderCtr,
+	"websocket":     WebsocketCtr,
+	"wechath5":      Wechath5,
+	"wechatmini":    Wechath5,
+	"coupon":        CouponCtr,
+}
+
+//生成随机码的6位md5
+func getSn() string {
+	x := Rand(8)
+	return Substr(Md5(ObjToStr(int64(x)+time.Now().UnixNano()+int64(Rand(6)))), 0, 6)
+}
+
+//生成随机码的4位随机数
+func getCode() string {
+	//res := ""
+	//for i := 0; i < 4; i++ {
+	res := ObjToStr(RandX(1000, 9999))
+	//}
+	return res
+}
+
+func strToArray(str string) Slice {
+	s := Slice{}
+
+	olds := strings.Split(str, ",")
+	for _, v := range olds {
+		if v != "" {
+			s = append(s, v)
+		}
+	}
+	return s
+}
+
+func arrayToStr(ars Slice) string {
+	s := ","
+	if ars == nil {
+		return s
+	}
+	for k, _ := range ars {
+		s = s + ars.GetString(k) + ","
+	}
+	return s
+}
+
+//认证公共方案
+func auth(that *Context, phone, companyName, userName string) error {
+
+	user := that.Db.Get("user", "id,phone,salesman_id,company_id,provider_id,name", Map{"id": that.Session("user_id").ToCeilInt()})
+	if user == nil {
+		return errors.New("找不到用户")
+	}
+	company := that.Db.Get("company", "name,id", Map{"id": user.GetCeilInt("company_id")})
+
+	if company == nil {
+		return errors.New("找不到企业")
+	}
+	//手机号与原来的不同则进行绑定
+	if phone != user.GetString("phone") || companyName != company.GetString("name") || user.GetString("name") != userName {
+		//微信验证成功
+		if that.Session("wechat_phone").ToStr() == phone {
+			that.Db.Update("user", Map{"phone": phone}, Map{"id": user.GetCeilInt("id")})
+			if user.GetCeilInt("company_id") != 0 {
+				that.Db.Update("company", Map{"phone": phone}, Map{"id": user.GetCeilInt("company_id")})
+			}
+			user["phone"] = phone
+		} else if that.Req.FormValue("code") == "" || that.Session("phone").ToStr() != phone || that.Session("code").ToStr() != that.Req.FormValue("code") {
+
+			return errors.New("验证码错误")
+		} else {
+			that.Db.Update("user", Map{"phone": phone, "name": userName}, Map{"id": user.GetCeilInt("id")})
+			if user.GetCeilInt("company_id") != 0 {
+				that.Db.Update("company", Map{"phone": phone}, Map{"id": user.GetCeilInt("company_id")})
+			}
+			user["phone"] = phone
+		}
+
+	}
+	//
+	//company := that.Db.Get("company", "name,id", Map{"id": user.GetCeilInt("company_id")})
+	if company != nil {
+		that.Db.Update("company", Map{"name": companyName}, Map{"id": company.GetCeilInt64("id")})
+		if user.GetCeilInt64("salesman_id") != 0 {
+			that.Db.Update("user", Map{"certification_flag": 1}, Map{"id": user.GetCeilInt("id")})
+		}
+		return nil
+	}
+
+	company = Map{"name": companyName,
+		"user_id": user.GetCeilInt("id"),
+	}
+	if user.GetCeilInt("salesman_id") != 0 {
+		company["salesman_id"] = user.GetCeilInt("salesman_id")
+	}
+	if user.GetCeilInt("provider_id") != 0 {
+		company["provider_id"] = user.GetCeilInt("provider_id")
+	}
+	if user.GetString("phone") != "" {
+		company["phone"] = user.GetString("phone")
+	}
+	company["id"] = that.Db.Insert("company", company)
+	if company.GetCeilInt64("id") == 0 {
+		return errors.New("新建企业失败")
+	}
+	upUser := Map{"company_id": company.GetCeilInt64("id")}
+	if user.GetCeilInt64("salesman_id") != 0 {
+		upUser["certification_flag"] = 1
+
+	}
+	that.Db.Update("user", upUser, Map{"id": that.Session("user_id").Data})
+
+	return nil
+
+}
+
+// FilterEmoji 过滤 emoji 表情
+func FilterEmoji(content string) string {
+	new_content := ""
+	for _, value := range content {
+		_, size := utf8.DecodeRuneInString(string(value))
+		if size <= 3 {
+			new_content += string(value)
+		}
+	}
+	return new_content
+}

example/app/lxcx.go

@@ -0,0 +1,29 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	"code.hoteas.com/golang/hotime/common"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/url"
+)
+
+var Lxcx = Ctr{
+	"lists": func(that *Context) {
+		urlStr := "https://www.ruichuangshe.com/Resources/Services/sAppInterface.ashx?type=policyprojectbycompanyname&page=1&pagesize=10&code=8eb68adf79d660e57ccd69ea4bf340162e29e43ec344df62b364bd65b886da7fca9fb995ad93a5b485d66fd268f946f34cf0&CompanyName="
+		companyName := that.Req.FormValue("company")
+		companyName = url.QueryEscape(url.QueryEscape(companyName))
+
+		resp, err := http.Get(urlStr + companyName)
+		if err != nil {
+			log.Println("err")
+		}
+		defer resp.Body.Close()
+		b, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			log.Println("err")
+		}
+		that.Display(0, common.ObjToMap(string(b)))
+	},
+}

example/app/matters.go

@@ -0,0 +1,168 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var MattersCtr = Ctr{
+	"create": func(that *Context) {
+
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		sn := that.Req.FormValue("sn")
+		if sn == "" {
+			that.Display(3, "没有SN码")
+			return
+		}
+		serviceContent := that.Req.FormValue("service_content")
+		if serviceContent == "" {
+			that.Display(3, "没有服务内容")
+			return
+		}
+
+		salesman := that.Db.Get("salesman", "id,provider_id,name,nickname", Map{"AND": Map{"sn": sn, "del_flag": 0}})
+		if salesman == nil {
+			that.Display(4, "找不到服务商")
+			return
+		}
+
+		re := that.Db.Insert("matters", Map{
+			"user_id":         that.Session("user_id").Data,
+			"salesman_id":     salesman.GetCeilInt64("id"),
+			"provider_id":     salesman.GetCeilInt64("provider_id"),
+			"type":            1,
+			"service_content": serviceContent,
+			"complete_flag":   0,
+			"create_time[#]":  "now()",
+			"modify_time[#]":  "now()",
+			"del_flag":        0,
+		})
+		res := that.Db.Get("matters", "*", Map{"id": re})
+		if res == nil {
+			that.Display(4, "找不到事项")
+			return
+		}
+
+		res["salesman"] = that.Db.Get("salesman", "name,id", Map{"id": res.GetCeilInt64("salesman_id")})
+
+		res["provider"] = that.Db.Get("provider", "name,id", Map{"id": res.GetCeilInt64("provider_id")})
+
+		that.Display(0, res)
+	},
+	"info": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("matters", "*", Map{"id": id})
+		if res == nil {
+			that.Display(4, "找不到事项")
+			return
+		}
+
+		res["salesman"] = that.Db.Get("salesman", "name,id", Map{"id": res.GetCeilInt64("salesman_id")})
+
+		res["provider"] = that.Db.Get("provider", "name,id", Map{"id": res.GetCeilInt64("provider_id")})
+
+		that.Display(0, res)
+	},
+	"edit": func(that *Context) {
+
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		serviceEvaluation := ObjToInt(that.Req.FormValue("service_evaluation"))
+		evaluationRemark := that.Req.FormValue("evaluation_remark")
+
+		if serviceEvaluation == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		matters := that.Db.Get("matters", "*", Map{"AND": Map{"id": id, "user_id": that.Session("user_id").Data}})
+		if matters == nil {
+			that.Display(4, "不是属于你的评价")
+			return
+		}
+
+		if matters.GetCeilInt("complete_flag") == 1 {
+			that.Display(4, "已完成评价，不可重复评价")
+			return
+		}
+
+		that.Db.Update("matters", Map{"service_evaluation": serviceEvaluation, "evaluation_remark": evaluationRemark, "complete_flag": 1, "modify_time[#]": "now()"}, Map{"id": id})
+
+		that.Display(0, "评价成功")
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		tp := that.Req.FormValue("type")
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "user_id": that.Session("user_id").Data}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"title[~]": keywords, "description[~]": keywords, "content[~]": keywords}
+		}
+
+		if tp != "" {
+			data["type"] = ObjToInt(tp)
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modify_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modify_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "modify_time DESC"}
+		}
+
+		count := that.Db.Count("matters", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("matters", "*", data)
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/notify.go

@@ -0,0 +1,111 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var NotifyCtr = Ctr{
+
+	"info": func(that *Context) {
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("notify", "*", Map{"id": id})
+
+		if res == nil {
+			that.Display(4, "找不到通知公告")
+			return
+		}
+		res["click_num"] = res.GetCeilInt64("click_num") + res.GetCeilInt64("click_num_base") + 1
+		delete(res, "click_num_base")
+
+		res["favorite_num"] = res.GetCeilInt64("favorite_num") + res.GetCeilInt64("favorite_num_base")
+		delete(res, "favorite_num_base")
+
+		article := that.Db.Get("article", "*", Map{"id": res.GetCeilInt64("article_id")})
+		if article != nil {
+			article["click_num"] = article.GetCeilInt64("click_num") + article.GetCeilInt64("click_num_base") + 1
+			delete(article, "click_num_base")
+
+			article["favorite_num"] = article.GetCeilInt64("favorite_num") + article.GetCeilInt64("favorite_num_base")
+			delete(article, "favorite_num_base")
+		}
+
+		res["article"] = article
+		//浏览量加1
+		that.Db.Update("notify", Map{"click_num[#]": "click_num+1"}, Map{"id": id})
+		//浏览量加1
+		that.Db.Update("article", Map{"click_num[#]": "click_num+1"}, Map{"id": res.GetCeilInt64("article_id")})
+
+		//查询是否已关注
+		if that.Session("user_id").Data != nil {
+			favorite := that.Db.Get("favorite", "user_id,notify_id", Map{"AND": Map{"notify_id": id, "user_id": that.Session("user_id").ToCeilInt(), "del_flag": 0}})
+			res["favorite"] = favorite
+		}
+
+		that.Display(0, res)
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "notify_id[!]": nil}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"title[~]": keywords, "description[~]": keywords, "content[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["release_date[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["release_date[<=]"] = finishTime
+		}
+
+		dispatchName := that.Req.FormValue("dispatch_name")
+		if dispatchName != "" {
+			data["dispatch_name"] = dispatchName
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "release_time DESC"}
+		}
+
+		count := that.Db.Count("article", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("article", "id,title,description,department_id,click_num+click_num_base AS click_num,"+
+			"favorite_num_base+favorite_num AS favorite_num,dispatch_num,dispatch_name,prepare_date,release_time,expire_date,area_id,status,policy_id,declare_id,notify_id,dispatch_name,policy_level", data)
+		for _, v := range res {
+
+			if v.GetCeilInt("notify_id") > 0 {
+				v["notify"] = that.Db.Get("notify", "id,tag", Map{"id": v.GetCeilInt("notify_id")})
+			}
+			//if v.GetCeilInt("policy_id")>0{
+			//	v["policy"]=that.Db.Get("policy","tag",Map{"id":v.GetCeilInt("policy_id")})
+			//}
+			//if v.GetCeilInt("declare_id")>0{
+			//	v["declare"]=that.Db.Get("declare","money_scope_min,money_scope_max,tag,status",Map{"id":v.GetCeilInt("declare_id")})
+			//}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/order.go

@@ -0,0 +1,208 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"time"
+)
+
+var OrderCtr = Ctr{
+	//创建订单
+	"create": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		providerId := ObjToInt(that.Req.FormValue("provider_id"))
+		phone := that.Req.FormValue("phone")
+		companyName := that.Req.FormValue("company_name")
+		userName := that.Req.FormValue("user_name")
+		if providerId == 0 || len(phone) != 11 || len(companyName) < 4 || len(userName) < 2 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		err := auth(that, phone, companyName, userName)
+		if err != nil {
+			that.Display(3, err.Error())
+			return
+		}
+
+		declareId := ObjToInt(that.Req.FormValue("declare_id"))
+
+		tp := that.Req.FormValue("type")
+
+		//新建流程
+		user := that.Db.Get("user", "*", Map{"id": that.Session("user_id").Data})
+
+		if user == nil {
+			that.Display(4, "找不到用户")
+			return
+		}
+		company := that.Db.Get("company", "name", Map{"id": user.GetCeilInt("company_id")})
+		if company == nil {
+			that.Display(4, "找不到企业")
+			return
+		}
+
+		provider := that.Db.Get("provider", "*", Map{"id": providerId})
+
+		if provider == nil {
+			that.Display(4, "找不到该服务商")
+			return
+		}
+
+		//是否以前已经创建了该服务商的订单，如果创建了则直接跳转到订单详情中去
+		oldOrder := that.Db.Get("order", "id", Map{"AND": Map{"provider_id": providerId, "user_id": that.Session("user_id").Data, "del_flag": 0, "status": 0}})
+		if oldOrder != nil {
+			orderRecord := Map{
+				"order_id":       oldOrder.GetCeilInt64("id"),
+				"user_id":        user.GetCeilInt64("id"),
+				"remarks":        user.GetString("nickname") + "向“" + provider.GetString("name") + "”服务商再次发起了订单请求",
+				"create_time[#]": "now()",
+				"modify_time[#]": "now()",
+				"del_flag":       0,
+			}
+
+			orderRecord["id"] = that.Db.Insert("order_record", orderRecord)
+			that.Db.Update("order", Map{"order_record_id": orderRecord.GetCeilInt64("id"), "modify_time[#]": "now()"}, Map{"id": oldOrder.GetCeilInt64("id")})
+
+			that.Display(0, oldOrder.GetCeilInt64("id"))
+			return
+		}
+
+		data := Map{
+			"name":           "购买“" + provider.GetString("title") + "”服务",
+			"sn":             "SN" + time.Now().Format("20060102150405") + getSn(),
+			"user_id":        user.GetCeilInt64("id"),
+			"salesman_id":    provider.GetCeilInt64("salesman_id"),
+			"provider_id":    provider.GetCeilInt64("id"),
+			"company_id":     company.GetCeilInt64("id"),
+			"company_name":   company.GetString("name"),
+			"phone":          user.GetString("phone"),
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+		}
+
+		if declareId != 0 {
+			data["policy_declare_flag"] = 1
+			data["declare_id"] = declareId
+		}
+
+		if tp == "policy_declare_flag" {
+			data["policy_declare_flag"] = 1
+		}
+
+		data["id"] = that.Db.Insert("order", data)
+		if data.GetCeilInt64("id") == 0 {
+			that.Display(4, "无法生成订单！")
+			return
+		}
+
+		orderRecord := Map{
+			"order_id":       data["id"],
+			"user_id":        user.GetCeilInt64("id"),
+			"remarks":        user.GetString("nickname") + "向“" + provider.GetString("name") + "”服务商发起了订单请求",
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+		}
+
+		orderRecord["id"] = that.Db.Insert("order_record", orderRecord)
+
+		if orderRecord.GetCeilInt64("id") == 0 {
+			that.Display(4, "无法生成订单记录！")
+			return
+		}
+
+		that.Db.Update("order", Map{"order_record_id": orderRecord.GetCeilInt64("id")}, Map{"id": data.GetCeilInt64("id")})
+
+		that.Display(0, data.GetCeilInt64("id"))
+	},
+
+	"info": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("order", "*", Map{"AND": Map{"id": id, "user_id": that.Session("user_id").Data}})
+
+		if res == nil {
+			that.Display(4, "找不到对应订单")
+			return
+		}
+		if res.GetCeilInt("provider_id") > 0 {
+			res["provider"] = that.Db.Get("provider", "name,title,phone", Map{"id": res.GetCeilInt("provider_id")})
+		}
+
+		res["order_record"] = that.Db.Select("order_record", "remarks,modify_time", Map{"order_id": res.GetCeilInt("id"), "ORDER": "modify_time DESC"})
+
+		that.Display(0, res)
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		if that.Session("user_id").Data == nil {
+			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 = 20
+		}
+
+		data := Map{"del_flag": 0, "user_id": that.Session("user_id").Data}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"sn[~]": keywords, "company_name[~]": keywords, "name[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modify_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modify_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "modify_time DESC"}
+		}
+
+		count := that.Db.Count("order", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("order", "*", data)
+		for _, v := range res {
+
+			//if v.GetCeilInt("policy_id")>0{
+			//	v["policy"]=that.Db.Get("policy","id,tag",Map{"id":v.GetCeilInt("policy_id")})
+			//}
+			if v.GetCeilInt("provider_id") > 0 {
+				v["provider"] = that.Db.Get("provider", "name,title", Map{"id": v.GetCeilInt("provider_id")})
+			}
+			if v.GetCeilInt("order_record_id") > 0 {
+				v["order_record"] = that.Db.Get("order_record", "remarks,modify_time", Map{"id": v.GetCeilInt("order_record_id")})
+			}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/policy.go

@@ -0,0 +1,112 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var PolicyCtr = Ctr{
+
+	"info": func(that *Context) {
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("policy", "*", Map{"id": id})
+
+		if res == nil {
+			that.Display(4, "找不到通知公告")
+			return
+		}
+		res["click_num"] = res.GetCeilInt64("click_num") + res.GetCeilInt64("click_num_base") + 1
+		delete(res, "click_num_base")
+
+		res["favorite_num"] = res.GetCeilInt64("favorite_num") + res.GetCeilInt64("favorite_num_base")
+		delete(res, "favorite_num_base")
+
+		article := that.Db.Get("article", "*", Map{"id": res.GetCeilInt64("article_id")})
+		if article != nil {
+			article["click_num"] = article.GetCeilInt64("click_num") + article.GetCeilInt64("click_num_base") + 1
+			delete(article, "click_num_base")
+
+			article["favorite_num"] = article.GetCeilInt64("favorite_num") + article.GetCeilInt64("favorite_num_base")
+			delete(article, "favorite_num_base")
+		}
+
+		res["article"] = article
+
+		//浏览量加1
+		that.Db.Update("policy", Map{"click_num[#]": "click_num+1"}, Map{"id": id})
+		//浏览量加1
+		that.Db.Update("article", Map{"click_num[#]": "click_num+1"}, Map{"id": res.GetCeilInt64("article_id")})
+
+		//查询是否已关注
+		if that.Session("user_id").Data != nil {
+			favorite := that.Db.Get("favorite", "user_id,policy_id", Map{"AND": Map{"policy_id": id, "user_id": that.Session("user_id").ToCeilInt(), "del_flag": 0}})
+			res["favorite"] = favorite
+		}
+
+		that.Display(0, res)
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "policy_id[!]": nil}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"title[~]": keywords, "description[~]": keywords, "content[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["release_date[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["release_date[<=]"] = finishTime
+		}
+
+		dispatchName := that.Req.FormValue("dispatch_name")
+		if dispatchName != "" {
+			data["dispatch_name"] = dispatchName
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "release_time DESC"}
+		}
+
+		count := that.Db.Count("article", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("article", "id,title,description,department_id,click_num+click_num_base AS click_num,"+
+			"favorite_num_base+favorite_num AS favorite_num,dispatch_num,dispatch_name,prepare_date,release_time,expire_date,area_id,status,policy_id,declare_id,policy_id,dispatch_name,policy_level", data)
+		for _, v := range res {
+
+			//if v.GetCeilInt("policy_id")>0{
+			//	v["policy"]=that.Db.Get("policy","id,tag",Map{"id":v.GetCeilInt("policy_id")})
+			//}
+			if v.GetCeilInt("policy_id") > 0 {
+				v["policy"] = that.Db.Get("policy", "tag", Map{"id": v.GetCeilInt("policy_id")})
+			}
+			//if v.GetCeilInt("declare_id")>0{
+			//	v["declare"]=that.Db.Get("declare","money_scope_min,money_scope_max,tag,status",Map{"id":v.GetCeilInt("declare_id")})
+			//}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/provider.go

@@ -0,0 +1,92 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var ProviderCtr = Ctr{
+	//用户微信公众号或者小程序登录
+	"info": func(that *Context) {
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("provider", "*", Map{"id": id})
+
+		if res == nil {
+			that.Display(4, "找不到服务商")
+			return
+		}
+
+		//浏览量加1
+		that.Db.Update("provider", Map{"click_num[#]": "click_num+1"}, Map{"id": id})
+
+		//查询是否已关注
+		if that.Session("user_id").Data != nil {
+			favorite := that.Db.Get("favorite", "user_id,provider_id", Map{"AND": Map{"provider_id": id, "user_id": that.Session("user_id").ToCeilInt(), "del_flag": 0}})
+			res["favorite"] = favorite
+		}
+
+		that.Display(0, res)
+	},
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "state": 0}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"name[~]": keywords, "title[~]": keywords}
+		}
+
+		tp := that.Req.FormValue("type")
+		if tp != "" {
+			data[tp] = 1
+		}
+
+		policyDeclareFlag := that.Req.FormValue("policy_declare_flag")
+		if policyDeclareFlag != "" {
+			data["policy_declare_flag"] = ObjToInt(policyDeclareFlag)
+		}
+
+		intellectualPropertyFlag := that.Req.FormValue("intellectual_property_flag")
+		if intellectualPropertyFlag != "" {
+			data["intellectual_property_flag"] = ObjToInt(intellectualPropertyFlag)
+		}
+
+		taxOnsultingFlag := that.Req.FormValue("tax_onsulting_flag")
+		if taxOnsultingFlag != "" {
+			data["tax_onsulting_flag"] = ObjToInt(taxOnsultingFlag)
+		}
+
+		lawFlag := that.Req.FormValue("law_flag")
+		if lawFlag != "" {
+			data["law_flag"] = ObjToInt(lawFlag)
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "id DESC"}
+		}
+
+		count := that.Db.Count("provider", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("provider", "id,name,level,discount,avatar,title,description,"+
+			"click_num_base+click_num AS click_num,handle_num_base+handle_num AS handle_num,favorite_num_base+favorite_num AS favorite_num,modify_time,policy_declare_flag,intellectual_property_flag,tax_onsulting_flag,law_flag", data)
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/search_record.go

@@ -0,0 +1,51 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var SearchRecordCtr = Ctr{
+
+	"search": func(that *Context) {
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		//if pageSize <= 0 {
+		pageSize = 50
+		//}
+
+		data := Map{"del_flag": 0}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["search_company_name[~]"] = keywords
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["create_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["create_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data}
+		} else {
+			data["ORDER"] = "create_time DESC"
+		}
+
+		count := that.Db.Count("search_record", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("search_record", "id,search_company_name,policy_match_count,money_scope,create_time", data)
+
+		that.Display(0, Map{"total": count, "data": res})
+
+	},
+}

example/app/sms.go

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

example/app/tag.go

@@ -0,0 +1,83 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var TagCtr = Ctr{
+
+	"create": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		name := that.Req.FormValue("name")
+
+		oldTag := that.Db.Get("tag", "id", Map{"name": name})
+		if oldTag != nil {
+			that.Display(4, "此标签已存在")
+			return
+		}
+
+		re := that.Db.Insert("tag", Map{
+			"user_id":        that.Session("user_id").Data,
+			"name":           name,
+			"remark":         "用户上传",
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"state":          1, //先置为异常状态，等待审核通过
+			"del_flag":       0,
+		})
+
+		if re == 0 {
+			that.Display(4, "添加失败")
+			return
+		}
+
+		that.Display(0, "添加成功")
+		return
+
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 40
+		}
+
+		data := Map{"del_flag": 0, "state": 0}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"name[~]": keywords, "remark[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modify_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modify_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data}
+		}
+
+		count := that.Db.Count("tag", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("tag", "id,name,remark", data)
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/app/upan.go

@@ -0,0 +1,91 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	"code.hoteas.com/golang/hotime/common"
+	"fmt"
+	"strings"
+)
+
+var UpanCtr = Ctr{
+	"login": func(that *Context) {
+		timestamp := that.Req.FormValue("timestamp")
+		sn := that.Req.FormValue("sn")
+
+		//str,_:=EnPwdCode([]byte(lus[len(lus)-1]+":"+ObjToStr(t)))//
+		re, e := DePwdCode(sn)
+
+		if e != nil {
+			that.Display(3, "数据异常")
+			return
+		}
+		reStr := string(re)
+		realSn := strings.Replace(reStr, ":"+timestamp, "", -1)
+		if len(realSn)+len(timestamp)+1 != len(reStr) {
+			that.Display(4, "数据验证失败")
+			return
+		}
+		fmt.Println("U盘校验", realSn)
+		user := that.Db.Get("user", "*", common.Map{"upankey": realSn})
+		if user == nil {
+			that.Display(5, "还没有绑定用户")
+			return
+		}
+
+		that.Session("user_id", user.GetCeilInt("id"))
+		that.Display(0, "登录成功")
+	},
+
+	"create": func(that *Context) {
+		timestamp := that.Req.FormValue("timestamp")
+		sn := that.Req.FormValue("sn")
+
+		//str,_:=EnPwdCode([]byte(lus[len(lus)-1]+":"+ObjToStr(t)))//
+		re, e := DePwdCode(sn)
+
+		if e != nil {
+			fmt.Println(e)
+			that.Display(3, "数据异常")
+			return
+		}
+		reStr := string(re)
+		realSn := strings.Replace(reStr, ":"+timestamp, "", -1)
+		if len(realSn)+len(timestamp)+1 != len(reStr) {
+			that.Display(4, "数据验证失败")
+			return
+		}
+
+		fmt.Println("U盘校验", realSn)
+
+		uuser := that.Db.Get("user", "id", common.Map{"upankey": realSn})
+
+		if uuser != nil {
+			that.Display(4, "已经绑定了其他企业")
+			return
+		}
+
+		phone := that.Req.FormValue("phone")
+		companyName := that.Req.FormValue("company_name")
+		userName := that.Req.FormValue("user_name")
+
+		if len(phone) != 11 || len(companyName) < 4 || len(userName) < 2 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		//验证不成功则反馈
+		err := auth(that, phone, companyName, userName)
+		if err != nil {
+			fmt.Println(err)
+			that.Display(3, err.Error())
+			return
+		}
+
+		num := that.Db.Update("user", common.Map{"upankey": realSn}, common.Map{"id": that.Session("user_id").Data})
+		if num == 0 {
+			that.Display(4, "更新失败")
+			return
+		}
+		that.Display(0, "绑定成功")
+
+	},
+}

example/app/user.go

@@ -0,0 +1,107 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var UserCtr = Ctr{
+	"test": func(that *Context) {
+		that.Session("user_id", 1)
+		that.Session("wechat_id", 1)
+		that.Display(0, 1)
+	},
+	//用户微信公众号或者小程序登录
+	"info": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		user := that.Db.Get("user", "*", Map{"id": that.Session("user_id").ToCeilInt()})
+		if user == nil {
+			that.Display(2, "获取个人信息失败")
+			return
+		}
+
+		if user.GetCeilInt("company_id") == 0 {
+			companyId := that.Db.Insert("company", Map{
+				"user_id":        user["id"],
+				"create_time[#]": "now()",
+				"modify_time[#]": "now()",
+				"del_flag":       0,
+			})
+			user["company_id"] = companyId
+			that.Db.Update("user", Map{"company_id": companyId}, Map{"id": user.GetCeilInt("id")})
+		}
+
+		delete(user, "password")
+
+		company := that.Db.Get("company", "id,name,social_code,business_license", Map{"id": user.GetCeilInt("company_id")})
+		salesman := that.Db.Get("salesman", "id,name", Map{"id": user.GetCeilInt("salesman_id")})
+		provider := that.Db.Get("provider", "id,name", Map{"id": user.GetCeilInt("provider_id")})
+
+		if user != nil {
+			user["company"] = company
+			user["salesman"] = salesman
+			user["provider"] = provider
+		}
+
+		that.Display(0, user)
+	},
+
+	"edit": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		name := that.Req.FormValue("name")
+		nickname := that.Req.FormValue("nickname")
+		sex := that.Req.FormValue("sex")
+		email := that.Req.FormValue("email")
+		avatar := that.Req.FormValue("avatar")
+		address := that.Req.FormValue("address")
+		phone := that.Req.FormValue("phone") //如果更换手机号则要有新的短信验证码
+		code := that.Req.FormValue("code")
+
+		data := Map{"modify_time[#]": "now()"}
+		if name != "" {
+			data["name"] = name
+		}
+		if nickname != "" {
+			data["nickname"] = nickname
+		}
+		if sex != "" {
+			data["sex"] = sex
+		}
+		if email != "" {
+			data["email"] = email
+		}
+		if avatar != "" {
+			data["avatar"] = avatar
+		}
+		if address != "" {
+			data["address"] = address
+		}
+		if phone != "" {
+
+			//微信验证成功
+			if that.Session("wechat_phone").ToStr() == phone {
+				data["phone"] = phone
+			} else if code == "" || that.Session("phone").ToStr() != phone || that.Session("code").ToStr() != code {
+				that.Display(3, "手机短信验证失败")
+				return
+			}
+			data["phone"] = phone
+		}
+
+		re := that.Db.Update("user", data, Map{"id": that.Session("user_id").Data})
+		if re == 0 {
+			that.Display(4, "更新失败")
+			return
+		}
+
+		that.Display(0, "修改成功")
+	},
+}

example/app/vip_order.go

@@ -0,0 +1,235 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/wechat"
+	"fmt"
+	"time"
+)
+
+var VipOrderCtr = Ctr{
+	//创建V订单
+	"create": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		phone := that.Req.FormValue("phone")
+		companyName := that.Req.FormValue("company_name")
+		userName := that.Req.FormValue("user_name")
+		if len(phone) != 11 || len(companyName) < 4 || len(userName) < 2 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		that.Db.Delete("vip_order", Map{"AND": Map{"user_id": that.Session("user_id").Data, "status": 0}})
+
+		user := that.Db.Get("user", "*", Map{"id": that.Session("user_id").Data})
+		if user == nil {
+			that.Display(2, "找不到此用户")
+			return
+		}
+
+		wc := that.Db.Get("wechat", "openid", Map{"AND": Map{"appid": that.Config.GetString("wechatAppID"), "user_id": that.Session("user_id").Data}})
+		if wc == nil {
+			that.Display(2, "没有获取微信个人信息")
+			return
+		}
+
+		err := auth(that, phone, companyName, userName)
+
+		if err != nil {
+			that.Display(3, err.Error())
+			return
+		}
+
+		data := Map{
+			"sn": "SN" + time.Now().Format("20060102150405") + getSn(),
+			//"name":"1年VIP会员",
+			"amount":          36000, //720元
+			"user_id":         user.GetCeilInt64("id"),
+			"company_id":      user.GetCeilInt("company_id"),
+			"expiration_time": time.Now().Add(365 * 24 * time.Hour).Format("2006-01-02 15:04:05"),
+			"create_time[#]":  "now()",
+			"modify_time[#]":  "now()",
+			"del_flag":        0,
+			"status":          0,
+		}
+		tp := "购买"
+		if user.GetString("expiration_time") != "" {
+			data["old_expiration_time"] = user.GetString("expiration_time")
+
+			t, e := time.Parse("2006-01-02 15:04:05", user.GetString("expiration_time"))
+			fmt.Println(e, "时间创建失败")
+			if t.Unix() >= time.Now().Unix() {
+				tp = "续订"
+				data["expiration_time"] = t.Add(365 * 24 * time.Hour).Format("2006-01-02 15:04:05")
+			}
+
+		}
+
+		if user.GetCeilInt("provider_id") != 0 {
+			data["provider_id"] = user.GetCeilInt("provider_id")
+			data["amount"] = 36000
+			//tp=tp
+		}
+		//data["amount"] = 1
+
+		if user.GetCeilInt("salesman_id") != 0 {
+			data["salesman_id"] = user.GetCeilInt("salesman_id")
+		}
+		data["name"] = companyName + tp + "1年VIP会员"
+
+		jsParams, e := wechat.WxPay.GetJsOrder(data.GetCeilInt64("amount"), that.Config.GetString("wechatAppID"), wc.GetString("openid"), data.GetString("name"), data.GetString("sn"), that.Config.GetString("wechatAppNotifyUrl"))
+		if e != nil {
+			fmt.Println(e)
+			that.Display(4, e)
+			return
+		}
+		re := that.Db.Insert("vip_order", data)
+		fmt.Println(re)
+		that.Display(0, jsParams)
+	},
+	"callback": func(that *Context) {
+		data, e := wechat.WxPay.CallbackJsOrder(that.Req)
+		if e != nil {
+			fmt.Println(e)
+			//that.Display(4,e)
+
+			fmt.Println("返回数据错误", e)
+			return
+		}
+
+		sn := data.OutTradeNo
+		amount := int64(data.Amount.Total)
+		state := data.TradeState
+		//state:="SUCCESS"
+		//data := Map{"ces": "das"}
+		//sn := that.Req.FormValue("sn")
+		//amount := ObjToCeilInt64(that.Req.FormValue("amount"))
+
+		if state != "SUCCESS" {
+
+			fmt.Println("购买返回失败", data)
+			return
+		}
+
+		vipOrder := that.Db.Get("vip_order", "*", Map{"sn": sn})
+
+		if vipOrder == nil {
+
+			fmt.Println("找不到订单", vipOrder, data)
+			return
+		}
+		user := that.Db.Get("user", "*", Map{"id": vipOrder.GetCeilInt("user_id")})
+		if user == nil {
+
+			fmt.Println("找不到用户", vipOrder, data)
+			return
+		}
+		if vipOrder.GetCeilInt64("amount") != amount {
+
+			fmt.Println("金额不符", user, vipOrder, amount, data)
+			return
+		}
+
+		that.Db.Update("vip_order", Map{"status": 1}, Map{"id": vipOrder.GetCeilInt("id")})
+
+		idata := Map{"expiration_time": time.Now().Add(365 * 24 * time.Hour).Format("2006-01-02 15:04:05")}
+		if user.GetString("expiration_time") != "" {
+
+			t, e := time.Parse("2006-01-02 15:04:05", user.GetString("expiration_time"))
+			fmt.Println(e, "时间创建失败")
+			if t.Unix() >= time.Now().Unix() {
+				idata["expiration_time"] = t.Add(365 * 24 * time.Hour).Format("2006-01-02 15:04:05")
+			}
+		}
+
+		re := that.Db.Update("user", idata, Map{"id": user.GetCeilInt("id")})
+		if re == 0 {
+			fmt.Println("购买失败", user, vipOrder, re, data)
+
+			return
+		}
+		fmt.Println("成功购买", user, vipOrder, re, data)
+
+		//购买成功后赠送10张券
+		//user_id := that.Session("user_id").Data
+		data2 := Map{
+			"user_id":                 that.Session("user_id").Data,
+			"coupon_id":               1,
+			"code_no":                 "SN" + time.Now().Format("20060102150405") + getSn(),
+			"effective_start_time[#]": "NOW()",
+			"effective_end_time":      time.Now().AddDate(0, 6, 0).Format("2006-01-02 15:04:05"),
+			"source_type":             1,
+			"status":                  0,
+			"admin_id":                user.GetCeilInt("admin_id"),
+			"create_time[#]":          "NOW()",
+		}
+		for n := 0; n < 5; n++ {
+			that.Db.Insert("coupon_user", data2)
+		}
+		data2["effective_end_time"] = time.Now().AddDate(1, 0, 0).Format("2006-01-02 15:04:05")
+		for n := 0; n < 5; n++ {
+			that.Db.Insert("coupon_user", data2)
+		}
+		return
+
+	},
+	"export": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		buy_date := ObjToStr(that.Req.FormValue("buy_date"))
+		if buy_date == "" {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		//data := that.Db.Query("SELECT vo.sn 订单号, vo.`name` 订单名, vo.user_id 购买用户ID,usr.`name` 购买用户名, usr.phone 购买用户电话, cp.id 企业ID, cp.`name` 企业名,\nvo.expiration_time 过期时间, vo.old_expiration_time 订购前到期时间,  vo.amount `订单金额_单位(分)`,\nvo.salesman_id 业务员ID,sm.`name` 业务员名, sm.phone 业务员电话, pv.`name` 服务商名 \nFROM vip_order vo\nLEFT JOIN salesman sm ON sm.id = vo.salesman_id\nLEFT JOIN provider pv ON pv.id = vo.provider_id\nLEFT JOIN `user` usr ON usr.id = vo.user_id\nLEFT JOIN company cp ON cp.id = vo.company_id\nWHERE vo.`status` = 1 AND  vo.create_time >= '" + buy_date + "' \nORDER BY vo.create_time")
+		//data := that.Db.Query("SELECT vo.sn 订单号, vo.`name` 订单名, vo.user_id 购买用户ID,usr.`name` 购买用户名, usr.phone 购买用户电话, cp.id 企业ID, cp.`name` 企业名,\nvo.expiration_time 过期时间, vo.old_expiration_time 订购前到期时间,  vo.amount `订单金额_单位(分)`,\nvo.salesman_id 业务员ID,sm.`name` 业务员名, sm.phone 业务员电话, pv.`name` 服务商名 \nFROM vip_order vo\n" +
+		//	"LEFT JOIN salesman sm ON sm.id = vo.salesman_id\nLEFT JOIN provider pv ON pv.id = vo.provider_id\nLEFT JOIN `user` usr" +
+		//	" ON usr.id = vo.user_id\nLEFT JOIN company cp ON cp.id = vo.company_id\nWHERE" +
+		//	" vo.`status` = 1 AND  vo.create_time >= ? \nORDER BY vo.create_time",buy_date)
+
+		data := that.Db.Select("vip_order", Map{"[>]salesman": "salesman.id=vip_order.salesman_id",
+			"[>]provider": "provider.id = vip_order.provider_id",
+			"[>]user":     "user.id = vip_order.user_id",
+			"[>]company":  "company.id = vip_order.company_id",
+		}, "vip_order.sn 订单号, vip_order.`name` 订单名, vip_order.user_id 购买用户ID,user.`name` 购买用户名, user.phone 购买用户电话, company.id 企业ID, company.`name` 企业名,\nvip_order.expiration_time 过期时间, vip_order.amount `订单金额_单位(分)`,\nvip_order.salesman_id 业务员ID,salesman.`name` 业务员名, salesman.phone 业务员电话, provider.`name` 服务商名",
+			Map{"AND": Map{"vip_order.status": 1, "vip_order.create_time[>=]": buy_date}, "ORDER": "vip_order.create_time DESC"})
+
+		if len(data) == 0 {
+			that.Display(0, "今日没有vip购买信息数据")
+			return
+		}
+
+		var titleList []string
+		if data != nil {
+			m := data[0]
+			for k, _ := range m {
+				titleList = append(titleList, k)
+			}
+		}
+
+		var dataList []Map
+		for _, v := range data {
+			dataList = append(dataList, v)
+		}
+
+		//打印最后一次sql语句
+		//that.Db.LastQuery
+		//请求的数据
+		//that.Db.LastData
+		//that.Db.LastErr
+		//appIns.Db.Select("company",common.Map{"[<>]user":"company.id=user.company_id"},"company.id as id",common.Map{"AND":common.Map{"id[!]":nil},"ORDER":"id DESC"})
+		//appIns.Db.Query("select * from user where id = ? and name = ?",common.Slice{1,"nn"})
+
+		//titleList:= []string{"aaaa", "vvvvv", "dddd", "eeeee", "gfgggg"}
+		DataToExcel(that.Resp, that.Req, titleList, dataList, buy_date+"vip购买信息分析数据")
+	},
+}

example/app/websocket.go

@@ -0,0 +1,72 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"golang.org/x/net/websocket"
+	"time"
+)
+
+type WSClient struct {
+	ID string
+	*websocket.Conn
+	time.Time
+	DeadTime time.Time
+	IsDead   bool
+}
+
+//websocket链接池
+var WsUserMap = map[string][]*WSClient{}
+var WSMasterID = ""
+
+func WsSendMsg(ws *WSClient, data Map) bool {
+	if WsUserMap[ws.ID] == nil {
+		return false
+	}
+
+	for _, v := range WsUserMap[ws.ID] {
+		if v.IsDead || v == ws {
+			//WsUserMap[ws.ID]=WsUserMap[ws.ID][:k]
+			continue
+		}
+
+		str := data.ToJsonString()
+		v.Conn.Write([]byte(str))
+
+	}
+
+	return true
+}
+
+var WebsocketCtr = Ctr{
+	"conn": func(this *Context) {
+		id := this.SessionId
+		if WsUserMap[id] == nil {
+			WsUserMap[id] = []*WSClient{}
+		}
+		hdler := websocket.Handler(func(ws *websocket.Conn) {
+
+			client := &WSClient{ID: id, Conn: ws, Time: time.Now(), DeadTime: time.Now(), IsDead: false}
+
+			WsUserMap[id] = append(WsUserMap[id], client)
+			var message string
+			for true {
+				err := websocket.Message.Receive(ws, &message)
+				if err != nil {
+					client.DeadTime = time.Now()
+					client.IsDead = true
+					return
+				}
+
+				data := Map{}
+				data.JsonToMap(message)
+				WsSendMsg(client, data)
+				//switch data.GetString("type") {
+				//
+				//}
+
+			}
+		})
+		hdler.ServeHTTP(this.Resp, this.Req)
+	},
+}

example/app/wechath5.go

@@ -0,0 +1,287 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/wechat"
+	"time"
+)
+
+var Wechath5 = Ctr{
+
+	//微信注册，0已经完整的注册了，1还没有注册
+	"code": func(that *Context) {
+
+		if that.Req.FormValue("code") == "" {
+			that.Display(3, "参数不足")
+			return
+		}
+
+		appid, resToken, userInfo, err := wechat.H5Program.GetUserInfo(that.Req.FormValue("code"))
+
+		if err != nil {
+			that.Display(4, err)
+			return
+		}
+		//此次获取的微信信息
+		wechatInfo := Map{
+			"openid":         userInfo.OpenID,
+			"acttoken":       resToken.AccessToken,
+			"retoken":        resToken.RefreshToken,
+			"appid":          appid,
+			"unionid":        userInfo.Unionid,
+			"nickname":       FilterEmoji(userInfo.Nickname),
+			"avatar":         userInfo.HeadImgURL,
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+			"type":           1,
+		}
+
+		userId := 0
+
+		//这个defer放到上面，防止出现用户第一次登陆的时候出现不返回company和salesman的情况
+		//如果有则直接返回用户信息到微信小程序里
+		defer func() {
+			if userId != 0 {
+				user := that.Db.Get("user", "*", Map{"id": userId})
+				if user == nil {
+					that.Display(4, "获取个人信息失败")
+					return
+				}
+				delete(user, "password")
+				company := that.Db.Get("company", "id,name", Map{"id": user.GetCeilInt("company_id")})
+
+				//消除company没有创建的影响
+				if company == nil {
+					companyId := that.Db.Insert("company", Map{
+						"user_id":        user["id"],
+						"provider_id":    user["provider_id"],
+						"salesman_id":    user["salesman_id"],
+						"create_time[#]": "now()",
+						"modify_time[#]": "now()",
+						"del_flag":       0,
+					})
+					user["company_id"] = companyId
+					that.Db.Update("user", Map{"company_id": companyId}, Map{"id": user.GetCeilInt("id")})
+					company = that.Db.Get("company", "*", Map{"id": user.GetCeilInt("company_id")})
+				}
+				salesman := that.Db.Get("salesman", "id,name", Map{"id": user.GetCeilInt("salesman_id")})
+				provider := that.Db.Get("provider", "id,name", Map{"id": user.GetCeilInt("provider_id")})
+
+				user["company"] = company
+				user["salesman"] = salesman
+				user["provider"] = provider
+
+				that.Display(0, user)
+			}
+		}()
+
+		defer func() {
+
+			//有sn就关联业务员
+			parentId := ObjToInt(that.Req.FormValue("parent_id"))
+			if parentId == 0 {
+				return
+			}
+			if userId == 0 || userId == parentId {
+				return
+			}
+			puser := that.Db.Get("user", "`index`,id", Map{"id": parentId})
+			if puser == nil {
+				return
+			}
+			user := that.Db.Get("user", "parent_id", Map{"id": userId})
+			if user.GetCeilInt("parent_id") != 0 {
+				return
+			}
+			index1 := puser.GetString("index")
+			if index1 == "," {
+				index1 = index1 + ObjToStr(parentId) + ","
+			}
+
+			//2022/5/11 zpw 添加字段：用户关联parenid的时间 （join_parent_time）
+			that.Db.Update("user", Map{"parent_id": parentId, "index": index1 + ObjToStr(userId) + ",", "join_parent_time[#]": "NOW()"}, Map{"id": userId})
+			//在这里做判断 能否通过分享领券
+			//如果通过邀请获得的券超过了三张则不再赠送
+			//赠送一张券
+			data := Map{
+				"user_id":                 parentId,
+				"coupon_id":               1,
+				"code_no":                 "SN" + time.Now().Format("20060102150405") + getSn(),
+				"effective_start_time[#]": "NOW()",
+				"effective_end_time":      time.Now().AddDate(0, 6, 0).Format("2006-01-02 15:04:05"),
+				"source_type":             3,
+				"status":                  0,
+				"admin_id":                user.GetCeilInt("admin_id"),
+				"create_time[#]":          "NOW()",
+			}
+			//先判断是否领取过 source_type=3 是通过拉新赠送的券
+			couponCount := that.Db.Count("coupon_user", Map{"AND": Map{"user_id": parentId, "source_type": 3}})
+			if couponCount < 3 {
+				that.Db.Insert("coupon_user", data)
+			}
+
+		}()
+		//最后验证服务商是否绑定
+		defer func() {
+			//有sn就关联业务员
+			sn := that.Req.FormValue("sn")
+			if sn == "" {
+				return
+			}
+			if userId == 0 {
+				return
+			}
+
+			salesman := that.Db.Get("salesman", "*", Map{"sn": sn})
+			if salesman.GetCeilInt("id") == 0 {
+				return
+			}
+
+			user := that.Db.Get("user", "*", Map{"id": userId})
+			if user == nil {
+				return
+			}
+
+			//用户都有企服人员关联
+			if user.GetCeilInt("salesman_id") != 0 {
+
+				return
+			}
+			//用户没有企服商id
+			//2022/5/11 zpw 添加字段：用户关联企服商业务人员的时间 （join_salesman_time）
+			that.Db.Update("user", Map{"salesman_id": salesman.GetCeilInt64("id"), "provider_id": salesman.GetCeilInt64("provider_id"), "join_salesman_time[#]": "NOW()"}, Map{"id": user.GetCeilInt64("id")})
+			if user.GetCeilInt("company_id") == 0 {
+				return
+			}
+			//绑定企业
+			that.Db.Update("company", Map{"salesman_id": salesman.GetCeilInt64("id"), "provider_id": salesman.GetCeilInt64("provider_id")}, Map{"id": user.GetCeilInt64("company_id")})
+
+		}()
+
+		wechat := that.Db.Get("wechat", "*", Map{"AND": Map{"openid": userInfo.OpenID, "del_flag": 0}})
+
+		if wechat != nil {
+			//有用户直接返回
+			if wechat.GetCeilInt("user_id") != 0 {
+
+				that.Db.Update("user", Map{"login_time[#]": "now()"}, Map{"id": wechat.GetCeilInt("user_id")})
+				that.Session("wechat_id", wechat.GetCeilInt("id"))
+				that.Session("user_id", wechat.GetCeilInt("user_id"))
+
+				userId = wechat.GetCeilInt("user_id")
+				//that.Display(0, "登录成功")
+				return
+			}
+			//没有用户继续查询数据库看是否有其他unionid
+			wechat1 := that.Db.Get("wechat", "*", Map{"AND": Map{"unionid": userInfo.Unionid, "openid[!]": userInfo.OpenID, "user_id[>]": 0, "del_flag": 0}})
+
+			//其他表有该数据,则更新当前表数据信息
+			if wechat1 != nil {
+
+				wechatInfo["user_id"] = wechat1.GetCeilInt("user_id")
+				that.Db.Update("wechat", wechatInfo, Map{"id": wechat.GetCeilInt("id")})
+
+				that.Db.Update("user", Map{"login_time[#]": "now()"}, Map{"id": wechat1.GetCeilInt("user_id")})
+				that.Session("wechat_id", wechat.GetCeilInt("id"))
+				that.Session("user_id", wechatInfo.GetCeilInt("user_id"))
+
+				userId = wechatInfo.GetCeilInt("user_id")
+				//that.Display(0, "登录成功")
+				return
+			}
+
+			//其他表也没有当前信息，则生成user表，并更新当前用户,一般不会走到这里来
+			user := Map{
+				"nickname":       wechatInfo.GetString("nickname"),
+				"avatar":         wechatInfo.GetString("avatar"),
+				"index":          ",",
+				"create_time[#]": "now()",
+				"modify_time[#]": "now()",
+				"login_time[#]":  "now()",
+				"del_flag":       0,
+			}
+			user["id"] = that.Db.Insert("user", user)
+			//创建企业
+			user["company_id"] = that.Db.Insert("company", Map{
+				"user_id":        user["id"],
+				"create_time[#]": "now()",
+				"modify_time[#]": "now()",
+				"del_flag":       0,
+			})
+			that.Db.Update("user", Map{"company_id": user["company_id"]}, Map{"id": user["id"]})
+
+			wechatInfo["user_id"] = user.GetCeilInt("id")
+
+			that.Db.Update("wechat", wechatInfo, Map{"id": wechat.GetCeilInt("id")})
+
+			that.Session("wechat_id", wechat.GetCeilInt("id"))
+			that.Session("user_id", wechatInfo.GetCeilInt("user_id"))
+
+			userId = wechatInfo.GetCeilInt("user_id")
+			//that.Display(0, "登录成功")
+			return
+		}
+		user := Map{
+			"nickname":       wechatInfo.GetString("nickname"),
+			"avatar":         wechatInfo.GetString("avatar"),
+			"index":          ",",
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"login_time[#]":  "now()",
+			"del_flag":       0,
+		}
+		user["id"] = that.Db.Insert("user", user)
+		user["company_id"] = that.Db.Insert("company", Map{
+			"user_id":        user["id"],
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+		})
+
+		that.Db.Update("user", Map{"company_id": user["company_id"]}, Map{"id": user["id"]})
+
+		wechatInfo["user_id"] = user.GetCeilInt("id")
+
+		wechatInfo["id"] = that.Db.Insert("wechat", wechatInfo)
+
+		if wechatInfo.GetCeilInt("id") == 0 {
+			that.Display(4, "创建用户失败")
+			return
+		}
+
+		that.Session("wechat_id", wechatInfo.GetCeilInt("id"))
+		that.Session("user_id", wechatInfo.GetCeilInt("user_id"))
+
+		userId = wechatInfo.GetCeilInt("user_id")
+		//that.Display(0, "登录成功")
+
+	},
+	//网页签名
+	"sign": func(that *Context) {
+
+		signUrl := that.Req.FormValue("url")
+		if signUrl == "" {
+			that.Display(3, "参数不足")
+			return
+		}
+
+		cfg1, e := wechat.H5Program.GetSignUrl(signUrl)
+
+		if e != nil {
+			that.Display(4, e)
+			return
+		}
+
+		sign := Map{
+			"appId":     cfg1.AppID,
+			"timestamp": cfg1.Timestamp,
+			"nonceStr":  cfg1.NonceStr,
+			"signature": cfg1.Signature,
+		}
+
+		that.Display(0, sign)
+
+	},
+}

example/app/wechatmini.go

@@ -0,0 +1,167 @@
+package app
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/wechat"
+	"fmt"
+)
+
+var WechatMini = Ctr{
+	"getphone": func(that *Context) {
+
+		//sessionKey := that.Req.FormValue("sessionkey")
+
+		if that.Session("wechat_id").Data == nil {
+			that.Display(2, "请先登录")
+			return
+		}
+
+		encryptedData := that.Req.FormValue("encryptedData")
+		iv := that.Req.FormValue("iv")
+
+		if encryptedData == "" || iv == "" {
+			that.Display(3, "参数不足")
+			return
+		}
+
+		wechatIns := that.Db.Get("wechat", "sessionkey", Map{"id": that.Session("wechat_id").ToCeilInt()})
+		_, re, e := wechat.MiniProgram.GetPhoneNumber(wechatIns.GetString("sessionkey"), encryptedData, iv)
+
+		if e != nil {
+			that.Display(4, e)
+			return
+		}
+		//临时存储用于校验
+		that.Session("wechat_phone", re.PhoneNumber)
+		that.Display(0, re.PhoneNumber)
+
+	},
+	//检查是否已经有用户登录了，如果有直接登录，如果没有则查询unionid，有则直接返回用户信息，没有则返回null
+	"code": func(that *Context) {
+
+		code := that.Req.FormValue("code")
+		if code == "" {
+			that.Display(3, "缺少code")
+			return
+		}
+
+		appid, re, e := wechat.MiniProgram.GetBaseUserInfo(code)
+		fmt.Println(re)
+		if e != nil {
+			that.Display(4, e)
+			return
+		}
+
+		wchat := Map{"openid": re.OpenID,
+			"appid":          appid,
+			"sessionkey":     re.SessionKey,
+			"unionid":        re.UnionID,
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+			"type":           2,
+		}
+
+		userId := 0
+
+		//如果有则直接返回用户信息到微信小程序里
+		defer func() {
+			if userId != 0 {
+				user := that.Db.Get("user", "*", Map{"id": userId})
+				company := that.Db.Get("company", "id,name", Map{"id": user.GetCeilInt("company_id")})
+				salesman := that.Db.Get("salesman", "id,name", Map{"id": user.GetCeilInt("salesman_id")})
+				provider := that.Db.Get("provider", "id,name", Map{"id": user.GetCeilInt("provider_id")})
+				if user == nil {
+					that.Display(4, "获取个人信息失败")
+					return
+				}
+				delete(user, "password")
+				user["company"] = company
+				user["salesman"] = salesman
+				user["provider"] = provider
+				that.Display(0, user)
+			}
+		}()
+
+		wechat := that.Db.Get("wechat", "*", Map{"AND": Map{"openid": re.OpenID, "user_id[!]": nil, "del_flag": 0}})
+		//有该用户，则登录成功
+		if wechat != nil {
+
+			that.Session("wechat_id", wechat.GetCeilInt("id"))
+			that.Session("user_id", wechat.GetCeilInt("user_id"))
+			//更新用户信息
+			that.Db.Update("wechat", wchat, Map{"id": wechat.GetCeilInt("id")})
+			//that.Display(0, "登录成功")
+			userId = wechat.GetCeilInt("user_id")
+			return
+		}
+
+		//如果其他人有相关信息，则直接取用
+		wechat = that.Db.Get("wechat", "*", Map{"AND": Map{"unionid": re.UnionID, "user_id[!]": nil, "del_flag": 0}})
+		if wechat != nil {
+			wechat1 := that.Db.Get("wechat", "*", Map{"AND": Map{"openid": re.OpenID, "del_flag": 0}})
+			//有该信息，但没有相关的用户信息，则直接绑定其他的信息上来
+			if wechat1 != nil {
+
+				//更新用户信息
+				that.Db.Update("wechat", wchat, Map{"id": wechat1.GetCeilInt("id")})
+
+				that.Session("wechat_id", wechat1.GetCeilInt("id"))
+				that.Session("user_id", wechat.GetCeilInt("user_id"))
+				//that.Display(0, "登录成功")
+				userId = wechat.GetCeilInt("user_id")
+				return
+			}
+			//没有相关用户信息，则新建wechat并完成登录
+			wchat["user_id"] = wechat["user_id"]
+			wchat["create_time[#]"] = "now()"
+
+			wchat["id"] = that.Db.Insert("wechat", wchat)
+			if wchat.GetCeilInt("id") == 0 {
+
+				that.Display(5, "创建wechat失败")
+				return
+			}
+
+			that.Session("wechat_id", wchat.GetCeilInt("id"))
+			that.Session("user_id", wchat.GetCeilInt("user_id"))
+
+			userId = wchat.GetCeilInt("user_id")
+			//that.Display(0, "登录成功")
+			return
+		}
+
+		user := Map{
+
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"login_time[#]":  "now()",
+			"del_flag":       0,
+		}
+		user["id"] = that.Db.Insert("user", user)
+
+		user["company_id"] = that.Db.Insert("company", Map{
+			"user_id":        user["id"],
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+		})
+
+		that.Db.Update("user", Map{"company_id": user["company_id"]}, Map{"id": user["id"]})
+
+		wchat["user_id"] = user.GetCeilInt("id")
+		wchat["create_time[#]"] = "now()"
+
+		wchat["id"] = that.Db.Insert("wechat", wchat)
+		if wchat.GetCeilInt("id") == 0 {
+			that.Display(5, "登录失败")
+			return
+		}
+
+		that.Session("wechat_id", wchat.GetCeilInt("id"))
+		that.Session("user_id", wchat.GetCeilInt("user_id"))
+
+		userId = wchat.GetCeilInt("user_id")
+		//that.Display(0, nil)
+	},
+}

example/config/config.json

@@ -1,4 +1,5 @@
 {
+	"aliyunCode": "06c6a07e89dd45c88de040ee1489eef7",
 	"avatarPath": "avatar/2006/01/02/",
 	"cache": {
 		"db": {
@@ -11,22 +12,21 @@
 			"timeout": 7200
 		}
 	},
-	"codeConfig": {
-		"admin": "config/app.json"
-	},
-	"codeConfig1": {
-		"admin": {
-			"config": "config/app.json",
-			"package": "admin",
-			"rule": "config/rule.json"
+	"codeConfig": [
+		{
+			"config": "config/admin.json",
+			"mode": 0,
+			"name": "",
+			"rule": "config/adminRule.json",
+			"table": "admin"
 		}
-	},
-	"crossDomain": "auto",
+	],
+	"crossDomain": "",
 	"db": {
 		"mysql": {
-			"host": "192.168.6.253",
-			"name": "iedc_dev",
-			"password": "dasda8454456",
+			"host": "192.168.2.50",
+			"name": "zct_v2_v2",
+			"password": "kct@2021",
 			"port": "3306",
 			"prefix": "",
 			"user": "root"
@@ -41,16 +41,26 @@
 		"2": "访问权限异常",
 		"3": "请求参数异常",
 		"4": "数据处理异常",
-		"5": "数据结果异常"
+		"5": "数据结果异常",
+		"6": "需要进一步获取个人信息"
 	},
 	"imgPath": "img/2006/01/02/",
-	"mode": 3,
+	"mode": 2,
 	"port": "8081",
 	"sessionName": "HOTIME",
 	"smsKey": "b0eb4bf0198b9983cffcb85b69fdf4fa",
-	"smsLogin": "【政企超链接】您的验证码为：{code}，请在5分钟内使用，切勿将验证码泄露于他人，如非本人操作请忽略。",
+	"smsLogin": "【政策通】您的验证码为：{code}，请在5分钟内使用，切勿将验证码泄露于他人，如非本人操作请忽略。",
+	"tencentId": "AKIDOgT8cKCQksnY7yKATaYO7j9ORJzSYohP",
+	"tencentKey": "GNXgjdN4czA9ya0FNMApVJzTmsmU0KSN",
 	"tpt": "tpt",
-	"wechatAppID": "wx2edb802f5c3ae1ae",
-	"wechatAppSecret": "4ff97e523c3de6bad47051b568522386",
+	"wechatAppID": "wxdcc8d6360661a179",
+	"wechatAppNotifyUrl": "https://zcth5.kct.cn/app/vip_order/callback",
+	"wechatAppSecret": "4d793683ca915264663a9c9a33530c3c",
+	"wechatMiniAppID": "wx1c795e883b5b54c4",
+	"wechatMiniAppSecret": "d2bec12d1fa4d8b5714ccbed1c0671e4",
+	"wechatPayMApiV3Key": "dh33tyagd1623623GDYGGDhe1d9dh171",
+	"wechatPayMCHID": "1624888906",
+	"wechatPayPrivateKey": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1vs3i/4sozxsK\noiS2S95rl+csLXQDugg23bcAVzXr7ZeTM/h81sCwraQDMnAJ/V3n7LxFAZeaFwLb\nyrkQ3lv4IEtWVgjVUkjkhvKGWcAp16Q/grOpxWmmn+VlW5ZGwQQ4DL4sC6BeEyxu\nUdtZ7UVc9lqsQX01R0oiegItJGPMMXNgeLFDEeoAwyIQcL0VG2bND7qrEVeQkLTj\nFm9ZkSb0LySPkSgqxMlSpiX1MS+wWWIHpq91CvdVHNowaGFA7ajU3RztbFAuxdpl\ng9RIocbrY1QwGXouQTEOUI2KZaES9rAa2lD6oWom4mRYiQ1oNO12XlUTcKsr84P5\nTq50dOYFAgMBAAECggEAQUns/mncnOlhhn1fANnaaf5kvlsJvTj8MHGPhyDNLxbo\nB6p4zqf7Cr0mGTvqQbxyGpnRvFxpEKLJlRmLSAMJOOapCbfYboGjy+yqfRcK0D02\nNNaIIinX3VK9fp7bKkm2cUgqnPoEPydWI79mNDTnYRDi29Se3R/iAuafl4XmD/js\nOKWG5tlXEatZ+gDbhnug4hp3xEGm4pbTS1HedV7HgYiKpxAT9uc/YmiHelZUUqlG\nwa1Nda2J88pzCSZX6TsRyY9UF/sjorxSNZGfj+5waeYMccj0Cx4uEQYgBv5tm+I+\nFTRgo/riM5gT9oRTnuNuzUrNwUNLyUsldvdQdlheNQKBgQDqwhrW52q3xClFLXR4\nHu9cTPt/p96MYE+xBllO/M9VFcG/hT++9R9l26+o26Lu+iIF5euDQiYSyURniGim\nWfV0I2q8HufhPLJBamvxRPI0V8LHwbY7c6HKnRR3eDAWAVYIcmsV4RLS67bsgtnr\nCgaFUDHXnpPKjxp1b4M5K3GqxwKBgQDGMLgAQn0a3nZwquPD4D+6tjy5xTxDX4Op\nULHBQheX0lBAR9Kcurzy4ca+T5xsyHd6SPwQxobRPei/3TBmc18J1T3nxJkTbEEP\nqy8k7MOWW2es3ou4CRL5lVKPx4YDWb5iT7X3Ue55JjPFAoj6FBOHxdvRQnDYsLFy\nSuSHPc280wKBgQCqfvCZNZcnAbtrd3jIKMd0hKB/dP7HesdF7TN9j1RRGi0NmIvU\ndxgnlOa9v05VO6rsF7D1MlyOdkhM3SAL+PewMmy5VcTYq4lWwyDEKGuzoi1fgIuG\nIBPYID8WCV77DFtcZSTqzf0q3HCM0vfLoQtdVQHt9Ein60ivE579LVUvTwKBgFid\nefgrwnJcG8serb5sKzKZvyc1CE/7igwPl5sYqSHqGJXVR1dqq4dR6iI3yHJfZASa\nU5JQogE21DXNeZGlbk4gOZDCt8sWcTTHTsoMzxsQfZeu3fwImqJb4NGG3eXrn5On\nnm4aBS3IJgelrYdbqKvhjPrQ4VISFxVKZUoPGUmfAoGARZbtbyl3s8cAExWe9dK6\nyWdkA3M2wR4n623W13rTQDc3D7p/hmlgB2x8it88m+580326G4qgwdUbG93EW1WQ\nahbkkcmdxzHgPVJdsyx22fR0TkeT1gjMpoSh4k3HOsbZE4EvlI459yE9fTSLBq2A\nFzGjYRpBTlRyrsSEhyVg4G0=\n-----END PRIVATE KEY-----",
+	"wechatPaySerialNo": "7A92D2D26D212D6BF934BDB10D547274807C3DDB",
 	"wxFilePath": "wxfile/2006/01/02/"
 }

example/config/configNote.json

@@ -20,10 +20,16 @@
 		},
 		"注释": "可配置memory，db，redis，默认启用memory，默认优先级为memory\u003eredis\u003edb,memory与数据库缓存设置项一致，缓存数据填充会自动反方向反哺，加入memory缓存过期将自动从redis更新，但memory永远不会更新redis，如果是集群建议不要开启memory，配置即启用"
 	},
-	"codeConfig": {
-		"packageName": "默认无，必须，包名称以及应用名，生成代码的配置文件地址，比如config/app.json，数据库有更新时自动更新配置文件以及对应的生成文件",
-		"注释": "配置即启用，非必须，默认无"
-	},
+	"codeConfig": [
+		"注释:配置即启用，非必须，默认无",
+		{
+			"config": "默认config/app.json，必须，接口描述配置文件",
+			"mode": "默认0，非必须，0为内嵌代码模式，1为生成代码模式",
+			"name": "默认无，非必须，有则生成代码到此目录，无则采用缺省模式使用表名，如设置为：admin，将在admin目录生成包名为admin的代码",
+			"rule": "默认config/rule.json，非必须，有则按改规则生成接口，无则按系统内嵌方式生成",
+			"table": "默认admin，必须，根据数据库内当前表名做为用户生成数据"
+		}
+	],
 	"crossDomain": "默认空 非必须，空字符串为不开启，如果需要跨域设置，auto为智能开启所有网站允许跨域，http://www.baidu.com为指定域允许跨域",
 	"db": {
 		"mysql": {

example/main.go

@@ -1,15 +1,89 @@
 package main
 
 import (
-	"../../hotime"
-	//"../dri/aliyun"
+	. "code.hoteas.com/golang/hotime"
+	"code.hoteas.com/golang/hotime/dri/aliyun"
+	"code.hoteas.com/golang/hotime/dri/ddsms"
+	"code.hoteas.com/golang/hotime/dri/tencent"
+	"code.hoteas.com/golang/hotime/dri/wechat"
+	"code.hoteas.com/golang/hotime/example/app"
+	"code.hoteas.com/golang/hotime/example/provider"
+	//. "code.hoteas.com/golang/hotime/common"
 	"fmt"
 	"time"
 )
 
+//
 func main() {
 	date, _ := time.Parse("2006-01-02 15:04", time.Now().Format("2006-01-02")+" 14:00")
 	fmt.Println(date, date.Unix())
+	//fmt.Println("开始测试")
+	//t:=common.Map{"t":1652425167}
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]=1652425167123
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]=1652425167123456
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]=1652425167123456789
+	//fmt.Println(t.GetTime("t"))
+	//fmt.Println("开始测试2")
+	//t["t"]="2006-01-02 15:04:05"
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]="2006-01-02 15"
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]="2006-01-02"
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]="2006-01"
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]="2006-01"
+	//fmt.Println(t.GetTime("t"))
+	//t["t"]="2006"
+	//fmt.Println(t.GetTime("t"))
+	//
+	//t["t"]="06"
+	//fmt.Println(t.GetTime("t"))
+
 	//fmt.Println("0123456"[1:7])
-	appIns := hotime.Init("config/config.json")
+	appIns := Init("config/config.json")
+
+	aliyun.Company.Init(appIns.Config.GetString("aliyunCode"))
+
+	//初始化短信配置
+	ddsms.DDY.Init(appIns.Config.GetString("smsKey"))
+	//初始化公众号配置
+	wechat.H5Program.Init(appIns.Config.GetString("wechatAppID"), appIns.Config.GetString("wechatAppSecret"))
+	//初始化小程序配置
+	wechat.MiniProgram.Init(appIns.Config.GetString("wechatMiniAppID"), appIns.Config.GetString("wechatMiniAppSecret"))
+	//初始化小程序及公众号支付配置
+	wechat.WxPay.Init(appIns.Config.GetString("wechatPayMCHID"),
+		appIns.Config.GetString("wechatPaySerialNo"),
+		appIns.Config.GetString("wechatPayMApiV3Key"),
+		appIns.Config.GetString("wechatPayPrivateKey"))
+	tencent.Tencent.Init(appIns.Config.GetString("tencentId"), appIns.Config.GetString("tencentKey"))
+
+	//用户侧访问前设置
+	appIns.SetConnectListener(func(that *Context) (isFinished bool) {
+		//发送短信校验
+		//that.RespFunc = func() {
+		//	go func(Form url.Values, RespData common.Map) {
+		//		fmt.Println(Form)
+		//		fmt.Println(RespData)
+		//	}(that.Req.Form, that.RespData)
+		//
+		//}
+
+		return isFinished
+	})
+
+	//appIns.SetConnectListener(func(that *Context) (isFinished bool) {
+	//
+	//	return isFinished
+	//})
+	//appIns.Db.Action(func(db db.HoTimeDB) (isSuccess bool) {
+	//	return isSuccess
+	//})
+	appIns.Run(Router{
+		"provider": provider.Project,
+		"app":      app.Project,
+	})
 }

example/provider/company.go

@@ -0,0 +1,144 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/aliyun"
+	"fmt"
+)
+
+var CompanyCtr = Ctr{
+
+	"search": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		keywords := that.Req.FormValue("keywords")
+		if keywords == "" {
+			keywords = that.Req.FormValue("company_name")
+		}
+		if keywords == "" {
+			keywords = that.Req.FormValue("name")
+		}
+
+		if len(keywords) < 2 {
+			that.Display(0, Slice{})
+			return
+		}
+
+		res, err := aliyun.Company.GetCompanyList(keywords)
+		if err != nil {
+			fmt.Println(err)
+			that.Display(0, Slice{})
+			return
+		}
+		if res.GetCeilInt64("status") != 200 {
+			fmt.Println(err)
+			that.Display(0, Slice{})
+			return
+		}
+
+		that.Display(0, res.GetMap("data").GetSlice("list"))
+	},
+	"search_info": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		name := that.Req.FormValue("name")
+
+		if len(name) < 2 {
+			that.Display(3, "找不到企业")
+			return
+		}
+
+		res, err := aliyun.Company.GetCompanyBaseInfo(name)
+		if err != nil {
+			fmt.Println(err)
+			that.Display(4, "查询失败")
+			return
+		}
+		if res.GetBool("status") != true {
+			fmt.Println(err)
+			that.Display(4, "查询失败")
+			return
+		}
+
+		that.Display(0, res.GetMap("data"))
+	},
+
+	"info": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("company", "*", Map{"id": id})
+		if res == nil {
+			that.Display(4, "找不到企业")
+			return
+		}
+		//先不做限制
+		//if res.GetCeilInt("salesman_id")!=that.Session("salesman_id").ToCeilInt(){
+		//	that.Display(4,"不是你的企业")
+		//	return
+		//}
+
+		res["technology_center_flag"] = strToArray(res.GetString("technology_center_flag"))
+		res["engineering_center_flag"] = strToArray(res.GetString("engineering_center_flag"))
+		res["engineering_laboratory_flag"] = strToArray(res.GetString("engineering_laboratory_flag"))
+		res["key_laboratory_flag"] = strToArray(res.GetString("key_laboratory_flag"))
+		res["industrial_design_center_flag"] = strToArray(res.GetString("industrial_design_center_flag"))
+		res["high_level_talents_flag1"] = strToArray(res.GetString("high_level_talents_flag1"))
+		res["tags"] = strToArray(res.GetString("tags"))
+
+		that.Display(0, res)
+	},
+	"edit": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		company := that.Db.Get("company", "*", Map{"id": id})
+		delete(company, "id")
+		delete(company, "salesman_id")
+		delete(company, "provider_id")
+		delete(company, "user_id")
+		delete(company, "del_flag")
+		delete(company, "state")
+		delete(company, "create_time")
+		delete(company, "modify_time")
+		data := Map{}
+		for k, _ := range company {
+			if that.Req.Form[k] != nil {
+				if k == "tags" || k == "high_level_talents_flag1" || k == "technology_center_flag" || k == "engineering_center_flag" || k == "engineering_laboratory_flag" || k == "key_laboratory_flag" || k == "industrial_design_center_flag" {
+					data[k] = arrayToStr(ObjToSlice(that.Req.Form[k]))
+				} else {
+					data[k] = that.Req.FormValue(k)
+				}
+
+			}
+		}
+
+		that.Db.Update("company", data, Map{"id": id})
+
+		that.Display(0, "更新成功")
+
+	},
+}

example/provider/declare.go

@@ -0,0 +1,113 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var DeclareCtr = Ctr{
+
+	"info": func(that *Context) {
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("declare", "*", Map{"id": id})
+
+		if res == nil {
+			that.Display(4, "找不到通知公告")
+			return
+		}
+		res["click_num"] = res.GetCeilInt64("click_num") + res.GetCeilInt64("click_num_base") + 1
+		delete(res, "click_num_base")
+
+		res["favorite_num"] = res.GetCeilInt64("favorite_num") + res.GetCeilInt64("favorite_num_base")
+		delete(res, "favorite_num_base")
+
+		article := that.Db.Get("article", "*", Map{"id": res.GetCeilInt64("article_id")})
+		if article != nil {
+			article["click_num"] = article.GetCeilInt64("click_num") + article.GetCeilInt64("click_num_base") + 1
+			delete(article, "click_num_base")
+
+			article["favorite_num"] = article.GetCeilInt64("favorite_num") + article.GetCeilInt64("favorite_num_base")
+			delete(article, "favorite_num_base")
+		}
+
+		res["article"] = article
+
+		//浏览量加1
+		that.Db.Update("declare", Map{"click_num[#]": "click_num+1"}, Map{"id": id})
+		//浏览量加1
+		that.Db.Update("article", Map{"click_num[#]": "click_num+1"}, Map{"id": res.GetCeilInt64("article_id")})
+
+		//查询是否已关注
+		if that.Session("user_id").Data != nil {
+			favorite := that.Db.Get("favorite", "user_id,declare_id", Map{"AND": Map{"declare_id": id, "user_id": that.Session("user_id").ToCeilInt(), "del_flag": 0}})
+			res["favorite"] = favorite
+		}
+
+		that.Display(0, res)
+	},
+
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "declare_id[!]": nil}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"title[~]": keywords, "description[~]": keywords, "content[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["release_date[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["release_date[<=]"] = finishTime
+		}
+
+		dispatchName := that.Req.FormValue("dispatch_name")
+		if dispatchName != "" {
+			data["dispatch_name"] = dispatchName
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "release_time DESC"}
+		}
+
+		count := that.Db.Count("article", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("article", "id,title,description,department_id,click_num+click_num_base AS click_num,"+
+			"favorite_num_base+favorite_num AS favorite_num,dispatch_num,dispatch_name,prepare_date,release_time,expire_date,area_id,status,declare_id,declare_id,declare_id,dispatch_name,policy_level", data)
+		for _, v := range res {
+
+			//if v.GetCeilInt("declare_id")>0{
+			//	v["declare"]=that.Db.Get("declare","id,tag",Map{"id":v.GetCeilInt("declare_id")})
+			//}
+			//if v.GetCeilInt("declare_id")>0{
+			//	v["declare"]=that.Db.Get("declare","tag",Map{"id":v.GetCeilInt("declare_id")})
+			//}
+			if v.GetCeilInt("declare_id") > 0 {
+				v["declare"] = that.Db.Get("declare", "money_scope_min,money_scope_max,status", Map{"id": v.GetCeilInt("declare_id")})
+			}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/provider/init.go

@@ -0,0 +1,72 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"strings"
+	"time"
+	"unicode/utf8"
+)
+
+// Project 管理端项目
+var Project = Proj{
+	"company":  CompanyCtr,
+	"declare":  DeclareCtr,
+	"matters":  MattersCtr,
+	"order":    OrderCtr,
+	"salesman": Salesman,
+	"sms":      Sms,
+	"tag":      TagCtr,
+	"user":     UserCtr,
+	"wechat":   Wechat,
+}
+
+func strToArray(str string) Slice {
+	s := Slice{}
+
+	olds := strings.Split(str, ",")
+	for _, v := range olds {
+		if v != "" {
+			s = append(s, v)
+		}
+	}
+	return s
+}
+
+func arrayToStr(ars Slice) string {
+	s := ","
+	if ars == nil {
+		return s
+	}
+	for k, _ := range ars {
+		s = s + ars.GetString(k) + ","
+	}
+	return s
+}
+
+//生成随机码的6位md5
+func getSn() string {
+	x := Rand(8)
+	return Substr(Md5(ObjToStr(int64(x)+time.Now().UnixNano()+int64(Rand(6)))), 0, 6)
+}
+
+//生成随机码的4位随机数
+func getCode() string {
+	//res := ""
+	//for i := 0; i < 4; i++ {
+	res := ObjToStr(RandX(1000, 9999))
+	//}
+	return res
+}
+
+// 过滤 emoji 表情
+func FilterEmoji(content string) string {
+	new_content := ""
+	for _, value := range content {
+		_, size := utf8.DecodeRuneInString(string(value))
+		if size <= 3 {
+			new_content += string(value)
+		}
+	}
+	return new_content
+}

example/provider/matters.go

@@ -0,0 +1,108 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var MattersCtr = Ctr{
+
+	"info": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		res := that.Db.Get("matters", "*", Map{"id": id})
+		if res == nil {
+			that.Display(4, "找不到事项")
+			return
+		}
+		if res.GetCeilInt("salesman_id") != that.Session("salesman_id").ToCeilInt() {
+			that.Display(4, "不是你的事项")
+			return
+		}
+
+		res["user"] = that.Db.Get("user", "id,name,nickname,company_id", Map{"id": res.GetCeilInt64("user_id")})
+		if res.GetMap("user") != nil && res.GetMap("user").GetCeilInt64("company_id") != 0 {
+			res["company"] = that.Db.Get("company", "id,name", Map{"id": res.GetMap("user").GetCeilInt64("company_id")})
+		}
+		that.Display(0, res)
+	},
+
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		userId := ObjToInt(that.Req.FormValue("id"))
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		tp := that.Req.FormValue("type")
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "salesman_id": that.Session("salesman_id").Data}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"title[~]": keywords, "description[~]": keywords, "content[~]": keywords}
+		}
+
+		if userId != 0 {
+
+			user := that.Db.Get("user", "id", Map{"AND": Map{"id": userId, "salesman_id": that.Session("salesman_id").Data}})
+			if user != nil {
+				data["user_id"] = userId
+			}
+		}
+
+		if tp != "" {
+			data["type"] = ObjToInt("tp")
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modify_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modify_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data}
+		}
+
+		count := that.Db.Count("matters", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("matters", "*", data)
+
+		for _, v := range res {
+			if v.GetCeilInt64("user_id") != 0 {
+				v["user"] = that.Db.Get("user", "id,avatar,name,nickname,company_id", Map{"id": v.GetCeilInt64("user_id")})
+				if v.GetMap("user") != nil && v.GetMap("user").GetCeilInt64("company_id") != 0 {
+					v["company"] = that.Db.Get("company", "id,name", Map{"id": v.GetMap("user").GetCeilInt64("company_id")})
+				}
+			}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/provider/order.go

@@ -0,0 +1,239 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var OrderCtr = Ctr{
+	"info": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+		salesman := that.Db.Get("salesman", "*", Map{"id": that.Session("salesman_id").Data})
+		if salesman == nil {
+			that.Display(2, "登录错误")
+			return
+		}
+
+		res := that.Db.Get("order", "*", Map{"AND": Map{"id": id, "provider_id": salesman.GetCeilInt64("provider_id")}})
+
+		if res == nil {
+			that.Display(4, "找不到对应订单")
+			return
+		}
+
+		//if res.GetCeilInt("salesman_id") != that.Session("salesman_id").ToCeilInt() {
+		//	that.Display(4, "不是你的订单")
+		//	return
+		//}
+
+		if res.GetCeilInt("user_id") > 0 {
+			res["user"] = that.Db.Get("user", "name,nickname,avatar", Map{"id": res.GetCeilInt("user_id")})
+		}
+
+		res["order_record"] = that.Db.Select("order_record", "remarks,modify_time", Map{"order_id": res.GetCeilInt("id"), "ORDER": "modify_time DESC"})
+
+		that.Display(0, res)
+	},
+	"create_order_record": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		remarks := that.Req.FormValue("remarks")
+
+		salesman := that.Db.Get("salesman", "*", Map{"id": that.Session("salesman_id").Data})
+		if salesman == nil {
+			that.Display(2, "登录错误")
+			return
+		}
+
+		order := that.Db.Get("order", "*", Map{"AND": Map{"id": id, "provider_id": salesman.GetCeilInt64("provider_id")}})
+		if order == nil {
+			that.Display(4, "不是属于你的订单")
+			return
+		}
+
+		if order.GetCeilInt("status") != 0 {
+			that.Display(4, "已完结订单，不可操作")
+			return
+		}
+
+		orderRecordId := that.Db.Insert("order_record", Map{
+			"order_id":       id,
+			"user_id":        order.GetCeilInt64("user_id"),
+			"remarks":        salesman.GetString("name") + ":" + remarks,
+			"salesman_id":    order.GetCeilInt64("salesman_id"),
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+		})
+
+		that.Db.Update("order", Map{"order_record_id": orderRecordId}, Map{"id": id})
+
+		that.Display(0, "新增订单记录成功")
+
+	},
+	"edit": func(that *Context) {
+
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		id := ObjToInt(that.Req.FormValue("id"))
+
+		if id == 0 {
+			that.Display(3, "请求参数异常")
+			return
+		}
+
+		salesman := that.Db.Get("salesman", "*", Map{"id": that.Session("salesman_id").Data})
+		if salesman == nil {
+			that.Display(2, "登录错误")
+			return
+		}
+
+		policyDeclareFlag := ObjToInt(that.Req.FormValue("policy_declare_flag"))
+		declareId := ObjToInt(that.Req.FormValue("declare_id"))
+
+		intellectualPropertyFlag := ObjToInt(that.Req.FormValue("intellectual_property_flag"))
+		intellectualPropertyCount := ObjToInt(that.Req.FormValue("intellectual_property_count"))
+		taxOnsultingFlag := ObjToInt(that.Req.FormValue("tax_onsulting_flag"))
+
+		lawFlag := ObjToInt(that.Req.FormValue("law_flag"))
+		status := ObjToInt(that.Req.FormValue("status"))
+
+		data := Map{
+			"policy_declare_flag":         policyDeclareFlag,
+			"intellectual_property_flag":  intellectualPropertyFlag,
+			"intellectual_property_count": intellectualPropertyCount,
+			"tax_onsulting_flag":          taxOnsultingFlag,
+			"law_flag":                    lawFlag,
+			"status":                      status,
+			"modify_time[#]":              "now()",
+		}
+
+		if declareId != 0 {
+			data["declare_id"] = declareId
+		}
+
+		order := that.Db.Get("order", "*", Map{"AND": Map{"id": id, "provider_id": salesman.GetCeilInt64("provider_id")}})
+		if order == nil {
+			that.Display(4, "不是属于你的订单")
+			return
+		}
+
+		if order.GetCeilInt("status") != 0 {
+			that.Display(4, "已完结订单，不可操作")
+			return
+		}
+
+		data["order_record_id"] = that.Db.Insert("order_record", Map{
+			"order_id":       id,
+			"user_id":        order.GetCeilInt64("user_id"),
+			"remarks":        salesman.GetString("name") + "变更了订单服务内容",
+			"salesman_id":    order.GetCeilInt64("salesman_id"),
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+		})
+		re := that.Db.Update("order", data, Map{"id": id})
+		if re == 0 {
+			that.Display(4, "变更订单内容失败")
+			return
+		}
+
+		that.Display(0, "变更订单内容成功")
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		userId := ObjToInt(that.Req.FormValue("id"))
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		salesman := that.Db.Get("salesman", "*", Map{"id": that.Session("salesman_id").Data})
+		if salesman == nil {
+			that.Display(2, "登录错误")
+			return
+		}
+
+		data := Map{"del_flag": 0, "provider_id": salesman.GetCeilInt64("provider_id")}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"sn[~]": keywords, "name[~]": keywords}
+		}
+
+		if userId != 0 {
+
+			user := that.Db.Get("user", "id", Map{"AND": Map{"id": userId, "salesman_id": that.Session("salesman_id").Data}})
+			if user != nil {
+				data["user_id"] = userId
+			}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modify_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modify_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data}
+		}
+
+		count := that.Db.Count("order", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("order", "*", data)
+		for _, v := range res {
+
+			//if v.GetCeilInt("policy_id")>0{
+			//	v["policy"]=that.Db.Get("policy","id,tag",Map{"id":v.GetCeilInt("policy_id")})
+			//}
+			if v.GetCeilInt("user_id") > 0 {
+				v["user"] = that.Db.Get("user", "name,nickname,avatar", Map{"id": v.GetCeilInt("user_id")})
+			}
+			if v.GetCeilInt("order_record_id") > 0 {
+				v["order_record"] = that.Db.Get("order_record", "remarks,modify_time", Map{"id": v.GetCeilInt("order_record_id")})
+			}
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/provider/salesman.go

@@ -0,0 +1,143 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var Salesman = Ctr{
+	"test": func(that *Context) {
+		that.Session("salesman_id", 1)
+		that.Session("wechat_id", 1)
+		that.Display(0, 1)
+	},
+	"info": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		salesman := that.Db.Get("salesman", "*", Map{"id": that.Session("salesman_id").Data})
+		if salesman == nil {
+			that.Display(4, "找不到该业务员")
+			return
+		}
+
+		if salesman.GetString("nickname") == "" {
+			wechat := that.Db.Get("wechat", "*", Map{"salesman_id": salesman.GetCeilInt64("id")})
+			if wechat != nil {
+				salesman["nickname"] = wechat.GetString("nickname")
+				salesman["avatar"] = wechat.GetString("avatar")
+				that.Db.Update("salesman", Map{"nickname": wechat.GetString("nickname"), "avatar": wechat.GetString("avatar")}, Map{"id": salesman.GetCeilInt64("id")})
+			}
+		}
+		salesman["user"] = that.Db.Count("user", Map{"AND": Map{"salesman_id": that.Session("salesman_id").Data, "del_flag": 0}})
+		salesman["matters"] = that.Db.Count("matters", Map{"AND": Map{"salesman_id": that.Session("salesman_id").Data, "del_flag": 0}})
+
+		salesman["admin"] = that.Db.Get("admin", "id,name,avatar", Map{"id": salesman.GetCeilInt64("admin_id")})
+		salesman["provider"] = that.Db.Get("provider", "*", Map{"id": salesman.GetCeilInt64("provider_id")})
+		if salesman["provider"] != nil {
+			salesman["provider_salesman"] = that.Db.Get("salesman", "id,nickname,name,avatar", Map{"id": salesman.GetMap("provider").GetCeilInt64("salesman_id")})
+		}
+
+		that.Display(0, salesman)
+	},
+
+	"search": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		salesman := that.Db.Get("salesman", "*", Map{"id": that.Session("salesman_id").Data})
+		if salesman == nil {
+			that.Display(4, "找不到该业务员")
+			return
+		}
+
+		provider := that.Db.Get("provider", "*", Map{"id": salesman.GetCeilInt64("provider_id")})
+
+		if provider.GetCeilInt("salesman_id") != salesman.GetCeilInt("id") {
+			that.Display(0, Slice{})
+			return
+		}
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 20
+		}
+
+		data := Map{"del_flag": 0, "provider_id": salesman.GetCeilInt64("provider_id")}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"name[~]": keywords, "nickname[~]": keywords, "phone[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modifye_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modifye_time[<=]"] = finishTime
+		}
+
+		count := that.Db.Count("salesman", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("salesman", "id,name,nickname,avatar", data)
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+	//用户微信公众号或者小程序登录
+	"login": func(that *Context) {
+
+		code := that.Req.FormValue("code")
+		phone := that.Req.FormValue("phone")
+
+		if phone != that.Session("phone").ToStr() && code == that.Session("code").ToStr() {
+			that.Display(3, "手机号或者验证码错误")
+			return
+		}
+
+		if that.Session("wechat_id").Data == nil {
+			that.Display(2, "还未登录")
+			return
+		}
+
+		wechat := that.Db.Get("wechat", "*", Map{"id": that.Session("wechat_id").ToCeilInt()})
+
+		salesman := that.Db.Get("salesman", "*", Map{"phone": phone})
+
+		if salesman == nil {
+			that.Display(3, "找不到企服商")
+			return
+		}
+
+		if wechat == nil {
+			that.Display(2, "还未绑定微信")
+			return
+		}
+
+		//有用户直接返回
+		if wechat.GetCeilInt("salesman_id") != 0 && wechat.GetCeilInt64("salesman_id") != salesman.GetCeilInt64("id") {
+			that.Display(5, "你已经绑定了其他商户")
+			return
+		}
+
+		that.Db.Update("wechat", Map{"salesman_id": salesman.GetCeilInt64("id")}, Map{"id": wechat.GetCeilInt64("id")})
+		that.Db.Update("salesman", Map{"login_time[#]": "now()", "modify_time[#]": "now()"},
+			Map{"id": salesman.GetCeilInt("id")})
+
+		wechat["salesman_id"] = salesman.GetCeilInt64("id")
+		that.Session("salesman_id", salesman.GetCeilInt64("id"))
+		that.Display(0, "登录成功！")
+
+	},
+}

example/provider/sms.go

@@ -0,0 +1,38 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	"code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/ddsms"
+)
+
+var Sms = Ctr{
+	//只允许微信验证过的或者登录成功的发送短信
+	"send": func(that *Context) {
+
+		phone := that.Req.FormValue("phone")
+		if len(phone) < 11 {
+			that.Display(3, "手机号格式错误")
+			return
+		}
+
+		if that.Session("wechat_id").Data == nil && that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录不可发送短信")
+			return
+		}
+
+		salesman := that.Db.Get("salesman", "id", common.Map{"phone": phone})
+		if salesman == nil {
+			that.Display(3, "你还不是企服人员，请联系管理员")
+			return
+		}
+
+		code := getCode()
+		that.Session("phone", phone)
+		that.Session("code", code)
+
+		ddsms.DDY.SendYZM(phone, that.Config.GetString("smsLogin"), map[string]string{"code": code})
+
+		that.Display(0, "发送成功")
+	},
+}

example/provider/tag.go

@@ -0,0 +1,83 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+)
+
+var TagCtr = Ctr{
+
+	"create": func(that *Context) {
+		if that.Session("user_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+
+		name := that.Req.FormValue("name")
+
+		oldTag := that.Db.Get("tag", "id", Map{"name": name})
+		if oldTag != nil {
+			that.Display(4, "此标签已存在")
+			return
+		}
+
+		re := that.Db.Insert("tag", Map{
+			"user_id":        that.Session("user_id").Data,
+			"name":           name,
+			"remark":         "用户上传",
+			"create_time[#]": "now()",
+			"modify_time[#]": "now()",
+			"state":          1, //先置为异常状态，等待审核通过
+			"del_flag":       0,
+		})
+
+		if re == 0 {
+			that.Display(4, "添加失败")
+			return
+		}
+
+		that.Display(0, "添加成功")
+		return
+
+	},
+	//用户微信公众号或者小程序登录
+	"search": func(that *Context) {
+
+		page := ObjToInt(that.Req.FormValue("page"))
+		pageSize := ObjToInt(that.Req.FormValue("pageSize"))
+
+		if page < 1 {
+			page = 1
+		}
+
+		if pageSize <= 0 {
+			pageSize = 40
+		}
+
+		data := Map{"del_flag": 0, "state": 0}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"name[~]": keywords, "remark[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modify_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modify_time[<=]"] = finishTime
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data}
+		}
+
+		count := that.Db.Count("tag", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("tag", "id,name,remark", data)
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/provider/user.go

@@ -0,0 +1,150 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"time"
+)
+
+var UserCtr = Ctr{
+	//用户微信公众号或者小程序登录
+	"info": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		userId := ObjToInt(that.Req.FormValue("id"))
+
+		if userId == 0 {
+			that.Display(3, "参数错误")
+			return
+		}
+
+		user := that.Db.Get("user", "*", Map{"id": that.Session("user_id").ToCeilInt()})
+		if user == nil {
+			that.Display(4, "获取个人信息失败")
+			return
+		}
+
+		delete(user, "password")
+
+		that.Display(0, user)
+	},
+
+	"edit": func(that *Context) {
+
+		if that.Session("salesman_id").Data == nil {
+			that.Display(2, "没有登录")
+			return
+		}
+		userId := ObjToInt(that.Req.FormValue("id"))
+
+		if userId == 0 {
+			that.Display(3, "参数错误")
+			return
+		}
+
+		name := that.Req.FormValue("name")
+		nickname := that.Req.FormValue("nickname")
+		sex := that.Req.FormValue("sex")
+		email := that.Req.FormValue("email")
+		avatar := that.Req.FormValue("avatar")
+		address := that.Req.FormValue("address")
+		phone := that.Req.FormValue("phone") //如果更换手机号则要有新的短信验证码
+
+		data := Map{"modify_time[#]": "now()"}
+		if name != "" {
+			data["name"] = name
+		}
+		if nickname != "" {
+			data["nickname"] = nickname
+		}
+		if sex != "" {
+			data["sex"] = sex
+		}
+		if email != "" {
+			data["email"] = email
+		}
+		if avatar != "" {
+			data["avatar"] = avatar
+		}
+		if address != "" {
+			data["address"] = address
+		}
+		if phone != "" {
+
+			data["phone"] = phone
+		}
+
+		re := that.Db.Update("user", data, Map{"id": userId})
+		if re == 0 {
+			that.Display(4, "更新失败")
+			return
+		}
+
+		that.Display(4, "修改成功")
+	},
+
+	"search": func(that *Context) {
+		if that.Session("salesman_id").Data == nil {
+			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 = 20
+		}
+
+		tp := ObjToInt(that.Req.FormValue("type")) //0，无操作，1，已扫码未认证，2，已认证，3，VIP会员
+
+		data := Map{"del_flag": 0, "salesman_id": that.Session("salesman_id").Data}
+		keywords := that.Req.FormValue("keywords")
+		if keywords != "" {
+			data["OR"] = Map{"name[~]": keywords, "nickname[~]": keywords, "phone[~]": keywords}
+		}
+
+		startTime := that.Req.FormValue("starttime")
+		finishTime := that.Req.FormValue("finishtime")
+
+		if startTime != "" {
+			data["modifye_time[>=]"] = startTime
+		}
+		if finishTime != "" {
+			data["modifye_time[<=]"] = finishTime
+		}
+		if tp == 1 {
+			data["certification_flag"] = 0
+		}
+
+		if tp == 2 {
+			data["certification_flag"] = 1
+			data["OR"] = Map{"expiration_time": nil, "expiration_time[#]": "now()"}
+		}
+
+		if tp == 3 {
+			data["certification_flag"] = 1
+			data["expiration_time[>]"] = time.Now().Format("2006-01-02 15:04:05")
+		}
+
+		if len(data) > 1 {
+			data = Map{"AND": data, "ORDER": "modify_time DESC"}
+		}
+
+		count := that.Db.Count("user", data)
+
+		res := that.Db.Page(page, pageSize).PageSelect("user", "*", data)
+
+		for _, v := range res {
+			delete(v, "password")
+		}
+
+		that.Display(0, Map{"total": count, "data": res})
+	},
+}

example/provider/wechat.go

@@ -0,0 +1,97 @@
+package provider
+
+import (
+	. "code.hoteas.com/golang/hotime"
+	. "code.hoteas.com/golang/hotime/common"
+	"code.hoteas.com/golang/hotime/dri/wechat"
+)
+
+var Wechat = Ctr{
+
+	////微信注册
+	"code": func(that *Context) {
+
+		if that.Req.FormValue("code") == "" {
+			that.Display(3, "参数不足")
+			return
+		}
+
+		appid, resToken, userInfo, err := wechat.H5Program.GetUserInfo(that.Req.FormValue("code"))
+
+		if err != nil {
+			that.Display(4, err)
+			return
+		}
+		//此次获取的微信信息
+		wechatInfo := Map{
+			"openid":   userInfo.OpenID,
+			"acttoken": resToken.AccessToken,
+			"retoken":  resToken.RefreshToken,
+			"appid":    appid,
+			"unionid":  userInfo.Unionid,
+			"nickname": FilterEmoji(userInfo.Nickname),
+			"avatar":   userInfo.HeadImgURL,
+			//"create_time[#]":"now()",
+			"modify_time[#]": "now()",
+			"del_flag":       0,
+			"type":           1,
+		}
+
+		wechat := that.Db.Get("wechat", "*", Map{"AND": Map{"openid": userInfo.OpenID, "del_flag": 0}})
+
+		if wechat != nil {
+			//有用户直接返回
+			if wechat.GetCeilInt("salesman_id") != 0 {
+
+				that.Db.Update("salesman", Map{"login_time[#]": "now()"},
+					Map{"id": wechat.GetCeilInt("salesman_id")})
+				that.Session("salesman_id", wechat.GetCeilInt("salesman_id"))
+
+				that.Display(0, "登录成功")
+				return
+			}
+			that.Session("wechat_id", wechat.GetCeilInt("id"))
+			that.Display(2, "暂未绑定")
+			return
+
+		}
+
+		wechatInfo["create_time[#]"] = "now()"
+
+		wechatInfo["id"] = that.Db.Insert("wechat", wechatInfo)
+		if wechatInfo.GetCeilInt("id") == 0 {
+			that.Display(4, "创建用户失败")
+			return
+		}
+
+		that.Session("wechat_id", wechatInfo.GetCeilInt("id"))
+		that.Display(2, "暂未绑定")
+	},
+
+	//网页签名
+	"sign": func(that *Context) {
+
+		signUrl := that.Req.FormValue("url")
+		if signUrl == "" {
+			that.Display(3, "参数不足")
+			return
+		}
+
+		cfg1, e := wechat.H5Program.GetSignUrl(signUrl)
+
+		if e != nil {
+			that.Display(4, e)
+			return
+		}
+
+		sign := Map{
+			"appId":     cfg1.AppID,
+			"timestamp": cfg1.Timestamp,
+			"nonceStr":  cfg1.NonceStr,
+			"signature": cfg1.Signature,
+		}
+
+		that.Display(0, sign)
+
+	},
+}

example/tpt/pc.html

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>微信登录</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <script type="text/javascript" src="js/hotime.js"></script>
+    <script type="text/javascript" src="js/qrcode.min.js"></script>
+    <style>
+        body{margin:0;}
+        .box{width:100%;height: 100vh;display:flex;align-items:center;justify-content: center;position: relative;}
+        .logo{position: absolute;top:7px;left: 17px;z-index: 2;width: 62px;height:22px;}
+        .logo img{width:100%;background-size: contain;}
+        .bg-img{position: absolute;top:0;left:0;width:100%;background-size: contain;}
+        .title{font-size: 14px;font-weight: bold;color: #FFF;letter-spacing: 6px;margin-bottom:50px;text-align: center;}
+        #qrcode{width:117px; height:117px; margin:23px auto 40px;}
+        .content{background: #D0ECF9;border: 1px solid rgba(255, 255, 255, 0.6);box-shadow: 0px 4px 12px rgba(25, 105, 146, 0.24);border-radius: 8px;padding:34px 0;font-size: 18px;color: #0674AE;margin:0 auto;width:65%;text-align: center;}
+        .footer{position: fixed;bottom:14px;width: 100%;font-size: 12px;
+color: rgba(0, 0, 0, 0.7);text-align: center;line-height: 16px;}
+    </style>
+</head>
+<body>
+    <div class="box">
+        <div class="logo">
+            <img src="./img/logo_2@2x.png" alt="">
+        </div>
+        <img class="bg-img" src="./img/bg_up@2x.png">
+        <div style="flex:1;">
+            <div class="title">
+                欢迎使用政策狩猎精灵
+            </div>
+            <div class="content">
+                <div>初次使用需要绑定您的信息</div>
+                <div>请打开微信扫描下方二维码</div>
+                <div id="qrcode"></div>
+            </div>
+        </div>
+        <div class="footer">
+            <div>成都市创新创业服务平台</div>
+            <div>国家级双创示范平台</div>
+        </div>
+    </div>
+<script>
+    var qrcode = new QRCode(document.getElementById("qrcode"), {
+        width: 117,
+        height: 117
+    })
+    function run() {
+        var data={"timestamp": window.H.getParam("timestamp"),"sn":window.H.getParam("sn")}
+        // if(data.code==null){
+        //     location.href='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx4d97696b9ecb49fc&redirect_uri='+location.href+'&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect'
+        //     return
+        // }
+        
+        //定时器，3s刷新登录
+        window.H.post("/app/upan/login", data, function (res) {
+            if (res.status != 0) {
+                //展示二维码，链接扫码到一个页面传参timestamp&sn，页面内容：app/upan/create？timestamp&sn&phone&company_name&code,成功后跳转到首页
+                 
+                let url = 'https://'+location.host+'/#/qrcode?timestamp='+ window.H.getParam("timestamp")+"&sn="+ encodeURIComponent(window.H.getParam("sn"))
+                qrcode.makeCode(url)
+                setTimeout(function(){
+                    run()
+                },3000)
+                return
+            }
+        // let res = { "result": { "acttoken": "56_ogEfWa4mglG-Ilf2kD50FfekZWimJXUouZ4gMKmkVP2CwcLwv2lHO35LOn5NSLOQ-yEAZcIs3FvgIBhk2uF9CA", "appid": "wx4d97696b9ecb49fc", "avatar": "https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTLNj0yKXe77H8C60ic2lUFIx5hkibf0FluNCRfTkiazrBfuqclqRhm4nDug9Hx3nsXQhtzNdfchAvJTQ/132", "nickname": "候鸟半夏", "openid": "oPoZT6juCkF6fvnMHrCFI6SK_vK8", "retoken": "56_tjuJPobvbLVvOPtqPRZjTzQHR7i3Vmx_aGXOy9j0WsNTFS_JRnb4ArmUGhWtq6e7eCpUnPNKulIQ44CPiBnYEA", "unionid": "ofKK36PEkbIt0xMMUgch4H-bVaFI" }, "status": 0 }
+            location.href="/#/home"
+
+        })
+    }
+
+    run()
+
+
+</script>
+</body>
+</html>

go.mod

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

go.sum

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

manage/manage.go

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

session.go

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

type.go

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

var.go

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