新增响应式瀑布流

Server01/migrations/0012_image_height_image_width.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1 on 2023-07-27 05:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("Server01", "0011_remove_user_followed"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="image",
+            name="height",
+            field=models.IntegerField(default=0, verbose_name="图片高度"),
+        ),
+        migrations.AddField(
+            model_name="image",
+            name="width",
+            field=models.IntegerField(default=0, verbose_name="图片宽度"),
+        ),
+    ]

Server01/models.py

@@ -40,6 +40,8 @@ def delete(self, *args, **kwargs):
 class Image(models.Model):
     post = models.ForeignKey(Post, on_delete=models.CASCADE, related_name='imgs')
     imagePath = models.CharField(max_length=256, verbose_name='帖子图片')
+    height = models.IntegerField(default=0, verbose_name='图片高度')
+    width = models.IntegerField(default=0, verbose_name='图片宽度')
 
 
 class Comment(models.Model):

Server01/util/auxiliaryFuction.py

@@ -26,6 +26,10 @@ def combine_index_post(posts):
             'title': post.title,
             'id': post.id,
             'img': imgs[0].imagePath,
+            'img_info': {
+                'height': imgs[0].height,
+                'width': imgs[0].width,
+            },
             'user': {
                 'id': post.user.id,
                 'username': post.user.username,

Server01/util/verifyJWT.py

@@ -24,11 +24,6 @@ def wrapper(request, *args, **kwargs):
         except jwt.InvalidTokenError:
             error_message = {'error': '非法的token'}
             return JsonResponse(error_message, status=401)
-        except AttributeError as e:
-            print(e)
-            error_message = {'error': '未查询到登录信息，请重新登录'}
-            return JsonResponse(error_message, status=403)
-
     return wrapper
 
 

Server01/views/comment.py

@@ -64,4 +64,4 @@ def load_reply(request):
             } for comment in filter_replies if comment
         ]
         return JsonResponse({'info': data, 'count': len(data)}, status=200)
-    return JsonResponse({'error': '错误的操作'}, status=404)
+    return JsonResponse({'error': '错误的操作'}, status=404)

Server01/views/post.py

@@ -1,5 +1,6 @@
 import json
 
+from PIL import Image
 from django.db.models import Q
 from django.http import JsonResponse
 
@@ -14,6 +15,9 @@ def upload_post(request, payload):
     file = request.FILES['file']
     id = request.POST.get('id')
     file_path = SYSTEM_PATH + 'post/' + str(id) + '-' + file.name
+    with Image.open(file) as img:
+        image_height = img.height
+        image_width = img.width
     with open(file_path, 'wb') as destination:
         for chunk in file.chunks():
             destination.write(chunk)
@@ -23,7 +27,7 @@ def upload_post(request, payload):
     }
     post = models.Post.objects.filter(id=id).first()
     if post:
-        models.Image.objects.create(imagePath=result['filepath'], post=post)
+        models.Image.objects.create(imagePath=result['filepath'], post=post, height=image_height, width=image_width)
         return JsonResponse({'data': 'success'}, status=200)
     return JsonResponse({'error': '错误的操作'}, status=401)
 
@@ -79,7 +83,7 @@ def query_post_index(request):
         )
     else:
         posts = models.Post.objects
-    posts = filter_querySet(posts, offset, limit=10)
+    posts = filter_querySet(posts, offset, limit=5)
     if posts:
         return JsonResponse({'info': list(combine_index_post(posts))}, status=200)
     # 没有内容了
@@ -116,7 +120,11 @@ def post_delete(request, payload):
     data = json.loads(request.body)
     id = data['id']
     post = models.Post.objects.filter(id=id).first()
-    if post.user.id == payload['user_id']:
-        post.delete()
-        return JsonResponse({'success': '帖子删除成功'}, status=200)
-    return JsonResponse({'error': '错误操作'}, status=404)
+    if post:
+        if post.user.id == payload['user_id']:
+            post.delete()
+            return JsonResponse({'success': '帖子删除成功'}, status=200)
+        print(payload)
+    print(data, post)
+    #     return JsonResponse({'error': '错误操作'}, status=404)
+    # return JsonResponse({'error': '未查询到帖子信息'}, status=404)

Server01/views/user.py

@@ -4,9 +4,9 @@
 
 import Server01.models as models
 from Server01.util.auxiliaryFuction import check_email, combine_index_post, check_and_delete, filter_querySet, \
-    convert_to_timezone, get_user_post_info, get_user_info
+    get_user_post_info, get_user_info
 from Server01.util.verifyJWT import create_token, authenticate_request
-from webServer.settings import SYSTEM_PATH, TIME_ZONE
+from webServer.settings import SYSTEM_PATH
 
 
 # 用户登录
@@ -202,7 +202,3 @@ def user_control_index(request, payload):
         total = user_data.count()
         return JsonResponse({'info': info, 'total': total}, status=200)
     return JsonResponse({'error': '错误的操作'}, status=404)
-
-
-
-