From 73937f15243486b3e65f3e046f9f6fcf38beca43 Mon Sep 17 00:00:00 2001
From: liangliang <liangliangyy@gmail.com>
Date: Sat, 14 Apr 2018 16:27:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DjangoBlog/feeds.py            |  6 +++---
 bin/config.md                  |  1 +
 blog/templatetags/blog_tags.py | 12 ++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/DjangoBlog/feeds.py b/DjangoBlog/feeds.py
index 4bda173..dd836bc 100644
--- a/DjangoBlog/feeds.py
+++ b/DjangoBlog/feeds.py
@@ -26,9 +26,9 @@ from django.contrib.sites.models import Site
 class DjangoBlogFeed(Feed):
     feed_type = Rss201rev2Feed
 
-    description = settings.SITE_DESCRIPTION
+    description = '大巧无工,重剑无锋.'
     feed_url = 'https://www.lylinux.net/feed'
-    title = "%s %s " % (settings.SITE_NAME, settings.SITE_DESCRIPTION)
+    title = "且听风吟 大巧无工,重剑无锋. "
     link = "https://www.lylinux.net"
 
     def author_name(self):
@@ -48,7 +48,7 @@ class DjangoBlogFeed(Feed):
 
     def feed_copyright(self):
         # print(Site.objects.get_current().name)
-        return "Copyright© 2017  " + settings.SITE_NAME
+        return "Copyright© 2018 且听风吟"
 
     def item_link(self, item):
         return item.get_absolute_url()
diff --git a/bin/config.md b/bin/config.md
index 9393c58..9496e6f 100644
--- a/bin/config.md
+++ b/bin/config.md
@@ -45,6 +45,7 @@ OAHUTH = {
 }
 ```
 将对应的appkey和appsecret修改为你自己的，将`callbackurl`的域名也修改为你的域名。
+## Update Oauth配置部分已经修改到配置表中
 
 ## owntracks：
 owntracks是一个位置追踪软件，可以定时的将你的坐标提交到你的服务器上，现在简单的支持owntracks功能，需要安装owntracks的app，然后将api地址设置为:
diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
index 7e0a825..ac5a57e 100644
--- a/blog/templatetags/blog_tags.py
+++ b/blog/templatetags/blog_tags.py
@@ -28,6 +28,7 @@ from comments.models import Comment
 from DjangoBlog.utils import cache_decorator, logger
 from django.contrib.auth import get_user_model
 from oauth.models import OAuthUser
+from django.contrib.sites.models import Site
 
 register = template.Library()
 
@@ -66,8 +67,9 @@ def truncatechars_content(content):
     :return:
     """
     from django.template.defaultfilters import truncatechars_html
-
-    return truncatechars_html(content, settings.ARTICLE_SUB_LENGTH)
+    from DjangoBlog.utils import get_blog_setting
+    blogsetting = get_blog_setting()
+    return truncatechars_html(content, blogsetting.article_sub_length)
 
 
 @register.filter(is_safe=True)
@@ -86,8 +88,10 @@ def load_breadcrumb(article):
     :return:
     """
     names = article.get_category_tree()
-
-    names.append((settings.SITE_NAME, settings.SITE_URL))
+    from DjangoBlog.utils import get_blog_setting
+    blogsetting = get_blog_setting()
+    site = Site.objects.get_current().domain
+    names.append((blogsetting.sitename, site))
     names = names[::-1]
 
     return {