From b562d9f8e85a2a757853f78e140529d18cc7a053 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 16 Jul 2024 12:03:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=20(#5833?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/dto/request/website.go | 4 ++-- backend/app/repo/website.go | 2 +- frontend/src/views/website/website/index.vue | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/app/dto/request/website.go b/backend/app/dto/request/website.go index 1929b7ca7..aac5baca1 100644 --- a/backend/app/dto/request/website.go +++ b/backend/app/dto/request/website.go @@ -7,7 +7,7 @@ import ( type WebsiteSearch struct { dto.PageInfo Name string `json:"name"` - OrderBy string `json:"orderBy" validate:"required,oneof=primary_domain type status created_at"` + OrderBy string `json:"orderBy" validate:"required,oneof=primary_domain type status created_at expire_date"` Order string `json:"order" validate:"required,oneof=null ascending descending"` WebsiteGroupID uint `json:"websiteGroupId"` } @@ -55,7 +55,7 @@ type WebsiteUpdate struct { ID uint `json:"id" validate:"required"` PrimaryDomain string `json:"primaryDomain" validate:"required"` Remark string `json:"remark"` - WebsiteGroupID uint `json:"webSiteGroupID" validate:"required"` + WebsiteGroupID uint `json:"webSiteGroupID"` ExpireDate string `json:"expireDate"` IPV6 bool `json:"IPV6"` } diff --git a/backend/app/repo/website.go b/backend/app/repo/website.go index 4c4cc2545..50f453ac1 100644 --- a/backend/app/repo/website.go +++ b/backend/app/repo/website.go @@ -96,7 +96,7 @@ func (w *WebsiteRepo) Page(page, size int, opts ...DBOption) (int64, []model.Web db := getDb(opts...).Model(&model.Website{}) count := int64(0) db = db.Count(&count) - err := db.Limit(size).Offset(size * (page - 1)).Preload("WebsiteSSL").Find(&websites).Error + err := db.Debug().Limit(size).Offset(size * (page - 1)).Preload("WebsiteSSL").Find(&websites).Error return count, websites, err } diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue index ef5bfa111..34c2b735d 100644 --- a/frontend/src/views/website/website/index.vue +++ b/frontend/src/views/website/website/index.vue @@ -128,7 +128,7 @@ prop="protocol" width="90px" > - +