修复开启「全站登录」后URL跳转异常的问题

CHANGES.md

@@ -3,6 +3,7 @@
 ### v0.6.8 2021-06
 
 - [新增]文档页面支持OGP协议；
+- [修复]开启「全站登录」后URL跳转异常的问题；
 - [优化]用户禁止同名文集创建，文集下禁止同名文档创建；
 
 ### v0.6.7 2021-05-29

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 接口

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):

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'), # 注册邀请码管理