From fe9e2c12060f89c076782516cd7c15d8a8f9d42f Mon Sep 17 00:00:00 2001
From: xiuyuanjun <729125866@qq.com>
Date: Wed, 20 Apr 2022 21:33:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81--?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E5=92=8Cgravatar=E5=A4=B4=E5=83=8F=E6=97=B6=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=BC=93=E5=AD=98=E7=9A=84=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/templatetags/blog_tags.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
index 14116a3..98e9dea 100644
--- a/blog/templatetags/blog_tags.py
+++ b/blog/templatetags/blog_tags.py
@@ -174,6 +174,7 @@ def load_sidebar(user, linktype):
             'extra_sidebars': extra_sidebars
         }
         cache.set("sidebar" + linktype, value, 60 * 60 * 60 * 3)
+        logger.info('set sidebar cache.key:{key}'.format(key="sidebar" + linktype))
         value['user'] = user
         return value
 
@@ -301,6 +302,7 @@ def gravatar_url(email, size=40):
         url = "https://www.gravatar.com/avatar/%s?%s" % (hashlib.md5(
             email.lower()).hexdigest(), urllib.parse.urlencode({'d': default, 's': str(size)}))
         cache.set(cachekey, url, 60 * 60 * 10)
+        logger.info('set gravatar cache.key:{key}'.format(key=cachekey))
         return url
 
 

From b99a0130ddd9f2f457b0bcd7a16d7a498c9cb4ea Mon Sep 17 00:00:00 2001
From: xiuyuanjun <729125866@qq.com>
Date: Wed, 20 Apr 2022 21:38:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81--?=
 =?UTF-8?q?=E8=8E=B7=E5=BE=97gravatar=E5=A4=B4=E5=83=8F=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/templatetags/blog_tags.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
index 14116a3..e02b520 100644
--- a/blog/templatetags/blog_tags.py
+++ b/blog/templatetags/blog_tags.py
@@ -285,8 +285,9 @@ def load_article_detail(article, isindex, user):
 def gravatar_url(email, size=40):
     """获得gravatar头像"""
     cachekey = 'gravatat/' + email
-    if cache.get(cachekey):
-        return cache.get(cachekey)
+    url = cache.get(cachekey)
+    if url:
+        return url
     else:
         usermodels = OAuthUser.objects.filter(email=email)
         if usermodels:

From 52b110c0ccd0d1b0ffcad20bb6ed99dc9fee3541 Mon Sep 17 00:00:00 2001
From: liangliangyy <liangliangyy@gmail.com>
Date: Fri, 6 May 2022 13:57:58 +0800
Subject: [PATCH 3/3] update requirements

---
 requirements.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a8cd4a1..a46b5e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 coverage==6.3.2
 bleach==5.0.0
 Django==4.0.4
-django-compressor==3.1
-django-haystack==3.2.dev0
+django-compressor==4.0
+django-haystack==3.2.1
 django-ipware==4.0.2
 django-mdeditor==0.1.20
 django-uuslug==2.0.0
@@ -11,9 +11,9 @@ elasticsearch-dsl==7.4.0
 gevent==21.12.0
 jieba==0.42.1
 jsonpickle==2.1.0
-Markdown==3.3.6
+Markdown==3.3.7
 mysqlclient==2.1.0
-Pillow==9.0.1
+Pillow==9.1.0
 Pygments==2.11.2
 python-logstash==0.4.6
 python-slugify==6.1.1
@@ -24,4 +24,4 @@ urllib3==1.26.9
 WeRoBot==1.13.1
 Whoosh==2.7.4
 user-agents==2.2.0
-redis==4.1.4
+redis==4.2.2