From 8b493c0f9bedcdf3f56b85cf37d2cbc85ec11d19 Mon Sep 17 00:00:00 2001
From: Airbo ZH <airbozh@qq.com>
Date: Thu, 9 Feb 2023 18:50:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=B8=80=E4=B8=AA=E6=9C=88=E5=86=85?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BAxx=E5=A4=A9=E5=89=8D?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BD=99=E6=98=BE=E7=A4=BA=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=20#78?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/modules/post-list.html | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/templates/modules/post-list.html b/templates/modules/post-list.html
index 99d89f57..ae16b97b 100644
--- a/templates/modules/post-list.html
+++ b/templates/modules/post-list.html
@@ -57,11 +57,26 @@
                     </span>
                 </th:block>
                 <!-- 创建时间 -->
-                <span class="post-meta-date">
+                <span class="post-meta-date" th:with="days=${(new java.util.Date().getTime()-post.spec.publishTime.toEpochMilli())/86400000}">
                     <i class="far fa-calendar-alt"></i>
                     <span class="article-meta-label">创建</span>
-                    <time style="display: inline;" th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}"
-                          th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}">
+                    <time style="display: inline;"
+                          th:if="${days > 30}"
+                          th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}"
+                          th:datetime="${post.spec.publishTime}"
+                          th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}+创建">
+                    </time>
+                    <time style="display: inline;"
+                          th:if="${days <= 30 && days > 0}"
+                          th:text="${days}+天前"
+                          th:datetime="${post.spec.publishTime}"
+                          th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}+创建">
+                    </time>
+                    <time style="display: inline;"
+                          th:if="${days == 0}"
+                          th:text="最近"
+                          th:datetime="${post.spec.publishTime}"
+                          th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}+创建">
                     </time>
                 </span>
             </div>

From 50fccd6b94609885e24318606111405196fb205e Mon Sep 17 00:00:00 2001
From: Airbo ZH <airbozh@qq.com>
Date: Thu, 9 Feb 2023 19:49:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=88=86=E7=B1=BB=E3=80=81Tag?=
 =?UTF-8?q?=E3=80=81recent-posts=E7=9A=84=E9=9A=8F=E6=9C=BA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/category.html                           | 8 ++++----
 templates/modules/widgets/aside/recent-posts.html | 6 ++++--
 templates/tag.html                                | 5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/templates/category.html b/templates/category.html
index f3427ff7..c9dd76ed 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -33,11 +33,12 @@
                 <div class="article-sort">
                     <!-- TODO 按照年份分组 需要 halo 提供归档数据-->
                     <!--<div class="article-sort-item year">2022</div>-->
-                    <div class="article-sort-item" th:each="post : ${posts.items}">
+                    <div class="article-sort-item" th:each="post : ${posts.items}"
+                         th:with='postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"," : theme.config.layout.postRandomImg+"?"}'>
                         <a class="article-sort-item-img" th:href="@{${post.status.permalink}}"
                            th:title="${post.spec.title}">
                             <img th:alt="${post.spec.title}"
-                                 th:src="${#strings.isEmpty(post.spec.cover) ? theme.config.layout.postRandomImg : post.spec.cover}">
+                                 th:src="${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : post.spec.cover}">
                         </a>
                         <div class="article-sort-item-info">
                             <div class="article-sort-item-time"><i class="far fa-calendar-alt"></i>
@@ -53,8 +54,7 @@
                             <div class="article-sort-item-tags">
                                 <a class="article-meta__tags"
                                    th:each="tag : ${post.tags}" th:href="@{${tag.status.permalink}}">
-                                    <span class="tags-punctuation">#</span>
-                                    [[${tag.spec.displayName}]]
+                                    <span class="tags-punctuation">#</span>[[${tag.spec.displayName}]]
                                 </a>
                                 <span class="article-meta__link">•</span>
                             </div>
diff --git a/templates/modules/widgets/aside/recent-posts.html b/templates/modules/widgets/aside/recent-posts.html
index 88b75926..b7a63c7f 100644
--- a/templates/modules/widgets/aside/recent-posts.html
+++ b/templates/modules/widgets/aside/recent-posts.html
@@ -1,12 +1,14 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div class="card-widget card-recent-post" th:fragment="recent-posts" th:with="posts = ${postFinder.list(1,theme.config.post.recentPost)}">
+<div class="card-widget card-recent-post" th:fragment="recent-posts" th:with='posts = ${postFinder.list(1,theme.config.post.recentPost)},
+    postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"," : theme.config.layout.postRandomImg+"?"}'>
     <div class="item-headline"><i class="iconfont icon-listol"></i><span>最近发布</span></div>
     <div class="aside-list">
         <!-- 最新文章，用户可以自定义展示数量 -->
         <div class="aside-list-item" th:each="post : ${posts}">
             <a class="thumbnail" th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
-                <img loading="lazy" th:alt="${post.spec.title}" th:src="${#strings.isEmpty(post.spec.cover) ? theme.config.layout.postRandomImg : post.spec.cover}">
+                <img loading="lazy" th:alt="${post.spec.title}"
+                     th:src="${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : post.spec.cover}">
             </a>
             <div class="content">
                 <a class="title" th:href="@{${post.status.permalink}}" th:text="${post.spec.title}" th:title="${post.spec.title}"></a>
diff --git a/templates/tag.html b/templates/tag.html
index e4c33bf6..95f82d3f 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -22,10 +22,11 @@
                 <div class="article-sort-title" th:text="${tag.spec.displayName}"></div>
                 <div class="article-sort" th:with="postItems=${posts.items}">
                     <!--<div class="article-sort-item year">2022</div>-->
-                    <div class="article-sort-item" th:each="post : ${postItems}">
+                    <div class="article-sort-item" th:each="post : ${postItems}"
+                         th:with='postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"," : theme.config.layout.postRandomImg+"?"}'>
                         <a class="article-sort-item-img" th:href="@{${post.status.permalink}}"
                            th:title="${post.spec.title}">
-                            <img loading="lazy" th:alt="${post.status.excerpt}" th:src="${#strings.isEmpty(post.spec.cover) ? theme.config.layout.postRandomImg : post.spec.cover}">
+                            <img loading="lazy" th:alt="${post.status.excerpt}" th:src="${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : post.spec.cover}">
                         </a>
                         <div class="article-sort-item-info">
                             <div class="article-sort-item-time"><i class="far fa-calendar-alt"></i>