From c497d511dc2ee6f7fe724983dfa625117cf14a15 Mon Sep 17 00:00:00 2001 From: yuetsh <51725939@qq.com> Date: Mon, 1 Jul 2024 12:17:43 +0800 Subject: [PATCH] refactor --- account/urls/admin.py | 6 +++--- account/urls/oj.py | 38 +++++++++++++++++++------------------- announcement/urls/admin.py | 4 ++-- announcement/urls/oj.py | 4 ++-- comment/urls/oj.py | 6 +++--- conf/urls/admin.py | 16 ++++++++-------- conf/urls/oj.py | 9 +++++---- contest/urls/admin.py | 10 +++++----- contest/urls/oj.py | 14 +++++++------- message/urls/oj.py | 4 ++-- oj/urls.py | 32 ++++++++++++++++---------------- problem/urls/admin.py | 20 ++++++++++---------- problem/urls/oj.py | 10 +++++----- submission/urls/admin.py | 6 +++--- submission/urls/oj.py | 10 +++++----- utils/urls.py | 6 +++--- 16 files changed, 98 insertions(+), 97 deletions(-) diff --git a/account/urls/admin.py b/account/urls/admin.py index ca4c89c..7158432 100644 --- a/account/urls/admin.py +++ b/account/urls/admin.py @@ -1,8 +1,8 @@ -from django.urls import re_path as url +from django.urls import path from ..views.admin import UserAdminAPI, GenerateUserAPI urlpatterns = [ - url(r"^user/?$", UserAdminAPI.as_view(), name="user_admin_api"), - url(r"^generate_user/?$", GenerateUserAPI.as_view(), name="generate_user_api"), + path("user", UserAdminAPI.as_view()), + path("generate_user", GenerateUserAPI.as_view()), ] diff --git a/account/urls/oj.py b/account/urls/oj.py index 6545a3a..dbdbc12 100644 --- a/account/urls/oj.py +++ b/account/urls/oj.py @@ -1,4 +1,4 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import (ApplyResetPasswordAPI, ResetPasswordAPI, UserChangePasswordAPI, UserRegisterAPI, UserChangeEmailAPI, @@ -10,22 +10,22 @@ from ..views.oj import (ApplyResetPasswordAPI, ResetPasswordAPI, from utils.captcha.views import CaptchaAPIView urlpatterns = [ - url(r"^login/?$", UserLoginAPI.as_view(), name="user_login_api"), - url(r"^logout/?$", UserLogoutAPI.as_view(), name="user_logout_api"), - url(r"^register/?$", UserRegisterAPI.as_view(), name="user_register_api"), - url(r"^change_password/?$", UserChangePasswordAPI.as_view(), name="user_change_password_api"), - url(r"^change_email/?$", UserChangeEmailAPI.as_view(), name="user_change_email_api"), - url(r"^apply_reset_password/?$", ApplyResetPasswordAPI.as_view(), name="apply_reset_password_api"), - url(r"^reset_password/?$", ResetPasswordAPI.as_view(), name="reset_password_api"), - url(r"^captcha/?$", CaptchaAPIView.as_view(), name="show_captcha"), - url(r"^check_username_or_email", UsernameOrEmailCheck.as_view(), name="check_username_or_email"), - url(r"^profile/?$", UserProfileAPI.as_view(), name="user_profile_api"), - url(r"^profile/fresh_display_id", ProfileProblemDisplayIDRefreshAPI.as_view(), name="display_id_fresh"), - url(r"^upload_avatar/?$", AvatarUploadAPI.as_view(), name="avatar_upload_api"), - url(r"^tfa_required/?$", CheckTFARequiredAPI.as_view(), name="tfa_required_check"), - url(r"^two_factor_auth/?$", TwoFactorAuthAPI.as_view(), name="two_factor_auth_api"), - url(r"^user_rank/?$", UserRankAPI.as_view(), name="user_rank_api"), - url(r"^sessions/?$", SessionManagementAPI.as_view(), name="session_management_api"), - url(r"^open_api_appkey/?$", OpenAPIAppkeyAPI.as_view(), name="open_api_appkey_api"), - url(r"^sso?$", SSOAPI.as_view(), name="sso_api") + path("login", UserLoginAPI.as_view()), + path("logout", UserLogoutAPI.as_view()), + path("register", UserRegisterAPI.as_view()), + path("change_password", UserChangePasswordAPI.as_view()), + path("change_email", UserChangeEmailAPI.as_view()), + path("apply_reset_password", ApplyResetPasswordAPI.as_view()), + path("reset_password", ResetPasswordAPI.as_view()), + path("captcha", CaptchaAPIView.as_view()), + path("check_username_or_email", UsernameOrEmailCheck.as_view()), + path("profile", UserProfileAPI.as_view(), name="user_profile_api"), + path("profile/fresh_display_id", ProfileProblemDisplayIDRefreshAPI.as_view()), + path("upload_avatar", AvatarUploadAPI.as_view()), + path("tfa_required", CheckTFARequiredAPI.as_view()), + path("two_factor_auth", TwoFactorAuthAPI.as_view(),), + path("user_rank", UserRankAPI.as_view()), + path("sessions", SessionManagementAPI.as_view()), + path("open_api_appkey", OpenAPIAppkeyAPI.as_view(),), + path("sso", SSOAPI.as_view()) ] diff --git a/announcement/urls/admin.py b/announcement/urls/admin.py index 7c0908a..0d499c8 100644 --- a/announcement/urls/admin.py +++ b/announcement/urls/admin.py @@ -1,7 +1,7 @@ -from django.urls import re_path as url +from django.urls import path from ..views.admin import AnnouncementAdminAPI urlpatterns = [ - url(r"^announcement/?$", AnnouncementAdminAPI.as_view(), name="announcement_admin_api"), + path("announcement", AnnouncementAdminAPI.as_view()), ] diff --git a/announcement/urls/oj.py b/announcement/urls/oj.py index 2cdc923..ff7d1d6 100644 --- a/announcement/urls/oj.py +++ b/announcement/urls/oj.py @@ -1,7 +1,7 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import AnnouncementAPI urlpatterns = [ - url(r"^announcement/?$", AnnouncementAPI.as_view(), name="announcement_api"), + path("announcement", AnnouncementAPI.as_view()), ] diff --git a/comment/urls/oj.py b/comment/urls/oj.py index a25f075..c30631f 100644 --- a/comment/urls/oj.py +++ b/comment/urls/oj.py @@ -1,9 +1,9 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import CommentAPI, CommentStatisticsAPI urlpatterns = [ - url(r"^comment/?$", CommentAPI.as_view(), name="comment_api"), - url(r"^comment/statistics?$", CommentStatisticsAPI.as_view(), name="comment_statistics_api"), + path("comment", CommentAPI.as_view()), + path("comment/statistics", CommentStatisticsAPI.as_view()), ] diff --git a/conf/urls/admin.py b/conf/urls/admin.py index 3a73d72..b515d60 100644 --- a/conf/urls/admin.py +++ b/conf/urls/admin.py @@ -1,14 +1,14 @@ -from django.urls import re_path as url +from django.urls import path from ..views import SMTPAPI, JudgeServerAPI, WebsiteConfigAPI, TestCasePruneAPI, SMTPTestAPI from ..views import ReleaseNotesAPI, DashboardInfoAPI urlpatterns = [ - url(r"^smtp/?$", SMTPAPI.as_view(), name="smtp_admin_api"), - url(r"^smtp_test/?$", SMTPTestAPI.as_view(), name="smtp_test_api"), - url(r"^website/?$", WebsiteConfigAPI.as_view(), name="website_config_api"), - url(r"^judge_server/?$", JudgeServerAPI.as_view(), name="judge_server_api"), - url(r"^prune_test_case/?$", TestCasePruneAPI.as_view(), name="prune_test_case_api"), - url(r"^versions/?$", ReleaseNotesAPI.as_view(), name="get_release_notes_api"), - url(r"^dashboard_info", DashboardInfoAPI.as_view(), name="dashboard_info_api"), + path("smtp", SMTPAPI.as_view()), + path("smtp_test", SMTPTestAPI.as_view()), + path("website", WebsiteConfigAPI.as_view()), + path("judge_server", JudgeServerAPI.as_view()), + path("prune_test_case", TestCasePruneAPI.as_view()), + path("versions", ReleaseNotesAPI.as_view()), + path("dashboard_info", DashboardInfoAPI.as_view()), ] diff --git a/conf/urls/oj.py b/conf/urls/oj.py index dad174c..d6b6aab 100644 --- a/conf/urls/oj.py +++ b/conf/urls/oj.py @@ -1,9 +1,10 @@ -from django.urls import re_path as url +from django.urls import path from ..views import JudgeServerHeartbeatAPI, LanguagesAPI, WebsiteConfigAPI urlpatterns = [ - url(r"^website/?$", WebsiteConfigAPI.as_view(), name="website_info_api"), - url(r"^judge_server_heartbeat/?$", JudgeServerHeartbeatAPI.as_view(), name="judge_server_heartbeat_api"), - url(r"^languages/?$", LanguagesAPI.as_view(), name="language_list_api") + path("website", WebsiteConfigAPI.as_view()), + # 这里必须要有 / + path("judge_server_heartbeat/", JudgeServerHeartbeatAPI.as_view()), + path("languages", LanguagesAPI.as_view()) ] diff --git a/contest/urls/admin.py b/contest/urls/admin.py index 44cb91e..20ae6cb 100644 --- a/contest/urls/admin.py +++ b/contest/urls/admin.py @@ -1,10 +1,10 @@ -from django.urls import re_path as url +from django.urls import path from ..views.admin import ContestAnnouncementAPI, ContestAPI, ACMContestHelper, DownloadContestSubmissions urlpatterns = [ - url(r"^contest/?$", ContestAPI.as_view(), name="contest_admin_api"), - url(r"^contest/announcement/?$", ContestAnnouncementAPI.as_view(), name="contest_announcement_admin_api"), - url(r"^contest/acm_helper/?$", ACMContestHelper.as_view(), name="acm_contest_helper"), - url(r"^download_submissions/?$", DownloadContestSubmissions.as_view(), name="acm_contest_helper"), + path("contest", ContestAPI.as_view()), + path("contest/announcement", ContestAnnouncementAPI.as_view()), + path("contest/acm_helper", ACMContestHelper.as_view()), + path("download_submissions", DownloadContestSubmissions.as_view()), ] diff --git a/contest/urls/oj.py b/contest/urls/oj.py index 257175f..7235f4f 100644 --- a/contest/urls/oj.py +++ b/contest/urls/oj.py @@ -1,4 +1,4 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import ContestAnnouncementListAPI from ..views.oj import ContestPasswordVerifyAPI, ContestAccessAPI @@ -6,10 +6,10 @@ from ..views.oj import ContestListAPI, ContestAPI from ..views.oj import ContestRankAPI urlpatterns = [ - url(r"^contests/?$", ContestListAPI.as_view(), name="contest_list_api"), - url(r"^contest/?$", ContestAPI.as_view(), name="contest_api"), - url(r"^contest/password/?$", ContestPasswordVerifyAPI.as_view(), name="contest_password_api"), - url(r"^contest/announcement/?$", ContestAnnouncementListAPI.as_view(), name="contest_announcement_api"), - url(r"^contest/access/?$", ContestAccessAPI.as_view(), name="contest_access_api"), - url(r"^contest_rank/?$", ContestRankAPI.as_view(), name="contest_rank_api"), + path("contests", ContestListAPI.as_view()), + path("contest", ContestAPI.as_view()), + path("contest/password", ContestPasswordVerifyAPI.as_view()), + path("contest/announcement", ContestAnnouncementListAPI.as_view()), + path("contest/access", ContestAccessAPI.as_view()), + path("contest_rank", ContestRankAPI.as_view()), ] diff --git a/message/urls/oj.py b/message/urls/oj.py index 2875cd9..ffc028b 100644 --- a/message/urls/oj.py +++ b/message/urls/oj.py @@ -1,7 +1,7 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import MessageAPI urlpatterns = [ - url(r"^message/?$", MessageAPI.as_view(), name="message_api"), + path("message", MessageAPI.as_view()), ] diff --git a/oj/urls.py b/oj/urls.py index 9834589..0a4c6bb 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -1,19 +1,19 @@ -from django.urls import include, re_path as url +from django.urls import include, path urlpatterns = [ - url(r"^api/", include("account.urls.oj")), - url(r"^api/admin/", include("account.urls.admin")), - url(r"^api/", include("announcement.urls.oj")), - url(r"^api/admin/", include("announcement.urls.admin")), - url(r"^api/", include("conf.urls.oj")), - url(r"^api/admin/", include("conf.urls.admin")), - url(r"^api/", include("problem.urls.oj")), - url(r"^api/admin/", include("problem.urls.admin")), - url(r"^api/", include("contest.urls.oj")), - url(r"^api/admin/", include("contest.urls.admin")), - url(r"^api/", include("submission.urls.oj")), - url(r"^api/admin/", include("submission.urls.admin")), - url(r"^api/admin/", include("utils.urls")), - url(r"^api/", include("message.urls.oj")), - url(r"^api/", include("comment.urls.oj")), + path("api/", include("account.urls.oj")), + path("api/admin/", include("account.urls.admin")), + path("api/", include("announcement.urls.oj")), + path("api/admin/", include("announcement.urls.admin")), + path("api/", include("conf.urls.oj")), + path("api/admin/", include("conf.urls.admin")), + path("api/", include("problem.urls.oj")), + path("api/admin/", include("problem.urls.admin")), + path("api/", include("contest.urls.oj")), + path("api/admin/", include("contest.urls.admin")), + path("api/", include("submission.urls.oj")), + path("api/admin/", include("submission.urls.admin")), + path("api/admin/", include("utils.urls")), + path("api/", include("message.urls.oj")), + path("api/", include("comment.urls.oj")), ] diff --git a/problem/urls/admin.py b/problem/urls/admin.py index 7d568c3..e07c8ea 100644 --- a/problem/urls/admin.py +++ b/problem/urls/admin.py @@ -1,17 +1,17 @@ -from django.urls import re_path as url +from django.urls import path from ..views.admin import (ContestProblemAPI, ProblemAPI, TestCaseAPI, MakeContestProblemPublicAPIView, CompileSPJAPI, AddContestProblemAPI, ExportProblemAPI, ImportProblemAPI, FPSProblemImport) urlpatterns = [ - url(r"^test_case/?$", TestCaseAPI.as_view(), name="test_case_api"), - url(r"^compile_spj/?$", CompileSPJAPI.as_view(), name="compile_spj"), - url(r"^problem/?$", ProblemAPI.as_view(), name="problem_admin_api"), - url(r"^contest/problem/?$", ContestProblemAPI.as_view(), name="contest_problem_admin_api"), - url(r"^contest_problem/make_public/?$", MakeContestProblemPublicAPIView.as_view(), name="make_public_api"), - url(r"^contest/add_problem_from_public/?$", AddContestProblemAPI.as_view(), name="add_contest_problem_from_public_api"), - url(r"^export_problem/?$", ExportProblemAPI.as_view(), name="export_problem_api"), - url(r"^import_problem/?$", ImportProblemAPI.as_view(), name="import_problem_api"), - url(r"^import_fps/?$", FPSProblemImport.as_view(), name="fps_problem_api"), + path("test_case", TestCaseAPI.as_view()), + path("compile_spj", CompileSPJAPI.as_view()), + path("problem", ProblemAPI.as_view()), + path("contest/problem", ContestProblemAPI.as_view()), + path("contest_problem/make_public", MakeContestProblemPublicAPIView.as_view()), + path("contest/add_problem_from_public", AddContestProblemAPI.as_view()), + path("export_problem", ExportProblemAPI.as_view()), + path("import_problem", ImportProblemAPI.as_view()), + path("import_fps", FPSProblemImport.as_view()), ] diff --git a/problem/urls/oj.py b/problem/urls/oj.py index f2ddf77..a4647c7 100644 --- a/problem/urls/oj.py +++ b/problem/urls/oj.py @@ -1,10 +1,10 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import ProblemTagAPI, ProblemAPI, ContestProblemAPI, PickOneAPI urlpatterns = [ - url(r"^problem/tags/?$", ProblemTagAPI.as_view(), name="problem_tag_list_api"), - url(r"^problem/?$", ProblemAPI.as_view(), name="problem_api"), - url(r"^pickone/?$", PickOneAPI.as_view(), name="pick_one_api"), - url(r"^contest/problem/?$", ContestProblemAPI.as_view(), name="contest_problem_api"), + path("problem/tags", ProblemTagAPI.as_view()), + path("problem", ProblemAPI.as_view()), + path("pickone", PickOneAPI.as_view()), + path("contest/problem", ContestProblemAPI.as_view()), ] diff --git a/submission/urls/admin.py b/submission/urls/admin.py index f359668..2c0cbe9 100644 --- a/submission/urls/admin.py +++ b/submission/urls/admin.py @@ -1,8 +1,8 @@ -from django.urls import re_path as url +from django.urls import path from ..views.admin import SubmissionRejudgeAPI, SubmissionStatisticsAPI urlpatterns = [ - url(r"^submission/rejudge?$", SubmissionRejudgeAPI.as_view(), name="submission_rejudge_api"), - url(r"^submission/statistics?$", SubmissionStatisticsAPI.as_view(), name="submission_statistics_api"), + path("submission/rejudge", SubmissionRejudgeAPI.as_view()), + path("submission/statistics", SubmissionStatisticsAPI.as_view()), ] diff --git a/submission/urls/oj.py b/submission/urls/oj.py index 49c5e1e..63c3091 100644 --- a/submission/urls/oj.py +++ b/submission/urls/oj.py @@ -1,10 +1,10 @@ -from django.urls import re_path as url +from django.urls import path from ..views.oj import SubmissionAPI, SubmissionListAPI, ContestSubmissionListAPI, SubmissionExistsAPI urlpatterns = [ - url(r"^submission/?$", SubmissionAPI.as_view(), name="submission_api"), - url(r"^submissions/?$", SubmissionListAPI.as_view(), name="submission_list_api"), - url(r"^submission_exists/?$", SubmissionExistsAPI.as_view(), name="submission_exists"), - url(r"^contest_submissions/?$", ContestSubmissionListAPI.as_view(), name="contest_submission_list_api"), + path("submission", SubmissionAPI.as_view()), + path("submissions", SubmissionListAPI.as_view()), + path("submission_exists", SubmissionExistsAPI.as_view()), + path("contest_submissions", ContestSubmissionListAPI.as_view()), ] diff --git a/utils/urls.py b/utils/urls.py index d9a25e0..35d955e 100644 --- a/utils/urls.py +++ b/utils/urls.py @@ -1,8 +1,8 @@ -from django.urls import re_path as url +from django.urls import path from .views import SimditorImageUploadAPIView, SimditorFileUploadAPIView urlpatterns = [ - url(r"^upload_image/?$", SimditorImageUploadAPIView.as_view(), name="upload_image"), - url(r"^upload_file/?$", SimditorFileUploadAPIView.as_view(), name="upload_file") + path("upload_image", SimditorImageUploadAPIView.as_view()), + path("upload_file", SimditorFileUploadAPIView.as_view()), ]