From 8a8ed90eef14981997c52823a28d179b0d3faf46 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Fri, 4 Mar 2022 18:11:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E7=95=99=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84jms=5Foidc=5Frp=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0009_auto_20220304_1736.py | 17 ----------------- apps/jumpserver/settings/base.py | 1 + requirements/requirements.txt | 1 + 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 apps/authentication/migrations/0009_auto_20220304_1736.py diff --git a/apps/authentication/migrations/0009_auto_20220304_1736.py b/apps/authentication/migrations/0009_auto_20220304_1736.py deleted file mode 100644 index 5a4c87b25..000000000 --- a/apps/authentication/migrations/0009_auto_20220304_1736.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.14 on 2022-03-04 09:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('authentication', '0008_superconnectiontoken'), - ] - - operations = [ - # 删除 jms_oidc_rp 中的Model - migrations.RunSQL( - sql='DROP TABLE `jms_oidc_rp_oidcuser` CASCADE;', - ), - ] diff --git a/apps/jumpserver/settings/base.py b/apps/jumpserver/settings/base.py index d5542b949..d81089a6d 100644 --- a/apps/jumpserver/settings/base.py +++ b/apps/jumpserver/settings/base.py @@ -57,6 +57,7 @@ INSTALLED_APPS = [ 'notifications.apps.NotificationsConfig', 'rbac.apps.RBACConfig', 'common.apps.CommonConfig', + 'jms_oidc_rp', 'rest_framework', 'rest_framework_swagger', 'drf_yasg', diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a60d7019d..97ee5b2be 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -95,6 +95,7 @@ ipython huaweicloud-sdk-python==1.0.21 django-redis==4.11.0 python-redis-lock==3.7.0 +jumpserver-django-oidc-rp==0.3.7.8 django-mysql==3.9.0 gmssl==3.2.1 azure-mgmt-compute==4.6.2