Merge branch 'main' into main

.all-contributorsrc

@@ -1,6 +1,16 @@
 {
   "skipCi": true,
   "contributors": [
+    {
+      "login": "liuzhihang",
+      "name": "liuzhihang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26057042?v=4",
+      "profile": "https://liuzhihang.com/",
+      "contributions": [
+        "code",
+        "tutorial"
+      ]
+    },
     {
       "login": "shy-share",
       "name": "sunheyi",
@@ -74,6 +84,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "chengzhongxue",
+      "name": "困困鱼",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89380218?v=4",
+      "profile": "https://github.com/chengzhongxue",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "files": [
@@ -87,5 +106,6 @@
   "commit": false,
   "imageSize": 100,
   "linkToUsage": true,
-  "contributorsPerLine": 6
+  "contributorsPerLine": 6,
+  "commitType": "docs"
 }

README.md

@@ -6,7 +6,7 @@
 [主题预览](#预览) |
 [快速上手](#安装) |
 [使用文档](https://docs.liuzhihang.com) |
-[加入我们](#加入我们)
+[加入我们](#讨论)
 
 </p>
 </div>
@@ -27,30 +27,48 @@
 - 程序员小航：[https://liuzhihang.com](https://liuzhihang.com)
 - 小孙同学：[https://blog.sunguoqi.com](https://blog.sunguoqi.com)
 - 困困鱼：[https://0206.ink](https://0206.ink)
+- Steven的博客: [https://blog.stevenw.cc/](https://blog.stevenw.cc/)
+- 小张博客: [https://www.xiaozhangstu.com/](https://www.xiaozhangstu.com/)
 
 ## 简介
 
-&emsp;&emsp;[Halo-Theme-Hao](https://github.com/liuzhihang/halo-theme-hao) 是一款适用于 [Halo2.x](https://github.com/halo-dev/halo) 的博客主题。
+[Halo-Theme-Hao](https://github.com/liuzhihang/halo-theme-hao) 是一款适用于 [Halo2.x](https://github.com/halo-dev/halo) 的博客主题。移植自 [Hexo](https://hexo.io/zh-cn/index.html) 社区中 [张洪 Heo](https://blog.zhheo.com/)
-
-&emsp;&emsp;移植自 [Hexo](https://hexo.io/zh-cn/index.html) 社区中 [张洪 Heo](https://blog.zhheo.com/)
 对 [Hexo-Theme-Butterfly](https://github.com/liuzhihang/halo-theme-hao)
 主题的魔改版本。
 
 ## 安装
 
-&emsp;&emsp;在 [Release](https://github.com/liuzhihang/halo-theme-hao/releases) 页面下载最新版本 `zip` 后，通过 `Halo Console` 安装上传即可。
+在 [Release](https://github.com/liuzhihang/halo-theme-hao/releases) 页面下载最新版本 `zip` 后，通过 `Halo Console` 安装上传即可。
-
-&emsp;&emsp;详细文档请参考：[https://docs.halo.run/user-guide/themes](https://docs.halo.run/user-guide/themes)
-
 
 ## 使用
 
-### &emsp;&emsp;[点我查看正在编写中的文档](https://docs.liuzhihang.com)
+### [点我查看正在编写中的文档](https://docs.liuzhihang.com)
+
+## 许可
+
+[Halo-Theme-Hao](https://github.com/liuzhihang/halo-theme-hao) 使用 [GPL-v3.0](./LICENSE) 协议开源，请遵守开源协议。
+
+## 讨论
+
+如果你对主题有什么建议或者意见，欢迎提 PR & issue。
+
+想了解更多信息可以关注 「 程序员小航 」。
+
+<img width="500" src="https://liuzhihang.com/themes/theme-hao/assets/images/wechat/wechat1.png" />
+
+- 发送 "hao 群" 可以加群 （群验证信息最好是个人网站）
+- 发送"加好友"，可以加我微信，我拉你进群 （群二维码失效时）
+
+> 卖服务器的广告人，就不要加了。
 
 ## 贡献
 
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)) :)
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -59,16 +77,29 @@
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://shyblog.world/"><img src="https://avatars.githubusercontent.com/u/50973219?v=4?s=100" width="100px;" alt="sunheyi"/><br /><sub><b>sunheyi</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=shy-share" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://liuzhihang.com/"><img src="https://avatars.githubusercontent.com/u/26057042?v=4?s=100" width="100px;" alt="liuzhihang"/><br /><sub><b>liuzhihang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=liuzhihang" title="Code">💻</a> <a href="#tutorial-liuzhihang" title="Tutorials">✅</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Joydevelop"><img src="https://avatars.githubusercontent.com/u/79132319?v=4?s=100" width="100px;" alt="Joy"/><br /><sub><b>Joy</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Joydevelop" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://shyblog.world/"><img src="https://avatars.githubusercontent.com/u/50973219?v=4?s=100" width="100px;" alt="sunheyi"/><br /><sub><b>sunheyi</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=shy-share" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://johnniang.me"><img src="https://avatars.githubusercontent.com/u/16865714?v=4?s=100" width="100px;" alt="John Niang"/><br /><sub><b>John Niang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=JohnNiang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/Joydevelop"><img src="https://avatars.githubusercontent.com/u/79132319?v=4?s=100" width="100px;" alt="Joy"/><br /><sub><b>Joy</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=Joydevelop" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://lanbinovo.cn"><img src="https://avatars.githubusercontent.com/u/62149873?v=4?s=100" width="100px;" alt="Lanbin"/><br /><sub><b>Lanbin</b></sub></a><br /><a href="#tutorial-lanbinshijie" title="Tutorials">✅</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://johnniang.me"><img src="https://avatars.githubusercontent.com/u/16865714?v=4?s=100" width="100px;" alt="John Niang"/><br /><sub><b>John Niang</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=JohnNiang" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://sunguoqi.com/"><img src="https://avatars.githubusercontent.com/u/79169717?v=4?s=100" width="100px;" alt="小孙同学"/><br /><sub><b>小孙同学</b></sub></a><br /><a href="#tutorial-sun0225SUN" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=sun0225SUN" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://lanbinovo.cn"><img src="https://avatars.githubusercontent.com/u/62149873?v=4?s=100" width="100px;" alt="Lanbin"/><br /><sub><b>Lanbin</b></sub></a><br /><a href="#tutorial-lanbinshijie" title="Tutorials">✅</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://airbozh.cn"><img src="https://avatars.githubusercontent.com/u/50261327?v=4?s=100" width="100px;" alt="airbo"/><br /><sub><b>airbo</b></sub></a><br /><a href="#tutorial-AirboZH" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=AirboZH" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://sunguoqi.com/"><img src="https://avatars.githubusercontent.com/u/79169717?v=4?s=100" width="100px;" alt="小孙同学"/><br /><sub><b>小孙同学</b></sub></a><br /><a href="#tutorial-sun0225SUN" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=sun0225SUN" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gadore"><img src="https://avatars.githubusercontent.com/u/18081104?v=4?s=100" width="100px;" alt="Gadore"/><br /><sub><b>Gadore</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=gadore" title="Code">💻</a></td>
+    </tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.hydsb0.com"><img src="https://avatars.githubusercontent.com/u/64968400?v=4?s=100" width="100px;" alt="羡羡"/><br /><sub><b>羡羡</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=xyhcode" title="Code">💻</a></td>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="http://airbozh.cn"><img src="https://avatars.githubusercontent.com/u/50261327?v=4?s=100" width="100px;" alt="airbo"/><br /><sub><b>airbo</b></sub></a><br /><a href="#tutorial-AirboZH" title="Tutorials">✅</a> <a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=AirboZH" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/gadore"><img src="https://avatars.githubusercontent.com/u/18081104?v=4?s=100" width="100px;" alt="Gadore"/><br /><sub><b>Gadore</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=gadore" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://www.hydsb0.com"><img src="https://avatars.githubusercontent.com/u/64968400?v=4?s=100" width="100px;" alt="羡羡"/><br /><sub><b>羡羡</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=xyhcode" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/chengzhongxue"><img src="https://avatars.githubusercontent.com/u/89380218?v=4?s=100" width="100px;" alt="困困鱼"/><br /><sub><b>困困鱼</b></sub></a><br /><a href="https://github.com/liuzhihang/halo-theme-hao/commits?author=chengzhongxue" title="Code">💻</a></td>
     </tr>
   </tbody>
+  <tfoot>
+    <tr>
+      <td align="center" size="13px" colspan="6">
+        <img src="https://raw.githubusercontent.com/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg">
+          <a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a>
+        </img>
+      </td>
+    </tr>
+  </tfoot>
 </table>
 
 <!-- markdownlint-restore -->
@@ -76,38 +107,11 @@
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-## 许可
+## 指标
 
-&emsp;&emsp;[Halo-Theme-Hao](https://github.com/liuzhihang/halo-theme-hao) 使用 [GPL-v3.0](./LICENSE) 协议开源，请遵守开源协议。
+![Alt](https://repobeats.axiom.co/api/embed/7cb154a9a3fe9cda4fe1a982bdd20adb760edf20.svg "Repobeats analytics image")
 
-## 加入我们
+> 本项目使用 JetBrains IDEA 进行开发
 
-&emsp;&emsp;如果你对主题有什么建议或者意见，欢迎提 PR & issue。
+<a href="https://www.jetbrains.com/?from=Toolkit"><img src="https://cdn.jsdelivr.net/gh/liuzhihang/oss/pic/article/jetbrains-logo-MrNwcp.png" width="10%" height="10%"></a>
-
+<a href="https://www.jetbrains.com/?from=Toolkit"><img src="https://cdn.jsdelivr.net/gh/liuzhihang/oss/pic/article/idea-logo-XpnqgG.png" width="10%" height="10%"> </a>
-&emsp;&emsp;想了解更多信息可以关注 「 程序员小航 」。
-
-![程序员小航](https://liuzhihang.com/themes/theme-hao/assets/images/wechat/wechat1.png)
-
-- 发送 "hao 群" 可以加群 （群验证信息最好是个人网站）
-- 发送"加好友"，可以加我微信，我拉你进群 （群二维码失效时）
-
-> 卖服务器的广告人，就不要加了。
-
-## Contributors
-
-Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
-
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
-
-
-本工具使用 JetBrains IDEA 进行开发
-----
-<a href="https://www.jetbrains.com/?from=Toolkit"><img src="https://cdn.jsdelivr.net/gh/liuzhihang/oss/pic/article/jetbrains-logo-MrNwcp.png" width="20%" height="20%"></a><a href="https://www.jetbrains.com/?from=Toolkit"><img src="https://cdn.jsdelivr.net/gh/liuzhihang/oss/pic/article/idea-logo-XpnqgG.png" width="20%" height="20%"> </a>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-hao",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "dependencies": {
   }
 }

settings.yaml

@@ -671,6 +671,39 @@ spec:
           label: 最近发布文章
           value: 4
           help: "最近发布的文章数量"
+        - $formkit: group
+          name: reward
+          label: 打赏
+          value:
+            enable_reward:
+            wxPay:
+            alipay:
+            reward_md_url:
+          children:
+            - $formkit: radio
+              name: enable_reward
+              help: 启用文章打赏，请正确填写名称和二维码图片链接
+              value: false
+              options:
+                - label: 启用
+                  value: true
+                - label: 禁用
+                  value: false
+            - $formkit: attachment
+              name: wxPay
+              label: 微信
+              help: 微信二维码图片链接
+              placeholder: 请填写微信二维码图片链接
+            - $formkit: attachment
+              name: alipay
+              label: 支付宝
+              help: 支付宝二维码图片链接
+              placeholder: 请填写支付宝二维码图片链接
+            - $formkit: url
+              name: reward_md_url
+              label: 赞赏者名单地址
+              placeholder: "请输入赞赏者名单地址"
+              value: "/about"
         - $formkit: group
           name: post_edit
           label: 运营模式与责任
@@ -1095,8 +1128,6 @@ spec:
             name:
             wxPay:
             alipay:
-            enable_reward_wz:
-            reward_md_url:          
           children:
             - $formkit: radio
               name: enable_reward_wz
@@ -1114,7 +1145,7 @@ spec:
               value: "/about"
             - $formkit: radio
               name: enable_reward
-              help: 启用关于页面打赏
+              help: 启用文章打赏，请正确填写名称和二维码图片链接
               value: false
               options:
                 - label: 启用

theme.yaml

@@ -27,5 +27,5 @@ spec:
   repo: 'https://github.com/liuzhihang/halo-theme-hao'
   settingName: "theme-hao-setting"
   configMapName: "theme-hao-configMap"
-  version: 1.1.2
+  version: 1.1.4
   require: 2.0.0