From e560ee0121075294b4390cc5ee2f56512c2cde19 Mon Sep 17 00:00:00 2001
From: liuzhihang <liuzhihangs@qq.com>
Date: Thu, 3 Nov 2022 09:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=20fontawesome-pro=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=20iconfont?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 ++-
 templates/assets/zhheo/zhheoblog.css          |  3 +-
 templates/modules/head.html                   |  8 +----
 templates/modules/right-menu.html             | 32 +++++++++----------
 .../modules/widgets/aside/categories.html     |  2 +-
 templates/modules/widgets/aside/comments.html |  2 +-
 templates/modules/widgets/aside/profile.html  |  2 +-
 templates/modules/widgets/banner-group.html   |  8 ++---
 templates/modules/widgets/console.html        |  2 +-
 templates/modules/widgets/nav-left.html       |  2 +-
 templates/modules/widgets/nav-menu.html       |  2 +-
 templates/modules/widgets/nav-right.html      |  2 +-
 templates/post.html                           | 22 ++++++-------
 13 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index 883ba8a6..5ac9b3cf 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,9 @@
 - [懒加载](https://github.com/liuzhihang/plugin-lazyload)
 - [文章目录](https://github.com/liuzhihang/plugin-tocbot)
 
-图标 icon 来自于 [iconfont](https://www.iconfont.cn/)
+图标 icon 来自于 [iconfont](https://www.iconfont.cn/)：
+- [Awesome常用免费开源图标](https://www.iconfont.cn/collections/detail?spm=a313x.7781069.1998910419.dc64b3430&cid=11790)
+
 
 
 ## 预览
diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css
index 6ce11b99..03233b3f 100644
--- a/templates/assets/zhheo/zhheoblog.css
+++ b/templates/assets/zhheo/zhheoblog.css
@@ -4653,7 +4653,8 @@ html {
 .fal,
 .far,
 .fas,
-.fat {
+.fat
+.iconfont {
     line-height: 1;
 }
 
diff --git a/templates/modules/head.html b/templates/modules/head.html
index 55715523..95041a68 100644
--- a/templates/modules/head.html
+++ b/templates/modules/head.html
@@ -15,17 +15,11 @@
     <script th:src="@{/assets/js/heo.js}"></script>
 
     <link rel="stylesheet" th:href="@{/assets/zhheo/zhheoblog.css}">
-    <!-- fontawesome-pro https://github.com/duyplus/fontawesome-pro  -->
-    <link media="print"
-          onload='this.media="all"'
-          rel="stylesheet"
-          href="https://cdn2.tianli0.top/gh/duyplus/fontawesome-pro/css/all.min.css"
-    />
 
     <link media="print"
           onload='this.media="all"'
           rel="stylesheet"
-          href="//at.alicdn.com/t/c/font_3736806_gm4x2ewgk4j.css">
+          href="//at.alicdn.com/t/c/font_3736806_voo36ma11kl.css">
 
     <!-- 右下角通知 -->
     <link href="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/node-snackbar/0.1.16/snackbar.min.css"
diff --git a/templates/modules/right-menu.html b/templates/modules/right-menu.html
index 729979ae..6dcaec73 100644
--- a/templates/modules/right-menu.html
+++ b/templates/modules/right-menu.html
@@ -11,72 +11,72 @@
         </div>
         <div class="rightMenu-group rightMenu-line rightMenuPlugin">
             <div class="rightMenu-item" id="menu-copytext">
-                <i class="fa-duotone fa-copy"></i>
+                <i class="iconfont icon-copy"></i>
                 <span>复制选中文本</span>
             </div>
             <div class="rightMenu-item" id="menu-pastetext">
-                <i class="fa-duotone fa-paste"></i>
+                <i class="iconfont icon-paste"></i>
                 <span>粘贴文本</span>
             </div>
             <a class="rightMenu-item" id="menu-commenttext">
-                <i class="fa-duotone fa-comment-medical"></i>
+                <i class="iconfont icon-comment-dots1"></i>
                 <span>引用到评论</span>
             </a>
             <div class="rightMenu-item" id="menu-newwindow">
-                <i class="fa-duotone fa-window-restore"></i>
+                <i class="iconfont icon-window-restore"></i>
                 <span>新窗口打开</span>
             </div>
             <div class="rightMenu-item" id="menu-copylink">
-                <i class="fa-duotone fa-link-horizontal"></i>
+                <i class="iconfont icon-link"></i>
                 <span>复制链接地址</span>
             </div>
             <div class="rightMenu-item" id="menu-copyimg">
-                <i class="fa-duotone fa-images"></i>
+                <i class="iconfont icon-image"></i>
                 <span>复制此图片</span>
             </div>
             <div class="rightMenu-item" id="menu-downloadimg">
-                <i class="fa-duotone fa-download"></i>
+                <i class="iconfont icon-download"></i>
                 <span>下载此图片</span>
             </div>
             <div class="rightMenu-item" id="menu-search">
-                <i class="fa-solid fa-magnifying-glass"></i>
+                <i class="iconfont icon-search"></i>
                 <span>站内搜索</span>
             </div>
             <div class="rightMenu-item" id="menu-searchBaidu">
-                <i class="fa-solid fa-magnifying-glass"></i>
+                <i class="iconfont icon-baidu"></i>
                 <span>百度搜索</span>
             </div>
         </div>
         <div class="rightMenu-group rightMenu-line rightMenuOther">
             <a class="rightMenu-item menu-link" id="menu-randomPost">
-                <i class="fa-duotone fa-dice"></i>
+                <i class="iconfont icon-dice"></i>
                 <span>随便逛逛</span>
             </a>
             <a class="rightMenu-item menu-link" href="categories/index.html">
-                <i class="fa-duotone fa-list-tree"></i>
+                <i class="iconfont icon-list-ul"></i>
                 <span>博客分类</span>
             </a>
             <a class="rightMenu-item menu-link" href="tags/index.html">
-                <i class="fa-duotone fa-tags"></i><span>文章标签</span>
+                <i class="iconfont icon-tags"></i><span>文章标签</span>
             </a>
         </div>
         <div class="rightMenu-group rightMenu-line">
             <a class="rightMenu-item menu-link" href="cc/index.html">
-                <i class="fa-solid fa-hand"></i>
+                <i class="iconfont icon-hand-holding"></i>
                 <span>隐私协议</span>
             </a>
             <a class="rightMenu-item menu-link" href="cc/index.html">
-                <i class="fa-solid fa-closed-captioning"></i>
+                <i class="iconfont icon-closed-captioning"></i>
                 <span>版权协议</span>
             </a>
         </div>
         <div class="rightMenu-group rightMenu-line rightMenuOther">
             <div class="rightMenu-item" id="menu-copy">
-                <i class="fa-duotone fa-link-horizontal"></i>
+                <i class="iconfont icon-link"></i>
                 <span>复制地址</span>
             </div>
             <div class="rightMenu-item" id="menu-darkmode">
-                <i class="fa-solid fa-moon"></i>
+                <i class="iconfont icon-moon"></i>
                 <span class="menu-darkmode-text">显示模式</span>
             </div>
         </div>
diff --git a/templates/modules/widgets/aside/categories.html b/templates/modules/widgets/aside/categories.html
index 37944ba7..d60321ef 100644
--- a/templates/modules/widgets/aside/categories.html
+++ b/templates/modules/widgets/aside/categories.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录 -->
 <div class="card-widget card-categories" th:fragment="categories" th:with="categories = ${categoryFinder.listAll()}">
-    <div class="item-headline"><i class="fas fa-folder-open"></i><span>分类</span></div>
+    <div class="item-headline"><i class="iconfont icon-folder-open"></i><span>分类</span></div>
     <div class="aside-list">
         <ul class="card-category-list">
             <li class="card-category-list-item" th:each="category : ${categories}">
diff --git a/templates/modules/widgets/aside/comments.html b/templates/modules/widgets/aside/comments.html
index 5f92fc9b..d3f8555a 100644
--- a/templates/modules/widgets/aside/comments.html
+++ b/templates/modules/widgets/aside/comments.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 归档 -->
 <div class="card-widget card-recent-post"  th:fragment="comments">
-    <div class="item-headline"><i class="fas fa-comment-dots"></i><span>最新评论</span></div>
+    <div class="item-headline"><i class="iconfont icon-comment-dots"></i><span>最新评论</span></div>
     <div class="aside-list">
 
         <div class="aside-list-item">
diff --git a/templates/modules/widgets/aside/profile.html b/templates/modules/widgets/aside/profile.html
index f05c691f..e0d808cc 100644
--- a/templates/modules/widgets/aside/profile.html
+++ b/templates/modules/widgets/aside/profile.html
@@ -22,7 +22,7 @@
     <!-- 跳转信息 -->
     <div class="banner-button-group">
         <a class="banner-button" href="/about">
-            <i class="fas fa-circle-arrow-up-right"></i>
+            <i class="iconfont icon-arrow-circle-right"></i>
             <span class="banner-button-text">了解更多</span>
         </a>
     </div>
diff --git a/templates/modules/widgets/banner-group.html b/templates/modules/widgets/banner-group.html
index 2c3119fb..c39a4612 100644
--- a/templates/modules/widgets/banner-group.html
+++ b/templates/modules/widgets/banner-group.html
@@ -133,7 +133,7 @@
         <!-- 随机前往一篇文章 -->
         <a id="banner-hover" onclick="randomPost()">
             <span class="bannerText">随便逛逛</span>
-            <i class="fas fa-arrow-right banner-righticon"></i>
+            <i class="iconfont icon-arrow-right banner-righticon"></i>
         </a>
     </div>
 
@@ -142,19 +142,19 @@
         <div class="categoryItem" style="box-shadow:var(--heo-shadow-blue)">
             <a class="categoryButton CB1 bikan"
                th:href="@{${#strings.isEmpty(theme.config.top.bikan)? theme.config.top.bikan : 'javascript:void(0);'}}">
-                <span class="categoryButtonText">必看精选</span><i class="fas fa-dove"></i>
+                <span class="categoryButtonText">必看精选</span><i class="iconfont icon-book"></i>
             </a>
         </div>
         <div class="categoryItem" style="box-shadow:var(--heo-shadow-red)">
             <a class="categoryButton remen"
                th:href="@{${#strings.isEmpty(theme.config.top.remen)? theme.config.top.remen : 'javascript:void(0);'}}">
-                <span class="categoryButtonText">热门文章</span><i class="fas fa-burn"></i>
+                <span class="categoryButtonText">热门文章</span><i class="iconfont icon-burn"></i>
             </a>
         </div>
         <div class="categoryItem" style="box-shadow:var(--heo-shadow-green)">
             <a class="categoryButton shiyong"
                th:href="@{${#strings.isEmpty(theme.config.top.shiyong)? theme.config.top.shiyong : 'javascript:void(0);'}}">
-                <span class="categoryButtonText">实用教程</span><i class="fas fa-book"></i>
+                <span class="categoryButtonText">实用教程</span><i class="iconfont icon-book"></i>
             </a>
         </div>
     </div>
diff --git a/templates/modules/widgets/console.html b/templates/modules/widgets/console.html
index f10ed980..17d61375 100644
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@@ -3,7 +3,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <div id="console" th:fragment="console">
     <div class="close-btn" href="javascript:void(0);" onclick="heo.hideConsole()">
-        <i class="fas fa-circle-xmark"></i>
+        <i class="iconfont icon-times-circle"></i>
     </div>
     <div class="console-card-group">
         <!-- 评论，需要使用评论插件，获取最近评论 -->
diff --git a/templates/modules/widgets/nav-left.html b/templates/modules/widgets/nav-left.html
index 4f0b0b07..92df7170 100644
--- a/templates/modules/widgets/nav-left.html
+++ b/templates/modules/widgets/nav-left.html
@@ -10,7 +10,7 @@
         <div class="back-home-button" tabindex="-1"
              th:if="${not #lists.isEmpty(leftMenu)}">
 
-            <i class="back-home-button-icon fas fa-grip-vertical"></i>
+            <i class="back-home-button-icon iconfont icon-grip-vertical"></i>
             <div class="back-menu-list-groups">
                 <div class="back-menu-list-group" th:each="menuItem : ${leftMenu.menuItems}">
                     <!-- 菜单必须有子项才会展示 -->
diff --git a/templates/modules/widgets/nav-menu.html b/templates/modules/widgets/nav-menu.html
index 4a1f46da..24df3e9b 100644
--- a/templates/modules/widgets/nav-menu.html
+++ b/templates/modules/widgets/nav-menu.html
@@ -11,7 +11,7 @@
             <!-- javascript:void(0);" -->
             <a class="site-page" rel="external nofollow" th:href="@{${menuItem.status.href}}">
                 <span th:text="${menuItem.status.displayName}"></span>
-                <i class="fas fa-chevron-down expand"></i>
+                <i class="iconfont icon-chevron-down"></i>
             </a>
 
             <!-- 有子菜单则显示子菜单 -->
diff --git a/templates/modules/widgets/nav-right.html b/templates/modules/widgets/nav-right.html
index b01dfc70..1ab910db 100644
--- a/templates/modules/widgets/nav-right.html
+++ b/templates/modules/widgets/nav-right.html
@@ -16,7 +16,7 @@
 
     <div class="nav-button">
         <a class="site-page" href="javascript:void(0);" title="随机文章">
-            <i class="iconfont icon-shuffle" style="font-size:1rem"></i>
+            <i class="iconfont icon-bus" style="font-size:1rem"></i>
         </a>
     </div>
 
diff --git a/templates/post.html b/templates/post.html
index 81dc93cf..8879b8a5 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -42,14 +42,14 @@
 
                         <span class="post-meta-wordcount"
                               th:with="wordCount = ${#strings.length(post.content.content)}">
-                            <i class="fas fa-file-word fa-fw post-meta-icon" title="字数"></i>
+                            <i class="iconfont icon-file-word post-meta-icon" title="字数"></i>
                             <span class="post-meta-label">字数:</span>
                             <span class="word-count" th:text="${{wordCount}}"></span>
                             <span class="post-meta-separator"></span>
-                            <i class="fas fa-clock post-meta-icon" title="阅读耗时"></i>
+                            <i class="iconfont icon-clock post-meta-icon" title="阅读耗时"></i>
                             <span class="post-meta-label">阅读耗时:</span><span>[[${wordCount / 400}]] 分钟</span>
                         </span>
-                        <span class="post-meta-date"><i class="fa-fw post-meta-icon fas fa-calendar"></i>
+                        <span class="post-meta-date"><i class="iconfont icon-calendar-alt post-meta-icon"></i>
                             <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')}">
@@ -60,7 +60,7 @@
                         <!--<span class="post-meta-position" title="作者IP属地为北京"><i-->
                         <!--        class="fas fa-location-dot post-meta-icon"></i>北京</span>-->
                         <span class="post-meta-pv" data-flag-title="热度">
-                            <i class="fab fa-hotjar fa-fw post-meta-icon"></i>
+                            <i class="iconfont icon-hotjar post-meta-icon"></i>
                             <span class="post-meta-label">热度:</span>
                             <span id="visit" th:text="${post.stats.visit}"></span>
                         </span>
@@ -118,7 +118,7 @@
                         <!-- 分享 -->
                         <div class="share-link mobile">
                             <div class="share-qrcode">
-                                <div class="share-button" title="使用手机访问这篇文章"><i class="fas fa-qrcode"></i>
+                                <div class="share-button" title="使用手机访问这篇文章"><i class="iconfont icon-qrcode"></i>
                                 </div>
                                 <div class="share-main">
                                     <div class="share-main-all">
@@ -134,10 +134,10 @@
                                target="_blank"
                                th:href="'https://service.weibo.com/share/share.php?title=' + ${post.spec.title}"
                                title="分享到微博">
-                                <i class="fab fa-weibo" style="font-size:22px"></i></a></div>
+                                <i class="iconfont icon-weibo" style="font-size:22px"></i></a></div>
                         <div class="share-link copyurl">
                             <div class="share-button" id="post-share-url" onclick="rm.copyPageUrl()" title="复制链接"><i
-                                    class="fas fa-link"></i></div>
+                                    class="iconfont icon-link"></i></div>
                         </div>
                     </div>
                     <div class="post-tools-right">
@@ -166,11 +166,11 @@
                     <div class="post-copyright__type">
                     <span class="post-copyright-info" id="post-copyright-url">
                     <a href="javascript:window.location.href;">
-                        text
+                        [[${post.spec.title}]]
                     </a>
                 </span>
                         <button class="post-copyright-copybtn" onclick="rm.copyPageUrl()">
-                            <i class="fas fa-paste copy-btn"></i>
+                            <i class="iconfont icon-paste"></i>
                         </button>
                     </div>
                     <div class="post-copyright__notice">
@@ -200,7 +200,7 @@
                     </div>
                 </nav>
                 <div class="relatedPosts">
-                    <div class="headline"><i class="fas fa-robot fa-fw"></i> <span>阅读建议</span></div>
+                    <div class="headline"><i class="iconfont icon-robot"></i> <span>阅读建议</span></div>
                     <div class="relatedPosts-list">
                         <!-- 建议阅读，这里可以自定义文章数量，然后遍历展示 -->
                         <div>
@@ -219,7 +219,7 @@
                 <!-- 评论模块，使用评论插件 -->
                 <div id="post-comment">
                     <div class="comment-head">
-                        <div class="comment-headline"><i class="fas fa-message fa-fw"></i> <span>评论</span></div>
+                        <div class="comment-headline"><i class="iconfont icon-comment-alt"></i> <span>评论</span></div>
                         <div class="comment-privacy"><a href="#">隐私政策</a></div>
                         <div class="comment-tips" id="comment-tips">
                             <span>你无需删除空行，直接评论以获取最佳展示效果</span>