Merge pull request #556 from chengzhongxue/main

优化代码
2023-12-04 14:42:15 +08:00 · 2023-12-04 14:42:15 +08:00 · 275bce7122
parent 45fae815e7 8de7ebcea8
commit 275bce7122
102 changed files with 932 additions and 1328 deletions
--- a/settings.yaml
+++ b/settings.yaml
@ -1424,23 +1424,6 @@ spec:
    - group: fcircle
      label: 友链鱼塘
      formSchema:
-        - $formkit: attachment
-          name: backgroundImg
-          label: 背景图
-          value: https://npm.onmicrosoft.cn/hao-theme-static@1.3.6/images/64624940e3623.jpeg
-          placeholder: 请输入图片地址
-        - $formkit: text
-          name: smallTitle
-          label: 小标题
-          value: 友链
-        - $formkit: text
-          name: bigTitle
-          label: 大标题
-          value: 最新文章订阅
-        - $formkit: text
-          name: detail
-          label: 描述
-          value: 使用 友链朋友圈 订阅友链最新文章
        - $formkit: text
          name: buttonTitle
          label: 按钮标题
@ -1489,22 +1472,6 @@ spec:
              label: 默认
            - value: one
              label: 样式一
-        - $formkit: attachment
-          if: $get(photosStyle).value == 'default'
-          name: backgroundImg
-          label: 背景图
-          value: https://liuzhihang.com/upload/moments.png
-        - $formkit: text
-          if: $get(photosStyle).value == 'default'
-          name: smallTitle
-          key: smallTitle
-          label: 小标题
-          value: 相册集
-        - $formkit: text
-          name: bigTitle
-          key: bigTitle
-          label: 大标题
-          value: 这里是我的相册集哦😯
        - $formkit: text
          name: topLink
          key: topLink
@ -1530,26 +1497,9 @@ spec:
    - group: todo
      label: 待办清单
      formSchema:
-        - $formkit: attachment
-          name: backgroundImg
-          label: 背景图
-          value: https://npm.onmicrosoft.cn/hao-theme-static@1.3.6/images/64624940e3623.jpeg
-          placeholder: 请输入图片地址
-        - $formkit: text
-          name: smallTitle
-          label: 小标题
-          value: 想做清单
-        - $formkit: text
-          name: bigTitle
-          label: 大标题
-          value: ToDoList
-        - $formkit: text
-          name: detail
-          label: 描述
-          value: 要做的事还有很多，想做的事源源不断
        - $formkit: repeater
          name: list
-          label: 待办清单
+          label: 待办清单列表
          value: [ ]
          children:
            - $formkit: text
@ -1605,27 +1555,6 @@ spec:
          label: 描述
          value: 跟我一起享受科技带来的乐趣

-    - group: new_comment
-      label: 最近评论
-      formSchema:
-        - $formkit: attachment
-          name: backgroundImg
-          label: 背景图
-          value: https://liuzhihang.com/upload/moments.png
-          placeholder: 请输入图片地址
-        - $formkit: text
-          name: smallTitle
-          label: 小标题
-          value: 评论
-        - $formkit: text
-          name: bigTitle
-          label: 大标题
-          value: 最近评论
-        - $formkit: text
-          name: detail
-          label: 描述
-          value: 快速查看本站最近评论内容。
-
    - group: envelope_comment
      label: 留言板
      formSchema:
--- a/templates/about.html
+++ b/templates/about.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'about',title = ${'关于' + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -79,7 +79,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/album.html
+++ b/templates/album.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -19,10 +19,10 @@
        <main class="layout hide-aside" id="content-inner">
            <div id="page">
                <div id="album" th:if="${#strings.equals(theme.config.photos.photosStyle, 'default')}">
-                    <div th:replace="~{macro/author-content :: author-content(background = ${theme.config.photos.backgroundImg},
-                        smallTitle = ${theme.config.photos.smallTitle},
-                        bigTitle = ${theme.config.photos.bigTitle},
-                        detail = ${theme.config.photos.detail},
+                    <div th:replace="~{macro/author-content :: author-content(background = ${singlePage.spec.cover},
+                        smallTitle = '相册集',
+                        bigTitle = ${singlePage.spec.title},
+                        detail = ${singlePage.spec.excerpt.raw},
                        buttonUrl = '',
                        buttonTitle = '')}"></div>

@ -182,7 +182,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
        <!-- 卡片顶部气泡效果 -->
        <script th:if="${theme.config.other.bubbleEnable}" async data-pjax
                th:src="${assets_link + '/libs/canvas/bubble.js'}"></script>
--- a/templates/archives.html
+++ b/templates/archives.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'archive',title = ${'文章归档' + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '文章归档',
@ -59,7 +59,7 @@
            <div th:replace="~{modules/aside :: aside(${theme.config.sidebar.widgetss.categoryWidgets})}"></div>
        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/assets/html/link-canvas.html
+++ b/templates/assets/html/link-canvas.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
 <head>
    <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="chrome=1">
--- a/templates/bangumis.html
+++ b/templates/bangumis.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'bangumis',title = ${'追番' + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '追番',
@ -534,7 +534,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/categories.html
+++ b/templates/categories.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'category',title = ${'分类' + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '分类目录',
@ -49,7 +49,7 @@
            </div>
        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/category.html
+++ b/templates/category.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'category',title = ${'分类' + ': ' + category.spec.displayName + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '分类',
@ -40,7 +40,7 @@
        </main>

        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/comments.html
+++ b/templates/comments.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'comments',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -276,7 +276,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/equipments.html
+++ b/templates/equipments.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'equipments',title = ${title + ' | ' + site.title}, head = ~{::head},_title = ${title})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${_title},
@ -202,7 +202,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
        <!-- 卡片顶部气泡效果 -->
        <script th:if="${theme.config.other.bubbleEnable}" async data-pjax
                th:src="${assets_link + '/libs/canvas/bubble.js'}"></script>
--- a/templates/error/404.html
+++ b/templates/error/404.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '404', title = '404', head = null)}"
+<html lang="zh-CN" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '404', title = '404', head = null)}"
      xmlns:th="http://www.thymeleaf.org">

 <th:block th:fragment="content">
@ -48,7 +48,7 @@

        </div>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>
 </th:block>

--- a/templates/error/500.html
+++ b/templates/error/500.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '500', title = '500', head = null)}"
+<html lang="zh-CN" th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = '500', title = '500', head = null)}"
      xmlns:th="http://www.thymeleaf.org">

 <th:block th:fragment="content">
@ -48,7 +48,7 @@

        </div>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>
 </th:block>

--- a/templates/fcircle.html
+++ b/templates/fcircle.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'fcircle',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head} )}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -18,10 +18,10 @@
        </header>
        <main class="layout hide-aside" id="content-inner">
            <div id="page">
-                <div  th:replace="~{macro/author-content :: author-content(background = ${theme.config.fcircle.backgroundImg},
-                smallTitle = ${theme.config.fcircle.smallTitle},
-                bigTitle = ${theme.config.fcircle.bigTitle},
-                detail = ${theme.config.fcircle.detail},
+                <div  th:replace="~{macro/author-content :: author-content(background = ${singlePage.spec.cover},
+                smallTitle = '友链',
+                bigTitle = ${singlePage.spec.title},
+                detail = ${singlePage.spec.excerpt.raw},
                buttonUrl = ${theme.config.fcircle.buttonUrl},
                buttonTitle = ${theme.config.fcircle.buttonTitle})}" ></div>
                <!--钓鱼-->
@ -91,7 +91,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
        <!-- 卡片顶部气泡效果 -->
        <script th:if="${theme.config.other.bubbleEnable}" async data-pjax th:src="${assets_link + '/libs/canvas/bubble.js'}"></script>
    </div>
--- a/templates/index.html
+++ b/templates/index.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'index', title = null, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${site.title},
@ -15,15 +15,15 @@
        <header th:class="${theme.config.top.above.enable_above ? 'full_page' : 'not-top-img'}" id="page-header">
            <nav th:replace="~{modules/nav :: nav(title = ${siteTitle})}"></nav>
            <!-- 问候语 -->
-            <th:block th:replace="~{modules/header/greeting :: greeting}"></th:block>
+            <th:block th:replace="~{modules/header/greeting}"/>
            <!-- 第一屏 -->
-            <th:block th:replace="~{modules/header/index-img :: index-img}"></th:block>
+            <th:block th:replace="~{modules/header/index-img}"/>
        </header>
        <div id="home_top">
            <!-- 每日说说 -->
-            <div th:replace="~{modules/moment :: moment}"></div>
+            <div th:replace="~{modules/moment}"/>
            <!-- 置顶内容 -->
-            <div th:replace="~{modules/recent-top :: recent-top}"></div>
+            <div th:replace="~{modules/recent-top}"/>
        </div>
        <main class="layout" id="content-inner" th:classappend="${theme.config.sidebar.location}">
            <div class="recent-posts" id="recent-posts">
@ -31,13 +31,13 @@
                <!-- 分类导航栏 -->
                <div th:replace="~{'modules/bar/' + ${theme.config.layout.navs.nav}}"></div>

-                <th:block th:replace="~{modules/post-list :: post-list}"></th:block>
+                <th:block th:replace="~{modules/post-list}"/>

            </div>
            <div th:replace="~{modules/aside :: aside(${theme.config.sidebar.widgetss.indexWidgets})}"></div>
        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/links.html
+++ b/templates/links.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en"  xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'links',title = ${'友链' + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = '友链',
@ -38,7 +38,7 @@
            </div>
        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/macro/author-content.html
+++ b/templates/macro/author-content.html
@ -1,5 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <div th:fragment="author-content(background, smallTitle, bigTitle, detail,buttonUrl,buttonTitle)"
     class="author-content author-content-item essayPage single"
     th:style="'background:url('+${background}+') left 28% / cover no-repeat !important;'">
@ -17,5 +15,3 @@
        </div>
    </div>
 </div>
-
-</html>
--- a/templates/macro/bangumi-item.html
+++ b/templates/macro/bangumi-item.html
@ -1,5 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <th:block th:fragment="bangumi-item(spec)">
    <div class="bangumi-item">
        <div class="bangumi-picture no-lightbox">
@ -51,5 +49,3 @@
        </div>
    </div>
 </th:block>
-
-</html>
--- a/templates/macro/prism-code.html
+++ b/templates/macro/prism-code.html
@ -1,7 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<th:block th:fragment="prism-code">
-    <th:block th:if="${theme.config.code.enable}">
+<th:block th:if="${theme.config.code.enable}">
    <link rel="preload" as="style" onload="this.rel='stylesheet'"
          th:href="${assets_link+'/libs/prism/prism.min.css'}">
    <link rel="preload" as="style" onload="this.rel='stylesheet'"
@ -20,6 +17,4 @@
        }
    </style>

-    </th:block>
 </th:block>
-</html>
--- a/templates/modules/about-widgets.html
+++ b/templates/modules/about-widgets.html
@ -1,6 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 关于小组件 -->
 <th:block th:fragment="about-widgets(widgets)"
          th:if="${not #lists.isEmpty(widgets)}">
@ -8,4 +5,3 @@
        <th:block th:replace="~{'modules/widgets/about-widgets/'+ ${widget.widgetId}}"/>
    </th:block>
 </th:block>
-</html>
--- a/templates/modules/aside.html
+++ b/templates/modules/aside.html
@ -1,6 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 侧边栏 -->
 <div class="aside-content" id="aside-content" th:fragment="aside(widgets)"
     th:if="${theme.config.sidebar.location != 'hide-aside' && not #strings.isEmpty(widgets)}">
@ -30,7 +27,7 @@

        <!-- toc 之后的组件需要被 sticky_layout 包裹 -->
        <div class="sticky_layout">
-            <th:block th:replace="~{modules/widgets/aside/toc :: toc}"/>
+            <th:block th:replace="~{modules/widgets/aside/toc}"/>

            <th:block th:each="widget : ${#strings.listSplit(#strings.substringAfter(widgets, 'toc'), ',')}">
                <th:block th:replace="~{'modules/widgets/aside/'+ ${widget}}"/>
@ -40,4 +37,3 @@


 </div>
-</html>
--- a/templates/modules/bar/category.html
+++ b/templates/modules/bar/category.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录条 -->
-<div id="category-bar" th:fragment="category">
+<div id="category-bar">
    <div class="category-bar-items" id="category-bar-items">
        <div class="category-bar-item select" id="category-bar-home">
            <a href="/">首页</a>
@ -17,7 +15,5 @@

        </th:block>
    </div>
-    <a class="category-bar-more" th:replace="~{modules/bar/more :: more}">更多</a>
+    <a class="category-bar-more" th:replace="~{modules/bar/more}">更多</a>
 </div>
-
-</html>
--- a/templates/modules/bar/custom-category.html
+++ b/templates/modules/bar/custom-category.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录条 -->
-<div id="category-bar" th:fragment="custom-category">
+<div id="category-bar">
    <div class="category-bar-items" id="category-bar-items">
        <div class="category-bar-item select" id="category-bar-home">
            <a href="/">首页</a>
@ -16,7 +14,5 @@
        </th:block>

    </div>
-    <a class="category-bar-more" th:replace="~{modules/bar/more :: more}">更多</a>
+    <a class="category-bar-more" th:replace="~{modules/bar/more}">更多</a>
 </div>
-
-</html>
--- a/templates/modules/bar/custom-tag.html
+++ b/templates/modules/bar/custom-tag.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录条，这里使用和 category-bar 同样的 css -->
-<div id="category-bar" th:fragment="custom-tag">
+<div id="category-bar">
    <div class="category-bar-items" id="category-bar-items">
        <div class="category-bar-item select" id="category-bar-home">
            <a href="/">首页</a>
@ -16,7 +14,5 @@
        </th:block>

    </div>
-    <a class="category-bar-more" th:replace="~{modules/bar/more :: more}">更多</a>
+    <a class="category-bar-more" th:replace="~{modules/bar/more}">更多</a>
 </div>
-
-</html>
--- a/templates/modules/bar/custom-url.html
+++ b/templates/modules/bar/custom-url.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录条，这里使用和 category-bar 同样的 css -->
-<div id="category-bar" th:fragment="custom-tag">
+<div id="category-bar">
    <div class="category-bar-items" id="category-bar-items">
        <div class="category-bar-item select" id="category-bar-home">
            <a href="/">首页</a>
@ -17,7 +15,5 @@

        </th:block>
    </div>
-    <a class="category-bar-more" th:replace="~{modules/bar/more :: more}">更多</a>
+    <a class="category-bar-more" th:replace="~{modules/bar/more}">更多</a>
 </div>
-
-</html>
--- a/templates/modules/bar/more.html
+++ b/templates/modules/bar/more.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录条，这里使用和 category-bar 同样的 css -->
-<th:block th:fragment="more">
+<th:block>
    <a class="category-bar-more" href="/categories"
       th:if="${#strings.equals(theme.config.layout.navs.navMore, 'categories') }">更多</a>
    <a class="category-bar-more" href="/tags"
@ -9,5 +7,3 @@
    <a class="category-bar-more" th:href="@{${theme.config.layout.navs.navMoreCustomUrl}}"
       th:if="${#strings.equals(theme.config.layout.navs.navMore, 'customUrl') }">更多</a>
 </th:block>
-
-</html>
--- a/templates/modules/bar/tag.html
+++ b/templates/modules/bar/tag.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录条，这里使用和 category-bar 同样的 css -->
-<div id="category-bar" th:fragment="tag">
+<div id="category-bar">
    <div class="category-bar-items" id="category-bar-items">
        <div class="category-bar-item select" id="category-bar-home">
            <a href="/">首页</a>
@ -17,7 +15,5 @@

        </th:block>
    </div>
-    <a class="category-bar-more" th:replace="~{modules/bar/more :: more}">更多</a>
+    <a class="category-bar-more" th:replace="~{modules/bar/more}">更多</a>
 </div>
-
-</html>
--- a/templates/modules/comment.html
+++ b/templates/modules/comment.html
@ -1,5 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <th:block th:fragment="comment(group, kind, name, allowComment)" th:if="${allowComment && theme.config.comments.commentsEnable}">
    <!-- 已知问题 PJAX 下，comment 首次请求会出错。当前的临时解决办法是使用 js 重试 -->
    <div id="post-comment">
@ -40,4 +38,3 @@
                      th:attr="name=${name},kind=${kind},group=${group}" colorScheme="document.documentElement.getAttribute('data-theme')"/>
    </div>
 </th:block>
-</html>
--- a/templates/modules/comment/Artalk.html
+++ b/templates/modules/comment/Artalk.html
@ -1,7 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<th:block th:fragment="artalk" th:if="${#strings.equals(theme.config.comments.use, 'Artalk')
+<th:block th:if="${#strings.equals(theme.config.comments.use, 'Artalk')
  && not #strings.isEmpty(theme.config.comments.artalks.server)}">
    <div class="js-pjax">
        <script th:src="${assets_link + '/js/comment/artalk.js'}"></script>
@ -219,5 +216,3 @@
    </style>

 </th:block>
-
-</html>
--- a/templates/modules/comment/Twikoo.html
+++ b/templates/modules/comment/Twikoo.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">

-<th:block th:fragment="twikoo" th:if="${#strings.equals(theme.config.comments.use, 'Twikoo') &&
+<th:block  th:if="${#strings.equals(theme.config.comments.use, 'Twikoo') &&
 not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
    <div class="js-pjax">
        <script th:src="${assets_link + '/js/comment/twikoo.js'}"></script>
@ -150,4 +148,3 @@ not #strings.isEmpty(theme.config.comments.twikoos.envId)}">
        })</script>

 </th:block>
-</html>
--- a/templates/modules/comment/Waline.html
+++ b/templates/modules/comment/Waline.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">

-<th:block th:fragment="waline" th:if="${#strings.equals(theme.config.comments.use, 'Waline')
+<th:block  th:if="${#strings.equals(theme.config.comments.use, 'Waline')
  && not #strings.isEmpty(theme.config.comments.walines.serverURL)}">
    <div class="js-pjax">
        <script th:src="${assets_link + '/js/comment/waline.js'}"></script>
@ -139,4 +137,3 @@

    </script>
 </th:block>
-</html>
--- a/templates/modules/common/51-la.html
+++ b/templates/modules/common/51-la.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 51统计 -->
-<th:block th:fragment="51-la">
-    <script th:if="${ not #strings.isEmpty(theme.config.about.LingQueMonitorID)}">
+<script th:if="${ not #strings.isEmpty(theme.config.about.LingQueMonitorID)}">
    !function (p) {
        "use strict";
        !function (t) {
@ -31,9 +28,4 @@
        ck: "[[${theme.config.about.LingQueMonitorID}]]",
        hashMode: true
    });
-    </script>
-</th:block>
-
-
-
-</html>
+</script>
--- a/templates/modules/common/code.html
+++ b/templates/modules/common/code.html
@ -1,6 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<th:block th:fragment="code">
+<th:block >
    <!-- 解决 pjax问题  自动识别语言-->
    <th:block th:if="${pluginFinder.available('PluginPrismJS')}">
        <script src="/plugins/PluginPrismJS/assets/static/highlight.js/highlight.min.js"></script>
@ -34,5 +32,3 @@
    </th:block>

 </th:block>
-
-</html>
--- a/templates/modules/common/diytitle.html
+++ b/templates/modules/common/diytitle.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 动态标题 -->
-<script th:fragment="diytitle"
+<script
        th:if="${theme.config.other.diytitle.diytitleEnable}">
    var leaveTitle = '[[${theme.config.other.diytitle.leaveTitle}]]';
    var backTitle = '[[${theme.config.other.diytitle.backTitle}]]';
@ -22,4 +20,3 @@
        }
    })
 </script>
-</html>
--- a/templates/modules/common/footer-style-one.html
+++ b/templates/modules/common/footer-style-one.html
@ -1,9 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<th:block th:fragment="footer-style-one">
-
-    <script th:if="${theme.config.footer.footerContent.style_one.runtime_enable}" async="async">(function () {
+<script th:if="${theme.config.footer.footerContent.style_one.runtime_enable}" async="async">(function () {
    var grt = new Date("[[${#strings.arraySplit(theme.config.basics.siteStartTime, '-')[1]}]]/[[${#strings.arraySplit(theme.config.basics.siteStartTime, '-')[2]}]]/[[${#strings.arraySplit(theme.config.basics.siteStartTime, '-')[0]}]] 00:00:00"); //设置网站上线时间
    var now = new Date();
    var dnum;
@ -65,8 +60,4 @@
        updateTime();
        updateHtml();
    }, 1000);
-    })();</script>
-
-</th:block>
-
-</html>
+})();</script>
--- a/templates/modules/common/open-graph.html
+++ b/templates/modules/common/open-graph.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html lang="zh-CN" xmlns:th="http://www.thymeleaf.org">
 <th:block th:fragment="open-graph(_title,_permalink,_cover,_excerpt,_type)">
    <!-- Open Graph Start -->
    <meta property="og:site_name" th:content="${site.title}" />
--- a/templates/modules/common/toc-bot.html
+++ b/templates/modules/common/toc-bot.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- Tocbot 目录生成 start -->
-<th:block th:fragment="toc-bot">
+<th:bloc>
    <script th:src="${assets_link + '/libs/tocbot/4.18.2/tocbot.min.js'}"></script>
    <link th:href="${assets_link + '/libs/tocbot/4.18.2/tocbot.css'}" rel="stylesheet">
-</th:block>
-</html>
+</th:bloc>
--- a/templates/modules/footer.html
+++ b/templates/modules/footer.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 页脚模块 -->
-<footer id="footer" th:fragment="footer">
+<footer id="footer">

    <div id="heo-footer-bar" th:if="${theme.config.footer.footer_bar.footer_bar_enable}">
        <div class="footer-logo"><th:block th:utext="${theme.config.footer.footer_bar.logo}"></th:block></div>
@ -163,5 +161,3 @@
    <div class="comment-barrage needEndHide" style="display: none;"></div>

 </footer>
-
-</html>
--- a/templates/modules/head.html
+++ b/templates/modules/head.html
@ -1,5 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 公共的 head 部分，可以定义部分 links,scripts,styles -->
 <th:block th:fragment="head(htmlType)">
    <meta charset="UTF-8">
@ -39,12 +37,12 @@
    />

    <!-- 代码块自动识别语言 -->
-    <th:block th:replace="~{modules/common/code :: code}"/>
+    <th:block th:replace="~{modules/common/code}"/>
    <!--  代码块-->
-    <th:block th:replace="~{macro/prism-code :: prism-code}"/>
+    <th:block th:replace="~{macro/prism-code}"/>

    <!-- 页脚内容-样式一 -->
-    <th:block th:replace="~{modules/common/footer-style-one :: footer-style-one}"/>
+    <th:block th:replace="~{modules/common/footer-style-one}"/>

    <script>
        (win => {
@ -180,9 +178,7 @@
    <!-- icon图标 -->
    <link rel="stylesheet" th:href="${assets_link + '/icon/iconfont.css' + theme_version}">

-    <th:block th:replace="~{modules/variables/site-config :: site-config}" />
+    <th:block th:replace="~{modules/variables/site-config}" />


 </th:block>
-
-</html>
--- a/templates/modules/header/greeting.html
+++ b/templates/modules/header/greeting.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 第一屏 -->
-<th:block th:fragment="greeting">
-    <th:block th:if="${theme.config.other.greeting.enable_greeting}">
+<th:block th:if="${theme.config.other.greeting.enable_greeting}">
    <div id="greetingBox"></div>
    <style>
        #greetingBox {
@ -92,7 +89,4 @@
            }), 3e3)
        })()
    </script>
-    </th:block>
 </th:block>
-
-</html>
--- a/templates/modules/header/index-img.html
+++ b/templates/modules/header/index-img.html
@ -1,8 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<!-- 第一屏 -->
-<th:block th:fragment="index-img">
-    <th:block th:if="${theme.config.top.above.enable_above}">
+<th:block th:if="${theme.config.top.above.enable_above}">
    <div class="pl-container">
        <th:block th:if="!${theme.config.top.above.enable_above_video}">
            <div class="pl-img pl-blur pl-visible"></div>
@ -276,7 +272,4 @@
            "function" == typeof Typed ? subtitleType() : getScript("https://npm.elemecdn.com/typed.js@2.0.12/lib/typed.min.js").then(subtitleType)
        },1800)
    </script>
-    </th:block>
 </th:block>
-
-</html>
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" th:fragment="layout(content, htmlType, title, head)" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh-CN" th:fragment="layout(content, htmlType, title, head)" xmlns:th="http://www.thymeleaf.org"
      th:with="assets_link=${theme.config.other.staticResource.use == 'onmicrosoft' ? 'https://npm.onmicrosoft.cn/hao-theme-static@' + theme.spec.version +'/templates/assets' :
      theme.config.other.staticResource.use == 'cbd' ? 'https://cdn.cbd.int/hao-theme-static@' + theme.spec.version +'/templates/assets' :
      theme.config.other.staticResource.use == 'custom' ? theme.config.other.staticResource.cdn_link : #theme.assets('/')},
@ -26,7 +26,7 @@
 <body>

 <!-- loading 页面 -->
-<th:block th:replace="~{modules/loading-box :: loading-box}"></th:block>
+<th:block th:replace="~{modules/loading-box}"/>

 <!-- 网站背景 -->
 <div id="web_bg"></div>
@ -35,13 +35,13 @@
 <div id="an_music_bg"></div>

 <!-- 控制台 -->
-<div th:replace="~{modules/widgets/console :: console}"></div>
+<div th:replace="~{modules/widgets/console}"/>

-<div th:replace="~{modules/sidebar :: sidebar}"></div>
+<div th:replace="~{modules/sidebar}"/>

 <!-- 左下角音乐 -->
 <th:block th:if="${theme.config.tool.nav_music.nav_musicEnable}" >
-    <div  th:replace="~{modules/widgets/nav-music :: nav-music}"></div>
+    <div  th:replace="~{modules/widgets/nav-music}"/>
 </th:block>

 <!-- 内容 -->
@ -49,10 +49,10 @@


 <!-- todo 右下角悬浮操作按钮 -->
-<th:block th:replace="~{modules/widgets/rightside :: rightside}"></th:block>
+<th:block th:replace="~{modules/widgets/rightside}"/>


-<div th:replace="~{modules/widgets/right-menu :: right-menu}"></div>
+<div th:replace="~{modules/widgets/right-menu}"/>

 <div>
    <script th:src="${assets_link + '/js/utils.js' + theme_version}"></script>
@ -71,7 +71,7 @@

    <div class="js-pjax">
        <!-- 动态标题 -->
-        <script th:replace="~{modules/common/diytitle :: diytitle}"></script>
+        <script th:replace="~{modules/common/diytitle}"/>
    </div>

    <!-- 评论 -->
@ -124,10 +124,10 @@
             th:src="${assets_link + '/zhheo/commentBarrage.js'}"></script>

    <!-- Tocbot 目录生成 start -->
-    <th:block th:replace="~{modules/common/toc-bot :: toc-bot}"></th:block>
+    <th:block th:replace="~{modules/common/toc-bot}"/>

    <!-- 51统计 -->
-    <th:block th:replace="~{modules/common/51-la :: 51-la}"></th:block>
+    <th:block th:replace="~{modules/common/51-la}"/>

    <!--官方评论插件js-->
    <script th:if="${pluginFinder.available('PluginCommentWidget')}" src="/plugins/PluginCommentWidget/assets/static/comment-widget.iife.js"></script>
--- a/templates/modules/loading-box.html
+++ b/templates/modules/loading-box.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- loading页面 -->
-<th:block th:fragment="loading-box"
+<th:block
          th:if="${theme.config.other.loadingBoxs.loadingBoxEnable} and not ${#strings.isEmpty(theme.config.other.loadingBoxs.loadingBoxImg)}">
    <style type="text/css">
        #loading-box {
@ -103,5 +101,3 @@
    </script>

 </th:block>
-
-</html>
--- a/templates/modules/moment.html
+++ b/templates/modules/moment.html
@ -1,7 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<div class="bbTimeList container" id="bbTimeList" th:fragment="moment"
+<div class="bbTimeList container" id="bbTimeList"
     th:if="${theme.config.top.moment}">

    <i class="haofont hao-icon-logo-moment" onclick="" style="font-size: 1.3rem;" title="瞬间"></i>
@ -37,4 +34,3 @@
         th:data-lazy-src="${ isLazyload ? theme.config.top.climb.climbImg : ''}">

 </div>
-</html>
--- a/templates/modules/nav.html
+++ b/templates/modules/nav.html
@ -1,10 +1,8 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <nav class="show" id="nav" th:fragment="nav(title)">
    <div id="nav-group">

        <!-- 导航栏左侧 -->
-        <div th:replace="~{modules/widgets/nav-left :: nav-left}"></div>
+        <div th:replace="~{modules/widgets/nav-left}"/>
        <div id="page-name-mask">
            <div id="page-name" >
                <a id="page-name-text" onclick="btf.scrollToDest(0,500)"
@ -16,9 +14,7 @@
        <div th:replace="~{modules/widgets/nav-menu :: nav-menu}"></div>

        <!-- 导航栏右侧 -->
-        <div th:replace="~{modules/widgets/nav-right :: nav-right}"></div>
+        <div th:replace="~{modules/widgets/nav-right}"/>

    </div>
 </nav>
-
-</html>
--- a/templates/modules/post-list.html
+++ b/templates/modules/post-list.html
@ -1,7 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<th:block th:fragment="post-list"
+<th:block
          th:with='postItems=${posts.items},
          postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"&" : theme.config.layout.postRandomImg+"?"}'>

@ -107,5 +104,3 @@
    <div th:replace="~{modules/widgets/page :: page('',${posts},true,'')}"></div>

 </th:block>
-
-</html>
--- a/templates/modules/post/copyright.html
+++ b/templates/modules/post/copyright.html
@ -1,17 +1,9 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 版权声明 -->
-<th:block th:fragment="copyright">
-
-
+<th:block >
    <!-- 默认样式 -->
-    <th:block th:replace="~{modules/post/copyright/copyright-default :: copyright-default}"></th:block>
+    <th:block th:replace="~{modules/post/copyright/copyright-default}"/>

    <!-- 样式一 -->
-    <th:block th:replace="~{modules/post/copyright/copyright-one :: copyright-one}"></th:block>
-
+    <th:block th:replace="~{modules/post/copyright/copyright-one}"/>

 </th:block>
-
-
-</html>
--- a/templates/modules/post/copyright/copyright-default.html
+++ b/templates/modules/post/copyright/copyright-default.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 版权样式默认 -->
-<th:block th:fragment="copyright-default" th:if="${#strings.equals(theme.config.post.copyrightsStyle, 'default')}">
+<th:block  th:if="${#strings.equals(theme.config.post.copyrightsStyle, 'default')}">
    <div class="post-tools" id="post-tools">
        <div class="post-tools-left">

@ -111,6 +109,3 @@

    <link rel="stylesheet" th:href="${assets_link + '/css/post-copyright.css' + theme_version}">
 </th:block>
-
-
-</html>
--- a/templates/modules/post/copyright/copyright-one.html
+++ b/templates/modules/post/copyright/copyright-one.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 版权样式一 -->
-<th:block th:fragment="copyright-one" th:if="${#strings.equals(theme.config.post.copyrightsStyle, 'one')}">
+<th:block  th:if="${#strings.equals(theme.config.post.copyrightsStyle, 'one')}">
    <!-- 版权声明 -->
    <div class="post-copyright">
        <div class="post-copyright__author_group"><a class="post-copyright__author_img" href="/about"
@ -96,7 +94,3 @@
    </div>
    <link rel="stylesheet" th:href="${assets_link + '/css/post-copyright-one.css' + theme_version}">
 </th:block>
-
-
-
-</html>
--- a/templates/modules/post/relatedPosts.html
+++ b/templates/modules/post/relatedPosts.html
@ -1,7 +1,6 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
 <!-- 阅读建议 -->
-<th:block th:fragment="relatedPosts" th:if="${not #lists.isEmpty(post.categories)}" th:with="recommendQuantity = ${theme.config.post.recommendQuantity},
+<th:block  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)},
 postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,'?') ? theme.config.layout.postRandomImg+'&' : theme.config.layout.postRandomImg+'?'}">
@ -57,4 +56,3 @@ postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,'?') ? theme
    <link th:if="${#strings.equals(recommendQuantity, 'two')}" rel="stylesheet"
          th:href="${assets_link + '/css/related-posts-two.css' + theme_version}">
 </th:block>
-</html>
--- a/templates/modules/recent-top.html
+++ b/templates/modules/recent-top.html
@ -1,17 +1,12 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 置顶的文章-->
 <div class="recent-top-post-group" id="recent-top-post-group"
-     th:fragment="recent-top"
     th:if="${theme.config.top.recentTop}">

    <div class="recent-post-top" id="recent-post-top">
        <!-- banner -->
-        <div th:replace="~{modules/widgets/banner-group :: banner-group}"></div>
+        <div th:replace="~{modules/widgets/banner-group}"/>
        <!-- top -->
-        <div th:replace="~{modules/widgets/top-group :: top-group}"></div>
+        <div th:replace="~{modules/widgets/top-group}"/>

    </div>
 </div>
-
-</html>
--- a/templates/modules/sidebar.html
+++ b/templates/modules/sidebar.html
@ -1,9 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 侧栏，主要是手机端时会使用 -->
-<div id="sidebar" th:fragment="sidebar">
-
+<div id="sidebar">
    <div id="menu-mask"></div>
    <div id="sidebar-menus">
        <span class="sidebar-menu-item-title">功能</span>
@ -78,4 +74,3 @@
        </div>
    </div>
 </div>
-</html>
--- a/templates/modules/variables/layout.html
+++ b/templates/modules/variables/layout.html
@ -1,4 +1,4 @@
-<style type="text/css" th:inline="css" th:fragment="variables-root">
+<style type="text/css" th:inline="css">
    [data-theme=light] {
        --heo-theme: [(${theme.config.style.themeLightSkin})] !important;
        --heo-theme-op: [(${theme.config.style.themeLightSkin})]23 !important;
--- a/templates/modules/variables/site-config.html
+++ b/templates/modules/variables/site-config.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<th:block th:fragment="site-config">
-    <!-- 声明一些公共信息 -->
-    <script id="site-config" th:inline="javascript">
+<!-- 声明一些公共信息 -->
+<script id="site-config" th:inline="javascript">
    var GLOBAL_CONFIG = {
        // 页面类型 index,page,post,tag,category
        htmlType: [[${ htmlType }]],
@ -130,6 +127,4 @@

    };

-    </script>
-</th:block>
-</html>
+</script>
--- a/templates/modules/widgets/about-widgets/about-reward.html
+++ b/templates/modules/widgets/about-widgets/about-reward.html
@ -1,4 +1,4 @@
-<div class="author-content" th:fragment="about-reward" th:if="${theme.config.aboutReward.aboutRewardEnable}">
+<div class="author-content" th:if="${theme.config.aboutReward.aboutRewardEnable}">
    <div class="author-content-item single reward" id="about-reward">
        <div class="author-content-item-tips">致谢</div>
        <span class="author-content-item-title" >[[${theme.config.aboutReward.title}]]</span>
--- a/templates/modules/widgets/about-widgets/authorCareers.html
+++ b/templates/modules/widgets/about-widgets/authorCareers.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 技能&职业生涯 -->
-<div class="author-content" th:fragment="authorCareers">
+<div class="author-content">

    <div class="author-content-item skills">
        <div class="card-content">
@ -314,5 +312,3 @@
        </div>
    </div>
 </div>
-
-</html>
--- a/templates/modules/widgets/about-widgets/content-idea.html
+++ b/templates/modules/widgets/about-widgets/content-idea.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 我的介绍&我的想法 -->
-<div class="author-content" th:fragment="content-idea">
+<div class="author-content">
    <div class="author-content-item myInfoAndSayHello" th:utext="${theme.config.about.content}">
    </div>
    <div class="aboutsiteTips author-content-item" th:utext="${theme.config.about.idea}"></div>
@ -24,5 +22,3 @@
        });
    </script>
 </div>
-
-</html>
--- a/templates/modules/widgets/about-widgets/game.html
+++ b/templates/modules/widgets/about-widgets/game.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 爱好 -->
-<div class="author-content" th:fragment="game">
+<div class="author-content" >
    <div class="author-content-item game-lol"
         th:style="'background: url('+ @{${theme.config.about.game.game_bg}} +') top / cover no-repeat'">
        <div class="card-content">
@ -65,5 +63,3 @@
        }
    </style>
 </div>
-
-</html>
--- a/templates/modules/widgets/about-widgets/hello-about.html
+++ b/templates/modules/widgets/about-widgets/hello-about.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- hello -->
-<div class="hello-about" th:fragment="hello-about">
+<div class="hello-about">
    <div class="cursor" style="translate: none; rotate: none; scale: none; transform: translate(721px,180px);"></div>
    <div class="shapes">
        <div class="shape shape-1"
@ -158,5 +156,3 @@
    </script>

 </div>
-
-</html>
--- a/templates/modules/widgets/about-widgets/like-music.html
+++ b/templates/modules/widgets/about-widgets/like-music.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 关注偏好&音乐偏好 -->
-<div class="author-content" th:fragment="like-music">
+<div class="author-content" >

    <div class="author-content-item like-technology"
         th:style="'background: url('+ @{${theme.config.about.like.like_bg}} +') top / cover no-repeat;'">
@ -40,4 +38,3 @@
    </div>

 </div>
-</html>
--- a/templates/modules/widgets/about-widgets/personalities-photo.html
+++ b/templates/modules/widgets/about-widgets/personalities-photo.html
@ -1,9 +1,7 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 性格&图片 -->

 <!-- personalities -->
-<div class="author-content" th:fragment="personalities-photo">
+<div class="author-content">
    <div class="author-content-item personalities" th:with="personality = ${theme.config.about.personalities}">
        <div class="author-content-item-tips">性格</div>

@ -204,5 +202,3 @@
                                                  th:src="${theme.config.about.authorCareersPhoto}">
    </div>
 </div>
-
-</html>
--- a/templates/modules/widgets/about-widgets/statistics-map.html
+++ b/templates/modules/widgets/about-widgets/statistics-map.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 数据统计&作者相关信息 -->
-<div class="author-content" th:fragment="statistics-map">
+<div class="author-content" >
    <div class="about-statistic author-content-item"
         style="background: url(https://bu.dusays.com/2023/03/12/640dc8c72f623.webp);">
        <div class="card-content">
@ -170,5 +168,3 @@

    </script>
 </div>
-
-</html>
--- a/templates/modules/widgets/about-widgets/tenyear.html
+++ b/templates/modules/widgets/about-widgets/tenyear.html
@ -1,4 +1,4 @@
-<div class="author-content"  th:fragment="tenyear" th:if="${theme.config.about.tenyear.tenyear_enable}">
+<div class="author-content" th:if="${theme.config.about.tenyear.tenyear_enable}">
    <div class="create-site-post author-content-item single">
        <div class="author-content-item-tips">[[${theme.config.about.tenyear.tenyear_tips}]]</div>
        <span class="author-content-item-title">[[${theme.config.about.tenyear.tenyear_title}]]</span>
--- a/templates/modules/widgets/about-widgets/textarea.html
+++ b/templates/modules/widgets/about-widgets/textarea.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 座右铭 -->
-<!-- motto -->
-<div class="author-content" th:fragment="textarea" th:if="${theme.config.about.textarea.size()}=='2'" th:with="texts = ${theme.config.about.textarea}">
+<div class="author-content"  th:if="${theme.config.about.textarea.size()}=='2'" th:with="texts = ${theme.config.about.textarea}">
    <div class="author-content-item maxim">
        <div class="author-content-item-tips" th:text="${texts[0].tittle}">座右铭</div>
        <span class="maxim-title">
@ -25,5 +22,3 @@
        </div>
    </div>
 </div>
-
-</html>
--- a/templates/modules/widgets/aside/adbox.html
+++ b/templates/modules/widgets/aside/adbox.html
@ -1,9 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<!-- 目录 -->
-
-<th:block th:fragment="adbox">
-    <div class="card-widget" th:if="${theme.config.sidebar.adbox.adType=='google'}">
+<!-- 广告 -->
+<div class="card-widget" th:if="${theme.config.sidebar.adbox.adType=='google'}">
    <div class="item-headline"><span>广告</span></div>
    <script async th:src="${'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=' + theme.config.sidebar.adbox.ad_google.ad_client}"
            crossorigin="anonymous"></script>
@ -18,6 +14,4 @@
        (adsbygoogle = window.adsbygoogle || []).push({});
    </script>

-    </div>
-</th:block>
-</html>
+</div>
--- a/templates/modules/widgets/aside/archives.html
+++ b/templates/modules/widgets/aside/archives.html
@ -1,8 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 归档 -->
-<div class="card-widget card-categories" th:fragment="archives">
+<div class="card-widget card-categories" >

 </div>
-
-</html>
--- a/templates/modules/widgets/aside/categories.html
+++ b/templates/modules/widgets/aside/categories.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录 -->
-<div class="card-widget card-categories" th:fragment="categories"
+<div class="card-widget card-categories"
     th:with="categories =  ${categoryFinder.list(1, theme.config.sidebar.categoryQuantity)}">
    <div class="item-headline"><i class="haofont hao-icon-folder-open"></i><span>分类</span></div>
    <div class="aside-list">
@ -18,5 +16,3 @@

    </div>
 </div>
-
-</html>
--- a/templates/modules/widgets/aside/comments.html
+++ b/templates/modules/widgets/aside/comments.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 最新评论 -->
-<div class="card-widget card-recent-post" th:fragment="comments">
+<div class="card-widget card-recent-post" >
    <a th:if="${not #strings.isEmpty(theme.config.sidebar.newcomment.newcommentUrl)}"
       th:onclick="pjax.loadUrl([[${theme.config.sidebar.newcomment.newcommentUrl}]])"
       title="查看更多"
@ -38,5 +36,3 @@
        </th:block>
    </div>
 </div>
-
-</html>
--- a/templates/modules/widgets/aside/contain/archive-contain.html
+++ b/templates/modules/widgets/aside/contain/archive-contain.html
@ -1,8 +1,6 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 标签 -->

-<th:block th:fragment="archive-contain" >
+<th:block  >

    <div  class="item-headline"><a class="card-more-btn" href="/archives/" title="查看更多" data-pjax-state=""></a></div>
    <ul  class="card-archive-list"
@ -36,6 +34,3 @@
    </ul>

 </th:block>
-
-
-</html>
--- a/templates/modules/widgets/aside/contain/stat-contain.html
+++ b/templates/modules/widgets/aside/contain/stat-contain.html
@ -1,10 +1,8 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 侧边栏站点信息统计 -->

-<th:block th:fragment="stat-contain" th:with="stats = ${siteStatsFinder.getStats()}">
+<th:block  th:with="stats = ${siteStatsFinder.getStats()}">

-<!--    <div class="item-headline"><i class="haofont icon-icon-sidebar-scxmtj"></i><span>统计</span></div>-->
+    <!--    <div class="item-headline"><i class="haofont icon-icon-sidebar-scxmtj"></i><span>统计</span></div>-->
    <div class="webinfo">
        <div class="webinfo-item">
            <div class="webinfo-item-title"><i class="haofont hao-icon-file-lines"></i>
@ -44,5 +42,3 @@
        </div> -->
    </div>
 </th:block>
-
-</html>
--- a/templates/modules/widgets/aside/contain/tags-contain.html
+++ b/templates/modules/widgets/aside/contain/tags-contain.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 标签 -->
-<th:block th:fragment="tags-contain"
+<th:block
          th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">

    <div class="item-headline"></div>
@ -22,6 +20,3 @@
    </script>

 </th:block>
-
-
-</html>
--- a/templates/modules/widgets/aside/friend-link.html
+++ b/templates/modules/widgets/aside/friend-link.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 通讯录 -->
-<div class="card-widget card-friend-link" th:fragment="friend-link">
+<div class="card-widget card-friend-link">
    <div class="item-headline"><i class="haofont hao-icon-tongxunlu07"
                                  style="font-size: 0.9rem;font-weight: 700;"></i><span>通讯录</span></div>
    <div class="card-friend-link-container"
@ -53,4 +51,3 @@


 </div>
-</html>
--- a/templates/modules/widgets/aside/music.html
+++ b/templates/modules/widgets/aside/music.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 音乐卡片 -->
-<div th:fragment="music">
+<div >
    <div class="item-headline-music"><i class="haofont hao-icon-music"></i><span>音乐天地</span></div>

    <div class="card-widget card-music"
@ -29,6 +27,3 @@
    </style>

 </div>
-
-
-</html>
--- a/templates/modules/widgets/aside/power.html
+++ b/templates/modules/widgets/aside/power.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 爱发电赞助 -->
-<div th:fragment="power">
-
+<div >
    <div class="card-widget card-power">
        <div class="item-headline"><i class="haofont hao-icon-aifadian-line"></i><span>爱发电赞助</span>
            <a class="power-charge" th:href="${theme.config.sidebar.power.powerLink}" target="_blank" title="赞助博主">赞助
@ -29,9 +26,5 @@
                </div>
            </div>
        </th:block>
-
    </div>
 </div>
-
-
-</html>
--- a/templates/modules/widgets/aside/profile.html
+++ b/templates/modules/widgets/aside/profile.html
@ -1,8 +1,6 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 侧边栏自我介绍 -->

-<div class="card-widget card-info" th:fragment="profile">
+<div class="card-widget card-info" >

    <!-- 默认 -->
    <th:block th:if="${#strings.equals(theme.config.sidebar.profile.profileStyle, 'default')}">
@ -469,5 +467,3 @@
    </th:block>

 </div>
-
-</html>
--- a/templates/modules/widgets/aside/recent-posts.html
+++ b/templates/modules/widgets/aside/recent-posts.html
@ -1,6 +1,4 @@
-<!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.sidebar.recentPost)},
+<div class="card-widget card-recent-post" th:with='posts = ${postFinder.list(1,theme.config.sidebar.recentPost)},
    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">
@ -24,4 +22,3 @@

    </div>
 </div>
-</html>
--- a/templates/modules/widgets/aside/stat.html
+++ b/templates/modules/widgets/aside/stat.html
@ -1,7 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">

-
-<div class="card-widget card-webinfo"  th:fragment="stat">
-    <th:block th:replace="~{modules/widgets/aside/contain/stat-contain :: stat-contain}"></th:block>
+<div class="card-widget card-webinfo">
+    <th:block th:replace="~{modules/widgets/aside/contain/stat-contain}"/>
 </div>
--- a/templates/modules/widgets/aside/steam.html
+++ b/templates/modules/widgets/aside/steam.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- Steam卡片 -->
-<div th:fragment="steam">
+<div >
    <div class="item-headline-steam"><i class="fa-brands fa-steam"></i><span>Steam卡片</span></div>

    <div class="card-widget card-steam"
@ -17,6 +15,3 @@
        </div>
    </div>
 </div>
-
-
-</html>
--- a/templates/modules/widgets/aside/tags-stat.html
+++ b/templates/modules/widgets/aside/tags-stat.html
@ -1,30 +1,20 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- tag & stat 粘性布局 -->
-
-<th:block th:fragment="tags-stat">
-
-    <div class="card-widget card-tags card-archives card-webinfo card-allinfo">
+<div class="card-widget card-tags card-archives card-webinfo card-allinfo">


        <span th:if="${theme.config.sidebar.tags_switch}">
-            <th:block th:replace="~{modules/widgets/aside/contain/tags-contain :: tags-contain}" th:if="${theme.config.sidebar.tags_switch}"></th:block>
+            <th:block th:replace="~{modules/widgets/aside/contain/tags-contain}" th:if="${theme.config.sidebar.tags_switch}"/>

            <hr>
        </span>

    <span th:if="${theme.config.sidebar.archive_switch}">
-            <th:block th:replace="~{modules/widgets/aside/contain/archive-contain :: archive-contain}" ></th:block>
+            <th:block th:replace="~{modules/widgets/aside/contain/archive-contain}" />

            <hr>
        </span>


-        <th:block th:replace="~{modules/widgets/aside/contain/stat-contain :: stat-contain}" ></th:block>
+    <th:block th:replace="~{modules/widgets/aside/contain/stat-contain}" />

-    </div>
-
-</th:block>
-
-
-</html>
+</div>
--- a/templates/modules/widgets/aside/tags.html
+++ b/templates/modules/widgets/aside/tags.html
@ -1,7 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 标签 -->
-
-<div class="card-widget card-tags"  th:fragment="tags">
-    <th:block th:replace="~{modules/widgets/aside/contain/tags-contain :: tags-contain}"></th:block>
+<div class="card-widget card-tags">
+    <th:block th:replace="~{modules/widgets/aside/contain/tags-contain}"/>
 </div>
--- a/templates/modules/widgets/aside/toc.html
+++ b/templates/modules/widgets/aside/toc.html
@ -1,9 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 目录 -->
-
-<th:block th:fragment="toc">
-    <div class="card-widget" id="card-toc">
+<div class="card-widget" id="card-toc">
    <div class="item-headline">
        <i class="haofont hao-icon-bars"></i>
        <span>文章目录</span>
@ -11,6 +7,4 @@
    </div>
    <!-- 目录容器 -->
    <div class="toc-content"></div>
-    </div>
-</th:block>
-</html>
+</div>
--- a/templates/modules/widgets/aside/wechat.html
+++ b/templates/modules/widgets/aside/wechat.html
@ -1,6 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div class="card-widget heo-right-widget" id="card-wechat" th:fragment="wechat"
+<div class="card-widget heo-right-widget" id="card-wechat"
 th:with="faceImg = ${theme.config.sidebar.wechat.wechatImgFace}, backImg=${theme.config.sidebar.wechat.wechatImgBack}"
     th:attr="onclick='javascript:window.open(\''+ ${theme.config.sidebar.wechat.url} +'\')'">
    <div id="flip-wrapper">
@ -35,4 +33,3 @@ th:with="faceImg = ${theme.config.sidebar.wechat.wechatImgFace}, backImg=${theme

    </style>
 </div>
-</html>
--- a/templates/modules/widgets/aside/welcome.html
+++ b/templates/modules/widgets/aside/welcome.html
@ -1,11 +1,7 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 小板报 -->
-<div class="card-widget card-announcement" th:fragment="welcome">
+<div class="card-widget card-announcement">
    <div class="item-headline"><i class="haofont hao-icon-bullhorn"
                                  style="font-size: 0.9rem;font-weight: 700;"></i><span>小板报</span></div>

    <div id="welcome-info"></div>
 </div>
-
-</html>
--- a/templates/modules/widgets/banner-group.html
+++ b/templates/modules/widgets/banner-group.html
@ -1,6 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<div id="bannerGroup" th:fragment="banner-group">
+<div id="bannerGroup" >

    <!-- banners -->
    <div id="banners">
@ -384,4 +382,3 @@
    </script>

 </div>
-</html>
--- a/templates/modules/widgets/console.html
+++ b/templates/modules/widgets/console.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<!-- 控制台，右上角点击的时候会显示 -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- TODO 控制台功能 -->
-<div id="console" th:fragment="console">
+<div id="console" >
  <div class="close-btn" onclick="heo.hideConsole()" href="javascript:void(0);">
    <i class="haofont hao-icon-circle-xmark"></i>
  </div>
@ -138,5 +135,3 @@
  <div class="console-mask" href="javascript:void(0);" onclick="heo.hideConsole()" rel="external nofollow">
  </div>
 </div>
-
-</html>
--- a/templates/modules/widgets/nav-left.html
+++ b/templates/modules/widgets/nav-left.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 导航栏左侧 -->
-<div id="blog_name" th:fragment="nav-left">
+<div id="blog_name" >

    <th:block th:if="${not #strings.isEmpty(theme.config.nav.leftMenu)}"
              th:with="leftMenu = ${menuFinder.getByName(theme.config.nav.leftMenu)}">
@ -40,6 +37,3 @@
        <span th:utext="${#strings.isEmpty(theme.config.basics.siteTitle)} ? ${site.title} : ${theme.config.basics.siteTitle}"></span>
    </a>
 </div>
-
-
-</html>
--- a/templates/modules/widgets/nav-menu.html
+++ b/templates/modules/widgets/nav-menu.html
@ -1,7 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-
 <th:block th:fragment="nav-menu-recursion(menuItem)">
    <!-- 有子菜单则显示子菜单 -->
    <th:block th:if="${not #lists.isEmpty(menuItem.children)}">
@ -46,6 +42,3 @@

    </div>
 </div>
-
-
-</html>
--- a/templates/modules/widgets/nav-music.html
+++ b/templates/modules/widgets/nav-music.html
@ -1,11 +1,7 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 音乐 -->
-<div th:fragment="nav-music" class="needEndHide" id="nav-music" >
+<div  class="needEndHide" id="nav-music" >
    <a id="nav-music-hoverTips" onclick="heo.musicToggle()" accesskey="m">播放音乐</a>
    <div id="console-music-bg"></div><meting-js th:id="${theme.config.tool.nav_music.id}" th:server="${theme.config.tool.nav_music.server}" type="playlist" mutex="true"
                                                preload="none" theme="var(--heo-main)" data-lrctype="0" order="random"></meting-js>

 </div>
-</html>
--- a/templates/modules/widgets/nav-right.html
+++ b/templates/modules/widgets/nav-right.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 导航栏菜单栏 -->
-<div id="nav-right" th:fragment="nav-right">
+<div id="nav-right">

    <!-- 功能都需要添加开关 -->

@ -82,6 +79,3 @@
        </a>
    </div>
 </div>
-
-
-</html>
--- a/templates/modules/widgets/page.html
+++ b/templates/modules/widgets/page.html
@ -1,5 +1,3 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!--
    分页模块

@ -73,5 +71,3 @@

    </div>
 </nav>
-
-</html>
--- a/templates/modules/widgets/right-menu.html
+++ b/templates/modules/widgets/right-menu.html
@ -1,7 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <!-- 右键菜单 -->
-<div class="js-pjax" th:fragment="right-menu" th:if="${theme.config.tool.rightMenu.rightMenuEnable}">
+<div class="js-pjax"  th:if="${theme.config.tool.rightMenu.rightMenuEnable}">
    <div id="rightMenu">
        <div class="rightMenu-group rightMenu-small">
            <div class="rightMenu-item" id="menu-backward"><i class="haofont hao-icon-arrow-left"></i></div>
@ -119,5 +117,3 @@
    </div>
    <div id="rightmenu-mask"></div>
 </div>
-
-</html>
--- a/templates/modules/widgets/rightside.html
+++ b/templates/modules/widgets/rightside.html
@ -1,6 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<th:block th:fragment="rightside">
+<th:block >
    <div id="rightside">
        <div id="rightside-config-hide">
            <button th:if="${htmlType == 'post' && theme.config.tool.rightside.readmode}" id="readmode" type="button" title="阅读模式"><i class="haofont hao-icon-book-open"></i></button>
@ -40,4 +38,3 @@
    <link th:if="${theme.config.tool.rightside.readmode && theme.config.tool.rightside.rightsideEnable}"
          rel="stylesheet" th:href="${assets_link + '/css/read-mode.css' + theme_version}">
 </th:block>
-</html>
--- a/templates/modules/widgets/top-group.html
+++ b/templates/modules/widgets/top-group.html
@ -1,8 +1,5 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
 <!-- 推荐文章 -->
-<div class="topGroup" th:fragment="top-group" th:with='topGroupPosts = ${postFinder.list(1,6)},
+<div class="topGroup"  th:with='topGroupPosts = ${postFinder.list(1,6)},
    postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"&" : theme.config.layout.postRandomImg+"?"}'
 >
    <div class="recent-post-item"
@ -79,4 +76,4 @@
        </div>
    </div>
 </div>
-</html>
+
--- a/templates/moments.html
+++ b/templates/moments.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'moments',title = ${title + ' | ' + site.title}, head = ~{::head}, _title = ${title})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${_title},
@ -83,7 +83,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
        <!-- 卡片顶部气泡效果 -->
        <script th:if="${theme.config.other.bubbleEnable}" async data-pjax
                th:src="${assets_link + '/libs/canvas/bubble.js'}"></script>
--- a/templates/music.html
+++ b/templates/music.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html  xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'music',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -37,7 +37,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/new_comment.html
+++ b/templates/new_comment.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html  xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'newComment',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -18,10 +18,10 @@
        </header>
        <main class="layout hide-aside" id="content-inner">
            <div id="page">
-                <div th:replace="~{macro/author-content :: author-content(background = ${theme.config.new_comment.backgroundImg},
-                        smallTitle = ${theme.config.new_comment.smallTitle},
-                        bigTitle = ${theme.config.new_comment.bigTitle},
-                        detail = ${theme.config.new_comment.detail},
+                <div th:replace="~{macro/author-content :: author-content(background = ${singlePage.spec.cover},
+                        smallTitle = '评论',
+                        bigTitle = ${singlePage.spec.title},
+                        detail = ${singlePage.spec.excerpt.raw},
                        buttonUrl = '',
                        buttonTitle = '')}"></div>
                <div id="comments-page">
@ -353,7 +353,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
        <!-- 卡片顶部气泡效果 -->
        <script th:if="${theme.config.other.bubbleEnable}" async data-pjax
                th:src="${assets_link + '/libs/canvas/bubble.js'}"></script>
--- a/templates/page.html
+++ b/templates/page.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html  xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -36,7 +36,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/page_links.html
+++ b/templates/page_links.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html  xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'page',title = ${singlePage.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${singlePage.spec.title},
@ -33,7 +33,7 @@
            </div>
        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/templates/photos.html
+++ b/templates/photos.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content},htmlType = 'photos',title = ${title + ' | ' + site.title}, head = ~{::head},_title = ${title})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${_title},
@ -249,7 +249,7 @@

        </main>
        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
        <!-- 卡片顶部气泡效果 -->
        <script th:if="${theme.config.other.bubbleEnable}" async data-pjax
                th:src="${assets_link + '/libs/canvas/bubble.js'}"></script>
--- a/templates/post.html
+++ b/templates/post.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html  xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'post',title = ${post.spec.title + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${post.spec.title},
@ -174,7 +174,7 @@
                        th:src="${assets_link + '/libs/gpt/post-ai.js'}"></script>

                <!-- 版权声明 -->
-                <th:block th:replace="~{modules/post/copyright :: copyright}"></th:block>
+                <th:block th:replace="~{modules/post/copyright}"></th:block>

                <nav class="pagination-post needEndHide" id="pagination"
                     th:with="postCursor = ${postFinder.cursor(post.metadata.name)},
@ -206,7 +206,7 @@
                    </div>
                </nav>
                <!-- 阅读建议 -->
-                <th:block th:replace="~{modules/post/relatedPosts :: relatedPosts}"></th:block>
+                <th:block th:replace="~{modules/post/relatedPosts}"/>
                <hr>
                <!--/* 评论组件 */-->
                <th:block
@ -222,7 +222,7 @@
        </main>

        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>

    </div>

--- a/templates/tag.html
+++ b/templates/tag.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="http://www.thymeleaf.org"
      th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'tag',title = ${'标签' + ': ' + tag.spec.displayName + ' | ' + site.title}, head = ~{::head})}">
 <th:block th:fragment="head">
    <th:block th:replace="~{modules/common/open-graph :: open-graph(_title = ${tag.spec.displayName},
@ -34,7 +34,7 @@
        </main>

        <!-- 底部 -->
-        <footer th:replace="~{modules/footer :: footer}"></footer>
+        <footer th:replace="~{modules/footer}"/>
    </div>

 </th:block>
--- a/Show More
+++ b/Show More