diff --git a/project_manage/manage/__pycache__/url.cpython-312.pyc b/project_manage/manage/__pycache__/url.cpython-312.pyc index b57a693..55055c0 100644 Binary files a/project_manage/manage/__pycache__/url.cpython-312.pyc and b/project_manage/manage/__pycache__/url.cpython-312.pyc differ diff --git a/project_manage/manage/__pycache__/views.cpython-312.pyc b/project_manage/manage/__pycache__/views.cpython-312.pyc index 3d08239..fbb50cc 100644 Binary files a/project_manage/manage/__pycache__/views.cpython-312.pyc and b/project_manage/manage/__pycache__/views.cpython-312.pyc differ diff --git a/project_manage/manage/middlewares/__pycache__/my_middlewares.cpython-312.pyc b/project_manage/manage/middlewares/__pycache__/my_middlewares.cpython-312.pyc index 7bd8404..ffecaa2 100644 Binary files a/project_manage/manage/middlewares/__pycache__/my_middlewares.cpython-312.pyc and b/project_manage/manage/middlewares/__pycache__/my_middlewares.cpython-312.pyc differ diff --git a/project_manage/manage/middlewares/my_middlewares.py b/project_manage/manage/middlewares/my_middlewares.py index e758f69..a20f011 100644 --- a/project_manage/manage/middlewares/my_middlewares.py +++ b/project_manage/manage/middlewares/my_middlewares.py @@ -1,24 +1,24 @@ -import re -from django.shortcuts import redirect -from django.utils.deprecation import MiddlewareMixin - -# 自定义中间件(登录验证) -class AuthMiddleware(MiddlewareMixin): - def process_request(self,request): - # 需要登录后访问的地址要验证登录状态 - # 拿到请求的路径,然后与列表中的路径作对比 - # 默认所以路径都需要验证,如果请求的路径在列表中,那么不用验证就可以进入 - url = request.path_info - for i in [r'^/admin/','r/^user/login/$','r/^/user/userreg/$']: - if re.match(i,url): - #请求的路径是列表的路径那么直接返回,不再阻拦 - return - - #校验登录状态 - is_login = request.session.get('is_login') - if is_login: - #已经登录,可以访问,直接return - return - else: - #未登录,跳转到登录页面 - return redirect('/user/login') \ No newline at end of file +# import re +# from django.shortcuts import redirect +# from django.utils.deprecation import MiddlewareMixin +# +# # 自定义中间件(登录验证) +# class AuthMiddleware(MiddlewareMixin): +# def process_request(self,request): +# # 需要登录后访问的地址要验证登录状态 +# # 拿到请求的路径,然后与列表中的路径作对比 +# # 默认所以路径都需要验证,如果请求的路径在列表中,那么不用验证就可以进入 +# url = request.path_info +# for i in [r'^/admin/','r/^user/login/$','r/^/user/userreg/$']: +# if re.match(i,url): +# #请求的路径是列表的路径那么直接返回,不再阻拦 +# return +# +# #校验登录状态 +# is_login = request.session.get('is_login') +# if is_login: +# #已经登录,可以访问,直接return +# return +# else: +# #未登录,跳转到登录页面 +# return redirect('/user/login') \ No newline at end of file diff --git a/project_manage/manage/url.py b/project_manage/manage/url.py index c0ac523..3b913f3 100644 --- a/project_manage/manage/url.py +++ b/project_manage/manage/url.py @@ -5,5 +5,6 @@ from manage import views from manage.views import * urlpatterns = [ - path('login/', ChooseLoginView.as_view()), + path('admin/', admin.site.urls), + path('', views.ChooseLoginView.as_view()), ] \ No newline at end of file diff --git a/project_manage/project_manage/__pycache__/settings.cpython-312.pyc b/project_manage/project_manage/__pycache__/settings.cpython-312.pyc index c293480..c3afa9e 100644 Binary files a/project_manage/project_manage/__pycache__/settings.cpython-312.pyc and b/project_manage/project_manage/__pycache__/settings.cpython-312.pyc differ diff --git a/project_manage/project_manage/__pycache__/urls.cpython-312.pyc b/project_manage/project_manage/__pycache__/urls.cpython-312.pyc index 8b136f3..d522de7 100644 Binary files a/project_manage/project_manage/__pycache__/urls.cpython-312.pyc and b/project_manage/project_manage/__pycache__/urls.cpython-312.pyc differ diff --git a/project_manage/project_manage/settings.py b/project_manage/project_manage/settings.py index 0c8afab..00163a3 100644 --- a/project_manage/project_manage/settings.py +++ b/project_manage/project_manage/settings.py @@ -49,7 +49,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'manage.middlewares.my_middlewares.AuthMiddleware'#自定义中间件 + # 'manage.middlewares.my_middlewares.AuthMiddleware'#自定义中间件 ] ROOT_URLCONF = 'project_manage.urls' @@ -115,6 +115,8 @@ LANGUAGE_CODE = 'zh-hans' TIME_ZONE = 'Asia/Shanghai' USE_I18N = False USE_TZ = True + + SIMPLEUI_DEFAULT_THEME = 'element.css' STATIC_URL = '/static/' STATICFILES_DIRS = [ diff --git a/project_manage/project_manage/urls.py b/project_manage/project_manage/urls.py index 2821507..e849bbe 100644 --- a/project_manage/project_manage/urls.py +++ b/project_manage/project_manage/urls.py @@ -16,9 +16,12 @@ Including another URLconf """ from django.contrib import admin from django.urls import path,include +from manage import views +from manage.views import ChooseLoginView urlpatterns = [ path('admin/', admin.site.urls), - path('user/',include('manage.url')), - path('',include('manage.url')) + path('',include('manage.url')), + # path('user/',include('manage.url')), + path('user/', ChooseLoginView.as_view()), ]