fix bugs

account/utils.py

@@ -1,10 +1,9 @@
 from string import ascii_letters, digits, printable
 
-from account.models import User
-
 
 def auth_with_username_or_email(username, password):
     password = encode_password(password)
+    from account.models import User
     if '@' in username:
         user = User.objects.get(email=username, password=password)
     else:

file/admin.py

@@ -4,7 +4,7 @@ from .models import File
 
 # Register your models here.
 class FileAdmin(admin.ModelAdmin):
-    list_display = ["file_id", "file_name", "father_folder", "update_time", "file_type", "file_size", "owner", "group"]
+    list_display = ["file_id", "file_name", "father_folder", "upload_time", "file_type", "owner", "group"]
 
 
 admin.site.register(File, FileAdmin)

file/views.py

@@ -19,7 +19,7 @@ import base64
 def upload_file(request):
     data = request.POST
     user = get_user(request)
-    key = data.get('token')
+    key = data.get('key')
     file_b64 = data.get('file_b64')
     file_name = data.get('file_name')
     file_type = judge_filepath(file_name.split('.')[-1].lower()) if '.' in file_name else ''

utils/crypto.py

@@ -58,7 +58,7 @@ def secure_transport(view_func):
             for p in map(lambda s: s.split('='), plain_text.split('&')):
                 loaded[p[0]] = p[1]
         dec_request = request
-        dec_request.POST = {**request.POST, **loaded}
+        dec_request.POST = {'key': key, **request.POST, **loaded}
 
         raw_response = view_func(dec_request, *args, **kwargs)