Merge pull request #583 from liangliangyy/dev

升级依赖

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
 
@@ -285,8 +286,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:
@@ -301,6 +303,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
 
 

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