From 942f769e066560525deca9e1b8f2edd6e57db053 Mon Sep 17 00:00:00 2001 From: yangjian Date: Tue, 1 Jun 2021 16:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF=E3=80=8C?= =?UTF-8?q?=E5=85=A8=E7=AB=99=E7=99=BB=E5=BD=95=E3=80=8D=E5=90=8EURL?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 1 + MrDoc/urls.py | 5 +++++ app_admin/middleware/require_login_middleware.py | 2 +- app_admin/urls.py | 5 ----- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c85f1d4..860815c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ ### v0.6.8 2021-06 - [新增]文档页面支持OGP协议； +- [修复]开启「全站登录」后URL跳转异常的问题； - [优化]用户禁止同名文集创建，文集下禁止同名文档创建； ### v0.6.7 2021-05-29 diff --git a/MrDoc/urls.py b/MrDoc/urls.py index 9662e9c..3f3afd5 100644 --- a/MrDoc/urls.py +++ b/MrDoc/urls.py @@ -19,11 +19,16 @@ from django.views.static import serve from django.conf import settings from django.contrib.sitemaps import views from app_doc.sitemaps import SitemapAll +from app_admin import views as admin_views sitemaps = SitemapAll() urlpatterns = [ path('',include('app_doc.urls')), # doc应用 + path('login/', admin_views.log_in, name='login'), # 登录 + path('logout/', admin_views.log_out, name='logout'), # 注销 + path('register/', admin_views.register, name="register"), # 注册 + path('check_code/', admin_views.check_code, name='check_code'), # 注册验证码 path('admin/',include('app_admin.urls'),), # admin应用 path('api/',include('app_api.urls')), # 用户 Token API 接口 path('api_app/',include('app_api.urls_app')), # RESTFUL API 接口 diff --git a/app_admin/middleware/require_login_middleware.py b/app_admin/middleware/require_login_middleware.py index 6fc6be4..c8cfe5c 100644 --- a/app_admin/middleware/require_login_middleware.py +++ b/app_admin/middleware/require_login_middleware.py @@ -13,7 +13,7 @@ class RequiredLoginMiddleware(): def __init__(self, get_response): self.get_response = get_response # 设置排除URL - compile_tuple = (r'/user/login(.*)$', r'/user/logout(.*)$', r'/user/register(.*)$',r'/user/check_code(.*)$',r'/static/(.*)$') + compile_tuple = (r'/login(.*)$', r'/logout(.*)$', r'/register(.*)$',r'/check_code(.*)$',r'/static/(.*)$') self.exceptions = tuple(re.compile(url) for url in compile_tuple) def __call__(self, request): diff --git a/app_admin/urls.py b/app_admin/urls.py index 150b2a8..df8d37e 100644 --- a/app_admin/urls.py +++ b/app_admin/urls.py @@ -2,10 +2,6 @@ from django.urls import path,re_path from app_admin import views urlpatterns = [ - path('login/',views.log_in,name='login'), # 登录 - path('logout/',views.log_out,name='logout'), # 注销 - path('register/',views.register,name="register"), # 注册 - path('user_manage/',views.admin_user,name="user_manage"), # 用户管理页面 path('user_profile/',views.admin_user_profile, name="user_profile"), # 用户资料页面 path('api/users', views.AdminUserList.as_view(), name="api_admin_users"), # 用户列表接口 @@ -21,7 +17,6 @@ urlpatterns = [ path('doc_manage/',views.admin_doc,name='doc_manage'), # 文档管理 path('doctemp_manage/',views.admin_doctemp,name='doctemp_manage'), # 文档模板管理 path('setting/',views.admin_setting,name="sys_setting"), # 应用设置 - path('check_code/',views.check_code,name='check_code'), # 注册验证码 path('forget_pwd/',views.forget_pwd,name='forget_pwd'), # 忘记密码 path('send_email_vcode/',views.send_email_vcode,name='send_email_vcode'), # 忘记密码发送邮件验证码 path('admin_register_code/',views.admin_register_code,name='register_code_manage'), # 注册邀请码管理