From bbb6f31f1604abf411abbcef6ce452da6188103f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A9=BA=E8=A7=81?= Date: Tue, 9 Jun 2015 10:18:21 +0800 Subject: [PATCH 1/4] support eq&ne for orm --- orm/db.go | 2 ++ orm/db_mysql.go | 2 ++ orm/db_postgres.go | 2 ++ orm/db_sqlite.go | 2 ++ 4 files changed, 8 insertions(+) diff --git a/orm/db.go b/orm/db.go index 060d83bc..20dc80f2 100644 --- a/orm/db.go +++ b/orm/db.go @@ -44,6 +44,8 @@ var ( "gte": true, "lt": true, "lte": true, + "eq": true, + "nq": true, "startswith": true, "endswith": true, "istartswith": true, diff --git a/orm/db_mysql.go b/orm/db_mysql.go index 3c2ad3a4..182914a2 100644 --- a/orm/db_mysql.go +++ b/orm/db_mysql.go @@ -30,6 +30,8 @@ var mysqlOperators = map[string]string{ "gte": ">= ?", "lt": "< ?", "lte": "<= ?", + "eq": "= ?", + "ne": "!= ?", "startswith": "LIKE BINARY ?", "endswith": "LIKE BINARY ?", "istartswith": "LIKE ?", diff --git a/orm/db_postgres.go b/orm/db_postgres.go index 296ee6a0..6500ef52 100644 --- a/orm/db_postgres.go +++ b/orm/db_postgres.go @@ -29,6 +29,8 @@ var postgresOperators = map[string]string{ "gte": ">= ?", "lt": "< ?", "lte": "<= ?", + "eq": "= ?", + "ne": "!= ?", "startswith": "LIKE ?", "endswith": "LIKE ?", "istartswith": "LIKE UPPER(?)", diff --git a/orm/db_sqlite.go b/orm/db_sqlite.go index 0a2f32c8..c2dcbb46 100644 --- a/orm/db_sqlite.go +++ b/orm/db_sqlite.go @@ -29,6 +29,8 @@ var sqliteOperators = map[string]string{ "gte": ">= ?", "lt": "< ?", "lte": "<= ?", + "eq": "= ?", + "ne": "!= ?", "startswith": "LIKE ? ESCAPE '\\'", "endswith": "LIKE ? ESCAPE '\\'", "istartswith": "LIKE ? ESCAPE '\\'", From b776e43962c4a4761bb232f763b20a8d6372ff33 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 11:15:13 +0800 Subject: [PATCH 2/4] merge bat/httplib to httplib --- httplib/httplib.go | 127 ++++++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 43 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 2389a7cb..68c22d70 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -36,7 +36,6 @@ import ( "crypto/tls" "encoding/json" "encoding/xml" - "fmt" "io" "io/ioutil" "log" @@ -48,26 +47,50 @@ import ( "net/url" "os" "strings" + "sync" "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} +var defaultSetting = BeegoHttpSettings{ + UserAgent: "beegoServer", + ConnectTimeout: 60 * time.Second, + ReadWriteTimeout: 60 * time.Second, + Gzip: true, + DumpBody: true, +} + var defaultCookieJar http.CookieJar +var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { + settingMutex.Lock() + defer settingMutex.Unlock() defaultCookieJar, _ = cookiejar.New(nil) } // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { + settingMutex.Lock() + defer settingMutex.Unlock() defaultSetting = setting + if defaultSetting.ConnectTimeout == 0 { + defaultSetting.ConnectTimeout = 60 * time.Second + } + if defaultSetting.ReadWriteTimeout == 0 { + defaultSetting.ReadWriteTimeout = 60 * time.Second + } } // return *BeegoHttpRequest with specific method -func newBeegoRequest(url, method string) *BeegoHttpRequest { +func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { var resp http.Response + u, err := url.Parse(rawurl) + if err != nil { + log.Fatal(err) + } req := http.Request{ + URL: u, Method: method, Header: make(http.Header), Proto: "HTTP/1.1", @@ -75,7 +98,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMinor: 1, } return &BeegoHttpRequest{ - url: url, + url: rawurl, req: &req, params: map[string]string{}, files: map[string]string{}, @@ -86,27 +109,27 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { // Get returns *BeegoHttpRequest with GET method. func Get(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "GET") + return NewBeegoRequest(url, "GET") } // Post returns *BeegoHttpRequest with POST method. func Post(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "POST") + return NewBeegoRequest(url, "POST") } // Put returns *BeegoHttpRequest with PUT method. func Put(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "PUT") + return NewBeegoRequest(url, "PUT") } // Delete returns *BeegoHttpRequest DELETE method. func Delete(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "DELETE") + return NewBeegoRequest(url, "DELETE") } // Head returns *BeegoHttpRequest with HEAD method. func Head(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "HEAD") + return NewBeegoRequest(url, "HEAD") } // BeegoHttpSettings @@ -120,6 +143,7 @@ type BeegoHttpSettings struct { Transport http.RoundTripper EnableCookie bool Gzip bool + DumpBody bool } // BeegoHttpRequest provides more useful methods for requesting one url than http.Request. @@ -134,6 +158,11 @@ type BeegoHttpRequest struct { dump []byte } +// get request +func (b *BeegoHttpRequest) GetRequest() *http.Request { + return b.req +} + // Change request settings func (b *BeegoHttpRequest) Setting(setting BeegoHttpSettings) *BeegoHttpRequest { b.setting = setting @@ -153,14 +182,20 @@ func (b *BeegoHttpRequest) SetEnableCookie(enable bool) *BeegoHttpRequest { } // SetUserAgent sets User-Agent header field -func (b *BeegoHttpRequest) SetUserAgent(userAgent string) *BeegoHttpRequest { - b.setting.UserAgent = userAgent +func (b *BeegoHttpRequest) SetUserAgent(useragent string) *BeegoHttpRequest { + b.setting.UserAgent = useragent return b } // Debug sets show debug or not when executing request. -func (b *BeegoHttpRequest) Debug(isDebug bool) *BeegoHttpRequest { - b.setting.ShowDebug = isDebug +func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { + b.setting.ShowDebug = isdebug + return b +} + +// Dump Body. +func (b *BeegoHttpRequest) DumpBody(isdump bool) *BeegoHttpRequest { + b.setting.DumpBody = isdump return b } @@ -279,21 +314,18 @@ func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) } func (b *BeegoHttpRequest) buildUrl(paramBody string) { - if paramBody == "" { - return - } // build GET url with query string - if b.req.Method == "GET" { - if strings.Index(b.url, "?") == -1 { - b.url = b.url + "?" + paramBody - } else { + if b.req.Method == "GET" && len(paramBody) > 0 { + if strings.Index(b.url, "?") != -1 { b.url += "&" + paramBody + } else { + b.url = b.url + "?" + paramBody } return } - // build POST url and body - if b.req.Method == "POST" && b.req.Body == nil { + // build POST/PUT/PATCH url and body + if (b.req.Method == "POST" || b.req.Method == "PUT" || b.req.Method == "PATCH") && b.req.Body == nil { // with files if len(b.files) > 0 { pr, pw := io.Pipe() @@ -338,16 +370,29 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if b.resp.StatusCode != 0 { return b.resp, nil } + resp, err := b.SendOut() + if err != nil { + return nil, err + } + b.resp = resp + return resp, nil +} + +func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { var paramBody string if len(b.params) > 0 { + var buf bytes.Buffer for k, v := range b.params { - paramBody += fmt.Sprintf("&%s=%v", url.QueryEscape(k), url.QueryEscape(v)) + buf.WriteString(url.QueryEscape(k)) + buf.WriteByte('=') + buf.WriteString(url.QueryEscape(v)) + buf.WriteByte('&') } - paramBody = paramBody[1:] + paramBody = buf.String() + paramBody = paramBody[0 : len(paramBody)-1] } b.buildUrl(paramBody) - url, err := url.Parse(b.url) if err != nil { return nil, err @@ -357,13 +402,6 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport - if b.setting.ConnectTimeout == 0 { - b.setting.ConnectTimeout = 60 * time.Second - } - if b.setting.ReadWriteTimeout == 0 { - b.setting.ReadWriteTimeout = 60 * time.Second - } - if trans == nil { // create default transport trans = &http.Transport{ @@ -404,15 +442,13 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { } if b.setting.ShowDebug { - dump, err := httputil.DumpRequest(b.req, true) + dump, err := httputil.DumpRequest(b.req, b.setting.DumpBody) if err != nil { log.Println(err.Error()) } b.dump = dump } - - b.resp, err = client.Do(b.req) - return b.resp, err + return client.Do(b.req) } // String returns the body string in response. @@ -433,9 +469,12 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return b.body, nil } resp, err := b.getResponse() - if resp == nil || resp.Body == nil { + if err != nil { return nil, err } + if resp.Body == nil { + return nil, nil + } defer resp.Body.Close() if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { reader, err := gzip.NewReader(resp.Body) @@ -452,18 +491,20 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { // ToFile saves the body data in response to one file. // it calls Response inner. func (b *BeegoHttpRequest) ToFile(filename string) error { - resp, err := b.getResponse() - if resp == nil || resp.Body == nil { - return err - } - defer resp.Body.Close() - f, err := os.Create(filename) if err != nil { return err } defer f.Close() + resp, err := b.getResponse() + if err != nil { + return err + } + if resp.Body == nil { + return nil + } + defer resp.Body.Close() _, err = io.Copy(f, resp.Body) return err } From e619d839901efc0120af07e25c47eff8e824fc46 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 12:47:01 +0800 Subject: [PATCH 3/4] fix the filter router issues --- router.go | 14 ++++++++------ router_test.go | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/router.go b/router.go index 4d195bc8..ca6d917a 100644 --- a/router.go +++ b/router.go @@ -611,19 +611,21 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { - if ok, p := filterR.ValidRouter(urlPath); ok { - for k, v := range p { + if filterR.returnOnOutput && w.started { + return true + } + if ok, params := filterR.ValidRouter(urlPath); ok { + for k, v := range params { context.Input.Params[k] = v } filterR.filterFunc(context) - if filterR.returnOnOutput && w.started { - return true - } + } + if filterR.returnOnOutput && w.started { + return true } } } } - return false } diff --git a/router_test.go b/router_test.go index ee712167..005f32d6 100644 --- a/router_test.go +++ b/router_test.go @@ -444,7 +444,7 @@ func TestFilterAfterExec(t *testing.T) { mux := NewControllerRegister() mux.InsertFilter(url, BeforeRouter, beegoFilterNoOutput) mux.InsertFilter(url, BeforeExec, beegoFilterNoOutput) - mux.InsertFilter(url, AfterExec, beegoAfterExec1) + mux.InsertFilter(url, AfterExec, beegoAfterExec1, false) mux.Get(url, beegoFilterFunc) @@ -506,7 +506,7 @@ func TestFilterFinishRouterMultiFirstOnly(t *testing.T) { url := "/finishRouterMultiFirstOnly" mux := NewControllerRegister() - mux.InsertFilter(url, FinishRouter, beegoFinishRouter1) + mux.InsertFilter(url, FinishRouter, beegoFinishRouter1, false) mux.InsertFilter(url, FinishRouter, beegoFinishRouter2) mux.Get(url, beegoFilterFunc) @@ -534,7 +534,7 @@ func TestFilterFinishRouterMulti(t *testing.T) { mux := NewControllerRegister() mux.InsertFilter(url, FinishRouter, beegoFinishRouter1, false) - mux.InsertFilter(url, FinishRouter, beegoFinishRouter2) + mux.InsertFilter(url, FinishRouter, beegoFinishRouter2, false) mux.Get(url, beegoFilterFunc) From c143a6ec19accb1be464666e197049dddc276275 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 16:20:26 +0800 Subject: [PATCH 4/4] fix #1090 add Getfiles to support mulit file upload --- controller.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/controller.go b/controller.go index 81ee1230..9011593a 100644 --- a/controller.go +++ b/controller.go @@ -499,6 +499,41 @@ func (c *Controller) GetFile(key string) (multipart.File, *multipart.FileHeader, return c.Ctx.Request.FormFile(key) } +// GetFiles return multi-upload files +// files, err:=c.Getfiles("myfiles") +// if err != nil { +// http.Error(w, err.Error(), http.StatusNoContent) +// return +// } +// for i, _ := range files { +// //for each fileheader, get a handle to the actual file +// file, err := files[i].Open() +// defer file.Close() +// if err != nil { +// http.Error(w, err.Error(), http.StatusInternalServerError) +// return +// } +// //create destination file making sure the path is writeable. +// dst, err := os.Create("upload/" + files[i].Filename) +// defer dst.Close() +// if err != nil { +// http.Error(w, err.Error(), http.StatusInternalServerError) +// return +// } +// //copy the uploaded file to the destination file +// if _, err := io.Copy(dst, file); err != nil { +// http.Error(w, err.Error(), http.StatusInternalServerError) +// return +// } +// } +func (c *Controller) GetFiles(key string) ([]*multipart.FileHeader, error) { + files, ok := c.Ctx.Request.MultipartForm.File["key"] + if ok { + return files, nil + } + return nil, http.ErrMissingFile +} + // SaveToFile saves uploaded file to new path. // it only operates the first one of mutil-upload form file field. func (c *Controller) SaveToFile(fromfile, tofile string) error {