diff --git a/DjangoBlog/settings.py b/DjangoBlog/settings.py index d7dfe30..d158ff4 100644 --- a/DjangoBlog/settings.py +++ b/DjangoBlog/settings.py @@ -46,14 +46,15 @@ INSTALLED_APPS = [ MIDDLEWARE_CLASSES = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - # 'django.middleware.cache.UpdateCacheMiddleware', + 'django.middleware.gzip.GZipMiddleware', + 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', - # 'django.middleware.cache.FetchFromCacheMiddleware', + 'django.middleware.cache.FetchFromCacheMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - + 'django.middleware.http.ConditionalGetMiddleware', ] ROOT_URLCONF = 'DjangoBlog.urls' @@ -142,6 +143,7 @@ TIME_FORMAT = '%Y-%m-%d %H:%M:%S' DATE_TIME_FORMAT = '%Y-%m-%d' SITE_NAME = 'Django Blog' +SITE_URL = 'http://blog.lylinux.org' SITE_DESCRIPTION = '大巧无工,重剑无锋.' SITE_SEO_DESCRIPTION = '小站主要用来分享和记录学习经验,教程,记录个人生活的点滴以及一些随笔.欢迎大家访问小站' @@ -159,17 +161,23 @@ SIDEBAR_COMMENT_COUNT = 5 # 分页 PAGINATE_BY = 10 - +# http缓存时间 +CACHE_CONTROL_MAX_AGE = 2592000 # cache setting -""" + CACHES = { 'default': { 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'LOCATION': '192.168.21.130:11211', + }, + 'localmem': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + 'LOCATION': 'unique-snowflake', } } -""" - +CACHE_MIDDLEWARE_SECONDS = 360000 +CACHE_MIDDLEWARE_KEY_PREFIX = "djangoblog" +CACHE_MIDDLEWARE_ALIAS = 'default' OAHUTH = { 'sina': { 'appkey': '3161614143', diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py index 6d99fed..f3fd651 100644 --- a/blog/templatetags/blog_tags.py +++ b/blog/templatetags/blog_tags.py @@ -83,7 +83,7 @@ def load_breadcrumb(article): """ names = article.get_category_tree() - names.append((settings.SITE_NAME, 'http://127.0.0.1:8000')) + names.append((settings.SITE_NAME, settings.SITE_URL)) names = names[::-1] return { diff --git a/requirements.txt b/requirements.txt index 1a0aaf5..91fc51b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,17 @@ Django==1.10.3 django-autoslug==1.9.3 +django-autoslug-field==0.2.3 django-pagedown==0.1.1 +django-registration==2.2 django-uuslug==1.1.8 +inflect==0.2.5 markdown2==2.3.1 Pillow==3.4.2 PyMySQL==0.7.9 +python-memcached==1.58 python-slugify==1.2.1 requests==2.12.1 +six==1.10.0 +sqlacodegen==1.1.6 +SQLAlchemy==1.1.4 +Unidecode==0.4.19 diff --git a/templates/base.html b/templates/base.html index 0228cda..6f1decd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -77,9 +77,14 @@ var wpAutoTopSpeed = 1;
{% endcomment %} {% comment %}{% endcomment %} - - - - +