From a7f7c27b283b30dac1dea84624db0a1df16d70b8 Mon Sep 17 00:00:00 2001
From: bettleChen <2207153529@qq.com>
Date: Fri, 8 Sep 2023 10:14:21 +0800
Subject: [PATCH] update code

---
 EduSystemServer/EduSystemServer/settings.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/EduSystemServer/EduSystemServer/settings.py b/EduSystemServer/EduSystemServer/settings.py
index b34a3d0..8d79069 100644
--- a/EduSystemServer/EduSystemServer/settings.py
+++ b/EduSystemServer/EduSystemServer/settings.py
@@ -12,17 +12,13 @@ https://docs.djangoproject.com/en/2.2/ref/settings/
 
 import os
 
-<<<<<<< Updated upstream
 
-=======
 CORS_ALLOW_ORIGIN_WHITELIST = [
     "http://localhost:8080",  # 允许访问的来源
     "http://localhost:8000",  # 允许访问的来源
     # 可以继续添加其他允许的来源
 ]
 
-CORS_ALLOW_CREDENTIALS = True  # 允许跨域请求携带凭据（例如Cookies）
->>>>>>> Stashed changes
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -65,7 +61,6 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'corsheaders.middleware.CorsMiddleware',
-<<<<<<< Updated upstream
     'django.middleware.common.CommonMiddleware',
     # 'API.middle.AuthMiddleware',
 ]
@@ -87,12 +82,6 @@ CORS_ALLOW_HEADERS = (
 )
 
 
-=======
-    # 'API.middle.AuthMiddleware',
-]
-
->>>>>>> Stashed changes
-
 ROOT_URLCONF = 'EduSystemServer.urls'
 
 TEMPLATES = [