From d92d462dab6050852d62bae3508f7700bbefe5ef Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 27 Jul 2018 16:54:40 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9A=82=E6=97=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=BA=9Burl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/urls.py | 5 +-- apps/users/urls/api_urls.py | 35 ++++++++---------- apps/users/urls/views_urls.py | 68 +++++++++++++++++------------------ 3 files changed, 51 insertions(+), 57 deletions(-) diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index 65de2eb4c..1631d6f72 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import re from django.conf.urls import url, include +from django.urls import path from django.conf import settings from django.conf.urls.static import static from rest_framework.response import Response @@ -58,7 +59,7 @@ def redirect_format_api(request, *args, **kwargs): v1_api_patterns = [ - url(r'^users/v1/', include('users.urls.api_urls', namespace='api-users')), + path('users/v1/', include('users.urls.api_urls', namespace='api-users')), url(r'^assets/v1/', include('assets.urls.api_urls', namespace='api-assets')), url(r'^perms/v1/', include('perms.urls.api_urls', namespace='api-perms')), url(r'^terminal/v1/', include('terminal.urls.api_urls', namespace='api-terminal')), @@ -69,7 +70,7 @@ v1_api_patterns = [ ] app_view_patterns = [ - url(r'^users/', include('users.urls.views_urls', namespace='users')), + path('users/', include('users.urls.views_urls', namespace='users')), url(r'^assets/', include('assets.urls.views_urls', namespace='assets')), url(r'^perms/', include('perms.urls.views_urls', namespace='perms')), url(r'^terminal/', include('terminal.urls.views_urls', namespace='terminal')), diff --git a/apps/users/urls/api_urls.py b/apps/users/urls/api_urls.py index a5736a12a..32952b75e 100644 --- a/apps/users/urls/api_urls.py +++ b/apps/users/urls/api_urls.py @@ -3,7 +3,7 @@ # from __future__ import absolute_import -from django.conf.urls import url +from django.urls import path from rest_framework_bulk.routes import BulkRouter from .. import api @@ -15,26 +15,19 @@ router.register(r'groups', api.UserGroupViewSet, 'user-group') urlpatterns = [ - # url(r'', api.UserListView.as_view()), - url(r'^token/$', api.UserToken.as_view(), name='user-token'), - url(r'^connection-token/$', api.UserConnectionTokenApi.as_view(), name='connection-token'), - url(r'^profile/$', api.UserProfile.as_view(), name='user-profile'), - url(r'^auth/$', api.UserAuthApi.as_view(), name='user-auth'), - url(r'^otp/auth/$', api.UserOtpAuthApi.as_view(), name='user-otp-auth'), - url(r'^users/(?P[0-9a-zA-Z\-]{36})/password/$', - api.ChangeUserPasswordApi.as_view(), name='change-user-password'), - url(r'^users/(?P[0-9a-zA-Z\-]{36})/password/reset/$', - api.UserResetPasswordApi.as_view(), name='user-reset-password'), - url(r'^users/(?P[0-9a-zA-Z\-]{36})/pubkey/reset/$', - api.UserResetPKApi.as_view(), name='user-public-key-reset'), - url(r'^users/(?P[0-9a-zA-Z\-]{36})/pubkey/update/$', - api.UserUpdatePKApi.as_view(), name='user-public-key-update'), - url(r'^users/(?P[0-9a-zA-Z\-]{36})/unblock/$', - api.UserUnblockPKApi.as_view(), name='user-unblock'), - url(r'^users/(?P[0-9a-zA-Z\-]{36})/groups/$', - api.UserUpdateGroupApi.as_view(), name='user-update-group'), - url(r'^groups/(?P[0-9a-zA-Z\-]{36})/users/$', - api.UserGroupUpdateUserApi.as_view(), name='user-group-update-user'), + # path(r'', api.UserListView.as_view()), + path('token/', api.UserToken.as_view(), name='user-token'), + path('connection-token/', api.UserConnectionTokenApi.as_view(), name='connection-token'), + path('profile/', api.UserProfile.as_view(), name='user-profile'), + path('auth/', api.UserAuthApi.as_view(), name='user-auth'), + path('otp/auth/', api.UserOtpAuthApi.as_view(), name='user-otp-auth'), + path('users//password/', api.ChangeUserPasswordApi.as_view(), name='change-user-password'), + path('users//password/reset/', api.UserResetPasswordApi.as_view(), name='user-reset-password'), + path('users//pubkey/reset/', api.UserResetPKApi.as_view(), name='user-public-key-reset'), + path('users//pubkey/update/', api.UserUpdatePKApi.as_view(), name='user-public-key-update'), + path('users//unblock/', api.UserUnblockPKApi.as_view(), name='user-unblock'), + path('users//groups/', api.UserUpdateGroupApi.as_view(), name='user-update-group'), + path('groups//users/', api.UserGroupUpdateUserApi.as_view(), name='user-group-update-user'), ] urlpatterns += router.urls diff --git a/apps/users/urls/views_urls.py b/apps/users/urls/views_urls.py index 8052f1384..8e4fb531c 100644 --- a/apps/users/urls/views_urls.py +++ b/apps/users/urls/views_urls.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from django.conf.urls import url +from django.urls import path from .. import views @@ -8,45 +8,45 @@ app_name = 'users' urlpatterns = [ # Login view - url(r'^login/$', views.UserLoginView.as_view(), name='login'), - url(r'^logout/$', views.UserLogoutView.as_view(), name='logout'), - url(r'^login/otp/$', views.UserLoginOtpView.as_view(), name='login-otp'), - url(r'^password/forgot/$', views.UserForgotPasswordView.as_view(), name='forgot-password'), - url(r'^password/forgot/sendmail-success/$', views.UserForgotPasswordSendmailSuccessView.as_view(), name='forgot-password-sendmail-success'), - url(r'^password/reset/$', views.UserResetPasswordView.as_view(), name='reset-password'), - url(r'^password/reset/success/$', views.UserResetPasswordSuccessView.as_view(), name='reset-password-success'), + path('login/', views.UserLoginView.as_view(), name='login'), + path('logout/', views.UserLogoutView.as_view(), name='logout'), + path('login/otp/', views.UserLoginOtpView.as_view(), name='login-otp'), + path('password/forgot/', views.UserForgotPasswordView.as_view(), name='forgot-password'), + path('password/forgot/sendmail-success/', views.UserForgotPasswordSendmailSuccessView.as_view(), name='forgot-password-sendmail-success'), + path('password/reset/', views.UserResetPasswordView.as_view(), name='reset-password'), + path('password/reset/success/', views.UserResetPasswordSuccessView.as_view(), name='reset-password-success'), # Profile - url(r'^profile/$', views.UserProfileView.as_view(), name='user-profile'), - url(r'^profile/update/$', views.UserProfileUpdateView.as_view(), name='user-profile-update'), - url(r'^profile/password/update/$', views.UserPasswordUpdateView.as_view(), name='user-password-update'), - url(r'^profile/pubkey/update/$', views.UserPublicKeyUpdateView.as_view(), name='user-pubkey-update'), - url(r'^profile/pubkey/generate/$', views.UserPublicKeyGenerateView.as_view(), name='user-pubkey-generate'), - url(r'^profile/otp/enable/authentication/$', views.UserOtpEnableAuthenticationView.as_view(), name='user-otp-enable-authentication'), - url(r'^profile/otp/enable/install-app/$', views.UserOtpEnableInstallAppView.as_view(), name='user-otp-enable-install-app'), - url(r'^profile/otp/enable/bind/$', views.UserOtpEnableBindView.as_view(), name='user-otp-enable-bind'), - url(r'^profile/otp/disable/authentication/$', views.UserOtpDisableAuthenticationView.as_view(), name='user-otp-disable-authentication'), - url(r'^profile/otp/settings-success/$', views.UserOtpSettingsSuccessView.as_view(), name='user-otp-settings-success'), + path('profile/', views.UserProfileView.as_view(), name='user-profile'), + path('profile/update/', views.UserProfileUpdateView.as_view(), name='user-profile-update'), + path('profile/password/update/', views.UserPasswordUpdateView.as_view(), name='user-password-update'), + path('profile/pubkey/update/', views.UserPublicKeyUpdateView.as_view(), name='user-pubkey-update'), + path('profile/pubkey/generate/', views.UserPublicKeyGenerateView.as_view(), name='user-pubkey-generate'), + path('profile/otp/enable/authentication/', views.UserOtpEnableAuthenticationView.as_view(), name='user-otp-enable-authentication'), + path('profile/otp/enable/install-app/', views.UserOtpEnableInstallAppView.as_view(), name='user-otp-enable-install-app'), + path('profile/otp/enable/bind/', views.UserOtpEnableBindView.as_view(), name='user-otp-enable-bind'), + path('profile/otp/disable/authentication/', views.UserOtpDisableAuthenticationView.as_view(), name='user-otp-disable-authentication'), + path('profile/otp/settings-success/', views.UserOtpSettingsSuccessView.as_view(), name='user-otp-settings-success'), # User view - url(r'^user/$', views.UserListView.as_view(), name='user-list'), - url(r'^user/export/$', views.UserExportView.as_view(), name='user-export'), - url(r'^first-login/$', views.UserFirstLoginView.as_view(), name='user-first-login'), - url(r'^user/import/$', views.UserBulkImportView.as_view(), name='user-import'), - url(r'^user/create/$', views.UserCreateView.as_view(), name='user-create'), - url(r'^user/(?P[0-9a-zA-Z\-]{36})/update/$', views.UserUpdateView.as_view(), name='user-update'), - url(r'^user/update/$', views.UserBulkUpdateView.as_view(), name='user-bulk-update'), - url(r'^user/(?P[0-9a-zA-Z\-]{36})/$', views.UserDetailView.as_view(), name='user-detail'), - url(r'^user/(?P[0-9a-zA-Z\-]{36})/assets/$', views.UserGrantedAssetView.as_view(), name='user-granted-asset'), - url(r'^user/(?P[0-9a-zA-Z\-]{36})/login-history/$', views.UserDetailView.as_view(), name='user-login-history'), + path('user/', views.UserListView.as_view(), name='user-list'), + path('user/export/', views.UserExportView.as_view(), name='user-export'), + path('first-login/', views.UserFirstLoginView.as_view(), name='user-first-login'), + path('user/import/', views.UserBulkImportView.as_view(), name='user-import'), + path('user/create/', views.UserCreateView.as_view(), name='user-create'), + path('user//update/', views.UserUpdateView.as_view(), name='user-update'), + path('user/update/', views.UserBulkUpdateView.as_view(), name='user-bulk-update'), + path('user//', views.UserDetailView.as_view(), name='user-detail'), + path('user//assets/', views.UserGrantedAssetView.as_view(), name='user-granted-asset'), + path('user//login-history/', views.UserDetailView.as_view(), name='user-login-history'), # User group view - url(r'^user-group/$', views.UserGroupListView.as_view(), name='user-group-list'), - url(r'^user-group/(?P[0-9a-zA-Z\-]{36})/$', views.UserGroupDetailView.as_view(), name='user-group-detail'), - url(r'^user-group/create/$', views.UserGroupCreateView.as_view(), name='user-group-create'), - url(r'^user-group/(?P[0-9a-zA-Z\-]{36})/update/$', views.UserGroupUpdateView.as_view(), name='user-group-update'), - url(r'^user-group/(?P[0-9a-zA-Z\-]{36})/assets/$', views.UserGroupGrantedAssetView.as_view(), name='user-group-granted-asset'), + path('user-group/', views.UserGroupListView.as_view(), name='user-group-list'), + path('user-group//', views.UserGroupDetailView.as_view(), name='user-group-detail'), + path('user-group/create/', views.UserGroupCreateView.as_view(), name='user-group-create'), + path('user-group//update/', views.UserGroupUpdateView.as_view(), name='user-group-update'), + path('user-group//assets/', views.UserGroupGrantedAssetView.as_view(), name='user-group-granted-asset'), # Login log - url(r'^login-log/$', views.LoginLogListView.as_view(), name='login-log-list'), + path('login-log/', views.LoginLogListView.as_view(), name='login-log-list'), ]