Merge branch 'master' of https://e.coding.net/ctcdevteam/examtest

.gitignore

@@ -12,6 +12,8 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 **/*.log
+test_server/media/*
+test_server/quota.dat
 
 tests/**/coverage/
 tests/e2e/reports

docs/ISsi1uCIiP.txt

@@ -0,0 +1 @@
+4f04a87f0f966902d03e402267e5c805

test_server/server/settings.py

@@ -134,6 +134,7 @@ USE_L10N = True
 USE_TZ = True
 
 
+# Static files (CSS, JavaScript, Images)
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
@@ -258,4 +259,4 @@ LOGGING = {
             'propagate': True
         },
     }
-}
+}

test_server/server/urls.py

@@ -24,6 +24,23 @@ from utils.file import UploadFileView
 from utils.view import redirect
 
 urlpatterns = [
+    path('rbac/', include('rbac.urls')),
+    path('vod/', include('vod.urls')),
+    path('develop/', include('develop.urls')),
+    path('crm/', include('crm.urls')),
+    path('question/', include('question.urls')),
+    path('examtest/', include('examtest.urls')),
+    path('cms/', include('cms.urls')),
+    path('analyse/', include('analyse.urls')),
+    path('qtest/', include('qtest.urls')),
+    path('token/', obtain_jwt_token),
+    path('token/refresh/', refresh_jwt_token),
+    path('token/verify/', verify_jwt_token),
+    path('token/remove/', UserLogoutView.as_view()),
+    path('uploadfile/', UploadFileView.as_view()),
+    path('redirect/',redirect),
+
+    
     path('api/rbac/', include('rbac.urls')),
     path('api/vod/', include('vod.urls')),
     path('api/develop/', include('develop.urls')),