Merge develop into main

myblog/blog/models.py

@@ -37,7 +37,7 @@ class SiteSettings(models.Model):
 
 class Post(models.Model):
     title = models.CharField(max_length=100)
-    content = MDTextField()  # ✅ 改成这里
+    content = MDTextField()
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     publish_date = models.DateTimeField(default=timezone.now)

myblog/blog/templates/blog/rss.html

@@ -286,7 +286,8 @@
                 </li>
                 {% for category in categories %}
                     <li>
-                    <a href="{% url 'category_feed' category.id %}" class="rss-feed-link" target="_blank">{{ category.name }}分类</a>
+                        <a href="{% url 'category_feed' category.id %}" class="rss-feed-link"
+                           target="_blank">{{ category.name }}分类</a>
                         <div class="rss-feed-description">{{ category.name }}分类下的最新博客文章</div>
                     </li>
                 {% endfor %}

myblog/blog/views.py

@@ -44,7 +44,6 @@ def index(request):
 
     # 为每篇文章添加摘要（根据设置的字符长度）
     for post in posts:
-        # 移除HTML标签并截取前N个字符作为摘要
         import re
         clean_content = re.sub(r'<[^>]+>', '', post.get_markdown_content())
         post.summary = clean_content[:summary_length] + '...' if len(clean_content) > summary_length else clean_content
@@ -66,7 +65,10 @@ def detail(request, post_id):
         site_settings = SiteSettings.objects.first()
     except SiteSettings.DoesNotExist:
         site_settings = None
-    return render(request, 'blog/detail.html', {'post': post, 'categories': categories, 'site_settings': site_settings})
+    return render(request, 'blog/detail.html', {
+        'post': post,
+        'categories': categories,
+        'site_settings': site_settings})
 
 
 # 添加RSS页面视图

myblog/myblog/settings.py

@@ -163,4 +163,3 @@ try:
     from .local_settings import *
 except ImportError:
     pass
-