From 108e9ad206a4550089889522f19f9aa33703a504 Mon Sep 17 00:00:00 2001
From: sysnix <535420543@qq.com>
Date: Thu, 28 Sep 2023 03:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=87=E7=AB=A0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=82=B9=E5=87=BB=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=20=E7=89=88=E6=9C=AC=E9=A1=B5=E9=9D=A2HTML=E4=BD=BF\n=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                           | 2 ++
 internal/model/admin/AdminArticel.go | 1 +
 internal/service/ArticleService.go   | 7 +++++++
 template/admin/version/index.html    | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

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 @@
                                     <v-card :color="item.milestone==1?'primary':''">
                                         <v-card-title class="text-h6">{{item.version}}</v-card-title>
                                         <v-card-text class="white text--primary">
-                                            <p style="font-size: 16px;">{{item.description}}</p>
+                                            <p style="font-size: 16px;white-space: pre-wrap;">{{item.description}}</p>
                                         </v-card-text>
                                     </v-card>
                                 </v-timeline-item>