diff --git a/backend/application/asgi.py b/backend/application/asgi.py index 5a5c987..14aacec 100644 --- a/backend/application/asgi.py +++ b/backend/application/asgi.py @@ -8,21 +8,25 @@ https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ """ import os -from django.core.asgi import get_asgi_application from channels.auth import AuthMiddlewareStack +from channels.security.websocket import AllowedHostsOriginValidator from channels.routing import ProtocolTypeRouter, URLRouter +from django.core.asgi import get_asgi_application + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings') os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true" - - http_application = get_asgi_application() + from application.routing import websocket_urlpatterns + application = ProtocolTypeRouter({ - "http":http_application, - 'websocket': AuthMiddlewareStack( - URLRouter( - websocket_urlpatterns #指明路由文件是devops/routing.py + "http": http_application, + 'websocket': AllowedHostsOriginValidator( + AuthMiddlewareStack( + URLRouter( + websocket_urlpatterns # 指明路由文件是devops/routing.py + ) ) ), -}) \ No newline at end of file +}) diff --git a/backend/application/settings.py b/backend/application/settings.py index d4161d6..1641939 100644 --- a/backend/application/settings.py +++ b/backend/application/settings.py @@ -4,10 +4,10 @@ Django settings for application project. Generated by 'django-admin startproject' using Django 3.2.3. For more information on this file, see -https://docs.djangoproject.com/en/3.2/topics/settings/ +https://docs.djangoproject.com/en/4.1/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.2/ref/settings/ +https://docs.djangoproject.com/en/4.1/ref/settings/ """ import os @@ -274,9 +274,6 @@ REST_FRAMEWORK = { ), "DEFAULT_PERMISSION_CLASSES": [ "rest_framework.permissions.IsAuthenticated", # 只有经过身份认证确定用户身份才能访问 - # 'rest_framework.permissions.IsAdminUser', # is_staff=True才能访问 —— 管理员(员工)权限 - # 'rest_framework.permissions.AllowAny', # 允许所有 - # 'rest_framework.permissions.IsAuthenticatedOrReadOnly', # 有身份 或者 只读访问(self.list,self.retrieve) ], "EXCEPTION_HANDLER": "dvadmin.utils.exception.CustomExceptionHandler", # 自定义的异常处理 } diff --git a/web/src/App.vue b/web/src/App.vue index f83735f..f3709ea 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -9,7 +9,7 @@ diff --git a/web/src/layout/navBars/breadcrumb/user.vue b/web/src/layout/navBars/breadcrumb/user.vue index 43ee623..9c7f2ee 100644 --- a/web/src/layout/navBars/breadcrumb/user.vue +++ b/web/src/layout/navBars/breadcrumb/user.vue @@ -39,7 +39,7 @@