From 7070c92b1965a570efd3c61c72472f42f1ecb44a Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Tue, 7 May 2019 21:13:05 +0800
Subject: [PATCH] Fixed render atom.xml error again.

---
 .../resources/templates/common/mail_template/mail_notice.ftl  | 2 +-
 src/main/resources/templates/common/web/atom.ftl              | 4 ++--
 src/main/resources/templates/common/web/rss.ftl               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/common/mail_template/mail_notice.ftl b/src/main/resources/templates/common/mail_template/mail_notice.ftl
index 13ee1adbc..fddd2137f 100644
--- a/src/main/resources/templates/common/mail_template/mail_notice.ftl
+++ b/src/main/resources/templates/common/mail_template/mail_notice.ftl
@@ -5,7 +5,7 @@
                 您的博客有新的评论！
             </h1>
             <div class="emailtext" style="background:#fff;padding:20px 32px 40px;">
-                <p style="color: #6e6e6e;font-size:13px;line-height:24px;">${user.nickName!}, 您好!</p>
+                <p style="color: #6e6e6e;font-size:13px;line-height:24px;">${user.nickname!}, 您好!</p>
                 <p style="color: #6e6e6e;font-size:13px;line-height:24px;">有访客在《${page!}》留言:</p>
                     <br />
                 <p style="color: #6e6e6e;font-size:13px;line-height:24px;padding:10px 20px;background:#f8f8f8;margin:0">
diff --git a/src/main/resources/templates/common/web/atom.ftl b/src/main/resources/templates/common/web/atom.ftl
index cb5f365c3..fe0d4b3f0 100644
--- a/src/main/resources/templates/common/web/atom.ftl
+++ b/src/main/resources/templates/common/web/atom.ftl
@@ -23,7 +23,7 @@
                 <link>${options.blog_url!}/archives/${post.url!}</link>
                 <comments>${options.blog_url!}/archives/${post.url!}#comments</comments>
                 <pubDate>${post.createTime!}</pubDate>
-                <dc:creator><![CDATA[${user.nickName!}]]></dc:creator>
+                <dc:creator><![CDATA[${user.nickname!}]]></dc:creator>
 
                 <#if post.categories?? && post.categories?size gt 0>
                     <#list post.categories as cate>
@@ -37,7 +37,7 @@
                 </description>
                 <content:encoded>
                     <![CDATA[
-                        ${post.formatContent!}
+                        ${post.summary!}
                     ]]>
                 </content:encoded>
                 <slash:comments>${post.commentCount!0}</slash:comments>
diff --git a/src/main/resources/templates/common/web/rss.ftl b/src/main/resources/templates/common/web/rss.ftl
index b645ed8d2..f46e136f8 100644
--- a/src/main/resources/templates/common/web/rss.ftl
+++ b/src/main/resources/templates/common/web/rss.ftl
@@ -14,7 +14,7 @@
                     <link>${options.blog_url}/archives/${post.url!}</link>
                     <content:encoded>
                         <![CDATA[
-                            ${post.formatContent!}
+                            ${post.summary!}
                         ]]>
                     </content:encoded>
                     <pubDate>${post.createTime}</pubDate>