diff --git a/App/views.py b/App/views.py index 5f560c8..741e8f3 100644 --- a/App/views.py +++ b/App/views.py @@ -112,7 +112,7 @@ def dashboard(request, type): t = 6 if type == 'login': data = getData(username, t) - table = Login.objects.filter(username=username).order_by('-login_time').all()[:30] + table = Login.objects.order_by('-login_time').all()[:30] elif type == 'docs': data = getData(username, t, 'docs') table = Upload.objects.filter(username=username).order_by('-upload_time').all()[:100] @@ -225,7 +225,6 @@ def getData(username, time, type='login'): data.update({str(date): videoUpload.objects.filter(video_time__startswith=date).count()}) elif type == 'package': data.update({str(date): packageUpload.objects.filter(package_time__startswith=date).count()}) - print(data) return data @@ -275,7 +274,6 @@ def checkTask(request, id): if request.method == 'POST': url = request.get_raw_uri().split('?')[0] if eval(request.COOKIES.get(f'sign{id}', '{}')).get('url') != url: - print(request.COOKIES,url) task = Task.objects.get(id=id) jsondata = json.loads(task.task_content) jsondata['userlist'][request.GET.get('name')] = {'status': '已完成', 'update_time': str(datetime.datetime.now())} diff --git a/djangoProject/settings.py b/djangoProject/settings.py index e8ead32..0874531 100644 --- a/djangoProject/settings.py +++ b/djangoProject/settings.py @@ -79,7 +79,7 @@ DATABASES = { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'object', 'USER': 'root', - 'PASSWORD': 'Qianfeng@123', + 'PASSWORD': 'QianFeng@123', 'HOST': 'mysql.server' } @@ -137,7 +137,6 @@ STATIC_URL = '/staticfiles/' STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'static'), os.path.join(BASE_DIR, 'upload'), - os.path.join(BASE_DIR, 'staticfiles'), ) STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') # Default primary key field type diff --git a/docker-compose.yml b/docker-compose.yml index 3660e04..18e3c84 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,9 @@ services: links: - db:mysql.server - redis:redis.server + volumes: + - ../upload:/webapp/upload + - /data/nextcloud/app/data/admin/files/随堂视频:/data/nextcloud/app/data/admin/files/随堂视频 depends_on: - db - redis diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2ac01e2..2dbb0dc 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -7,4 +7,5 @@ gunicorn --workers 8 \ --bind 0.0.0.0:8000 \ djangoProject.wsgi:application \ --log-level info \ ---access-logfile /var/log/myblog.log \ No newline at end of file +--access-logfile /var/log/myblog.log \ +--timeout 3600 \ No newline at end of file diff --git a/templates/nav/dashboard.html b/templates/nav/dashboard.html index 7446909..4cb314b 100644 --- a/templates/nav/dashboard.html +++ b/templates/nav/dashboard.html @@ -91,6 +91,7 @@ 登录时间 + 用户 登录IP 国家 省 @@ -101,6 +102,7 @@ {% for i in table %} {{ i.login_time }} + {{ i.username }} {{ i.client_addr }} {{ i.country }} {{ i.region }} diff --git a/templates/nav/videolist.html b/templates/nav/videolist.html index 13a9310..282dadf 100644 --- a/templates/nav/videolist.html +++ b/templates/nav/videolist.html @@ -37,11 +37,11 @@
-
{{ i.video_title }}
- 文件大小:{{ i.video_size|filesizeformat }}
- 上传用户:{{ i.username }}
- 上传时间:{{ i.video_time }}
- 点击下载 +
{{ i.video_title }}
+ 文件大小:{{ i.video_size|filesizeformat }}
+ 上传用户:{{ i.username }}
+ 上传时间:{{ i.video_time }}
+ 点击下载

本视频由千锋云计算持续维护,加速通道正在开发当中。