chore(theme): 默认主题升级3.0.1版本

src/main/resources/templates/themes/halo-theme-dream/README.md

@@ -40,16 +40,16 @@
 
 ## 三、版本适配关系
 
-| 主题版本        | 适配Halo版本                | 测试用Halo版本 |
-|-------------| --------------------------- | -------------- |
-| 1.x         | 1.4.x及以下（不保证适配性） | 1.4.8          |
-| 2.0.0-2.0.1 | 1.4.x                       | 1.4.8          |
-| 2.0.2-2.3.1 | 1.5.x ~ 1.6.1                   | 1.6.1         |
+| 主题版本     | 适配Halo-Plus版本 | 测试用Halo-Plus版本 |
+|----------|---------------|----------------|
+| xx-2.3.1 | 1.0.0         | 1.0.0          |
+| 3.0.0    | 1.0.1   | 1.0.1          |
+| 3.0.1    | 1.0.2         | 1.0.2          |
 
+当前仓库为适配 `Halo-Plus` 的仓库，与 `Halo` 官方的博客系统不兼容。
 
-> 主题未在配置要求中对 Halo 最低版本限制得太死，但 Halo 不同版本开发接口略有不同，在不适配的版本中无法保证完全兼容。
->
-> 相对来说，测试用的 Halo 版本具有最好的适配性，是主题推荐的 `Halo` 版本。
+- 兼容 `Halo 1.x` 的分支（存档，不再维护）：https://github.com/nineya/halo-theme-dream/tree/halo
+- 兼容 `Haki 2.x` 的分支（维护中）：https://github.com/nineya/halo-theme-dream2.0
 
 
 

src/main/resources/templates/themes/halo-theme-dream/journals.ftl

@@ -1,4 +1,5 @@
 <#include "template/layout.ftl">
+<#include "template/main/comment.ftl">
 <@layout title="${journals_title!'动态'} - ${blog_title!}" canonical="${journals_url!}">
     <#if journals.content?? && journals.content?size gt 0>
         <#list journals.content as journal>
@@ -16,7 +17,7 @@
                                     class="fa fa-heart-o"></i><em>${(journal.likes != 0)?string(journal.likes?c,'喜欢')}</em></a>
                     </span>
 
-                    <#if settings.enable_journals_comment!true>
+                    <#if enable_comment>
                     <span class="journal-operation-item">
                         <a class="comment"><i
                                     class="fa fa-commenting-o"></i><em><#if journal.commentCount==0>评论<#else>${journal.commentCount}</#if></em></a>
@@ -28,9 +29,8 @@
                     </span>
                     </#if>
                 </div>
-                <#if settings.enable_journals_comment!true>
+                <#if enable_comment>
                 <div class="journal-comment">
-                    <#include "template/main/comment.ftl">
                     <@comment journal.id?c, "journal" />
                 </div>
                 </#if>

src/main/resources/templates/themes/halo-theme-dream/links.ftl

@@ -61,7 +61,7 @@
             </div>
         </div>
     </div>
-    <#if settings.link_comment_id?? && settings.link_comment_id!='' && settings.enable_comment!true>
+    <#if enable_comment>
         <div class="card card-content" id="comment-wrapper">
             <h3 class="comment-title">评论</h3>
             <#include "template/main/comment.ftl">

src/main/resources/templates/themes/halo-theme-dream/mail_template/mail_notice.ftl

@@ -1,6 +1,6 @@
 <#assign emojis={'呵呵':'hehe','哈哈':'haha','吐舌':'tushe','啊':'a','酷':'ku','怒':'nu','开心':'kaixin','汗':'han','泪':'lei','黑线':'heixian','鄙视':'bishi','不高兴':'bugaoxing','真棒':'zhenbang','钱':'qian','疑问':'yiwen','阴险':'yingxiang','吐':'tu','咦':'yi','委屈':'weiqu','花心':'huaxin','呼~':'hu','笑眼':'xiaoyan','冷':'len','太开心':'taikaixin','滑稽':'huaji','勉强':'mianqiang','狂汗':'kuanhan','乖':'guai','睡觉':'shuijiao','惊哭':'jingku','生气':'shengqi','惊讶':'jingya','喷':'pen','突然兴奋':'turanxingfen','挖鼻':'wabi','摊手':'tanshou','捂嘴笑':'wuzuixiao','喝酒':'hejiu','犀利':'xili','懒得理':'landeli','炸药':'zhayao','吃瓜':'chigua','小乖':'xiaoguai','你懂的':'nidongde','嘿嘿嘿':'heiheihei','欢呼':'huanhu','笑尿':'xiaoniao','酸爽':'suanshuang','紧张':'jinzhang','暗中观察':'anzhongguancha','小红脸':'xiaohonglian','呀咩爹':'yamiedie','微微一笑':'weiweiyixiao','what':'what','托腮':'tuosai','噗':'pu','困成狗':'kunchenggou','柯基暗中观察':'kejianzhongguancha','菜狗':'caigou','老虎':'laohu','嗷呜':'aowu','奥特曼':'aoteman','黑头高兴':'heitougaoxing','黑头瞪眼':'heitoudengyan','望远镜':'wangyuanjing','不听':'butin','干饭':'ganfan','大拇指':'damuzhi','胜利':'shengli','haha':'haha2','OK':'ok','红领巾':'honglingjin','爱心':'aixin','心碎':'xinsui','玫瑰':'meigui','礼物':'liwu','烟花':'yanhua','彩虹':'caihong','太阳':'taiyang','星星月亮':'xingxingyueliang','蛋糕':'dangao','茶杯':'chabei','香蕉':'xiangjiao','便便':'bianbian','药丸':'yaowan','钱币':'qianbi','蜡烛':'lazhu','沙发':'shafa','音乐':'yinyue','灯泡':'dengpao','手纸':'shouzhi'}>
 <#list emojis?keys as key>
-    <#assign content=content?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/halo-comment@1.1.3/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
+    <#assign content=content?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/halo-comment@1.1.4/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
 </#list>
 <div class="email-page" style="background:#fff;">
     <style>@media screen and (max-width: 400px) {

src/main/resources/templates/themes/halo-theme-dream/mail_template/mail_reply.ftl

@@ -1,7 +1,7 @@
 <#assign emojis={'呵呵':'hehe','哈哈':'haha','吐舌':'tushe','啊':'a','酷':'ku','怒':'nu','开心':'kaixin','汗':'han','泪':'lei','黑线':'heixian','鄙视':'bishi','不高兴':'bugaoxing','真棒':'zhenbang','钱':'qian','疑问':'yiwen','阴险':'yingxiang','吐':'tu','咦':'yi','委屈':'weiqu','花心':'huaxin','呼~':'hu','笑眼':'xiaoyan','冷':'len','太开心':'taikaixin','滑稽':'huaji','勉强':'mianqiang','狂汗':'kuanhan','乖':'guai','睡觉':'shuijiao','惊哭':'jingku','生气':'shengqi','惊讶':'jingya','喷':'pen','突然兴奋':'turanxingfen','挖鼻':'wabi','摊手':'tanshou','捂嘴笑':'wuzuixiao','喝酒':'hejiu','犀利':'xili','懒得理':'landeli','炸药':'zhayao','吃瓜':'chigua','小乖':'xiaoguai','你懂的':'nidongde','嘿嘿嘿':'heiheihei','欢呼':'huanhu','笑尿':'xiaoniao','酸爽':'suanshuang','紧张':'jinzhang','暗中观察':'anzhongguancha','小红脸':'xiaohonglian','呀咩爹':'yamiedie','微微一笑':'weiweiyixiao','what':'what','托腮':'tuosai','噗':'pu','困成狗':'kunchenggou','柯基暗中观察':'kejianzhongguancha','菜狗':'caigou','老虎':'laohu','嗷呜':'aowu','奥特曼':'aoteman','黑头高兴':'heitougaoxing','黑头瞪眼':'heitoudengyan','望远镜':'wangyuanjing','不听':'butin','干饭':'ganfan','大拇指':'damuzhi','胜利':'shengli','haha':'haha2','OK':'ok','红领巾':'honglingjin','爱心':'aixin','心碎':'xinsui','玫瑰':'meigui','礼物':'liwu','烟花':'yanhua','彩虹':'caihong','太阳':'taiyang','星星月亮':'xingxingyueliang','蛋糕':'dangao','茶杯':'chabei','香蕉':'xiangjiao','便便':'bianbian','药丸':'yaowan','钱币':'qianbi','蜡烛':'lazhu','沙发':'shafa','音乐':'yinyue','灯泡':'dengpao','手纸':'shouzhi'}>
 <#list emojis?keys as key>
-    <#assign baseContent=baseContent?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/halo-comment@1.1.3/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
-    <#assign replyContent=replyContent?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/halo-comment@1.1.3/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
+    <#assign baseContent=baseContent?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/halo-comment@1.1.4/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
+    <#assign replyContent=replyContent?replace('\\[/${key}\\]','<img src="${blog_url!}/themes/dream/source/lib/halo-comment@1.1.4/assets/emoji/${emojis[key]}.png" style="width: 1.6em;height: 1.6em;margin: auto 2px;vertical-align: middle;"/>','ri')>
 </#list>
 <div class="email-page" style="background:#fff;">
     <style>@media screen and (max-width: 400px) {

src/main/resources/templates/themes/halo-theme-dream/settings.yaml

@@ -1264,12 +1264,18 @@ live2d:
       default: '280x260'
       placeholder: '请输入宽度(px)x高度(px)'
       description: '看板娘的（宽度x高度），单位为px。'
+      options:
+        - value: '280x260'
+        - value: '320x300'
     live2d_edge_side:
       name: live2d_edge_side
       label: 看板娘贴边方向与距离
       type: text
       default: 'right:50'
       placeholder: '请输入位置:距离(px)'
+      options:
+        - value: 'right:50'
+        - value: 'left:50'
     live2d_model_rand_mode:
       name: live2d_model_rand_mode
       label: 模型切换方式