From 9bca332716b3f83d289a947d7dbf53f71ee138da Mon Sep 17 00:00:00 2001
From: UPToZ <uptoz@qq.com>
Date: Fri, 21 Jun 2024 01:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9D=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8E=E7=BD=AE=E9=A1=B6=E6=96=87=E7=AB=A0=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98=20detailed=EF=BC=9A=201.?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=BA1.0.3-ce=E3=80=82=202.=E6=9B=B4=E6=96=B0=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E6=9C=80=E4=BD=8EHalo=E7=89=88=E6=9C=AC=E8=A6=81?=
 =?UTF-8?q?=E6=B1=82=E4=B8=BA>=3D2.15.0=E3=80=82=203.=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E3=80=82=204.=E5=A2=9E=E5=8A=A0=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E3=80=82=205.=E4=BF=AE=E5=A4=8D=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E6=9C=80=E8=BF=91=E5=8F=91=E5=B8=83=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=B8=80=E7=9B=B4=E6=98=BE=E7=A4=BA=E7=BD=AE=E9=A1=B6?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/assets/zhheo/blogex.js              |  2 +-
 .../aside/contain/archive-contain.html        |  2 +-
 .../modules/widgets/aside/recent-posts.html   | 58 +++++++++++++------
 templates/modules/widgets/console.html        |  2 +-
 theme.yaml                                    |  8 ++-
 5 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/templates/assets/zhheo/blogex.js b/templates/assets/zhheo/blogex.js
index 9242b51..4a2455c 100644
--- a/templates/assets/zhheo/blogex.js
+++ b/templates/assets/zhheo/blogex.js
@@ -311,7 +311,7 @@ document.addEventListener('scroll', btf.throttle(function () {
 //友链随机传送
 function travelling() {
     function getLinks() {
-        const links = "/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links?keyword=&sort=priority,asc"
+        const links = "/apis/api.plugin.halo.run/v1alpha1/plugins/PluginLinks/links?keyword="
         fetch(links)
             .then(res => res.json())
             .then(json => {
diff --git a/templates/modules/widgets/aside/contain/archive-contain.html b/templates/modules/widgets/aside/contain/archive-contain.html
index 963e6cb..581159e 100644
--- a/templates/modules/widgets/aside/contain/archive-contain.html
+++ b/templates/modules/widgets/aside/contain/archive-contain.html
@@ -4,7 +4,7 @@
 
     <div  class="item-headline"><a class="card-more-btn" href="/archives/" title="查看更多" data-pjax-state=""></a></div>
     <ul  class="card-archive-list"
-         th:with="archives = ${postFinder.archives(1,1000)}, archivesQuantity = ${#conversions.convert(theme.config.sidebar.archivesQuantity, 'java.lang.Integer')}">
+         th:with="archives = ${postFinder.archives(1,0)}, archivesQuantity = ${#conversions.convert(theme.config.sidebar.archivesQuantity, 'java.lang.Integer')}">
         <th:block th:each="archive,archiveStat : ${archives.items}">
             <li class="card-archive-list-item"
                 th:each="month,monthIndex  : ${archive.months}"
diff --git a/templates/modules/widgets/aside/recent-posts.html b/templates/modules/widgets/aside/recent-posts.html
index 1369383..4cc4808 100644
--- a/templates/modules/widgets/aside/recent-posts.html
+++ b/templates/modules/widgets/aside/recent-posts.html
@@ -1,24 +1,48 @@
-<div class="card-widget card-recent-post card-article" th:with='posts = ${postFinder.list(1,theme.config.sidebar.recentPost)},
+<!-- <div class="card-widget card-recent-post card-article" th:with='posts = ${postFinder.list(1,theme.config.sidebar.recentPost)}, -->
+<div class="card-widget card-recent-post" th:with='
     postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"&" : theme.config.layout.postRandomImg+"?"}'>
     <div class="item-headline"><i class="haofont hao-icon-eicon_map-2-line1"></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 th:alt="${post.spec.title}"
-                     th:with="img = ${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : post.spec.cover}"
-
-                     th:src="${isLazyload ? loadingImg : img}"
-                     th:data-lazy-src="${ isLazyload ? img : ''}">
-            </a>
-            <div class="content">
-                <a class="title" th:href="@{${post.status.permalink}}" th:text="${post.spec.title}" th:title="${post.spec.title}"></a>
-                <time th:attr="datetime=${#dates.format(post.spec.publishTime, 'yyyy-MM-dd HH:mm:ss')}"
-                      th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd HH:mm:ss')}"
-                      th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd HH:mm:ss')}">
-                </time>
-            </div>
-        </div>
+		<th:block th:with="archives = ${postFinder.archives(1,#conversions.convert(theme.config.sidebar.recentPost, 'java.lang.Integer'))}">
+            <th:block th:each="archive : ${archives.items}">
+                <th:block th:each="month : ${archive.months}">
+                    <div class="aside-list-item" th:each="post : ${month.posts}">
+                        <a class="thumbnail" th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
+                            <img th:alt="${post.spec.title}"
+                                 th:with="img = ${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : post.spec.cover}"
 
+                                 th:src="${isLazyload ? loadingImg : img}"
+                                 th:data-lazy-src="${ isLazyload ? img : ''}">
+                        </a>
+                        <div class="content">
+                            <a class="title" th:href="@{${post.status.permalink}}" th:text="${post.spec.title}" th:title="${post.spec.title}"></a>
+                            <time th:attr="datetime=${#dates.format(post.spec.publishTime, 'yyyy-MM-dd HH:mm:ss')}"
+                                  th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd HH:mm:ss')}"
+                                  th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd HH:mm:ss')}">
+                            </time>
+                        </div>
+                    </div>
+                </th:block>
+            </th:block>
+        </th:block>
+			
+		<!-- 以下代码会将置顶的文章也显示在最近发布 -->
+		<!-- <div class="aside-list-item" th:each="post : ${posts}">
+			<a class="thumbnail" th:href="@{${post.status.permalink}}" th:title="${post.spec.title}">
+				<img th:alt="${post.spec.title}"
+					 th:with="img = ${#strings.isEmpty(post.spec.cover) ? postRandomImg+post.spec.title : post.spec.cover}"
+		
+					 th:src="${isLazyload ? loadingImg : img}"
+					 th:data-lazy-src="${ isLazyload ? img : ''}">
+			</a>
+			<div class="content">
+				<a class="title" th:href="@{${post.status.permalink}}" th:text="${post.spec.title}" th:title="${post.spec.title}"></a>
+				<time th:attr="datetime=${#dates.format(post.spec.publishTime, 'yyyy-MM-dd HH:mm:ss')}"
+					  th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd HH:mm:ss')}"
+					  th:title="${#dates.format(post.spec.publishTime,'yyyy-MM-dd HH:mm:ss')}">
+				</time>
+			</div>
+		</div> -->
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/modules/widgets/console.html b/templates/modules/widgets/console.html
index bc306b9..6703457 100644
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@@ -62,7 +62,7 @@
       <!-- 底部展示时间归档 -->
       <div class="console-card history" onclick="heo.hideConsole()">
         <div class="item-headline"><i class="fas fa-archive"></i><span>文章</span></div>
-        <ul class="card-archive-list" th:with="archives = ${postFinder.archives(1,1000)}">
+        <ul class="card-archive-list" th:with="archives = ${postFinder.archives(1,0)}">
           <th:block th:each="archive : ${archives.items}">
             <li class="card-archive-list-item" th:each="month,monthStat : ${archive.months}">
               <a class="card-archive-list-link" th:href="@{'/archives/'+${archive.year}+'/'+${month.month}}"
diff --git a/theme.yaml b/theme.yaml
index b34b1aa..52f2e7f 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -49,7 +49,11 @@ spec:
   logo: /themes/theme-hao/assets/images/hao-logo.jpg
   website: https://blog.uptoz.cn
   repo: https://gitea.uptoz.cn/UPToZ/halo-theme-hao
+  issues: https://gitee.com/uptoz/halo-theme-hao/issues
   settingName: "theme-hao-setting"
   configMapName: "theme-hao-configMap"
-  version: "1.0.2-ce"
-  require: ">=2.10.0"
+  version: "1.0.3-ce"
+  require: ">=2.15.0"
+  license:
+    - name: "CC BY-SA 4.0"
+      url: "https://gitee.com/uptoz/halo-theme-hao/blob/main/LICENSE"