golang/hotime
4
0
Fork 1
Code Issues Pull Requests Releases 66 Wiki Activity

修复bug

Browse Source
This commit is contained in:
hoteas 2022-08-08 02:37:15 +08:00
parent 7419e03d67
commit c420e23edb
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application.go
View File

@ -23,7 +23,6 @@ type Application struct {
MakeCodeRouter map[string]*code.MakeCode
MethodRouter
Router
ContextBase
Error
Log *logrus.Logger
WebConnectLog *logrus.Logger

37
code/makecode.go
View File

@ -803,6 +803,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
continue
}
if v["list"] != false {
if v.GetString("link") != "" &&
@ -881,6 +882,38 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
}
if v.GetString("type") == "text" {
reqValue := req.FormValue(v.GetString("name"))
if reqValue != "" {
data[table+"."+v.GetString("name")+"[~]"] = reqValue
}
}
if v.GetString("type") == "unixtime" {
//fmt.Println(req.Form["daterange"])
if len(req.Form[v.GetString("name")]) == 1 {
daterange[table+"."+v.GetString("name")+"[>]"] = req.FormValue("daterange")
} else if len(req.Form[v.GetString("name")]) == 2 {
daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
}
}
if v.GetString("type") == "time" {
//fmt.Println(req.Form["daterange"])
if len(req.Form[v.GetString("name")]) == 1 {
t := time.Unix(ObjToCeilInt64(req.FormValue(v.GetString("name"))), 0).Format("2006-01-02 15:04:05")
daterange[table+"."+v.GetString("name")+"[>]"] = t
} else if len(req.Form[v.GetString("name")]) == 2 {
t1 := time.Unix(ObjToCeilInt64(req.Form[v.GetString("name")][0]), 0).Format("2006-01-02 15:04:05")
t2 := time.Unix(ObjToCeilInt64(req.Form[v.GetString("name")][1]), 0).Format("2006-01-02 15:04:05")
daterange[table+"."+v.GetString("name")+"[<>]"] = Slice{t1, t2}
}
}
if keywordStr != "" {
if v.GetString("type") == "text" {
keyword[table+"."+v.GetString("name")+"[~]"] = keywordStr
@ -954,7 +987,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
if v.GetString("type") == "unixtime" {
//fmt.Println(req.Form["daterange"])
if len(req.Form["daterange"]) == 1 {
daterange[table+"."+v.GetString("name")+"[<]"] = req.FormValue("daterange")
daterange[table+"."+v.GetString("name")+"[>]"] = req.FormValue("daterange")
} else if len(req.Form["daterange"]) == 2 {
daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
@ -966,7 +999,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
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
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")

3
context.go
View File

@ -1,7 +1,6 @@
package hotime
import (
. "code.hoteas.com/golang/hotime/cache"
. "code.hoteas.com/golang/hotime/common"
. "code.hoteas.com/golang/hotime/db"
"encoding/json"
@ -19,7 +18,7 @@ type Context struct {
Db *HoTimeDB
RespData Map
RespFunc func()
CacheIns
//CacheIns
SessionIns
DataSize int
HandlerStr string //复写请求url

2
db/hotimedb.go
View File

@ -34,7 +34,7 @@ type HoTimeDB struct {
}
type HotimeDBBuilder struct {
*HoTimeDB
HoTimeDB *HoTimeDB
table string
selects []interface{}
join Slice