From 916071814ae60cc5f740417305303282be33c7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Wed, 20 Dec 2023 23:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=201.=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=90=8E,=E7=BB=A7=E7=BB=AD=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py | 6 ++++++
 web/src/utils/service.ts        | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 590c144..fb79ad6 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -154,6 +154,11 @@ STATICFILES_DIRS = [
 MEDIA_ROOT = "media"  # 项目下的目录
 MEDIA_URL = "/media/"  # 跟STATIC_URL类似，指定用户可以通过这个url找到文件
 
+#添加以下代码以后就不用写{% load staticfiles %}，可以直接引用
+STATICFILES_FINDERS = (
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder"
+)
 # 收集静态文件，必须将 MEDIA_ROOT,STATICFILES_DIRS先注释
 # python manage.py collectstatic
 # STATIC_ROOT=os.path.join(BASE_DIR,'static')
@@ -402,5 +407,6 @@ PLUGINS_URL_PATTERNS = []
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理
+from dvadmin_social_auth.settings import *
 # ...
 # ********** 一键导入插件配置结束 **********
diff --git a/web/src/utils/service.ts b/web/src/utils/service.ts
index 6253446..aaed7ff 100644
--- a/web/src/utils/service.ts
+++ b/web/src/utils/service.ts
@@ -96,12 +96,13 @@ function createService() {
 						return dataAxios;
 					case 4000:
 						errorCreate(`${dataAxios.msg}: ${response.config.url}`);
-						return dataAxios;
+						break;
 					default:
 						// 不是正确的 code
 						errorCreate(`${dataAxios.msg}: ${response.config.url}`);
-						return dataAxios;
+						break;
 				}
+				return Promise.reject();
 			}
 		},
 		(error) => {