diff --git a/.gitignore b/.gitignore index 642800d..68d652b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ build/ *.db *.log *.exe +*.sum +blog \ No newline at end of file diff --git a/internal/model/admin/AdminArticel.go b/internal/model/admin/AdminArticel.go index 37c8ff6..d67b053 100644 --- a/internal/model/admin/AdminArticel.go +++ b/internal/model/admin/AdminArticel.go @@ -13,6 +13,7 @@ type AdminArticle struct { Content string `json:"content" gorm:"-"` ContentType string `json:"contentType"` Tags string `json:"tags"` + View int `json:"view" gorm:"-"` PublishTime int64 `json:"publishTime"` CreateBy string `json:"createBy"` CreateTime int64 `json:"createTime"` diff --git a/internal/service/ArticleService.go b/internal/service/ArticleService.go index 9dc7528..3d664b6 100644 --- a/internal/service/ArticleService.go +++ b/internal/service/ArticleService.go @@ -70,6 +70,7 @@ func (*articleService) GetAdminArticle(id string) admin.AdminArticle { func (*articleService) PageAdminArticle(page int, itemsPerPage int) vo.Page[admin.AdminArticle] { var content []admin.AdminArticle var totalElements int64 + ctx := context.Background() database.GormTemplate.Table("blog_articles").Count(&totalElements) database.GormTemplate.Table("blog_articles"). Where("del != ?", 1). @@ -78,6 +79,12 @@ func (*articleService) PageAdminArticle(page int, itemsPerPage int) vo.Page[admi Order("create_time DESC"). Find(&content) + for i, v := range content { + id := v.Id + view, _ := database.RedisTemplate.HGet(ctx, consts.REDIS_BLOG_VIEW_RECORD, id).Int() + content[i].View = view + } + pre := int(totalElements) % itemsPerPage if pre > 0 { pre = 1 diff --git a/template/admin/version/index.html b/template/admin/version/index.html index 59bfcd1..9096b43 100644 --- a/template/admin/version/index.html +++ b/template/admin/version/index.html @@ -75,7 +75,7 @@ {{item.version}} -

{{item.description}}

+

{{item.description}}