From b6a66a1457215e0813938690788ef7e1783a9c22 Mon Sep 17 00:00:00 2001 From: ladeng07 <40017222+ladeng07@users.noreply.github.com> Date: Wed, 27 Apr 2022 21:56:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=90=88=E5=B9=B6+?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=20=E4=BF=AE=E6=94=B9=E4=BA=86history?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 76 ++++++++++++++++++++++++++++++++------ ITShowPlatform/settings.py | 4 +- ITShowPlatform/urls.py | 1 + history/urls.py | 2 +- 4 files changed, 68 insertions(+), 15 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e50ad7b..43975b9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,23 +10,32 @@ + + + + + - + + + + + + + - - - - - - + + + + + + @@ -118,7 +141,19 @@ - + + + @@ -127,7 +162,8 @@ - @@ -138,6 +174,10 @@ + + + + @@ -166,6 +206,14 @@ + + + + + + + + @@ -174,13 +222,17 @@ - + - + + + + + \ No newline at end of file diff --git a/ITShowPlatform/settings.py b/ITShowPlatform/settings.py index 5b796f0..eb7b1de 100644 --- a/ITShowPlatform/settings.py +++ b/ITShowPlatform/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-0cn#v4ei2(^n+txyh4%3d5sllz6mknz#7t$!cq-d!ly*_rwvh2 # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["*"] # Application definition @@ -47,7 +47,7 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', + #'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', diff --git a/ITShowPlatform/urls.py b/ITShowPlatform/urls.py index 38184d1..61cc431 100644 --- a/ITShowPlatform/urls.py +++ b/ITShowPlatform/urls.py @@ -25,6 +25,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path('v1/api/', include('comments.urls')), path('v1/api/', include('history.urls')), + path('v1/api/', include('enroll.urls')), path(r'^api-auth/', include('rest_framework.urls')), re_path(r'^media/(?P.*)', serve, {"document_root": settings.MEDIA_ROOT}), ] diff --git a/history/urls.py b/history/urls.py index 6d8989b..d0da8d0 100644 --- a/history/urls.py +++ b/history/urls.py @@ -6,5 +6,5 @@ from history.views import DepartmentViewSet, MemberViewSet, HistoryViewSet urlpatterns = [ path('department/', DepartmentViewSet.as_view()), path('member/', MemberViewSet.as_view()), - path('history_list/', HistoryViewSet.as_view()), + path('history/', HistoryViewSet.as_view()), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)