Thank you very much for your comments on this site
You can visit %(article_title)s to review your comments, @@ -29,17 +19,10 @@ def send_comment_email(comment):Congratulations, you have successfully bound your email address. You can use @@ -182,7 +169,7 @@ def emailconfirm(request, id, sign): url = url + '?type=success' return HttpResponseRedirect(url) -# 绑定邮箱的表单视图 + class RequireEmailView(FormView): form_class = RequireEmailForm template_name = 'oauth/require_email.html' @@ -216,7 +203,6 @@ class RequireEmailView(FormView): oauthuser = get_object_or_404(OAuthUser, pk=oauthid) oauthuser.email = email oauthuser.save() - # 生成签名并发送绑定邮件 sign = get_sha256(settings.SECRET_KEY + str(oauthuser.id) + settings.SECRET_KEY) site = get_current_site().domain @@ -246,7 +232,7 @@ class RequireEmailView(FormView): url = url + '?type=email' return HttpResponseRedirect(url) -# 绑定成功页面 + def bindsuccess(request, oauthid): type = request.GET.get('type', None) oauthuser = get_object_or_404(OAuthUser, pk=oauthid) diff --git a/src/owntracks/migrations/__init__.py b/src/DjangoBlog/owntracks/__init__.py similarity index 100% rename from src/owntracks/migrations/__init__.py rename to src/DjangoBlog/owntracks/__init__.py diff --git a/src/DjangoBlog/owntracks/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/owntracks/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..ac9b286 Binary files /dev/null and b/src/DjangoBlog/owntracks/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/__pycache__/admin.cpython-310.pyc b/src/DjangoBlog/owntracks/__pycache__/admin.cpython-310.pyc new file mode 100644 index 0000000..e0568bb Binary files /dev/null and b/src/DjangoBlog/owntracks/__pycache__/admin.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/__pycache__/apps.cpython-310.pyc b/src/DjangoBlog/owntracks/__pycache__/apps.cpython-310.pyc new file mode 100644 index 0000000..cd9615a Binary files /dev/null and b/src/DjangoBlog/owntracks/__pycache__/apps.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/__pycache__/models.cpython-310.pyc b/src/DjangoBlog/owntracks/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000..2439f96 Binary files /dev/null and b/src/DjangoBlog/owntracks/__pycache__/models.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/__pycache__/urls.cpython-310.pyc b/src/DjangoBlog/owntracks/__pycache__/urls.cpython-310.pyc new file mode 100644 index 0000000..1c1ca7e Binary files /dev/null and b/src/DjangoBlog/owntracks/__pycache__/urls.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/__pycache__/views.cpython-310.pyc b/src/DjangoBlog/owntracks/__pycache__/views.cpython-310.pyc new file mode 100644 index 0000000..d7f66a9 Binary files /dev/null and b/src/DjangoBlog/owntracks/__pycache__/views.cpython-310.pyc differ diff --git a/src/owntracks/admin.py b/src/DjangoBlog/owntracks/admin.py similarity index 100% rename from src/owntracks/admin.py rename to src/DjangoBlog/owntracks/admin.py diff --git a/src/owntracks/apps.py b/src/DjangoBlog/owntracks/apps.py similarity index 100% rename from src/owntracks/apps.py rename to src/DjangoBlog/owntracks/apps.py diff --git a/src/owntracks/migrations/0001_initial.py b/src/DjangoBlog/owntracks/migrations/0001_initial.py similarity index 100% rename from src/owntracks/migrations/0001_initial.py rename to src/DjangoBlog/owntracks/migrations/0001_initial.py diff --git a/src/owntracks/migrations/0002_alter_owntracklog_options_and_more.py b/src/DjangoBlog/owntracks/migrations/0002_alter_owntracklog_options_and_more.py similarity index 100% rename from src/owntracks/migrations/0002_alter_owntracklog_options_and_more.py rename to src/DjangoBlog/owntracks/migrations/0002_alter_owntracklog_options_and_more.py diff --git a/src/servermanager/__init__.py b/src/DjangoBlog/owntracks/migrations/__init__.py similarity index 100% rename from src/servermanager/__init__.py rename to src/DjangoBlog/owntracks/migrations/__init__.py diff --git a/src/DjangoBlog/owntracks/migrations/__pycache__/0001_initial.cpython-310.pyc b/src/DjangoBlog/owntracks/migrations/__pycache__/0001_initial.cpython-310.pyc new file mode 100644 index 0000000..7d7ddb2 Binary files /dev/null and b/src/DjangoBlog/owntracks/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/migrations/__pycache__/0002_alter_owntracklog_options_and_more.cpython-310.pyc b/src/DjangoBlog/owntracks/migrations/__pycache__/0002_alter_owntracklog_options_and_more.cpython-310.pyc new file mode 100644 index 0000000..e6a9acb Binary files /dev/null and b/src/DjangoBlog/owntracks/migrations/__pycache__/0002_alter_owntracklog_options_and_more.cpython-310.pyc differ diff --git a/src/DjangoBlog/owntracks/migrations/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/owntracks/migrations/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..99d946a Binary files /dev/null and b/src/DjangoBlog/owntracks/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/owntracks/models.py b/src/DjangoBlog/owntracks/models.py similarity index 100% rename from src/owntracks/models.py rename to src/DjangoBlog/owntracks/models.py diff --git a/src/owntracks/tests.py b/src/DjangoBlog/owntracks/tests.py similarity index 100% rename from src/owntracks/tests.py rename to src/DjangoBlog/owntracks/tests.py diff --git a/src/owntracks/urls.py b/src/DjangoBlog/owntracks/urls.py similarity index 100% rename from src/owntracks/urls.py rename to src/DjangoBlog/owntracks/urls.py diff --git a/src/owntracks/views.py b/src/DjangoBlog/owntracks/views.py similarity index 100% rename from src/owntracks/views.py rename to src/DjangoBlog/owntracks/views.py diff --git a/src/plugins/__init__.py b/src/DjangoBlog/plugins/__init__.py similarity index 100% rename from src/plugins/__init__.py rename to src/DjangoBlog/plugins/__init__.py diff --git a/src/DjangoBlog/plugins/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/plugins/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..76f112e Binary files /dev/null and b/src/DjangoBlog/plugins/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/plugins/article_copyright/__init__.py b/src/DjangoBlog/plugins/article_copyright/__init__.py similarity index 100% rename from src/plugins/article_copyright/__init__.py rename to src/DjangoBlog/plugins/article_copyright/__init__.py diff --git a/src/DjangoBlog/plugins/article_copyright/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/plugins/article_copyright/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..554c46a Binary files /dev/null and b/src/DjangoBlog/plugins/article_copyright/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/DjangoBlog/plugins/article_copyright/__pycache__/plugin.cpython-310.pyc b/src/DjangoBlog/plugins/article_copyright/__pycache__/plugin.cpython-310.pyc new file mode 100644 index 0000000..7f973c6 Binary files /dev/null and b/src/DjangoBlog/plugins/article_copyright/__pycache__/plugin.cpython-310.pyc differ diff --git a/src/plugins/article_copyright/plugin.py b/src/DjangoBlog/plugins/article_copyright/plugin.py similarity index 88% rename from src/plugins/article_copyright/plugin.py rename to src/DjangoBlog/plugins/article_copyright/plugin.py index 5dba3b3..317fed2 100644 --- a/src/plugins/article_copyright/plugin.py +++ b/src/DjangoBlog/plugins/article_copyright/plugin.py @@ -22,11 +22,6 @@ class ArticleCopyrightPlugin(BasePlugin): article = kwargs.get('article') if not article: return content - - # 如果是摘要模式(首页),不添加版权声明 - is_summary = kwargs.get('is_summary', False) - if is_summary: - return content copyright_info = f"\n
本文由 {article.author.username} 原创,转载请注明出处。
" return content + copyright_info diff --git a/src/plugins/external_links/__init__.py b/src/DjangoBlog/plugins/external_links/__init__.py similarity index 100% rename from src/plugins/external_links/__init__.py rename to src/DjangoBlog/plugins/external_links/__init__.py diff --git a/src/DjangoBlog/plugins/external_links/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/plugins/external_links/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..29e23ea Binary files /dev/null and b/src/DjangoBlog/plugins/external_links/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/DjangoBlog/plugins/external_links/__pycache__/plugin.cpython-310.pyc b/src/DjangoBlog/plugins/external_links/__pycache__/plugin.cpython-310.pyc new file mode 100644 index 0000000..20ae765 Binary files /dev/null and b/src/DjangoBlog/plugins/external_links/__pycache__/plugin.cpython-310.pyc differ diff --git a/src/plugins/external_links/plugin.py b/src/DjangoBlog/plugins/external_links/plugin.py similarity index 100% rename from src/plugins/external_links/plugin.py rename to src/DjangoBlog/plugins/external_links/plugin.py diff --git a/src/plugins/reading_time/__init__.py b/src/DjangoBlog/plugins/reading_time/__init__.py similarity index 100% rename from src/plugins/reading_time/__init__.py rename to src/DjangoBlog/plugins/reading_time/__init__.py diff --git a/src/DjangoBlog/plugins/reading_time/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/plugins/reading_time/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..09b7cd8 Binary files /dev/null and b/src/DjangoBlog/plugins/reading_time/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/DjangoBlog/plugins/reading_time/__pycache__/plugin.cpython-310.pyc b/src/DjangoBlog/plugins/reading_time/__pycache__/plugin.cpython-310.pyc new file mode 100644 index 0000000..fd25160 Binary files /dev/null and b/src/DjangoBlog/plugins/reading_time/__pycache__/plugin.cpython-310.pyc differ diff --git a/src/plugins/reading_time/plugin.py b/src/DjangoBlog/plugins/reading_time/plugin.py similarity index 78% rename from src/plugins/reading_time/plugin.py rename to src/DjangoBlog/plugins/reading_time/plugin.py index 4b929d8..35f9db1 100644 --- a/src/plugins/reading_time/plugin.py +++ b/src/DjangoBlog/plugins/reading_time/plugin.py @@ -17,15 +17,7 @@ class ReadingTimePlugin(BasePlugin): def add_reading_time(self, content, *args, **kwargs): """ 计算阅读时间并添加到内容开头。 - 只在文章详情页显示,首页(文章列表页)不显示。 """ - # 检查是否为摘要模式(首页/文章列表页) - # 通过kwargs中的is_summary参数判断 - is_summary = kwargs.get('is_summary', False) - if is_summary: - # 如果是摘要模式(首页),直接返回原内容,不添加阅读时间 - return content - # 移除HTML标签和空白字符,以获得纯文本 clean_content = re.sub(r'<[^>]*>', '', content) clean_content = clean_content.strip() diff --git a/src/plugins/seo_optimizer/__init__.py b/src/DjangoBlog/plugins/seo_optimizer/__init__.py similarity index 100% rename from src/plugins/seo_optimizer/__init__.py rename to src/DjangoBlog/plugins/seo_optimizer/__init__.py diff --git a/src/DjangoBlog/plugins/seo_optimizer/__pycache__/__init__.cpython-310.pyc b/src/DjangoBlog/plugins/seo_optimizer/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..d612bb9 Binary files /dev/null and b/src/DjangoBlog/plugins/seo_optimizer/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/DjangoBlog/plugins/seo_optimizer/__pycache__/plugin.cpython-310.pyc b/src/DjangoBlog/plugins/seo_optimizer/__pycache__/plugin.cpython-310.pyc new file mode 100644 index 0000000..0d3e66b Binary files /dev/null and b/src/DjangoBlog/plugins/seo_optimizer/__pycache__/plugin.cpython-310.pyc differ diff --git a/src/plugins/seo_optimizer/plugin.py b/src/DjangoBlog/plugins/seo_optimizer/plugin.py similarity index 96% rename from src/plugins/seo_optimizer/plugin.py rename to src/DjangoBlog/plugins/seo_optimizer/plugin.py index de12c15..b5b19a3 100644 --- a/src/plugins/seo_optimizer/plugin.py +++ b/src/DjangoBlog/plugins/seo_optimizer/plugin.py @@ -97,8 +97,6 @@ class SeoOptimizerPlugin(BasePlugin): structured_data = { "@context": "https://schema.org", "@type": "WebSite", - "name": blog_setting.site_name, - "description": blog_setting.site_description, "url": request.build_absolute_uri('/'), "potentialAction": { "@type": "SearchAction", @@ -133,15 +131,12 @@ class SeoOptimizerPlugin(BasePlugin): json_ld_script = f'' - seo_html = f""" + return f"""
{{ SITE_DESCRIPTION }}
{% load i18n %} + + + {#