From 3af3088b85e1030d2197f015ce426e975a56b78a Mon Sep 17 00:00:00 2001 From: taoshihan1991 <630892807@qq.com> Date: Mon, 6 Jul 2020 14:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 1 + controller/visitor.go | 2 +- models/visitors.go | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/config.go b/config/config.go index 889add9..4867d64 100644 --- a/config/config.go +++ b/config/config.go @@ -9,6 +9,7 @@ import ( ) var( PageSize uint=10 + VisitorPageSize uint=8 ) const Dir = "config/" const AccountConf = Dir + "account.json" diff --git a/controller/visitor.go b/controller/visitor.go index 7fc5c9f..6b69316 100644 --- a/controller/visitor.go +++ b/controller/visitor.go @@ -18,7 +18,7 @@ func GetVisitor(c *gin.Context) { } func GetVisitors(c *gin.Context) { page,_:=strconv.Atoi(c.Query("page")) - vistors:=models.FindVisitors(uint(page)) + vistors:=models.FindVisitors(uint(page),config.VisitorPageSize) count:=models.CountVisitors() c.JSON(200, gin.H{ "code": 200, diff --git a/models/visitors.go b/models/visitors.go index 69e76af..9a20ba8 100644 --- a/models/visitors.go +++ b/models/visitors.go @@ -1,7 +1,5 @@ package models -import "github.com/taoshihan1991/imaptool/config" - type Visitor struct { Model Name string `json:"name"` @@ -39,13 +37,13 @@ func FindVisitorByVistorId(visitorId string)Visitor{ DB.Where("visitor_id = ?", visitorId).First(&v) return v } -func FindVisitors(page uint)[]Visitor{ - offset:=(page-1)*config.PageSize +func FindVisitors(page uint,pagesize uint)[]Visitor{ + offset:=(page-1)*pagesize if offset<0{ offset=0 } var visitors []Visitor - DB.Offset(offset).Limit(config.PageSize).Order("status desc, updated_at desc").Find(&visitors) + DB.Offset(offset).Limit(pagesize).Order("status desc, updated_at desc").Find(&visitors) return visitors } func FindVisitorsOnline()[]Visitor{