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" > - +