From 79a265cdd68a1ce47d86548c178a0600198d111b Mon Sep 17 00:00:00 2001
From: xm <2871214878@qq.com>
Date: Sun, 9 Nov 2025 18:14:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                              |   5 -
 .idea/Django.iml                              |  12 --
 .idea/django.iml                              |  15 ---
 .idea/inspectionProfiles/Project_Default.xml  |  78 ------------
 .../inspectionProfiles/profiles_settings.xml  |   6 -
 .idea/misc.xml                                |   7 --
 .idea/modules.xml                             |   8 --
 .idea/vcs.xml                                 |   7 --
 .idea/workspace.xml                           | 114 ------------------
 README.md                                     |   2 -
 src/.idea/.gitignore                          |   5 -
 .../inspectionProfiles/profiles_settings.xml  |   6 -
 src/.idea/misc.xml                            |   4 -
 src/.idea/modules.xml                         |   8 --
 src/.idea/src.iml                             |   8 --
 src/.idea/vcs.xml                             |   6 -
 src/Django                                    |   1 -
 .../DjangoBlog-master/.coveragerc             |   0
 .../DjangoBlog-master/.dockerignore           |   0
 .../DjangoBlog-master/.gitattributes          |   0
 .../.github/ISSUE_TEMPLATE.md                 |   0
 .../.github/workflows/codeql-analysis.yml     |   0
 .../.github/workflows/django.yml              |   0
 .../.github/workflows/docker.yml              |   0
 .../.github/workflows/publish-release.yml     |   0
 .../DjangoBlog-master/.gitignore              |   0
 .../DjangoBlog-master/Dockerfile              |   0
 .../DjangoBlog-master/LICENSE                 |   0
 .../DjangoBlog-master/README.md               |   0
 .../DjangoBlog-master/accounts/__init__.py    |   0
 .../DjangoBlog-master/accounts/admin.py       |   0
 .../DjangoBlog-master/accounts/apps.py        |   0
 .../DjangoBlog-master/accounts/forms.py       |   0
 .../accounts/migrations/0001_initial.py       |   0
 ...s_remove_bloguser_created_time_and_more.py |   0
 .../accounts/migrations/__init__.py           |   0
 .../DjangoBlog-master/accounts/models.py      |   0
 .../accounts/templatetags/__init__.py         |   0
 .../DjangoBlog-master/accounts/tests.py       |   0
 .../DjangoBlog-master/accounts/urls.py        |   0
 .../accounts/user_login_backend.py            |   0
 .../DjangoBlog-master/accounts/utils.py       |   0
 .../DjangoBlog-master/accounts/views.py       |   0
 .../DjangoBlog-master/blog/__init__.py        |   0
 .../DjangoBlog-master/blog/admin.py           |   0
 .../DjangoBlog-master/blog/apps.py            |   0
 .../blog/context_processors.py                |   0
 .../DjangoBlog-master/blog/documents.py       |   0
 .../DjangoBlog-master/blog/forms.py           |   0
 .../blog/management/__init__.py               |   0
 .../blog/management/commands/__init__.py      |   0
 .../blog/management/commands/build_index.py   |   0
 .../management/commands/build_search_words.py |   0
 .../blog/management/commands/clear_cache.py   |   0
 .../management/commands/create_testdata.py    |   0
 .../blog/management/commands/ping_baidu.py    |   0
 .../management/commands/sync_user_avatar.py   |   0
 .../DjangoBlog-master/blog/middleware.py      |   0
 .../blog/migrations/0001_initial.py           |   0
 ...002_blogsettings_global_footer_and_more.py |   0
 .../0003_blogsettings_comment_need_review.py  |   0
 ...de_blogsettings_analytics_code_and_more.py |   0
 ...options_alter_category_options_and_more.py |   0
 .../0006_alter_blogsettings_options.py        |   0
 .../blog/migrations/__init__.py               |   0
 .../DjangoBlog-master/blog/models.py          |   0
 .../DjangoBlog-master/blog/search_indexes.py  |   0
 .../blog/templatetags/__init__.py             |   0
 .../blog/templatetags/blog_tags.py            |   0
 .../DjangoBlog-master/blog/tests.py           |   0
 .../DjangoBlog-master/blog/urls.py            |   0
 .../DjangoBlog-master/blog/views.py           |   0
 .../DjangoBlog-master/comments/__init__.py    |   0
 .../DjangoBlog-master/comments/admin.py       |   0
 .../DjangoBlog-master/comments/apps.py        |   0
 .../DjangoBlog-master/comments/forms.py       |   0
 .../comments/migrations/0001_initial.py       |   0
 .../0002_alter_comment_is_enable.py           |   0
 ...ns_remove_comment_created_time_and_more.py |   0
 .../comments/migrations/__init__.py           |   0
 .../DjangoBlog-master/comments/models.py      |   0
 .../comments/templatetags/__init__.py         |   0
 .../comments/templatetags/comments_tags.py    |   0
 .../DjangoBlog-master/comments/tests.py       |   0
 .../DjangoBlog-master/comments/urls.py        |   0
 .../DjangoBlog-master/comments/utils.py       |   0
 .../DjangoBlog-master/comments/views.py       |   0
 .../docker-compose/docker-compose.es.yml      |   0
 .../deploy/docker-compose/docker-compose.yml  |   0
 .../DjangoBlog-master/deploy/entrypoint.sh    |   0
 .../deploy/k8s/configmap.yaml                 |   0
 .../deploy/k8s/deployment.yaml                |   0
 .../DjangoBlog-master/deploy/k8s/gateway.yaml |   0
 .../DjangoBlog-master/deploy/k8s/pv.yaml      |   0
 .../DjangoBlog-master/deploy/k8s/pvc.yaml     |   0
 .../DjangoBlog-master/deploy/k8s/service.yaml |   0
 .../deploy/k8s/storageclass.yaml              |   0
 .../DjangoBlog-master/deploy/nginx.conf       |   0
 .../DjangoBlog-master/djangoblog/__init__.py  |   0
 .../djangoblog/admin_site.py                  |   0
 .../DjangoBlog-master/djangoblog/apps.py      |   0
 .../djangoblog/blog_signals.py                |   0
 .../djangoblog/elasticsearch_backend.py       |   0
 .../DjangoBlog-master/djangoblog/feeds.py     |   0
 .../djangoblog/logentryadmin.py               |   0
 .../djangoblog/plugin_manage/base_plugin.py   |   0
 .../plugin_manage/hook_constants.py           |   0
 .../djangoblog/plugin_manage/hooks.py         |   0
 .../djangoblog/plugin_manage/loader.py        |   0
 .../DjangoBlog-master/djangoblog/settings.py  |   0
 .../DjangoBlog-master/djangoblog/sitemap.py   |   0
 .../djangoblog/spider_notify.py               |   0
 .../DjangoBlog-master/djangoblog/tests.py     |   0
 .../DjangoBlog-master/djangoblog/urls.py      |   0
 .../DjangoBlog-master/djangoblog/utils.py     |   0
 .../djangoblog/whoosh_cn_backend.py           |   0
 .../DjangoBlog-master/djangoblog/wsgi.py      |   0
 .../DjangoBlog-master/docs/README-en.md       |   0
 .../DjangoBlog-master/docs/config-en.md       |   0
 .../DjangoBlog-master/docs/config.md          |   0
 .../DjangoBlog-master/docs/docker-en.md       |   0
 .../DjangoBlog-master/docs/docker.md          |   0
 .../DjangoBlog-master/docs/es.md              |   0
 .../DjangoBlog-master/docs/imgs/alipay.jpg    | Bin
 .../docs/imgs/pycharm_logo.png                | Bin
 .../DjangoBlog-master/docs/imgs/wechat.jpg    | Bin
 .../DjangoBlog-master/docs/k8s-en.md          |   0
 .../DjangoBlog-master/docs/k8s.md             |   0
 .../locale/en/LC_MESSAGES/django.mo           | Bin
 .../locale/en/LC_MESSAGES/django.po           |   0
 .../locale/zh_Hans/LC_MESSAGES/django.mo      | Bin
 .../locale/zh_Hans/LC_MESSAGES/django.po      |   0
 .../locale/zh_Hant/LC_MESSAGES/django.mo      | Bin
 .../locale/zh_Hant/LC_MESSAGES/django.po      |   0
 .../DjangoBlog-master/manage.py               |   0
 .../DjangoBlog-master/oauth/__init__.py       |   0
 .../DjangoBlog-master/oauth/admin.py          |   0
 .../DjangoBlog-master/oauth/apps.py           |   0
 .../DjangoBlog-master/oauth/forms.py          |   0
 .../oauth/migrations/0001_initial.py          |   0
 ...ptions_alter_oauthuser_options_and_more.py |   0
 .../0003_alter_oauthuser_nickname.py          |   0
 .../oauth/migrations/__init__.py              |   0
 .../DjangoBlog-master/oauth/models.py         |   0
 .../DjangoBlog-master/oauth/oauthmanager.py   |   0
 .../oauth/templatetags/__init__.py            |   0
 .../oauth/templatetags/oauth_tags.py          |   0
 .../DjangoBlog-master/oauth/tests.py          |   0
 .../DjangoBlog-master/oauth/urls.py           |   0
 .../DjangoBlog-master/oauth/views.py          |   0
 .../DjangoBlog-master/owntracks/__init__.py   |   0
 .../DjangoBlog-master/owntracks/admin.py      |   0
 .../DjangoBlog-master/owntracks/apps.py       |   0
 .../owntracks/migrations/0001_initial.py      |   0
 ...0002_alter_owntracklog_options_and_more.py |   0
 .../owntracks/migrations/__init__.py          |   0
 .../DjangoBlog-master/owntracks/models.py     |   0
 .../DjangoBlog-master/owntracks/tests.py      |   0
 .../DjangoBlog-master/owntracks/urls.py       |   0
 .../DjangoBlog-master/owntracks/views.py      |   0
 .../DjangoBlog-master/plugins/__init__.py     |   0
 .../plugins/article_copyright/__init__.py     |   0
 .../plugins/article_copyright/plugin.py       |   0
 .../plugins/external_links/__init__.py        |   0
 .../plugins/external_links/plugin.py          |   0
 .../plugins/reading_time/__init__.py          |   0
 .../plugins/reading_time/plugin.py            |   0
 .../plugins/seo_optimizer/__init__.py         |   0
 .../plugins/seo_optimizer/plugin.py           |   0
 .../plugins/view_count/__init__.py            |   0
 .../plugins/view_count/plugin.py              |   0
 .../DjangoBlog-master/requirements.txt        | Bin
 .../servermanager/MemcacheStorage.py          |   0
 .../servermanager/__init__.py                 |   0
 .../DjangoBlog-master/servermanager/admin.py  |   0
 .../servermanager/api/__init__.py             |   0
 .../servermanager/api/blogapi.py              |   0
 .../servermanager/api/commonapi.py            |   0
 .../DjangoBlog-master/servermanager/apps.py   |   0
 .../servermanager/migrations/0001_initial.py  |   0
 ...002_alter_emailsendlog_options_and_more.py |   0
 .../servermanager/migrations/__init__.py      |   0
 .../DjangoBlog-master/servermanager/models.py |   0
 .../DjangoBlog-master/servermanager/robot.py  |   0
 .../DjangoBlog-master/servermanager/tests.py  |   0
 .../DjangoBlog-master/servermanager/urls.py   |   0
 .../DjangoBlog-master/servermanager/views.py  |   0
 .../templates/account/forget_password.html    |   0
 .../templates/account/login.html              |   0
 .../templates/account/registration_form.html  |   0
 .../templates/account/result.html             |   0
 .../templates/blog/article_archives.html      |   0
 .../templates/blog/article_detail.html        |   0
 .../templates/blog/article_index.html         |   0
 .../templates/blog/error_page.html            |   0
 .../templates/blog/links_list.html            |   0
 .../templates/blog/tags/article_info.html     |   0
 .../blog/tags/article_meta_info.html          |   0
 .../blog/tags/article_pagination.html         |   0
 .../templates/blog/tags/article_tag_list.html |   0
 .../templates/blog/tags/breadcrumb.html       |   0
 .../templates/blog/tags/sidebar.html          |   0
 .../templates/comments/tags/comment_item.html |   0
 .../comments/tags/comment_item_tree.html      |   0
 .../templates/comments/tags/comment_list.html |   0
 .../templates/comments/tags/post_comment.html |   0
 .../templates/oauth/bindsuccess.html          |   0
 .../templates/oauth/oauth_applications.html   |   0
 .../templates/oauth/require_email.html        |   0
 .../templates/owntracks/show_log_dates.html   |   0
 .../templates/owntracks/show_maps.html        |   0
 .../search/indexes/blog/article_text.txt      |   0
 .../templates/search/search.html              |   0
 .../templates/share_layout/adsense.html       |   0
 .../templates/share_layout/base.html          |   0
 .../templates/share_layout/base_account.html  |   0
 .../templates/share_layout/footer.html        |   0
 .../templates/share_layout/nav.html           |   0
 .../templates/share_layout/nav_node.html      |   0
 src/DjangoBlog-master_1/.idea/.gitignore      |   3 -
 .../.idea/DjangoBlog-master.iml               |  17 ---
 .../inspectionProfiles/profiles_settings.xml  |   6 -
 src/DjangoBlog-master_1/.idea/misc.xml        |   7 --
 src/DjangoBlog-master_1/.idea/modules.xml     |   8 --
 src/DjangoBlog-master_1/.idea/vcs.xml         |   7 --
 src/context_processors.py                     |  63 ----------
 src/test.py                                   |   0
 227 files changed, 403 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/Django.iml
 delete mode 100644 .idea/django.iml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 README.md
 delete mode 100644 src/.idea/.gitignore
 delete mode 100644 src/.idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 src/.idea/misc.xml
 delete mode 100644 src/.idea/modules.xml
 delete mode 100644 src/.idea/src.iml
 delete mode 100644 src/.idea/vcs.xml
 delete mode 160000 src/Django
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.coveragerc (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.dockerignore (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.gitattributes (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.github/ISSUE_TEMPLATE.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.github/workflows/codeql-analysis.yml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.github/workflows/django.yml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.github/workflows/docker.yml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.github/workflows/publish-release.yml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/.gitignore (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/Dockerfile (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/LICENSE (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/README.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/admin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/forms.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/migrations/0001_initial.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/migrations/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/models.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/templatetags/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/user_login_backend.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/utils.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/accounts/views.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/admin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/context_processors.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/documents.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/forms.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/build_index.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/build_search_words.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/clear_cache.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/create_testdata.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/ping_baidu.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/management/commands/sync_user_avatar.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/middleware.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/0001_initial.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/migrations/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/models.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/search_indexes.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/templatetags/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/templatetags/blog_tags.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/blog/views.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/admin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/forms.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/migrations/0001_initial.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/migrations/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/models.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/templatetags/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/templatetags/comments_tags.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/utils.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/comments/views.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/docker-compose/docker-compose.yml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/entrypoint.sh (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/configmap.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/deployment.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/gateway.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/pv.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/pvc.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/service.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/k8s/storageclass.yaml (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/deploy/nginx.conf (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/admin_site.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/blog_signals.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/elasticsearch_backend.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/feeds.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/logentryadmin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/plugin_manage/hooks.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/plugin_manage/loader.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/settings.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/sitemap.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/spider_notify.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/utils.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/whoosh_cn_backend.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/djangoblog/wsgi.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/README-en.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/config-en.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/config.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/docker-en.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/docker.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/es.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/imgs/alipay.jpg (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/imgs/pycharm_logo.png (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/imgs/wechat.jpg (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/k8s-en.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/docs/k8s.md (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/locale/en/LC_MESSAGES/django.po (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/manage.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/admin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/forms.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/migrations/0001_initial.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/migrations/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/models.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/oauthmanager.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/templatetags/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/templatetags/oauth_tags.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/oauth/views.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/admin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/migrations/0001_initial.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/migrations/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/models.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/owntracks/views.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/article_copyright/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/article_copyright/plugin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/external_links/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/external_links/plugin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/reading_time/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/reading_time/plugin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/seo_optimizer/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/seo_optimizer/plugin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/view_count/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/plugins/view_count/plugin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/requirements.txt (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/MemcacheStorage.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/admin.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/api/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/api/blogapi.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/api/commonapi.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/apps.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/migrations/0001_initial.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/migrations/__init__.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/models.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/robot.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/tests.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/urls.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/servermanager/views.py (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/account/forget_password.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/account/login.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/account/registration_form.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/account/result.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/article_archives.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/article_detail.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/article_index.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/error_page.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/links_list.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/tags/article_info.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/tags/article_meta_info.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/tags/article_pagination.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/tags/article_tag_list.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/tags/breadcrumb.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/blog/tags/sidebar.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/comments/tags/comment_item.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/comments/tags/comment_item_tree.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/comments/tags/comment_list.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/comments/tags/post_comment.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/oauth/bindsuccess.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/oauth/oauth_applications.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/oauth/require_email.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/owntracks/show_log_dates.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/owntracks/show_maps.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/search/indexes/blog/article_text.txt (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/search/search.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/share_layout/adsense.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/share_layout/base.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/share_layout/base_account.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/share_layout/footer.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/share_layout/nav.html (100%)
 rename src/{DjangoBlog-master_1 => }/DjangoBlog-master/templates/share_layout/nav_node.html (100%)
 delete mode 100644 src/DjangoBlog-master_1/.idea/.gitignore
 delete mode 100644 src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml
 delete mode 100644 src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 src/DjangoBlog-master_1/.idea/misc.xml
 delete mode 100644 src/DjangoBlog-master_1/.idea/modules.xml
 delete mode 100644 src/DjangoBlog-master_1/.idea/vcs.xml
 delete mode 100644 src/context_processors.py
 delete mode 100644 src/test.py

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 10b731c..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
diff --git a/.idea/Django.iml b/.idea/Django.iml
deleted file mode 100644
index 460d402..0000000
--- a/.idea/Django.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.13" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/django.iml b/.idea/django.iml
deleted file mode 100644
index f4995de..0000000
--- a/.idea/django.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-  <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
-    <option name="TEMPLATE_FOLDERS">
-      <list>
-        <option value="$MODULE_DIR$/src/DjangoBlog-master/DjangoBlog-master/templates" />
-      </list>
-    </option>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 5c72c3f..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <list>
-          <option value="bleach" />
-          <option value="borax" />
-          <option value="bottle" />
-          <option value="certifi" />
-          <option value="cffi" />
-          <option value="charset-normalizer" />
-          <option value="colorama" />
-          <option value="coverage" />
-          <option value="Django" />
-          <option value="django-appconf" />
-          <option value="django-compressor" />
-          <option value="django-echarts" />
-          <option value="django-haystack" />
-          <option value="django-ipware" />
-          <option value="django-mdeditor" />
-          <option value="django-uuslug" />
-          <option value="elasticsearch" />
-          <option value="elasticsearch-dsl" />
-          <option value="frozenlist" />
-          <option value="gevent" />
-          <option value="greenlet" />
-          <option value="htmlgenerator" />
-          <option value="idna" />
-          <option value="jieba" />
-          <option value="Jinja2" />
-          <option value="jsonpickle" />
-          <option value="Markdown" />
-          <option value="MarkupSafe" />
-          <option value="multidict" />
-          <option value="mysqlclient" />
-          <option value="openai" />
-          <option value="packaging" />
-          <option value="pillow" />
-          <option value="prettytable" />
-          <option value="propcache" />
-          <option value="pycparser" />
-          <option value="pyecharts" />
-          <option value="Pygments" />
-          <option value="python-dateutil" />
-          <option value="python-ipware" />
-          <option value="python-logstash" />
-          <option value="python-slugify" />
-          <option value="pytz" />
-          <option value="rcssmin" />
-          <option value="redis" />
-          <option value="requests" />
-          <option value="rjsmin" />
-          <option value="setuptools" />
-          <option value="simplejson" />
-          <option value="six" />
-          <option value="sqlparse" />
-          <option value="text-unidecode" />
-          <option value="tqdm" />
-          <option value="typing_extensions" />
-          <option value="tzdata" />
-          <option value="ua-parser" />
-          <option value="ua-parser-builtins" />
-          <option value="urllib3" />
-          <option value="user-agents" />
-          <option value="wcwidth" />
-          <option value="webencodings" />
-          <option value="WeRoBot" />
-          <option value="Whoosh" />
-          <option value="xmltodict" />
-          <option value="yarl" />
-          <option value="zope.event" />
-          <option value="zope.interface" />
-        </list>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 991141f..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings><!-- 配置设置区域 -->
-    <option name="USE_PROJECT_PROFILE" value="false" /><!-- 配置选项：是否使用项目配置文件，当前设置为不使用（false） -->
-    <version value="1.0" /><!-- 配置版本信息，当前版本为1.0 -->
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 1d3ce46..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.13" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 340639d..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Django.iml" filepath="$PROJECT_DIR$/.idea/Django.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 93a14a3..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/src/DjangoBlog-master/DjangoBlog" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 2848a40..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="feebdecb-aab4-468a-89d2-02ab184d6524" name="更改" comment="注释">
-      <change beforePath="$PROJECT_DIR$/.idea/django.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/django.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/DjangoBlog-master/.idea/inspectionProfiles/profiles_settings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/DjangoBlog-master/.idea/inspectionProfiles/profiles_settings.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="main" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;customColor&quot;: &quot;&quot;,
-  &quot;associatedIndex&quot;: 1
-}</component>
-  <component name="ProjectId" id="33xBFgI9uhuAj9lNSHkgcMEmGEr" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "RunOnceActivity.OpenDjangoStructureViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "last_opened_file_path": "C:/Users/35500/Desktop/软件工程与方法学/django",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="RunManager">
-    <configuration name="django" type="Python.DjangoServer" factoryName="Django server">
-      <module name="django" />
-      <option name="ENV_FILES" value="" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="launchJavascriptDebuger" value="false" />
-      <option name="port" value="8000" />
-      <option name="host" value="" />
-      <option name="additionalOptions" value="" />
-      <option name="browserUrl" value="" />
-      <option name="runTestServer" value="false" />
-      <option name="runNoReload" value="false" />
-      <option name="useCustomRunCommand" value="false" />
-      <option name="customRunCommand" value="" />
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-js-predefined-d6986cc7102b-b598e85cdad2-JavaScript-PY-252.25557.178" />
-        <option value="bundled-python-sdk-ce6832f46686-7b97d883f26b-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.25557.178" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="feebdecb-aab4-468a-89d2-02ab184d6524" name="更改" comment="" />
-      <created>1760248745025</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1760248745025</updated>
-      <workItem from="1760248747064" duration="34000" />
-      <workItem from="1760248891758" duration="6962000" />
-      <workItem from="1760271313858" duration="27000" />
-      <workItem from="1760271342012" duration="835000" />
-      <workItem from="1760851293582" duration="1237000" />
-      <workItem from="1760852569906" duration="605000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index a2629a5..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Django
-
diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore
deleted file mode 100644
index 10b731c..0000000
--- a/src/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
diff --git a/src/.idea/inspectionProfiles/profiles_settings.xml b/src/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/src/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml
deleted file mode 100644
index 43073ce..0000000
--- a/src/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (DjangoBlog-master)" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml
deleted file mode 100644
index f669a0e..0000000
--- a/src/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/.idea/src.iml b/src/.idea/src.iml
deleted file mode 100644
index 9b14324..0000000
--- a/src/.idea/src.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.11 (DjangoBlog-master)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/src/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/Django b/src/Django
deleted file mode 160000
index 51c0763..0000000
--- a/src/Django
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51c0763b7938a4b2616c068e850998ad2b00973e
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.coveragerc b/src/DjangoBlog-master/.coveragerc
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.coveragerc
rename to src/DjangoBlog-master/.coveragerc
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.dockerignore b/src/DjangoBlog-master/.dockerignore
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.dockerignore
rename to src/DjangoBlog-master/.dockerignore
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.gitattributes b/src/DjangoBlog-master/.gitattributes
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.gitattributes
rename to src/DjangoBlog-master/.gitattributes
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/ISSUE_TEMPLATE.md b/src/DjangoBlog-master/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/ISSUE_TEMPLATE.md
rename to src/DjangoBlog-master/.github/ISSUE_TEMPLATE.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/codeql-analysis.yml b/src/DjangoBlog-master/.github/workflows/codeql-analysis.yml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/codeql-analysis.yml
rename to src/DjangoBlog-master/.github/workflows/codeql-analysis.yml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/django.yml b/src/DjangoBlog-master/.github/workflows/django.yml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/django.yml
rename to src/DjangoBlog-master/.github/workflows/django.yml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/docker.yml b/src/DjangoBlog-master/.github/workflows/docker.yml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/docker.yml
rename to src/DjangoBlog-master/.github/workflows/docker.yml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/publish-release.yml b/src/DjangoBlog-master/.github/workflows/publish-release.yml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.github/workflows/publish-release.yml
rename to src/DjangoBlog-master/.github/workflows/publish-release.yml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/.gitignore b/src/DjangoBlog-master/.gitignore
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/.gitignore
rename to src/DjangoBlog-master/.gitignore
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/Dockerfile b/src/DjangoBlog-master/Dockerfile
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/Dockerfile
rename to src/DjangoBlog-master/Dockerfile
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/LICENSE b/src/DjangoBlog-master/LICENSE
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/LICENSE
rename to src/DjangoBlog-master/LICENSE
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/README.md b/src/DjangoBlog-master/README.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/README.md
rename to src/DjangoBlog-master/README.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/__init__.py b/src/DjangoBlog-master/accounts/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/__init__.py
rename to src/DjangoBlog-master/accounts/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/admin.py b/src/DjangoBlog-master/accounts/admin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/admin.py
rename to src/DjangoBlog-master/accounts/admin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/apps.py b/src/DjangoBlog-master/accounts/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/apps.py
rename to src/DjangoBlog-master/accounts/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/forms.py b/src/DjangoBlog-master/accounts/forms.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/forms.py
rename to src/DjangoBlog-master/accounts/forms.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0001_initial.py b/src/DjangoBlog-master/accounts/migrations/0001_initial.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0001_initial.py
rename to src/DjangoBlog-master/accounts/migrations/0001_initial.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py b/src/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py
rename to src/DjangoBlog-master/accounts/migrations/0002_alter_bloguser_options_remove_bloguser_created_time_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/__init__.py b/src/DjangoBlog-master/accounts/migrations/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/migrations/__init__.py
rename to src/DjangoBlog-master/accounts/migrations/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/models.py b/src/DjangoBlog-master/accounts/models.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/models.py
rename to src/DjangoBlog-master/accounts/models.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/templatetags/__init__.py b/src/DjangoBlog-master/accounts/templatetags/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/templatetags/__init__.py
rename to src/DjangoBlog-master/accounts/templatetags/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/tests.py b/src/DjangoBlog-master/accounts/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/tests.py
rename to src/DjangoBlog-master/accounts/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/urls.py b/src/DjangoBlog-master/accounts/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/urls.py
rename to src/DjangoBlog-master/accounts/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/user_login_backend.py b/src/DjangoBlog-master/accounts/user_login_backend.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/user_login_backend.py
rename to src/DjangoBlog-master/accounts/user_login_backend.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/utils.py b/src/DjangoBlog-master/accounts/utils.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/utils.py
rename to src/DjangoBlog-master/accounts/utils.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/accounts/views.py b/src/DjangoBlog-master/accounts/views.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/accounts/views.py
rename to src/DjangoBlog-master/accounts/views.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/__init__.py b/src/DjangoBlog-master/blog/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/__init__.py
rename to src/DjangoBlog-master/blog/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/admin.py b/src/DjangoBlog-master/blog/admin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/admin.py
rename to src/DjangoBlog-master/blog/admin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/apps.py b/src/DjangoBlog-master/blog/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/apps.py
rename to src/DjangoBlog-master/blog/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/context_processors.py b/src/DjangoBlog-master/blog/context_processors.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/context_processors.py
rename to src/DjangoBlog-master/blog/context_processors.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/documents.py b/src/DjangoBlog-master/blog/documents.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/documents.py
rename to src/DjangoBlog-master/blog/documents.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/forms.py b/src/DjangoBlog-master/blog/forms.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/forms.py
rename to src/DjangoBlog-master/blog/forms.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/__init__.py b/src/DjangoBlog-master/blog/management/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/__init__.py
rename to src/DjangoBlog-master/blog/management/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/__init__.py b/src/DjangoBlog-master/blog/management/commands/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/__init__.py
rename to src/DjangoBlog-master/blog/management/commands/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_index.py b/src/DjangoBlog-master/blog/management/commands/build_index.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_index.py
rename to src/DjangoBlog-master/blog/management/commands/build_index.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_search_words.py b/src/DjangoBlog-master/blog/management/commands/build_search_words.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/build_search_words.py
rename to src/DjangoBlog-master/blog/management/commands/build_search_words.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/clear_cache.py b/src/DjangoBlog-master/blog/management/commands/clear_cache.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/clear_cache.py
rename to src/DjangoBlog-master/blog/management/commands/clear_cache.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/create_testdata.py b/src/DjangoBlog-master/blog/management/commands/create_testdata.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/create_testdata.py
rename to src/DjangoBlog-master/blog/management/commands/create_testdata.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/ping_baidu.py b/src/DjangoBlog-master/blog/management/commands/ping_baidu.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/ping_baidu.py
rename to src/DjangoBlog-master/blog/management/commands/ping_baidu.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/sync_user_avatar.py b/src/DjangoBlog-master/blog/management/commands/sync_user_avatar.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/management/commands/sync_user_avatar.py
rename to src/DjangoBlog-master/blog/management/commands/sync_user_avatar.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/middleware.py b/src/DjangoBlog-master/blog/middleware.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/middleware.py
rename to src/DjangoBlog-master/blog/middleware.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0001_initial.py b/src/DjangoBlog-master/blog/migrations/0001_initial.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0001_initial.py
rename to src/DjangoBlog-master/blog/migrations/0001_initial.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py b/src/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py
rename to src/DjangoBlog-master/blog/migrations/0002_blogsettings_global_footer_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py b/src/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py
rename to src/DjangoBlog-master/blog/migrations/0003_blogsettings_comment_need_review.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py b/src/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py
rename to src/DjangoBlog-master/blog/migrations/0004_rename_analyticscode_blogsettings_analytics_code_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py b/src/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py
rename to src/DjangoBlog-master/blog/migrations/0005_alter_article_options_alter_category_options_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py b/src/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py
rename to src/DjangoBlog-master/blog/migrations/0006_alter_blogsettings_options.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/__init__.py b/src/DjangoBlog-master/blog/migrations/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/migrations/__init__.py
rename to src/DjangoBlog-master/blog/migrations/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/models.py b/src/DjangoBlog-master/blog/models.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/models.py
rename to src/DjangoBlog-master/blog/models.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/search_indexes.py b/src/DjangoBlog-master/blog/search_indexes.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/search_indexes.py
rename to src/DjangoBlog-master/blog/search_indexes.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/__init__.py b/src/DjangoBlog-master/blog/templatetags/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/__init__.py
rename to src/DjangoBlog-master/blog/templatetags/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/blog_tags.py b/src/DjangoBlog-master/blog/templatetags/blog_tags.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/templatetags/blog_tags.py
rename to src/DjangoBlog-master/blog/templatetags/blog_tags.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/tests.py b/src/DjangoBlog-master/blog/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/tests.py
rename to src/DjangoBlog-master/blog/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/urls.py b/src/DjangoBlog-master/blog/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/urls.py
rename to src/DjangoBlog-master/blog/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/blog/views.py b/src/DjangoBlog-master/blog/views.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/blog/views.py
rename to src/DjangoBlog-master/blog/views.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/__init__.py b/src/DjangoBlog-master/comments/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/__init__.py
rename to src/DjangoBlog-master/comments/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/admin.py b/src/DjangoBlog-master/comments/admin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/admin.py
rename to src/DjangoBlog-master/comments/admin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/apps.py b/src/DjangoBlog-master/comments/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/apps.py
rename to src/DjangoBlog-master/comments/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/forms.py b/src/DjangoBlog-master/comments/forms.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/forms.py
rename to src/DjangoBlog-master/comments/forms.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0001_initial.py b/src/DjangoBlog-master/comments/migrations/0001_initial.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0001_initial.py
rename to src/DjangoBlog-master/comments/migrations/0001_initial.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py b/src/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py
rename to src/DjangoBlog-master/comments/migrations/0002_alter_comment_is_enable.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py b/src/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py
rename to src/DjangoBlog-master/comments/migrations/0003_alter_comment_options_remove_comment_created_time_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/__init__.py b/src/DjangoBlog-master/comments/migrations/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/migrations/__init__.py
rename to src/DjangoBlog-master/comments/migrations/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/models.py b/src/DjangoBlog-master/comments/models.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/models.py
rename to src/DjangoBlog-master/comments/models.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/__init__.py b/src/DjangoBlog-master/comments/templatetags/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/__init__.py
rename to src/DjangoBlog-master/comments/templatetags/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/comments_tags.py b/src/DjangoBlog-master/comments/templatetags/comments_tags.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/templatetags/comments_tags.py
rename to src/DjangoBlog-master/comments/templatetags/comments_tags.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/tests.py b/src/DjangoBlog-master/comments/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/tests.py
rename to src/DjangoBlog-master/comments/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/urls.py b/src/DjangoBlog-master/comments/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/urls.py
rename to src/DjangoBlog-master/comments/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/utils.py b/src/DjangoBlog-master/comments/utils.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/utils.py
rename to src/DjangoBlog-master/comments/utils.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/comments/views.py b/src/DjangoBlog-master/comments/views.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/comments/views.py
rename to src/DjangoBlog-master/comments/views.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml b/src/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml
rename to src/DjangoBlog-master/deploy/docker-compose/docker-compose.es.yml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.yml b/src/DjangoBlog-master/deploy/docker-compose/docker-compose.yml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/docker-compose/docker-compose.yml
rename to src/DjangoBlog-master/deploy/docker-compose/docker-compose.yml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/entrypoint.sh b/src/DjangoBlog-master/deploy/entrypoint.sh
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/entrypoint.sh
rename to src/DjangoBlog-master/deploy/entrypoint.sh
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/configmap.yaml b/src/DjangoBlog-master/deploy/k8s/configmap.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/configmap.yaml
rename to src/DjangoBlog-master/deploy/k8s/configmap.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/deployment.yaml b/src/DjangoBlog-master/deploy/k8s/deployment.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/deployment.yaml
rename to src/DjangoBlog-master/deploy/k8s/deployment.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/gateway.yaml b/src/DjangoBlog-master/deploy/k8s/gateway.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/gateway.yaml
rename to src/DjangoBlog-master/deploy/k8s/gateway.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pv.yaml b/src/DjangoBlog-master/deploy/k8s/pv.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pv.yaml
rename to src/DjangoBlog-master/deploy/k8s/pv.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pvc.yaml b/src/DjangoBlog-master/deploy/k8s/pvc.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/pvc.yaml
rename to src/DjangoBlog-master/deploy/k8s/pvc.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/service.yaml b/src/DjangoBlog-master/deploy/k8s/service.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/service.yaml
rename to src/DjangoBlog-master/deploy/k8s/service.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/storageclass.yaml b/src/DjangoBlog-master/deploy/k8s/storageclass.yaml
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/k8s/storageclass.yaml
rename to src/DjangoBlog-master/deploy/k8s/storageclass.yaml
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/deploy/nginx.conf b/src/DjangoBlog-master/deploy/nginx.conf
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/deploy/nginx.conf
rename to src/DjangoBlog-master/deploy/nginx.conf
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/__init__.py b/src/DjangoBlog-master/djangoblog/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/__init__.py
rename to src/DjangoBlog-master/djangoblog/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/admin_site.py b/src/DjangoBlog-master/djangoblog/admin_site.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/admin_site.py
rename to src/DjangoBlog-master/djangoblog/admin_site.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/apps.py b/src/DjangoBlog-master/djangoblog/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/apps.py
rename to src/DjangoBlog-master/djangoblog/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/blog_signals.py b/src/DjangoBlog-master/djangoblog/blog_signals.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/blog_signals.py
rename to src/DjangoBlog-master/djangoblog/blog_signals.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/elasticsearch_backend.py b/src/DjangoBlog-master/djangoblog/elasticsearch_backend.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/elasticsearch_backend.py
rename to src/DjangoBlog-master/djangoblog/elasticsearch_backend.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/feeds.py b/src/DjangoBlog-master/djangoblog/feeds.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/feeds.py
rename to src/DjangoBlog-master/djangoblog/feeds.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/logentryadmin.py b/src/DjangoBlog-master/djangoblog/logentryadmin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/logentryadmin.py
rename to src/DjangoBlog-master/djangoblog/logentryadmin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py b/src/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py
rename to src/DjangoBlog-master/djangoblog/plugin_manage/base_plugin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py b/src/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py
rename to src/DjangoBlog-master/djangoblog/plugin_manage/hook_constants.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hooks.py b/src/DjangoBlog-master/djangoblog/plugin_manage/hooks.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/hooks.py
rename to src/DjangoBlog-master/djangoblog/plugin_manage/hooks.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/loader.py b/src/DjangoBlog-master/djangoblog/plugin_manage/loader.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/plugin_manage/loader.py
rename to src/DjangoBlog-master/djangoblog/plugin_manage/loader.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/settings.py b/src/DjangoBlog-master/djangoblog/settings.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/settings.py
rename to src/DjangoBlog-master/djangoblog/settings.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/sitemap.py b/src/DjangoBlog-master/djangoblog/sitemap.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/sitemap.py
rename to src/DjangoBlog-master/djangoblog/sitemap.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/spider_notify.py b/src/DjangoBlog-master/djangoblog/spider_notify.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/spider_notify.py
rename to src/DjangoBlog-master/djangoblog/spider_notify.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/tests.py b/src/DjangoBlog-master/djangoblog/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/tests.py
rename to src/DjangoBlog-master/djangoblog/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/urls.py b/src/DjangoBlog-master/djangoblog/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/urls.py
rename to src/DjangoBlog-master/djangoblog/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/utils.py b/src/DjangoBlog-master/djangoblog/utils.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/utils.py
rename to src/DjangoBlog-master/djangoblog/utils.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/whoosh_cn_backend.py b/src/DjangoBlog-master/djangoblog/whoosh_cn_backend.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/whoosh_cn_backend.py
rename to src/DjangoBlog-master/djangoblog/whoosh_cn_backend.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/wsgi.py b/src/DjangoBlog-master/djangoblog/wsgi.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/djangoblog/wsgi.py
rename to src/DjangoBlog-master/djangoblog/wsgi.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/README-en.md b/src/DjangoBlog-master/docs/README-en.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/README-en.md
rename to src/DjangoBlog-master/docs/README-en.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/config-en.md b/src/DjangoBlog-master/docs/config-en.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/config-en.md
rename to src/DjangoBlog-master/docs/config-en.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/config.md b/src/DjangoBlog-master/docs/config.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/config.md
rename to src/DjangoBlog-master/docs/config.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/docker-en.md b/src/DjangoBlog-master/docs/docker-en.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/docker-en.md
rename to src/DjangoBlog-master/docs/docker-en.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/docker.md b/src/DjangoBlog-master/docs/docker.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/docker.md
rename to src/DjangoBlog-master/docs/docker.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/es.md b/src/DjangoBlog-master/docs/es.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/es.md
rename to src/DjangoBlog-master/docs/es.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/alipay.jpg b/src/DjangoBlog-master/docs/imgs/alipay.jpg
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/alipay.jpg
rename to src/DjangoBlog-master/docs/imgs/alipay.jpg
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/pycharm_logo.png b/src/DjangoBlog-master/docs/imgs/pycharm_logo.png
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/pycharm_logo.png
rename to src/DjangoBlog-master/docs/imgs/pycharm_logo.png
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/wechat.jpg b/src/DjangoBlog-master/docs/imgs/wechat.jpg
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/imgs/wechat.jpg
rename to src/DjangoBlog-master/docs/imgs/wechat.jpg
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s-en.md b/src/DjangoBlog-master/docs/k8s-en.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s-en.md
rename to src/DjangoBlog-master/docs/k8s-en.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s.md b/src/DjangoBlog-master/docs/k8s.md
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/docs/k8s.md
rename to src/DjangoBlog-master/docs/k8s.md
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo b/src/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo
rename to src/DjangoBlog-master/locale/en/LC_MESSAGES/django.mo
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.po b/src/DjangoBlog-master/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/en/LC_MESSAGES/django.po
rename to src/DjangoBlog-master/locale/en/LC_MESSAGES/django.po
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo b/src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo
rename to src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.mo
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po b/src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po
rename to src/DjangoBlog-master/locale/zh_Hans/LC_MESSAGES/django.po
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo b/src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo
rename to src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.mo
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po b/src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po
rename to src/DjangoBlog-master/locale/zh_Hant/LC_MESSAGES/django.po
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/manage.py b/src/DjangoBlog-master/manage.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/manage.py
rename to src/DjangoBlog-master/manage.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/__init__.py b/src/DjangoBlog-master/oauth/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/__init__.py
rename to src/DjangoBlog-master/oauth/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/admin.py b/src/DjangoBlog-master/oauth/admin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/admin.py
rename to src/DjangoBlog-master/oauth/admin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/apps.py b/src/DjangoBlog-master/oauth/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/apps.py
rename to src/DjangoBlog-master/oauth/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/forms.py b/src/DjangoBlog-master/oauth/forms.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/forms.py
rename to src/DjangoBlog-master/oauth/forms.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0001_initial.py b/src/DjangoBlog-master/oauth/migrations/0001_initial.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0001_initial.py
rename to src/DjangoBlog-master/oauth/migrations/0001_initial.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py b/src/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py
rename to src/DjangoBlog-master/oauth/migrations/0002_alter_oauthconfig_options_alter_oauthuser_options_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py b/src/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py
rename to src/DjangoBlog-master/oauth/migrations/0003_alter_oauthuser_nickname.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/__init__.py b/src/DjangoBlog-master/oauth/migrations/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/migrations/__init__.py
rename to src/DjangoBlog-master/oauth/migrations/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/models.py b/src/DjangoBlog-master/oauth/models.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/models.py
rename to src/DjangoBlog-master/oauth/models.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/oauthmanager.py b/src/DjangoBlog-master/oauth/oauthmanager.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/oauthmanager.py
rename to src/DjangoBlog-master/oauth/oauthmanager.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/__init__.py b/src/DjangoBlog-master/oauth/templatetags/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/__init__.py
rename to src/DjangoBlog-master/oauth/templatetags/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/oauth_tags.py b/src/DjangoBlog-master/oauth/templatetags/oauth_tags.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/templatetags/oauth_tags.py
rename to src/DjangoBlog-master/oauth/templatetags/oauth_tags.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/tests.py b/src/DjangoBlog-master/oauth/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/tests.py
rename to src/DjangoBlog-master/oauth/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/urls.py b/src/DjangoBlog-master/oauth/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/urls.py
rename to src/DjangoBlog-master/oauth/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/oauth/views.py b/src/DjangoBlog-master/oauth/views.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/oauth/views.py
rename to src/DjangoBlog-master/oauth/views.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/__init__.py b/src/DjangoBlog-master/owntracks/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/__init__.py
rename to src/DjangoBlog-master/owntracks/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/admin.py b/src/DjangoBlog-master/owntracks/admin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/admin.py
rename to src/DjangoBlog-master/owntracks/admin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/apps.py b/src/DjangoBlog-master/owntracks/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/apps.py
rename to src/DjangoBlog-master/owntracks/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0001_initial.py b/src/DjangoBlog-master/owntracks/migrations/0001_initial.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0001_initial.py
rename to src/DjangoBlog-master/owntracks/migrations/0001_initial.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py b/src/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py
rename to src/DjangoBlog-master/owntracks/migrations/0002_alter_owntracklog_options_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/__init__.py b/src/DjangoBlog-master/owntracks/migrations/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/migrations/__init__.py
rename to src/DjangoBlog-master/owntracks/migrations/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/models.py b/src/DjangoBlog-master/owntracks/models.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/models.py
rename to src/DjangoBlog-master/owntracks/models.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/tests.py b/src/DjangoBlog-master/owntracks/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/tests.py
rename to src/DjangoBlog-master/owntracks/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/urls.py b/src/DjangoBlog-master/owntracks/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/urls.py
rename to src/DjangoBlog-master/owntracks/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/owntracks/views.py b/src/DjangoBlog-master/owntracks/views.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/owntracks/views.py
rename to src/DjangoBlog-master/owntracks/views.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/__init__.py b/src/DjangoBlog-master/plugins/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/__init__.py
rename to src/DjangoBlog-master/plugins/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/__init__.py b/src/DjangoBlog-master/plugins/article_copyright/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/__init__.py
rename to src/DjangoBlog-master/plugins/article_copyright/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/plugin.py b/src/DjangoBlog-master/plugins/article_copyright/plugin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/article_copyright/plugin.py
rename to src/DjangoBlog-master/plugins/article_copyright/plugin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/__init__.py b/src/DjangoBlog-master/plugins/external_links/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/__init__.py
rename to src/DjangoBlog-master/plugins/external_links/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/plugin.py b/src/DjangoBlog-master/plugins/external_links/plugin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/external_links/plugin.py
rename to src/DjangoBlog-master/plugins/external_links/plugin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/__init__.py b/src/DjangoBlog-master/plugins/reading_time/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/__init__.py
rename to src/DjangoBlog-master/plugins/reading_time/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/plugin.py b/src/DjangoBlog-master/plugins/reading_time/plugin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/reading_time/plugin.py
rename to src/DjangoBlog-master/plugins/reading_time/plugin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/__init__.py b/src/DjangoBlog-master/plugins/seo_optimizer/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/__init__.py
rename to src/DjangoBlog-master/plugins/seo_optimizer/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/plugin.py b/src/DjangoBlog-master/plugins/seo_optimizer/plugin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/seo_optimizer/plugin.py
rename to src/DjangoBlog-master/plugins/seo_optimizer/plugin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/__init__.py b/src/DjangoBlog-master/plugins/view_count/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/__init__.py
rename to src/DjangoBlog-master/plugins/view_count/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/plugin.py b/src/DjangoBlog-master/plugins/view_count/plugin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/plugins/view_count/plugin.py
rename to src/DjangoBlog-master/plugins/view_count/plugin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/requirements.txt b/src/DjangoBlog-master/requirements.txt
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/requirements.txt
rename to src/DjangoBlog-master/requirements.txt
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/MemcacheStorage.py b/src/DjangoBlog-master/servermanager/MemcacheStorage.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/MemcacheStorage.py
rename to src/DjangoBlog-master/servermanager/MemcacheStorage.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/__init__.py b/src/DjangoBlog-master/servermanager/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/__init__.py
rename to src/DjangoBlog-master/servermanager/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/admin.py b/src/DjangoBlog-master/servermanager/admin.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/admin.py
rename to src/DjangoBlog-master/servermanager/admin.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/__init__.py b/src/DjangoBlog-master/servermanager/api/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/__init__.py
rename to src/DjangoBlog-master/servermanager/api/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/blogapi.py b/src/DjangoBlog-master/servermanager/api/blogapi.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/blogapi.py
rename to src/DjangoBlog-master/servermanager/api/blogapi.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/commonapi.py b/src/DjangoBlog-master/servermanager/api/commonapi.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/api/commonapi.py
rename to src/DjangoBlog-master/servermanager/api/commonapi.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/apps.py b/src/DjangoBlog-master/servermanager/apps.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/apps.py
rename to src/DjangoBlog-master/servermanager/apps.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0001_initial.py b/src/DjangoBlog-master/servermanager/migrations/0001_initial.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0001_initial.py
rename to src/DjangoBlog-master/servermanager/migrations/0001_initial.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py b/src/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py
rename to src/DjangoBlog-master/servermanager/migrations/0002_alter_emailsendlog_options_and_more.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/__init__.py b/src/DjangoBlog-master/servermanager/migrations/__init__.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/migrations/__init__.py
rename to src/DjangoBlog-master/servermanager/migrations/__init__.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/models.py b/src/DjangoBlog-master/servermanager/models.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/models.py
rename to src/DjangoBlog-master/servermanager/models.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/robot.py b/src/DjangoBlog-master/servermanager/robot.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/robot.py
rename to src/DjangoBlog-master/servermanager/robot.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/tests.py b/src/DjangoBlog-master/servermanager/tests.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/tests.py
rename to src/DjangoBlog-master/servermanager/tests.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/urls.py b/src/DjangoBlog-master/servermanager/urls.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/urls.py
rename to src/DjangoBlog-master/servermanager/urls.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/servermanager/views.py b/src/DjangoBlog-master/servermanager/views.py
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/servermanager/views.py
rename to src/DjangoBlog-master/servermanager/views.py
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/forget_password.html b/src/DjangoBlog-master/templates/account/forget_password.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/forget_password.html
rename to src/DjangoBlog-master/templates/account/forget_password.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/login.html b/src/DjangoBlog-master/templates/account/login.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/login.html
rename to src/DjangoBlog-master/templates/account/login.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/registration_form.html b/src/DjangoBlog-master/templates/account/registration_form.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/registration_form.html
rename to src/DjangoBlog-master/templates/account/registration_form.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/account/result.html b/src/DjangoBlog-master/templates/account/result.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/account/result.html
rename to src/DjangoBlog-master/templates/account/result.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_archives.html b/src/DjangoBlog-master/templates/blog/article_archives.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_archives.html
rename to src/DjangoBlog-master/templates/blog/article_archives.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_detail.html b/src/DjangoBlog-master/templates/blog/article_detail.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_detail.html
rename to src/DjangoBlog-master/templates/blog/article_detail.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_index.html b/src/DjangoBlog-master/templates/blog/article_index.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/article_index.html
rename to src/DjangoBlog-master/templates/blog/article_index.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/error_page.html b/src/DjangoBlog-master/templates/blog/error_page.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/error_page.html
rename to src/DjangoBlog-master/templates/blog/error_page.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/links_list.html b/src/DjangoBlog-master/templates/blog/links_list.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/links_list.html
rename to src/DjangoBlog-master/templates/blog/links_list.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_info.html b/src/DjangoBlog-master/templates/blog/tags/article_info.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_info.html
rename to src/DjangoBlog-master/templates/blog/tags/article_info.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_meta_info.html b/src/DjangoBlog-master/templates/blog/tags/article_meta_info.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_meta_info.html
rename to src/DjangoBlog-master/templates/blog/tags/article_meta_info.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_pagination.html b/src/DjangoBlog-master/templates/blog/tags/article_pagination.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_pagination.html
rename to src/DjangoBlog-master/templates/blog/tags/article_pagination.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_tag_list.html b/src/DjangoBlog-master/templates/blog/tags/article_tag_list.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/article_tag_list.html
rename to src/DjangoBlog-master/templates/blog/tags/article_tag_list.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/breadcrumb.html b/src/DjangoBlog-master/templates/blog/tags/breadcrumb.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/breadcrumb.html
rename to src/DjangoBlog-master/templates/blog/tags/breadcrumb.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/sidebar.html b/src/DjangoBlog-master/templates/blog/tags/sidebar.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/blog/tags/sidebar.html
rename to src/DjangoBlog-master/templates/blog/tags/sidebar.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item.html b/src/DjangoBlog-master/templates/comments/tags/comment_item.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item.html
rename to src/DjangoBlog-master/templates/comments/tags/comment_item.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item_tree.html b/src/DjangoBlog-master/templates/comments/tags/comment_item_tree.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_item_tree.html
rename to src/DjangoBlog-master/templates/comments/tags/comment_item_tree.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_list.html b/src/DjangoBlog-master/templates/comments/tags/comment_list.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/comment_list.html
rename to src/DjangoBlog-master/templates/comments/tags/comment_list.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/post_comment.html b/src/DjangoBlog-master/templates/comments/tags/post_comment.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/comments/tags/post_comment.html
rename to src/DjangoBlog-master/templates/comments/tags/post_comment.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/bindsuccess.html b/src/DjangoBlog-master/templates/oauth/bindsuccess.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/bindsuccess.html
rename to src/DjangoBlog-master/templates/oauth/bindsuccess.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/oauth_applications.html b/src/DjangoBlog-master/templates/oauth/oauth_applications.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/oauth_applications.html
rename to src/DjangoBlog-master/templates/oauth/oauth_applications.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/require_email.html b/src/DjangoBlog-master/templates/oauth/require_email.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/oauth/require_email.html
rename to src/DjangoBlog-master/templates/oauth/require_email.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_log_dates.html b/src/DjangoBlog-master/templates/owntracks/show_log_dates.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_log_dates.html
rename to src/DjangoBlog-master/templates/owntracks/show_log_dates.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_maps.html b/src/DjangoBlog-master/templates/owntracks/show_maps.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/owntracks/show_maps.html
rename to src/DjangoBlog-master/templates/owntracks/show_maps.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/search/indexes/blog/article_text.txt b/src/DjangoBlog-master/templates/search/indexes/blog/article_text.txt
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/search/indexes/blog/article_text.txt
rename to src/DjangoBlog-master/templates/search/indexes/blog/article_text.txt
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/search/search.html b/src/DjangoBlog-master/templates/search/search.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/search/search.html
rename to src/DjangoBlog-master/templates/search/search.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/adsense.html b/src/DjangoBlog-master/templates/share_layout/adsense.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/adsense.html
rename to src/DjangoBlog-master/templates/share_layout/adsense.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base.html b/src/DjangoBlog-master/templates/share_layout/base.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base.html
rename to src/DjangoBlog-master/templates/share_layout/base.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base_account.html b/src/DjangoBlog-master/templates/share_layout/base_account.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/base_account.html
rename to src/DjangoBlog-master/templates/share_layout/base_account.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/footer.html b/src/DjangoBlog-master/templates/share_layout/footer.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/footer.html
rename to src/DjangoBlog-master/templates/share_layout/footer.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav.html b/src/DjangoBlog-master/templates/share_layout/nav.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav.html
rename to src/DjangoBlog-master/templates/share_layout/nav.html
diff --git a/src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav_node.html b/src/DjangoBlog-master/templates/share_layout/nav_node.html
similarity index 100%
rename from src/DjangoBlog-master_1/DjangoBlog-master/templates/share_layout/nav_node.html
rename to src/DjangoBlog-master/templates/share_layout/nav_node.html
diff --git a/src/DjangoBlog-master_1/.idea/.gitignore b/src/DjangoBlog-master_1/.idea/.gitignore
deleted file mode 100644
index 359bb53..0000000
--- a/src/DjangoBlog-master_1/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
diff --git a/src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml b/src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml
deleted file mode 100644
index 566804d..0000000
--- a/src/DjangoBlog-master_1/.idea/DjangoBlog-master.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?> #11
-<module type="PYTHON_MODULE" version="4">
-=======
-<?xml version="1.0" encoding="UTF-8"?> 
-<module type="PYTHON_MODULE" version="4"> #当前版本是4
->>>>>>> 8581d5796cc6f0d8331faf265b42580ab31a2bea
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml b/src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/src/DjangoBlog-master_1/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/src/DjangoBlog-master_1/.idea/misc.xml b/src/DjangoBlog-master_1/.idea/misc.xml
deleted file mode 100644
index 7717a04..0000000
--- a/src/DjangoBlog-master_1/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.12 (pythonProject)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/src/DjangoBlog-master_1/.idea/modules.xml b/src/DjangoBlog-master_1/.idea/modules.xml
deleted file mode 100644
index 5494c00..0000000
--- a/src/DjangoBlog-master_1/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/DjangoBlog-master.iml" filepath="$PROJECT_DIR$/.idea/DjangoBlog-master.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/DjangoBlog-master_1/.idea/vcs.xml b/src/DjangoBlog-master_1/.idea/vcs.xml
deleted file mode 100644
index 2dd0ec8..0000000
--- a/src/DjangoBlog-master_1/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4"> #11
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/DjangoBlog" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/context_processors.py b/src/context_processors.py
deleted file mode 100644
index 98416db..0000000
--- a/src/context_processors.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import logging
-
-from django.utils import timezone
-
-from djangoblog.utils import cache, get_blog_setting
-from .models import Category, Article
-# 获取当前模块的logger对象
-logger = logging.getLogger(__name__)
-
-
-def seo_processor(requests):
-"""
-    SEO处理器函数，用于生成包含SEO相关信息和网站设置的上下文数据
-    该结果会被缓存以提高性能
-    Args:
-        requests: Django的request对象，用于获取当前请求信息     
-    Returns:
-        dict: 包含SEO设置和网站配置的字典
-    """
-# 缓存键名
-    key = 'seo_processor'
-# 尝试从缓存获取数据
-    value = cache.get(key)
-    if value:
-        return value
-    else:
-        logger.info('set processor cache.')
-   # 获取博客设置
-        setting = get_blog_setting()
-# 构建包含SEO和网站设置的字典
-        value = {
-           # 基本站点信息
-            'SITE_NAME': setting.site_name,
-          # 广告相关设置
-            'SHOW_GOOGLE_ADSENSE': setting.show_google_adsense,
-            'GOOGLE_ADSENSE_CODES': setting.google_adsense_codes,
-            'SITE_SEO_DESCRIPTION': setting.site_seo_description,
-            'SITE_DESCRIPTION': setting.site_description,
-            'SITE_KEYWORDS': setting.site_keywords,
-            'SITE_BASE_URL': requests.scheme + '://' + requests.get_host() + '/',
-               # 文章相关设置
-            'ARTICLE_SUB_LENGTH': setting.article_sub_length,
-                # 导航数据
-            'nav_category_list': Category.objects.all(),
-            'nav_pages': Article.objects.filter(
-                type='p',
-                status='p'),
-               # 评论系统设置
-            'OPEN_SITE_COMMENT': setting.open_site_comment,
-                # 备案和统计代码
-            'BEIAN_CODE': setting.beian_code,
-            'ANALYTICS_CODE': setting.analytics_code,
-            "BEIAN_CODE_GONGAN": setting.gongan_beiancode,
-            "SHOW_GONGAN_CODE": setting.show_gongan_code,
-               # 其他信息
-            "CURRENT_YEAR": timezone.now().year,
-            "GLOBAL_HEADER": setting.global_header,
-            "GLOBAL_FOOTER": setting.global_footer,
-            "COMMENT_NEED_REVIEW": setting.comment_need_review,
-        }
-         # 将结果缓存10小时(60秒*60分钟*10)
-        cache.set(key, value, 60 * 60 * 10)
-        return value
diff --git a/src/test.py b/src/test.py
deleted file mode 100644
index e69de29..0000000