From 74a640a048476ae862b6fbb674f5b1511a4333b0 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Sat, 15 Jul 2023 00:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8B=E8=81=94=E6=A8=A1=E6=9D=BF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                         |   9 ++
 templates/fcircle.html                |   4 +-
 templates/links.html                  | 144 +-----------------------
 templates/macro/content-links.html    | 151 ++++++++++++++++++++++++++
 templates/modules/layouts/layout.html |   3 +-
 templates/page_links.html             | 146 +------------------------
 6 files changed, 167 insertions(+), 290 deletions(-)
 create mode 100644 templates/macro/content-links.html

diff --git a/settings.yaml b/settings.yaml
index abead65b..d7408816 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1080,6 +1080,15 @@ spec:
           value: "https://moments.0206.ink/randomfriend"
           label: 随机访问地址
           help: 注意格式 (你的鱼塘token地址 + randomfriend)
+        - $formkit: url
+          name: fcircleUrl
+          value: "/fcircle"
+          label: 鱼塘链接
+        - $formkit: url
+          name: linksUrl
+          value: "/links"
+          label: 友链链接
+
 
     - group: fcircle
       label: 友链鱼塘
diff --git a/templates/fcircle.html b/templates/fcircle.html
index f32b46b2..08ed9e99 100644
--- a/templates/fcircle.html
+++ b/templates/fcircle.html
@@ -36,7 +36,9 @@
                                                                                          href="javascript:fetchRandomPost();"><i
                                 class="haofont hao-icon-arrow-rotate-right"></i></a>
                         </div>
-                        <div class="title-h2-a-right"><a class="random-post-all" href="/links">全部友链</a></div>
+                        <div th:if="${not #strings.isEmpty(theme.config.link.linksUrl)}" class="title-h2-a-right">
+                            <a class="random-post-all" th:href="${theme.config.link.linksUrl}">全部友链</a>
+                        </div>
                     </div>
                     <div id="random-post"></div>
                     <script type="text/javascript">
diff --git a/templates/links.html b/templates/links.html
index 91d51bb5..ef12f4c4 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -11,149 +11,7 @@
         </header>
         <main class="layout hide-aside" id="content-inner">
             <div id="page">
-                <div class="flink" id="banners">
-                    <div class="banners-title">
-                        <div class="banners-title-small">[[${theme.config.link.smallTitle}]]</div>
-                        <div class="banners-title-big">[[${theme.config.link.bigTitle}]]</div>
-                    </div>
-                    <div class="banner-button-group">
-                        <a class="banner-button secondary" data-pjax-state="" onclick="travelling()">
-                            <i class="haofont hao-icon-paper-plane1"></i>
-                            <span class="banner-button-text">随机访问</span>
-                        </a>
-                        <a class="banner-button" href="#post-comment" rel="external nofollow">
-                            <i class="iconfont icon-link"></i>
-                            <span class="banner-button-text">申请友链</span>
-                        </a>
-                    </div>
-                    <div class="tags-group-all nowrapMove">
-                        <div class="tags-group-wrapper">
-                            <th:block th:each="group : ${groups}">
-                                <th:block th:each="link,iterStat : ${group.links}" th:if="${group.links.size > 2}">
-                                    <div class="tags-group-icon-pair" th:if="${iterStat.even}">
-                                        <a class="tags-group-icon" target="_blank"
-                                           th:href="${linkOdd.spec.url}"
-                                           th:title="${linkOdd.spec.displayName}"
-                                           th:with="linkOdd = ${group.links.get(iterStat.index - 1)}">
-                                            <img th:src="@{${linkOdd.spec.logo}}"
-                                                 th:title="${linkOdd.spec.displayName}">
-                                        </a>
-                                        <a class="tags-group-icon" target="_blank"
-                                           th:href="${linkEven.spec.url}"
-                                           th:title="${linkEven.spec.displayName}"
-                                           th:with="linkEven = ${link}">
-                                            <img th:src="@{${linkEven.spec.logo}}"
-                                                 th:title="${linkEven.spec.displayName}">
-                                        </a>
-                                    </div>
-                                </th:block>
-                            </th:block>
-                        </div>
-                    </div>
-                </div>
-
-                <!--钓鱼-->
-                <th:block th:if="${not #lists.isEmpty(groups) && theme.config.fcircle.linksRandomFriendsEnable}" >
-                    <div class="title-h2-a">
-                        <div class="title-h2-a-left">
-                            <h2 style="padding-top:0;margin:.6rem 0 .6rem">🎣 钓鱼</h2><a class="random-post-start"
-                                                                                         href="javascript:fetchRandomPost();"><i class="haofont hao-icon-arrow-rotate-right"></i></a>
-                        </div>
-                        <div class="title-h2-a-right"><a class="random-post-all" href="/fcircle" data-pjax-state="">查看鱼塘</a></div>
-                    </div>
-                    <div id="random-post"></div>
-                    <script type="text/javascript">
-                        var fdataUser = {
-                            apiurl: [[${theme.config.fcircle.apiurl}]],
-                            defaultFish: 500,
-                            hungryFish: 500,
-                        }
-                    </script>
-                    <script th:src="${assets_link + '/libs/moments/random-friends-post.js'}"></script>
-                </th:block>
-
-                <div class="flink" id="article-container">
-
-                    <th:block th:each="group,iterStat : ${groups}">
-
-                        <h2 th:if="${not #lists.isEmpty(group.spec.displayName)}">
-                            <a class="headerlink" th:href="'#'+${group.spec.displayName}+'-'+${group.links.size}" th:title="${group.spec.displayName}+ '('+${group.links.size}+')'"></a>
-                            [[${group.spec.displayName}]] ([[${group.links.size}]])
-                        </h2>
-
-                        <div class="flink-desc">[[${group.spec.description}]]</div>
-
-
-                        <!-- 第一个，使用卡片展示 -->
-                        <div th:if="${#strings.equals(group.spec.displayStyle,'beautify') && not #lists.isEmpty(group.spec.displayStyle)}" class="site-card-group" >
-                            <div class="site-card" th:each="link : ${group.links}">
-                                <span th:if="${not #lists.isEmpty(link.spec.label)}" th:style="'background-color:' + ${link.spec.labelColor}" class="site-card-tag">[[${link.spec.label}]]</span>
-                                <a class="img" target="_blank" th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <img class="flink-avatar" style="pointer-events: none;"
-                                         th:alt="${link.spec.displayName}" th:src="@{${#strings.isEmpty(link.spec.siteshot) ? link.spec.logo : link.spec.siteshot}}">
-                                </a>
-
-                                <a class="info cf-friends-link" target="_blank" th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <div class="site-card-avatar">
-                                        <img class="flink-avatar cf-friends-avatar"
-                                             th:alt="${link.spec.displayName}" th:src="${link.spec.logo}">
-                                    </div>
-                                    <div class="site-card-text">
-                                        <span class="title cf-friends-name" th:text="${link.spec.displayName}"></span>
-                                        <span class="desc" th:text="${link.spec.description}"
-                                              th:title="${link.spec.description}"></span>
-                                    </div>
-                                </a>
-                            </div>
-
-                        </div>
-
-
-                        <div class="flink-list" th:if="${#strings.equals(group.spec.displayStyle,'default') && not #lists.isEmpty(group.spec.displayStyle)}">
-                            <div class="flink-list-item" th:each="link : ${group.links}">
-                                <span th:if="${not #lists.isEmpty(link.spec.label)}" th:style="'background-color:' + ${link.spec.labelColor}" class="site-card-tag">[[${link.spec.label}]]</span>
-                                <a class="cf-friends-link" rel="external nofollow"
-                                   target="_blank"
-                                   th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <img class="flink-avatar cf-friends-avatar"
-                                         th:alt="${link.spec.displayName}"
-                                         th:src="${link.spec.logo}">
-                                    <div class="flink-item-info">
-                                        <span class="flink-item-name cf-friends-name"
-                                              th:text="${link.spec.displayName}"></span>
-                                        <span class="flink-item-desc" th:text="${link.spec.description}"
-                                              th:title="${link.spec.description}"></span>
-                                        <img th:src="${link.spec.logo}"
-                                             class="entered loaded">
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                        <div class="flink-list mini" th:if="${#strings.equals(group.spec.displayStyle,'deprecated') && not #lists.isEmpty(group.spec.displayStyle)}">
-                            <div class="flink-list-item" th:each="link : ${group.links}">
-                                <a class="cf-friends-link"  rel="external nofollow"
-                                   target="_blank"
-                                   th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <img class="flink-avatar cf-friends-avatar entered loaded"
-                                         th:src="${link.spec.logo}"
-                                         th:alt="${link.spec.displayName}">
-                                    <div class="img-alt is-center">[[${link.spec.displayName}]]</div>
-                                    <div class="flink-item-info">
-                                        <span class="flink-item-name cf-friends-name">[[${link.spec.displayName}]]</span>
-                                        <span class="flink-item-desc"  th:title="${link.spec.description}">[[${link.spec.description}]]</span>
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </th:block>
-
-                </div>
+                <th:block th:replace="~{macro/content-links :: content-links(${htmlType})}" />
 
                 <hr/>
                 <!-- 评论模块 -->
diff --git a/templates/macro/content-links.html b/templates/macro/content-links.html
new file mode 100644
index 00000000..ee34bb4d
--- /dev/null
+++ b/templates/macro/content-links.html
@@ -0,0 +1,151 @@
+<th:block th:fragment="content-links(htmlType)">
+
+    <th:block th:with="groups = ${linkFinder.groupBy()}">
+        <div class="flink" id="banners">
+            <div class="banners-title">
+                <div class="banners-title-small">[[${theme.config.link.smallTitle}]]</div>
+                <div class="banners-title-big">[[${theme.config.link.bigTitle}]]</div>
+            </div>
+            <div class="banner-button-group">
+                <a class="banner-button secondary" data-pjax-state="" onclick="travelling()">
+                    <i class="haofont hao-icon-paper-plane1"></i>
+                    <span class="banner-button-text">随机访问</span>
+                </a>
+                <a class="banner-button" href="#post-comment" rel="external nofollow">
+                    <i class="iconfont icon-link"></i>
+                    <span class="banner-button-text">申请友链</span>
+                </a>
+            </div>
+            <div class="tags-group-all nowrapMove">
+                <div class="tags-group-wrapper">
+                    <th:block th:each="group : ${groups}">
+                        <th:block th:each="link,iterStat : ${group.links}" th:if="${group.links.size > 2}">
+                            <div class="tags-group-icon-pair" th:if="${iterStat.even}">
+                                <a class="tags-group-icon" target="_blank" th:href="${linkOdd.spec.url}"
+                                   th:title="${linkOdd.spec.displayName}"
+                                   th:with="linkOdd = ${group.links.get(iterStat.index - 1)}">
+                                    <img th:src="@{${linkOdd.spec.logo}}" th:title="${linkOdd.spec.displayName}">
+                                </a>
+                                <a class="tags-group-icon" target="_blank" th:href="${linkEven.spec.url}"
+                                   th:title="${linkEven.spec.displayName}" th:with="linkEven = ${link}">
+                                    <img th:src="@{${linkEven.spec.logo}}" th:title="${linkEven.spec.displayName}">
+                                </a>
+                            </div>
+                        </th:block>
+                    </th:block>
+                </div>
+            </div>
+        </div>
+
+        <!--钓鱼-->
+        <th:block th:if="${not #lists.isEmpty(groups) && theme.config.fcircle.linksRandomFriendsEnable}">
+            <div class="title-h2-a">
+                <div class="title-h2-a-left">
+                    <h2 style="padding-top:0;margin:.6rem 0 .6rem">🎣 钓鱼</h2>
+                    <a class="random-post-start" href="javascript:fetchRandomPost();">
+                        <i class="haofont hao-icon-arrow-rotate-right"></i>
+                    </a>
+                </div>
+                <div th:if="${not #strings.isEmpty(theme.config.link.fcircleUrl)}" class="title-h2-a-right">
+                    <a class="random-post-all" th:href="${theme.config.link.fcircleUrl}" data-pjax-state="">查看鱼塘</a>
+                </div>
+            </div>
+            <div id="random-post"></div>
+            <script type="text/javascript">
+                var fdataUser = {
+                    apiurl: [[${ theme.config.fcircle.apiurl }]],
+                    defaultFish: 500,
+                    hungryFish: 500,
+                }
+            </script>
+            <script th:src="${assets_link + '/libs/moments/random-friends-post.js'}"></script>
+        </th:block>
+
+        <div class="flink" id="article-container">
+
+            <th:block th:each="group,iterStat : ${groups}">
+
+                <h2 th:if="${not #lists.isEmpty(group.spec.displayName)}">
+                    <a class="headerlink" th:href="'#'+${group.spec.displayName}+'-'+${group.links.size}"
+                       th:title="${group.spec.displayName}+ '('+${group.links.size}+')'"></a>
+                    [[${group.spec.displayName}]] ([[${group.links.size}]])
+                </h2>
+
+                <div class="flink-desc">[[${group.spec.description}]]</div>
+
+
+                <!-- 第一个，使用卡片展示 -->
+                <div th:if="${#strings.equals(group.spec.displayStyle,'beautify') && not #lists.isEmpty(group.spec.displayStyle)}"
+                     class="site-card-group">
+                    <div class="site-card" th:each="link : ${group.links}">
+                        <span th:if="${not #lists.isEmpty(link.spec.label)}"
+                              th:style="'background-color:' + ${link.spec.labelColor}"
+                              class="site-card-tag">[[${link.spec.label}]]</span>
+                        <a class="img" target="_blank" th:href="${link.spec.url}" th:title="${link.spec.displayName}">
+                            <img class="flink-avatar" style="pointer-events: none;" th:alt="${link.spec.displayName}"
+                                 th:src="@{${#strings.isEmpty(link.spec.siteshot) ? link.spec.logo : link.spec.siteshot}}">
+                        </a>
+
+                        <a class="info cf-friends-link" target="_blank" th:href="${link.spec.url}"
+                           th:title="${link.spec.displayName}">
+                            <div class="site-card-avatar">
+                                <img class="flink-avatar cf-friends-avatar" th:alt="${link.spec.displayName}"
+                                     th:src="${link.spec.logo}">
+                            </div>
+                            <div class="site-card-text">
+                                <span class="title cf-friends-name" th:text="${link.spec.displayName}"></span>
+                                <span class="desc" th:text="${link.spec.description}"
+                                      th:title="${link.spec.description}"></span>
+                            </div>
+                        </a>
+                    </div>
+
+                </div>
+
+
+                <div class="flink-list"
+                     th:if="${#strings.equals(group.spec.displayStyle,'default') && not #lists.isEmpty(group.spec.displayStyle)}">
+                    <div class="flink-list-item" th:each="link : ${group.links}">
+                        <span th:if="${not #lists.isEmpty(link.spec.label)}"
+                              th:style="'background-color:' + ${link.spec.labelColor}"
+                              class="site-card-tag">[[${link.spec.label}]]</span>
+                        <a class="cf-friends-link" rel="external nofollow" target="_blank" th:href="${link.spec.url}"
+                           th:title="${link.spec.displayName}">
+                            <img class="flink-avatar cf-friends-avatar" th:alt="${link.spec.displayName}"
+                                 th:src="${link.spec.logo}">
+                            <div class="flink-item-info">
+                                <span class="flink-item-name cf-friends-name" th:text="${link.spec.displayName}"></span>
+                                <span class="flink-item-desc" th:text="${link.spec.description}"
+                                      th:title="${link.spec.description}"></span>
+                                <img th:src="${link.spec.logo}" class="entered loaded">
+                            </div>
+                        </a>
+                    </div>
+                </div>
+
+                <div class="flink-list mini"
+                     th:if="${#strings.equals(group.spec.displayStyle,'deprecated') && not #lists.isEmpty(group.spec.displayStyle)}">
+                    <div class="flink-list-item" th:each="link : ${group.links}">
+                        <a class="cf-friends-link" rel="external nofollow" target="_blank" th:href="${link.spec.url}"
+                           th:title="${link.spec.displayName}">
+                            <img class="flink-avatar cf-friends-avatar entered loaded" th:src="${link.spec.logo}"
+                                 th:alt="${link.spec.displayName}">
+                            <div class="img-alt is-center">[[${link.spec.displayName}]]</div>
+                            <div class="flink-item-info">
+                                <span class="flink-item-name cf-friends-name">[[${link.spec.displayName}]]</span>
+                                <span class="flink-item-desc"
+                                      th:title="${link.spec.description}">[[${link.spec.description}]]</span>
+                            </div>
+                        </a>
+                    </div>
+                </div>
+
+            </th:block>
+
+            <th:block th:if="${htmlType == 'page'}" th:utext="${singlePage.content.content}">
+            </th:block>
+
+        </div>
+
+    </th:block>
+</th:block>
\ No newline at end of file
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html
index 95d2af45..a1c52c1a 100644
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@@ -211,6 +211,7 @@
                 // 页脚友链
                 addFriendLinksInFooter: function () {
 
+                    var linksUrl = '[[${theme.config.link.linksUrl}]]'
                     var fetchUrl = [[${theme.config.footer.footer_group.fetchUrl}]]
                     fetch(fetchUrl)
                         .then(res => res.json())
@@ -222,7 +223,7 @@
                                 var item = randomFriendLinks[i]
                                 htmlText += `<a class='footer-item' href='${item.link}'  target="_blank" rel="noopener nofollow">${item.name}</a>`;
                             }
-                            htmlText += `<a class='footer-item' href='/links'>更多</a>`
+                            htmlText += `<a class='footer-item' href='${linksUrl}'>更多</a>`
                             document.getElementById("friend-links-in-footer").innerHTML = htmlText;
                         })
                 }
diff --git a/templates/page_links.html b/templates/page_links.html
index c5531b87..2663d758 100644
--- a/templates/page_links.html
+++ b/templates/page_links.html
@@ -11,153 +11,9 @@
         </header>
         <main class="layout hide-aside" id="content-inner">
             <div id="page">
-                <div class="flink" id="banners">
-                    <div class="banners-title">
-                        <div class="banners-title-small">[[${theme.config.link.smallTitle}]]</div>
-                        <div class="banners-title-big">[[${theme.config.link.bigTitle}]]</div>
-                    </div>
-                    <div class="banner-button-group">
-                        <a class="banner-button secondary" data-pjax-state="" onclick="travelling()">
-                            <i class="haofont hao-icon-paper-plane1"></i>
-                            <span class="banner-button-text">随机访问</span>
-                        </a>
-                        <a class="banner-button" href="#post-comment" rel="external nofollow">
-                            <i class="iconfont icon-link"></i>
-                            <span class="banner-button-text">申请友链</span>
-                        </a>
-                    </div>
-                    <div class="tags-group-all nowrapMove">
-                        <div class="tags-group-wrapper">
-                            <th:block th:each="group : ${groups}">
-                                <th:block th:each="link,iterStat : ${group.links}" th:if="${group.links.size > 2}">
-                                    <div class="tags-group-icon-pair" th:if="${iterStat.even}">
-                                        <a class="tags-group-icon" target="_blank"
-                                           th:href="${linkOdd.spec.url}"
-                                           th:title="${linkOdd.spec.displayName}"
-                                           th:with="linkOdd = ${group.links.get(iterStat.index - 1)}">
-                                            <img th:src="@{${linkOdd.spec.logo}}"
-                                                 th:title="${linkOdd.spec.displayName}">
-                                        </a>
-                                        <a class="tags-group-icon" target="_blank"
-                                           th:href="${linkEven.spec.url}"
-                                           th:title="${linkEven.spec.displayName}"
-                                           th:with="linkEven = ${link}">
-                                            <img th:src="@{${linkEven.spec.logo}}"
-                                                 th:title="${linkEven.spec.displayName}">
-                                        </a>
-                                    </div>
-                                </th:block>
-                            </th:block>
-                        </div>
-                    </div>
-                </div>
 
-                <!--钓鱼-->
-                <th:block th:if="${not #lists.isEmpty(groups) && theme.config.fcircle.linksRandomFriendsEnable}" >
-                    <div class="title-h2-a">
-                        <div class="title-h2-a-left">
-                            <h2 style="padding-top:0;margin:.6rem 0 .6rem">🎣 钓鱼</h2><a class="random-post-start"
-                                                                                         href="javascript:fetchRandomPost();"><i class="haofont hao-icon-arrow-rotate-right"></i></a>
-                        </div>
-                        <div class="title-h2-a-right"><a class="random-post-all" href="/fcircle" data-pjax-state="">查看鱼塘</a></div>
-                    </div>
-                    <div id="random-post"></div>
-                    <script type="text/javascript">
-                        var fdataUser = {
-                            apiurl: [[${theme.config.fcircle.apiurl}]],
-                            defaultFish: 500,
-                            hungryFish: 500,
-                        }
-                    </script>
-                    <script th:src="${assets_link + '/libs/moments/random-friends-post.js'}"></script>
-                </th:block>
+                <th:block th:replace="~{macro/content-links :: content-links(${htmlType})}" />
 
-                <div class="flink" id="article-container">
-
-                    <th:block th:each="group,iterStat : ${groups}">
-
-                        <h2 th:if="${not #lists.isEmpty(group.spec.displayName)}">
-                            <a class="headerlink" th:href="'#'+${group.spec.displayName}+'-'+${group.links.size}" th:title="${group.spec.displayName}+ '('+${group.links.size}+')'"></a>
-                            [[${group.spec.displayName}]] ([[${group.links.size}]])
-                        </h2>
-
-                        <div class="flink-desc">[[${group.spec.description}]]</div>
-
-
-                        <!-- 第一个，使用卡片展示 -->
-                        <div th:if="${#strings.equals(group.spec.displayStyle,'beautify') && not #lists.isEmpty(group.spec.displayStyle)}" class="site-card-group" >
-                            <div class="site-card" th:each="link : ${group.links}">
-                                <span th:if="${not #lists.isEmpty(link.spec.label)}" th:style="'background-color:' + ${link.spec.labelColor}" class="site-card-tag">[[${link.spec.label}]]</span>
-                                <a class="img" target="_blank" th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <img class="flink-avatar" style="pointer-events: none;"
-                                         th:alt="${link.spec.displayName}" th:src="@{${#strings.isEmpty(link.spec.siteshot) ? link.spec.logo : link.spec.siteshot}}">
-                                </a>
-
-                                <a class="info cf-friends-link" target="_blank" th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <div class="site-card-avatar">
-                                        <img class="flink-avatar cf-friends-avatar"
-                                             th:alt="${link.spec.displayName}" th:src="${link.spec.logo}">
-                                    </div>
-                                    <div class="site-card-text">
-                                        <span class="title cf-friends-name" th:text="${link.spec.displayName}"></span>
-                                        <span class="desc" th:text="${link.spec.description}"
-                                              th:title="${link.spec.description}"></span>
-                                    </div>
-                                </a>
-                            </div>
-
-                        </div>
-
-
-                        <div class="flink-list" th:if="${#strings.equals(group.spec.displayStyle,'default') && not #lists.isEmpty(group.spec.displayStyle)}">
-                            <div class="flink-list-item" th:each="link : ${group.links}">
-                                <span th:if="${not #lists.isEmpty(link.spec.label)}" th:style="'background-color:' + ${link.spec.labelColor}" class="site-card-tag">[[${link.spec.label}]]</span>
-                                <a class="cf-friends-link" rel="external nofollow"
-                                   target="_blank"
-                                   th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <img class="flink-avatar cf-friends-avatar"
-                                         th:alt="${link.spec.displayName}"
-                                         th:src="${link.spec.logo}">
-                                    <div class="flink-item-info">
-                                        <span class="flink-item-name cf-friends-name"
-                                              th:text="${link.spec.displayName}"></span>
-                                        <span class="flink-item-desc" th:text="${link.spec.description}"
-                                              th:title="${link.spec.description}"></span>
-                                        <img th:src="${link.spec.logo}"
-                                             class="entered loaded">
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                        <div class="flink-list mini" th:if="${#strings.equals(group.spec.displayStyle,'deprecated') && not #lists.isEmpty(group.spec.displayStyle)}">
-                            <div class="flink-list-item" th:each="link : ${group.links}">
-                                <a class="cf-friends-link"  rel="external nofollow"
-                                   target="_blank"
-                                   th:href="${link.spec.url}"
-                                   th:title="${link.spec.displayName}">
-                                    <img class="flink-avatar cf-friends-avatar entered loaded"
-                                         th:src="${link.spec.logo}"
-                                         th:alt="${link.spec.displayName}">
-                                    <div class="img-alt is-center">[[${link.spec.displayName}]]</div>
-                                    <div class="flink-item-info">
-                                        <span class="flink-item-name cf-friends-name">[[${link.spec.displayName}]]</span>
-                                        <span class="flink-item-desc"  th:title="${link.spec.description}">[[${link.spec.description}]]</span>
-                                    </div>
-                                </a>
-                            </div>
-                        </div>
-
-                    </th:block>
-
-                    <th:block
-                            th:utext="${singlePage.content.content}">
-                    </th:block>
-
-                </div>
 
                 <hr/>
                 <!-- 评论模块 -->