Version 1.1

DevRoss · Mar 8, 2017 · 6409bd0 · 6409bd0
1 parent 774fa22
commit 6409bd0
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 102 deletions.
diff --git a/Anonymous_message/__pycache__/settings.cpython-35.pyc b/Anonymous_message/__pycache__/settings.cpython-35.pyc
diff --git a/Anonymous_message/settings.py b/Anonymous_message/settings.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 """
 Django settings for Anonymous_message project.
 
@@ -26,7 +28,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 
-ALLOWED_HOSTS = ['127.0.0.1']
+ALLOWED_HOSTS = ['127.0.0.1', '*']
 
 # Application definition
 
@@ -45,7 +47,7 @@
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
+    # 'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -134,5 +136,5 @@
 
 REST_FRAMEWORK = {
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
-    'PAGE_SIZE': 20
+    'PAGE_SIZE': 8
 }
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/website/__pycache__/__init__.cpython-35.pyc b/website/__pycache__/__init__.cpython-35.pyc
diff --git a/website/__pycache__/admin.cpython-35.pyc b/website/__pycache__/admin.cpython-35.pyc
diff --git a/website/__pycache__/models.cpython-35.pyc b/website/__pycache__/models.cpython-35.pyc
diff --git a/website/__pycache__/serializer.cpython-35.pyc b/website/__pycache__/serializer.cpython-35.pyc
diff --git a/website/__pycache__/urls.cpython-35.pyc b/website/__pycache__/urls.cpython-35.pyc
diff --git a/website/__pycache__/views.cpython-35.pyc b/website/__pycache__/views.cpython-35.pyc
diff --git a/website/migrations/0001_initial.py b/website/migrations/0001_initial.py
diff --git a/website/migrations/0002_remove_messages_ip.py b/website/migrations/0002_remove_messages_ip.py
diff --git a/website/migrations/0003_auto_20170305_2000.py b/website/migrations/0003_auto_20170305_2000.py
diff --git a/website/migrations/0004_auto_20170305_2006.py b/website/migrations/0004_auto_20170305_2006.py
diff --git a/website/migrations/__pycache__/0001_initial.cpython-35.pyc b/website/migrations/__pycache__/0001_initial.cpython-35.pyc
diff --git a/website/migrations/__pycache__/0004_auto_20170305_2006.cpython-35.pyc b/website/migrations/__pycache__/0004_auto_20170305_2006.cpython-35.pyc
diff --git a/website/migrations/__pycache__/__init__.cpython-35.pyc b/website/migrations/__pycache__/__init__.cpython-35.pyc
diff --git a/website/models.py b/website/models.py
@@ -1,7 +1,8 @@
 from django.db import models
 from django.template.defaultfilters import default
 
-from website.extend_function import getIPFromDJangoRequest
+
+# from website.extend_function import getIPFromDJangoRequest
 
 
 # Create your models here.

diff --git a/website/serializer.py b/website/serializer.py
@@ -21,6 +21,11 @@ def get_time(self, obj):
 
 # 发表留言
 class PostMessageSerializer(serializers.ModelSerializer):
+    time = serializers.SerializerMethodField()
+
     class Meta:
         model = Messages
-        fields = ('content',)
+        fields = ('content', 'time')
+
+    def get_time(self, obj):
+        return dateformat.format(obj.time, 'U')
diff --git a/website/urls.py b/website/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import url
 from website.views import (GetMessageList,
-                           PostMessage)
+                           PostMessage,
+                           PostMessageDev)
 
 urlpatterns = [
     url(r'messagelist/$', GetMessageList.as_view()),
     url(r'postmessage/$', PostMessage.as_view()),
+    url(r'postmessagedev/$', PostMessageDev.as_view()),
 ]
diff --git a/website/views.py b/website/views.py
@@ -1,19 +1,30 @@
 # from django.shortcuts import render
 from rest_framework import generics
 # from rest_framework.views import APIView
+from rest_framework.filters import OrderingFilter
+
 from website.models import Messages
 from website.serializer import (GetMessageSerializer,
                                 PostMessageSerializer)
+from rest_framework import parsers
+from rest_framework import filters
 
 
 # Create your views here.
 
 class GetMessageList(generics.ListAPIView):
     queryset = Messages.objects.all()
     serializer_class = GetMessageSerializer
+    filter_backends = (filters.OrderingFilter, filters.SearchFilter)
+    search_fields = ('content',)
+    ordering = ('-time',)
 
 
 class PostMessage(generics.CreateAPIView):
     serializer_class = PostMessageSerializer
+    parser_classes = (parsers.JSONParser,)
 
 
+class PostMessageDev(generics.CreateAPIView):
+    serializer_class = PostMessageSerializer
+    parser_classes = (parsers.FormParser,)