From 10ca1f2aceff1efdeea4c32cf30298dae40953b2 Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Sat, 23 Mar 2019 22:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=20close=20?= =?UTF-8?q?#229=20#232?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DjangoBlog/spider_notify.py | 2 +- accounts/views.py | 6 ++++-- blog/forms.py | 6 ++++-- blog/search_indexes.py | 14 +------------- blog/views.py | 4 ++-- requirements.txt | 6 +++--- travis_test/requirements.txt | 7 ++++--- 7 files changed, 19 insertions(+), 26 deletions(-) diff --git a/DjangoBlog/spider_notify.py b/DjangoBlog/spider_notify.py index c13835c..e83ccb1 100644 --- a/DjangoBlog/spider_notify.py +++ b/DjangoBlog/spider_notify.py @@ -27,7 +27,7 @@ class SpiderNotify(): try: data = '\n'.join(urls) result = requests.post(settings.BAIDU_NOTIFY_URL, data=data) - print(result.text) + logger.info(result.text) except Exception as e: logger.error(e) diff --git a/accounts/views.py b/accounts/views.py index a3ee777..0e64e16 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render - +import logging from .forms import RegisterForm, LoginForm from django.contrib.auth import authenticate, login, logout # from django.views.generic.edit import FormView @@ -17,6 +17,8 @@ from django.utils.decorators import method_decorator from django.views.decorators.debug import sensitive_post_parameters from django.utils.http import is_safe_url +logger = logging.getLogger(__name__) + # Create your views here. @@ -73,7 +75,7 @@ class LoginView(FormView): from DjangoBlog.utils import cache if cache and cache is not None: cache.clear() - print(self.redirect_field_name) + logger.info(self.redirect_field_name) redirect_to = self.request.GET.get(self.redirect_field_name) auth.login(self.request, form.get_user()) return super(LoginView, self).form_valid(form) diff --git a/blog/forms.py b/blog/forms.py index 3c09fc3..1df8023 100644 --- a/blog/forms.py +++ b/blog/forms.py @@ -15,7 +15,9 @@ from haystack.forms import SearchForm from django import forms -from blog.models import Article, Category +import logging + +logger = logging.getLogger(__name__) class BlogSearchForm(SearchForm): @@ -27,5 +29,5 @@ class BlogSearchForm(SearchForm): return self.no_query_found() if self.cleaned_data['querydata']: - print(self.cleaned_data['querydata']) + logger.info(self.cleaned_data['querydata']) return datas diff --git a/blog/search_indexes.py b/blog/search_indexes.py index 9d0268e..f48ae32 100644 --- a/blog/search_indexes.py +++ b/blog/search_indexes.py @@ -18,23 +18,11 @@ from blog.models import Article, Category, Tag class ArticleIndex(indexes.SearchIndex, indexes.Indexable): - # title = indexes.CharField(document=True, use_template=True) text = indexes.CharField(document=True, use_template=True) + author = indexes.CharField(model_attr='author') def get_model(self): return Article def index_queryset(self, using=None): return self.get_model().objects.filter(status='p') - - -""" -class CategoryIndex(indexes.SearchIndex, indexes.Indexable): - name = indexes.CharField(document=True, use_template=True) - - def get_model(self): - return Article - - def index_queryset(self, using=None): - return self.get_model().objects.filter(status='p') -""" diff --git a/blog/views.py b/blog/views.py index b572278..119f9cf 100644 --- a/blog/views.py +++ b/blog/views.py @@ -188,7 +188,7 @@ class AuthorDetailView(ArticleListView): def get_queryset_data(self): author_name = self.kwargs['author_name'] - article_list = Article.objects.filter(author__username=author_name) + article_list = Article.objects.filter(author__username=author_name, type='a', status='p') return article_list def get_context_data(self, **kwargs): @@ -209,7 +209,7 @@ class TagDetailView(ArticleListView): tag = get_object_or_404(Tag, slug=slug) tag_name = tag.name self.name = tag_name - article_list = Article.objects.filter(tags__name=tag_name) + article_list = Article.objects.filter(tags__name=tag_name, type='a', status='p') return article_list def get_queryset_cache_key(self): diff --git a/requirements.txt b/requirements.txt index 67ea8cb..74c3113 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ bottle==0.12.16 certifi==2019.3.9 cffi==1.12.2 chardet==3.0.4 -coverage==4.5.2 +coverage==4.5.3 cryptography==2.6.1 Django==2.1.7 django-appconf==1.0.3 @@ -17,7 +17,7 @@ django-ipware==2.1.0 django-mdeditor==0.1.13 django-uuslug==1.1.8 idna==2.8 -isort==4.3.14 +isort==4.3.15 jieba==0.39 jsonpickle==1.1 lazy-object-proxy==1.3.1 @@ -40,7 +40,7 @@ rcssmin==1.0.6 requests==2.21.0 rjsmin==1.1.0 six==1.12.0 -sqlparse==0.2.4 +sqlparse==0.3.0 text-unidecode==1.2 typed-ast==1.3.1 Unidecode==1.0.23 diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt index cae8531..74c3113 100644 --- a/travis_test/requirements.txt +++ b/travis_test/requirements.txt @@ -5,7 +5,7 @@ bottle==0.12.16 certifi==2019.3.9 cffi==1.12.2 chardet==3.0.4 -coverage==4.5.2 +coverage==4.5.3 cryptography==2.6.1 Django==2.1.7 django-appconf==1.0.3 @@ -17,7 +17,7 @@ django-ipware==2.1.0 django-mdeditor==0.1.13 django-uuslug==1.1.8 idna==2.8 -isort==4.3.14 +isort==4.3.15 jieba==0.39 jsonpickle==1.1 lazy-object-proxy==1.3.1 @@ -32,6 +32,7 @@ Pygments==2.3.1 pylint==2.3.1 PyMySQL==0.9.3 pyparsing==2.3.1 +python-memcached==1.59 python-slugify==3.0.0 pytz==2018.9 raven==6.10.0 @@ -39,7 +40,7 @@ rcssmin==1.0.6 requests==2.21.0 rjsmin==1.1.0 six==1.12.0 -sqlparse==0.2.4 +sqlparse==0.3.0 text-unidecode==1.2 typed-ast==1.3.1 Unidecode==1.0.23