From d84eed57faaa7860f943701cf800aa044bf222ca Mon Sep 17 00:00:00 2001 From: allanwei Date: Wed, 21 Jul 2021 14:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=97=B6=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E5=92=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E5=86=B2=E7=AA=81=E6=97=B6=E5=8F=91=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- grmi/Paging.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/grmi/Paging.go b/grmi/Paging.go index 9d8774f..b2395a0 100644 --- a/grmi/Paging.go +++ b/grmi/Paging.go @@ -5,8 +5,10 @@ import ( ) const ( - PageSize = "pageSize" - PageNumber = "pageNumber" + PageSize = "pageSize" + _PageSize = "_pageSize" + PageNumber = "pageNumber" + _PageNumber = "_pageNumber" ) type Paging struct { @@ -33,20 +35,22 @@ func (self *Paging) Fill(urlParameters map[string]string) bool { return false } -func getValue(urlParameters map[string]string, name string, defaultValue int64) (int64, bool) { - if urlParameter, ok := urlParameters[name]; ok { - value, err := strconv.ParseInt(urlParameter, 10, 64) - if err == nil { - return value, true +func getValue(urlParameters map[string]string, names []string, defaultValue int64) (int64, bool) { + for _, name := range names { + if urlParameter, ok := urlParameters[name]; ok { + value, err := strconv.ParseInt(urlParameter, 10, 64) + if err == nil { + return value, true + } } } return defaultValue, false } func getPageIndex(urlParameters map[string]string) (int64, bool) { - return getValue(urlParameters, PageNumber, 1) + return getValue(urlParameters, []string{_PageNumber, PageNumber}, 1) } func getPageSize(urlParameters map[string]string) (int64, bool) { - return getValue(urlParameters, PageSize, 10) + return getValue(urlParameters, []string{_PageSize, PageSize}, 1) }