From 63a08850f440a0eb95696fb3fb1c9c1991d26d5b Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <17683872107czx>
Date: Mon, 14 Aug 2023 13:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=98=85=E8=AF=BB=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/modules/post/relatedPosts.html | 71 ++++++++++++------------
 1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/templates/modules/post/relatedPosts.html b/templates/modules/post/relatedPosts.html
index 398ecab8..c92074e7 100644
--- a/templates/modules/post/relatedPosts.html
+++ b/templates/modules/post/relatedPosts.html
@@ -1,53 +1,54 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 阅读建议 -->
-<th:block th:fragment="relatedPosts">
-    <div class="relatedPosts" th:if="${not #lists.isEmpty(post.categories)}">
+<th:block th:fragment="relatedPosts" th:if="${not #lists.isEmpty(post.categories)}" th:with="recommendQuantity = ${theme.config.post.recommendQuantity},
+recommandPosts = ${postFinder.listByCategory(1,recommendQuantity == 'six' ? 7 : recommendQuantity == 'two' ? 3 : 1,post.categories.get(0).metadata.name)},
+containsTitle = ${#strings.contains(recommandPosts,post.spec.title)}">
+    <div class="relatedPosts" th:if="${recommandPosts.total>1}">
         <div class="headline">
             <i class="iconfont icon-robot"></i>
             <span>阅读建议</span>
         </div>
         <!-- 六篇文章 -->
-        <div th:if="${#strings.equals(theme.config.post.recommendQuantity, 'six')}" class="relatedPosts-list"
-             th:with="recommandPosts = ${postFinder.listByCategory(1, 7, post.categories.get(0).metadata.name)}">
+        <div th:if="${#strings.equals(recommendQuantity, 'six')}" class="relatedPosts-list">
             <!-- 建议阅读，这里可以自定义文章数量，然后遍历展示 -->
-            <div th:each="recommandPost :${recommandPosts}"
-                 th:if="${not #strings.equals(post.spec.title, recommandPost.spec.title)}">
-                <a th:href="@{${recommandPost.status.permalink}}" th:title="${recommandPost.spec.title}">
-                    <img alt="cover" class="cover" loading="lazy" id="preimg"
-                         th:src="${#strings.isEmpty(recommandPost.spec.cover) ? theme.config.layout.postRandomImg : recommandPost.spec.cover}">
-                    <div class="content is-center">
-                        <div class="date" style="color: white"><i class="far fa-calendar-alt fa-fw"></i>
-                            [[${#dates.format(recommandPost.spec.publishTime,'yyyy-MM-dd')}]]
+            <th:block th:each="recommandPost,iterStat :${recommandPosts}"
+                      th:if="${not #strings.equals(post.spec.title, recommandPost.spec.title)}">
+                <div th:if="${!containsTitle ? iterStat.index <6 : true}">
+                    <a th:href="@{${recommandPost.status.permalink}}" th:title="${recommandPost.spec.title}">
+                        <img alt="cover" class="cover" loading="lazy" id="preimg"
+                             th:src="${#strings.isEmpty(recommandPost.spec.cover) ? theme.config.layout.postRandomImg : recommandPost.spec.cover}">
+                        <div class="content is-center">
+                            <div class="date" style="color: white"><i class="far fa-calendar-alt fa-fw"></i>
+                                [[${#dates.format(recommandPost.spec.publishTime,'yyyy-MM-dd')}]]
+                            </div>
+                            <div class="title" style="color: white" th:text="${recommandPost.spec.title}"></div>
                         </div>
-                        <div class="title" style="color: white" th:text="${recommandPost.spec.title}"></div>
-                    </div>
-                </a>
-            </div>
+                    </a>
+                </div>
+            </th:block>
         </div>
         <!-- 两篇文章 -->
-        <div th:if="${#strings.equals(theme.config.post.recommendQuantity, 'two')}" class="relatedPosts-list"
-             th:with="recommandPosts = ${postFinder.listByCategory(1, 3, post.categories.get(0).metadata.name)}">
-            <div th:each="recommandPost :${recommandPosts}"
-                 th:if="${not #strings.equals(post.spec.title, recommandPost.spec.title)}">
-                <a th:href="@{${recommandPost.status.permalink}}" th:title="${recommandPost.spec.title}">
-                    <img class="cover" alt="cover"
-                         th:src="${#strings.isEmpty(recommandPost.spec.cover) ? theme.config.layout.postRandomImg : recommandPost.spec.cover}">
-                    <div class="content is-center">
-                        <div class="date"><i class="far fa-calendar-alt fa-fw"></i>
-                            [[${#dates.format(recommandPost.spec.publishTime,'yyyy-MM-dd')}]]</div>
-                        <div class="title" th:text="${recommandPost.spec.title}"></div>
-                    </div>
-                </a>
-            </div>
+        <div th:if="${#strings.equals(recommendQuantity, 'two')}" class="relatedPosts-list">
+            <th:block th:each="recommandPost,iterStat :${recommandPosts}"
+                      th:if="${not #strings.equals(post.spec.title, recommandPost.spec.title)}">
+                <div th:if="${!containsTitle ? iterStat.index <2 : true}">
+                    <a th:href="@{${recommandPost.status.permalink}}" th:title="${recommandPost.spec.title}">
+                        <img class="cover" alt="cover"
+                             th:src="${#strings.isEmpty(recommandPost.spec.cover) ? theme.config.layout.postRandomImg : recommandPost.spec.cover}">
+                        <div class="content is-center">
+                            <div class="date"><i class="far fa-calendar-alt fa-fw"></i>
+                                [[${#dates.format(recommandPost.spec.publishTime,'yyyy-MM-dd')}]]</div>
+                            <div class="title" th:text="${recommandPost.spec.title}"></div>
+                        </div>
+                    </a>
+                </div>
+            </th:block>
         </div>
     </div>
-
-    <link th:if="${#strings.equals(theme.config.post.recommendQuantity, 'six')}" rel="stylesheet"
+    <link th:if="${#strings.equals(recommendQuantity, 'six')}" rel="stylesheet"
           th:href="${assets_link + '/css/related-posts-six.css' + theme_version}">
-    <link th:if="${#strings.equals(theme.config.post.recommendQuantity, 'two')}" rel="stylesheet"
+    <link th:if="${#strings.equals(recommendQuantity, 'two')}" rel="stylesheet"
           th:href="${assets_link + '/css/related-posts-two.css' + theme_version}">
 </th:block>
-
-
 </html>
\ No newline at end of file
