Browse Source

class friend提交
将返回改为字典

zoe 3 years ago
parent
commit
f223508ddc
8 changed files with 17 additions and 14 deletions
  1. 1 1
      .idea/MeChat.iml
  2. 1 1
      .idea/misc.xml
  3. 1 0
      MeChat/settings.py
  4. 1 2
      friends/urls.py
  5. 10 10
      friends/views.py
  6. BIN
      venv/Scripts/python.exe
  7. BIN
      venv/Scripts/pythonw.exe
  8. 3 0
      venv/pyvenv.cfg

+ 1 - 1
.idea/MeChat.iml

@@ -14,7 +14,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.9 (python)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

+ 1 - 1
.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (python)" project-jdk-type="Python SDK" />
   <component name="PyCharmProfessionalAdvertiser">
     <option name="shown" value="true" />
   </component>

+ 1 - 0
MeChat/settings.py

@@ -37,6 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'chat',
     'account',
+    'friends',
 ]
 
 MIDDLEWARE = [

+ 1 - 2
friends/urls.py

@@ -2,9 +2,8 @@ from django.urls import path, include
 from django.views.generic.base import TemplateView
 from . import views
 
-
 urlpatterns = [
-    path("Friend/add", views.addFriend),
+    # path("Friend/add", views.addFriend),
     path("friendsList/", views.friendsList),
     path("friendsList/<int:pk>", views.friendDetail),
     path("friend/delete", views.deleteFriend),

+ 10 - 10
friends/views.py

@@ -14,7 +14,7 @@ def more_clean(request, form):
             data = user_login_form.cleaned_data
             return data
     else:
-        response = ['illegal input']
+        response = {'result': 'illegal input'}
         return HttpResponse(json.dumps(response))
 
 
@@ -23,14 +23,14 @@ def more_clean(request, form):
 def friendsList(request):
     data = more_clean(request, UserListForm)
     if data.get('token') != 'token':
-        response = ['there has a mistake, please provide illegal token']
+        response = {'result': 'there has a mistake, please provide illegal token'}
         return HttpResponse(json.dumps(response))
     else:
         try:
             friendsTemp = friends.objects.filter(whomfriend=data['username'])
             return HttpResponse(json.dumps(friendsTemp))
         except friends.DoesNotExist:
-            response = ['this user do not exist']
+            response = {'result': 'this user do not exist'}
             return HttpResponse(json.dumps(response))
 
 
@@ -47,10 +47,10 @@ def acceptFriend(request):
         try:
             friends.objects.create(username=data["username"], whomfriend=data["otherUsername"], token=data["token"],
                                    status=1)
-            response = ["add successfully"]
+            response = {'result': "add successfully"}
             return HttpResponse(json.dumps(response))
         except:
-            response = ["add failed"]
+            response = {'result': "add failed"}
             return HttpResponse(json.dumps(response))
 
 
@@ -63,14 +63,14 @@ def friendDetail(request, pk):
         friendsTemp = friends.objects.get(whomfriend=loginUserid, userid=pk)
 
     except friends.DoesNotExist:
-        response = ["do not exist"]
+        response = {'result': "do not exist"}
         return HttpResponse(json.dumps(response))
 
     if len(friendsTemp):
-        response = [friendsTemp]
+        response = {"data": friendsTemp, "result": "好友列表"}
         return HttpResponse(json.dumps(response))
     else:
-        response = ["wrong"]
+        response = {"result": "wrong"}
         return HttpResponse(json.dumps(response))
 
 
@@ -81,8 +81,8 @@ def deleteFriend(request):
         tempFriend = friends.objects.get(
             username=data["username"], whomfriend=data["otherUsername"])
         tempFriend.clear()
-        response = ["delete success"]
+        response = {"result": "delete success"}
         return HttpResponse(json.dumps(response))
     except:
-        response = ["delete failed"]
+        response = {"result": "delete failed"}
         return JsonResponse(response)

BIN
venv/Scripts/python.exe


BIN
venv/Scripts/pythonw.exe


+ 3 - 0
venv/pyvenv.cfg

@@ -0,0 +1,3 @@
+home = C:\Users\12499\AppData\Local\Programs\Python\Python39
+include-system-site-packages = false
+version = 3.9.5