diff --git a/blog/context_processors.py b/blog/context_processors.py index 3b2862d..512e4f4 100644 --- a/blog/context_processors.py +++ b/blog/context_processors.py @@ -1,5 +1,6 @@ import logging -from datetime import datetime + +from django.utils import timezone from djangoblog.utils import cache, get_blog_setting from .models import Category, Article @@ -33,6 +34,6 @@ def seo_processor(requests): 'ANALYTICS_CODE': setting.analyticscode, "BEIAN_CODE_GONGAN": setting.gongan_beiancode, "SHOW_GONGAN_CODE": setting.show_gongan_code, - "CURRENT_YEAR": datetime.now().year} + "CURRENT_YEAR": timezone.now().year} cache.set(key, value, 60 * 60 * 10) return value diff --git a/blog/views.py b/blog/views.py index 0e6f962..14174ef 100644 --- a/blog/views.py +++ b/blog/views.py @@ -1,4 +1,3 @@ -import datetime import logging import os import uuid @@ -8,6 +7,7 @@ from django.core.paginator import Paginator from django.http import HttpResponse, HttpResponseForbidden from django.shortcuts import get_object_or_404 from django.shortcuts import render +from django.utils import timezone from django.views.decorators.csrf import csrf_exempt from django.views.generic.detail import DetailView from django.views.generic.list import ListView @@ -309,7 +309,7 @@ def fileupload(request): return HttpResponseForbidden() response = [] for filename in request.FILES: - timestr = datetime.datetime.now().strftime('%Y/%m/%d') + timestr = timezone.now().strftime('%Y/%m/%d') imgextensions = ['jpg', 'png', 'jpeg', 'bmp'] fname = u''.join(str(filename)) isimage = len([i for i in imgextensions if fname.find(i) >= 0]) > 0 diff --git a/comments/models.py b/comments/models.py index 67df624..d7f5faa 100644 --- a/comments/models.py +++ b/comments/models.py @@ -29,7 +29,7 @@ class Comment(models.Model): '是否显示', default=True, blank=False, null=False) class Meta: - ordering = ['id'] + ordering = ['-id'] verbose_name = "评论" verbose_name_plural = verbose_name get_latest_by = 'id' diff --git a/djangoblog/feeds.py b/djangoblog/feeds.py index 1c09246..8c4e851 100644 --- a/djangoblog/feeds.py +++ b/djangoblog/feeds.py @@ -1,11 +1,10 @@ -from datetime import datetime - from django.contrib.auth import get_user_model from django.contrib.syndication.views import Feed +from django.utils import timezone from django.utils.feedgenerator import Rss201rev2Feed -from djangoblog.utils import CommonMarkdown from blog.models import Article +from djangoblog.utils import CommonMarkdown class DjangoBlogFeed(Feed): @@ -31,7 +30,7 @@ class DjangoBlogFeed(Feed): return CommonMarkdown.get_markdown(item.body) def feed_copyright(self): - now = datetime.now() + now = timezone.now() return "Copyright© {year} 且听风吟".format(year=now.year) def item_link(self, item): diff --git a/oauth/views.py b/oauth/views.py index fdfb542..a15311d 100644 --- a/oauth/views.py +++ b/oauth/views.py @@ -1,4 +1,3 @@ -import datetime import logging # Create your views here. from urllib.parse import urlparse @@ -13,6 +12,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.shortcuts import render from django.urls import reverse +from django.utils import timezone from django.views.generic import FormView from djangoblog.blog_signals import oauth_user_login_signal @@ -73,8 +73,7 @@ def authorize(request): user = manager.get_oauth_userinfo() if user: if not user.nikename or not user.nikename.strip(): - import datetime - user.nikename = "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S') + user.nikename = "djangoblog" + timezone.now().strftime('%y%m%d%I%M%S') try: temp = OAuthUser.objects.get(type=type, openid=user.openid) temp.picture = user.picture @@ -102,7 +101,7 @@ def authorize(request): except ObjectDoesNotExist: author.username = user.nikename else: - author.username = "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S') + author.username = "djangoblog" + timezone.now().strftime('%y%m%d%I%M%S') author.source = 'authorize' author.save() @@ -141,7 +140,7 @@ def emailconfirm(request, id, sign): if result[1]: author.source = 'emailconfirm' author.username = oauthuser.nikename.strip() if oauthuser.nikename.strip( - ) else "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S') + ) else "djangoblog" + timezone.now().strftime('%y%m%d%I%M%S') author.save() oauthuser.author = author oauthuser.save() diff --git a/owntracks/views.py b/owntracks/views.py index 65bfd3e..1396b95 100644 --- a/owntracks/views.py +++ b/owntracks/views.py @@ -10,6 +10,7 @@ from django.contrib.auth.decorators import login_required from django.http import HttpResponse from django.http import JsonResponse from django.shortcuts import render +from django.utils import timezone from django.views.decorators.csrf import csrf_exempt from .models import OwnTrackLog @@ -45,7 +46,7 @@ def manage_owntrack_log(request): @login_required def show_maps(request): if request.user.is_superuser: - defaultdate = str(datetime.datetime.now().date()) + defaultdate = str(timezone.now().date()) date = request.GET.get('date', defaultdate) context = { 'date': date