Inicio Explorar Axuda
Iniciar sesión
214
/
st-cloud
5
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

fix bugs

ignalxy %!s(int64=4) %!d(string=hai) anos
pai
3acaac5ec1
achega
80687d5185
Modificáronse 8 ficheiros con 31 adicións e 10 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 2 2
      account/models.py
  2. 1 0
      account/views.py
  3. BIN=BIN
      db.sqlite3
  4. 3 2
      file/views.py
  5. 2 2
      folder/models.py
  6. 1 1
      folder/urls.py
  7. 3 3
      folder/views.py
  8. 19 0
      templates/get_root_folder.html

+ 2 - 2
account/models.py
Ver ficheiro 

@@ -81,8 +81,8 @@ class User(models.Model):
 
 
 
 
 
 def get_user(request):
 
 def get_user(request):
 
-    username = request.data.get('username', '')
 
-    token = request.data.get('token', '')
 
+    username = request.POST.get('username', '')
 
+    token = request.POST.get('token', '')
 
     try:
 
     try:
 
         user = User.objects.get(username=username)
 
         user = User.objects.get(username=username)
 
         if user.check_token(token):
 
         if user.check_token(token):

+ 1 - 0
account/views.py
Ver ficheiro 

@@ -132,6 +132,7 @@ def check_token(request):
 
         print('用户不存在')
 
         print('用户不存在')
 
         return JsonResponse({'code': 302, 'error': '用户不存在'})
 
         return JsonResponse({'code': 302, 'error': '用户不存在'})
 
     if token and user.check_token(token):
 
     if token and user.check_token(token):
 
+        print('验证码有效')
 
         return JsonResponse({'code': 200})
 
         return JsonResponse({'code': 200})
 
     else:
 
     else:
 
         return JsonResponse({'code': 303, 'error': '验证码无效'})
 
         return JsonResponse({'code': 303, 'error': '验证码无效'})

BIN=BIN
db.sqlite3
Ver ficheiro


+ 3 - 2
file/views.py
Ver ficheiro 

@@ -32,7 +32,7 @@ def upload_file(request):
 
             return JsonResponse({'code': 401, 'error': '文件不存在'})
 
             return JsonResponse({'code': 401, 'error': '文件不存在'})
 
         file_type = judge_filepath(file_obj.name.split('.')[-1].lower()) if '.' in file_obj.name else ''
 
         file_type = judge_filepath(file_obj.name.split('.')[-1].lower()) if '.' in file_obj.name else ''
 
         update_time = timezone.now().strftime("%Y-%m-%d %H:%M:%S")
 
         update_time = timezone.now().strftime("%Y-%m-%d %H:%M:%S")
 
-        file_size = format_size(file_obj.size)
 
+        file_size = file_obj.size
 
         file_name = file_obj.name
 
         file_name = file_obj.name
 
         folder_id = request.POST.get('folder_id')
 
         folder_id = request.POST.get('folder_id')
 
         try:
 
         try:
 
@@ -44,7 +44,8 @@ def upload_file(request):
 
                                    folder=folder,
 
                                    folder=folder,
 
                                    update_time=update_time,
 
                                    update_time=update_time,
 
                                    file_size=file_size,
 
                                    file_size=file_size,
 
-                                   file_type=file_type)
 
+                                   file_type=file_type,
 
+                                   owner=user)
 
         # TODO: 文件hash
 
         # TODO: 文件hash
 
         file_dir = BASE_DIR + '/' + file.file_id
 
         file_dir = BASE_DIR + '/' + file.file_id
 
         with open(file_dir, 'wb+') as f:
 
         with open(file_dir, 'wb+') as f:

+ 2 - 2
folder/models.py
Ver ficheiro 

@@ -25,8 +25,8 @@ class Folder(models.Model):
 
     def to_json(self):
 
     def to_json(self):
 
         return {'folder_id': self.folder_id, 'folder_name': self.folder_name, 'father_folder_id': self.father_folder_id}
 
         return {'folder_id': self.folder_id, 'folder_name': self.folder_name, 'father_folder_id': self.father_folder_id}
 
 
 
-    def __unicode__(self):
 
-        return self.folder_id
 
+    def __str__(self):
 
+        return str(self.folder_id)
 
 
 
 
 
 # 信号接收函数，每当新建User实例的时候自动调用
 
 # 信号接收函数，每当新建User实例的时候自动调用

+ 1 - 1
folder/urls.py
Ver ficheiro 

@@ -6,5 +6,5 @@ urlpatterns = [
 
     path('folder_list/', views.folder_list, name='folder_list'),
 
     path('folder_list/', views.folder_list, name='folder_list'),
 
     path('add_folder/', views.add_folder, name='add_folder'),
 
     path('add_folder/', views.add_folder, name='add_folder'),
 
     path('delete_folder/', views.delete_folder, name='delete_folder'),
 
     path('delete_folder/', views.delete_folder, name='delete_folder'),
 
-    path('get_first_folder/', views.get_root_folder, name='get_first_folder'),
 
+    path('get_root_folder/', views.get_root_folder, name='get_root_folder'),
 
 ]
 
 ]

+ 3 - 3
folder/views.py
Ver ficheiro 

@@ -19,9 +19,9 @@ def get_root_folder(request):
 
     if request.method == 'POST':
 
     if request.method == 'POST':
 
         # 获取所有根文件夹id
 
         # 获取所有根文件夹id
 
         user = get_user(request)
 
         user = get_user(request)
 
-        return JsonResponse({'code': 200, 'root_folder_id': user.profile.root_folder_id})
 
+        return JsonResponse({'code': 200, 'root_folder_id': user.get_root_folder().folder_id})
 
     elif request.method == 'GET' and DEBUG:
 
     elif request.method == 'GET' and DEBUG:
 
-        return render(request, 'folder_list.html')
 
+        return render(request, 'get_root_folder.html')
 
     else:
 
     else:
 
         return HttpResponse(status=400)
 
         return HttpResponse(status=400)
 
 
 
@@ -68,7 +68,7 @@ def add_folder(request):
 
             return JsonResponse({'code': '421', 'error': '上级文件夹不存在'})
 
             return JsonResponse({'code': '421', 'error': '上级文件夹不存在'})
 
 
 
         folder_name = data.get('folder_name')
 
         folder_name = data.get('folder_name')
 
-        Folder.objects.create(folder_name=folder_name, father_folder=father_folder)
 
+        Folder.objects.create(folder_name=folder_name, father_folder=father_folder, owner=user)
 
         return JsonResponse({'code': '200'})
 
         return JsonResponse({'code': '200'})
 
     elif request.method == 'GET' and DEBUG:
 
     elif request.method == 'GET' and DEBUG:
 
         return render(request, 'add_folder.html')
 
         return render(request, 'add_folder.html')

+ 19 - 0
templates/get_root_folder.html
Ver ficheiro 

@@ -0,0 +1,19 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-cn">
 
+    <div>
 
+        <form method="post" action=".">
 
+            {% csrf_token %}
 
+            <!-- 用户名 -->
 
+            <div>
 
+                <label for="username">用户名</label>
 
+                <input type="text" id="username" name="username">
 
+            </div>
 
+            <div>
 
+                <label for="token">token</label>
 
+                <input type="text" id="token" name="token">
 
+            </div>
 
+            <!-- 提交按钮 -->
 
+            <button type="submit">提交</button>
 
+        </form>
 
+    </div>
 
+</html>