From f729114cf90819fe2bb312aa6677318c92f5789c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 29 Mar 2021 02:33:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?!8=20=E9=85=8D=E7=BD=AEdocker-compose.yml?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=20*=20!7=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AEdocker-compose.yml=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 6 + .../apps/vadmin/utils/request_util.py | 6 +- .../components/CommonStaticTable/index.vue | 465 ------------------ 3 files changed, 10 insertions(+), 467 deletions(-) delete mode 100644 dvadmin-ui/src/components/CommonStaticTable/index.vue diff --git a/docker-compose.yml b/docker-compose.yml index 2df19eb..fb3d0fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -85,6 +85,8 @@ services: volumes: - ./dvadmin-backend:/dvadmin-backend - ./logs/log:/var/log + env_file: + - ./.env ports: - "8000:8000" expose: @@ -115,3 +117,7 @@ services: restart: always networks: - dvadmin_net + +networks: + dvadmin_net: + driver: bridge diff --git a/dvadmin-backend/apps/vadmin/utils/request_util.py b/dvadmin-backend/apps/vadmin/utils/request_util.py index 6952cf0..24965ed 100644 --- a/dvadmin-backend/apps/vadmin/utils/request_util.py +++ b/dvadmin-backend/apps/vadmin/utils/request_util.py @@ -26,8 +26,10 @@ def get_request_user(request, authenticate=True): user: AbstractBaseUser = getattr(request, 'user', None) if user and user.is_authenticated: return user - user, tokrn = OpAuthJwtAuthentication().authenticate(request) - print(22, user) + try: + user, tokrn = OpAuthJwtAuthentication().authenticate(request) + except Exception as e: + pass return user or AnonymousUser() diff --git a/dvadmin-ui/src/components/CommonStaticTable/index.vue b/dvadmin-ui/src/components/CommonStaticTable/index.vue deleted file mode 100644 index fe92660..0000000 --- a/dvadmin-ui/src/components/CommonStaticTable/index.vue +++ /dev/null @@ -1,465 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - {{ field.label }} - - - - - - - - - - - - - - - - - - - - - - - 已选择:{{ multipleSelection.length }}条 - 清空 - - - 总计:{{ filterData.length }}条 - - - - - - - From 987c147fd86d32e933a43064184eb541461322a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Mon, 29 Mar 2021 02:38:39 +0800 Subject: [PATCH 2/2] CommonStaticTable --- .../components/CommonStaticTable/index.vue | 465 ++++++++++++++++++ 1 file changed, 465 insertions(+) create mode 100644 dvadmin-ui/src/components/CommonStaticTable/index.vue diff --git a/dvadmin-ui/src/components/CommonStaticTable/index.vue b/dvadmin-ui/src/components/CommonStaticTable/index.vue new file mode 100644 index 0000000..fe92660 --- /dev/null +++ b/dvadmin-ui/src/components/CommonStaticTable/index.vue @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ field.label }} + + + + + + + + + + + + + + + + + + + + + + + 已选择:{{ multipleSelection.length }}条 + 清空 + + + 总计:{{ filterData.length }}条 + + + + + + +